From bb68aa8217ccdec2d8c80ec98fa12ca184c698d2 Mon Sep 17 00:00:00 2001 From: Jeff Daily Date: Fri, 18 Dec 2020 16:36:43 -0800 Subject: [PATCH 1/2] add rocm 4.0 manywheel support --- cron/update_s3_htmls.sh | 2 +- manywheel/build_rocm.sh | 2 +- manywheel/deploy.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cron/update_s3_htmls.sh b/cron/update_s3_htmls.sh index 07d13b3ae..deb2413e2 100755 --- a/cron/update_s3_htmls.sh +++ b/cron/update_s3_htmls.sh @@ -9,7 +9,7 @@ set -e # Upload for all CUDA/cpu versions if not given one to use if [[ -z "$CUDA_VERSIONS" ]]; then - export CUDA_VERSIONS=('cpu' 'cu92' 'cu100' 'cu101' 'cu102' 'cu110' 'rocm3.7' 'rocm3.8' 'rocm3.9' 'rocm3.10') + export CUDA_VERSIONS=('cpu' 'cu92' 'cu100' 'cu101' 'cu102' 'cu110' 'rocm3.7' 'rocm3.8' 'rocm3.9' 'rocm3.10' 'rocm4.0') fi if [[ -z "$HTML_NAME" ]]; then diff --git a/manywheel/build_rocm.sh b/manywheel/build_rocm.sh index 680a9a19c..ce0c18532 100755 --- a/manywheel/build_rocm.sh +++ b/manywheel/build_rocm.sh @@ -75,7 +75,7 @@ fi # NOTE: Some ROCm versions have identical dependencies, or very close deps. # To avoid copy/paste mistakes, version condition branches are combined. -if [[ $ROCM_VERSION == "rocm3.7" || $ROCM_VERSION == "rocm3.8" || $ROCM_VERSION == "rocm3.9" || $ROCM_VERSION == "rocm3.10" ]]; then +if [[ $ROCM_VERSION == "rocm3.7" || $ROCM_VERSION == "rocm3.8" || $ROCM_VERSION == "rocm3.9" || $ROCM_VERSION == "rocm3.10" || $ROCM_VERSION == "rocm4.0" ]]; then DEPS_LIST=( "/opt/rocm/miopen/lib/libMIOpen.so.1" diff --git a/manywheel/deploy.sh b/manywheel/deploy.sh index 132ed96c7..60d5aa5d3 100755 --- a/manywheel/deploy.sh +++ b/manywheel/deploy.sh @@ -2,7 +2,7 @@ set -eou pipefail -for rocm_version in 3.7 3.8 3.9 3.10; do +for rocm_version in 3.7 3.8 3.9 3.10 4.0; do ( set -x DOCKER_BUILDKIT=1 docker build \ From 080b3dc7d7fab027903720a9019ecaa647dbaa63 Mon Sep 17 00:00:00 2001 From: Jeff Daily Date: Sat, 19 Dec 2020 02:51:31 +0000 Subject: [PATCH 2/2] in rocm4.0, libamdhip64.so.3 changed to *.so.4 --- manywheel/build_rocm.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/manywheel/build_rocm.sh b/manywheel/build_rocm.sh index ce0c18532..0a061915c 100755 --- a/manywheel/build_rocm.sh +++ b/manywheel/build_rocm.sh @@ -73,13 +73,20 @@ else COMGR_LIBDIR="lib64" fi +# in rocm4.0, libamdhip64.so.3 changed to *.so.4 +if [[ $ROCM_VERSION == "rocm4.0" ]]; then + LIBAMDHIP64=libamdhip64.so.4 +else + LIBAMDHIP64=libamdhip64.so.3 +fi; + # NOTE: Some ROCm versions have identical dependencies, or very close deps. # To avoid copy/paste mistakes, version condition branches are combined. if [[ $ROCM_VERSION == "rocm3.7" || $ROCM_VERSION == "rocm3.8" || $ROCM_VERSION == "rocm3.9" || $ROCM_VERSION == "rocm3.10" || $ROCM_VERSION == "rocm4.0" ]]; then DEPS_LIST=( "/opt/rocm/miopen/lib/libMIOpen.so.1" - "/opt/rocm/hip/lib/libamdhip64.so.3" + "/opt/rocm/hip/lib/$LIBAMDHIP64" "/opt/rocm/hiprand/lib/libhiprand.so.1" "/opt/rocm/hipsparse/lib/libhipsparse.so.0" "/opt/rocm/hsa/lib/libhsa-runtime64.so.1" @@ -99,7 +106,7 @@ DEPS_LIST=( DEPS_SONAME=( "libMIOpen.so.1" - "libamdhip64.so.3" + "$LIBAMDHIP64" "libhiprand.so.1" "libhipsparse.so.0" "libhsa-runtime64.so.1"