From 2706394bfef1689d381bf1b44ad820d1e024f85f Mon Sep 17 00:00:00 2001 From: Johan Date: Sun, 15 Oct 2023 17:05:06 +0200 Subject: [PATCH 1/4] Relax numpy version requirements (#4291) --- requirements.txt | 2 +- requirements_amd.txt | 2 +- requirements_amd_noavx2.txt | 2 +- requirements_apple_intel.txt | 2 +- requirements_apple_silicon.txt | 2 +- requirements_cpu_only.txt | 2 +- requirements_cpu_only_noavx2.txt | 2 +- requirements_noavx2.txt | 2 +- requirements_nowheels.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index dc7c231e..addba222 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6; platform_system != "Darwin" and platform_machine != "x86_64" gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_amd.txt b/requirements_amd.txt index e6078e59..dc732193 100644 --- a/requirements_amd.txt +++ b/requirements_amd.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6 gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_amd_noavx2.txt b/requirements_amd_noavx2.txt index 7b104fb0..84c7fb52 100644 --- a/requirements_amd_noavx2.txt +++ b/requirements_amd_noavx2.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6 gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_apple_intel.txt b/requirements_apple_intel.txt index 6c780045..09d16f81 100644 --- a/requirements_apple_intel.txt +++ b/requirements_apple_intel.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6 gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_apple_silicon.txt b/requirements_apple_silicon.txt index 9e160f93..288be50b 100644 --- a/requirements_apple_silicon.txt +++ b/requirements_apple_silicon.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6 gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_cpu_only.txt b/requirements_cpu_only.txt index 49eb4f13..cd79d867 100644 --- a/requirements_cpu_only.txt +++ b/requirements_cpu_only.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6 gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_cpu_only_noavx2.txt b/requirements_cpu_only_noavx2.txt index 35e1473c..2d99e4e2 100644 --- a/requirements_cpu_only_noavx2.txt +++ b/requirements_cpu_only_noavx2.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6 gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_noavx2.txt b/requirements_noavx2.txt index d5e4ef51..576efca1 100644 --- a/requirements_noavx2.txt +++ b/requirements_noavx2.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6; platform_system != "Darwin" and platform_machine != "x86_64" gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* diff --git a/requirements_nowheels.txt b/requirements_nowheels.txt index f165523a..283a369c 100644 --- a/requirements_nowheels.txt +++ b/requirements_nowheels.txt @@ -5,7 +5,7 @@ einops exllamav2==0.0.6 gradio==3.47.* markdown -numpy==1.24 +numpy==1.24.* optimum==1.13.1 pandas peft==0.5.* From 45fa803943a2a9a911b259c005c8f3d1afac75a9 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Sun, 15 Oct 2023 17:25:29 -0300 Subject: [PATCH 2/4] Create auto-release.yml --- .github/workflows/auto-release.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/auto-release.yml diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml new file mode 100644 index 00000000..1c3ccb4e --- /dev/null +++ b/.github/workflows/auto-release.yml @@ -0,0 +1,27 @@ +name: Weekly Snapshot Release +on: + schedule: + - cron: '15 20 * * 0' + +jobs: + create_release: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set snapshot tag + id: set_snapshot_tag + run: echo ::set-output name=tag::snapshot-$(date +'%Y-%m-%d') + + - name: Create release + id: create_release + uses: softprops/action-gh-release@v1 + with: + generate_release_notes: true + tag_name: ${{ steps.set_snapshot_tag.outputs.tag }} + name: ${{ steps.set_snapshot_tag.outputs.tag }} + draft: false + prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 3bb4046fadbe9541eb96889c2bf47b9162ab9ec9 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Sun, 15 Oct 2023 17:27:16 -0300 Subject: [PATCH 3/4] Update auto-release.yml --- .github/workflows/auto-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 1c3ccb4e..59287718 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -2,6 +2,7 @@ name: Weekly Snapshot Release on: schedule: - cron: '15 20 * * 0' + workflow_dispatch: {} jobs: create_release: From d331501ebc83e80c5d8f49c3e7c547730afff5c2 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 16 Oct 2023 08:27:19 +1000 Subject: [PATCH 4/4] Fix for using Torch with CUDA 11.8 (#4298) --- docker/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 810bb7c1..7b14b24f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,8 +11,8 @@ WORKDIR /build RUN --mount=type=cache,target=/root/.cache/pip,rw \ python3 -m venv /build/venv && \ . /build/venv/bin/activate && \ - pip3 install --upgrade pip setuptools wheel && \ - pip3 install torch torchvision torchaudio && \ + pip3 install --upgrade pip setuptools wheel ninja && \ + pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 && \ pip3 install -r requirements.txt # https://developer.nvidia.com/cuda-gpus @@ -31,6 +31,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,rw apt-get update && rm -rf /var/lib/apt/lists/* RUN --mount=type=cache,target=/root/.cache/pip,rw pip3 install virtualenv + RUN mkdir /app WORKDIR /app @@ -42,8 +43,9 @@ RUN test -n "${WEBUI_VERSION}" && git reset --hard ${WEBUI_VERSION} || echo "Usi RUN virtualenv /app/venv RUN --mount=type=cache,target=/root/.cache/pip,rw \ . /app/venv/bin/activate && \ - pip3 install --upgrade pip setuptools wheel && \ - pip3 install torch torchvision torchaudio sentence_transformers xformers + pip3 install --upgrade pip setuptools wheel ninja && \ + pip3 install torch --index-url https://download.pytorch.org/whl/cu118 && \ + pip3 install torchvision torchaudio sentence_transformers xformers # Copy and install GPTQ-for-LLaMa COPY --from=builder /build /app/repositories/GPTQ-for-LLaMa