From 5ad397d6104cf21156c8cf9730c81e74e5c413a9 Mon Sep 17 00:00:00 2001 From: Christian Zhou-Zheng Date: Wed, 5 Jun 2024 13:49:20 -0400 Subject: [PATCH] reduce diffs with master --- convert-hf-to-gguf.py | 5 ++--- gguf-py/gguf/gguf_manager.py | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/convert-hf-to-gguf.py b/convert-hf-to-gguf.py index d12373c41..b4399f680 100644 --- a/convert-hf-to-gguf.py +++ b/convert-hf-to-gguf.py @@ -77,10 +77,8 @@ class Model: self.lazy = not eager self.part_names = Model.get_model_part_names(self.dir_model, ".safetensors") self.is_safetensors = len(self.part_names) > 0 - if not self.is_safetensors: self.part_names = Model.get_model_part_names(self.dir_model, ".bin") - self.hparams = Model.load_hparams(self.dir_model) self.block_count = self.find_hparam(["n_layers", "num_hidden_layers", "n_layer"]) self.tensor_map = gguf.get_tensor_name_map(self.model_arch, self.block_count) @@ -331,7 +329,7 @@ class Model: self.write_tensors() self.gguf_writer.write_header_to_file() self.gguf_writer.write_kv_data_to_file() - self.gguf_writer.write_tensors_to_file() + self.gguf_writer.write_tensors_to_file(progress=True) self.gguf_writer.close() def write_vocab(self): @@ -1568,6 +1566,7 @@ class MiniCPMModel(Model): return [(self.map_tensor_name(name), data_torch)] + @Model.register("QWenLMHeadModel") class QwenModel(Model): model_arch = gguf.MODEL_ARCH.QWEN diff --git a/gguf-py/gguf/gguf_manager.py b/gguf-py/gguf/gguf_manager.py index 002d13877..2605b816a 100644 --- a/gguf-py/gguf/gguf_manager.py +++ b/gguf-py/gguf/gguf_manager.py @@ -125,6 +125,7 @@ class SplitStrategy(deque): num /= 1024.0 return f"{num:.1f}T - over 1TB, --split recommended" + class GGUFManager(GGUFWriter): kv_data: KVTempData tensors: list[TensorTempData] @@ -204,7 +205,7 @@ class GGUFManager(GGUFWriter): self.state = WriterState.KV_DATA - def write_tensors_to_file(self) -> None: + def write_tensors_to_file(self, progress: bool = False) -> None: if self.split_arguments.dry_run: return @@ -227,7 +228,7 @@ class GGUFManager(GGUFWriter): # need to write everything down here writer.write_header_to_file() writer.write_kv_data_to_file() - writer.write_tensors_to_file(progress=True) + writer.write_tensors_to_file(progress=progress) del tensors self.state = WriterState.TI_DATA