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
66b809cc
Commit
66b809cc
authored
Feb 08, 2025
by
zhuwenwen
Browse files
Merge tag 'v0.7.2' into v0.7.2-dev
parents
37b63c24
0408efc6
Changes
1000
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
40 additions
and
2 deletions
+40
-2
vllm/engine/output_processor/single_step.py
vllm/engine/output_processor/single_step.py
+2
-0
vllm/engine/output_processor/stop_checker.py
vllm/engine/output_processor/stop_checker.py
+2
-0
vllm/engine/output_processor/util.py
vllm/engine/output_processor/util.py
+2
-0
vllm/engine/protocol.py
vllm/engine/protocol.py
+2
-0
vllm/entrypoints/api_server.py
vllm/entrypoints/api_server.py
+1
-0
vllm/entrypoints/chat_utils.py
vllm/entrypoints/chat_utils.py
+4
-2
vllm/entrypoints/launcher.py
vllm/entrypoints/launcher.py
+2
-0
vllm/entrypoints/llm.py
vllm/entrypoints/llm.py
+2
-0
vllm/entrypoints/logger.py
vllm/entrypoints/logger.py
+2
-0
vllm/entrypoints/openai/api_server.py
vllm/entrypoints/openai/api_server.py
+2
-0
vllm/entrypoints/openai/cli_args.py
vllm/entrypoints/openai/cli_args.py
+1
-0
vllm/entrypoints/openai/logits_processors.py
vllm/entrypoints/openai/logits_processors.py
+2
-0
vllm/entrypoints/openai/protocol.py
vllm/entrypoints/openai/protocol.py
+2
-0
vllm/entrypoints/openai/reasoning_parsers/__init__.py
vllm/entrypoints/openai/reasoning_parsers/__init__.py
+2
-0
vllm/entrypoints/openai/reasoning_parsers/abs_reasoning_parsers.py
...ypoints/openai/reasoning_parsers/abs_reasoning_parsers.py
+2
-0
vllm/entrypoints/openai/reasoning_parsers/deepseek_r1_reasoning_parser.py
.../openai/reasoning_parsers/deepseek_r1_reasoning_parser.py
+2
-0
vllm/entrypoints/openai/run_batch.py
vllm/entrypoints/openai/run_batch.py
+2
-0
vllm/entrypoints/openai/serving_chat.py
vllm/entrypoints/openai/serving_chat.py
+2
-0
vllm/entrypoints/openai/serving_completion.py
vllm/entrypoints/openai/serving_completion.py
+2
-0
vllm/entrypoints/openai/serving_embedding.py
vllm/entrypoints/openai/serving_embedding.py
+2
-0
No files found.
Too many changes to show.
To preserve performance only
1000 of 1000+
files are displayed.
Plain diff
Email patch
vllm/engine/output_processor/single_step.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
from
typing
import
List
from
vllm.config
import
SchedulerConfig
...
...
vllm/engine/output_processor/stop_checker.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
from
typing
import
Callable
,
List
,
Optional
,
Tuple
from
vllm.lora.request
import
LoRARequest
...
...
vllm/engine/output_processor/util.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
from
typing
import
List
from
typing
import
Sequence
as
GenericSequence
from
typing
import
cast
...
...
vllm/engine/protocol.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
from
abc
import
ABC
,
abstractmethod
from
typing
import
AsyncGenerator
,
List
,
Mapping
,
Optional
...
...
vllm/entrypoints/api_server.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
"""
NOTE: This API server is used only for demonstrating usage of AsyncEngine
and simple performance benchmarks. It is not intended for production use.
...
...
vllm/entrypoints/chat_utils.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
import
codecs
import
json
...
...
@@ -408,7 +410,7 @@ class BaseMultiModalItemTracker(ABC, Generic[_T]):
return
"<image>"
if
model_type
==
"mllama"
:
return
"<|image|>"
if
model_type
==
"qwen2_vl"
:
if
model_type
in
(
"qwen2_vl"
,
"qwen2_5_vl"
)
:
return
"<|vision_start|><|image_pad|><|vision_end|>"
if
model_type
==
"molmo"
:
return
""
...
...
@@ -428,7 +430,7 @@ class BaseMultiModalItemTracker(ABC, Generic[_T]):
return
"(<audio>./</audio>)"
raise
TypeError
(
f
"Unknown model type:
{
model_type
}
"
)
elif
modality
==
"video"
:
if
model_type
==
"qwen2_vl"
:
if
model_type
in
(
"qwen2_vl"
,
"qwen2_5_vl"
)
:
return
"<|vision_start|><|video_pad|><|vision_end|>"
if
model_type
in
(
"minicpmo"
,
"minicpmv"
):
return
"(<video>./</video>)"
...
...
vllm/entrypoints/launcher.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
import
signal
from
http
import
HTTPStatus
...
...
vllm/entrypoints/llm.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
itertools
import
warnings
from
contextlib
import
contextmanager
...
...
vllm/entrypoints/logger.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
from
typing
import
List
,
Optional
,
Union
from
vllm.logger
import
init_logger
...
...
vllm/entrypoints/openai/api_server.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
import
atexit
import
gc
...
...
vllm/entrypoints/openai/cli_args.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
"""
This file contains the command line arguments for the vLLM's
OpenAI-compatible server. It is kept in a separate file for documentation
...
...
vllm/entrypoints/openai/logits_processors.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
from
functools
import
lru_cache
,
partial
from
typing
import
Dict
,
FrozenSet
,
Iterable
,
List
,
Optional
,
Union
...
...
vllm/entrypoints/openai/protocol.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
# Adapted from
# https://github.com/lm-sys/FastChat/blob/168ccc29d3f7edc50823016105c024fe2282732a/fastchat/protocol/openai_api_protocol.py
import
re
...
...
vllm/entrypoints/openai/reasoning_parsers/__init__.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
from
.abs_reasoning_parsers
import
ReasoningParser
,
ReasoningParserManager
from
.deepseek_r1_reasoning_parser
import
DeepSeekR1ReasoningParser
...
...
vllm/entrypoints/openai/reasoning_parsers/abs_reasoning_parsers.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
os
from
functools
import
cached_property
from
typing
import
Callable
,
Dict
,
List
,
Optional
,
Sequence
,
Tuple
,
Type
,
Union
...
...
vllm/entrypoints/openai/reasoning_parsers/deepseek_r1_reasoning_parser.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
re
from
typing
import
Optional
,
Sequence
,
Tuple
,
Union
...
...
vllm/entrypoints/openai/run_batch.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
from
http
import
HTTPStatus
from
io
import
StringIO
...
...
vllm/entrypoints/openai/serving_chat.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
import
json
import
time
...
...
vllm/entrypoints/openai/serving_completion.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
import
time
from
typing
import
AsyncGenerator
,
AsyncIterator
,
Dict
,
List
,
Optional
...
...
vllm/entrypoints/openai/serving_embedding.py
View file @
66b809cc
# SPDX-License-Identifier: Apache-2.0
import
asyncio
import
base64
import
time
...
...
Prev
1
…
27
28
29
30
31
32
33
34
35
…
50
Next
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