Skip to content

Commit fe05d6b

Browse files
committed
Try to fix hipblas build
Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent 6d974bf commit fe05d6b

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

backend/Dockerfile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ EOT
123123

124124
COPY . /LocalAI
125125

126-
RUN cd /LocalAI && make -C /LocalAI/backend/go/${BACKEND} build
126+
RUN cd /LocalAI && make protogen-go && make -C /LocalAI/backend/go/${BACKEND} build
127127

128128
FROM scratch
129129
ARG BACKEND=rerankers

backend/cpp/llama-cpp/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LLAMA_REPO?=https://github.com/ggerganov/llama.cpp
44

55
CMAKE_ARGS?=
66
BUILD_TYPE?=
7-
NATIVE?=true
7+
NATIVE?=false
88
ONEAPI_VARS?=/opt/intel/oneapi/setvars.sh
99
TARGET?=--target grpc-server
1010

@@ -27,9 +27,14 @@ else ifeq ($(BUILD_TYPE),clblas)
2727
CMAKE_ARGS+=-DGGML_CLBLAST=ON -DCLBlast_DIR=/some/path
2828
# If it's hipblas we do have also to set CC=/opt/rocm/llvm/bin/clang CXX=/opt/rocm/llvm/bin/clang++
2929
else ifeq ($(BUILD_TYPE),hipblas)
30+
ROCM_HOME ?= /opt/rocm
31+
ROCM_PATH ?= /opt/rocm
32+
export CXX=$(ROCM_HOME)/llvm/bin/clang++
33+
export CC=$(ROCM_HOME)/llvm/bin/clang
34+
# GPU_TARGETS ?= gfx803,gfx900,gfx906,gfx908,gfx90a,gfx942,gfx1010,gfx1030,gfx1032,gfx1100,gfx1101,gfx1102
35+
# AMDGPU_TARGETS ?= "$(GPU_TARGETS)"
3036
CMAKE_ARGS+=-DGGML_HIP=ON
31-
# If it's OSX, DO NOT embed the metal library - -DGGML_METAL_EMBED_LIBRARY=ON requires further investigation
32-
# But if it's OSX without metal, disable it here
37+
# CMAKE_ARGS+=-DGGML_HIP=ON -DAMDGPU_TARGETS="$(AMDGPU_TARGETS)" -DGPU_TARGETS="$(GPU_TARGETS)"
3338
else ifeq ($(OS),Darwin)
3439
ifeq ($(BUILD_TYPE),)
3540
BUILD_TYPE=metal

backend/cpp/llama-cpp/package.sh

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,27 @@ CURDIR=$(dirname "$(realpath $0)")
1111
mkdir -p $CURDIR/package/lib
1212

1313
cp -avrf $CURDIR/llama-cpp-* $CURDIR/package/
14+
cp -rfv $CURDIR/run.sh $CURDIR/package/
1415

