CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-10-30 08:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

cann: update cmake (#8765)

Browse Source
This commit is contained in:
wangshuai09
2024-07-30 18:37:35 +08:00
committed by GitHub
parent c887d8b017
commit 6e2b6000e5
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ggml/CMakeLists.txt
View File

@@ -207,6 +207,7 @@ set(GGML_PUBLIC_HEADERS
include/ggml-alloc.h include/ggml-alloc.h
include/ggml-backend.h include/ggml-backend.h
include/ggml-blas.h include/ggml-blas.h
include/ggml-cann.h
include/ggml-cuda.h include/ggml-cuda.h
include/ggml.h include/ggml.h
include/ggml-kompute.h include/ggml-kompute.h

6
ggml/src/CMakeLists.txt
View File

@@ -849,11 +849,6 @@ if (GGML_CANN)
${CANN_INSTALL_DIR}/acllib/include ${CANN_INSTALL_DIR}/acllib/include
) )
# TODO: find libs
link_directories(
${CANN_INSTALL_DIR}/lib64
)
add_subdirectory(ggml-cann/kernels) add_subdirectory(ggml-cann/kernels)
list(APPEND CANN_LIBRARIES list(APPEND CANN_LIBRARIES
ascendcl ascendcl
@@ -872,6 +867,7 @@ if (GGML_CANN)
set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${CANN_LIBRARIES} ) set(GGML_EXTRA_LIBS ${GGML_EXTRA_LIBS} ${CANN_LIBRARIES} )
set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CANN_INCLUDE_DIRS}) set(GGML_EXTRA_INCLUDES ${GGML_EXTRA_INCLUDES} ${CANN_INCLUDE_DIRS})
set(GGML_EXTRA_LIBDIRS ${GGML_EXTRA_LIBDIRS} ${CANN_INSTALL_DIR}/lib64)
list(APPEND GGML_CDEF_PUBLIC GGML_USE_CANN) list(APPEND GGML_CDEF_PUBLIC GGML_USE_CANN)
endif() endif()
else() else()