From: cmdr2 <redacted>
Date: Thu, 10 Apr 2025 12:23:08 +0000 (+0530)
Subject: ggml: don't include arm_neon.h when using CUDA 12 with ARM Neon (ggml/1187)
X-Git-Tag: gguf-v0.16.1~51
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=cb79c2e7fa28e874694c14598c1fd2fde82263e1;p=pkg%2Fggml%2Fsources%2Fllama.cpp

ggml: don't include arm_neon.h when using CUDA 12 with ARM Neon (ggml/1187)

fix #1186
---

diff --git a/ggml/src/ggml-impl.h b/ggml/src/ggml-impl.h
index 13a3857c..a19cfb14 100644
--- a/ggml/src/ggml-impl.h
+++ b/ggml/src/ggml-impl.h
@@ -16,6 +16,14 @@
 #include <arm_sve.h>
 #endif // __ARM_FEATURE_SVE
 
+#if defined(__ARM_NEON) && !defined(__CUDACC__) && !defined(__MUSACC__)
+// if YCM cannot find <arm_neon.h>, make a symbolic link to it, for example:
+//
+//   $ ln -sfn /Library/Developer/CommandLineTools/usr/lib/clang/13.1.6/include/arm_neon.h ./src/
+//
+#include <arm_neon.h>
+#endif
+
 #if defined(__F16C__)
 #include <immintrin.h>
 #endif
@@ -317,13 +325,6 @@ GGML_API void ggml_aligned_free(void * ptr, size_t size);
 // for     MUSA compilers        , we use uint16_t: ref https://github.com/ggml-org/llama.cpp/pull/11843
 //
 #if defined(__ARM_NEON) && !(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ <= 11) && !defined(__MUSACC__)
-
-    // if YCM cannot find <arm_neon.h>, make a symbolic link to it, for example:
-    //
-    //   $ ln -sfn /Library/Developer/CommandLineTools/usr/lib/clang/13.1.6/include/arm_neon.h ./src/
-    //
-    #include <arm_neon.h>
-
     #define GGML_COMPUTE_FP16_TO_FP32(x) ggml_compute_fp16_to_fp32(x)
     #define GGML_COMPUTE_FP32_TO_FP16(x) ggml_compute_fp32_to_fp16(x)