diff --git a/common/install_rocm_drm.sh b/common/install_rocm_drm.sh index a6665f23e..d722a9c6c 100644 --- a/common/install_rocm_drm.sh +++ b/common/install_rocm_drm.sh @@ -11,10 +11,7 @@ case "$ID" in apt-get install -y libpciaccess-dev pkg-config apt-get clean ;; - centos) - yum install -y libpciaccess-devel pkgconfig - ;; - almalinux) + centos|almalinux) yum install -y libpciaccess-devel pkgconfig ;; *) diff --git a/manywheel/build_docker.sh b/manywheel/build_docker.sh index 2bba151b8..b885b03e1 100755 --- a/manywheel/build_docker.sh +++ b/manywheel/build_docker.sh @@ -76,7 +76,7 @@ case ${GPU_ARCH_TYPE} in MANY_LINUX_VERSION="aarch64" DOCKERFILE_SUFFIX="_cuda_aarch64" ;; - rocm) + rocm|rocm-manylinux_2_28) TARGET=rocm_final DOCKER_TAG=rocm${GPU_ARCH_VERSION} GPU_IMAGE=rocm/dev-centos-7:${GPU_ARCH_VERSION}-complete @@ -92,25 +92,9 @@ case ${GPU_ARCH_TYPE} in PYTORCH_ROCM_ARCH+=";gfx942" fi DOCKER_GPU_BUILD_ARG="--build-arg ROCM_VERSION=${GPU_ARCH_VERSION} --build-arg PYTORCH_ROCM_ARCH=${PYTORCH_ROCM_ARCH} --build-arg DEVTOOLSET_VERSION=9" - ;; - rocm-manylinux_2_28) - TARGET=rocm_final - DOCKER_TAG=rocm${GPU_ARCH_VERSION} - GPU_IMAGE=amd64/almalinux:8 - #PYTORCH_ROCM_ARCH="gfx900;gfx906;gfx908;gfx90a;gfx1030;gfx1100" - PYTORCH_ROCM_ARCH="gfx908;gfx90a" - ROCM_REGEX="([0-9]+)\.([0-9]+)[\.]?([0-9]*)" - if [[ $GPU_ARCH_VERSION =~ $ROCM_REGEX ]]; then - ROCM_VERSION_INT=$((${BASH_REMATCH[1]}*10000 + ${BASH_REMATCH[2]}*100 + ${BASH_REMATCH[3]:-0})) - else - echo "ERROR: rocm regex failed" - exit 1 - fi - #if [[ $ROCM_VERSION_INT -ge 60000 ]]; then - # PYTORCH_ROCM_ARCH+=";gfx942" - #fi - DOCKER_GPU_BUILD_ARG="--build-arg ROCM_VERSION=${GPU_ARCH_VERSION} --build-arg PYTORCH_ROCM_ARCH=${PYTORCH_ROCM_ARCH} --build-arg DEVTOOLSET_VERSION=11" - MANY_LINUX_VERSION="2_28" + if [ ${GPU_ARCH_TYPE} == "rocm-manylinux_2_28" ]; then + MANY_LINUX_VERSION="2_28" + fi ;; xpu) TARGET=xpu_final