From d24b360255ae13434eef2851187e8d1ba91929a2 Mon Sep 17 00:00:00 2001 From: Max Krasnyansky Date: Thu, 28 Nov 2024 15:37:54 -0800 Subject: [PATCH] opencl: fixed merge conflict (MUSA added twice in cmake) --- ggml/src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt index 272b043be..c8744341b 100644 --- a/ggml/src/CMakeLists.txt +++ b/ggml/src/CMakeLists.txt @@ -316,7 +316,6 @@ ggml_add_backend(RPC) ggml_add_backend(SYCL) ggml_add_backend(Vulkan) ggml_add_backend(OpenCL2) -ggml_add_backend(MUSA) foreach (target ggml-base ggml) target_include_directories(${target} PUBLIC $ $)