diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b6675068974..26ce322d691 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -14,6 +14,8 @@ COPY requirements/ /tmp/pip-tmp/requirements/ RUN \ pip3 install awscli && \ aws s3 sync --no-sign-request s3://sphinx-packages/ dist/ && \ + # trying to resolve pesq installation issue + pip3 install -q "numpy<1.24" && \ pip3 --disable-pip-version-check --no-cache-dir install \ -r /tmp/pip-tmp/requirements/devel.txt \ -r /tmp/pip-tmp/requirements/docs.txt \ diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 6716d422f47..a6ff994f985 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - python: ["3.9", "3.10"] + python: ["3.9", "3.10", "3.11"] steps: - name: Checkout uses: actions/checkout@v4 @@ -58,12 +58,13 @@ jobs: matrix: include: # These are the base images for PL release docker images, - # so include at least all of the combinations in release-dockers.yml. + # so include at least all of the combinations in release-dockers.yml. - { python: "3.8", pytorch: "1.8.1", cuda: "11.1.1", ubuntu: "20.04" } - { python: "3.9", pytorch: "1.10", cuda: "11.8.0", ubuntu: "22.04" } - { python: "3.9", pytorch: "1.11", cuda: "11.8.0", ubuntu: "22.04" } - { python: "3.9", pytorch: "1.13", cuda: "11.8.0", ubuntu: "22.04" } - { python: "3.10", pytorch: "2.0", cuda: "11.8.0", ubuntu: "22.04" } + - { python: "3.11", pytorch: "2.0", cuda: "12.1.0", ubuntu: "22.04" } steps: - uses: actions/checkout@v4 @@ -74,7 +75,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build (and Push) Devcontainer + - name: Build (and Push) runner uses: docker/build-push-action@v5 with: build-args: | diff --git a/dockers/ubuntu-cuda/Dockerfile b/dockers/ubuntu-cuda/Dockerfile index b382279a869..ea8ab92ac45 100644 --- a/dockers/ubuntu-cuda/Dockerfile +++ b/dockers/ubuntu-cuda/Dockerfile @@ -82,8 +82,6 @@ RUN \ done && \ # trying to resolve pesq installation issue pip install -q "numpy<1.24" && \ - # needed for the gpu multiprocessing - pip install "mkl-service==2.4.0" && \ CUDA_VERSION_MM=${CUDA_VERSION%.*} && \ CU_VERSION_MM=${CUDA_VERSION_MM//'.'/''} && \ pip install --no-cache-dir -r requirements/devel.txt \