Skip to content

Commit fd4ecde

Browse files
committed
ggml-cpu : fix linking order
1 parent 3555b30 commit fd4ecde

File tree

4 files changed

+762
-745
lines changed

4 files changed

+762
-745
lines changed

ggml/src/ggml-cpu/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
2828
ggml-cpu/repack.h
2929
ggml-cpu/hbm.cpp
3030
ggml-cpu/hbm.h
31-
ggml-cpu/quants.c
3231
ggml-cpu/quants.h
3332
ggml-cpu/traits.cpp
3433
ggml-cpu/traits.h
@@ -453,6 +452,12 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
453452
list(APPEND ARCH_FLAGS -DGGML_CPU_GENERIC)
454453
endif()
455454

455+
# Include generic implementations last to avoid accidentally overriding arch-specific implementations in static linking
456+
list (APPEND GGML_CPU_SOURCES
457+
ggml-cpu/repack-impl.cpp
458+
ggml-cpu/quants.c
459+
)
460+
456461
if (GGML_CPU_REPACK)
457462
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_CPU_REPACK)
458463
endif()

0 commit comments

Comments
 (0)