Skip to content

Commit adfd9b9

Browse files
Pernekhanjimpang
authored andcommitted
Use revision when downloading the quantization config file (vllm-project#2697)
Co-authored-by: Pernekhan Utemuratov <pernekhan@deepinfra.com>
1 parent 08b782e commit adfd9b9

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

vllm/model_executor/model_loader.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ def get_model(model_config: ModelConfig,
4444
# Get the (maybe quantized) linear method.
4545
linear_method = None
4646
if model_config.quantization is not None:
47-
quant_config = get_quant_config(model_config.quantization,
48-
model_config.model,
49-
model_config.hf_config,
50-
model_config.download_dir)
47+
quant_config = get_quant_config(model_config)
5148
capability = torch.cuda.get_device_capability()
5249
capability = capability[0] * 10 + capability[1]
5350
if capability < quant_config.get_min_capability():

vllm/model_executor/weight_utils.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import numpy as np
1212
from safetensors.torch import load_file, save_file, safe_open
1313
import torch
14-
from transformers import PretrainedConfig
1514
from tqdm.auto import tqdm
1615

16+
from vllm.config import ModelConfig
1717
from vllm.logger import init_logger
1818
from vllm.model_executor.layers.quantization import (get_quantization_config,
1919
QuantizationConfig)
@@ -83,25 +83,22 @@ def convert_bin_to_safetensor_file(
8383

8484

8585
# TODO(woosuk): Move this to other place.
86-
def get_quant_config(
87-
quantization: str,
88-
model_name_or_path: str,
89-
hf_config: PretrainedConfig,
90-
cache_dir: Optional[str] = None,
91-
) -> QuantizationConfig:
92-
quant_cls = get_quantization_config(quantization)
86+
def get_quant_config(model_config: ModelConfig) -> QuantizationConfig:
87+
quant_cls = get_quantization_config(model_config.quantization)
9388
# Read the quantization config from the HF model config, if available.
94-
hf_quant_config = getattr(hf_config, "quantization_config", None)
89+
hf_quant_config = getattr(model_config.hf_config, "quantization_config",
90+
None)
9591
if hf_quant_config is not None:
9692
return quant_cls.from_config(hf_quant_config)
97-
93+
model_name_or_path = model_config.model
9894
is_local = os.path.isdir(model_name_or_path)
9995
if not is_local:
10096
# Download the config files.
101-
with get_lock(model_name_or_path, cache_dir):
97+
with get_lock(model_name_or_path, model_config.download_dir):
10298
hf_folder = snapshot_download(model_name_or_path,
99+
revision=model_config.revision,
103100
allow_patterns="*.json",
104-
cache_dir=cache_dir,
101+
cache_dir=model_config.download_dir,
105102
tqdm_class=Disabledtqdm)
106103
else:
107104
hf_folder = model_name_or_path
@@ -112,10 +109,12 @@ def get_quant_config(
112109
f.endswith(x) for x in quant_cls.get_config_filenames())
113110
]
114111
if len(quant_config_files) == 0:
115-
raise ValueError(f"Cannot find the config file for {quantization}")
112+
raise ValueError(
113+
f"Cannot find the config file for {model_config.quantization}")
116114
if len(quant_config_files) > 1:
117-
raise ValueError(f"Found multiple config files for {quantization}: "
118-
f"{quant_config_files}")
115+
raise ValueError(
116+
f"Found multiple config files for {model_config.quantization}: "
117+
f"{quant_config_files}")
119118

120119
quant_config_file = quant_config_files[0]
121120
with open(quant_config_file, "r") as f:

0 commit comments

Comments
 (0)