Skip to content

Commit a96c1f9

Browse files
committed
feat(transformers): merge musicgen functionalities to a single backend
So we optimize space Signed-off-by: Ettore Di Giacinto <[email protected]>
1 parent b5eeb5c commit a96c1f9

21 files changed

+173
-401
lines changed

.bruno/LocalAI Test Requests/tts/musicgen.bru

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ headers {
1616

1717
body:json {
1818
{
19-
"backend": "transformers-musicgen",
19+
"backend": "transformers",
2020
"model": "facebook/musicgen-small",
2121
"input": "80s Synths playing Jazz"
2222
}

.github/dependabot.yml

-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ updates:
8181
directory: "/backend/python/transformers"
8282
schedule:
8383
interval: "weekly"
84-
- package-ecosystem: "pip"
85-
directory: "/backend/python/transformers-musicgen"
86-
schedule:
87-
interval: "weekly"
8884
- package-ecosystem: "pip"
8985
directory: "/backend/python/vllm"
9086
schedule:

.github/workflows/test-extra.yml

+20-20
Original file line numberDiff line numberDiff line change
@@ -153,27 +153,27 @@ jobs:
153153
make --jobs=5 --output-sync=target -C backend/python/openvoice
154154
make --jobs=5 --output-sync=target -C backend/python/openvoice test
155155
156-
tests-transformers-musicgen:
157-
runs-on: ubuntu-latest
158-
steps:
159-
- name: Clone
160-
uses: actions/checkout@v4
161-
with:
162-
submodules: true
163-
- name: Dependencies
164-
run: |
165-
sudo apt-get update
166-
sudo apt-get install build-essential ffmpeg
167-
# Install UV
168-
curl -LsSf https://astral.sh/uv/install.sh | sh
169-
sudo apt-get install -y ca-certificates cmake curl patch python3-pip
170-
sudo apt-get install -y libopencv-dev
171-
pip install --user --no-cache-dir grpcio-tools==1.64.1
156+
# tests-transformers-musicgen:
157+
# runs-on: ubuntu-latest
158+
# steps:
159+
# - name: Clone
160+
# uses: actions/checkout@v4
161+
# with:
162+
# submodules: true
163+
# - name: Dependencies
164+
# run: |
165+
# sudo apt-get update
166+
# sudo apt-get install build-essential ffmpeg
167+
# # Install UV
168+
# curl -LsSf https://astral.sh/uv/install.sh | sh
169+
# sudo apt-get install -y ca-certificates cmake curl patch python3-pip
170+
# sudo apt-get install -y libopencv-dev
171+
# pip install --user --no-cache-dir grpcio-tools==1.64.1
172172

173-
- name: Test transformers-musicgen
174-
run: |
175-
make --jobs=5 --output-sync=target -C backend/python/transformers-musicgen
176-
make --jobs=5 --output-sync=target -C backend/python/transformers-musicgen test
173+
# - name: Test transformers-musicgen
174+
# run: |
175+
# make --jobs=5 --output-sync=target -C backend/python/transformers-musicgen
176+
# make --jobs=5 --output-sync=target -C backend/python/transformers-musicgen test
177177

178178
# tests-bark:
179179
# runs-on: ubuntu-latest

Dockerfile

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG TARGETARCH
1515
ARG TARGETVARIANT
1616

1717
ENV DEBIAN_FRONTEND=noninteractive
18-
ENV EXTERNAL_GRPC_BACKENDS="coqui:/build/backend/python/coqui/run.sh,huggingface-embeddings:/build/backend/python/sentencetransformers/run.sh,transformers:/build/backend/python/transformers/run.sh,sentencetransformers:/build/backend/python/sentencetransformers/run.sh,rerankers:/build/backend/python/rerankers/run.sh,autogptq:/build/backend/python/autogptq/run.sh,bark:/build/backend/python/bark/run.sh,diffusers:/build/backend/python/diffusers/run.sh,openvoice:/build/backend/python/openvoice/run.sh,kokoro:/build/backend/python/kokoro/run.sh,vllm:/build/backend/python/vllm/run.sh,mamba:/build/backend/python/mamba/run.sh,exllama2:/build/backend/python/exllama2/run.sh,transformers-musicgen:/build/backend/python/transformers-musicgen/run.sh,parler-tts:/build/backend/python/parler-tts/run.sh"
18+
ENV EXTERNAL_GRPC_BACKENDS="coqui:/build/backend/python/coqui/run.sh,huggingface-embeddings:/build/backend/python/sentencetransformers/run.sh,transformers:/build/backend/python/transformers/run.sh,sentencetransformers:/build/backend/python/sentencetransformers/run.sh,rerankers:/build/backend/python/rerankers/run.sh,autogptq:/build/backend/python/autogptq/run.sh,bark:/build/backend/python/bark/run.sh,diffusers:/build/backend/python/diffusers/run.sh,openvoice:/build/backend/python/openvoice/run.sh,kokoro:/build/backend/python/kokoro/run.sh,vllm:/build/backend/python/vllm/run.sh,mamba:/build/backend/python/mamba/run.sh,exllama2:/build/backend/python/exllama2/run.sh,parler-tts:/build/backend/python/parler-tts/run.sh"
1919

2020

2121
RUN apt-get update && \
@@ -448,9 +448,6 @@ RUN if [[ ( "${EXTRA_BACKENDS}" =~ "coqui" || -z "${EXTRA_BACKENDS}" ) && "$IMAG
448448
; fi && \
449449
if [[ ( "${EXTRA_BACKENDS}" =~ "diffusers" || -z "${EXTRA_BACKENDS}" ) && "$IMAGE_TYPE" == "extras" ]]; then \
450450
make -C backend/python/diffusers \
451-
; fi && \
452-
if [[ ( "${EXTRA_BACKENDS}" =~ "transformers-musicgen" || -z "${EXTRA_BACKENDS}" ) && "$IMAGE_TYPE" == "extras" ]]; then \
453-
make -C backend/python/transformers-musicgen \
454451
; fi
455452

456453
RUN if [[ ( "${EXTRA_BACKENDS}" =~ "kokoro" || -z "${EXTRA_BACKENDS}" ) && "$IMAGE_TYPE" == "extras" ]]; then \

Makefile

+2-11
Original file line numberDiff line numberDiff line change
@@ -583,10 +583,10 @@ protogen-go-clean:
583583
$(RM) bin/*
584584

585585
.PHONY: protogen-python
586-
protogen-python: autogptq-protogen bark-protogen coqui-protogen diffusers-protogen exllama2-protogen mamba-protogen rerankers-protogen sentencetransformers-protogen transformers-protogen parler-tts-protogen transformers-musicgen-protogen kokoro-protogen vllm-protogen openvoice-protogen
586+
protogen-python: autogptq-protogen bark-protogen coqui-protogen diffusers-protogen exllama2-protogen mamba-protogen rerankers-protogen sentencetransformers-protogen transformers-protogen parler-tts-protogen kokoro-protogen vllm-protogen openvoice-protogen
587587

588588
.PHONY: protogen-python-clean
589-
protogen-python-clean: autogptq-protogen-clean bark-protogen-clean coqui-protogen-clean diffusers-protogen-clean exllama2-protogen-clean mamba-protogen-clean sentencetransformers-protogen-clean rerankers-protogen-clean transformers-protogen-clean transformers-musicgen-protogen-clean parler-tts-protogen-clean kokoro-protogen-clean vllm-protogen-clean openvoice-protogen-clean
589+
protogen-python-clean: autogptq-protogen-clean bark-protogen-clean coqui-protogen-clean diffusers-protogen-clean exllama2-protogen-clean mamba-protogen-clean sentencetransformers-protogen-clean rerankers-protogen-clean transformers-protogen-clean parler-tts-protogen-clean kokoro-protogen-clean vllm-protogen-clean openvoice-protogen-clean
590590

591591
.PHONY: autogptq-protogen
592592
autogptq-protogen:
@@ -668,14 +668,6 @@ parler-tts-protogen:
668668
parler-tts-protogen-clean:
669669
$(MAKE) -C backend/python/parler-tts protogen-clean
670670

671-
.PHONY: transformers-musicgen-protogen
672-
transformers-musicgen-protogen:
673-
$(MAKE) -C backend/python/transformers-musicgen protogen
674-
675-
.PHONY: transformers-musicgen-protogen-clean
676-
transformers-musicgen-protogen-clean:
677-
$(MAKE) -C backend/python/transformers-musicgen protogen-clean
678-
679671
.PHONY: kokoro-protogen
680672
kokoro-protogen:
681673
$(MAKE) -C backend/python/kokoro protogen
@@ -712,7 +704,6 @@ prepare-extra-conda-environments: protogen-python
712704
$(MAKE) -C backend/python/sentencetransformers
713705
$(MAKE) -C backend/python/rerankers
714706
$(MAKE) -C backend/python/transformers
715-
$(MAKE) -C backend/python/transformers-musicgen
716707
$(MAKE) -C backend/python/parler-tts
717708
$(MAKE) -C backend/python/kokoro
718709
$(MAKE) -C backend/python/openvoice

backend/python/transformers-musicgen/Makefile

-29
This file was deleted.

backend/python/transformers-musicgen/README.md

-5
This file was deleted.

backend/python/transformers-musicgen/backend.py

-176
This file was deleted.

backend/python/transformers-musicgen/install.sh

-14
This file was deleted.

backend/python/transformers-musicgen/requirements-cpu.txt

-3
This file was deleted.

backend/python/transformers-musicgen/requirements-cublas11.txt

-4
This file was deleted.

backend/python/transformers-musicgen/requirements-cublas12.txt

-3
This file was deleted.

backend/python/transformers-musicgen/requirements-hipblas.txt

-4
This file was deleted.

backend/python/transformers-musicgen/requirements-intel.txt

-8
This file was deleted.

backend/python/transformers-musicgen/requirements.txt

-4
This file was deleted.

backend/python/transformers-musicgen/run.sh

-4
This file was deleted.

0 commit comments

Comments
 (0)