Revert "[Misc] add humming to dependencies" (#43492)
This commit is contained in:
@@ -25,7 +25,4 @@ nvidia-cutlass-dsl[cu13]==4.5.0
|
|||||||
quack-kernels>=0.3.3
|
quack-kernels>=0.3.3
|
||||||
|
|
||||||
# Tokenspeed_MLA for faster mla with spec decode
|
# Tokenspeed_MLA for faster mla with spec decode
|
||||||
tokenspeed-mla==0.1.2
|
tokenspeed-mla==0.1.2
|
||||||
|
|
||||||
# Humming kernels for quantization gemm
|
|
||||||
humming-kernels[cu13]==0.1.0
|
|
||||||
@@ -1017,8 +1017,6 @@ def get_requirements() -> list[str]:
|
|||||||
if "nvidia-cutlass-dsl[cu13]" in req and cuda_major == "12":
|
if "nvidia-cutlass-dsl[cu13]" in req and cuda_major == "12":
|
||||||
# [cu13] extra is the default; strip it on CUDA 12 builds.
|
# [cu13] extra is the default; strip it on CUDA 12 builds.
|
||||||
req = req.replace("nvidia-cutlass-dsl[cu13]", "nvidia-cutlass-dsl")
|
req = req.replace("nvidia-cutlass-dsl[cu13]", "nvidia-cutlass-dsl")
|
||||||
if "humming-kernels[cu13]" in req and cuda_major == "12":
|
|
||||||
req = req.replace("humming-kernels[cu13]", "humming-kernels[cu12]")
|
|
||||||
modified_requirements.append(req)
|
modified_requirements.append(req)
|
||||||
requirements = modified_requirements
|
requirements = modified_requirements
|
||||||
elif _is_hip():
|
elif _is_hip():
|
||||||
|
|||||||
@@ -43,9 +43,12 @@ from vllm.model_executor.parameter import (
|
|||||||
RowvLLMParameter,
|
RowvLLMParameter,
|
||||||
)
|
)
|
||||||
from vllm.model_executor.utils import set_weight_attrs
|
from vllm.model_executor.utils import set_weight_attrs
|
||||||
from vllm.platforms import current_platform
|
|
||||||
|
|
||||||
if current_platform.is_cuda():
|
if TYPE_CHECKING:
|
||||||
|
from vllm.model_executor.models.utils import WeightsMapper
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
from humming.dtypes import DataType
|
from humming.dtypes import DataType
|
||||||
from humming.layer import HummingMethod
|
from humming.layer import HummingMethod
|
||||||
from humming.schema import (
|
from humming.schema import (
|
||||||
@@ -62,17 +65,16 @@ if current_platform.is_cuda():
|
|||||||
HummingIndexedExperts,
|
HummingIndexedExperts,
|
||||||
get_humming_moe_gemm_type,
|
get_humming_moe_gemm_type,
|
||||||
)
|
)
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
HummingMethod = None
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from humming.schema import (
|
def assert_humming_available():
|
||||||
BaseInputSchema,
|
assert HummingMethod is not None, (
|
||||||
BaseWeightSchema,
|
"humming is not available, please run "
|
||||||
HummingInputSchema,
|
"'pip install git+https://github.com/inclusionAI/humming' to install it."
|
||||||
HummingWeightSchema,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
from vllm.model_executor.models.utils import WeightsMapper
|
|
||||||
|
|
||||||
|
|
||||||
def prepare_padded_shape(shape, x):
|
def prepare_padded_shape(shape, x):
|
||||||
padded_shape = math.ceil(shape / x) * x
|
padded_shape = math.ceil(shape / x) * x
|
||||||
@@ -184,6 +186,7 @@ class HummingConfig(QuantizationConfig):
|
|||||||
packed_modules_mapping: dict[str, list[str]] = {}
|
packed_modules_mapping: dict[str, list[str]] = {}
|
||||||
|
|
||||||
def __init__(self, full_config: dict[str, Any] | None = None):
|
def __init__(self, full_config: dict[str, Any] | None = None):
|
||||||
|
assert_humming_available()
|
||||||
self.full_config: dict[str, Any] = full_config or {}
|
self.full_config: dict[str, Any] = full_config or {}
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
Reference in New Issue
Block a user