1516
# Detect architecture and copy appropriate libraries
1617
if [ -f "/lib64/ld-linux-x86-64.so.2" ]; then
1718
# x86_64 architecture
1819
echo "Detected x86_64 architecture, copying x86_64 libraries..."
19-
cp -arfv /lib64/ld-linux-x86-64.so.2 $CURDIR/package/lib/ld.so
20-
cp -arfv /lib/x86_64-linux-gnu/libc.so.6 $CURDIR/package/lib/libc.so.6
21-
cp -arfv /lib/x86_64-linux-gnu/libgcc_s.so.1 $CURDIR/package/lib/libgcc_s.so.1
22-
cp -arfv /lib/x86_64-linux-gnu/libstdc++.so.6 $CURDIR/package/lib/libstdc++.so.6
23-
cp -arfv /lib/x86_64-linux-gnu/libm.so.6 $CURDIR/package/lib/libm.so.6
24-
cp -arfv /lib/x86_64-linux-gnu/libgomp.so.1 $CURDIR/package/lib/libgomp.so.1
20+
cp -arfLv /lib64/ld-linux-x86-64.so.2 $CURDIR/package/lib/ld.so
21+
cp -arfLv /lib/x86_64-linux-gnu/libc.so.6 $CURDIR/package/lib/libc.so.6
22+
cp -arfLv /lib/x86_64-linux-gnu/libgcc_s.so.1 $CURDIR/package/lib/libgcc_s.so.1
23+
cp -arfLv /lib/x86_64-linux-gnu/libstdc++.so.6 $CURDIR/package/lib/libstdc++.so.6
24+
cp -arfLv /lib/x86_64-linux-gnu/libm.so.6 $CURDIR/package/lib/libm.so.6
25+
cp -arfLv /lib/x86_64-linux-gnu/libgomp.so.1 $CURDIR/package/lib/libgomp.so.1
2526
elif [ -f "/lib/ld-linux-aarch64.so.1" ]; then
2627
# ARM64 architecture
2728
echo "Detected ARM64 architecture, copying ARM64 libraries..."
28-
cp -arfv /lib/ld-linux-aarch64.so.1 $CURDIR/package/lib/ld.so
29-
cp -arfv /lib/aarch64-linux-gnu/libc.so.6 $CURDIR/package/lib/libc.so.6
30-
cp -arfv /lib/aarch64-linux-gnu/libgcc_s.so.1 $CURDIR/package/lib/libgcc_s.so.1
31-
cp -arfv /lib/aarch64-linux-gnu/libstdc++.so.6 $CURDIR/package/lib/libstdc++.so.6
32-
cp -arfv /lib/aarch64-linux-gnu/libm.so.6 $CURDIR/package/lib/libm.so.6
33-
cp -arfv /lib/aarch64-linux-gnu/libgomp.so.1 $CURDIR/package/lib/libgomp.so.1
29+
cp -arfLv /lib/ld-linux-aarch64.so.1 $CURDIR/package/lib/ld.so
30+
cp -arfLv /lib/aarch64-linux-gnu/libc.so.6 $CURDIR/package/lib/libc.so.6
31+
cp -arfLv /lib/aarch64-linux-gnu/libgcc_s.so.1 $CURDIR/package/lib/libgcc_s.so.1
32+
cp -arfLv /lib/aarch64-linux-gnu/libstdc++.so.6 $CURDIR/package/lib/libstdc++.so.6
33+
cp -arfLv /lib/aarch64-linux-gnu/libm.so.6 $CURDIR/package/lib/libm.so.6
34+
cp -arfLv /lib/aarch64-linux-gnu/libgomp.so.1 $CURDIR/package/lib/libgomp.so.1
3435
else
3536
echo "Error: Could not detect architecture"
3637
exit 1

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
177177
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
178178
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
179179
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
180+
github.com/ggerganov/whisper.cpp/bindings/go v0.0.0-20240626202019-c118733a29ad h1:dQ93Vd6i25o+zH9vvnZ8mu7jtJQ6jT3D+zE3V8Q49n0=
181+
github.com/ggerganov/whisper.cpp/bindings/go v0.0.0-20240626202019-c118733a29ad/go.mod h1:QIjZ9OktHFG7p+/m3sMvrAJKKdWrr1fZIK0rM6HZlyo=
180182
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
181183
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
182184
github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
@@ -505,6 +507,8 @@ github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
505507
github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
506508
github.com/mudler/edgevpn v0.30.1 h1:4yyhNFJX62NpRp50sxiyZE5E/sdAqEZX+aE5Mv7QS60=
507509
github.com/mudler/edgevpn v0.30.1/go.mod h1:IAJkkJ0oH3rwsSGOGTFT4UBYFqYuD/QyaKzTLB3P/eU=
510+
github.com/mudler/go-piper v0.0.0-20241023091659-2494246fd9fc h1:RxwneJl1VgvikiX28EkpdAyL4yQVnJMrbquKospjHyA=
511+
github.com/mudler/go-piper v0.0.0-20241023091659-2494246fd9fc/go.mod h1:O7SwdSWMilAWhBZMK9N9Y/oBDyMMzshE3ju8Xkexwig=
508512
github.com/mudler/go-processmanager v0.0.0-20240820160718-8b802d3ecf82 h1:FVT07EI8njvsD4tC2Hw8Xhactp5AWhsQWD4oTeQuSAU=
509513
github.com/mudler/go-processmanager v0.0.0-20240820160718-8b802d3ecf82/go.mod h1:Urp7LG5jylKoDq0663qeBh0pINGcRl35nXdKx82PSoU=
510514
github.com/mudler/water v0.0.0-20221010214108-8c7313014ce0 h1:Qh6ghkMgTu6siFbTf7L3IszJmshMhXxNL4V+t7IIA6w=

0 commit comments

Comments
 (0)