From 61b64a65abf771f5844012f18c3b96bdc3e5edb3 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Thu, 3 Jul 2025 19:31:10 +0200 Subject: [PATCH] chore(bark-cpp): generalize and move to bark-cpp (#5786) Signed-off-by: Ettore Di Giacinto --- Makefile | 12 ++++++------ backend/Dockerfile.go | 6 +++--- backend/go/{bark => bark-cpp}/Makefile | 0 backend/go/{bark => bark-cpp}/gobark.cpp | 0 backend/go/{bark => bark-cpp}/gobark.go | 0 backend/go/{bark => bark-cpp}/gobark.h | 0 backend/go/{bark => bark-cpp}/main.go | 0 backend/go/{bark => bark-cpp}/run.sh | 0 8 files changed, 9 insertions(+), 9 deletions(-) rename backend/go/{bark => bark-cpp}/Makefile (100%) rename backend/go/{bark => bark-cpp}/gobark.cpp (100%) rename backend/go/{bark => bark-cpp}/gobark.go (100%) rename backend/go/{bark => bark-cpp}/gobark.h (100%) rename backend/go/{bark => bark-cpp}/main.go (100%) rename backend/go/{bark => bark-cpp}/run.sh (100%) diff --git a/Makefile b/Makefile index 1ea9c1def..4abc71abf 100644 --- a/Makefile +++ b/Makefile @@ -265,8 +265,8 @@ sources/bark.cpp/build/libbark.a: sources/bark.cpp cmake $(CMAKE_ARGS) .. && \ cmake --build . --config Release -backend/go/bark/libbark.a: sources/bark.cpp/build/libbark.a - $(MAKE) -C backend/go/bark libbark.a +backend/go/bark-cpp/libbark.a: sources/bark.cpp/build/libbark.a + $(MAKE) -C backend/go/bark-cpp libbark.a ## go-piper sources/go-piper: @@ -355,7 +355,7 @@ clean: ## Remove build related file rm -rf release/ rm -rf backend-assets/* $(MAKE) -C backend/cpp/grpc clean - $(MAKE) -C backend/go/bark clean + $(MAKE) -C backend/go/bark-cpp clean $(MAKE) -C backend/cpp/llama clean $(MAKE) -C backend/go/image/stablediffusion-ggml clean rm -rf backend/cpp/llama-* || true @@ -778,9 +778,9 @@ backend-assets/util/llama-cpp-rpc-server: backend-assets/grpc/llama-cpp-grpc mkdir -p backend-assets/util/ cp -rf backend/cpp/llama-grpc/llama.cpp/build/bin/rpc-server backend-assets/util/llama-cpp-rpc-server -backend-assets/grpc/bark-cpp: backend/go/bark/libbark.a backend-assets/grpc - CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(CURDIR)/backend/go/bark/ LIBRARY_PATH=$(CURDIR)/backend/go/bark/ \ - $(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/bark-cpp ./backend/go/bark/ +backend-assets/grpc/bark-cpp: backend/go/bark-cpp/libbark.a backend-assets/grpc + CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(CURDIR)/backend/go/bark-cpp/ LIBRARY_PATH=$(CURDIR)/backend/go/bark-cpp/ \ + $(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/bark-cpp ./backend/go/bark-cpp/ ifneq ($(UPX),) $(UPX) backend-assets/grpc/bark-cpp endif diff --git a/backend/Dockerfile.go b/backend/Dockerfile.go index 7770e09cb..504e9dafb 100644 --- a/backend/Dockerfile.go +++ b/backend/Dockerfile.go @@ -123,9 +123,9 @@ EOT COPY . /LocalAI -RUN cd /LocalAI && make backend-assets/grpc/bark-cpp +RUN cd /LocalAI && make backend-assets/grpc/${BACKEND} FROM scratch -COPY --from=builder /LocalAI/backend-assets/grpc/bark-cpp ./ -COPY --from=builder /LocalAI/backend/go/bark/run.sh ./ \ No newline at end of file +COPY --from=builder /LocalAI/backend-assets/grpc/${BACKEND} ./ +COPY --from=builder /LocalAI/backend/go/${BACKEND}/run.sh ./ \ No newline at end of file diff --git a/backend/go/bark/Makefile b/backend/go/bark-cpp/Makefile similarity index 100% rename from backend/go/bark/Makefile rename to backend/go/bark-cpp/Makefile diff --git a/backend/go/bark/gobark.cpp b/backend/go/bark-cpp/gobark.cpp similarity index 100% rename from backend/go/bark/gobark.cpp rename to backend/go/bark-cpp/gobark.cpp diff --git a/backend/go/bark/gobark.go b/backend/go/bark-cpp/gobark.go similarity index 100% rename from backend/go/bark/gobark.go rename to backend/go/bark-cpp/gobark.go diff --git a/backend/go/bark/gobark.h b/backend/go/bark-cpp/gobark.h similarity index 100% rename from backend/go/bark/gobark.h rename to backend/go/bark-cpp/gobark.h diff --git a/backend/go/bark/main.go b/backend/go/bark-cpp/main.go similarity index 100% rename from backend/go/bark/main.go rename to backend/go/bark-cpp/main.go diff --git a/backend/go/bark/run.sh b/backend/go/bark-cpp/run.sh similarity index 100% rename from backend/go/bark/run.sh rename to backend/go/bark-cpp/run.sh