remane USE_CANN_GRAPH to USE_ACL_GRAPH

Signed-off-by: noemotiovon <[email protected]>

Author: noemotiovon

ggml/src/ggml-cann/CMakeLists.txt

@@ -31,12 +31,12 @@ string(REGEX MATCH "[0-9]+[a-zA-Z]" SOC_TYPE_MAJOR_SN "${SOC_VERSION}")
 set(SOC_TYPE_COMPILE_OPTION "ASCEND_${SOC_TYPE_MAJOR_SN}")
 string(TOUPPER ${SOC_TYPE_COMPILE_OPTION} SOC_TYPE_COMPILE_OPTION)
 message(STATUS "CANN: SOC_VERSION =  ${SOC_VERSION}")
-option(CANN_GRAPH "Enable CANN graph execution (ACL graph mode)" OFF)
+option(USE_ACL_GRAPH "Enable CANN graph execution (ACL graph mode)" OFF)
 
-if(CANN_GRAPH AND (SOC_TYPE_MAJOR_SN STREQUAL "310P" OR SOC_TYPE_COMPILE_OPTION STREQUAL "ASCEND_310P"))
+if(USE_ACL_GRAPH AND (SOC_TYPE_MAJOR_SN STREQUAL "310P" OR SOC_TYPE_COMPILE_OPTION STREQUAL "ASCEND_310P"))
     message(FATAL_ERROR
         "CANN Graph (ACL graph mode) is not supported on 310P devices. "
-        "Please build with -DCANN_GRAPH=OFF or use a supported SOC.")
+        "Please build with -DUSE_ACL_GRAPH=OFF or use a supported SOC.")
 endif()
 
 if (CANN_INSTALL_DIR)
@@ -75,11 +75,11 @@ if (CANN_INSTALL_DIR)
 
     target_compile_definitions(ggml-cann PRIVATE "-D${SOC_TYPE_COMPILE_OPTION}")
 
-    if (CANN_GRAPH)
-        target_compile_definitions(ggml-cann PRIVATE CANN_GRAPH)
-        message(STATUS "CANN: CANN_GRAPH is enabled.")
+    if (USE_ACL_GRAPH)
+        target_compile_definitions(ggml-cann PRIVATE USE_ACL_GRAPH)
+        message(STATUS "CANN: USE_ACL_GRAPH is enabled.")
     else()
-        message(STATUS "CANN: CANN_GRAPH is disabled.")
+        message(STATUS "CANN: USE_ACL_GRAPH is disabled.")
     endif()
 
     message(STATUS "CANN: CANN_INCLUDE_DIRS =  ${CANN_INCLUDE_DIRS}")

ggml/src/ggml-cann/common.h

@@ -337,7 +337,7 @@ class cann_task_queue {
     int32_t device_;
 };
 
-#ifdef CANN_GRAPH
+#ifdef USE_ACL_GRAPH
 struct ggml_graph_node_properties {
     void * node_address;
     ggml_op node_op;
@@ -358,7 +358,7 @@ struct ggml_cann_graph {
 
     std::vector<ggml_graph_node_properties> ggml_graph_properties;
 };
-#endif  // CANN_GRAPH
+#endif  // USE_ACL_GRAPH
 
 /**
  * @brief Context for managing CANN backend operations.
@@ -368,7 +368,7 @@ struct ggml_backend_cann_context {
     std::string name;                /**< Name of the device. */
     std::string description;         /**< Description of the device. */
     aclrtEvent copy_event = nullptr; /**< Event for managing copy operations. */
-#ifdef CANN_GRAPH
+#ifdef USE_ACL_GRAPH
     /// Cached CANN ACL graph used for executing the current ggml computation graph.
     std::unique_ptr<ggml_cann_graph> cann_graph; 
 #endif

ggml/src/ggml-cann/ggml-cann.cpp

@@ -2075,7 +2075,7 @@ static void ggml_backend_cann_synchronize(ggml_backend_t backend) {
     ACL_CHECK(aclrtSynchronizeStream(cann_ctx->stream()));
 }
 
-#ifdef CANN_GRAPH
+#ifdef USE_ACL_GRAPH
 /**
  * @brief Populate the internal CANN graph node properties from the ggml computation graph.
  *
@@ -2171,7 +2171,7 @@ static bool is_cann_graph_update_required(ggml_backend_cann_context * cann_ctx,
     }
     return false;
 }
-#endif  // CANN_GRAPH
+#endif  // USE_ACL_GRAPH
 
 /**
  * @brief Evaluate the computation graph and optionally capture or execute it using CANN graph API.
@@ -2188,15 +2188,15 @@ static bool is_cann_graph_update_required(ggml_backend_cann_context * cann_ctx,
  */
 static void evaluate_and_capture_cann_graph(ggml_backend_cann_context * cann_ctx, ggml_cgraph * cgraph,
     bool & use_cann_graph, bool & cann_graph_update_required) {
-#ifdef CANN_GRAPH
+#ifdef USE_ACL_GRAPH
     if (use_cann_graph && cann_graph_update_required) {
         if (cann_ctx->cann_graph->graph != nullptr) {
             ACL_CHECK(aclmdlRIDestroy(cann_ctx->cann_graph->graph));
             cann_ctx->cann_graph->graph = nullptr;
         }
         ACL_CHECK(aclmdlRICaptureBegin(cann_ctx->stream(), ACL_MODEL_RI_CAPTURE_MODE_GLOBAL));
     }
-#endif // CANN_GRAPH
+#endif // USE_ACL_GRAPH
 
     // Only perform the graph execution if CANN graphs are not enabled, or we are capturing the graph.
     // With the use of CANN graphs, the execution will be performed by the graph launch.
@@ -2216,7 +2216,7 @@ static void evaluate_and_capture_cann_graph(ggml_backend_cann_context * cann_ctx
         }
     }
 
-#ifdef CANN_GRAPH
+#ifdef USE_ACL_GRAPH
     if (use_cann_graph && cann_graph_update_required) { // End CANN graph capture
         ACL_CHECK(aclmdlRICaptureEnd(cann_ctx->stream(), &cann_ctx->cann_graph->graph));
     }
@@ -2225,7 +2225,7 @@ static void evaluate_and_capture_cann_graph(ggml_backend_cann_context * cann_ctx
         // Execute graph
         ACL_CHECK(aclmdlRIExecuteAsync(cann_ctx->cann_graph->graph, cann_ctx->stream()));
     }
-#endif
+#endif // USE_ACL_GRAPH
 }
 
 
@@ -2247,7 +2247,7 @@ static enum ggml_status ggml_backend_cann_graph_compute(
         (ggml_backend_cann_context*)backend->context;
     ggml_cann_set_device(cann_ctx->device);
     release_nz_workspace();
-#ifdef CANN_GRAPH
+#ifdef USE_ACL_GRAPH
     bool use_cann_graph = true;
     bool cann_graph_update_required = false;
 
@@ -2268,7 +2268,7 @@ static enum ggml_status ggml_backend_cann_graph_compute(
 #else
     bool use_cann_graph = false;
     bool cann_graph_update_required = false;
-#endif  // CANN_GRAPH
+#endif  // USE_ACL_GRAPH
 
     evaluate_and_capture_cann_graph(
         cann_ctx,