Skip to content

Commit 137dfcf

Browse files
localai-botmudlerlocalai-org-maint-bot
authored
chore: ⬆️ Update antirez/ds4 to b7e9f0091139999b6c070a57590c447c5741da5c (#11333)
* ⬆️ Update antirez/ds4 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fix(ds4): link upstream CUDA MMQ objects The updated ds4 CUDA object now calls into the vendored MMQ implementation. Build and link those objects into both the gRPC server and distributed worker. Assisted-by: Codex:gpt-5 [Codex] --------- Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: mudler <2420543+mudler@users.noreply.github.com> Co-authored-by: localai-org-maint-bot <306269227+localai-org-maint-bot@users.noreply.github.com>
1 parent 750ab91 commit 137dfcf

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

backend/cpp/ds4/CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,15 @@ target_include_directories(hw_grpc_proto PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
6969

7070
set(DS4_OBJS "${DS4_DIR}/ds4.o")
7171
if(DS4_GPU STREQUAL "cuda")
72-
list(APPEND DS4_OBJS "${DS4_DIR}/ds4_cuda.o")
72+
list(APPEND DS4_OBJS
73+
"${DS4_DIR}/ds4_cuda.o"
74+
"${DS4_DIR}/cuda/mmq/ds4_ggml_stubs.o"
75+
"${DS4_DIR}/cuda/mmq/ds4_mmq.o"
76+
"${DS4_DIR}/cuda/mmq/ds4_mmq_d2r.o"
77+
"${DS4_DIR}/cuda/mmq/quantize.o"
78+
"${DS4_DIR}/cuda/mmq/mmid.o"
79+
"${DS4_DIR}/cuda/mmq/mmvq.o"
80+
"${DS4_DIR}/cuda/mmq/ds4_repack.o")
7381
elseif(DS4_GPU STREQUAL "metal")
7482
list(APPEND DS4_OBJS "${DS4_DIR}/ds4_metal.o")
7583
elseif(DS4_GPU STREQUAL "cpu")

backend/cpp/ds4/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# ds4 backend Makefile.
22
#
3-
# Upstream pin lives below as DS4_VERSION?=54b36ed9ba42da31b24f2d1a5feb075c2475dbb1
3+
# Upstream pin lives below as DS4_VERSION?=b7e9f0091139999b6c070a57590c447c5741da5c
44
# (.github/bump_deps.sh) can find and update it - matches the
55
# llama-cpp / ik-llama-cpp / turboquant convention.
66

7-
DS4_VERSION?=54b36ed9ba42da31b24f2d1a5feb075c2475dbb1
7+
DS4_VERSION?=b7e9f0091139999b6c070a57590c447c5741da5c
88
DS4_REPO?=https://github.com/antirez/ds4
99

1010
CURRENT_MAKEFILE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -23,7 +23,9 @@ CMAKE_ARGS ?= -DCMAKE_BUILD_TYPE=Release
2323
# are shared by every GPU mode, so append them unconditionally below.
2424
ifeq ($(BUILD_TYPE),cublas)
2525
CMAKE_ARGS += -DDS4_GPU=cuda
26-
DS4_OBJ_TARGET := ds4.o ds4_cuda.o ds4_distributed.o ds4_tp.o ds4_ssd.o ds4_layer_pack.o
26+
DS4_OBJ_TARGET := ds4.o ds4_cuda.o ds4_distributed.o ds4_tp.o ds4_ssd.o ds4_layer_pack.o \
27+
cuda/mmq/ds4_ggml_stubs.o cuda/mmq/ds4_mmq.o cuda/mmq/ds4_mmq_d2r.o \
28+
cuda/mmq/quantize.o cuda/mmq/mmid.o cuda/mmq/mmvq.o cuda/mmq/ds4_repack.o
2729
else ifeq ($(UNAME_S),Darwin)
2830
CMAKE_ARGS += -DDS4_GPU=metal
2931
DS4_OBJ_TARGET := ds4.o ds4_metal.o ds4_distributed.o ds4_tp.o ds4_ssd.o ds4_layer_pack.o
@@ -55,7 +57,7 @@ ds4:
5557
# the right per-platform compile flags (Objective-C/Metal on Darwin, nvcc on Linux+CUDA).
5658
ds4/ds4.o: ds4
5759
ifeq ($(BUILD_TYPE),cublas)
58-
+$(MAKE) -C ds4 ds4.o ds4_cuda.o ds4_distributed.o ds4_tp.o ds4_ssd.o ds4_layer_pack.o
60+
+$(MAKE) -C ds4 $(DS4_OBJ_TARGET)
5961
else ifeq ($(UNAME_S),Darwin)
6062
+$(MAKE) -C ds4 ds4.o ds4_metal.o ds4_distributed.o ds4_tp.o ds4_ssd.o ds4_layer_pack.o
6163
else

0 commit comments

Comments
 (0)