try to fix clang compilation errors, 3rd attempt

Author: xctan

ggml/src/ggml-cpu/arch/arm/repack.cpp

@@ -1,21 +1,15 @@
 #define GGML_COMMON_IMPL_CPP
 #define GGML_COMMON_DECL_CPP
 #include "ggml-common.h"
-#include "ggml-backend-impl.h"
-
-#include "ggml-quants.h"
 #include "ggml-impl.h"
-#include "ggml-cpu.h"
-#include "ggml-cpu-impl.h"
-#include "traits.h"
 
 #include <cmath>
 #include <cstring>
 #include <cassert>
-#include <cfloat>
 #include <cstdlib> // for qsort
 #include <cstdio>  // for GGML_ASSERT
 
+#define GGML_CPU_CLANG_WORKAROUND
 #include "../../repack.h"
 
 #if defined(__GNUC__)
@@ -2175,4 +2169,3 @@ void ggml_gemm_iq4_nl_4x4_q8_0(int n, float * GGML_RESTRICT s, size_t bs, const
         }
     }
 }
-

ggml/src/ggml-cpu/arch/riscv/repack.cpp

@@ -16,6 +16,7 @@
 #include <cstdlib> // for qsort
 #include <cstdio>  // for GGML_ASSERT
 
+#define GGML_CPU_CLANG_WORKAROUND
 #include "../../repack.h"
 
 #if defined(__GNUC__)
@@ -395,4 +396,3 @@ void ggml_gemm_q4_0_8x8_q8_0(int n, float * GGML_RESTRICT s, size_t bs, const vo
         }
     }
 }
-

ggml/src/ggml-cpu/arch/x86/quants.c

@@ -735,7 +735,7 @@ void ggml_vec_dot_q4_1_q8_1(int n, float * GGML_RESTRICT s, size_t bs, const voi
     }
 
     sumf = hsum_float_8(acc) + summs;
-    
+
 #endif
     for (; ib < nb; ++ib) {
         int sumi0 = 0;
@@ -828,7 +828,7 @@ void ggml_vec_dot_q5_0_q8_0(int n, float * GGML_RESTRICT s, size_t bs, const voi
     }
 
     sumf = hsum_float_8(acc);
-    
+
 #endif
     for (; ib < nb; ++ib) {
         uint32_t qh;
@@ -933,7 +933,7 @@ void ggml_vec_dot_q5_1_q8_1(int n, float * GGML_RESTRICT s, size_t bs, const voi
     }
 
     sumf = hsum_float_8(acc) + summs;
-    
+
 #endif
     for (; ib < nb; ++ib) {
         uint32_t qh;

ggml/src/ggml-cpu/arch/x86/repack.cpp

@@ -1,21 +1,14 @@
 #define GGML_COMMON_IMPL_CPP
 #define GGML_COMMON_DECL_CPP
 #include "ggml-common.h"
-#include "ggml-backend-impl.h"
-
-#include "ggml-quants.h"
 #include "ggml-impl.h"
-#include "ggml-cpu.h"
-#include "ggml-cpu-impl.h"
-#include "traits.h"
 
-#include <cmath>
 #include <cstring>
 #include <cassert>
-#include <cfloat>
 #include <cstdlib> // for qsort
 #include <cstdio>  // for GGML_ASSERT
 
+#define GGML_CPU_CLANG_WORKAROUND
 #include "../../repack.h"
 
 #if defined(__GNUC__)
@@ -3282,4 +3275,4 @@ void ggml_gemm_q4_K_8x8_q8_K(int n, float * GGML_RESTRICT s, size_t bs, const vo
         }
     }
 #endif
-}
+}

ggml/src/ggml-cpu/repack.h

@@ -69,7 +69,7 @@ extern "C" {
 // clang++ complains: ``error: call to 'ggml_gemm_q4_0_4x4_q8_0' is ambiguous''
 // repro: https://godbolt.org/z/oKdeWKonM (ICE), https://godbolt.org/z/1szq6P36v (ambiguous call)
 // but gcc needs forward declarations
-#if !defined(__clang__)
+#if !defined(__clang__) || (defined(__clang__) && defined(GGML_CPU_CLANG_WORKAROUND))
 void ggml_quantize_mat_q8_0_4x4(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);
 void ggml_quantize_mat_q8_0_4x8(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);
 void ggml_quantize_mat_q8_K_4x8(const float * GGML_RESTRICT x, void * GGML_RESTRICT vy, int64_t k);