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
175bda67
Unverified
Commit
175bda67
authored
May 06, 2025
by
Aaron Pham
Committed by
GitHub
May 06, 2025
Browse files
[Feat] Add deprecated=True to CLI args (#17426)
Signed-off-by:
Aaron Pham
<
contact@aarnphm.xyz
>
parent
cba31c47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
2 deletions
+77
-2
vllm/engine/arg_utils.py
vllm/engine/arg_utils.py
+1
-0
vllm/utils.py
vllm/utils.py
+76
-2
No files found.
vllm/engine/arg_utils.py
View file @
175bda67
...
@@ -531,6 +531,7 @@ class EngineArgs:
...
@@ -531,6 +531,7 @@ class EngineArgs:
guided_decoding_group
.
add_argument
(
guided_decoding_group
.
add_argument
(
"--enable-reasoning"
,
"--enable-reasoning"
,
action
=
argparse
.
BooleanOptionalAction
,
action
=
argparse
.
BooleanOptionalAction
,
deprecated
=
True
,
help
=
"[DEPRECATED] The `--enable-reasoning` flag is deprecated as "
help
=
"[DEPRECATED] The `--enable-reasoning` flag is deprecated as "
"of v0.8.6. Use `--reasoning-parser` to specify the reasoning "
"of v0.8.6. Use `--reasoning-parser` to specify the reasoning "
"parser backend insteadThis flag (`--enable-reasoning`) will be "
"parser backend insteadThis flag (`--enable-reasoning`) will be "
...
...
vllm/utils.py
View file @
175bda67
...
@@ -33,7 +33,7 @@ import uuid
...
@@ -33,7 +33,7 @@ import uuid
import
warnings
import
warnings
import
weakref
import
weakref
from
argparse
import
(
Action
,
ArgumentDefaultsHelpFormatter
,
ArgumentParser
,
from
argparse
import
(
Action
,
ArgumentDefaultsHelpFormatter
,
ArgumentParser
,
ArgumentTypeError
)
ArgumentTypeError
,
_ArgumentGroup
)
from
asyncio
import
FIRST_COMPLETED
,
AbstractEventLoop
,
Task
from
asyncio
import
FIRST_COMPLETED
,
AbstractEventLoop
,
Task
from
collections
import
UserDict
,
defaultdict
from
collections
import
UserDict
,
defaultdict
from
collections.abc
import
(
AsyncGenerator
,
Awaitable
,
Generator
,
Hashable
,
from
collections.abc
import
(
AsyncGenerator
,
Awaitable
,
Generator
,
Hashable
,
...
@@ -41,6 +41,7 @@ from collections.abc import (AsyncGenerator, Awaitable, Generator, Hashable,
...
@@ -41,6 +41,7 @@ from collections.abc import (AsyncGenerator, Awaitable, Generator, Hashable,
from
concurrent.futures.process
import
ProcessPoolExecutor
from
concurrent.futures.process
import
ProcessPoolExecutor
from
dataclasses
import
dataclass
,
field
from
dataclasses
import
dataclass
,
field
from
functools
import
cache
,
lru_cache
,
partial
,
wraps
from
functools
import
cache
,
lru_cache
,
partial
,
wraps
from
gettext
import
gettext
as
_gettext
from
types
import
MappingProxyType
from
types
import
MappingProxyType
from
typing
import
(
TYPE_CHECKING
,
Any
,
Callable
,
Generic
,
Literal
,
NamedTuple
,
from
typing
import
(
TYPE_CHECKING
,
Any
,
Callable
,
Generic
,
Literal
,
NamedTuple
,
Optional
,
Sequence
,
Tuple
,
Type
,
TypeVar
,
Union
,
cast
,
Optional
,
Sequence
,
Tuple
,
Type
,
TypeVar
,
Union
,
cast
,
...
@@ -70,6 +71,8 @@ import vllm.triton_utils # noqa: F401
...
@@ -70,6 +71,8 @@ import vllm.triton_utils # noqa: F401
from
vllm.logger
import
enable_trace_function_call
,
init_logger
from
vllm.logger
import
enable_trace_function_call
,
init_logger
if
TYPE_CHECKING
:
if
TYPE_CHECKING
:
from
argparse
import
Namespace
from
vllm.config
import
ModelConfig
,
VllmConfig
from
vllm.config
import
ModelConfig
,
VllmConfig
logger
=
init_logger
(
__name__
)
logger
=
init_logger
(
__name__
)
...
@@ -1323,16 +1326,78 @@ class SortedHelpFormatter(ArgumentDefaultsHelpFormatter):
...
@@ -1323,16 +1326,78 @@ class SortedHelpFormatter(ArgumentDefaultsHelpFormatter):
super
().
add_arguments
(
actions
)
super
().
add_arguments
(
actions
)
class
_FlexibleArgumentGroup
(
_ArgumentGroup
):
def
__init__
(
self
,
parser
:
FlexibleArgumentParser
,
*
args
,
**
kwargs
):
self
.
_parser
=
parser
super
().
__init__
(
*
args
,
**
kwargs
)
def
add_argument
(
self
,
*
args
:
Any
,
**
kwargs
:
Any
):
if
sys
.
version_info
<
(
3
,
13
):
deprecated
=
kwargs
.
pop
(
'deprecated'
,
False
)
action
=
super
().
add_argument
(
*
args
,
**
kwargs
)
object
.
__setattr__
(
action
,
'deprecated'
,
deprecated
)
if
deprecated
and
action
.
dest
not
in
\
self
.
_parser
.
__class__
.
_deprecated
:
self
.
_parser
.
_deprecated
.
add
(
action
)
return
action
# python>3.13
return
super
().
add_argument
(
*
args
,
**
kwargs
)
class
FlexibleArgumentParser
(
ArgumentParser
):
class
FlexibleArgumentParser
(
ArgumentParser
):
"""ArgumentParser that allows both underscore and dash in names."""
"""ArgumentParser that allows both underscore and dash in names."""
_deprecated
:
set
[
Action
]
=
set
()
_seen
:
set
[
str
]
=
set
()
def
__init__
(
self
,
*
args
,
**
kwargs
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
# Set the default 'formatter_class' to SortedHelpFormatter
# Set the default 'formatter_class' to SortedHelpFormatter
if
'formatter_class'
not
in
kwargs
:
if
'formatter_class'
not
in
kwargs
:
kwargs
[
'formatter_class'
]
=
SortedHelpFormatter
kwargs
[
'formatter_class'
]
=
SortedHelpFormatter
super
().
__init__
(
*
args
,
**
kwargs
)
super
().
__init__
(
*
args
,
**
kwargs
)
def
parse_args
(
self
,
args
=
None
,
namespace
=
None
):
if
sys
.
version_info
<
(
3
,
13
):
def
parse_known_args
(
# type: ignore[override]
self
,
args
:
Sequence
[
str
]
|
None
=
None
,
namespace
:
Namespace
|
None
=
None
,
)
->
tuple
[
Namespace
|
None
,
list
[
str
]]:
namespace
,
args
=
super
().
parse_known_args
(
args
,
namespace
)
for
action
in
FlexibleArgumentParser
.
_deprecated
:
if
action
.
dest
not
in
FlexibleArgumentParser
.
_seen
and
getattr
(
namespace
,
action
.
dest
,
None
)
!=
action
.
default
:
# noqa: E501
self
.
_warning
(
_gettext
(
"argument '%(argument_name)s' is deprecated"
)
%
{
'argument_name'
:
action
.
dest
})
FlexibleArgumentParser
.
_seen
.
add
(
action
.
dest
)
return
namespace
,
args
def
add_argument
(
self
,
*
args
:
Any
,
**
kwargs
:
Any
):
# add a deprecated=True compatibility
# for python < 3.13
deprecated
=
kwargs
.
pop
(
'deprecated'
,
False
)
action
=
super
().
add_argument
(
*
args
,
**
kwargs
)
object
.
__setattr__
(
action
,
'deprecated'
,
deprecated
)
if
deprecated
and
\
action
not
in
FlexibleArgumentParser
.
_deprecated
:
self
.
_deprecated
.
add
(
action
)
return
action
def
_warning
(
self
,
message
:
str
):
self
.
_print_message
(
_gettext
(
'warning: %(message)s
\n
'
)
%
{
'message'
:
message
},
sys
.
stderr
)
def
parse_args
(
# type: ignore[override]
self
,
args
:
list
[
str
]
|
None
=
None
,
namespace
:
Namespace
|
None
=
None
,
):
if
args
is
None
:
if
args
is
None
:
args
=
sys
.
argv
[
1
:]
args
=
sys
.
argv
[
1
:]
...
@@ -1503,6 +1568,15 @@ class FlexibleArgumentParser(ArgumentParser):
...
@@ -1503,6 +1568,15 @@ class FlexibleArgumentParser(ArgumentParser):
return
processed_args
return
processed_args
def
add_argument_group
(
self
,
*
args
:
Any
,
**
kwargs
:
Any
,
)
->
_FlexibleArgumentGroup
:
group
=
_FlexibleArgumentGroup
(
self
,
self
,
*
args
,
**
kwargs
)
self
.
_action_groups
.
append
(
group
)
return
group
async
def
_run_task_with_lock
(
task
:
Callable
,
lock
:
asyncio
.
Lock
,
*
args
,
async
def
_run_task_with_lock
(
task
:
Callable
,
lock
:
asyncio
.
Lock
,
*
args
,
**
kwargs
):
**
kwargs
):
...
...
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