From c18d6a23ff66c44723dc400df008c85d4151d517 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Fri, 24 Oct 2025 17:55:36 +0800 Subject: [PATCH] revert for mistral common fix merge --- convert_hf_to_gguf.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/convert_hf_to_gguf.py b/convert_hf_to_gguf.py index 54ff7cdac..ed99dc847 100755 --- a/convert_hf_to_gguf.py +++ b/convert_hf_to_gguf.py @@ -29,15 +29,12 @@ if 'NO_LOCAL_GGUF' not in os.environ: sys.path.insert(1, str(Path(__file__).parent / 'gguf-py')) import gguf from gguf.vocab import MistralTokenizerType, MistralVocab -try: - from mistral_common.tokens.tokenizers.base import TokenizerVersion - from mistral_common.tokens.tokenizers.multimodal import DATASET_MEAN, DATASET_STD - from mistral_common.tokens.tokenizers.tekken import Tekkenizer - from mistral_common.tokens.tokenizers.sentencepiece import ( - SentencePieceTokenizer, - ) -except Exception: - print("Warning: No Mistral Common Installed. You cannot convert Mistral models.") +from mistral_common.tokens.tokenizers.base import TokenizerVersion +from mistral_common.tokens.tokenizers.multimodal import DATASET_MEAN, DATASET_STD +from mistral_common.tokens.tokenizers.tekken import Tekkenizer +from mistral_common.tokens.tokenizers.sentencepiece import ( + SentencePieceTokenizer, +) logger = logging.getLogger("hf-to-gguf") @@ -1366,13 +1363,11 @@ class MmprojModel(ModelBase): self.gguf_writer.add_vision_head_count(self.find_vparam(["num_attention_heads"])) # preprocessor config - # image_mean = DATASET_MEAN if self.is_mistral_format else self.preprocessor_config["image_mean"] - # image_std = DATASET_STD if self.is_mistral_format else self.preprocessor_config["image_std"] + image_mean = DATASET_MEAN if self.is_mistral_format else self.preprocessor_config["image_mean"] + image_std = DATASET_STD if self.is_mistral_format else self.preprocessor_config["image_std"] - # self.gguf_writer.add_vision_image_mean(image_mean) - # self.gguf_writer.add_vision_image_std(image_std) - self.gguf_writer.add_vision_image_mean(self.preprocessor_config["image_mean"]) - self.gguf_writer.add_vision_image_std(self.preprocessor_config["image_std"]) + self.gguf_writer.add_vision_image_mean(image_mean) + self.gguf_writer.add_vision_image_std(image_std) if self.has_audio_encoder: self.gguf_writer.add_clip_has_audio_encoder(True)