diff --git a/.circleci/docker/build.sh b/.circleci/docker/build.sh index de3c6ed9b75..bc05bdfa15b 100755 --- a/.circleci/docker/build.sh +++ b/.circleci/docker/build.sh @@ -222,14 +222,6 @@ case "$image" in DB=yes VISION=yes ;; - pytorch-linux-bionic-rocm4.3.1-py3.7) - ANACONDA_PYTHON_VERSION=3.7 - GCC_VERSION=9 - PROTOBUF=yes - DB=yes - VISION=yes - ROCM_VERSION=4.3.1 - ;; pytorch-linux-bionic-rocm4.5-py3.7) ANACONDA_PYTHON_VERSION=3.7 GCC_VERSION=9 @@ -238,6 +230,14 @@ case "$image" in VISION=yes ROCM_VERSION=4.5.2 ;; + pytorch-linux-bionic-rocm5.0-py3.7) + ANACONDA_PYTHON_VERSION=3.7 + GCC_VERSION=9 + PROTOBUF=yes + DB=yes + VISION=yes + ROCM_VERSION=5.0 + ;; *) # Catch-all for builds that are not hardcoded. PROTOBUF=yes diff --git a/.circleci/docker/common/install_rocm.sh b/.circleci/docker/common/install_rocm.sh index b7da1daf71c..2c714ea907c 100644 --- a/.circleci/docker/common/install_rocm.sh +++ b/.circleci/docker/common/install_rocm.sh @@ -35,7 +35,7 @@ ver() { } # Map ROCm version to AMDGPU version -declare -A AMDGPU_VERSIONS=( ["4.5.2"]="21.40.2" ) +declare -A AMDGPU_VERSIONS=( ["4.5.2"]="21.40.2" ["5.0"]="21.50" ) install_ubuntu() { apt-get update diff --git a/.github/scripts/generate_ci_workflows.py b/.github/scripts/generate_ci_workflows.py index 7b8349e3e49..e15d66d6ddc 100755 --- a/.github/scripts/generate_ci_workflows.py +++ b/.github/scripts/generate_ci_workflows.py @@ -667,8 +667,8 @@ LINUX_WORKFLOWS = [ ), CIWorkflow( arch="linux", - build_environment="linux-bionic-rocm4.5-py3.7", - docker_image_base=f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-bionic-rocm4.5-py3.7", + build_environment="linux-bionic-rocm5.0-py3.7", + docker_image_base=f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-bionic-rocm5.0-py3.7", test_runner_type=LINUX_ROCM_TEST_RUNNER, num_test_shards=2, enable_distributed_test=False, @@ -936,8 +936,8 @@ MACOS_WORKFLOWS = [ ] DOCKER_IMAGES = { - f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-bionic-rocm4.3.1-py3.7", # for rocm - f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-bionic-rocm4.5-py3.7", # for rocm + f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-bionic-rocm4.5-py3.7", # for rocm + f"{DOCKER_REGISTRY}/pytorch/pytorch-linux-bionic-rocm5.0-py3.7", # for rocm } DOCKER_IMAGES.update({ diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index ee71a6f42df..a9e18fb866d 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -27,8 +27,8 @@ jobs: - docker-image-name: pytorch-linux-bionic-cuda10.2-cudnn7-py3.9-gcc7 - docker-image-name: pytorch-linux-bionic-cuda11.5-cudnn8-py3-gcc7 - docker-image-name: pytorch-linux-bionic-py3.7-clang9 - - docker-image-name: pytorch-linux-bionic-rocm4.3.1-py3.7 - docker-image-name: pytorch-linux-bionic-rocm4.5-py3.7 + - docker-image-name: pytorch-linux-bionic-rocm5.0-py3.7 - docker-image-name: pytorch-linux-xenial-cuda10.2-cudnn7-py3-gcc7 - docker-image-name: pytorch-linux-xenial-cuda11.3-cudnn8-py3-gcc7 - docker-image-name: pytorch-linux-xenial-py3-clang5-android-ndk-r19c diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 0dc89becaa8..fb2c96fa56e 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -175,20 +175,20 @@ jobs: { config: "distributed", shard: 1, num_shards: 1, runner: "linux.8xlarge.nvidia.gpu" }, ]} - linux-bionic-rocm4_5-py3_7-build: - name: linux-bionic-rocm4.5-py3.7 + linux-bionic-rocm5_0-py3_7-build: + name: linux-bionic-rocm5.0-py3.7 uses: ./.github/workflows/_linux-build.yml with: - build-environment: linux-bionic-rocm4.5-py3.7 - docker-image-name: pytorch-linux-bionic-rocm4.5-py3.7 + build-environment: linux-bionic-rocm5.0-py3.7 + docker-image-name: pytorch-linux-bionic-rocm5.0-py3.7 - linux-bionic-rocm4_5-py3_7-test: - name: linux-bionic-rocm4.5-py3.7 + linux-bionic-rocm5_0-py3_7-test: + name: linux-bionic-rocm5.0-py3.7 uses: ./.github/workflows/_rocm-test.yml - needs: linux-bionic-rocm4_5-py3_7-build + needs: linux-bionic-rocm5_0-py3_7-build with: - build-environment: linux-bionic-rocm4.5-py3.7 - docker-image: ${{ needs.linux-bionic-rocm4_5-py3_7-build.outputs.docker-image }} + build-environment: linux-bionic-rocm5.0-py3.7 + docker-image: ${{ needs.linux-bionic-rocm5_0-py3_7-build.outputs.docker-image }} test-matrix: | { include: [ { config: "default", shard: 1, num_shards: 2, runner: "linux.rocm.gpu" },