Skip to content

Commit 1342fb5

Browse files
ROCm5.3 nightly wheels (#1193)
* Enable ROCm5.3 nightly wheels * Enable ROCm5.3 docker builds * Update amdgpu repo url for ROCm5.3 * ROCm5.3 not supported on Ubuntu 18.04 * empty * Another empty commit * Try disabling MLIR build to shorten docker build time * Clean up disk space * MLIR project changed names from ROCm5.4 * Retrigger CI to get around flaky magma git access error
1 parent d5f2b39 commit 1342fb5

File tree

8 files changed

+35
-15
lines changed

8 files changed

+35
-15
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-18.04
4848
strategy:
4949
matrix:
50-
rocm_version: ["5.1.1", "5.2"]
50+
rocm_version: ["5.2", "5.3"]
5151
env:
5252
GPU_ARCH_TYPE: rocm
5353
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
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-18.04
5050
strategy:
5151
matrix:
52-
rocm_version: ["5.1.1", "5.2"]
52+
rocm_version: ["5.2", "5.3"]
5353
env:
5454
GPU_ARCH_TYPE: rocm
5555
GPU_ARCH_VERSION: ${{ matrix.rocm_version }}

common/install_miopen.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ fi
8888

8989
git clone https://github.com/ROCmSoftwarePlatform/MIOpen -b ${MIOPEN_BRANCH}
9090
pushd MIOpen
91+
# Don't build MLIR to save docker build time
92+
# since we are disabling MLIR backend for MIOpen anyway
93+
if [[ $ROCM_INT -ge 50400 ]] && [[ $ROCM_INT -lt 50500 ]]; then
94+
sed -i '/rocMLIR/d' requirements.txt
95+
elif [[ $ROCM_INT -ge 50200 ]] && [[ $ROCM_INT -lt 50400 ]]; then
96+
sed -i '/llvm-project-mlir/d' requirements.txt
97+
fi
9198
## MIOpen minimum requirements
9299
cmake -P install_deps.cmake --minimum
93100
## Build MIOpen
@@ -99,12 +106,15 @@ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig CXX=${ROCM_INSTALL_PATH}/llvm/bin/clang
99106
-DCMAKE_PREFIX_PATH="${ROCM_INSTALL_PATH}/hip;${ROCM_INSTALL_PATH}"
100107
make MIOpen -j $(nproc)
101108
make -j $(nproc) package
102-
yum install -y miopen-*.rpm
103-
popd
104-
rm -rf MIOpen
105109

106-
# Cleanup
110+
# clean up since CI runner was running out of disk space
111+
rm -rf /usr/local/cget
112+
rm -rf /tmp/*
107113
yum clean all
108114
rm -rf /var/cache/yum
109115
rm -rf /var/lib/yum/yumdb
110116
rm -rf /var/lib/yum/history
117+
118+
yum install -y miopen-*.rpm
119+
popd
120+
rm -rf MIOpen

common/install_rocm.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ install_ubuntu() {
3333
if [[ $(ver $ROCM_VERSION) -ge $(ver 4.5) ]]; then
3434
# Add amdgpu repository
3535
UBUNTU_VERSION_NAME=`cat /etc/os-release | grep UBUNTU_CODENAME | awk -F= '{print $2}'`
36-
local amdgpu_baseurl="https://repo.radeon.com/amdgpu/${AMDGPU_VERSIONS[$ROCM_VERSION]}/ubuntu"
36+
local amdgpu_baseurl
37+
if [[ $(ver $ROCM_VERSION) -ge $(ver 5.3) ]]; then
38+
amdgpu_baseurl="https://repo.radeon.com/amdgpu/${ROCM_VERSION}/ubuntu"
39+
else
40+
amdgpu_baseurl="https://repo.radeon.com/amdgpu/${AMDGPU_VERSIONS[$ROCM_VERSION]}/ubuntu"
41+
fi
3742
echo "deb [arch=amd64] ${amdgpu_baseurl} ${UBUNTU_VERSION_NAME} main" > /etc/apt/sources.list.d/amdgpu.list
3843
fi
3944

@@ -83,7 +88,12 @@ install_centos() {
8388

8489
if [[ $(ver $ROCM_VERSION) -ge $(ver 4.5) ]]; then
8590
# Add amdgpu repository
86-
local amdgpu_baseurl="https://repo.radeon.com/amdgpu/${AMDGPU_VERSIONS[$ROCM_VERSION]}/rhel/7.9/main/x86_64"
91+
local amdgpu_baseurl
92+
if [[ $(ver $ROCM_VERSION) -ge $(ver 5.3) ]]; then
93+
amdgpu_baseurl="https://repo.radeon.com/amdgpu/${ROCM_VERSION}/rhel/7.9/main/x86_64"
94+
else
95+
amdgpu_baseurl="https://repo.radeon.com/amdgpu/${AMDGPU_VERSIONS[$ROCM_VERSION]}/rhel/7.9/main/x86_64"
96+
fi
8797
echo "[AMDGPU]" > /etc/yum.repos.d/amdgpu.repo
8898
echo "name=AMDGPU" >> /etc/yum.repos.d/amdgpu.repo
8999
echo "baseurl=${amdgpu_baseurl}" >> /etc/yum.repos.d/amdgpu.repo

libtorch/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ RUN apt-get update -y && \
6969
apt-get install python -y && \
7070
apt-get clean
7171

72-
FROM rocm as rocm5.1.1
73-
RUN ROCM_VERSION=5.1.1 bash ./install_rocm.sh && rm install_rocm.sh
72+
FROM rocm as rocm5.2
73+
RUN ROCM_VERSION=5.2 bash ./install_rocm.sh && rm install_rocm.sh
7474
RUN bash ./install_rocm_drm.sh && rm install_rocm_drm.sh
7575
RUN bash ./install_rocm_magma.sh && rm install_rocm_magma.sh
7676

77-
FROM rocm as rocm5.2
78-
RUN ROCM_VERSION=5.2 bash ./install_rocm.sh && rm install_rocm.sh
77+
FROM rocm as rocm5.3
78+
RUN ROCM_VERSION=5.3 bash ./install_rocm.sh && rm install_rocm.sh
7979
RUN bash ./install_rocm_drm.sh && rm install_rocm_drm.sh
8080
RUN bash ./install_rocm_magma.sh && rm install_rocm_magma.sh
8181

libtorch/build_all_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ for cuda_version in 11.8 11.7 11.6; do
88
GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/libtorch/build_docker.sh"
99
done
1010

11-
for rocm_version in 5.1.1 5.2; do
11+
for rocm_version in 5.2 5.3; do
1212
GPU_ARCH_TYPE=rocm GPU_ARCH_VERSION="${rocm_version}" "${TOPDIR}/libtorch/build_docker.sh"
1313
done

libtorch/build_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ case ${GPU_ARCH_TYPE} in
2727
rocm)
2828
BASE_TARGET=rocm${GPU_ARCH_VERSION}
2929
DOCKER_TAG=rocm${GPU_ARCH_VERSION}
30-
GPU_IMAGE=rocm/dev-ubuntu-18.04:${GPU_ARCH_VERSION}
30+
GPU_IMAGE=rocm/dev-ubuntu-20.04:${GPU_ARCH_VERSION}
3131
PYTORCH_ROCM_ARCH="gfx900;gfx906;gfx908"
3232
ROCM_REGEX="([0-9]+)\.([0-9]+)[\.]?([0-9]*)"
3333
if [[ $GPU_ARCH_VERSION =~ $ROCM_REGEX ]]; then

manywheel/build_all_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for cuda_version in 11.7 11.6; do
1414
MANYLINUX_VERSION=2014 GPU_ARCH_TYPE=cuda GPU_ARCH_VERSION="${cuda_version}" "${TOPDIR}/manywheel/build_docker.sh"
1515
done
1616

17-
for rocm_version in 5.1.1 5.2; do
17+
for rocm_version in 5.2 5.3; do
1818
GPU_ARCH_TYPE=rocm GPU_ARCH_VERSION="${rocm_version}" "${TOPDIR}/manywheel/build_docker.sh"
1919
MANYLINUX_VERSION=2014 GPU_ARCH_TYPE=rocm GPU_ARCH_VERSION="${rocm_version}" "${TOPDIR}/manywheel/build_docker.sh"
2020
done

0 commit comments

Comments
 (0)