Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenDAS
vllm_cscc
Commits
ad0d567e
Unverified
Commit
ad0d567e
authored
Jan 03, 2025
by
Robert Shaw
Committed by
GitHub
Jan 03, 2025
Browse files
[V1] Chore: cruft removal (#11724)
parent
bf0d97d7
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
11 deletions
+0
-11
vllm/entrypoints/llm.py
vllm/entrypoints/llm.py
+0
-2
vllm/v1/engine/core_client.py
vllm/v1/engine/core_client.py
+0
-2
vllm/v1/engine/llm_engine.py
vllm/v1/engine/llm_engine.py
+0
-4
vllm/v1/engine/processor.py
vllm/v1/engine/processor.py
+0
-3
No files found.
vllm/entrypoints/llm.py
View file @
ad0d567e
...
@@ -225,8 +225,6 @@ class LLM:
...
@@ -225,8 +225,6 @@ class LLM:
# Logic to switch between engines is done at runtime instead of import
# Logic to switch between engines is done at runtime instead of import
# to avoid import order issues
# to avoid import order issues
self
.
engine_class
=
self
.
get_engine_class
()
self
.
engine_class
=
self
.
get_engine_class
()
# TODO(rob): enable mp by default (issue with fork vs spawn)
self
.
llm_engine
=
self
.
engine_class
.
from_engine_args
(
self
.
llm_engine
=
self
.
engine_class
.
from_engine_args
(
engine_args
,
usage_context
=
UsageContext
.
LLM_CLASS
)
engine_args
,
usage_context
=
UsageContext
.
LLM_CLASS
)
...
...
vllm/v1/engine/core_client.py
View file @
ad0d567e
...
@@ -94,8 +94,6 @@ class InprocClient(EngineCoreClient):
...
@@ -94,8 +94,6 @@ class InprocClient(EngineCoreClient):
* pushes EngineCoreRequest directly into the EngineCore
* pushes EngineCoreRequest directly into the EngineCore
* pulls EngineCoreOutputs by stepping the EngineCore
* pulls EngineCoreOutputs by stepping the EngineCore
TODO: support asyncio-mode for debugging.
"""
"""
def
__init__
(
self
,
*
args
,
**
kwargs
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
...
...
vllm/v1/engine/llm_engine.py
View file @
ad0d567e
...
@@ -42,8 +42,6 @@ class LLMEngine:
...
@@ -42,8 +42,6 @@ class LLMEngine:
use_cached_outputs
:
bool
=
False
,
use_cached_outputs
:
bool
=
False
,
multiprocess_mode
:
bool
=
False
,
multiprocess_mode
:
bool
=
False
,
)
->
None
:
)
->
None
:
# TODO: Can we avoid this?
self
.
model_config
=
vllm_config
.
model_config
self
.
model_config
=
vllm_config
.
model_config
# Tokenizer (+ ensure liveness if running in another process).
# Tokenizer (+ ensure liveness if running in another process).
...
@@ -179,8 +177,6 @@ class LLMEngine:
...
@@ -179,8 +177,6 @@ class LLMEngine:
return
request_outputs
return
request_outputs
# TODO(rob): Can we get rid of these?
def
get_model_config
(
self
):
def
get_model_config
(
self
):
return
self
.
model_config
return
self
.
model_config
...
...
vllm/v1/engine/processor.py
View file @
ad0d567e
...
@@ -49,9 +49,6 @@ class Processor:
...
@@ -49,9 +49,6 @@ class Processor:
cache_config
.
enable_prefix_caching
cache_config
.
enable_prefix_caching
self
.
mm_hasher
=
MMHasher
()
self
.
mm_hasher
=
MMHasher
()
# TODO: run in an ThreadpoolExecutor or BackgroundProcess.
# This ideally should releases the GIL, so we should not block the
# asyncio loop while this is running.
def
process_inputs
(
def
process_inputs
(
self
,
self
,
request_id
:
str
,
request_id
:
str
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment