From: luoyu-intel <redacted>
Date: Tue, 2 Jul 2024 04:50:07 +0000 (+0000)
Subject: Fix win build conflict of math library (llama/8230)
X-Git-Tag: upstream/0.0.1642~554
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=3c4cc7ccc99476c5c167b973e0b8c2de99db74aa;p=pkg%2Fggml%2Fsources%2Fggml

Fix win build conflict of math library (llama/8230)

* fix win build conflict of math library

* fix the condition: !(win32 & SYCL)

* revert warp_size=16
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a18198f1..08b71d41 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -490,7 +490,7 @@ if (GGML_SYCL)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl-targets=nvptx64-nvidia-cuda")
         add_compile_definitions(GGML_SYCL_WARP_SIZE=32)
     else()
-        add_compile_definitions(GGML_SYCL_WARP_SIZE=16)
+        add_compile_definitions(GGML_SYCL_WARP_SIZE=32)
     endif()
 
     file(GLOB   GGML_HEADERS_SYCL "ggml-sycl/*.hpp")
@@ -1168,7 +1168,9 @@ target_link_libraries(ggml PRIVATE Threads::Threads ${GGML_EXTRA_LIBS})
 
 find_library(MATH_LIBRARY m)
 if (MATH_LIBRARY)
-    target_link_libraries(ggml PRIVATE ${MATH_LIBRARY})
+    if (NOT WIN32 OR NOT GGML_SYCL)
+        target_link_libraries(ggml PRIVATE ${MATH_LIBRARY})
+    endif()
 endif()
 
 if (BUILD_SHARED_LIBS)