fix progeress bar

leejet · leejet · commit 94ab11fabaa6 · 2025-09-14T22:40:52.000+08:00
diff --git a/lora.hpp b/lora.hpp
@@ -147,7 +147,7 @@ struct LoraModel : public GGMLRunner {
                 }
             } else {
                 const std::string& name = tensor_storage.name;
-                auto iter = lora_tensors.find(name);
+                auto iter               = lora_tensors.find(name);
                 if (iter != lora_tensors.end()) {
                     *dst_tensor = iter->second;
                 }
diff --git a/model.cpp b/model.cpp
@@ -2264,7 +2264,8 @@ bool ModelLoader::load_tensors(on_new_tensor_cb_t on_new_tensor_cb, int n_thread
             if (current_idx >= file_tensors.size() || failed) {
                 break;
             }
-            pretty_progress(total_tensors_processed + current_idx, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f);
+            size_t curr_num = total_tensors_processed + current_idx;
+            pretty_progress(curr_num, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f / (curr_num + 1e-6f));
             std::this_thread::sleep_for(std::chrono::milliseconds(200));
         }
 
@@ -2277,11 +2278,10 @@ bool ModelLoader::load_tensors(on_new_tensor_cb_t on_new_tensor_cb, int n_thread
             break;
         }
         total_tensors_processed += file_tensors.size();
-    }
-
-    pretty_progress(total_tensors_processed, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f);
-    if (total_tensors_to_process > 0) {
-        printf("\n");
+        pretty_progress(total_tensors_processed, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f / (total_tensors_processed + 1e-6f));
+        if (total_tensors_processed < total_tensors_to_process) {
+            printf("\n");
+        }
     }
 
     int64_t end_time = ggml_time_ms();

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ struct LoraModel : public GGMLRunner {`
`147`	`147`	`}`
`148`	`148`	`} else {`
`149`	`149`	`const std::string& name = tensor_storage.name;`
`150`		`- auto iter = lora_tensors.find(name);`
	`150`	`+ auto iter = lora_tensors.find(name);`
`151`	`151`	`if (iter != lora_tensors.end()) {`
`152`	`152`	`*dst_tensor = iter->second;`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2264,7 +2264,8 @@ bool ModelLoader::load_tensors(on_new_tensor_cb_t on_new_tensor_cb, int n_thread`
`2264`	`2264`	`if (current_idx >= file_tensors.size() \|\| failed) {`
`2265`	`2265`	`break;`
`2266`	`2266`	`}`
`2267`		`- pretty_progress(total_tensors_processed + current_idx, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f);`
	`2267`	`+ size_t curr_num = total_tensors_processed + current_idx;`
	`2268`	`+ pretty_progress(curr_num, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f / (curr_num + 1e-6f));`
`2268`	`2269`	`std::this_thread::sleep_for(std::chrono::milliseconds(200));`
`2269`	`2270`	`}`
`2270`	`2271`
`@@ -2277,11 +2278,10 @@ bool ModelLoader::load_tensors(on_new_tensor_cb_t on_new_tensor_cb, int n_thread`
`2277`	`2278`	`break;`
`2278`	`2279`	`}`
`2279`	`2280`	`total_tensors_processed += file_tensors.size();`
`2280`		`- }`
`2281`		`-`
`2282`		`- pretty_progress(total_tensors_processed, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f);`
`2283`		`- if (total_tensors_to_process > 0) {`
`2284`		`- printf("\n");`
	`2281`	`+ pretty_progress(total_tensors_processed, total_tensors_to_process, (ggml_time_ms() - t_start) / 1000.0f / (total_tensors_processed + 1e-6f));`
	`2282`	`+ if (total_tensors_processed < total_tensors_to_process) {`
	`2283`	`+ printf("\n");`
	`2284`	`+ }`
`2285`	`2285`	`}`
`2286`	`2286`
`2287`	`2287`	`int64_t end_time = ggml_time_ms();`