Upgrade ROCm version (pytorch#2405)

Summary: - Upgrade supported ROCm version Pull Request resolved: pytorch#2405 Reviewed By: spcyppt Differential Revision: D54691119 Pulled By: q10 fbshipit-source-id: f3f0a18944d91d8bc3c56af76e457430fe9a5f17
ROCm · Mar 8, 2024 · 0b392a0 · 0b392a0
1 parent 3affa45
commit 0b392a0
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/.github/scripts/utils_pip.bash b/.github/scripts/utils_pip.bash
@@ -42,7 +42,7 @@ __export_package_variant_info () {
   local package_variant_type_version="$1"
 
   local FALLBACK_VERSION_CUDA="12.1.1"
-  local FALLBACK_VERSION_ROCM="5.7.0"
+  local FALLBACK_VERSION_ROCM="6.0.2"
 
   if [ "$package_variant_type_version" == "cuda" ]; then
     # If "cuda", default to latest CUDA
@@ -80,7 +80,7 @@ __export_package_variant_info () {
       local rocm_version="${variant_version:-${FALLBACK_VERSION_ROCM}}"
       # shellcheck disable=SC2206
       local rocm_version_arr=(${rocm_version//./ })
-      # Convert, i.e. rocm 5.5.1 => rocm5.5
+      # Convert, i.e. rocm 5.6.1 => rocm5.6
       local variant_type="rocm"
       local variant_version="${rocm_version_arr[0]}.${rocm_version_arr[1]}"
 

diff --git a/.github/workflows/fbgemm_gpu_ci_cuda.yml b/.github/workflows/fbgemm_gpu_ci_cuda.yml
@@ -104,7 +104,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Install cuDNN
       run: . $PRELUDE; install_cudnn $BUILD_ENV "$(pwd)/build_only/cudnn" ${{ matrix.cuda-version }}
@@ -192,7 +192,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Prepare FBGEMM_GPU Build
       run: . $PRELUDE; cd fbgemm_gpu; prepare_fbgemm_gpu_build $BUILD_ENV

diff --git a/.github/workflows/fbgemm_gpu_ci_rocm.yml b/.github/workflows/fbgemm_gpu_ci_rocm.yml
@@ -64,7 +64,7 @@ jobs:
         ]
         container-image: [ "ubuntu:20.04" ]
         python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
-        rocm-version: [ "5.7" ]
+        rocm-version: [ "6.0.2" ]
         compiler: [ "gcc", "clang" ]
 
     steps:
@@ -108,7 +108,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Prepare FBGEMM_GPU Build
       run: . $PRELUDE; cd fbgemm_gpu; prepare_fbgemm_gpu_build $BUILD_ENV
@@ -144,7 +144,7 @@ jobs:
         ]
         # ROCm machines are limited, so we only test a subset of Python versions
         python-version: [ "3.12" ]
-        rocm-version: [ "5.7" ]
+        rocm-version: [ "6.0.2" ]
         compiler: [ "gcc", "clang" ]
     needs: build_artifact
 
@@ -183,7 +183,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Prepare FBGEMM_GPU Build
       run: . $PRELUDE; cd fbgemm_gpu; prepare_fbgemm_gpu_build $BUILD_ENV

diff --git a/.github/workflows/fbgemm_gpu_docs.yml b/.github/workflows/fbgemm_gpu_docs.yml
@@ -77,7 +77,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Prepare FBGEMM_GPU Build
       run: . $PRELUDE; cd fbgemm_gpu; prepare_fbgemm_gpu_build $BUILD_ENV

diff --git a/.github/workflows/fbgemm_gpu_pip.yml b/.github/workflows/fbgemm_gpu_pip.yml
@@ -92,7 +92,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Install FBGEMM_GPU-CPU
       run: . $PRELUDE; install_fbgemm_gpu_pip $BUILD_ENV ${{ github.event.inputs.fbgemm_gpu_channel_version || 'nightly' }} cpu
@@ -152,7 +152,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Install FBGEMM_GPU-CUDA
       run: . $PRELUDE; install_fbgemm_gpu_pip $BUILD_ENV ${{ github.event.inputs.fbgemm_gpu_channel_version || 'nightly' }} cuda/${{ matrix.cuda-version }}
@@ -218,7 +218,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Install FBGEMM_GPU-ROCm
       run: . $PRELUDE; install_fbgemm_gpu_pip $BUILD_ENV ${{ github.event.inputs.fbgemm_gpu_channel_version || 'nightly' }} rocm/${{ matrix.rocm-version }}

diff --git a/.github/workflows/fbgemm_gpu_release_cpu.yml b/.github/workflows/fbgemm_gpu_release_cpu.yml
@@ -97,7 +97,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Prepare FBGEMM_GPU Build
       run: . $PRELUDE; cd fbgemm_gpu; prepare_fbgemm_gpu_build $BUILD_ENV
@@ -165,7 +165,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Prepare FBGEMM_GPU Build
       run: . $PRELUDE; cd fbgemm_gpu; prepare_fbgemm_gpu_build $BUILD_ENV

diff --git a/.github/workflows/fbgemm_gpu_release_cuda.yml b/.github/workflows/fbgemm_gpu_release_cuda.yml
@@ -106,7 +106,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Install cuDNN
       run: . $PRELUDE; install_cudnn $BUILD_ENV "$(pwd)/build_only/cudnn" ${{ matrix.cuda-version }}
@@ -178,7 +178,7 @@ jobs:
 
     - name: Collect PyTorch Environment Info
       if: ${{ success() || failure() }}
-      run: . $PRELUDE; if which conda; then collect_pytorch_env_info $BUILD_ENV; fi
+      run: if . $PRELUDE && which conda; then collect_pytorch_env_info $BUILD_ENV; fi
 
     - name: Prepare FBGEMM_GPU Build
       run: . $PRELUDE; cd fbgemm_gpu; prepare_fbgemm_gpu_build $BUILD_ENV

diff --git a/.gitignore b/.gitignore
@@ -91,5 +91,10 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 
+# Visual Studio Code
+.history/
+.vscode/
+*.vsix
+
 # Sphinx repos
 pytorch-sphinx-theme/