Skip to content

Commit 3347604

Browse files
committed
Move ray_utils.py from engine to executor package
Per @zhuohan123's request here: vllm-project#3466 (comment)
1 parent 96e90fd commit 3347604

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed

vllm/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from vllm.engine.arg_utils import AsyncEngineArgs, EngineArgs
44
from vllm.engine.async_llm_engine import AsyncLLMEngine
55
from vllm.engine.llm_engine import LLMEngine
6-
from vllm.engine.ray_utils import initialize_ray_cluster
76
from vllm.entrypoints.llm import LLM
7+
from vllm.executor.ray_utils import initialize_ray_cluster
88
from vllm.model_executor.models import ModelRegistry
99
from vllm.outputs import CompletionOutput, RequestOutput
1010
from vllm.sampling_params import SamplingParams

vllm/engine/async_llm_engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from vllm.config import ModelConfig
1111
from vllm.engine.arg_utils import AsyncEngineArgs
1212
from vllm.engine.llm_engine import LLMEngine
13-
from vllm.engine.ray_utils import initialize_ray_cluster, ray
13+
from vllm.executor.ray_utils import initialize_ray_cluster, ray
1414
from vllm.logger import init_logger
1515
from vllm.lora.request import LoRARequest
1616
from vllm.outputs import RequestOutput

vllm/engine/llm_engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
SequenceGroupOutputProcessor)
1616
from vllm.engine.output_processor.stop_checker import StopChecker
1717
from vllm.engine.output_processor.util import create_output_by_sequence_group
18-
from vllm.engine.ray_utils import initialize_ray_cluster
1918
from vllm.executor.executor_base import ExecutorBase
19+
from vllm.executor.ray_utils import initialize_ray_cluster
2020
from vllm.logger import init_logger
2121
from vllm.lora.request import LoRARequest
2222
from vllm.outputs import RequestOutput

vllm/executor/ray_gpu_executor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from itertools import islice, repeat
66
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple
77

8-
from vllm.engine.ray_utils import RayWorkerWrapper, ray
98
from vllm.executor.executor_base import ExecutorAsyncBase, ExecutorBase
9+
from vllm.executor.ray_utils import RayWorkerWrapper, ray
1010
from vllm.logger import init_logger
1111
from vllm.lora.request import LoRARequest
1212
from vllm.sequence import SamplerOutput, SequenceGroupMetadata
File renamed without changes.

vllm/transformers_utils/tokenizer_group/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import Optional
22

33
from vllm.config import TokenizerPoolConfig
4-
from vllm.engine.ray_utils import ray
4+
from vllm.executor.ray_utils import ray
55
from vllm.transformers_utils.tokenizer_group.base_tokenizer_group import (
66
BaseTokenizerGroup)
77
from vllm.transformers_utils.tokenizer_group.tokenizer_group import (

vllm/transformers_utils/tokenizer_group/ray_tokenizer_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from transformers import PreTrainedTokenizer
77

88
from vllm.config import TokenizerPoolConfig
9-
from vllm.engine.ray_utils import ray
9+
from vllm.executor.ray_utils import ray
1010
from vllm.lora.request import LoRARequest
1111
from vllm.transformers_utils.tokenizer_group.base_tokenizer_group import (
1212
BaseTokenizerGroup)

0 commit comments

Comments
 (0)