add static ggml_graph_compute_sugar()

Author: mqy

ggml.c

@@ -17272,7 +17272,6 @@ void ggml_graph_compute(struct ggml_graph_compute_plan * plan, struct ggml_cgrap
                 GGML_ASSERT(plan->n_tasks[i] > 0);
             }
         }
-
     }
 
     const int n_threads = plan->n_threads;
@@ -17339,6 +17338,20 @@ void ggml_graph_compute(struct ggml_graph_compute_plan * plan, struct ggml_cgrap
     }
 }
 
+static void ggml_graph_compute_sugar(struct ggml_cgraph * cgraph, int n_threads) {
+    struct ggml_graph_compute_plan plan = ggml_graph_compute_make_plan(cgraph, n_threads);
+    if (plan.work_size > 0) {
+        plan.work_data = malloc(plan.work_size);
+        GGML_ASSERT(plan.work_data);
+    }
+
+    ggml_graph_compute(&plan, cgraph);
+
+    if (plan.work_data) {
+        free(plan.work_data);
+    }
+}
+
 void ggml_graph_reset(struct ggml_cgraph * cgraph) {
     for (int i = 0; i < cgraph->n_nodes; i++) {
         struct ggml_tensor * grad = cgraph->grads[i];
@@ -18193,17 +18206,7 @@ static enum ggml_opt_result ggml_opt_adam(
     ggml_graph_reset  (gf);
     ggml_set_f32      (f->grad, 1.0f);
 
-    {
-        struct ggml_graph_compute_plan plan = ggml_graph_compute_make_plan(gb, params.n_threads);
-        if (plan.work_size > 0) {
-            plan.work_data = malloc(plan.work_size);
-            GGML_ASSERT(plan.work_data);
-        }
-        ggml_graph_compute(&plan, gb);
-        if (plan.work_data) {
-            free(plan.work_data);
-        }
-    }
+    ggml_graph_compute_sugar(gb, params.n_threads);
 
     opt->adam.fx_prev = ggml_get_f32_1d(f, 0);
     opt->adam.fx_best = opt->adam.fx_prev;
@@ -18284,17 +18287,7 @@ static enum ggml_opt_result ggml_opt_adam(
         ggml_graph_reset  (gf);
         ggml_set_f32      (f->grad, 1.0f);
 
-        {
-            struct ggml_graph_compute_plan plan = ggml_graph_compute_make_plan(gb, params.n_threads);
-            if (plan.work_size > 0) {
-                plan.work_data = malloc(plan.work_size);
-                GGML_ASSERT(plan.work_data);
-            }
-            ggml_graph_compute(&plan, gb);
-            if (plan.work_data) {
-                free(plan.work_data);
-            }
-        }
+        ggml_graph_compute_sugar(gb, params.n_threads);
 
         const float fx = ggml_get_f32_1d(f, 0);
 
@@ -18416,17 +18409,7 @@ static enum ggml_opt_result linesearch_backtracking(
             ggml_graph_reset  (gf);
             ggml_set_f32      (f->grad, 1.0f);
 
-            {
-                struct ggml_graph_compute_plan plan = ggml_graph_compute_make_plan(gb, params->n_threads);
-                if (plan.work_size > 0) {
-                    plan.work_data = malloc(plan.work_size);
-                    GGML_ASSERT(plan.work_data);
-                }
-                ggml_graph_compute(&plan, gb);
-                if (plan.work_data) {
-                    free(plan.work_data);
-                }
-            }
+            ggml_graph_compute_sugar(gb, params->n_threads);
 
             ggml_opt_get_grad(np, ps, g);
 
@@ -18545,17 +18528,8 @@ static enum ggml_opt_result ggml_opt_lbfgs(
 
         ggml_graph_reset  (gf);
         ggml_set_f32      (f->grad, 1.0f);
-        {
-            struct ggml_graph_compute_plan plan = ggml_graph_compute_make_plan(gb, params.n_threads);
-            if (plan.work_size > 0) {
-                plan.work_data = malloc(plan.work_size);
-                GGML_ASSERT(plan.work_data);
-            }
-            ggml_graph_compute(&plan, gb);
-            if (plan.work_data) {
-                free(plan.work_data);
-            }
-        }
+
+        ggml_graph_compute_sugar(gb, params.n_threads);
 
         ggml_opt_get_grad(np, ps, g);