Spaces:
Sleeping
Sleeping
Commit
·
345a58d
1
Parent(s):
52eea23
cann: update cmake (llama/8765)
Browse files- ggml/CMakeLists.txt +1 -0
- ggml/src/CMakeLists.txt +1 -5
ggml/CMakeLists.txt
CHANGED
|
@@ -207,6 +207,7 @@ set(GGML_PUBLIC_HEADERS
|
|
| 207 |
include/ggml-alloc.h
|
| 208 |
include/ggml-backend.h
|
| 209 |
include/ggml-blas.h
|
|
|
|
| 210 |
include/ggml-cuda.h
|
| 211 |
include/ggml.h
|
| 212 |
include/ggml-kompute.h
|
|
|
|
| 207 |
include/ggml-alloc.h
|
| 208 |
include/ggml-backend.h
|
| 209 |
include/ggml-blas.h
|
| 210 |
+
include/ggml-cann.h
|
| 211 |
include/ggml-cuda.h
|
| 212 |
include/ggml.h
|
| 213 |
include/ggml-kompute.h
|
ggml/src/CMakeLists.txt
CHANGED
|
@@ -849,11 +849,6 @@ if (GGML_CANN)
|
|
| 849 |
${CANN_INSTALL_DIR}/acllib/include
|
| 850 |
)
|
| 851 |
|
| 852 |
-
# TODO: find libs
|
| 853 |
-
link_directories(
|
| 854 |
-
${CANN_INSTALL_DIR}/lib64
|
| 855 |
-
)
|
| 856 |
-
|
| 857 |
add_subdirectory(ggml-cann/kernels)
|
| 858 |
list(APPEND CANN_LIBRARIES
|
| 859 |
ascendcl
|
|
@@ -872,6 +867,7 @@ if (GGML_CANN)
|
|
| 872 |
|
| 873 |
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${CANN_LIBRARIES} )
|
| 874 |
set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CANN_INCLUDE_DIRS})
|
|
|
|
| 875 |
list(APPEND GGML_CDEF_PUBLIC GGML_USE_CANN)
|
| 876 |
endif()
|
| 877 |
else()
|
|
|
|
| 849 |
${CANN_INSTALL_DIR}/acllib/include
|
| 850 |
)
|
| 851 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 852 |
add_subdirectory(ggml-cann/kernels)
|
| 853 |
list(APPEND CANN_LIBRARIES
|
| 854 |
ascendcl
|
|
|
|
| 867 |
|
| 868 |
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${CANN_LIBRARIES} )
|
| 869 |
set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CANN_INCLUDE_DIRS})
|
| 870 |
+
set(GGML_EXTRA_LIBDIRS ${GGML_EXTRA_LIBDIRS} ${CANN_INSTALL_DIR}/lib64)
|
| 871 |
list(APPEND GGML_CDEF_PUBLIC GGML_USE_CANN)
|
| 872 |
endif()
|
| 873 |
else()
|