xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2026-06-08 22:35:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

use .dev for version comparison with pytorch nightly release (#20031)

Browse Source 
Signed-off-by: Boyuan Feng <boyuan@meta.com>
This commit is contained in:
Boyuan Feng 2025-06-24 14:52:16 -07:00 committed by GitHub
parent ead369845d
commit c01d1c5aba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/compile/test_config.py
View File

@ -5,6 +5,15 @@ import pytest
import vllm import vllm
from vllm.compilation.counter import compilation_counter from vllm.compilation.counter import compilation_counter
from vllm.config import VllmConfig from vllm.config import VllmConfig
from vllm.utils import _is_torch_equal_or_newer
def test_version():
assert _is_torch_equal_or_newer('2.8.0.dev20250624+cu128', '2.8.0.dev')
assert _is_torch_equal_or_newer('2.8.0a0+gitc82a174', '2.8.0.dev')
assert _is_torch_equal_or_newer('2.8.0', '2.8.0.dev')
assert _is_torch_equal_or_newer('2.8.1', '2.8.0.dev')
assert not _is_torch_equal_or_newer('2.7.1', '2.8.0.dev')
def test_use_cudagraphs_dynamic(monkeypatch): def test_use_cudagraphs_dynamic(monkeypatch):

2
vllm/compilation/backends.py
View File

@ -32,7 +32,7 @@ logger = init_logger(__name__)
def make_compiler(compilation_config: CompilationConfig) -> CompilerInterface: def make_compiler(compilation_config: CompilationConfig) -> CompilerInterface:
if compilation_config.use_inductor: if compilation_config.use_inductor:
if envs.VLLM_USE_STANDALONE_COMPILE and is_torch_equal_or_newer( if envs.VLLM_USE_STANDALONE_COMPILE and is_torch_equal_or_newer(
"2.8.0a"): "2.8.0.dev"):
logger.debug("Using InductorStandaloneAdaptor") logger.debug("Using InductorStandaloneAdaptor")
return InductorStandaloneAdaptor() return InductorStandaloneAdaptor()
else: else:

4
vllm/model_executor/layers/quantization/torchao.py
View File

@ -44,14 +44,14 @@ class TorchAOConfig(QuantizationConfig):
""" """
# TorchAO quantization relies on tensor subclasses. In order, # TorchAO quantization relies on tensor subclasses. In order,
# to enable proper caching this needs standalone compile # to enable proper caching this needs standalone compile
if is_torch_equal_or_newer("2.8.0a"): if is_torch_equal_or_newer("2.8.0.dev"):
os.environ["VLLM_TEST_STANDALONE_COMPILE"] = "1" os.environ["VLLM_TEST_STANDALONE_COMPILE"] = "1"
logger.info( logger.info(
"Using TorchAO: Setting VLLM_TEST_STANDALONE_COMPILE=1") "Using TorchAO: Setting VLLM_TEST_STANDALONE_COMPILE=1")
# TODO: remove after the torch dependency is updated to 2.8 # TODO: remove after the torch dependency is updated to 2.8
if is_torch_equal_or_newer( if is_torch_equal_or_newer(
"2.7.0") and not is_torch_equal_or_newer("2.8.0a"): "2.7.0") and not is_torch_equal_or_newer("2.8.0.dev"):
os.environ["VLLM_DISABLE_COMPILE_CACHE"] = "1" os.environ["VLLM_DISABLE_COMPILE_CACHE"] = "1"
logger.info("Using TorchAO: Setting VLLM_DISABLE_COMPILE_CACHE=1") logger.info("Using TorchAO: Setting VLLM_DISABLE_COMPILE_CACHE=1")
""" """

9
vllm/utils.py
View File

@ -2919,8 +2919,13 @@ def is_torch_equal_or_newer(target: str) -> bool:
Whether the condition meets. Whether the condition meets.
""" """
try: try:
torch_version = version.parse(str(torch.__version__)) return _is_torch_equal_or_newer(str(torch.__version__), target)
return torch_version >= version.parse(target)
except Exception: except Exception:
# Fallback to PKG-INFO to load the package info, needed by the doc gen. # Fallback to PKG-INFO to load the package info, needed by the doc gen.
return Version(importlib.metadata.version('torch')) >= Version(target) return Version(importlib.metadata.version('torch')) >= Version(target)
# Helper function used in testing.
def _is_torch_equal_or_newer(torch_version: str, target: str) -> bool:
torch_version = version.parse(torch_version)
return torch_version >= version.parse(target)