Skip to content

Commit

Permalink
Merge branch 'master' into gw-list-model-filter-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
dave-gray101 authored Jul 13, 2024
2 parents 845bb83 + 85fe197 commit 46b651b
Show file tree
Hide file tree
Showing 49 changed files with 220 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump_deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
token: ${{ secrets.UPDATE_BOT_TOKEN }}
push-to-fork: ci-forks/LocalAI
commit-message: ':arrow_up: Update ${{ matrix.repository }}'
title: ':arrow_up: Update ${{ matrix.repository }}'
title: 'chore: :arrow_up: Update ${{ matrix.repository }}'
branch: "update/${{ matrix.variable }}"
body: Bump of ${{ matrix.repository }} version
signoff: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bump_docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
token: ${{ secrets.UPDATE_BOT_TOKEN }}
push-to-fork: ci-forks/LocalAI
commit-message: ':arrow_up: Update docs version ${{ matrix.repository }}'
title: ':arrow_up: Update docs version ${{ matrix.repository }}'
title: 'docs: :arrow_up: update docs version ${{ matrix.repository }}'
branch: "update/docs"
body: Bump of ${{ matrix.repository }} version inside docs
signoff: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot_auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2.1.0
uses: dependabot/fetch-metadata@v2.2.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
skip-commit-verification: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_grpc_cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
uses: actions/checkout@v4

- name: Cache GRPC
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
# The build-args MUST be an EXACT match between the image cache and other workflow steps that want to use that cache.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_intel_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: actions/checkout@v4

- name: Cache Intel images
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
build-args: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/image_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ jobs:
password: ${{ secrets.quayPassword }}

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
if: github.event_name != 'pull_request'
with:
builder: ${{ steps.buildx.outputs.name }}
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
### Start testing image
- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
if: github.event_name == 'pull_request'
with:
builder: ${{ steps.buildx.outputs.name }}
Expand Down Expand Up @@ -276,7 +276,7 @@ jobs:
## End testing image
- name: Build and push AIO image
if: inputs.aio != ''
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
build-args: |
Expand All @@ -291,7 +291,7 @@ jobs:

- name: Build and push AIO image (dockerhub)
if: inputs.aio != ''
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
build-args: |
Expand Down
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DETECT_LIBS?=true
# llama.cpp versions
GOLLAMA_REPO?=https://github.com/go-skynet/go-llama.cpp
GOLLAMA_VERSION?=2b57a8ae43e4699d3dc5d1496a1ccd42922993be
CPPLLAMA_VERSION?=368645698ab648e390dcd7c00a2bf60efa654f57
CPPLLAMA_VERSION?=17eb6aa8a992cda37ee65cf848d9289bd6cad860

# gpt4all version
GPT4ALL_REPO?=https://github.com/nomic-ai/gpt4all
Expand Down Expand Up @@ -214,7 +214,7 @@ sources/go-bert.cpp:
git remote add origin $(BERT_REPO) && \
git fetch origin && \
git checkout $(BERT_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/go-bert.cpp/libgobert.a: sources/go-bert.cpp
$(MAKE) -C sources/go-bert.cpp libgobert.a
Expand All @@ -227,7 +227,7 @@ sources/go-llama.cpp:
git remote add origin $(GOLLAMA_REPO) && \
git fetch origin && \
git checkout $(GOLLAMA_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/go-llama.cpp/libbinding.a: sources/go-llama.cpp
$(MAKE) -C sources/go-llama.cpp BUILD_TYPE=$(STABLE_BUILD_TYPE) libbinding.a
Expand All @@ -240,7 +240,7 @@ sources/go-piper:
git remote add origin $(PIPER_REPO) && \
git fetch origin && \
git checkout $(PIPER_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/go-piper/libpiper_binding.a: sources/go-piper
$(MAKE) -C sources/go-piper libpiper_binding.a example/main piper.o
Expand All @@ -253,7 +253,7 @@ sources/gpt4all:
git remote add origin $(GPT4ALL_REPO) && \
git fetch origin && \
git checkout $(GPT4ALL_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/gpt4all/gpt4all-bindings/golang/libgpt4all.a: sources/gpt4all
$(MAKE) -C sources/gpt4all/gpt4all-bindings/golang/ libgpt4all.a
Expand All @@ -266,7 +266,7 @@ sources/go-rwkv.cpp:
git remote add origin $(RWKV_REPO) && \
git fetch origin && \
git checkout $(RWKV_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/go-rwkv.cpp/librwkv.a: sources/go-rwkv.cpp
cd sources/go-rwkv.cpp && cd rwkv.cpp && cmake . -DRWKV_BUILD_SHARED_LIBRARY=OFF && cmake --build . && cp librwkv.a ..
Expand All @@ -279,7 +279,7 @@ sources/go-stable-diffusion:
git remote add origin $(STABLEDIFFUSION_REPO) && \
git fetch origin && \
git checkout $(STABLEDIFFUSION_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/go-stable-diffusion/libstablediffusion.a: sources/go-stable-diffusion
CPATH="$(CPATH):/usr/include/opencv4" $(MAKE) -C sources/go-stable-diffusion libstablediffusion.a
Expand All @@ -292,7 +292,7 @@ sources/go-tiny-dream:
git remote add origin $(TINYDREAM_REPO) && \
git fetch origin && \
git checkout $(TINYDREAM_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/go-tiny-dream/libtinydream.a: sources/go-tiny-dream
$(MAKE) -C sources/go-tiny-dream libtinydream.a
Expand All @@ -305,7 +305,7 @@ sources/whisper.cpp:
git remote add origin $(WHISPER_REPO) && \
git fetch origin && \
git checkout $(WHISPER_CPP_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

sources/whisper.cpp/libwhisper.a: sources/whisper.cpp
cd sources/whisper.cpp && $(MAKE) libwhisper.a libggml.a
Expand Down
2 changes: 1 addition & 1 deletion backend/cpp/grpc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $(GRPC_REPO):
git remote add origin $(GIT_REPO_LIB_GRPC) && \
git fetch origin && \
git checkout $(TAG_LIB_GRPC) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

$(GRPC_BUILD): $(GRPC_REPO)
mkdir -p $(GRPC_BUILD)
Expand Down
2 changes: 1 addition & 1 deletion backend/cpp/llama/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ llama.cpp:
git remote add origin $(LLAMA_REPO) && \
git fetch origin && \
git checkout -b build $(LLAMA_VERSION) && \
git submodule update --init --recursive --depth 1
git submodule update --init --recursive --depth 1 --single-branch

llama.cpp/examples/grpc-server: llama.cpp
mkdir -p llama.cpp/examples/grpc-server
Expand Down
2 changes: 1 addition & 1 deletion backend/python/autogptq/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
intel-extension-for-pytorch
torch
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
2 changes: 1 addition & 1 deletion backend/python/autogptq/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
accelerate
auto-gptq==0.7.1
grpcio==1.64.0
grpcio==1.64.1
protobuf
torch
certifi
Expand Down
2 changes: 1 addition & 1 deletion backend/python/bark/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ intel-extension-for-pytorch
torch
torchaudio
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
2 changes: 1 addition & 1 deletion backend/python/bark/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
accelerate
bark==0.1.5
grpcio==1.64.0
grpcio==1.64.1
protobuf
certifi
transformers
2 changes: 1 addition & 1 deletion backend/python/common/template/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
grpcio==1.64.0
grpcio==1.64.1
protobuf
2 changes: 1 addition & 1 deletion backend/python/coqui/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ intel-extension-for-pytorch
torch
torchaudio
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
2 changes: 1 addition & 1 deletion backend/python/coqui/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
accelerate
TTS==0.22.0
grpcio==1.64.0
grpcio==1.64.1
protobuf
certifi
transformers
2 changes: 1 addition & 1 deletion backend/python/diffusers/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ intel-extension-for-pytorch
torch
torchvision
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
2 changes: 1 addition & 1 deletion backend/python/diffusers/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
accelerate
compel
diffusers
grpcio==1.64.0
grpcio==1.64.1
opencv-python
pillow
protobuf
Expand Down
2 changes: 1 addition & 1 deletion backend/python/exllama/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
grpcio==1.64.0
grpcio==1.64.1
protobuf
torch
transformers
Expand Down
2 changes: 1 addition & 1 deletion backend/python/exllama2/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
accelerate
grpcio==1.64.0
grpcio==1.64.1
protobuf
certifi
torch
Expand Down
2 changes: 1 addition & 1 deletion backend/python/mamba/requirements-install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
packaging
setuptools
wheel
torch==2.2.0
torch==2.3.1
6 changes: 3 additions & 3 deletions backend/python/mamba/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
causal-conv1d==1.2.0.post2
mamba-ssm==1.2.0.post1
grpcio==1.64.0
causal-conv1d==1.4.0
mamba-ssm==2.2.2
grpcio==1.64.1
protobuf
certifi
transformers
10 changes: 5 additions & 5 deletions backend/python/openvoice/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ torch
optimum[openvino]
grpcio==1.64.1
protobuf
librosa==0.9.1
faster-whisper==0.9.0
librosa==0.10.2.post1
faster-whisper==1.0.3
pydub==0.25.1
wavmark==0.0.3
numpy==1.26.4
numpy==2.0.0
eng_to_ipa==0.0.2
inflect==7.0.0
inflect==7.3.1
unidecode==1.3.7
whisper-timestamped==1.15.4
openai
python-dotenv
pypinyin==0.50.0
cn2an==0.5.22
jieba==0.42.1
gradio==4.36.1
gradio==4.38.1
langid==1.1.6
git+https://github.com/myshell-ai/MeloTTS.git
2 changes: 1 addition & 1 deletion backend/python/parler-tts/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ intel-extension-for-pytorch
torch
torchaudio
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
2 changes: 1 addition & 1 deletion backend/python/parler-tts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
accelerate
grpcio==1.64.0
grpcio==1.64.1
protobuf
torch
git+https://github.com/huggingface/parler-tts.git@10016fb0300c0dc31a0fb70e26f3affee7b62f16
Expand Down
2 changes: 1 addition & 1 deletion backend/python/petals/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
intel-extension-for-pytorch
torch
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
2 changes: 1 addition & 1 deletion backend/python/rerankers/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
intel-extension-for-pytorch
torch
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
2 changes: 1 addition & 1 deletion backend/python/rerankers/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
accelerate
rerankers[transformers]
grpcio==1.64.0
grpcio==1.64.1
protobuf
certifi
transformers
2 changes: 1 addition & 1 deletion backend/python/sentencetransformers/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
intel-extension-for-pytorch
torch
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
4 changes: 2 additions & 2 deletions backend/python/sentencetransformers/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
accelerate
sentence-transformers==2.5.1
sentence-transformers==3.0.1
transformers
grpcio==1.64.0
grpcio==1.64.1
protobuf
certifi
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
intel-extension-for-pytorch
torch
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
4 changes: 2 additions & 2 deletions backend/python/transformers-musicgen/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
accelerate
transformers
grpcio==1.64.0
grpcio==1.64.1
protobuf
torch
scipy==1.13.0
scipy==1.14.0
certifi
2 changes: 1 addition & 1 deletion backend/python/transformers/requirements-intel.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
intel-extension-for-pytorch
torch
optimum[openvino]
setuptools==69.5.1 # https://github.com/mudler/LocalAI/issues/2406
setuptools==70.3.0 # https://github.com/mudler/LocalAI/issues/2406
Loading

0 comments on commit 46b651b

Please sign in to comment.