split ggml-cann to multi files

hipudding · Mar 28, 2024 · 65a4236 · 65a4236
1 parent 9e5a764
commit 65a4236
Show file tree

Hide file tree

Showing 10 changed files with 894 additions and 838 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -846,7 +846,8 @@ if (LLAMA_CANN)
             message(STATUS "CANN: CANN_INCLUDE_DIRS =  ${CANN_INCLUDE_DIRS}")
             message(STATUS "CANN: CANN_LIBRARIES =  ${CANN_LIBRARIES}")
             set(GGML_HEADERS_CANN ggml-cann.h)
-            set(GGML_SOURCES_CANN ggml-cann.cpp)
+            file(GLOB GGML_SOURCES_CUDA "ggml-cann/*.cpp")
+            list(APPEND GGML_SOURCES_CANN "ggml-cann.cpp")
             set(LLAMA_EXTRA_LIBS     ${LLAMA_EXTRA_LIBS}     ${CANN_LIBRARIES})
             set(LLAMA_EXTRA_INCLUDES ${LLAMA_EXTRA_INCLUDES} ${CANN_INCLUDE_DIRS})
             add_compile_definitions(GGML_USE_CANN)

diff --git a/examples/llama-bench/llama-bench.cpp b/examples/llama-bench/llama-bench.cpp
@@ -140,10 +140,10 @@ static std::string get_gpu_info() {
     }
 #endif
 #ifdef GGML_USE_CANN
-    int count = ggml_cann_get_device_count();
-    for (int i = 0; i < count; i++) {
+    uint32_t count = ggml_backend_cann_get_device_count();
+    for (uint32_t i = 0; i < count; i++) {
         char buf[128];
-        ggml_cann_get_device_description(i, buf, sizeof(buf));
+        ggml_backend_cann_get_device_description(i, buf, sizeof(buf));
         id += buf;
         if (i < count - 1) {
             id += "/";