Convert formatting to use ruff instead of yapf + isort (#26247)

Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
Harry Mellor
2025-10-05 07:06:22 -07:00
committed by GitHub
parent 17edd8a807
commit d6953beb91
1508 changed files with 115205 additions and 94107 deletions
@@ -9,15 +9,17 @@ import torch.nn.functional as F
from packaging import version
from vllm.model_executor.layers.linear import LinearBase, LinearMethodBase
from vllm.model_executor.layers.quantization import (QuantizationConfig,
QuantizationMethods)
from vllm.model_executor.layers.quantization import (
QuantizationConfig,
QuantizationMethods,
)
from vllm.model_executor.utils import set_weight_attrs
class DeepSpeedFPConfig(QuantizationConfig):
"""Config for DeepSpeed FP quantizer. It supports fp6 and fp8.
Args:
Args:
weight_bits: the target quantization bits, 6 or 8.
group_size: group size for quantizaiton, default to 128.
"""
@@ -36,11 +38,14 @@ class DeepSpeedFPConfig(QuantizationConfig):
raise ValueError(
"Currently, only 6-bit or 8-bit weight quantization are "
f"supported for DeepSpeed FP quantizaiton, but got "
f"{self.weight_bits} bits.")
f"{self.weight_bits} bits."
)
def __repr__(self) -> str:
return (f"DeepSpeedFPConfig(weight_bits={self.weight_bits}), "
f"group_size={self.group_size}")
return (
f"DeepSpeedFPConfig(weight_bits={self.weight_bits}), "
f"group_size={self.group_size}"
)
@classmethod
def get_name(cls) -> QuantizationMethods:
@@ -71,8 +76,9 @@ class DeepSpeedFPConfig(QuantizationConfig):
"quantize_config.json",
]
def get_quant_method(self, layer: torch.nn.Module,
prefix: str) -> Optional["DeepSpeedFPLinearMethod"]:
def get_quant_method(
self, layer: torch.nn.Module, prefix: str
) -> Optional["DeepSpeedFPLinearMethod"]:
if isinstance(layer, LinearBase):
return DeepSpeedFPLinearMethod(self)
return None
@@ -89,15 +95,17 @@ class DeepSpeedFPLinearMethod(LinearMethodBase):
self.quant_config = quant_config
self.weight = None
def create_weights(self,
layer: torch.nn.Module,
input_size_per_partition: int,
output_partition_sizes: list[int],
input_size: int,
output_size: int,
params_dtype: torch.dtype,
weight_loader=None,
**extra_weight_attrs):
def create_weights(
self,
layer: torch.nn.Module,
input_size_per_partition: int,
output_partition_sizes: list[int],
input_size: int,
output_size: int,
params_dtype: torch.dtype,
weight_loader=None,
**extra_weight_attrs,
):
del output_size
del input_size
output_size_per_partition = sum(output_partition_sizes)
@@ -106,10 +114,13 @@ class DeepSpeedFPLinearMethod(LinearMethodBase):
params_dtype=params_dtype,
quant_config=self.quant_config,
)
set_weight_attrs(weight, {
"input_dim": 1,
"output_dim": 0,
})
set_weight_attrs(
weight,
{
"input_dim": 1,
"output_dim": 0,
},
)
layer.register_parameter("weight", weight)
def quant_weight_loader(param, loaded_weight, *args, **kwargs):
@@ -125,10 +136,12 @@ class DeepSpeedFPLinearMethod(LinearMethodBase):
extra_weight_attrs["weight_loader"] = quant_weight_loader
set_weight_attrs(weight, extra_weight_attrs)
def apply(self,
layer: torch.nn.Module,
x: torch.Tensor,
bias: Optional[torch.Tensor] = None) -> torch.Tensor:
def apply(
self,
layer: torch.nn.Module,
x: torch.Tensor,
bias: Optional[torch.Tensor] = None,
) -> torch.Tensor:
weight = layer.weight
y = weight.ds_dequantize()
return F.linear(x, y, bias)
@@ -141,23 +154,33 @@ class DeepSpeedFPParameter(nn.Parameter):
GPUs, and can be dequantized on-the-fly when needed by the model.
"""
def __new__(cls, orig_shape: torch.Size, params_dtype: torch.dtype,
quant_config: DeepSpeedFPConfig):
def __new__(
cls,
orig_shape: torch.Size,
params_dtype: torch.dtype,
quant_config: DeepSpeedFPConfig,
):
try:
import deepspeed
if version.parse(deepspeed.__version__) < version.parse("0.14.2"):
raise ImportError("deepspeed version is wrong. Please "
"install deepspeed>=0.14.2.")
raise ImportError(
"deepspeed version is wrong. Please install deepspeed>=0.14.2."
)
from deepspeed.ops.fp_quantizer import FP_Quantize
except ImportError as err:
raise ImportError("Please install deepspeed>=0.14.2 via "
"`pip install deepspeed>=0.14.2` to use "
"deepspeedfp quantizer.") from err
data = torch.empty((
orig_shape.numel() // quant_config.group_size,
quant_config.group_size * quant_config.weight_bits // 8 + 4,
),
dtype=torch.int8)
raise ImportError(
"Please install deepspeed>=0.14.2 via "
"`pip install deepspeed>=0.14.2` to use "
"deepspeedfp quantizer."
) from err
data = torch.empty(
(
orig_shape.numel() // quant_config.group_size,
quant_config.group_size * quant_config.weight_bits // 8 + 4,
),
dtype=torch.int8,
)
self = torch.Tensor._make_subclass(cls, data, data.requires_grad)
self.orig_shape = orig_shape
self.quant_config = quant_config
@@ -172,7 +195,8 @@ class DeepSpeedFPParameter(nn.Parameter):
self.fp_quantizer.quantize(
tensor.data,
q_bits=self.quant_config.weight_bits,
))
)
)
def ds_dequantize(self, fp_out=None) -> torch.Tensor:
"""
@@ -180,7 +204,8 @@ class DeepSpeedFPParameter(nn.Parameter):
"""
assert self.data.device.type == "cuda" and self.data.dtype == torch.int8
return self.fp_quantizer.dequantize(
self.data, fp_out=fp_out, q_bits=self.quant_config.weight_bits)
self.data, fp_out=fp_out, q_bits=self.quant_config.weight_bits
)
def ds_selective_dequantize(self, indices, fp_out=None) -> torch.Tensor:
"""
@@ -189,7 +214,5 @@ class DeepSpeedFPParameter(nn.Parameter):
"""
assert self.data.device.type == "cuda" and self.data.dtype == torch.int8
return self.fp_quantizer.selective_dequantize(
self.data,
indices,
fp_out=fp_out,
q_bits=self.quant_config.weight_bits)
self.data, indices, fp_out=fp_out, q_bits=self.quant_config.weight_bits
)