[auto] Sync version 2304231820.0.0+llamacpp-release.master-ec9cdb6

KerfuffleV2 · Apr 23, 2023 · f8cafc3 · f8cafc3
1 parent 1609461
commit f8cafc3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ggml-sys-bleedingedge"
-version = "2304231232.0.0+llamacpp-release.master-53c8434"
+version = "2304231820.0.0+llamacpp-release.master-ec9cdb6"
 description = "Bleeding edge low-level bindings to GGML. "
 repository = "https://github.com/KerfuffleV2/ggml-bleeding-edge"
 keywords = ["deep-learning", "machine-learning", "tensors", "ggml", "ml"]

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-2304231232.0.0+llamacpp-release.master-53c8434
+2304231820.0.0+llamacpp-release.master-ec9cdb6
diff --git a/ggml-src/ggml.c b/ggml-src/ggml.c
@@ -11237,9 +11237,9 @@ void ggml_graph_print(const struct ggml_cgraph * cgraph) {
     for (int i = 0; i < cgraph->n_nodes; i++) {
         struct ggml_tensor * node = cgraph->nodes[i];
 
-        perf_total_per_op_us[node->op] += node->perf_time_us;
+        perf_total_per_op_us[node->op] += MAX(1, node->perf_time_us);
 
-        GGML_PRINT(" - %3d: [ %" PRId64 ", %" PRId64 ", %" PRId64 "] %16s %s (%3d) cpu = %7.3f / %7.3f ms, wall = %7.3f / %7.3f ms\n",
+        GGML_PRINT(" - %3d: [ %5" PRId64 ", %5" PRId64 ", %5" PRId64 "] %16s %s (%3d) cpu = %7.3f / %7.3f ms, wall = %7.3f / %7.3f ms\n",
                 i,
                 node->ne[0], node->ne[1], node->ne[2],
                 GGML_OP_LABEL[node->op], node->is_param ? "x" : node->grad ? "g" : " ", node->perf_runs,
@@ -11253,13 +11253,17 @@ void ggml_graph_print(const struct ggml_cgraph * cgraph) {
     for (int i = 0; i < cgraph->n_leafs; i++) {
         struct ggml_tensor * node = cgraph->leafs[i];
 
-        GGML_PRINT(" - %3d: [ %" PRId64 ", %" PRId64 "] %8s\n",
+        GGML_PRINT(" - %3d: [ %5" PRId64 ", %5" PRId64 "] %8s\n",
                 i,
                 node->ne[0], node->ne[1],
                 GGML_OP_LABEL[node->op]);
     }
 
     for (int i = 0; i < GGML_OP_COUNT; i++) {
+        if (perf_total_per_op_us[i] == 0) {
+            continue;
+        }
+
         GGML_PRINT("perf_total_per_op_us[%16s] = %7.3f ms\n", GGML_OP_LABEL[i], (double) perf_total_per_op_us[i] / 1000.0);
     }
 

diff --git a/ggml-tag-current.txt b/ggml-tag-current.txt
@@ -1 +1 @@
-master-53c8434
+master-ec9cdb6
diff --git a/ggml-tag-previous.txt b/ggml-tag-previous.txt
@@ -1 +1 @@
-master-c9e2c26
+master-53c8434
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2304231232.0.0+llamacpp-release.master-53c8434
		2304231820.0.0+llamacpp-release.master-ec9cdb6