vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gg/cmake-dedup-link' into sycl-build-fix

Browse source
This commit is contained in:
Georgi Gerganov 2024-09-13 14:22:45 +03:00 • committed by GitHub
commit 013b6502ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ggml/src/CMakeLists.txt
View file

@ -516,7 +516,8 @@ if (GGML_SYCL)
endif() endif()
check_cxx_compiler_flag("-fsycl" SUPPORTS_SYCL) check_cxx_compiler_flag("-fsycl" SUPPORTS_SYCL)
if ( DEFINED ENV{ONEAPI_ROOT})
if (DEFINED ENV{ONEAPI_ROOT})
message(STATUS "Using oneAPI Release SYCL compiler (icpx).") message(STATUS "Using oneAPI Release SYCL compiler (icpx).")
elseif(SUPPORTS_SYCL) elseif(SUPPORTS_SYCL)
message(WARNING "Using open-source SYCL compiler (clang++). Didn't detect ENV {ONEAPI_ROOT}. message(WARNING "Using open-source SYCL compiler (clang++). Didn't detect ENV {ONEAPI_ROOT}.
@ -554,11 +555,17 @@ if (GGML_SYCL)
find_package(DNNL) find_package(DNNL)
message("-- DNNL found:" ${DNNL_FOUND}) message("-- DNNL found:" ${DNNL_FOUND})
if (GGML_SYCL_TARGET STREQUAL "INTEL") if (GGML_SYCL_TARGET STREQUAL "INTEL")
add_compile_definitions(GGML_SYCL_DNNL=${DNNL_FOUND}) add_compile_definitions(GGML_SYCL_DNNL=${DNNL_FOUND})
else() else()
add_compile_definitions(GGML_SYCL_DNNL=0) add_compile_definitions(GGML_SYCL_DNNL=0)
endif() endif()
if (${DNNL_FOUND} AND GGML_SYCL_TARGET STREQUAL "INTEL")
list(APPEND GGML_EXTRA_LIBS DNNL::dnnl)
endif()
if (WIN32) if (WIN32)
find_package(IntelSYCL REQUIRED) find_package(IntelSYCL REQUIRED)
find_package(MKL REQUIRED) find_package(MKL REQUIRED)