From beae4b94231c48a42881c9f23ac11af12e1bbfe1 Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:08:41 -0500 Subject: [PATCH] revert --- frigate/embeddings/functions/onnx.py | 32 +++++++++++----------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/frigate/embeddings/functions/onnx.py b/frigate/embeddings/functions/onnx.py index c82b605170..454fe3faf4 100644 --- a/frigate/embeddings/functions/onnx.py +++ b/frigate/embeddings/functions/onnx.py @@ -119,27 +119,21 @@ def _load_model_and_tokenizer(self): ) def _load_tokenizer(self): - if not self.tokenizer: - tokenizer_path = os.path.join( - f"{MODEL_CACHE_DIR}/{self.model_name}/tokenizer" - ) - self.tokenizer = AutoTokenizer.from_pretrained( - self.model_name, - cache_dir=tokenizer_path, - trust_remote_code=True, - clean_up_tokenization_spaces=True, - ) + tokenizer_path = os.path.join(f"{MODEL_CACHE_DIR}/{self.model_name}/tokenizer") + return AutoTokenizer.from_pretrained( + self.model_name, + cache_dir=tokenizer_path, + trust_remote_code=True, + clean_up_tokenization_spaces=True, + ) def _load_feature_extractor(self): - if not self.feature_extractor: - feature_extractor_path = os.path.join( - f"{MODEL_CACHE_DIR}/{self.model_name}/feature_extractor" - ) - self.feature_extractor = AutoFeatureExtractor.from_pretrained( - self.model_name, - trust_remote_code=True, - cache_dir=feature_extractor_path, - ) + feature_extractor_path = os.path.join( + f"{MODEL_CACHE_DIR}/{self.model_name}/feature_extractor" + ) + return AutoFeatureExtractor.from_pretrained( + self.model_name, trust_remote_code=True, cache_dir=feature_extractor_path + ) def _load_model(self, path: str, providers: List[str]): if os.path.exists(path):