c673979fee
* Bump up the version for ROCm-6.0.0 * Adding patch files * Style check failure fix * Style check fixes * Style check error fixes * Patch to remove hipblas client file installation in 6.0 * Patch need to be applied on all 5.7 relases * 6.0 update for math libs and other packages, new github url etc * Correct package-audit failures * Correcting shasum for rocfft patch and limiting patch in rocblas * Reverting updates in rocprofiler-dev due to ci-gitlab failure * Fixes for ci-gitlab failure due to disabling hip backward compatibilit * Adding patch file to Change HIP_PLATFORM from HCC to AMD and NVCC to NVIDIA * Use the gcnArchName inplace of gcnArch as gcnArch is deprecated from rocm-6.0.0 * Patches to fix magma and blaspp build error with rocm 6.0.0 * Patch for mfem and arborx for rocm 6.0 * Style check error fix * Correcting style check errors * Uodating dependent version * Update for petsc to build with rocm 6.0 Need reverting-operator-mixup-fix-for-slate.patch for rocm 6.0 * Reverting the change in url for 2.7.4-rocm-enhanced * hip-tensor 6.0.0 update
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
diff --git a/clr/hipamd/CMakeLists.txt b/clr/hipamd/CMakeLists.txt
|
|
index 7ad3001..aaf6ad0 100755
|
|
--- a/clr/hipamd/CMakeLists.txt
|
|
+++ b/clr/hipamd/CMakeLists.txt
|
|
@@ -297,16 +297,6 @@ if(HIP_RUNTIME STREQUAL "rocclr")
|
|
add_subdirectory(src)
|
|
endif()
|
|
|
|
-# Download libamdhip64.so.5
|
|
-if(HIP_PLATFORM STREQUAL "amd")
|
|
- if(NOT WIN32)
|
|
- execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/download_libamhip64_v5.sh" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND_ECHO STDERR RESULT_VARIABLE DWLD_HIP_SO_RC)
|
|
- if (DWLD_HIP_SO_RC AND NOT DWLD_HIP_SO_RC EQUAL 0)
|
|
- message(FATAL_ERROR "Failed to download libamdhip64.so.5")
|
|
- endif()
|
|
- endif()
|
|
-endif()
|
|
-
|
|
# Build doxygen documentation
|
|
find_program(DOXYGEN_EXE doxygen)
|
|
if(DOXYGEN_EXE)
|
|
@@ -408,8 +398,6 @@ if (NOT ${HIPCC_BIN_DIR} STREQUAL "")
|
|
install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.pl DESTINATION bin)
|
|
install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.pl DESTINATION bin)
|
|
install(PROGRAMS ${HIPCC_BIN_DIR}/hipvars.pm DESTINATION bin)
|
|
- install(PROGRAMS ${HIPCC_BIN_DIR}/hipcc.bat DESTINATION bin)
|
|
- install(PROGRAMS ${HIPCC_BIN_DIR}/hipconfig.bat DESTINATION bin)
|
|
endif()
|
|
|
|
#############################
|
|
diff --git a/hipcc/bin/hipcc.pl b/hipcc/bin/hipcc.pl
|
|
index 513a427..cd2d6ac 100755
|
|
--- a/hipcc/bin/hipcc.pl
|
|
+++ b/hipcc/bin/hipcc.pl
|
|
@@ -160,11 +160,14 @@ if ($HIP_PLATFORM eq "amd") {
|
|
if($isWindows) {
|
|
$execExtension = ".exe";
|
|
}
|
|
- $HIPCC=get_normalized_path("$HIP_CLANG_PATH/clang++" . $execExtension);
|
|
+ # llvm_path is set inside the hip recipe
|
|
+ $LLVM_PATH= $ENV{'LLVM_PATH'};
|
|
+ $HIPCC="${LLVM_PATH}/bin/clang++" . $execExtension;
|
|
|
|
# If $HIPCC clang++ is not compiled, use clang instead
|
|
if ( ! -e $HIPCC ) {
|
|
- $HIPCC=get_normalized_path("$HIP_CLANG_PATH/clang" . $execExtension);
|
|
+ $LLVM_PATH= $ENV{'LLVM_PATH'};
|
|
+ $HIPCC="${LLVM_PATH}/bin/clang" . $execExtension;
|
|
$HIPLDFLAGS = "--driver-mode=g++";
|
|
}
|
|
# to avoid using dk linker or MSVC linker
|
|
@@ -484,7 +487,8 @@ if($HIP_PLATFORM eq "amd"){
|
|
$targetsStr = $ENV{HCC_AMDGPU_TARGET};
|
|
} elsif (not $isWindows) {
|
|
# Else try using rocm_agent_enumerator
|
|
- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator";
|
|
+ $ROCMINFO_PATH = $ENV{'ROCMINFO_PATH'} // $ROCMINFO_PATH;
|
|
+ $ROCM_AGENT_ENUM = "${ROCMINFO_PATH}/bin/rocm_agent_enumerator";
|
|
$targetsStr = `${ROCM_AGENT_ENUM} -t GPU`;
|
|
$targetsStr =~ s/\n/,/g;
|
|
}
|