Unverified Commit 754b699c authored by Jon Gill's avatar Jon Gill Committed by GitHub
Browse files

[Bug]: Fix S3 model/tokenizer path resolution (#18083)


Signed-off-by: default avatarJon Gill <jon@yurts.ai>
parent 6e27c6d8
...@@ -611,28 +611,35 @@ class ModelConfig: ...@@ -611,28 +611,35 @@ class ModelConfig:
def maybe_pull_model_tokenizer_for_s3(self, model: str, def maybe_pull_model_tokenizer_for_s3(self, model: str,
tokenizer: str) -> None: tokenizer: str) -> None:
"""Pull model/tokenizer from S3 to temporary directory when needed.
Args:
model: Model name or path
tokenizer: Tokenizer name or path
""" """
Pull the model config or tokenizer to a temporary if not (is_s3(model) or is_s3(tokenizer)):
directory in case of S3. return
Args: if is_s3(model):
model: The model name or path. s3_model = S3Model()
tokenizer: The tokenizer name or path. s3_model.pull_files(model,
allow_pattern=["*.model", "*.py", "*.json"])
self.model_weights = model
self.model = s3_model.dir
""" # If tokenizer is same as model, download to same directory
if is_s3(model) or is_s3(tokenizer): if model == tokenizer:
if is_s3(model):
s3_model = S3Model()
s3_model.pull_files( s3_model.pull_files(
model, allow_pattern=["*.model", "*.py", "*.json"])
self.model_weights = self.model
self.model = s3_model.dir
if is_s3(tokenizer):
s3_tokenizer = S3Model()
s3_tokenizer.pull_files(
model, ignore_pattern=["*.pt", "*.safetensors", "*.bin"]) model, ignore_pattern=["*.pt", "*.safetensors", "*.bin"])
self.tokenizer = s3_tokenizer.dir self.tokenizer = s3_model.dir
return
# Only download tokenizer if needed and not already handled
if is_s3(tokenizer):
s3_tokenizer = S3Model()
s3_tokenizer.pull_files(
model, ignore_pattern=["*.pt", "*.safetensors", "*.bin"])
self.tokenizer = s3_tokenizer.dir
def _init_multimodal_config(self) -> Optional["MultiModalConfig"]: def _init_multimodal_config(self) -> Optional["MultiModalConfig"]:
if self.registry.is_multimodal_model(self.architectures): if self.registry.is_multimodal_model(self.architectures):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment