Skip to content

Commit 6011911

Browse files
authored
fix(piper): pin petals, phonemize and espeak (#1393)
* fix: pin phonemize and espeak Signed-off-by: Ettore Di Giacinto <[email protected]> * fix: pin petals deps --------- Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent 997119c commit 6011911

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
# Pre-build piper before we start tests in order to have shared libraries in place
8484
make sources/go-piper && \
8585
GO_TAGS="tts" make -C sources/go-piper piper.o && \
86-
sudo cp -rfv sources/go-piper/piper/build/pi/lib/. /usr/lib/ && \
86+
sudo cp -rfv sources/go-piper/piper-phonemize/pi/lib/. /usr/lib/ && \
8787
# Pre-build stable diffusion before we install a newer version of abseil (not compatible with stablediffusion-ncn)
8888
GO_TAGS="stablediffusion tts" GRPC_BACKENDS=backend-assets/grpc/stablediffusion make build
8989

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ RUN if [ "${BUILD_GRPC}" = "true" ]; then \
105105
# Rebuild with defaults backends
106106
RUN make build
107107

108-
RUN if [ ! -d "/build/sources/go-piper/piper/build/pi/lib/" ]; then \
109-
mkdir -p /build/sources/go-piper/piper/build/pi/lib/ \
110-
touch /build/sources/go-piper/piper/build/pi/lib/keep \
108+
RUN if [ ! -d "/build/sources/go-piper/piper-phonemize/pi/lib/" ]; then \
109+
mkdir -p /build/sources/go-piper/piper-phonemize/pi/lib/ \
110+
touch /build/sources/go-piper/piper-phonemize/pi/lib/keep \
111111
; fi
112112

113113
###################################
@@ -151,7 +151,7 @@ RUN make prepare-sources && cd /build/grpc/cmake/build && make install && rm -rf
151151
COPY --from=builder /build/local-ai ./
152152

153153
# Copy shared libraries for piper
154-
COPY --from=builder /build/sources/go-piper/piper/build/pi/lib/* /usr/lib/
154+
COPY --from=builder /build/sources/go-piper/piper-phonemize/pi/lib/* /usr/lib/
155155

156156
# do not let stablediffusion rebuild (requires an older version of absl)
157157
COPY --from=builder /build/backend-assets/grpc/stablediffusion ./backend-assets/grpc/stablediffusion

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ WHISPER_CPP_VERSION?=3c28d1a5712e4c06b0380166e6f482ca2b525970
2828
BERT_VERSION?=6abe312cded14042f6b7c3cd8edf082713334a4d
2929

3030
# go-piper version
31-
PIPER_VERSION?=5a4c9e28c84bac09ab6baa9f88457d852cb46bb2
31+
PIPER_VERSION?=5386f3ed8e8ff6d9474832aa9a9a6a8d7b337d6a
3232

3333
# stablediffusion version
3434
STABLEDIFFUSION_VERSION?=902db5f066fd137697e3b69d0fa10d4782bd2c2f
@@ -191,7 +191,7 @@ backend-assets/gpt4all: sources/gpt4all/gpt4all-bindings/golang/libgpt4all.a
191191
backend-assets/espeak-ng-data: sources/go-piper
192192
mkdir -p backend-assets/espeak-ng-data
193193
$(MAKE) -C sources/go-piper piper.o
194-
@cp -rf sources/go-piper/piper/build/pi/share/espeak-ng-data/. backend-assets/espeak-ng-data
194+
@cp -rf sources/go-piper/piper-phonemize/pi/share/espeak-ng-data/. backend-assets/espeak-ng-data
195195

196196
sources/gpt4all/gpt4all-bindings/golang/libgpt4all.a: sources/gpt4all
197197
$(MAKE) -C sources/gpt4all/gpt4all-bindings/golang/ libgpt4all.a

backend/python/petals/petals.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
# - ncurses=6.4=h6a678d5_0
1616
# - openssl=3.0.11=h7f8727e_2
1717
# - pip=23.2.1=py311h06a4308_0
18-
# - python=3.11.5=h955ad1f_0
18+
- python=3.11.5=h955ad1f_0
1919
# - readline=8.2=h5eee18b_0
2020
# - setuptools=68.0.0=py311h06a4308_0
2121
# - sqlite=3.41.2=h5eee18b_0
@@ -25,5 +25,6 @@ dependencies:
2525
# - xz=5.4.2=h5eee18b_0
2626
# - zlib=1.2.13=h5eee18b_0
2727
- pip:
28+
- torch==2.1.0
2829
- git+https://github.com/bigscience-workshop/petals
2930
prefix: /opt/conda/envs/petals

0 commit comments

Comments
 (0)