ggml : add ggml_get_tensor_by_name()

Author: ggerganov

examples/mnist/main.cpp

@@ -193,6 +193,7 @@ int mnist_eval(
 
     // soft max
     ggml_tensor * probs = ggml_soft_max(ctx0, fc2);
+    ggml_set_name(probs, "probs");
 
     // build / export / run the computation graph
     ggml_build_forward_expand(&gf, probs);
@@ -201,25 +202,27 @@ int mnist_eval(
     //ggml_graph_print   (&gf);
     ggml_graph_dump_dot(&gf, NULL, "mnist.dot");
 
+    ggml_graph_export(&gf, "mnist.ggml");
+
+#if 0
     const float * probs_data = ggml_get_data_f32(probs);
 
     const int prediction = std::max_element(probs_data, probs_data + 10) - probs_data;
+#else
+    struct ggml_context * ctx_data = NULL;
+    struct ggml_context * ctx_eval = NULL;
 
-    ggml_free(ctx0);
+    struct ggml_cgraph gfi = ggml_graph_import("mnist.ggml", &ctx_data, &ctx_eval);
+    gfi.n_threads = n_threads;
 
-    ggml_graph_export(&gf, "mnist.ggml");
+    ggml_graph_compute(ctx0, &gfi);
 
-    // TMP
-    // import the computation graph
-    {
-        struct ggml_context * ctx_data = NULL;
-        struct ggml_context * ctx_eval = NULL;
+    const float * probs_data = ggml_get_data_f32(ggml_get_tensor_by_name(&gfi, "probs"));
 
-        struct ggml_cgraph gfi = ggml_graph_import("mnist.ggml", &ctx_data, &ctx_eval);
-        gfi.n_threads = n_threads;
+    const int prediction = std::max_element(probs_data, probs_data + 10) - probs_data;
+#endif
 
-        ggml_graph_compute(ctx0, &gfi);
-    }
+    ggml_free(ctx0);
 
     return prediction;
 }

include/ggml/ggml.h

@@ -978,6 +978,8 @@ extern "C" {
     GGML_API void ggml_graph_compute(struct ggml_context * ctx, struct ggml_cgraph * cgraph);
     GGML_API void ggml_graph_reset  (struct ggml_cgraph * cgraph);
 
+    GGML_API struct ggml_tensor * ggml_get_tensor_by_name(struct ggml_cgraph * cgraph, const char * name);
+
     // print info and performance information for the graph
     GGML_API void ggml_graph_print(const struct ggml_cgraph * cgraph);
 

src/ggml.c

@@ -14526,6 +14526,18 @@ void ggml_graph_reset(struct ggml_cgraph * cgraph) {
     }
 }
 
+struct ggml_tensor * ggml_get_tensor_by_name(struct ggml_cgraph * cgraph, const char * name) {
+    for (int i = 0; i < cgraph->n_nodes; i++) {
+        struct ggml_tensor * node = cgraph->nodes[i];
+
+        if (strcmp(node->name, name) == 0) {
+            return node;
+        }
+    }
+
+    return NULL;
+}
+
 void ggml_graph_print(const struct ggml_cgraph * cgraph) {
     int64_t perf_total_per_op_us[GGML_OP_COUNT] = {0};