ggml-opt: remove workarounds for dynamic tensors

ggerganov · Nov 18, 2024 · cb26686 · cb26686
1 parent 3ad0dd2
commit cb26686
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/ggml-opt.cpp b/src/ggml-opt.cpp
@@ -419,8 +419,6 @@ ggml_opt_context_t ggml_opt_init(struct ggml_opt_params params) {
         result->buf_static = ggml_backend_alloc_ctx_tensors(result->ctx_static, ggml_backend_sched_get_backend(result->backend_sched, 0));
         result->buf_static_cpu = nullptr;
 
-        ggml_opt_alloc_graph(result, result->gf);
-
         return result;
     }
 
@@ -434,7 +432,6 @@ ggml_opt_context_t ggml_opt_init(struct ggml_opt_params params) {
         result->buf_static = ggml_backend_alloc_ctx_tensors(result->ctx_static, ggml_backend_sched_get_backend(result->backend_sched, 0));
         result->buf_static_cpu = nullptr;
 
-        ggml_opt_alloc_graph(result, result->gb_grad);
         ggml_graph_reset(result->gb_grad);
 
         return result;
@@ -466,7 +463,6 @@ ggml_opt_context_t ggml_opt_init(struct ggml_opt_params params) {
 
     result->buf_static_cpu = ggml_backend_alloc_ctx_tensors_from_buft(result->ctx_static_cpu, ggml_backend_cpu_buffer_type());
 
-    ggml_opt_alloc_graph(result, result->gb_opt);
     ggml_graph_reset(result->gb_opt);
 
     return result;

diff --git a/src/ggml.c b/src/ggml.c
@@ -5839,12 +5839,8 @@ void ggml_graph_reset(struct ggml_cgraph * cgraph) {
 
         if (node->op == GGML_OP_OPT_STEP_ADAMW) {
             // clear momenta
-            if (node->src[2]->data) {
-                ggml_set_zero(node->src[2]);
-            }
-            if (node->src[3]->data) {
-                ggml_set_zero(node->src[3]);
-            }
+            ggml_set_zero(node->src[2]);
+            ggml_set_zero(node->src[3]);
         }
 
         // initial gradients of loss should be 1, 0 otherwise