Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
norm
vllm
Commits
7e108113
Unverified
Commit
7e108113
authored
Jan 18, 2024
by
Nikola Borisov
Committed by
GitHub
Jan 18, 2024
Browse files
Don't download both safetensor and bin files. (#2480)
parent
18473cf4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
3 deletions
+16
-3
vllm/model_executor/weight_utils.py
vllm/model_executor/weight_utils.py
+16
-3
No files found.
vllm/model_executor/weight_utils.py
View file @
7e108113
"""Utilities for downloading and initializing model weights."""
"""Utilities for downloading and initializing model weights."""
import
filelock
import
filelock
import
glob
import
glob
import
fnmatch
import
json
import
json
import
os
import
os
from
collections
import
defaultdict
from
collections
import
defaultdict
from
typing
import
Any
,
Iterator
,
List
,
Optional
,
Tuple
from
typing
import
Any
,
Iterator
,
List
,
Optional
,
Tuple
from
huggingface_hub
import
snapshot_download
from
huggingface_hub
import
snapshot_download
,
HfFileSystem
import
numpy
as
np
import
numpy
as
np
from
safetensors.torch
import
load_file
,
save_file
,
safe_open
from
safetensors.torch
import
load_file
,
save_file
,
safe_open
import
torch
import
torch
...
@@ -149,6 +150,20 @@ def prepare_hf_model_weights(
...
@@ -149,6 +150,20 @@ def prepare_hf_model_weights(
allow_patterns
+=
[
"*.pt"
]
allow_patterns
+=
[
"*.pt"
]
if
not
is_local
:
if
not
is_local
:
# Before we download we look at that is available:
fs
=
HfFileSystem
()
file_list
=
fs
.
ls
(
model_name_or_path
,
detail
=
False
,
revision
=
revision
)
# depending on what is available we download different things
for
pattern
in
allow_patterns
:
matching
=
fnmatch
.
filter
(
file_list
,
pattern
)
if
len
(
matching
)
>
0
:
allow_patterns
=
[
pattern
]
if
pattern
==
"*.safetensors"
:
use_safetensors
=
True
break
logger
.
info
(
f
"Downloading model weights
{
allow_patterns
}
"
)
# Use file lock to prevent multiple processes from
# Use file lock to prevent multiple processes from
# downloading the same model weights at the same time.
# downloading the same model weights at the same time.
with
get_lock
(
model_name_or_path
,
cache_dir
):
with
get_lock
(
model_name_or_path
,
cache_dir
):
...
@@ -163,8 +178,6 @@ def prepare_hf_model_weights(
...
@@ -163,8 +178,6 @@ def prepare_hf_model_weights(
for
pattern
in
allow_patterns
:
for
pattern
in
allow_patterns
:
hf_weights_files
+=
glob
.
glob
(
os
.
path
.
join
(
hf_folder
,
pattern
))
hf_weights_files
+=
glob
.
glob
(
os
.
path
.
join
(
hf_folder
,
pattern
))
if
len
(
hf_weights_files
)
>
0
:
if
len
(
hf_weights_files
)
>
0
:
if
pattern
==
"*.safetensors"
:
use_safetensors
=
True
break
break
if
not
use_safetensors
:
if
not
use_safetensors
:
# Exclude files that are not needed for inference.
# Exclude files that are not needed for inference.
...
...
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