### Summary
This PR refactors the `vllm_ascend/quantization` module to improve code
organization, maintainability, and extensibility. The refactoring
introduces a clear separation of concerns with a registry-based scheme
discovery pattern, abstract base classes for quantization schemes, and
dedicated wrapper classes.
### Key Changes
#### 1. **Modular Directory Structure**
| Before | After |
|--------|-------|
| Flat file structure with mixed responsibilities | Organized into
`methods/` subpackage for schemes |
| Single `quant_config.py` (600+ lines) | Separate config files:
`modelslim_config.py`, `compressed_tensors_config.py` |
| `utils.py` with scheme lookup logic | `methods/registry.py` with
decorator-based registration |
#### 2. **Registry-Based Scheme Discovery**
Replaced hardcoded `ASCEND_QUANTIZATION_METHOD_MAP` dictionary with a
decorator-based registry pattern:
```python
# Before: Manual dictionary mapping
ASCEND_QUANTIZATION_METHOD_MAP = {
"W8A8_DYNAMIC": {"linear": AscendW8A8DynamicLinearMethod, ...},
...
}
# After: Decorator-based registration
@register_scheme("W8A8_DYNAMIC", "linear")
class AscendW8A8DynamicLinearMethod(AscendLinearScheme):
...
```
#### 3. **Abstract Base Classes**
Introduced three abstract base classes in `methods/base.py`:
- `AscendLinearScheme` - Base for linear layer quantization
- `AscendMoEScheme` - Base for MoE layer quantization
- `AscendAttentionScheme` - Base for attention layer quantization
#### 4. **Separated Config and Wrapper Classes**
- **Config classes** (`AscendModelSlimConfig`,
`AscendCompressedTensorsConfig`): Handle config parsing and scheme
selection
- **Wrapper classes** (`AscendLinearMethod`, `AscendFusedMoEMethod`,
etc.): Implement vLLM interfaces and delegate to schemes
#### 5. **Cleaner Public API**
```python
# New clean module interface
from vllm_ascend.quantization import (
AscendModelSlimConfig,
AscendCompressedTensorsConfig,
)
from vllm_ascend.quantization.methods import get_scheme_class
```
### Architecture Diagram
```mermaid
classDiagram
direction TB
class QuantizationConfig {
<<vLLM Interface>>
+get_quant_method()
}
class AscendModelSlimConfig {
+quant_description
+get_quant_method()
-create_scheme_for_layer()
}
class AscendCompressedTensorsConfig {
+target_scheme_map
+get_quant_method()
-_get_scheme_from_parts()
}
class AscendLinearMethod {
<<Wrapper>>
+quant_method: AscendLinearScheme
+create_weights()
+apply()
}
class AscendFusedMoEMethod {
<<Wrapper>>
+quant_method: AscendMoEScheme
+create_weights()
+apply()
}
class AscendLinearScheme {
<<Abstract>>
+get_weight()*
+apply()*
+get_pertensor_param()
+get_perchannel_param()
}
class AscendMoEScheme {
<<Abstract>>
+get_weight()*
+get_dynamic_quant_param()*
+apply()*
}
class W8A8DynamicLinear {
+get_weight()
+apply()
}
class W8A8DynamicMoE {
+get_weight()
+apply()
}
QuantizationConfig <|-- AscendModelSlimConfig
QuantizationConfig <|-- AscendCompressedTensorsConfig
AscendModelSlimConfig ..> AscendLinearMethod : creates
AscendModelSlimConfig ..> AscendFusedMoEMethod : creates
AscendCompressedTensorsConfig ..> AscendLinearMethod : creates
AscendCompressedTensorsConfig ..> AscendFusedMoEMethod : creates
AscendLinearMethod o-- AscendLinearScheme : delegates to
AscendFusedMoEMethod o-- AscendMoEScheme : delegates to
AscendLinearScheme <|-- W8A8DynamicLinear
AscendMoEScheme <|-- W8A8DynamicMoE
```
### Scheme Registration Flow
```mermaid
sequenceDiagram
participant Module as Scheme Module
participant Registry as _SCHEME_REGISTRY
participant Config as QuantConfig
participant Wrapper as Wrapper Class
Note over Module: At import time
Module->>Registry: @register_scheme("W8A8_DYNAMIC", "linear")
Registry->>Registry: Store (quant_type, layer_type) -> Class
Note over Config: At runtime
Config->>Config: Determine quant_type from description
Config->>Registry: get_scheme_class(quant_type, layer_type)
Registry-->>Config: Return scheme class
Config->>Config: scheme = scheme_cls()
Config->>Wrapper: Create wrapper with scheme
Wrapper-->>Config: Return wrapper instance
```
### File Changes Summary
| Original Files | Refactored Files |
|----------------|------------------|
| `__init__.py` (empty) | `__init__.py` (exports public API) |
| `quant_config.py` | `modelslim_config.py` + `wrappers.py` |
| `compressed_tensors/` | `compressed_tensors_config.py` |
| `utils.py` | `methods/registry.py` |
| `w8a8_dynamic.py` | `methods/w8a8_dynamic.py` |
| `w8a8.py` | `methods/w8a8_static.py` |
| `w4a4_flatquant_dynamic.py` | `methods/w4a4_flatquant.py` |
| ... | `methods/base.py` (new) |
### Benefits
1. **Extensibility**: Adding new quantization schemes only requires
implementing the base class and adding `@register_scheme` decorator
2. **Maintainability**: Clear separation between config parsing, wrapper
logic, and scheme implementation
3. **Testability**: Abstract base classes enable easier unit testing and
mocking
4. **Discoverability**: Registry pattern makes it easy to list all
supported schemes
5. **Reduced Coupling**: Config classes no longer need to know about all
scheme implementations
___
- vLLM version: v0.13.0
- vLLM main:
2f4e6548ef
---------
Signed-off-by: SlightwindSec <slightwindsec@gmail.com>
191 lines
8.0 KiB
Python
191 lines
8.0 KiB
Python
#
|
|
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
|
|
# This file is a part of the vllm-ascend project.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
import math
|
|
from typing import Any, Dict, Optional, Tuple
|
|
|
|
import torch
|
|
import torch_npu
|
|
|
|
from .base import AscendLinearScheme
|
|
from .registry import register_scheme
|
|
|
|
KRONECKER_QUANT_MAX_BATCH_SIZE = 32768
|
|
|
|
|
|
def pack_int4_weights(weight_tensor: torch.Tensor) -> torch.Tensor:
|
|
"""Pack int4 weights for NPU."""
|
|
original_device = weight_tensor.device
|
|
weight_tensor_npu = weight_tensor.npu()
|
|
weight_int4_packed = torch_npu.npu_convert_weight_to_int4pack(
|
|
weight_tensor_npu.to(torch.int32), inner_k_tiles=1)
|
|
return weight_int4_packed.to(original_device)
|
|
|
|
|
|
def get_decompose_dim(n):
|
|
"""Get decomposed dimensions for Kronecker quantization."""
|
|
a = int(math.sqrt(n))
|
|
if a * a < n:
|
|
a += 1
|
|
while True:
|
|
tmp = a * a - n
|
|
b = int(math.sqrt(tmp))
|
|
if b * b == tmp:
|
|
break
|
|
a += 1
|
|
return a - b, a + b
|
|
|
|
|
|
# TODO: This function is a temporary workaround for the npu_kronecker_quant operator,
|
|
# which has a limitation on the maximum batch size (dim0). This wrapper should be
|
|
# removed once the operator supports larger inputs natively.
|
|
def batched_kronecker_quant(
|
|
x: torch.Tensor,
|
|
left_trans: torch.Tensor,
|
|
right_trans: torch.Tensor,
|
|
clip_ratio: float,
|
|
) -> Tuple[torch.Tensor, torch.Tensor]:
|
|
"""Batched Kronecker quantization with batch size limit handling."""
|
|
batch_tokens = x.shape[0]
|
|
if batch_tokens <= KRONECKER_QUANT_MAX_BATCH_SIZE:
|
|
return torch_npu.npu_kronecker_quant(x,
|
|
left_trans,
|
|
right_trans,
|
|
clip_ratio=clip_ratio,
|
|
dst_dtype=torch.int32)
|
|
x_chunks = torch.split(x, KRONECKER_QUANT_MAX_BATCH_SIZE, dim=0)
|
|
processed_chunks = [
|
|
torch_npu.npu_kronecker_quant(chunk,
|
|
left_trans,
|
|
right_trans,
|
|
clip_ratio=clip_ratio,
|
|
dst_dtype=torch.int32)
|
|
for chunk in x_chunks
|
|
]
|
|
quantized_list, scale_list = zip(*processed_chunks)
|
|
x_quantized_int4 = torch.cat(quantized_list, dim=0)
|
|
activation_scale = torch.cat(scale_list, dim=0)
|
|
return x_quantized_int4, activation_scale
|
|
|
|
|
|
@register_scheme("W4A4_FLATQUANT_DYNAMIC", "linear")
|
|
class AscendW4A4FlatQuantDynamicLinearMethod(AscendLinearScheme):
|
|
"""Linear method for Ascend W4A4_FLATQUANT_DYNAMIC.
|
|
|
|
This class implements W4A4 quantization with FlatQuant approach and dynamic activation quantization.
|
|
- Weight: 4-bit quantization (per-channel) with scale and offset, stored as int8 and packed to int32 during loading
|
|
- Activation: 4-bit dynamic quantization with FlatQuant transform matrices (left_trans, right_trans) for distribution smoothing
|
|
- Parameters: clip_ratio for controlling quantization clipping, weight_offset for asymmetric quantization, loaded from external weights
|
|
"""
|
|
input_size = 0
|
|
|
|
def __init__(self):
|
|
self.sym = True
|
|
|
|
def get_weight(self, input_size: int, output_size: int,
|
|
params_dtype: torch.dtype) -> Dict[str, Any]:
|
|
if input_size % 8 != 0:
|
|
raise ValueError(
|
|
f"input_size ({input_size}) must be divisible by 8 for int4 packing"
|
|
)
|
|
AscendW4A4FlatQuantDynamicLinearMethod.input_size = input_size
|
|
params_dict = {
|
|
"weight": torch.empty(output_size, input_size, dtype=torch.int8)
|
|
}
|
|
return params_dict
|
|
|
|
def get_pertensor_param(self, params_dtype: torch.dtype) -> Dict[str, Any]:
|
|
params_dict = {}
|
|
left_trans_dim, right_trans_dim = get_decompose_dim(
|
|
AscendW4A4FlatQuantDynamicLinearMethod.input_size)
|
|
params_dict["left_trans"] = torch.empty(left_trans_dim,
|
|
left_trans_dim,
|
|
dtype=params_dtype)
|
|
params_dict["right_trans"] = torch.empty(right_trans_dim,
|
|
right_trans_dim,
|
|
dtype=params_dtype)
|
|
params_dict["clip_ratio"] = torch.empty(1, dtype=torch.float32)
|
|
return params_dict
|
|
|
|
def get_perchannel_param(
|
|
self,
|
|
output_size: int,
|
|
params_dtype: torch.dtype,
|
|
) -> Dict[str, Any]:
|
|
params_dict = {}
|
|
params_dict["weight_scale"] = torch.empty(output_size,
|
|
1,
|
|
dtype=torch.float32)
|
|
params_dict["weight_offset"] = torch.empty(output_size,
|
|
1,
|
|
dtype=torch.float32)
|
|
return params_dict
|
|
|
|
def apply(
|
|
self,
|
|
layer: torch.nn.Module,
|
|
x: torch.Tensor,
|
|
bias: Optional[torch.Tensor] = None,
|
|
tp_rank: Optional[int] = 0,
|
|
) -> torch.Tensor:
|
|
original_dtype = x.dtype
|
|
input_shape = x.shape
|
|
in_features = input_shape[-1]
|
|
left_dim = layer.left_trans.shape[0]
|
|
right_dim = layer.right_trans.shape[0]
|
|
if left_dim * right_dim != in_features:
|
|
raise ValueError(
|
|
f"FlatQuant transform matrices dimension mismatch: "
|
|
f"left_dim({left_dim}) * right_dim({right_dim}) != in_features({in_features})"
|
|
)
|
|
left_trans_matched = layer.left_trans.to(original_dtype)
|
|
right_trans_matched = layer.right_trans.to(original_dtype)
|
|
x_reshaped = x.view(-1, left_dim, right_dim)
|
|
x_quantized_int4, activation_scale = batched_kronecker_quant(
|
|
x_reshaped, left_trans_matched, right_trans_matched,
|
|
layer.aclnn_clip_ratio)
|
|
x_quantized_reshaped = x_quantized_int4.view(-1,
|
|
left_dim * right_dim // 8)
|
|
pertoken_scale = activation_scale.view(-1).to(torch.float32)
|
|
output = torch_npu.npu_quant_matmul(x_quantized_reshaped,
|
|
layer.weight_packed.t(),
|
|
layer.weight_scale.view(-1).to(
|
|
torch.float32),
|
|
pertoken_scale=pertoken_scale,
|
|
bias=None,
|
|
output_dtype=original_dtype)
|
|
output = output.view(*input_shape[:-1], -1)
|
|
if bias is not None:
|
|
output = output + bias.to(original_dtype)
|
|
return output
|
|
|
|
def process_weights_after_loading(self, layer):
|
|
# NOTE: Currently, w4a4 can't support weight nz
|
|
weight_packed = pack_int4_weights(layer.weight.data)
|
|
layer.register_parameter(
|
|
'weight_packed',
|
|
torch.nn.Parameter(weight_packed, requires_grad=False))
|
|
del layer.weight
|
|
layer.weight_scale.data = layer.weight_scale.data.to(torch.float32)
|
|
layer.weight_offset.data = layer.weight_offset.data.to(torch.float32)
|
|
layer.left_trans = torch.nn.Parameter(
|
|
layer.left_trans.data.t().contiguous())
|
|
layer.right_trans = torch.nn.Parameter(layer.right_trans.data)
|
|
layer.clip_ratio = torch.nn.Parameter(
|
|
layer.clip_ratio.data.to(torch.float32))
|
|
layer.aclnn_clip_ratio = layer.clip_ratio.item()
|