[Quant] Consolidate GPTQ: rename gptq_marlin.py to auto_gptq.py (#38288)
Signed-off-by: Chengyi Nie <cnie@roblox.com> Co-authored-by: Chengyi Nie <cnie@roblox.com> Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
co-authored by
Chengyi Nie
Cursor
parent
3b6a204789
commit
fa2a33b893
@@ -3,6 +3,9 @@
|
||||
"""Tests whether vllm correctly load and run gptq_v2 format checkpoints.
|
||||
|
||||
Run `pytest tests/quantization/test_gptq_v2.py --forked`.
|
||||
|
||||
Note: 2/3-bit GPTQ models are no longer supported after the consolidation
|
||||
to Marlin kernels. Only 4/8-bit symmetric GPTQ models are supported.
|
||||
"""
|
||||
|
||||
import pytest
|
||||
@@ -10,9 +13,10 @@ import torch
|
||||
from transformers import AutoTokenizer
|
||||
|
||||
from vllm import SamplingParams
|
||||
from vllm.model_executor.layers.quantization.gptq import GPTQLinearMethod
|
||||
from vllm.model_executor.layers.quantization.auto_gptq import AutoGPTQLinearMethod
|
||||
|
||||
# A dummy small model quantized by GPTQModel, stored in GPTQ v2 format
|
||||
# Note: This is a 2-bit model which is no longer supported with Marlin kernels
|
||||
MODELS = ["XXXXyu/Qwen3-1.7B-w2g64-gptq_v2"]
|
||||
|
||||
# Generate multiple sequences for testing, because an 1.7B 2-bit model
|
||||
@@ -20,27 +24,19 @@ MODELS = ["XXXXyu/Qwen3-1.7B-w2g64-gptq_v2"]
|
||||
N_SEQ = 5
|
||||
|
||||
|
||||
@pytest.mark.skip(reason="2-bit GPTQ is no longer supported after Marlin consolidation")
|
||||
@pytest.mark.parametrize("model_id", MODELS)
|
||||
def test_model_load(vllm_runner, model_id, monkeypatch):
|
||||
# `LLM.apply_model` requires pickling a function.
|
||||
monkeypatch.setenv("VLLM_ALLOW_INSECURE_SERIALIZATION", "1")
|
||||
|
||||
# Only check the default GPTQ linear method (used for 2/3-bit models).
|
||||
# 4/8-bit linear methods like Marlin already support gptq_v2.
|
||||
linear_method_cls = GPTQLinearMethod
|
||||
|
||||
with vllm_runner(model_id, dtype=torch.float16, max_model_len=512) as llm:
|
||||
|
||||
def check_model(model_id):
|
||||
for name, submodule in model_id.named_modules():
|
||||
# Could check more modules if necessary
|
||||
if name == "model_id.layers.0.self_attn.qkv_proj":
|
||||
assert isinstance(submodule.quant_method, linear_method_cls)
|
||||
|
||||
config = submodule.quant_method.quant_config
|
||||
assert config.checkpoint_format == "gptq_v2"
|
||||
assert submodule.quant_method.use_v2_format
|
||||
|
||||
assert isinstance(submodule.quant_method, AutoGPTQLinearMethod)
|
||||
# Just break since currently we only check 1 module
|
||||
break
|
||||
|
||||
@@ -48,6 +44,7 @@ def test_model_load(vllm_runner, model_id, monkeypatch):
|
||||
llm.apply_model(check_model)
|
||||
|
||||
|
||||
@pytest.mark.skip(reason="2-bit GPTQ is no longer supported after Marlin consolidation")
|
||||
@pytest.mark.parametrize("model_id", MODELS)
|
||||
def test_model_inference(vllm_runner, model_id):
|
||||
# Prepare prompt to test the model's generation result.
|
||||
|
||||
Reference in New Issue
Block a user