From d85170bb624d17db429c8465b39b5137b2a6e322 Mon Sep 17 00:00:00 2001 From: Zhengjun Xing Date: Thu, 10 Apr 2025 10:29:30 +0000 Subject: [PATCH] ggml-impl.h: Fix build issues on AArch64 with CUDA version 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #12732: * Remove incorrect inclusion of "arm_neon.h" for CUDA versions ≥ 12 --- ggml/src/ggml-impl.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ggml/src/ggml-impl.h b/ggml/src/ggml-impl.h index caa6b9dba3f06..8d65bf26615d5 100644 --- a/ggml/src/ggml-impl.h +++ b/ggml/src/ggml-impl.h @@ -301,6 +301,14 @@ struct ggml_cgraph ggml_graph_view(struct ggml_cgraph * cgraph, int i0, int i1); GGML_API void * ggml_aligned_malloc(size_t size); GGML_API void ggml_aligned_free(void * ptr, size_t size); +#if defined(__ARM_NEON) && !defined(__CUDACC__) && !defined(__MUSACC__) +// if YCM cannot find , 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 +#endif + // FP16 to FP32 conversion // 16-bit float @@ -312,12 +320,6 @@ GGML_API void ggml_aligned_free(void * ptr, size_t size); // #if defined(__ARM_NEON) && !(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ <= 11) && !defined(__MUSACC__) - // if YCM cannot find , 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 - #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)