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
f98a4920
Unverified
Commit
f98a4920
authored
Mar 31, 2025
by
Mark McLoughlin
Committed by
GitHub
Mar 31, 2025
Browse files
[V1][Core] Remove unused speculative config from scheduler (#15818)
Signed-off-by:
Mark McLoughlin
<
markmc@redhat.com
>
parent
d4bfc23e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
6 deletions
+1
-6
tests/v1/core/test_scheduler.py
tests/v1/core/test_scheduler.py
+0
-1
vllm/v1/core/sched/scheduler.py
vllm/v1/core/sched/scheduler.py
+1
-4
vllm/v1/engine/core.py
vllm/v1/engine/core.py
+0
-1
No files found.
tests/v1/core/test_scheduler.py
View file @
f98a4920
...
@@ -71,7 +71,6 @@ def create_scheduler(
...
@@ -71,7 +71,6 @@ def create_scheduler(
scheduler_config
,
scheduler_config
,
model_config
,
model_config
,
cache_config
,
cache_config
,
speculative_config
=
None
,
lora_config
=
None
,
lora_config
=
None
,
log_stats
=
True
,
log_stats
=
True
,
structured_output_manager
=
StructuredOutputManager
(
vllm_config
),
structured_output_manager
=
StructuredOutputManager
(
vllm_config
),
...
...
vllm/v1/core/sched/scheduler.py
View file @
f98a4920
...
@@ -7,8 +7,7 @@ from collections import deque
...
@@ -7,8 +7,7 @@ from collections import deque
from
collections.abc
import
Iterable
from
collections.abc
import
Iterable
from
typing
import
Optional
,
Union
from
typing
import
Optional
,
Union
from
vllm.config
import
(
CacheConfig
,
LoRAConfig
,
ModelConfig
,
SchedulerConfig
,
from
vllm.config
import
CacheConfig
,
LoRAConfig
,
ModelConfig
,
SchedulerConfig
SpeculativeConfig
)
from
vllm.logger
import
init_logger
from
vllm.logger
import
init_logger
from
vllm.multimodal
import
MULTIMODAL_REGISTRY
,
MultiModalRegistry
from
vllm.multimodal
import
MULTIMODAL_REGISTRY
,
MultiModalRegistry
from
vllm.v1.core.encoder_cache_manager
import
(
EncoderCacheManager
,
from
vllm.v1.core.encoder_cache_manager
import
(
EncoderCacheManager
,
...
@@ -36,7 +35,6 @@ class Scheduler(SchedulerInterface):
...
@@ -36,7 +35,6 @@ class Scheduler(SchedulerInterface):
model_config
:
ModelConfig
,
model_config
:
ModelConfig
,
cache_config
:
CacheConfig
,
cache_config
:
CacheConfig
,
lora_config
:
Optional
[
LoRAConfig
],
lora_config
:
Optional
[
LoRAConfig
],
speculative_config
:
Optional
[
SpeculativeConfig
],
structured_output_manager
:
StructuredOutputManager
,
structured_output_manager
:
StructuredOutputManager
,
mm_registry
:
MultiModalRegistry
=
MULTIMODAL_REGISTRY
,
mm_registry
:
MultiModalRegistry
=
MULTIMODAL_REGISTRY
,
include_finished_set
:
bool
=
False
,
include_finished_set
:
bool
=
False
,
...
@@ -45,7 +43,6 @@ class Scheduler(SchedulerInterface):
...
@@ -45,7 +43,6 @@ class Scheduler(SchedulerInterface):
self
.
scheduler_config
=
scheduler_config
self
.
scheduler_config
=
scheduler_config
self
.
cache_config
=
cache_config
self
.
cache_config
=
cache_config
self
.
lora_config
=
lora_config
self
.
lora_config
=
lora_config
self
.
speculative_config
=
speculative_config
self
.
log_stats
=
log_stats
self
.
log_stats
=
log_stats
self
.
structured_output_manager
=
structured_output_manager
self
.
structured_output_manager
=
structured_output_manager
...
...
vllm/v1/engine/core.py
View file @
f98a4920
...
@@ -95,7 +95,6 @@ class EngineCore:
...
@@ -95,7 +95,6 @@ class EngineCore:
model_config
=
vllm_config
.
model_config
,
model_config
=
vllm_config
.
model_config
,
cache_config
=
vllm_config
.
cache_config
,
cache_config
=
vllm_config
.
cache_config
,
lora_config
=
vllm_config
.
lora_config
,
lora_config
=
vllm_config
.
lora_config
,
speculative_config
=
vllm_config
.
speculative_config
,
include_finished_set
=
vllm_config
.
parallel_config
.
data_parallel_size
include_finished_set
=
vllm_config
.
parallel_config
.
data_parallel_size
>
1
,
>
1
,
log_stats
=
self
.
log_stats
,
log_stats
=
self
.
log_stats
,
...
...
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