| 1 |
commit: ca58d5dcf2f0fa62f9bcda56f1c13f89f557afac |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 24 22:21:23 2023 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 09:52:48 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca58d5dc |
| 7 |
|
| 8 |
dev-util/hip: drop 5.0.2-r3 |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/hip/Manifest | 6 -- |
| 13 |
dev-util/hip/files/hipvars-5.0.2.pm | 20 ------ |
| 14 |
dev-util/hip/hip-5.0.2-r3.ebuild | 138 ------------------------------------ |
| 15 |
3 files changed, 164 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest |
| 18 |
index b1a87a900106..91fbbb7d722a 100644 |
| 19 |
--- a/dev-util/hip/Manifest |
| 20 |
+++ b/dev-util/hip/Manifest |
| 21 |
@@ -1,16 +1,10 @@ |
| 22 |
-DIST 5.0.2-update-header.patch.gz 5136 BLAKE2B 290b9e250e3004a1147ad28606d7d205078affbd809c6a429744767ebabf35bd8df6395dc135984d345ae2f23fa457dcb2524bcbf31c5bf16903d3ee2007bf5d SHA512 41b1025c403e874026a712ec6f6571c873203b08ddadf68848f6d1f63924c21b206677b330f79edad2c4b85e2ba5053b1d33f70c7c09ff9c17bc5905b849da0c |
| 23 |
DIST hip-5.1.3-update-header.patch.gz 3406 BLAKE2B 805539c3396a9cdcc4b807afd96eacd2de0e494a9ec927a1526cb8ce26b1c6e0a4d06415cd0210cba1398b5ff70f995fa67ad22b659578c075eb24c2a2cc9228 SHA512 eef4d70f9470a61d1d8cb140728cc4f2e792a4e64e0900a7410a74f3a6421410e7546e4e62bbbf35ae231b566bf162fb85de1f1ad1d8cfb2f282d2ed9a34b53a |
| 24 |
-DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73 |
| 25 |
DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca |
| 26 |
DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924 |
| 27 |
-DIST rocm-hip-5.0.2.tar.gz 958496 BLAKE2B 9c8bb1eacd982203e3bd6c24560672c4a9aaf5606608635d7da5a60f613d9be50998f990c1ea3e0e6f5581e0efcba09af736a77bbc9469b2898e0974d063e8d6 SHA512 4a99e86a4594c15509a1bbfec0678cd05469eb14dcf35ce650e1eb7c2415f57f59071b1b8add2f8566ccf06242bead77abd275987fe79fe6031dea90d5693805 |
| 28 |
DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24 |
| 29 |
DIST rocm-hip-5.3.3.tar.gz 1151858 BLAKE2B 5f460b2078c850b3eb4414fcec4a6f951a3b282aa9828f77ba5d5adfdc0ee8d2e62c856e112a154c340daaf7dad49f4871412edd7b38f7fae2e6b17840ee144b SHA512 e747cc10e78cd09009cac762f0e060be13f3447af7ec2a4a2889cbdc09cd76ecb1b5b58c89f09a3b45a8296c2c71e1c55baf113e58a5a12434af3de7168b8d87 |
| 30 |
-DIST rocm-hipamd-5.0.2.tar.gz 319973 BLAKE2B ca19938eeca66f0d2614ff933e1d0e75b6b8dbc8d996fd4369e5649897b9948271ac88f2a66f0a40ef586d6185b30d01132decac95d1615c1ee419996050ed07 SHA512 056acab082b5073e81f9e5de00ae12c85021d1c297cdcfc45b85f191dcc68603f64fe5d0e75f9523120657947eb125beaa9c3ce26234968c43b200e638f9afa3 |
| 31 |
DIST rocm-hipamd-5.1.3.tar.gz 331996 BLAKE2B 176121fe199d53c02a0fc407015681c2f08c8a72104738b457581fd81b37d16efb8170a46d687fb85a45242ba8564246cdd5746e78d9b73dd0bdc9b24eb8378c SHA512 daa6f4da97f71a5fd1f79d8c9e5fc43324743aec91362a05fa62e08966397a637d794abc7e14230eccf5f1271f9fac58d1336aaad1f2cded6cd10792845a494b |
| 32 |
DIST rocm-hipamd-5.3.3.tar.gz 383179 BLAKE2B 45c4fbf28d639095db3cec0632e1b1d872104b3755bdca818ed37ac46caab399fcd2224330e6ac8df7ab155fb146b6272b3ed2efe00d7358b47f31ca2cb1e4f5 SHA512 34c62d915990b6742a2df9b37b6b2bad09f7383e561009519911095e8b65f6f1d79486f7f9b97fa76d7a9755b59fca5a5dff321d8c8b15fd83f2fd22ce08834c |
| 33 |
-DIST rocm-opencl-runtime-5.0.2.tar.gz 1004855 BLAKE2B e2c2beb987053204fbe8fda562ae65d6c1a58447e9e88bf1081aabeee6c9a10738fd8562114b564b647682438fdbd2c535db1008ac6e1cc4eb9a915998eeb3c7 SHA512 fa01d1fafc890181b9e67070353ee7c9100619494b7509cae1a3659f24ef1d00f650024cb24bdb0e6e7eacfdec1115e4683ec6f320228a19f41ae83321780780 |
| 34 |
DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0 |
| 35 |
DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f |
| 36 |
-DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44 |
| 37 |
DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b |
| 38 |
|
| 39 |
diff --git a/dev-util/hip/files/hipvars-5.0.2.pm b/dev-util/hip/files/hipvars-5.0.2.pm |
| 40 |
deleted file mode 100644 |
| 41 |
index 88d3c27bab99..000000000000 |
| 42 |
--- a/dev-util/hip/files/hipvars-5.0.2.pm |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,20 +0,0 @@ |
| 45 |
-#!/usr/bin/perl -w |
| 46 |
-package hipvars; |
| 47 |
- |
| 48 |
-$HIP_BASE_VERSION_MAJOR = "@HIP_BASE_VERSION_MAJOR@"; |
| 49 |
-$HIP_BASE_VERSION_MINOR = "@HIP_BASE_VERSION_MINOR@"; |
| 50 |
- |
| 51 |
-$isWindows = 0; |
| 52 |
-$HIP_PATH='/usr'; |
| 53 |
-$ROCM_PATH='/usr'; |
| 54 |
-$CUDA_PATH='/opt/cuda'; |
| 55 |
-$HSA_PATH='/usr'; |
| 56 |
-$HIP_CLANG_PATH='/usr/lib/llvm/roc/bin'; |
| 57 |
-$HIP_ROCCLR_HOME=$HIP_PATH; |
| 58 |
-$HIP_PLATFORM='amd'; |
| 59 |
-$HIP_COMPILER = "clang"; |
| 60 |
-$HIP_RUNTIME = "rocclr"; |
| 61 |
-$HIP_VERSION_MAJOR = $HIP_BASE_VERSION_MAJOR; |
| 62 |
-$HIP_VERSION_MINOR = $HIP_BASE_VERSION_MINOR; |
| 63 |
-$HIP_VERSION_PATCH = "@HIP_VERSION_PATCH@"; |
| 64 |
-$HIP_VERSION="$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; |
| 65 |
|
| 66 |
diff --git a/dev-util/hip/hip-5.0.2-r3.ebuild b/dev-util/hip/hip-5.0.2-r3.ebuild |
| 67 |
deleted file mode 100644 |
| 68 |
index cf695cc6f6fc..000000000000 |
| 69 |
--- a/dev-util/hip/hip-5.0.2-r3.ebuild |
| 70 |
+++ /dev/null |
| 71 |
@@ -1,138 +0,0 @@ |
| 72 |
-# Copyright 1999-2023 Gentoo Authors |
| 73 |
-# Distributed under the terms of the GNU General Public License v2 |
| 74 |
- |
| 75 |
-EAPI=8 |
| 76 |
- |
| 77 |
-PYTHON_COMPAT=( python3_{9..11} ) |
| 78 |
- |
| 79 |
-inherit cmake prefix python-any-r1 |
| 80 |
- |
| 81 |
-DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" |
| 82 |
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" |
| 83 |
-SRC_URI="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-${PV}.tar.gz -> rocm-hipamd-${PV}.tar.gz |
| 84 |
- https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz |
| 85 |
- https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz |
| 86 |
- https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz |
| 87 |
- profile? ( https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz |
| 88 |
- https://github.com/ROCm-Developer-Tools/hipamd/files/8311148/hip_prof_str_diff.gz -> ${PV}-update-header.patch.gz |
| 89 |
- )" |
| 90 |
- |
| 91 |
-KEYWORDS="~amd64" |
| 92 |
-LICENSE="MIT" |
| 93 |
-SLOT="0/$(ver_cut 1-2)" |
| 94 |
- |
| 95 |
-IUSE="debug profile" |
| 96 |
- |
| 97 |
-DEPEND=" |
| 98 |
- dev-util/rocminfo:${SLOT} |
| 99 |
- =sys-devel/llvm-roc-${PV}*[runtime] |
| 100 |
- dev-libs/rocm-comgr:${SLOT} |
| 101 |
- virtual/opengl |
| 102 |
-" |
| 103 |
-RDEPEND="${DEPEND} |
| 104 |
- dev-perl/URI-Encode |
| 105 |
- dev-libs/roct-thunk-interface:${SLOT}" |
| 106 |
-BDEPEND="profile? ( $(python_gen_any_dep ' |
| 107 |
- dev-python/CppHeaderParser[${PYTHON_USEDEP}] |
| 108 |
- ') ) |
| 109 |
-" |
| 110 |
- |
| 111 |
-PATCHES=( |
| 112 |
- "${FILESDIR}/${PN}-5.0.1-DisableTest.patch" |
| 113 |
- "${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch" |
| 114 |
- "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" |
| 115 |
- "${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch" |
| 116 |
- "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" |
| 117 |
-) |
| 118 |
- |
| 119 |
-python_check_deps() { |
| 120 |
- if use profile; then |
| 121 |
- python_has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" |
| 122 |
- fi |
| 123 |
-} |
| 124 |
- |
| 125 |
-S="${WORKDIR}/hipamd-rocm-${PV}" |
| 126 |
-HIP_S="${WORKDIR}"/HIP-rocm-${PV} |
| 127 |
-OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV} |
| 128 |
-CLR_S="${WORKDIR}"/ROCclr-rocm-${PV} |
| 129 |
-RTC_S="${WORKDIR}"/roctracer-rocm-${PV} |
| 130 |
- |
| 131 |
-src_prepare() { |
| 132 |
- cmake_src_prepare |
| 133 |
- use profile && eapply "${WORKDIR}/${PV}-update-header.patch" |
| 134 |
- |
| 135 |
- eapply_user |
| 136 |
- |
| 137 |
- # Use Gentoo slot number, otherwise git hash is attempted in vain. |
| 138 |
- sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die |
| 139 |
- |
| 140 |
- # disable PCH, because it results in a build error in ROCm 4.0.0 |
| 141 |
- sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die |
| 142 |
- |
| 143 |
- # correctly find HIP_CLANG_INCLUDE_PATH using cmake |
| 144 |
- sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die |
| 145 |
- |
| 146 |
- # correct libs and cmake install dir |
| 147 |
- sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \ |
| 148 |
- -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die |
| 149 |
- sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die |
| 150 |
- |
| 151 |
- cd ${HIP_S} || die |
| 152 |
- eapply "${FILESDIR}/${PN}-5.0.2-correct-ldflag.patch" |
| 153 |
- # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" |
| 154 |
- # which makes "stdlib.h" not found when using "#include_next" in header files; |
| 155 |
- sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ |
| 156 |
- -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ |
| 157 |
- -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \ |
| 158 |
- -e "s:\$ENV{'HIP_LIB_PATH'}:'/usr/$(get_libdir)':" \ |
| 159 |
- -e "/rpath/s,--rpath=[^ ]*,," \ |
| 160 |
- -i bin/hipcc.pl || die |
| 161 |
- |
| 162 |
- # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" |
| 163 |
- sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \ |
| 164 |
- -i "${S}/hip-config.cmake.in" || die |
| 165 |
- |
| 166 |
- einfo "prefixing hipcc and its utils..." |
| 167 |
- hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}") |
| 168 |
- hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${HIP_S}") |
| 169 |
- |
| 170 |
- cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.0.2.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" |
| 171 |
- sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ |
| 172 |
- -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die |
| 173 |
-} |
| 174 |
- |
| 175 |
-src_configure() { |
| 176 |
- use debug && CMAKE_BUILD_TYPE="Debug" |
| 177 |
- |
| 178 |
- # TODO: Currently a GENTOO configuration is build, |
| 179 |
- # this is also used in the cmake configuration files |
| 180 |
- # which will be installed to find HIP; |
| 181 |
- # Other ROCm packages expect a "RELEASE" configuration, |
| 182 |
- # see "hipBLAS" |
| 183 |
- local mycmakeargs=( |
| 184 |
- -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc" |
| 185 |
- -DCMAKE_BUILD_TYPE=${buildtype} |
| 186 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" |
| 187 |
- -DBUILD_HIPIFY_CLANG=OFF |
| 188 |
- -DHIP_PLATFORM=amd |
| 189 |
- -DHIP_COMPILER=clang |
| 190 |
- -DROCM_PATH="${EPREFIX}/usr" |
| 191 |
- -DUSE_PROF_API=$(usex profile 1 0) |
| 192 |
- -DPROF_API_HEADER_PATH="${RTC_S}"/inc/ext |
| 193 |
- -DROCCLR_PATH=${CLR_S} |
| 194 |
- -DHIP_COMMON_DIR=${HIP_S} |
| 195 |
- -DAMD_OPENCL_PATH=${OCL_S} |
| 196 |
- ) |
| 197 |
- |
| 198 |
- cmake_src_configure |
| 199 |
-} |
| 200 |
- |
| 201 |
-src_install() { |
| 202 |
- |
| 203 |
- cmake_src_install |
| 204 |
- |
| 205 |
- rm "${ED}/usr/include/hip/hcc_detail" || die |
| 206 |
- |
| 207 |
- # Don't install .hipInfo and .hipVersion to bin/lib |
| 208 |
- rm "${ED}/usr/lib/.hipInfo" "${ED}/usr/bin/.hipVersion" || die |
| 209 |
-} |
Archives