Skip to content

Commit 17ea05e

Browse files
Update builder images to ROCm5.7 (#1541)
* Update docker build images for rocm5.7 * Fix erroneous logic that was skipping msccl files even for ROCm5.6; update msccl path for ROCm5.7 (cherry picked from commit 36c10cc) * missing bzip2 package install for miopen * Revert "missing bzip2 package install for miopen" This reverts commit 8ef5fc9. * ROCm 5.7 MIOpen does not need any patches, do not build from source --------- Co-authored-by: Jeff Daily <[email protected]>
1 parent 22f0903 commit 17ea05e

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

.github/workflows/build-libtorch-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: linux.12xlarge
5353
strategy:
5454
matrix:
55-
rocm_version: ["5.5", "5.6"]
55+
rocm_version: ["5.6", "5.7"]
5656
env:
5757
GPU_ARCH_TYPE: rocm
5858
GPU_ARCH_VERSION: ${{ matrix.rocm_version }}

.github/workflows/build-manywheel-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: linux.12xlarge
5959
strategy:
6060
matrix:
61-
rocm_version: ["5.5", "5.6"]
61+
rocm_version: ["5.6", "5.7"]
6262
env:
6363
GPU_ARCH_TYPE: rocm
6464
GPU_ARCH_VERSION: ${{ matrix.rocm_version }}

common/install_miopen.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ MIOPEN_CMAKE_COMMON_FLAGS="
5858
-DMIOPEN_BUILD_DRIVER=OFF
5959
"
6060
# Pull MIOpen repo and set DMIOPEN_EMBED_DB based on ROCm version
61-
if [[ $ROCM_INT -ge 50600 ]] && [[ $ROCM_INT -lt 50700 ]]; then
61+
if [[ $ROCM_INT -ge 50700 ]] && [[ $ROCM_INT -lt 50800 ]]; then
62+
echo "ROCm 5.7 MIOpen does not need any patches, do not build from source"
63+
exit 0
64+
elif [[ $ROCM_INT -ge 50600 ]] && [[ $ROCM_INT -lt 50700 ]]; then
6265
MIOPEN_BRANCH="release/rocm-rel-5.6-staging"
6366
elif [[ $ROCM_INT -ge 50500 ]] && [[ $ROCM_INT -lt 50600 ]]; then
6467
MIOPEN_BRANCH="release/rocm-rel-5.5-gfx11"

manywheel/build_rocm.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,17 @@ if [[ $ROCM_INT -ge 50500 ]]; then
204204

205205
DEPS_AUX_SRCLIST+=(${MIOPEN_SHARE_FILES[@]/#/$MIOPEN_SHARE_SRC/})
206206
DEPS_AUX_DSTLIST+=(${MIOPEN_SHARE_FILES[@]/#/$MIOPEN_SHARE_DST/})
207-
elif [[ $ROCM_INT -ge 50600 ]]; then
207+
fi
208+
209+
if [[ $ROCM_INT -ge 50600 ]]; then
208210
# RCCL library files
209-
RCCL_SHARE_SRC=$ROCM_HOME/lib/msccl-algorithms
210-
RCCL_SHARE_DST=lib/msccl-algorithms
211+
if [[ $ROCM_INT -ge 50700 ]]; then
212+
RCCL_SHARE_SRC=$ROCM_HOME/share/rccl/msccl-algorithms
213+
RCCL_SHARE_DST=share/rccl/msccl-algorithms
214+
else
215+
RCCL_SHARE_SRC=$ROCM_HOME/lib/msccl-algorithms
216+
RCCL_SHARE_DST=lib/msccl-algorithms
217+
fi
211218
RCCL_SHARE_FILES=($(ls $RCCL_SHARE_SRC))
212219

213220
DEPS_AUX_SRCLIST+=(${RCCL_SHARE_FILES[@]/#/$RCCL_SHARE_SRC/})

0 commit comments

Comments
 (0)