summarylogtreecommitdiffstats
path: root/hipinfo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'hipinfo.patch')
-rw-r--r--hipinfo.patch66
1 files changed, 0 insertions, 66 deletions
diff --git a/hipinfo.patch b/hipinfo.patch
deleted file mode 100644
index 1f3a280008f..00000000000
--- a/hipinfo.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --unified --recursive --text HIP-rocm-3.9.0/bin/hipconfig HIP-rocm-3.9.0.new/bin/hipconfig
---- HIP-rocm-3.9.0/bin/hipconfig 2020-10-13 02:42:39.000000000 -0400
-+++ HIP-rocm-3.9.0.new/bin/hipconfig 2020-11-02 17:13:56.119076102 -0500
-@@ -98,12 +98,12 @@
- $HIP_INFO_PATH= "$HIP_PATH/lib/.hipInfo"; # use actual file
- }
- #---
--#HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
--$HIP_PLATFORM=$ENV{'HIP_PLATFORM'};
- # Read .hipInfo
- my %hipInfo = ();
- parse_config_file("$HIP_INFO_PATH", \%hipInfo);
- # Prioritize Env first, otherwise use the hipInfo config file
-+#HIP_PLATFORM controls whether to use NVCC or HCC for compilation:
-+$HIP_PLATFORM = $ENV{'HIP_PLATFORM'} // $hipInfo{'HIP_PLATFORM'} // "hcc";
- $HIP_COMPILER = $ENV{'HIP_COMPILER'} // $hipInfo{'HIP_COMPILER'} // "hcc";
- $HIP_RUNTIME = $ENV{'HIP_RUNTIME'} // $hipInfo{'HIP_RUNTIME'} // "HCC";
-
-diff --unified --recursive --text HIP-rocm-3.9.0/CMakeLists.txt HIP-rocm-3.9.0.new/CMakeLists.txt
---- HIP-rocm-3.9.0/CMakeLists.txt 2020-10-13 02:42:39.000000000 -0400
-+++ HIP-rocm-3.9.0.new/CMakeLists.txt 2020-11-02 17:12:49.638464570 -0500
-@@ -138,6 +138,7 @@
- endif()
- endif()
- message(STATUS "HIP Platform: " ${HIP_PLATFORM})
-+add_to_config(_buildInfo HIP_PLATFORM)
-
- # Determine HIP_COMPILER
- # Either hcc or clang; default is hcc
-@@ -332,7 +333,6 @@
-
- include_directories(${PROJECT_SOURCE_DIR}/include)
- add_subdirectory(rocclr)
-- file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
-
-
- # set(ROCclr_CXX_FLAGS "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ")
-@@ -436,14 +436,14 @@
- else()
- target_link_libraries(device INTERFACE host)
- endif()
--
-- # Generate .hipInfo
-- file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
- endif()
-
- if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr")
- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lpl_ca)
- endif()
-+# Generate .hipInfo
-+file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo})
-+
- # Generate .hipVersion
- file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo})
-
-@@ -482,9 +482,7 @@
- endif()
-
- # Install .hipInfo
--if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr")
-- install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
--endif()
-+install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib)
-
- # Install .hipVersion
- install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin)