Adjust the GGML_CANN_ASYNC_MODE setting to accept yes, enable, 1, or on (case-insensitive) as valid options.

Author: bachelor-dou

ggml/src/ggml-cann/common.h

@@ -37,6 +37,7 @@
 #include <thread>
 #include <unistd.h>
 #include <functional>
+#include <set>
 
 #include "../include/ggml-cann.h"
 #include "../include/ggml.h"
@@ -103,6 +104,8 @@ const ggml_cann_device_info& ggml_cann_info();
 void ggml_cann_set_device(int32_t device);
 int32_t ggml_cann_get_device();
 
+static std::string to_lower_case(const char* env_var);
+
 /**
  * @brief Abstract base class for memory pools used by CANN.
  */
@@ -354,7 +357,10 @@ struct ggml_backend_cann_context {
         : device(device), name("CANN" + std::to_string(device)), task_queue(1024, device) {
         ggml_cann_set_device(device);
         description = aclrtGetSocName();
-        async_mode = (getenv("GGML_CANN_ASYNC_MODE") != nullptr);
+
+        std::string value = to_lower_case(getenv("GGML_CANN_ASYNC_MODE"));
+        std::set<std::string> valid_values = {"on", "1", "yes", "enable"};
+        async_mode = valid_values.find(value) != valid_values.end();
         GGML_LOG_INFO("%s: device %d async operator submission is %s\n", __func__,
             device, async_mode ? "ON" : "OFF");
     }

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

@@ -92,6 +92,18 @@ int32_t ggml_cann_get_device() {
     return id;
 }
 
+/**
+ * @brief Convert the value obtained from getenv to a lowercase std::string.
+ *
+ * @param env_var C-style string(char*)
+ * @return A string of type std::stringD.
+ */
+static std::string to_lower_case(const char* env_var){
+    std::string mem_pool_type(env_var ? env_var : "");
+    std::transform(mem_pool_type.begin(), mem_pool_type.end(), mem_pool_type.begin(), ::tolower);
+    return mem_pool_type;
+}
+
 /**
  * @brief Initialize the CANN device information.
  *
@@ -731,8 +743,7 @@ struct ggml_cann_pool_vmm : public ggml_cann_pool {
 std::unique_ptr<ggml_cann_pool> ggml_backend_cann_context::new_pool_for_device(
     int device) {
     const char* env_var = getenv("GGML_CANN_MEM_POOL");
-    std::string mem_pool_type(env_var ? env_var : "");
-    std::transform(mem_pool_type.begin(), mem_pool_type.end(), mem_pool_type.begin(), ::tolower);
+    std::string mem_pool_type = to_lower_case(env_var);
 
     if (mem_pool_type == "prio") {
         GGML_LOG_INFO("%s: device %d use buffer pool with priority queue\n", __func__, device);