Spaces:
Sleeping
Sleeping
cmdr2
commited on
Commit
·
87f1ea3
1
Parent(s):
4c5e449
ggml: don't include arm_neon.h when using CUDA 12 with ARM Neon (ggml/1187)
Browse files- ggml/src/ggml-impl.h +8 -7
ggml/src/ggml-impl.h
CHANGED
|
@@ -16,6 +16,14 @@
|
|
| 16 |
#include <arm_sve.h>
|
| 17 |
#endif // __ARM_FEATURE_SVE
|
| 18 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
#if defined(__F16C__)
|
| 20 |
#include <immintrin.h>
|
| 21 |
#endif
|
|
@@ -317,13 +325,6 @@ GGML_API void ggml_aligned_free(void * ptr, size_t size);
|
|
| 317 |
// for MUSA compilers , we use uint16_t: ref https://github.com/ggml-org/llama.cpp/pull/11843
|
| 318 |
//
|
| 319 |
#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 |
-
|
| 327 |
#define GGML_COMPUTE_FP16_TO_FP32(x) ggml_compute_fp16_to_fp32(x)
|
| 328 |
#define GGML_COMPUTE_FP32_TO_FP16(x) ggml_compute_fp32_to_fp16(x)
|
| 329 |
|
|
|
|
| 16 |
#include <arm_sve.h>
|
| 17 |
#endif // __ARM_FEATURE_SVE
|
| 18 |
|
| 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 |
+
|
| 27 |
#if defined(__F16C__)
|
| 28 |
#include <immintrin.h>
|
| 29 |
#endif
|
|
|
|
| 325 |
// for MUSA compilers , we use uint16_t: ref https://github.com/ggml-org/llama.cpp/pull/11843
|
| 326 |
//
|
| 327 |
#if defined(__ARM_NEON) && !(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ <= 11) && !defined(__MUSACC__)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 328 |
#define GGML_COMPUTE_FP16_TO_FP32(x) ggml_compute_fp16_to_fp32(x)
|
| 329 |
#define GGML_COMPUTE_FP32_TO_FP16(x) ggml_compute_fp32_to_fp16(x)
|
| 330 |
|