vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

swap bar orders

Browse source
This commit is contained in:
Christian Zhou-Zheng 2024-06-10 07:58:17 -04:00
parent 4550826871
commit efa06098a6
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gguf-py/gguf/gguf_writer.py
View file

@ -370,15 +370,14 @@ class GGUFWriter:
total_bytes = sum(ti.nbytes for t in self.tensors for ti in t.values()) total_bytes = sum(ti.nbytes for t in self.tensors for ti in t.values())
bar = tqdm(desc="Writing", total=total_bytes, unit="byte", unit_scale=True)
if len(self.fout) > 1: if len(self.fout) > 1:
shard_bar = tqdm(desc=f"Shard (0/{len(self.fout)})", total=None, unit="byte", unit_scale=True) shard_bar = tqdm(desc=f"Shard (0/{len(self.fout)})", total=None, unit="byte", unit_scale=True)
bar = tqdm(desc="Writing", total=total_bytes, unit="byte", unit_scale=True)
for i, (fout, tensors) in enumerate(zip(self.fout, self.tensors)): for i, (fout, tensors) in enumerate(zip(self.fout, self.tensors)):
if shard_bar is not None: if shard_bar is not None:
shard_bar.set_description(f"Shard ({i + 1}/{len(self.fout)})") shard_bar.set_description(f"Shard ({i + 1}/{len(self.fout)})")
total = sum(ti.nbytes for ti in tensors.values()) total = sum(ti.nbytes for ti in tensors.values())
# bar behaves weirdly when total is 0
shard_bar.reset(total=(total if total > 0 else None)) shard_bar.reset(total=(total if total > 0 else None))
# relying on the fact that Python dicts preserve insertion order (since 3.7) # relying on the fact that Python dicts preserve insertion order (since 3.7)
@ -386,10 +385,10 @@ class GGUFWriter:
assert ti.tensor is not None # can only iterate once over the tensors assert ti.tensor is not None # can only iterate once over the tensors
assert ti.tensor.nbytes == ti.nbytes assert ti.tensor.nbytes == ti.nbytes
ti.tensor.tofile(fout) ti.tensor.tofile(fout)
if bar is not None:
bar.update(ti.nbytes)
if shard_bar is not None: if shard_bar is not None:
shard_bar.update(ti.nbytes) shard_bar.update(ti.nbytes)
if bar is not None:
bar.update(ti.nbytes)
self.write_padding(fout, ti.nbytes) self.write_padding(fout, ti.nbytes)
ti.tensor = None ti.tensor = None
else: else: