Skip to content

Commit 6d974bf

Browse files
mudlermudler
committed
Fix leftover from bark-cpp extraction
Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent e5cecc7 commit 6d974bf

File tree

5 files changed

+43
-45
lines changed

5 files changed

+43
-45
lines changed

‎Makefile

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ BINARY_NAME=local-ai
55

66
DETECT_LIBS?=true
77

8-
# llama.cpp versions
9-
CPPLLAMA_VERSION?=496957e1cbcb522abc63aa18521036e40efce985
10-
118
# whisper.cpp version
129
WHISPER_REPO?=https://github.com/ggml-org/whisper.cpp
1310
WHISPER_CPP_VERSION?=032697b9a850dc2615555e2a93a683cc3dd58559
@@ -16,10 +13,6 @@ WHISPER_CPP_VERSION?=032697b9a850dc2615555e2a93a683cc3dd58559
1613
PIPER_REPO?=https://github.com/mudler/go-piper
1714
PIPER_VERSION?=e10ca041a885d4a8f3871d52924b47792d5e5aa0
1815

19-
# bark.cpp
20-
BARKCPP_REPO?=https://github.com/PABannier/bark.cpp.git
21-
BARKCPP_VERSION?=5d5be84f089ab9ea53b7a793f088d3fbf7247495
22-
2316
# stablediffusion.cpp (ggml)
2417
STABLEDIFFUSION_GGML_REPO?=https://github.com/richiejp/stable-diffusion.cpp
2518
STABLEDIFFUSION_GGML_VERSION?=53e3b17eb3d0b5760ced06a1f98320b68b34aaae
@@ -255,23 +248,6 @@ endif
255248

256249
all: help
257250

258-
## bark.cpp
259-
sources/bark.cpp:
260-
git clone --recursive $(BARKCPP_REPO) sources/bark.cpp && \
261-
cd sources/bark.cpp && \
262-
git checkout $(BARKCPP_VERSION) && \
263-
git submodule update --init --recursive --depth 1 --single-branch
264-
265-
sources/bark.cpp/build/libbark.a: sources/bark.cpp
266-
cd sources/bark.cpp && \
267-
mkdir -p build && \
268-
cd build && \
269-
cmake $(CMAKE_ARGS) .. && \
270-
cmake --build . --config Release
271-
272-
backend/go/bark-cpp/libbark.a: sources/bark.cpp/build/libbark.a
273-
$(MAKE) -C backend/go/bark-cpp libbark.a
274-
275251
## go-piper
276252
sources/go-piper:
277253
mkdir -p sources/go-piper
@@ -327,7 +303,7 @@ sources/whisper.cpp/build/src/libwhisper.a: sources/whisper.cpp
327303
cd sources/whisper.cpp && cmake $(WHISPER_CMAKE_ARGS) . -B ./build
328304
cd sources/whisper.cpp/build && cmake --build . --config Release
329305

330-
get-sources: sources/go-piper sources/stablediffusion-ggml.cpp sources/bark.cpp sources/whisper.cpp
306+
get-sources: sources/go-piper sources/stablediffusion-ggml.cpp sources/whisper.cpp
331307

332308
replace:
333309
$(GOCMD) mod edit -replace github.com/ggerganov/whisper.cpp=$(CURDIR)/sources/whisper.cpp
@@ -359,7 +335,6 @@ clean: ## Remove build related file
359335
rm -rf release/
360336
rm -rf backend-assets/*
361337
$(MAKE) -C backend/cpp/grpc clean
362-
$(MAKE) -C backend/go/bark-cpp clean
363338
$(MAKE) -C backend/go/image/stablediffusion-ggml clean
364339
$(MAKE) dropreplace
365340
$(MAKE) protogen-clean
@@ -690,13 +665,6 @@ ifneq ($(UPX),)
690665
$(UPX) backend-assets/grpc/huggingface
691666
endif
692667

693-
backend-assets/grpc/bark-cpp: protogen-go replace backend/go/bark-cpp/libbark.a backend-assets/grpc
694-
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(CURDIR)/backend/go/bark-cpp/ LIBRARY_PATH=$(CURDIR)/backend/go/bark-cpp/ \
695-
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/bark-cpp ./backend/go/bark-cpp/
696-
ifneq ($(UPX),)
697-
$(UPX) backend-assets/grpc/bark-cpp
698-
endif
699-
700668
backend-assets/grpc/piper: protogen-go replace sources/go-piper sources/go-piper/libpiper_binding.a backend-assets/grpc backend-assets/espeak-ng-data
701669
CGO_CXXFLAGS="$(PIPER_CGO_CXXFLAGS)" CGO_LDFLAGS="$(PIPER_CGO_LDFLAGS)" LIBRARY_PATH=$(CURDIR)/sources/go-piper \
702670
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/piper ./backend/go/tts/
@@ -791,6 +759,9 @@ backend-images:
791759
docker-build-llama-cpp:
792760
docker build -t local-ai-backend:llama-cpp -f backend/Dockerfile.llama-cpp .
793761

762+
docker-build-bark-cpp:
763+
docker build -t local-ai-backend:bark-cpp -f backend/Dockerfile.go --build-arg BACKEND=bark-cpp .
764+
794765
docker-save-llama-cpp: backend-images
795766
docker save local-ai-backend:llama-cpp -o backend-images/llama-cpp.tar
796767

‎backend/Dockerfile.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ EOT
123123

124124
COPY . /LocalAI
125125

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

128128
FROM scratch
129+
ARG BACKEND=rerankers
129130

130-
COPY --from=builder /LocalAI/backend-assets/grpc/${BACKEND} ./
131+
COPY --from=builder /LocalAI/backend/go/${BACKEND}/${BACKEND} ./
131132
COPY --from=builder /LocalAI/backend/go/${BACKEND}/run.sh ./

‎backend/go/bark-cpp/Makefile

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,46 @@ LIBRARY_PATH := $(abspath ./)
33

44
AR?=ar
55

6+
CMAKE_ARGS?=-DGGML_NATIVE=OFF
67
BUILD_TYPE?=
8+
GOCMD=go
79
# keep standard at C11 and C++11
8-
CXXFLAGS = -I. -I$(INCLUDE_PATH)/../../../sources/bark.cpp/examples -I$(INCLUDE_PATH)/../../../sources/bark.cpp/spm-headers -I$(INCLUDE_PATH)/../../../sources/bark.cpp -O3 -DNDEBUG -std=c++17 -fPIC
9-
LDFLAGS = -L$(LIBRARY_PATH) -L$(LIBRARY_PATH)/../../../sources/bark.cpp/build/examples -lbark -lstdc++ -lm
10+
CXXFLAGS = -I. -I$(INCLUDE_PATH)/sources/bark.cpp/examples -I$(INCLUDE_PATH)/sources/bark.cpp/encodec.cpp/ggml/include -I$(INCLUDE_PATH)/sources/bark.cpp/spm-headers -I$(INCLUDE_PATH)/sources/bark.cpp -O3 -DNDEBUG -std=c++17 -fPIC
11+
LDFLAGS = -L$(LIBRARY_PATH) -L$(LIBRARY_PATH)/sources/bark.cpp/build/examples -lbark -lstdc++ -lm
12+
13+
# bark.cpp
14+
BARKCPP_REPO?=https://github.com/PABannier/bark.cpp.git
15+
BARKCPP_VERSION?=5d5be84f089ab9ea53b7a793f088d3fbf7247495
1016

1117
# warnings
1218
CXXFLAGS += -Wall -Wextra -Wpedantic -Wcast-qual -Wno-unused-function
1319

20+
## bark.cpp
21+
sources/bark.cpp:
22+
git clone --recursive $(BARKCPP_REPO) sources/bark.cpp && \
23+
cd sources/bark.cpp && \
24+
git checkout $(BARKCPP_VERSION) && \
25+
git submodule update --init --recursive --depth 1 --single-branch
26+
27+
sources/bark.cpp/build/libbark.a: sources/bark.cpp
28+
cd sources/bark.cpp && \
29+
mkdir -p build && \
30+
cd build && \
31+
cmake $(CMAKE_ARGS) .. && \
32+
cmake --build . --config Release
33+
1434
gobark.o:
1535
$(CXX) $(CXXFLAGS) gobark.cpp -o gobark.o -c $(LDFLAGS)
1636

17-
libbark.a: gobark.o
18-
cp $(INCLUDE_PATH)/../../../sources/bark.cpp/build/libbark.a ./
37+
libbark.a: sources/bark.cpp/build/libbark.a gobark.o
38+
cp $(INCLUDE_PATH)/sources/bark.cpp/build/libbark.a ./
1939
$(AR) rcs libbark.a gobark.o
20-
$(AR) rcs libbark.a $(LIBRARY_PATH)/../../../sources/bark.cpp/build/encodec.cpp/ggml/src/CMakeFiles/ggml.dir/ggml.c.o
21-
$(AR) rcs libbark.a $(LIBRARY_PATH)/../../../sources/bark.cpp/build/encodec.cpp/ggml/src/CMakeFiles/ggml.dir/ggml-alloc.c.o
22-
$(AR) rcs libbark.a $(LIBRARY_PATH)/../../../sources/bark.cpp/build/encodec.cpp/ggml/src/CMakeFiles/ggml.dir/ggml-backend.c.o
40+
41+
bark-cpp: libbark.a
42+
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH="$(CURDIR)" LIBRARY_PATH=$(CURDIR) \
43+
$(GOCMD) build -v -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o bark-cpp ./
44+
45+
build: bark-cpp
2346

2447
clean:
2548
rm -f gobark.o libbark.a

‎backend/go/bark-cpp/gobark.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

3-
// #cgo CXXFLAGS: -I${SRCDIR}/../../../sources/bark.cpp/ -I${SRCDIR}/../../../sources/bark.cpp/encodec.cpp -I${SRCDIR}/../../../sources/bark.cpp/examples -I${SRCDIR}/../../../sources/bark.cpp/spm-headers
4-
// #cgo LDFLAGS: -L${SRCDIR}/ -L${SRCDIR}/../../../sources/bark.cpp/build/examples -L${SRCDIR}/../../../sources/bark.cpp/build/encodec.cpp/ -lbark -lencodec -lcommon
3+
// #cgo CXXFLAGS: -I${SRCDIR}/sources/bark.cpp/ -I${SRCDIR}/sources/bark.cpp/encodec.cpp -I${SRCDIR}/sources/bark.cpp/encodec.cpp/ggml/include -I${SRCDIR}/sources/bark.cpp/examples -I${SRCDIR}/sources/bark.cpp/spm-headers
4+
// #cgo LDFLAGS: -L${SRCDIR}/ -L${SRCDIR}/sources/bark.cpp/build/examples -L${SRCDIR}/sources/bark.cpp/build/encodec.cpp/ggml/src/ -L${SRCDIR}/sources/bark.cpp/build/encodec.cpp/ -lbark -lencodec -lcommon -lggml -lgomp
55
// #include <gobark.h>
66
// #include <stdlib.h>
77
import "C"

‎backend/go/bark-cpp/run.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
#!/bin/bash
22
set -ex
3-
exec ./bark-cpp
3+
4+
CURDIR=$(dirname "$(realpath $0)")
5+
6+
exec $CURDIR/bark-cpp "$@"

0 commit comments

Comments
 (0)