From: Frankie Robertson <redacted>
Date: Wed, 4 Dec 2024 00:41:37 +0000 (+0200)
Subject: Avoid using __fp16 on ARM with old nvcc (llama/10616)
X-Git-Tag: upstream/1.7.4~113
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=6f1ba9d82d3ae0a6d012152f344896805a1ffefa;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

Avoid using __fp16 on ARM with old nvcc (llama/10616)
---

diff --git a/ggml/src/ggml-impl.h b/ggml/src/ggml-impl.h
index 78e3af8f..00a1546a 100644
--- a/ggml/src/ggml-impl.h
+++ b/ggml/src/ggml-impl.h
@@ -310,14 +310,14 @@ void ggml_aligned_free(void * ptr, size_t size);
 // FP16 to FP32 conversion
 
 #if defined(__ARM_NEON)
-    #ifdef _MSC_VER
+    #if defined(_MSC_VER) || (defined(__CUDACC__) && __CUDACC_VER_MAJOR__ <= 11)
         typedef uint16_t ggml_fp16_internal_t;
     #else
         typedef __fp16 ggml_fp16_internal_t;
     #endif
 #endif
 
-#if defined(__ARM_NEON) && !defined(_MSC_VER)
+#if defined(__ARM_NEON) && !defined(_MSC_VER) && !(defined(__CUDACC__) && __CUDACC_VER_MAJOR__ <= 11)
     #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)