Skip to content

Commit cb79c2e

Browse files
cmdr2ggerganov
authored andcommitted
ggml: don't include arm_neon.h when using CUDA 12 with ARM Neon (ggml/1187)
fix #1186
1 parent fe92821 commit cb79c2e

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

ggml/src/ggml-impl.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
#include <arm_sve.h>
1717
#endif // __ARM_FEATURE_SVE
1818

19+
#if defined(__ARM_NEON) && !defined(__CUDACC__) && !defined(__MUSACC__)
20+
// if YCM cannot find <arm_neon.h>, make a symbolic link to it, for example:
21+
//
22+
// $ ln -sfn /Library/Developer/CommandLineTools/usr/lib/clang/13.1.6/include/arm_neon.h ./src/
23+
//
24+
#include <arm_neon.h>
25+
#endif
26+
1927
#if defined(__F16C__)
2028
#include <immintrin.h>
2129
#endif
@@ -317,13 +325,6 @@ GGML_API void ggml_aligned_free(void * ptr, size_t size);
317325
// for MUSA compilers , we use uint16_t: ref https://github.com/ggml-org/llama.cpp/pull/11843
318326
//
319327
#if defined(__ARM_NEON) && !(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ <= 11) && !defined(__MUSACC__)
320-
321-
// if YCM cannot find <arm_neon.h>, make a symbolic link to it, for example:
322-
//
323-
// $ ln -sfn /Library/Developer/CommandLineTools/usr/lib/clang/13.1.6/include/arm_neon.h ./src/
324-
//
325-
#include <arm_neon.h>
326-
327328
#define GGML_COMPUTE_FP16_TO_FP32(x) ggml_compute_fp16_to_fp32(x)
328329
#define GGML_COMPUTE_FP32_TO_FP16(x) ggml_compute_fp32_to_fp16(x)
329330

0 commit comments

Comments
 (0)