fix(quantization): Fix AWQ dequantize on Intel XPU and refactor AutoAWQ config (#42727)

Signed-off-by: Alex <alex.tech.lab@outlook.com>
Signed-off-by: AlexHuang <jihuihuang@tencent.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Kunshang Ji <kunshang.ji@intel.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
AlexHuang
2026-06-18 20:12:28 +08:00
committed by GitHub
co-authored by Claude Kunshang Ji mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
parent 351c72d6e5
commit 8d4f54966c
20 changed files with 580 additions and 429 deletions
@@ -27,9 +27,6 @@ from vllm.model_executor.layers.quantization.base_config import (
QuantizationConfig,
QuantizeMethodBase,
)
from vllm.model_executor.layers.quantization.utils.marlin_utils import (
check_marlin_supports_layer,
)
from vllm.model_executor.utils import set_weight_attrs
from vllm.platforms import current_platform
@@ -55,10 +52,8 @@ class MoeWNA16Config(QuantizationConfig):
self.lm_head_quantized = lm_head_quantized
self.linear_quant_method = linear_quant_method
self.full_config = full_config
self.use_marlin = False
# Avoid circular import
from vllm.model_executor.layers.quantization.awq import AWQConfig
from vllm.model_executor.layers.quantization.awq_marlin import AWQMarlinConfig
from vllm.model_executor.layers.quantization.auto_awq import AutoAWQConfig
if self.linear_quant_method == "gptq":
pass
@@ -67,7 +62,7 @@ class MoeWNA16Config(QuantizationConfig):
device_capability = (
-1 if capability_tuple is None else capability_tuple.to_int()
)
awq_min_capability = AWQConfig.get_min_capability()
awq_min_capability = AutoAWQConfig.get_min_capability()
if device_capability < awq_min_capability:
raise ValueError(
"The quantization method moe_wna16 + awq is not supported "
@@ -75,7 +70,6 @@ class MoeWNA16Config(QuantizationConfig):
f"Minimum capability: {awq_min_capability}. "
f"Current capability: {device_capability}."
)
self.use_marlin = AWQMarlinConfig.is_awq_marlin_compatible(full_config)
else:
raise ValueError("moe_wna16 only support gptq and awq.")
@@ -148,9 +142,9 @@ class MoeWNA16Config(QuantizationConfig):
-1 if capability_tuple is None else capability_tuple.to_int()
)
# Avoid circular import
from vllm.model_executor.layers.quantization.awq import AWQConfig
from vllm.model_executor.layers.quantization.auto_awq import AutoAWQConfig
awq_min_capability = AWQConfig.get_min_capability()
awq_min_capability = AutoAWQConfig.get_min_capability()
gptq_compatible = quant_method == "gptq" and not desc_act and num_bits in [4, 8]
awq_compatible = (
@@ -170,29 +164,19 @@ class MoeWNA16Config(QuantizationConfig):
return UnquantizedLinearMethod()
elif isinstance(layer, LinearBase):
# Avoid circular import
from vllm.model_executor.layers.quantization.auto_awq import AutoAWQConfig
from vllm.model_executor.layers.quantization.auto_gptq import (
AutoGPTQConfig,
)
from vllm.model_executor.layers.quantization.awq import AWQConfig
from vllm.model_executor.layers.quantization.awq_marlin import (
AWQMarlinConfig,
)
if self.linear_quant_method == "gptq":
return AutoGPTQConfig.from_config(self.full_config).get_quant_method(
layer, prefix
)
elif self.linear_quant_method in ("awq", "awq_marlin"):
if self.use_marlin and check_marlin_supports_layer(
layer, self.group_size
):
return AWQMarlinConfig.from_config(
self.full_config
).get_quant_method(layer, prefix)
else:
return AWQConfig.from_config(self.full_config).get_quant_method(
layer, prefix
)
return AutoAWQConfig.from_config(self.full_config).get_quant_method(
layer, prefix
)
else:
raise ValueError("moe_wna16 only support gptq and awq.")
elif isinstance(layer, RoutedExperts):