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
27ec3c78
Unverified
Commit
27ec3c78
authored
Sep 24, 2025
by
Isotr0py
Committed by
GitHub
Sep 24, 2025
Browse files
[CI/Build] Fix v1 OOT registration test (#25547)
Signed-off-by:
Isotr0py
<
mozf@mail2.sysu.edu.cn
>
parent
1cbcfb94
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
21 deletions
+20
-21
tests/conftest.py
tests/conftest.py
+2
-2
tests/models/test_oot_registration.py
tests/models/test_oot_registration.py
+0
-2
vllm/model_executor/models/registry.py
vllm/model_executor/models/registry.py
+18
-17
No files found.
tests/conftest.py
View file @
27ec3c78
...
...
@@ -1079,7 +1079,7 @@ def dummy_llava_path():
local_dir
=
_dummy_llava_path
,
ignore_patterns
=
[
"*.bin"
,
"*.bin.index.json"
,
"*.pt"
,
"*.h5"
,
"*.msgpack"
"*.msgpack"
,
"*.safetensors"
])
assert
os
.
path
.
exists
(
json_path
)
with
open
(
json_path
)
as
f
:
...
...
@@ -1098,7 +1098,7 @@ def dummy_gemma2_embedding_path():
local_dir
=
_dummy_gemma2_embedding_path
,
ignore_patterns
=
[
"*.bin"
,
"*.bin.index.json"
,
"*.pt"
,
"*.h5"
,
"*.msgpack"
"*.msgpack"
,
"*.safetensors"
])
assert
os
.
path
.
exists
(
json_path
)
with
open
(
json_path
)
as
f
:
...
...
tests/models/test_oot_registration.py
View file @
27ec3c78
...
...
@@ -42,7 +42,6 @@ def test_oot_registration_text_generation(
assert
rest
==
""
@
pytest
.
mark
.
skip
(
reason
=
"This test is skipped because it failed on V1."
)
@
create_new_process_for_each_test
()
def
test_oot_registration_embedding
(
monkeypatch
:
pytest
.
MonkeyPatch
,
...
...
@@ -63,7 +62,6 @@ def test_oot_registration_embedding(
image
=
convert_image_mode
(
ImageAsset
(
"cherry_blossom"
).
pil_image
,
"RGB"
)
@
pytest
.
mark
.
skip
(
reason
=
"This test is skipped because it failed on V1."
)
@
create_new_process_for_each_test
()
def
test_oot_registration_multimodal
(
monkeypatch
:
pytest
.
MonkeyPatch
,
...
...
vllm/model_executor/models/registry.py
View file @
27ec3c78
...
...
@@ -483,23 +483,23 @@ class _LazyRegisteredModel(_BaseRegisteredModel):
def
inspect_model_cls
(
self
)
->
_ModelInfo
:
model_path
=
Path
(
__file__
).
parent
/
f
"
{
self
.
module_name
.
split
(
'.'
)[
-
1
]
}
.py"
module_hash
=
None
assert
model_path
.
exists
(),
\
f
"Model
{
self
.
module_name
}
expected to be on path
{
model_path
}
"
with
open
(
model_path
,
"rb"
)
as
f
:
module_hash
=
hashlib
.
md5
(
f
.
read
()).
hexdigest
()
mi
=
self
.
_load_modelinfo_from_cache
(
module_hash
)
if
mi
is
not
None
:
logger
.
debug
((
"Loaded model info "
"for class %s.%s from cache"
),
self
.
module_name
,
self
.
class_name
)
return
mi
else
:
logger
.
debug
((
"Cache model info "
"for class %s.%s miss. "
"Loading model instead."
),
self
.
module_name
,
self
.
class_name
)
if
model_path
.
exists
():
with
open
(
model_path
,
"rb"
)
as
f
:
module_hash
=
hashlib
.
md5
(
f
.
read
()).
hexdigest
()
mi
=
self
.
_load_modelinfo_from_cache
(
module_hash
)
if
mi
is
not
None
:
logger
.
debug
((
"Loaded model info "
"for class %s.%s from cache"
),
self
.
module_name
,
self
.
class_name
)
return
mi
else
:
logger
.
debug
((
"Cache model info "
"for class %s.%s miss. "
"Loading model instead."
),
self
.
module_name
,
self
.
class_name
)
# Performed in another process to avoid initializing CUDA
mi
=
_run_in_subprocess
(
...
...
@@ -508,7 +508,8 @@ class _LazyRegisteredModel(_BaseRegisteredModel):
self
.
class_name
)
# save cache file
self
.
_save_modelinfo_to_cache
(
mi
,
module_hash
)
if
module_hash
is
not
None
:
self
.
_save_modelinfo_to_cache
(
mi
,
module_hash
)
return
mi
...
...
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