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

opencl: fixed merge conflict (MUSA added twice in cmake)

Browse source
This commit is contained in:
Max Krasnyansky 2024-11-28 15:37:54 -08:00
parent 671c7af6b9
commit d24b360255
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ggml/src/CMakeLists.txt
View file

@ -316,7 +316,6 @@ ggml_add_backend(RPC)
ggml_add_backend(SYCL) ggml_add_backend(SYCL)
ggml_add_backend(Vulkan) ggml_add_backend(Vulkan)
ggml_add_backend(OpenCL2) ggml_add_backend(OpenCL2)
ggml_add_backend(MUSA)
foreach (target ggml-base ggml) foreach (target ggml-base ggml)
target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<INSTALL_INTERFACE:include>) target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> $<INSTALL_INTERFACE:include>)