Scheduled removal of override_pooler_config and disable_log_requests (#29402)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
This commit is contained in:
@@ -29,7 +29,7 @@ import regex as re
|
||||
import torch
|
||||
from pydantic import TypeAdapter, ValidationError
|
||||
from pydantic.fields import FieldInfo
|
||||
from typing_extensions import TypeIs, deprecated
|
||||
from typing_extensions import TypeIs
|
||||
|
||||
import vllm.envs as envs
|
||||
from vllm.attention.backends.registry import AttentionBackendEnum
|
||||
@@ -520,9 +520,6 @@ class EngineArgs:
|
||||
scheduler_cls: str | type[object] | None = SchedulerConfig.scheduler_cls
|
||||
|
||||
pooler_config: PoolerConfig | None = ModelConfig.pooler_config
|
||||
override_pooler_config: dict | PoolerConfig | None = (
|
||||
ModelConfig.override_pooler_config
|
||||
)
|
||||
compilation_config: CompilationConfig = get_field(VllmConfig, "compilation_config")
|
||||
worker_cls: str = ParallelConfig.worker_cls
|
||||
worker_extension_cls: str = ParallelConfig.worker_extension_cls
|
||||
@@ -659,11 +656,6 @@ class EngineArgs:
|
||||
)
|
||||
model_group.add_argument("--hf-overrides", **model_kwargs["hf_overrides"])
|
||||
model_group.add_argument("--pooler-config", **model_kwargs["pooler_config"])
|
||||
model_group.add_argument(
|
||||
"--override-pooler-config",
|
||||
**model_kwargs["override_pooler_config"],
|
||||
deprecated=True,
|
||||
)
|
||||
model_group.add_argument(
|
||||
"--logits-processor-pattern", **model_kwargs["logits_processor_pattern"]
|
||||
)
|
||||
@@ -1243,7 +1235,6 @@ class EngineArgs:
|
||||
mm_encoder_tp_mode=self.mm_encoder_tp_mode,
|
||||
mm_encoder_attn_backend=self.mm_encoder_attn_backend,
|
||||
pooler_config=self.pooler_config,
|
||||
override_pooler_config=self.override_pooler_config,
|
||||
logits_processor_pattern=self.logits_processor_pattern,
|
||||
generation_config=self.generation_config,
|
||||
override_generation_config=self.override_generation_config,
|
||||
@@ -2047,24 +2038,6 @@ class AsyncEngineArgs(EngineArgs):
|
||||
|
||||
enable_log_requests: bool = False
|
||||
|
||||
@property
|
||||
@deprecated(
|
||||
"`disable_log_requests` is deprecated and has been replaced with "
|
||||
"`enable_log_requests`. This will be removed in v0.12.0. Please use "
|
||||
"`enable_log_requests` instead."
|
||||
)
|
||||
def disable_log_requests(self) -> bool:
|
||||
return not self.enable_log_requests
|
||||
|
||||
@disable_log_requests.setter
|
||||
@deprecated(
|
||||
"`disable_log_requests` is deprecated and has been replaced with "
|
||||
"`enable_log_requests`. This will be removed in v0.12.0. Please use "
|
||||
"`enable_log_requests` instead."
|
||||
)
|
||||
def disable_log_requests(self, value: bool):
|
||||
self.enable_log_requests = not value
|
||||
|
||||
@staticmethod
|
||||
def add_cli_args(
|
||||
parser: FlexibleArgumentParser, async_args_only: bool = False
|
||||
|
||||
Reference in New Issue
Block a user