Skip to content

Commit 18547ae

Browse files
committed
workaround
1 parent b1e0083 commit 18547ae

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ RUN make prepare
105105
COPY . .
106106
COPY .git .
107107

108-
# piper does not tolerate a newer version of abseil, build only the piper backend
109-
RUN GRPC_BACKENDS=backend-assets/grpc/piper ESPEAK_DATA=/build/lib/Linux-$(uname -m)/piper_phonemize/lib/espeak-ng-data make build
108+
# stablediffusion does not tolerate a newer version of abseil, build it first
109+
RUN GRPC_BACKENDS=backend-assets/grpc/stablediffusion make build
110110

111111
RUN git clone --recurse-submodules -b v1.58.0 --depth 1 --shallow-submodules https://github.com/grpc/grpc && \
112112
cd grpc && mkdir -p cmake/build && cd cmake/build && cmake -DgRPC_INSTALL=ON \
113113
-DgRPC_BUILD_TESTS=OFF \
114114
../.. && make -j12 install && rm -rf grpc
115115

116116
# Rebuild with defaults backends
117-
RUN make build
117+
RUN ESPEAK_DATA=/build/lib/Linux-$(uname -m)/piper_phonemize/lib/espeak-ng-data make build
118118

119119
###################################
120120
###################################

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ go-llama/libbinding.a: go-llama
225225
go-llama-stable/libbinding.a: go-llama-stable
226226
$(MAKE) -C go-llama-stable BUILD_TYPE=$(STABLE_BUILD_TYPE) libbinding.a
227227

228-
go-piper/libpiper_binding.a:
228+
go-piper/libpiper_binding.a: go-piper
229229
$(MAKE) -C go-piper libpiper_binding.a example/main
230230

231231
get-sources: go-llama go-llama-stable go-ggllm go-ggml-transformers gpt4all go-piper go-rwkv whisper.cpp go-bert bloomz go-stable-diffusion
@@ -464,9 +464,12 @@ backend-assets/grpc/bert-embeddings: backend-assets/grpc go-bert/libgobert.a
464464
backend-assets/grpc/langchain-huggingface: backend-assets/grpc
465465
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/langchain-huggingface ./cmd/grpc/langchain-huggingface/
466466

467-
backend-assets/grpc/stablediffusion: backend-assets/grpc go-stable-diffusion/libstablediffusion.a
468-
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(shell pwd)/go-stable-diffusion/ LIBRARY_PATH=$(shell pwd)/go-stable-diffusion/ \
469-
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/stablediffusion ./cmd/grpc/stablediffusion/
467+
backend-assets/grpc/stablediffusion: backend-assets/grpc
468+
if [ ! -f backend-assets/grpc/stablediffusion ]; then \
469+
$(MAKE) go-stable-diffusion/libstablediffusion.a
470+
CGO_LDFLAGS="$(CGO_LDFLAGS)" C_INCLUDE_PATH=$(shell pwd)/go-stable-diffusion/ LIBRARY_PATH=$(shell pwd)/go-stable-diffusion/ \
471+
$(GOCMD) build -ldflags "$(LD_FLAGS)" -tags "$(GO_TAGS)" -o backend-assets/grpc/stablediffusion ./cmd/grpc/stablediffusion/
472+
fi
470473

471474
backend-assets/grpc/piper: backend-assets/grpc backend-assets/espeak-ng-data go-piper/libpiper_binding.a
472475
CGO_LDFLAGS="$(CGO_LDFLAGS)" LIBRARY_PATH=$(shell pwd)/go-piper \

0 commit comments

Comments
 (0)