From 5a208586bedbdd89e7b9cf4e5d825bc31d681811 Mon Sep 17 00:00:00 2001 From: Jithun Nair Date: Thu, 1 Jun 2023 22:49:13 +0000 Subject: [PATCH 1/3] Fix lib search logic and lib list --- manywheel/build_rocm.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/manywheel/build_rocm.sh b/manywheel/build_rocm.sh index b910e552f..e227b8576 100755 --- a/manywheel/build_rocm.sh +++ b/manywheel/build_rocm.sh @@ -84,10 +84,6 @@ ROCM_SO_FILES=( "libmagma.so" "librccl.so" "librocblas.so" - "librocfft-device-0.so" - "librocfft-device-1.so" - "librocfft-device-2.so" - "librocfft-device-3.so" "librocfft.so" "librocm_smi64.so" "librocrand.so" @@ -97,6 +93,13 @@ ROCM_SO_FILES=( "libroctx64.so" ) +if [[ $ROCM_INT -lt 50500 ]]; then + ROCM_SO_FILES+=("librocfft-device-0.so") + ROCM_SO_FILES+=("librocfft-device-1.so") + ROCM_SO_FILES+=("librocfft-device-2.so") + ROCM_SO_FILES+=("librocfft-device-3.so") +fi + if [[ $ROCM_INT -ge 50400 ]]; then ROCM_SO_FILES+=("libhiprtc.so") fi @@ -164,6 +167,10 @@ do if [[ -z $file_path ]]; then file_path=($(find $ROCM_HOME/ -name "$lib")) # Then search in ROCM_HOME fi + if [[ -z $file_path ]]; then + echo "Error: Library file $lib is not found." >&2 + exit 1 + fi ROCM_SO_PATHS[${#ROCM_SO_PATHS[@]}]="$file_path" # Append lib to array done From 36808bdb1d0445f42fdbb4e154d79c421b1d4b6b Mon Sep 17 00:00:00 2001 From: Jithun Nair Date: Fri, 2 Jun 2023 05:24:08 +0000 Subject: [PATCH 2/3] Add libhipsolver.so dependency for upstream Pytorch (needed since PyTorch PR 97370) --- manywheel/build_rocm.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/manywheel/build_rocm.sh b/manywheel/build_rocm.sh index e227b8576..4465bca4f 100755 --- a/manywheel/build_rocm.sh +++ b/manywheel/build_rocm.sh @@ -78,6 +78,7 @@ ROCM_SO_FILES=( "libhipblas.so" "libhipfft.so" "libhiprand.so" + "libhipsolver.so" "libhipsparse.so" "libhsa-runtime64.so" "libamd_comgr.so" From 21c430d9d857065cb3e5a80e974c48efb4a678f4 Mon Sep 17 00:00:00 2001 From: Jithun Nair Date: Fri, 9 Jun 2023 07:56:04 +0000 Subject: [PATCH 3/3] Add MIOpen db files to share path only for ROCm5.5 and above --- manywheel/build_rocm.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manywheel/build_rocm.sh b/manywheel/build_rocm.sh index 4465bca4f..04768ec8f 100755 --- a/manywheel/build_rocm.sh +++ b/manywheel/build_rocm.sh @@ -187,16 +187,19 @@ DEPS_SONAME=( DEPS_AUX_SRCLIST=( "${ROCBLAS_LIB_FILES[@]/#/$ROCBLAS_LIB_SRC/}" - "${MIOPEN_SHARE_FILES[@]/#/$MIOPEN_SHARE_SRC/}" "/opt/amdgpu/share/libdrm/amdgpu.ids" ) DEPS_AUX_DSTLIST=( "${ROCBLAS_LIB_FILES[@]/#/$ROCBLAS_LIB_DST/}" - "${MIOPEN_SHARE_FILES[@]/#/$MIOPEN_SHARE_DST/}" "share/libdrm/amdgpu.ids" ) +if [[ $ROCM_INT -ge 50500 ]]; then + DEPS_AUX_SRCLIST[${#DEPS_AUX_SRCLIST[@]}]="${MIOPEN_SHARE_FILES[@]/#/$MIOPEN_SHARE_SRC/}" + DEPS_AUX_DSTLIST[${#DEPS_AUX_DSTLIST[@]}]="${MIOPEN_SHARE_FILES[@]/#/$MIOPEN_SHARE_DST/}" +fi + echo "PYTORCH_ROCM_ARCH: ${PYTORCH_ROCM_ARCH}" SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"