Skip to content

ggml-cpu : fix static linking issue #14205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

ggml-cpu : fix static linking issue #14205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd4ecde
ggml-cpu : fix linking order
xctan Jun 14, 2025
af04c01
ggml-cpu : fix linking issue with clang
xctan Jun 14, 2025
999b32d
clean up repack-impl.cpp
xctan Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ggml/src/ggml-cpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
ggml-cpu/repack.h
ggml-cpu/hbm.cpp
ggml-cpu/hbm.h
ggml-cpu/quants.c
ggml-cpu/quants.h
ggml-cpu/traits.cpp
ggml-cpu/traits.h
Expand Down Expand Up @@ -453,6 +452,12 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
list(APPEND ARCH_FLAGS -DGGML_CPU_GENERIC)
endif()

# Include generic implementations last to avoid accidentally overriding arch-specific implementations in static linking
list (APPEND GGML_CPU_SOURCES
ggml-cpu/repack-impl.cpp
ggml-cpu/quants.c
)

if (GGML_CPU_REPACK)
target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_USE_CPU_REPACK)
endif()
Expand Down
1 change: 0 additions & 1 deletion ggml/src/ggml-cpu/arch/arm/repack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <cstdlib> // for qsort
#include <cstdio> // for GGML_ASSERT

#define GGML_CPU_CLANG_WORKAROUND
#include "../../repack.h"

#if defined(__GNUC__)
Expand Down
1 change: 0 additions & 1 deletion ggml/src/ggml-cpu/arch/riscv/repack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <cstdlib> // for qsort
#include <cstdio> // for GGML_ASSERT

#define GGML_CPU_CLANG_WORKAROUND
#include "../../repack.h"

#if defined(__GNUC__)
Expand Down
1 change: 0 additions & 1 deletion ggml/src/ggml-cpu/arch/x86/repack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <cstdlib> // for qsort
#include <cstdio> // for GGML_ASSERT

#define GGML_CPU_CLANG_WORKAROUND
#include "../../repack.h"

#if defined(__GNUC__)
Expand Down
Loading
Loading