fix: should not include arm_neon.h when compiling on musa arm64

Huaishun Hu · Huaishun Hu · commit 2030e5981640 · 2025-02-13T16:51:26.000+08:00
diff --git a/ggml/include/ggml-cuda.h b/ggml/include/ggml-cuda.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#ifdef GGML_USE_MUSA
-#undef __ARM_NEON
-#endif
-
 #include "ggml.h"
 #include "ggml-backend.h"
 
diff --git a/ggml/src/ggml-cuda/common.cuh b/ggml/src/ggml-cuda/common.cuh
@@ -1,9 +1,5 @@
 #pragma once
 
-#ifdef GGML_USE_MUSA
-#undef __ARM_NEON
-#endif
-
 #include "ggml.h"
 #include "ggml-cuda.h"
 
diff --git a/ggml/src/ggml-cuda/opt-step-adamw.cu b/ggml/src/ggml-cuda/opt-step-adamw.cu
@@ -1,7 +1,3 @@
-#ifdef GGML_USE_MUSA
-#undef __ARM_NEON
-#endif
-
 #include "ggml-impl.h"
 #include "opt-step-adamw.cuh"
 
diff --git a/ggml/src/ggml-impl.h b/ggml/src/ggml-impl.h
@@ -16,7 +16,7 @@
 #include <arm_sve.h>
 #endif // __ARM_FEATURE_SVE
 
-#if defined(__ARM_NEON) && !defined(__CUDACC__)
+#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/
