From 6a3c76e5a7d7f1519b5a943e3ae725c127f2675d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 18 Dec 2022 13:15:19 +0100 Subject: dev-util/hip: drop versions 3* and 4* Signed-off-by: Andreas Sturmlechner --- dev-util/hip/Manifest | 5 - dev-util/hip/files/hip-3.5.1-config-cmake-in.patch | 28 ----- ...p-3.5.1-detect_offload-arch_for_clang-roc.patch | 21 ---- .../hip/files/hip-3.5.1-hip_vector_types.patch | 10 -- dev-util/hip/files/hip-3.9.0-DisableTest.patch | 87 ---------------- .../files/hip-3.9.0-add-include-directories.patch | 13 --- .../hip/files/hip-3.9.0-lpl_ca-add-include.patch | 10 -- dev-util/hip/files/hip-4.1.0-DisableTest.patch | 37 ------- .../hip/files/hip-4.3.0-hip_vector_types.patch | 11 -- dev-util/hip/hip-4.0.0-r1.ebuild | 116 --------------------- dev-util/hip/hip-4.0.0.ebuild | 107 ------------------- dev-util/hip/hip-4.1.0-r1.ebuild | 105 ------------------- dev-util/hip/hip-4.1.0.ebuild | 109 ------------------- dev-util/hip/hip-4.2.0.ebuild | 108 ------------------- dev-util/hip/hip-4.3.0-r1.ebuild | 108 ------------------- dev-util/hip/hip-4.3.0-r2.ebuild | 112 -------------------- dev-util/hip/hip-4.3.0.ebuild | 107 ------------------- 17 files changed, 1094 deletions(-) delete mode 100644 dev-util/hip/files/hip-3.5.1-config-cmake-in.patch delete mode 100644 dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch delete mode 100644 dev-util/hip/files/hip-3.5.1-hip_vector_types.patch delete mode 100644 dev-util/hip/files/hip-3.9.0-DisableTest.patch delete mode 100644 dev-util/hip/files/hip-3.9.0-add-include-directories.patch delete mode 100644 dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch delete mode 100644 dev-util/hip/files/hip-4.1.0-DisableTest.patch delete mode 100644 dev-util/hip/files/hip-4.3.0-hip_vector_types.patch delete mode 100644 dev-util/hip/hip-4.0.0-r1.ebuild delete mode 100644 dev-util/hip/hip-4.0.0.ebuild delete mode 100644 dev-util/hip/hip-4.1.0-r1.ebuild delete mode 100644 dev-util/hip/hip-4.1.0.ebuild delete mode 100644 dev-util/hip/hip-4.2.0.ebuild delete mode 100644 dev-util/hip/hip-4.3.0-r1.ebuild delete mode 100644 dev-util/hip/hip-4.3.0-r2.ebuild delete mode 100644 dev-util/hip/hip-4.3.0.ebuild diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest index de73421d0c04..48b4b11a54db 100644 --- a/dev-util/hip/Manifest +++ b/dev-util/hip/Manifest @@ -2,15 +2,10 @@ DIST 5.0.2-update-header.patch.gz 5136 BLAKE2B 290b9e250e3004a1147ad28606d7d2050 DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73 DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca -DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6 -DIST rocm-hip-4.1.0.tar.gz 954215 BLAKE2B c4b75ab2158e6921be1c34820ab5d1a5e2eb36112834b0143c50023caa27de384e0497f4837947cc7fe05554c6c95201340b1979eb916b31ebb4ffec8c923735 SHA512 420ffd7b79e2b4506873cbfc56e96395f8ed9d9375ce28df51626601199d4d8dca6920528e255d39a48ad66ee11f4b653f3b9f659df489d32b21886fb86c64b5 -DIST rocm-hip-4.2.0.tar.gz 918281 BLAKE2B 45c28289c8ff9e600bfd9daff8af162c897fcfdf41ce65d91d1761d58253d87a6385fd4a15e818619ca39d3413479bf043ab2758fead349a243105e979b64f7c SHA512 e620507321c949ded2eab6159099eef0eab267eb686b6ee0ed86022fffaa51fb8714a7f344b79acf76c876c55919360905d1bb3a7c00a87f40174774d6682ce8 -DIST rocm-hip-4.3.0.tar.gz 967550 BLAKE2B 263e8bbaa86198d3cb6a29f5597b56a3fe1e9338a8c485935070e6253816ccdba9671f33d8142c260aa3c36f43a71de7f2c1b7a15e1227f97aaf03ed10ce10dd SHA512 bc2d9597200405397387cc8f626f0cc734ee450c462bd7c7a0c655e3dfe2d1e09780328cbfa1c0d1e0db836e561fc450c5d514a6ad1a5828cb913c4c3c535ef1 DIST rocm-hip-5.0.2.tar.gz 958496 BLAKE2B 9c8bb1eacd982203e3bd6c24560672c4a9aaf5606608635d7da5a60f613d9be50998f990c1ea3e0e6f5581e0efcba09af736a77bbc9469b2898e0974d063e8d6 SHA512 4a99e86a4594c15509a1bbfec0678cd05469eb14dcf35ce650e1eb7c2415f57f59071b1b8add2f8566ccf06242bead77abd275987fe79fe6031dea90d5693805 DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24 DIST rocm-hipamd-5.0.2.tar.gz 319973 BLAKE2B ca19938eeca66f0d2614ff933e1d0e75b6b8dbc8d996fd4369e5649897b9948271ac88f2a66f0a40ef586d6185b30d01132decac95d1615c1ee419996050ed07 SHA512 056acab082b5073e81f9e5de00ae12c85021d1c297cdcfc45b85f191dcc68603f64fe5d0e75f9523120657947eb125beaa9c3ce26234968c43b200e638f9afa3 DIST rocm-hipamd-5.1.3.tar.gz 331996 BLAKE2B 176121fe199d53c02a0fc407015681c2f08c8a72104738b457581fd81b37d16efb8170a46d687fb85a45242ba8564246cdd5746e78d9b73dd0bdc9b24eb8378c SHA512 daa6f4da97f71a5fd1f79d8c9e5fc43324743aec91362a05fa62e08966397a637d794abc7e14230eccf5f1271f9fac58d1336aaad1f2cded6cd10792845a494b -DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d DIST rocm-opencl-runtime-5.0.2.tar.gz 1004855 BLAKE2B e2c2beb987053204fbe8fda562ae65d6c1a58447e9e88bf1081aabeee6c9a10738fd8562114b564b647682438fdbd2c535db1008ac6e1cc4eb9a915998eeb3c7 SHA512 fa01d1fafc890181b9e67070353ee7c9100619494b7509cae1a3659f24ef1d00f650024cb24bdb0e6e7eacfdec1115e4683ec6f320228a19f41ae83321780780 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0 DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44 diff --git a/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch b/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch deleted file mode 100644 index f3b5ac9c19ef..000000000000 --- a/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/hip-config.cmake.in 2020-06-21 21:17:35.576297760 +0200 -+++ b/hip-config.cmake.in 2020-06-21 21:17:59.861296628 +0200 -@@ -123,8 +123,10 @@ - ) - set_target_properties(hip::device PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "__HIP_ROCclr__=1" -- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" -- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" -+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -+# INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" -+# INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" - ) - else() - set_target_properties(hip::hip_hcc_static PROPERTIES -@@ -156,9 +158,9 @@ - INTERFACE_LINK_LIBRARIES --hip-device-lib-path=${AMD_DEVICE_LIBS_PREFIX}/lib --hip-link - ) - -- set_property(TARGET hip::device APPEND PROPERTY -- INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.." -- ) -+# set_property(TARGET hip::device APPEND PROPERTY -+# INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.." -+# ) - - set_property(TARGET hip::device APPEND PROPERTY - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.." diff --git a/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch b/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch deleted file mode 100644 index 7997e2929666..000000000000 --- a/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -uprN HIP-rocm-3.5.1/bin/hipcc patched/bin/hipcc ---- HIP-rocm-3.5.1/bin/hipcc 2020-07-21 14:29:11.625878447 +0800 -+++ patched/bin/hipcc 2020-07-21 14:34:11.454395203 +0800 -@@ -675,7 +675,7 @@ foreach $arg (@ARGV) - $prevArg = $arg; - } - --if($HIP_PLATFORM eq "hcc"){ -+if($HIP_PLATFORM eq "hcc" || $HIP_PLATFORM eq "rocclr"){ - # No AMDGPU target specified at commandline. So look for HCC_AMDGPU_TARGET - if($default_amdgpu_target eq 1) { - if (defined $ENV{HCC_AMDGPU_TARGET}) { -@@ -694,6 +694,8 @@ if($HIP_PLATFORM eq "hcc"){ - - if($HIP_COMPILER eq "hcc") { - $GPU_ARCH_OPT = " --amdgpu-target="; -+ } elsif($HIP_COMPILER eq "clang") { -+ $GPU_ARCH_OPT = " --offload-arch="; - } else { - $GPU_ARCH_OPT = " --cuda-gpu-arch="; - } diff --git a/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch b/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch deleted file mode 100644 index 382ed52f6923..000000000000 --- a/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/hip/hcc_detail/hip_vector_types.h -+++ b/include/hip/hcc_detail/hip_vector_types.h -@@ -42,6 +42,7 @@ - #endif - - #if defined(__cplusplus) -+ #include - #include - #include - #include diff --git a/dev-util/hip/files/hip-3.9.0-DisableTest.patch b/dev-util/hip/files/hip-3.9.0-DisableTest.patch deleted file mode 100644 index 3fc787a7354e..000000000000 --- a/dev-util/hip/files/hip-3.9.0-DisableTest.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/CMakeLists.txt 2020-11-15 11:26:09.747793881 +0100 -+++ b/CMakeLists.txt 2020-11-15 11:28:45.289793287 +0100 -@@ -676,45 +676,45 @@ - # Target: test - set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}) - set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}) --if(HIP_PLATFORM STREQUAL "nvcc") -- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --endif() --execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --if(${RUN_HIT} EQUAL 0) -- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --endif() --if(${RUN_HIT} EQUAL 0) -- set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH}) -- include(${HIP_SRC_PATH}/tests/hit/HIT.cmake) -- -- # Add tests -- include_directories(${HIP_SRC_PATH}/tests/src) -- hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests") -- -- # Add unit tests -- include_directories(${HIP_SRC_PATH}/tests/unit) -- hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests") -- -- # Add performance tests -- include_directories(${HIP_SRC_PATH}/tests/performance) -- hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests") -- -- # Add top-level tests to build_tests -- add_custom_target(build_tests DEPENDS directed_tests unit_tests) -- -- # Add top-level tests to build performance_tests. -- # To build performance tests, just run "make build_perf" -- add_custom_target(build_perf DEPENDS performance_tests) -- -- # Add custom target: perf. -- # To run performance tests, just run "make perf" -- add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose) -- -- # Add custom target: check -- add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests) --else() -- message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location") --endif() -+#if(HIP_PLATFORM STREQUAL "nvcc") -+# execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET) -+#endif() -+#execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET) -+#if(${RUN_HIT} EQUAL 0) -+# execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET) -+#endif() -+#if(${RUN_HIT} EQUAL 0) -+# set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH}) -+# include(${HIP_SRC_PATH}/tests/hit/HIT.cmake) -+# -+# # Add tests -+# include_directories(${HIP_SRC_PATH}/tests/src) -+# hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests") -+# -+# # Add unit tests -+# include_directories(${HIP_SRC_PATH}/tests/unit) -+# hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests") -+# -+# # Add performance tests -+# include_directories(${HIP_SRC_PATH}/tests/performance) -+# hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests") -+# -+# # Add top-level tests to build_tests -+# add_custom_target(build_tests DEPENDS directed_tests unit_tests) -+# -+# # Add top-level tests to build performance_tests. -+# # To build performance tests, just run "make build_perf" -+# add_custom_target(build_perf DEPENDS performance_tests) -+# -+# # Add custom target: perf. -+# # To run performance tests, just run "make perf" -+# add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose) -+# -+# # Add custom target: check -+# add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests) -+#else() -+# message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location") -+#endif() - - ############################# - # Code analysis diff --git a/dev-util/hip/files/hip-3.9.0-add-include-directories.patch b/dev-util/hip/files/hip-3.9.0-add-include-directories.patch deleted file mode 100644 index 42bd9736ee2c..000000000000 --- a/dev-util/hip/files/hip-3.9.0-add-include-directories.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/rocclr/CMakeLists.txt 2020-08-23 11:45:13.148817894 +0200 -+++ b/rocclr/CMakeLists.txt 2020-08-23 11:50:12.409816752 +0200 -@@ -139,6 +139,10 @@ - target_compile_definitions(hip64 - PRIVATE - $) -+ -+ include_directories(/usr/include/rocclr) -+ include_directories(/usr/include/rocclr/elf) -+ include_directories(/usr/include/rocclr/compiler/lib/include/) - endif() - - # Enable profiling API diff --git a/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch b/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch deleted file mode 100644 index bebe6f0f4ecc..000000000000 --- a/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lpl_ca/CMakeLists.txt 2020-11-15 11:47:55.091788901 +0100 -+++ b/lpl_ca/CMakeLists.txt 2020-11-15 11:49:14.881788597 +0100 -@@ -17,6 +17,7 @@ - ${PROJECT_SOURCE_DIR}/src - PRIVATE - $) -+target_include_directories(lpl SYSTEM PUBLIC /usr/include/rocclr/elf) - - target_compile_options(lpl PUBLIC -Wall) - target_link_libraries(lpl PUBLIC pthread) diff --git a/dev-util/hip/files/hip-4.1.0-DisableTest.patch b/dev-util/hip/files/hip-4.1.0-DisableTest.patch deleted file mode 100644 index 49e7171b2f0d..000000000000 --- a/dev-util/hip/files/hip-4.1.0-DisableTest.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/CMakeLists.txt 2021-03-28 18:02:34.755857717 +0200 -+++ b/CMakeLists.txt 2021-03-28 18:04:54.217854203 +0200 -@@ -474,20 +474,20 @@ - ############################# - set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}) - set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}) --if(HIP_PLATFORM STREQUAL "nvidia") -- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --endif() --execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --if(${RUN_HIT} EQUAL 0) -- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET) --endif() --if(${RUN_HIT} EQUAL 0) -- set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH}) -- include(${HIP_SRC_PATH}/tests/hit/HIT.cmake) -- include(${HIP_SRC_PATH}/tests/Tests.cmake) --else() -- message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location") --endif() -+#if(HIP_PLATFORM STREQUAL "nvidia") -+# execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${HIP_ROOT_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET) -+#endif() -+#execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET) -+#if(${RUN_HIT} EQUAL 0) -+# execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET) -+#endif() -+#if(${RUN_HIT} EQUAL 0) -+# set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH}) -+# include(${HIP_SRC_PATH}/tests/hit/HIT.cmake) -+# include(${HIP_SRC_PATH}/tests/Tests.cmake) -+#else() -+# message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location") -+#endif() - - ############################# - # Code analysis diff --git a/dev-util/hip/files/hip-4.3.0-hip_vector_types.patch b/dev-util/hip/files/hip-4.3.0-hip_vector_types.patch deleted file mode 100644 index faad9629740f..000000000000 --- a/dev-util/hip/files/hip-4.3.0-hip_vector_types.patch +++ /dev/null @@ -1,11 +0,0 @@ -mitigate compilation error ---- a/include/hip/amd_detail/hip_vector_types.h -+++ b/include/hip/amd_detail/hip_vector_types.h -@@ -45,6 +45,7 @@ THE SOFTWARE. - - #if defined(__cplusplus) - #if !defined(__HIPCC_RTC__) -+ #include - #include - #include - #include diff --git a/dev-util/hip/hip-4.0.0-r1.ebuild b/dev-util/hip/hip-4.0.0-r1.ebuild deleted file mode 100644 index 9252cfffc779..000000000000 --- a/dev-util/hip/hip-4.0.0-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake flag-o-matic prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -# Don't strip to prevent some tests from failing. -RESTRICT="strip" - -DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2) - >=dev-util/rocminfo-$(ver_cut 1-2) - =sys-devel/llvm-roc-${PV}*[runtime]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-3.9.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch" - "${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch" - "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch" -) - -S="${WORKDIR}/HIP-rocm-${PV}" - -src_prepare() { - cmake_src_prepare - eapply_user - - # Use Gentoo version number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/HIP_PLATFORM.*HIP_COMPILER.*clang/s:hcc:rocclr:" \ - -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -i bin/hipcc || die - - # replace hcc remnants with modern rocclr. - sed -e "/HIP_PLATFORM.*STREQUAL/s:hcc:rocclr:" -i cmake/FindHIP/run_hipcc.cmake || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") -} - -src_configure() { - strip-flags - if ! use debug; then - append-cflags "-DNDEBUG" - append-cxxflags "-DNDEBUG" - buildtype="Release" - else - buildtype="Debug" - fi - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_RUNTIME=ROCclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die - echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die - echo "HIP_PLATFORM=rocclr" >> 99hip || die - echo "HIP_RUNTIME=ROCclr" >> 99hip || die - echo "HIP_COMPILER=clang" >> 99hip || die - echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die - - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install -} diff --git a/dev-util/hip/hip-4.0.0.ebuild b/dev-util/hip/hip-4.0.0.ebuild deleted file mode 100644 index ae96dbdc84e7..000000000000 --- a/dev-util/hip/hip-4.0.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake flag-o-matic prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -# Don't strip to prevent some tests from failing. -RESTRICT="strip" - -DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2) - >=dev-util/rocminfo-$(ver_cut 1-2) - =sys-devel/llvm-roc-${PV}*[runtime]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-3.9.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch" - "${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch" - "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch" -) - -S="${WORKDIR}/HIP-rocm-${PV}" - -src_prepare() { - cmake_src_prepare - eapply_user - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Due to setting HAS_PATH to "/usr", this results in setting "-isystem /usr/include" - # which results in a e.g. "stdlib.h" not found when using "#include_next" in header files; - sed -e "s:\$HIP_PLATFORM eq \"hcc\" and \$HIP_COMPILER eq \"clang\":\$HIP_PLATFORM eq \"rocclr\" and \$HIP_COMPILER eq \"clang\":" \ - -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -i bin/hipcc || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") -} - -src_configure() { - strip-flags - if ! use debug; then - append-cflags "-DNDEBUG" - append-cxxflags "-DNDEBUG" - buildtype="Release" - else - buildtype="Debug" - fi - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_RUNTIME=ROCclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die - echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die - echo "HIP_PLATFORM=rocclr" >> 99hip || die - echo "HIP_RUNTIME=ROCclr" >> 99hip || die - echo "HIP_COMPILER=clang" >> 99hip || die - echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die - - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install -} diff --git a/dev-util/hip/hip-4.1.0-r1.ebuild b/dev-util/hip/hip-4.1.0-r1.ebuild deleted file mode 100644 index 15d5bfcd3e35..000000000000 --- a/dev-util/hip/hip-4.1.0-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake flag-o-matic prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -# Don't strip to prevent some tests from failing. -RESTRICT="strip" - -DEPEND="dev-libs/rocclr:${SLOT} - dev-util/rocminfo:${SLOT} - =sys-devel/llvm-roc-${PV}*[runtime]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch" - "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch" -) - -S="${WORKDIR}/HIP-rocm-${PV}" - -src_prepare() { - cmake_src_prepare - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -i bin/hipcc || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die -} - -src_configure() { - strip-flags - if ! use debug; then - append-cflags "-DNDEBUG" - append-cxxflags "-DNDEBUG" - buildtype="Release" - else - buildtype="Debug" - fi - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install -} diff --git a/dev-util/hip/hip-4.1.0.ebuild b/dev-util/hip/hip-4.1.0.ebuild deleted file mode 100644 index c5b5027b241c..000000000000 --- a/dev-util/hip/hip-4.1.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake flag-o-matic prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -# Don't strip to prevent some tests from failing. -RESTRICT="strip" - -DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2) - >=dev-util/rocminfo-$(ver_cut 1-2) - =sys-devel/llvm-roc-${PV}*[runtime]" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch" - "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch" -) - -S="${WORKDIR}/HIP-rocm-${PV}" - -src_prepare() { - cmake_src_prepare - eapply_user - - # Use Gentoo version number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${PVR})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -i bin/hipcc || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") -} - -src_configure() { - strip-flags - if ! use debug; then - append-cflags "-DNDEBUG" - append-cxxflags "-DNDEBUG" - buildtype="Release" - else - buildtype="Debug" - fi - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die - echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die - echo "HIP_PLATFORM=amd" >> 99hip || die - echo "HIP_RUNTIME=rocclr" >> 99hip || die - echo "HIP_COMPILER=clang" >> 99hip || die - echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die - - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install -} diff --git a/dev-util/hip/hip-4.2.0.ebuild b/dev-util/hip/hip-4.2.0.ebuild deleted file mode 100644 index 20017c515343..000000000000 --- a/dev-util/hip/hip-4.2.0.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake flag-o-matic prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -# Don't strip to prevent some tests from failing. -RESTRICT="strip" - -DEPEND="dev-libs/rocclr:${SLOT} - dev-util/rocminfo:${SLOT} - =sys-devel/llvm-roc-${PV}*[runtime] - profile? ( dev-util/roctracer:${SLOT} )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch" - "${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch" -) - -S="${WORKDIR}/HIP-rocm-${PV}" - -src_prepare() { - cmake_src_prepare - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die - - # remove forcing set USE_PROF_API to 1 - sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -e "/rpath/s,--rpath=[^ ]*,," \ - -i bin/hipcc || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die -} - -src_configure() { - strip-flags - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install - - rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die -} diff --git a/dev-util/hip/hip-4.3.0-r1.ebuild b/dev-util/hip/hip-4.3.0-r1.ebuild deleted file mode 100644 index 59e92546583b..000000000000 --- a/dev-util/hip/hip-4.3.0-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake flag-o-matic prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -DEPEND="dev-libs/rocclr:${SLOT} - dev-util/rocminfo:${SLOT} - =sys-devel/llvm-roc-${PV}*[runtime] - profile? ( dev-util/roctracer:${SLOT} )" -RDEPEND="${DEPEND} - dev-perl/URI-Encode" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch" - "${FILESDIR}/${PN}-4.3.0-hip_vector_types.patch" - "${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch" -) - -S="${WORKDIR}/HIP-rocm-${PV}" - -src_prepare() { - cmake_src_prepare - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die - - # remove forcing set USE_PROF_API to 1 - sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -e "/rpath/s,--rpath=[^ ]*,," \ - -i bin/hipcc || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die - - cp -a "${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}/amdocl/cl_vk_amd.hpp amdocl/ || die -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install - - rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die -} diff --git a/dev-util/hip/hip-4.3.0-r2.ebuild b/dev-util/hip/hip-4.3.0-r2.ebuild deleted file mode 100644 index 9547abd69ae1..000000000000 --- a/dev-util/hip/hip-4.3.0-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" -S="${WORKDIR}/HIP-rocm-${PV}" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -DEPEND=" - dev-libs/rocclr:${SLOT} - dev-util/rocminfo:${SLOT} - dev-libs/roct-thunk-interface:${SLOT} - =sys-devel/llvm-roc-${PV}*[runtime] - profile? ( dev-util/roctracer:${SLOT} )" -RDEPEND="${DEPEND} - dev-perl/URI-Encode" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch" - "${FILESDIR}/${PN}-4.3.0-hip_vector_types.patch" - "${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch" -) - -src_prepare() { - cmake_src_prepare - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die - - # remove forcing set USE_PROF_API to 1 - sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -e "/rpath/s,--rpath=[^ ]*,," \ - -i bin/hipcc || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die - - cp -a "${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}/amdocl/cl_vk_amd.hpp amdocl/ || die - - # Bug 790164 - rm amdocl/CL/cl{,_icd,_gl,_gl_ext,_platform}.h || die - sed -i 's/CL_EXT_SUFFIX/CL_API_SUFFIX/' amdocl/cl_icd_amd.h amdocl/CL/cl_ext.h rocclr/cl_lqdflash_amd.h || die -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install - - rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die -} diff --git a/dev-util/hip/hip-4.3.0.ebuild b/dev-util/hip/hip-4.3.0.ebuild deleted file mode 100644 index 7e522e9fb0e5..000000000000 --- a/dev-util/hip/hip-4.3.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake flag-o-matic prefix - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP" -SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug profile" - -DEPEND="dev-libs/rocclr:${SLOT} - dev-util/rocminfo:${SLOT} - =sys-devel/llvm-roc-${PV}*[runtime] - profile? ( dev-util/roctracer:${SLOT} )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-DisableTest.patch" - "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch" - "${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch" - "${FILESDIR}/${PN}-4.3.0-hip_vector_types.patch" - "${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch" -) - -S="${WORKDIR}/HIP-rocm-${PV}" - -src_prepare() { - cmake_src_prepare - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # disable PCH, because it results in a build error in ROCm 4.0.0 - sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die - - # remove forcing set USE_PROF_API to 1 - sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die - - # "hcc" is deprecated and not installed, new platform is "rocclr"; - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ - -e "/rpath/s,--rpath=[^ ]*,," \ - -i bin/hipcc || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die - - cp -a "${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}/amdocl/cl_vk_amd.hpp amdocl/ || die -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip" - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=rocclr - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DHSA_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=$(usex profile 1 0) - -DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext - -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr - ) - - cmake_src_configure -} - -src_install() { - echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die - echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die - - doenvd 99hip - - cmake_src_install - - rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die -} -- cgit v1.2.3-65-gdbad