Skip to content

Commit 272b86e

Browse files
committed
try to fix clang compilation errors, 9th attempt
1 parent 2bad20d commit 272b86e

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

ggml/src/ggml-cpu/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
402402
message(STATUS "Wasm detected")
403403
list (APPEND GGML_CPU_SOURCES ggml-cpu/arch/wasm/quants.c)
404404
else()
405-
message(STATUS "Unknown architecture")
405+
message(WARNING "Unknown CPU architecture. Falling back to generic implementations.")
406+
list(APPEND ARCH_FLAGS -DGGML_CPU_GENERIC)
406407
endif()
407408

408409
if (GGML_CPU_REPACK)

ggml/src/ggml-cpu/quants.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55

66
#include "ggml.h"
77

8-
#if defined(__APPLE__)
9-
#include <TargetConditionals.h>
10-
#endif
11-
128
// GGML CPU internal header
139

1410
#ifdef __cplusplus
@@ -88,7 +84,7 @@ void ggml_vec_dot_iq1_m_q8_K_generic(int n, float * GGML_RESTRICT s, size_t bs,
8884
void ggml_vec_dot_iq4_nl_q8_0_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, size_t bx, const void * GGML_RESTRICT vy, size_t by, int nrc);
8985
void ggml_vec_dot_iq4_xs_q8_K_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, size_t bx, const void * GGML_RESTRICT vy, size_t by, int nrc);
9086

91-
#if defined(__APPLE__) && !TARGET_OS_OSX
87+
#if defined(GGML_CPU_GENERIC)
9288
#define quantize_row_q8_0_generic quantize_row_q8_0
9389
#define quantize_row_q8_1_generic quantize_row_q8_1
9490
#define quantize_row_q8_K_generic quantize_row_q8_K

ggml/src/ggml-cpu/repack.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
#include "traits.h"
77
#include "ggml.h"
88

9-
#if defined(__APPLE__)
10-
#include <TargetConditionals.h>
11-
#endif
12-
139
// GGML internal header
1410

1511
ggml_backend_buffer_type_t ggml_backend_cpu_repack_buffer_type(void);
@@ -102,7 +98,7 @@ void ggml_gemm_q4_0_8x8_q8_0_generic(int n, float * GGML_RESTRICT s, size_t bs,
10298
void ggml_gemm_q4_K_8x8_q8_K_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, const void * GGML_RESTRICT vy, int nr, int nc);
10399
void ggml_gemm_iq4_nl_4x4_q8_0_generic(int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, const void * GGML_RESTRICT vy, int nr, int nc);
104100

105-
#if defined(__APPLE__) && !TARGET_OS_OSX
101+
#if defined(GGML_CPU_GENERIC)
106102
#define ggml_quantize_mat_q8_0_4x4_generic ggml_quantize_mat_q8_0_4x4
107103
#define ggml_quantize_mat_q8_0_4x8_generic ggml_quantize_mat_q8_0_4x8
108104
#define ggml_quantize_mat_q8_K_4x8_generic ggml_quantize_mat_q8_K_4x8

0 commit comments

Comments
 (0)