"docs/vscode:/vscode.git/clone" did not exist on "71557a5f7c221b63759a0d87c0b175b1bab243e6"
Unverified Commit 7371749d authored by Mengqing Cao's avatar Mengqing Cao Committed by GitHub
Browse files

[Misc] Fix ImportError causing by triton (#9493)

parent ad39bd64
...@@ -13,12 +13,15 @@ from vllm.executor.multiproc_worker_utils import (ProcessWorkerWrapper, ...@@ -13,12 +13,15 @@ from vllm.executor.multiproc_worker_utils import (ProcessWorkerWrapper,
from vllm.logger import init_logger from vllm.logger import init_logger
from vllm.model_executor.layers.sampler import SamplerOutput from vllm.model_executor.layers.sampler import SamplerOutput
from vllm.sequence import ExecuteModelRequest from vllm.sequence import ExecuteModelRequest
from vllm.triton_utils import maybe_set_triton_cache_manager from vllm.triton_utils.importing import HAS_TRITON
from vllm.utils import (_run_task_with_lock, cuda_device_count_stateless, from vllm.utils import (_run_task_with_lock, cuda_device_count_stateless,
cuda_is_initialized, get_distributed_init_method, cuda_is_initialized, get_distributed_init_method,
get_open_port, get_vllm_instance_id, make_async, get_open_port, get_vllm_instance_id, make_async,
update_environment_variables) update_environment_variables)
if HAS_TRITON:
from vllm.triton_utils import maybe_set_triton_cache_manager
logger = init_logger(__name__) logger = init_logger(__name__)
...@@ -59,7 +62,7 @@ class MultiprocessingGPUExecutor(DistributedGPUExecutor): ...@@ -59,7 +62,7 @@ class MultiprocessingGPUExecutor(DistributedGPUExecutor):
torch.set_num_threads(default_omp_num_threads) torch.set_num_threads(default_omp_num_threads)
# workaround for https://github.com/vllm-project/vllm/issues/6103 # workaround for https://github.com/vllm-project/vllm/issues/6103
if world_size > 1: if HAS_TRITON and world_size > 1:
maybe_set_triton_cache_manager() maybe_set_triton_cache_manager()
# Multiprocessing-based executor does not support multi-node setting. # Multiprocessing-based executor does not support multi-node setting.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment