From f7aabf1b504a6f6c471f574933144821b04ccf64 Mon Sep 17 00:00:00 2001 From: cryptk <421501+cryptk@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:12:15 -0500 Subject: [PATCH] fix: bring everything onto the same GRPC version to fix tests (#2199) fix: more places where we are installing grpc that need a version specified fix: attempt to fix metal tests fix: metal/brew is forcing an update, they don't have 1.58 available anymore Signed-off-by: Chris Jowett <421501+cryptk@users.noreply.github.com> --- .github/workflows/generate_grpc_cache.yaml | 2 +- .github/workflows/image_build.yml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/test-extra.yml | 22 +++++++++---------- .github/workflows/test.yml | 4 ++-- backend/python/autogptq/autogptq.yml | 2 +- .../transformers/transformers-nvidia.yml | 2 +- .../transformers/transformers-rocm.yml | 2 +- .../common-env/transformers/transformers.yml | 2 +- backend/python/diffusers/diffusers-rocm.yml | 2 +- backend/python/diffusers/diffusers.yml | 2 +- backend/python/diffusers/install.sh | 4 ++-- backend/python/exllama/exllama.yml | 2 +- backend/python/exllama2/exllama2.yml | 2 +- backend/python/parler-tts/parler-nvidia.yml | 2 +- backend/python/parler-tts/parler.yml | 2 +- backend/python/vall-e-x/ttsvalle.yml | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/generate_grpc_cache.yaml b/.github/workflows/generate_grpc_cache.yaml index deda6084..b52a137c 100644 --- a/.github/workflows/generate_grpc_cache.yaml +++ b/.github/workflows/generate_grpc_cache.yaml @@ -84,7 +84,7 @@ jobs: build-args: | GRPC_BASE_IMAGE=${{ matrix.grpc-base-image }} GRPC_MAKEFLAGS=--jobs=4 --output-sync=target - GRPC_VERSION=v1.58.0 + GRPC_VERSION=v1.63.0 context: . file: ./Dockerfile cache-to: type=gha,ignore-error=true diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 7d60d23a..4b5ebecd 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -218,7 +218,7 @@ jobs: BASE_IMAGE=${{ inputs.base-image }} GRPC_BASE_IMAGE=${{ inputs.grpc-base-image || inputs.base-image }} GRPC_MAKEFLAGS=--jobs=4 --output-sync=target - GRPC_VERSION=v1.58.0 + GRPC_VERSION=v1.63.0 MAKEFLAGS=${{ inputs.makeflags }} context: . file: ./Dockerfile diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dc887fc1..364307f1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,7 +5,7 @@ on: - pull_request env: - GRPC_VERSION: v1.58.0 + GRPC_VERSION: v1.63.0 permissions: contents: write diff --git a/.github/workflows/test-extra.yml b/.github/workflows/test-extra.yml index f9476d4d..1bd342e6 100644 --- a/.github/workflows/test-extra.yml +++ b/.github/workflows/test-extra.yml @@ -34,7 +34,7 @@ jobs: sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch python3-pip sudo apt-get install -y libopencv-dev - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true @@ -64,7 +64,7 @@ jobs: sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch python3-pip sudo apt-get install -y libopencv-dev - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true @@ -95,7 +95,7 @@ jobs: sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch python3-pip sudo apt-get install -y libopencv-dev - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true @@ -125,7 +125,7 @@ jobs: sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch python3-pip sudo apt-get install -y libopencv-dev - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true @@ -155,7 +155,7 @@ jobs: sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch python3-pip sudo apt-get install -y libopencv-dev - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true @@ -185,7 +185,7 @@ jobs: sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch python3-pip sudo apt-get install -y libopencv-dev - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true @@ -217,7 +217,7 @@ jobs: # sudo apt-get install -y conda # sudo apt-get install -y ca-certificates cmake curl patch python3-pip # sudo apt-get install -y libopencv-dev - # pip install --user grpcio-tools + # pip install --user grpcio-tools==1.63.0 # sudo rm -rfv /usr/bin/conda || true @@ -289,7 +289,7 @@ jobs: # sudo apt-get install -y conda # sudo apt-get install -y ca-certificates cmake curl patch python3-pip # sudo apt-get install -y libopencv-dev - # pip install --user grpcio-tools + # pip install --user grpcio-tools==1.63.0 # sudo rm -rfv /usr/bin/conda || true @@ -322,7 +322,7 @@ jobs: # sudo apt-get install -y conda # sudo apt-get install -y ca-certificates cmake curl patch python3-pip # sudo apt-get install -y libopencv-dev - # pip install --user grpcio-tools + # pip install --user grpcio-tools==1.63.0 # sudo rm -rfv /usr/bin/conda || true # - name: Test vllm # run: | @@ -349,7 +349,7 @@ jobs: sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch python3-pip sudo apt-get install -y libopencv-dev - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true - name: Test vall-e-x run: | @@ -376,7 +376,7 @@ jobs: sudo apt-get update && \ sudo apt-get install -y conda sudo apt-get install -y ca-certificates cmake curl patch espeak espeak-ng python3-pip - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 sudo rm -rfv /usr/bin/conda || true - name: Test coqui diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f50479e1..6fa003b3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ on: - '*' env: - GRPC_VERSION: v1.58.0 + GRPC_VERSION: v1.63.0 concurrency: group: ci-tests-${{ github.head_ref || github.ref }}-${{ github.repository }} @@ -203,7 +203,7 @@ jobs: - name: Dependencies run: | brew install protobuf grpc make protoc-gen-go protoc-gen-go-grpc - pip install --user grpcio-tools + pip install --user grpcio-tools==1.63.0 - name: Test run: | export C_INCLUDE_PATH=/usr/local/include diff --git a/backend/python/autogptq/autogptq.yml b/backend/python/autogptq/autogptq.yml index d22b354e..1d11c998 100644 --- a/backend/python/autogptq/autogptq.yml +++ b/backend/python/autogptq/autogptq.yml @@ -41,7 +41,7 @@ dependencies: - filelock==3.12.4 - frozenlist==1.4.0 - fsspec==2023.6.0 - - grpcio==1.59.0 + - grpcio==1.63.0 - huggingface-hub==0.16.4 - idna==3.4 - jinja2==3.1.2 diff --git a/backend/python/common-env/transformers/transformers-nvidia.yml b/backend/python/common-env/transformers/transformers-nvidia.yml index 16e494c5..cf9f2eab 100644 --- a/backend/python/common-env/transformers/transformers-nvidia.yml +++ b/backend/python/common-env/transformers/transformers-nvidia.yml @@ -47,7 +47,7 @@ dependencies: - frozenlist==1.4.0 - fsspec==2023.6.0 - funcy==2.0 - - grpcio==1.59.0 + - grpcio==1.63.0 - huggingface-hub - idna==3.4 - jinja2==3.1.2 diff --git a/backend/python/common-env/transformers/transformers-rocm.yml b/backend/python/common-env/transformers/transformers-rocm.yml index cdefcc27..3fcc407d 100644 --- a/backend/python/common-env/transformers/transformers-rocm.yml +++ b/backend/python/common-env/transformers/transformers-rocm.yml @@ -48,7 +48,7 @@ dependencies: - frozenlist==1.4.0 - fsspec==2023.6.0 - funcy==2.0 - - grpcio==1.59.0 + - grpcio==1.63.0 - huggingface-hub - idna==3.4 - jinja2==3.1.2 diff --git a/backend/python/common-env/transformers/transformers.yml b/backend/python/common-env/transformers/transformers.yml index 5f4e85b9..4cc66b11 100644 --- a/backend/python/common-env/transformers/transformers.yml +++ b/backend/python/common-env/transformers/transformers.yml @@ -47,7 +47,7 @@ dependencies: - frozenlist==1.4.0 - fsspec==2023.6.0 - funcy==2.0 - - grpcio==1.59.0 + - grpcio==1.63.0 - huggingface-hub - humanfriendly==10.0 - idna==3.4 diff --git a/backend/python/diffusers/diffusers-rocm.yml b/backend/python/diffusers/diffusers-rocm.yml index 97b2ce0f..fc1ad08c 100644 --- a/backend/python/diffusers/diffusers-rocm.yml +++ b/backend/python/diffusers/diffusers-rocm.yml @@ -34,7 +34,7 @@ dependencies: - diffusers==0.24.0 - filelock==3.12.4 - fsspec==2023.9.2 - - grpcio==1.59.0 + - grpcio==1.63.0 - huggingface-hub>=0.19.4 - idna==3.4 - importlib-metadata==6.8.0 diff --git a/backend/python/diffusers/diffusers.yml b/backend/python/diffusers/diffusers.yml index d5d2913e..60c28db9 100644 --- a/backend/python/diffusers/diffusers.yml +++ b/backend/python/diffusers/diffusers.yml @@ -32,7 +32,7 @@ dependencies: - diffusers==0.24.0 - filelock==3.12.4 - fsspec==2023.9.2 - - grpcio==1.59.0 + - grpcio==1.63.0 - huggingface-hub>=0.19.4 - idna==3.4 - importlib-metadata==6.8.0 diff --git a/backend/python/diffusers/install.sh b/backend/python/diffusers/install.sh index d83ec0be..0b6607dc 100755 --- a/backend/python/diffusers/install.sh +++ b/backend/python/diffusers/install.sh @@ -31,8 +31,8 @@ if [ -d "/opt/intel" ]; then --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/ pip install google-api-python-client \ - grpcio \ - grpcio-tools \ + grpcio==1.63.0 \ + grpcio-tools==1.63.0 \ diffusers==0.24.0 \ transformers>=4.25.1 \ accelerate \ diff --git a/backend/python/exllama/exllama.yml b/backend/python/exllama/exllama.yml index 0a30ee91..80f52af5 100644 --- a/backend/python/exllama/exllama.yml +++ b/backend/python/exllama/exllama.yml @@ -27,7 +27,7 @@ dependencies: - pip: - filelock==3.12.4 - fsspec==2023.9.2 - - grpcio==1.59.0 + - grpcio==1.63.0 - jinja2==3.1.2 - markupsafe==2.1.3 - mpmath==1.3.0 diff --git a/backend/python/exllama2/exllama2.yml b/backend/python/exllama2/exllama2.yml index d9060312..678d36a5 100644 --- a/backend/python/exllama2/exllama2.yml +++ b/backend/python/exllama2/exllama2.yml @@ -27,7 +27,7 @@ dependencies: - pip: - filelock==3.12.4 - fsspec==2023.9.2 - - grpcio==1.59.0 + - grpcio==1.63.0 - markupsafe==2.1.3 - mpmath==1.3.0 - networkx==3.1 diff --git a/backend/python/parler-tts/parler-nvidia.yml b/backend/python/parler-tts/parler-nvidia.yml index ed925e94..28ffd14c 100644 --- a/backend/python/parler-tts/parler-nvidia.yml +++ b/backend/python/parler-tts/parler-nvidia.yml @@ -26,7 +26,7 @@ dependencies: - zlib=1.2.13=h5eee18b_0 - pip: - accelerate>=0.11.0 - - grpcio==1.59.0 + - grpcio==1.63.0 - numpy==1.26.0 - nvidia-cublas-cu12==12.1.3.1 - nvidia-cuda-cupti-cu12==12.1.105 diff --git a/backend/python/parler-tts/parler.yml b/backend/python/parler-tts/parler.yml index fd0c3cb6..a3028fe1 100644 --- a/backend/python/parler-tts/parler.yml +++ b/backend/python/parler-tts/parler.yml @@ -27,7 +27,7 @@ dependencies: - pip: - accelerate>=0.11.0 - numpy==1.26.0 - - grpcio==1.59.0 + - grpcio==1.63.0 - torch==2.1.0 - transformers>=4.34.0 - descript-audio-codec diff --git a/backend/python/vall-e-x/ttsvalle.yml b/backend/python/vall-e-x/ttsvalle.yml index e235bf4e..09dbd946 100644 --- a/backend/python/vall-e-x/ttsvalle.yml +++ b/backend/python/vall-e-x/ttsvalle.yml @@ -42,7 +42,7 @@ dependencies: - future==0.18.3 - gradio==3.47.1 - gradio-client==0.6.0 - - grpcio==1.59.0 + - grpcio==1.63.0 - h11==0.14.0 - httpcore==0.18.0 - httpx==0.25.0