Răsfoiți Sursa

CANN: Define `cann_graph_update_required` before macro (#17434)

**Description of the problem**

`cann_graph_update_required` is redundantly defined and
initialized as `false` inside two mutually exclusive macro branches.

**Proposed solution**

Define it right before the macro so that it could serve both
branches.
Raul Torres 1 lună în urmă
părinte
comite
01ad35e6d6
1 a modificat fișierele cu 1 adăugiri și 2 ștergeri
  1. 1 2
      ggml/src/ggml-cann/ggml-cann.cpp

+ 1 - 2
ggml/src/ggml-cann/ggml-cann.cpp

@@ -2303,9 +2303,9 @@ static enum ggml_status ggml_backend_cann_graph_compute(ggml_backend_t backend,
     // calculate rope cache for fist layer in current device.
     // calculate rope cache for fist layer in current device.
     cann_ctx->rope_cache.cached = false;
     cann_ctx->rope_cache.cached = false;
 
 
+    bool cann_graph_update_required = false;
 #ifdef USE_ACL_GRAPH
 #ifdef USE_ACL_GRAPH
     bool use_cann_graph             = true;
     bool use_cann_graph             = true;
-    bool cann_graph_update_required = false;
 
 
     static bool prefill_use_graph = parse_bool(get_env("GGML_CANN_PREFILL_USE_GRAPH").value_or(""));
     static bool prefill_use_graph = parse_bool(get_env("GGML_CANN_PREFILL_USE_GRAPH").value_or(""));
     if (!prefill_use_graph) {
     if (!prefill_use_graph) {
@@ -2336,7 +2336,6 @@ static enum ggml_status ggml_backend_cann_graph_compute(ggml_backend_t backend,
     }
     }
 #else
 #else
     bool use_cann_graph             = false;
     bool use_cann_graph             = false;
-    bool cann_graph_update_required = false;
 #endif  // USE_ACL_GRAPH
 #endif  // USE_ACL_GRAPH
     evaluate_and_capture_cann_graph(cann_ctx, cgraph, use_cann_graph, cann_graph_update_required);
     evaluate_and_capture_cann_graph(cann_ctx, cgraph, use_cann_graph, cann_graph_update_required);