fix: get_processor fails when --tokenizer-path lacks model config.json (#25643)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: ronnie_zheng <zl19940307@163.com>
This commit is contained in:
co-authored by
github-actions[bot]
ronnie_zheng
parent
92b42c8d8a
commit
799584e173
@@ -688,6 +688,7 @@ class Scheduler(
|
|||||||
revision=server_args.revision,
|
revision=server_args.revision,
|
||||||
use_fast=not server_args.disable_fast_image_processor,
|
use_fast=not server_args.disable_fast_image_processor,
|
||||||
tokenizer_backend=server_args.tokenizer_backend,
|
tokenizer_backend=server_args.tokenizer_backend,
|
||||||
|
model_name=server_args.model_path,
|
||||||
)
|
)
|
||||||
self.tokenizer = get_tokenizer_from_processor(self.processor)
|
self.tokenizer = get_tokenizer_from_processor(self.processor)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -3015,6 +3015,7 @@ def _get_processor_wrapper(server_args):
|
|||||||
revision=server_args.revision,
|
revision=server_args.revision,
|
||||||
use_fast=not server_args.disable_fast_image_processor,
|
use_fast=not server_args.disable_fast_image_processor,
|
||||||
tokenizer_backend=server_args.tokenizer_backend,
|
tokenizer_backend=server_args.tokenizer_backend,
|
||||||
|
model_name=server_args.model_path,
|
||||||
)
|
)
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
error_message = str(e)
|
error_message = str(e)
|
||||||
@@ -3029,6 +3030,7 @@ def _get_processor_wrapper(server_args):
|
|||||||
revision=server_args.revision,
|
revision=server_args.revision,
|
||||||
use_fast=True,
|
use_fast=True,
|
||||||
tokenizer_backend=server_args.tokenizer_backend,
|
tokenizer_backend=server_args.tokenizer_backend,
|
||||||
|
model_name=server_args.model_path,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
raise e
|
raise e
|
||||||
|
|||||||
@@ -276,6 +276,7 @@ class TpModelWorker(BaseTpWorker):
|
|||||||
trust_remote_code=server_args.trust_remote_code,
|
trust_remote_code=server_args.trust_remote_code,
|
||||||
revision=server_args.revision,
|
revision=server_args.revision,
|
||||||
tokenizer_backend=server_args.tokenizer_backend,
|
tokenizer_backend=server_args.tokenizer_backend,
|
||||||
|
model_name=server_args.model_path,
|
||||||
)
|
)
|
||||||
self.tokenizer = get_tokenizer_from_processor(self.processor)
|
self.tokenizer = get_tokenizer_from_processor(self.processor)
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -143,6 +143,7 @@ def get_processor(
|
|||||||
tokenizer_revision: Optional[str] = None,
|
tokenizer_revision: Optional[str] = None,
|
||||||
use_fast: Optional[bool] = True,
|
use_fast: Optional[bool] = True,
|
||||||
tokenizer_backend: str = "huggingface",
|
tokenizer_backend: str = "huggingface",
|
||||||
|
model_name: Optional[str] = None,
|
||||||
**kwargs,
|
**kwargs,
|
||||||
):
|
):
|
||||||
if tokenizer_backend == "fastokens":
|
if tokenizer_backend == "fastokens":
|
||||||
@@ -159,6 +160,13 @@ def get_processor(
|
|||||||
trust_remote_code=trust_remote_code,
|
trust_remote_code=trust_remote_code,
|
||||||
revision=revision,
|
revision=revision,
|
||||||
)
|
)
|
||||||
|
elif model_name is not None:
|
||||||
|
config = AutoConfig.from_pretrained(
|
||||||
|
model_name,
|
||||||
|
trust_remote_code=trust_remote_code,
|
||||||
|
revision=revision,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
config = AutoConfig.from_pretrained(
|
config = AutoConfig.from_pretrained(
|
||||||
tokenizer_name,
|
tokenizer_name,
|
||||||
|
|||||||
Reference in New Issue
Block a user