diff options
Diffstat (limited to 'sci-libs')
17 files changed, 362 insertions, 23 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex cdbd8e7ab00b..c7ad2b902fa1 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest index 769ee7600f8a..5e0501fd7a38 100644 --- a/sci-libs/hipFFT/Manifest +++ b/sci-libs/hipFFT/Manifest @@ -1,6 +1,7 @@ AUX hipFFT-4.3.0-add-complex-header.patch 381 BLAKE2B 962865d4dd1a38bbc4e70756d614c92a287029e5bd6d987e8adbabb4b33a83e616cc1156bfc5dc415124d25373e146178a99854972d957039654007d5d3d5122 SHA512 8dfda0eb470005b9ed4701dbf0a1022040ce6bc90f0e04ca16704083074047b5170396257c1aa8c5d0855c055e491249c63516f4f1ba7583d5214f39705433fa AUX hipFFT-5.0.2-remove-git-dependency.patch 1489 BLAKE2B 800033e728c4871c9c8de797779f3c9ca0f3441e1946068e4d826aabf02d1e27145e0fc627ae583ac27eaa43abeafba271fda48c22d087eda3cdace18cd62af2 SHA512 4c0ca6282b3fccf99d7ae25c17f5961b10b0ff49e1d1e1a65055d7ff20fe4a17901b8c5e9ec78953a2de86ab9408f583eb85cc211db1e2dc339fb8e2217a9f10 AUX hipFFT-5.1.3-gentoo-install-locations.patch 1003 BLAKE2B f41fecbfa3556767f59fe4c2516a070664fb105c2d9871640a2ea4679bd50c292ac329e81ba34557423f1e2445a8157630aba9e0d0a9eacd6b3778efbd67734b SHA512 e2cd361116c59215d5a1aa383fc6e9a3a4ea3c22348dfd83a6e5da13f3ab03833b149ba4a60939f41cb933276015b819aab4e4f9356ee6742f38b88598747d45 +AUX hipFFT-5.1.3_hip-config.patch 2792 BLAKE2B 275010cb9b4fe0b2f530bc1fe4fd027e774d1bb7bb035774fec24566ff513ae7a3ea63ecc6abef81b290b02235a3f45939f21c6b34268f72f1ca2a4e4265d81c SHA512 3307392bf43cfbfdd70973a87d2d67c63d94408e382b5db145aaf23e8572f3efa77e68c29ef168123960279da947a356fbadc0b2dc67163a6bf353694dd2a51f DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706 -EBUILD hipFFT-5.1.3.ebuild 1215 BLAKE2B c6247905b76257910c1c04beb4cac06d268184855061b9475d0caa981462497c6fe6ce6eb45de786dbafded3d59cef5f5ba561c3d5d7cdc8b9dfad02ad018871 SHA512 200e46991f56e3158c7c3520fc7a1642b4fcb2a7e622c6a124b0b336d64f62cb7c27798604f4a8fc81d387a9ecfc1cc1ba588d73576097147ff6e0007b6d9e16 +EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e MISC metadata.xml 617 BLAKE2B d5ab7f2a7c98fdafe1e50bff4708e7a2bf58680e9ee2cadaa2eea018b81032b4e1d82849144684a1100acb9a4e2651fb07572c0e46cbda87ef585b290e4b865c SHA512 7859cff3011e71bb1e6a2668c6d1f035cdd47ad214aefe6c0c225a8ac7133081a9e2bad5a7bb7ea94b7a9c3761f131228e5da66b0190e35234cd10c626e01734 diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch new file mode 100644 index 000000000000..2f63a0f8e6f7 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch @@ -0,0 +1,90 @@ +reverts the following commit. + +Upstream: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/67 + +commit 41491c9a70f808ed74690a538ca7bd25ff1ae1ca +Author: Steve Leung <Steve.Leung@amd.com> +Date: Wed Sep 1 11:25:26 2021 -0600 + + cmake: use HIP CONFIG on Windows + +diff --git a/clients/rider/CMakeLists.txt b/clients/rider/CMakeLists.txt +index de1fc7d..8b88103 100644 +--- b/clients/rider/CMakeLists.txt ++++ a/clients/rider/CMakeLists.txt +@@ -43,11 +43,7 @@ + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + target_link_libraries( hipfft-rider PRIVATE hip::host ) + else() + +diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt +index 5a882c6..37162ab 100644 +--- b/clients/samples/CMakeLists.txt ++++ a/clients/samples/CMakeLists.txt +@@ -48,11 +48,7 @@ + target_link_libraries( ${sample} PRIVATE hip::hipfft ) + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) + target_link_libraries( ${sample} PRIVATE hip::host ) + else() +diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt +index 2b965e2..0442a79 100644 +--- b/clients/tests/CMakeLists.txt ++++ a/clients/tests/CMakeLists.txt +@@ -81,11 +81,7 @@ + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + target_link_libraries( hipfft-test PRIVATE hip::host ) + else() + target_compile_definitions( hipfft-test PRIVATE __HIP_PLATFORM_NVIDIA__) +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index 022e3e4..0c8b3f8 100644 +--- b/cmake/dependencies.cmake ++++ a/cmake/dependencies.cmake +@@ -27,22 +27,14 @@ + # HIP + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" ) + endif() + else() + if( BUILD_WITH_LIB STREQUAL "CUDA" ) + set(HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include") + else() +- if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +- else() +- find_package( HIP MODULE REQUIRED ) +- endif() ++ find_package( HIP REQUIRED ) + endif() + endif() + diff --git a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild index 216d15841546..79eb8052324f 100644 --- a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild +++ b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" -RDEPEND="dev-util/hip:${SLOT} +RDEPEND="dev-util/hip sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="" @@ -26,25 +26,19 @@ BDEPEND="" S="${WORKDIR}/hipFFT-rocm-${PV}" PATCHES=( + "${FILESDIR}/${PN}-5.1.3_hip-config.patch" "${FILESDIR}/${PN}-5.1.3-gentoo-install-locations.patch" "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch" "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch" ) -src_prepare() { - sed -e "/CMAKE_INSTALL_LIBDIR/d" -i CMakeLists.txt || die - cmake_src_prepare -} - src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft" - -DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake" - -DHIP_ROOT_DIR="${EPREFIX}/usr" + -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_TESTS=OFF -DBUILD_CLIENTS_RIDER=OFF ) - cmake_src_configure + CXX=hipcc cmake_src_configure } diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest new file mode 100644 index 000000000000..38b697c3e519 --- /dev/null +++ b/sci-libs/hipRAND/Manifest @@ -0,0 +1,3 @@ +DIST hipFFT-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 +EBUILD hipRAND-5.6.0.ebuild 825 BLAKE2B 0363d94ed0bb68ab437d62966e8c261fb8c5d31fa7ba4abc52325e28cc7d3b857ccdaf5158c03478b0f72ceb89545965452257ddb72d30d7a7c6a3776c788ced SHA512 16f97156691aaaf630e6c040b6ec6594a85c9420a16e2f6be2a37d6b21973d85130dd283801750986c8ae5ae47a1d2f396b010284ee6407d918b26d8c7068b92 +MISC metadata.xml 489 BLAKE2B 9dbd5a5d1c3d7deeb191eb70c48ec9f4abd11a6362a81f93fb54116a4687edf9cf1113179af884bd346b9bfb4c785437dd674251903b233589ba8556e5316644 SHA512 4f85aa13c08b7ccab6c1db816f805a987a3ee33991dacba683fabf7f40ff7288660f725296dfdda68d9ae9ff5d5150cde9b6e9303f481960665a2085b5f62ef0 diff --git a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild new file mode 100644 index 000000000000..d0bd5ace71e4 --- /dev/null +++ b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic hip RAND implementation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipRAND" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="" + +S="${WORKDIR}/hipRAND-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipRAND/metadata.xml b/sci-libs/hipRAND/metadata.xml new file mode 100644 index 000000000000..27c8916b67d4 --- /dev/null +++ b/sci-libs/hipRAND/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + <name>Gentoo Science Project</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>xgreenlandforwyy@gmail.com</email> + <name>Yiyang Wu</name> + </maintainer> + <upstream> + <remote-id type="github">ROCmSoftwarePlatform/hipRAND</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index 674d93870e97..985271bde4d1 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -10,6 +10,6 @@ DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fc DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4 -EBUILD rocBLAS-5.1.3-r3.ebuild 3057 BLAKE2B ad53ba2724e736014a49a78ff0a8d326efe083d811f8084cc830ecce93bcc6c0203a23d2d9c2aa75577be57d2085e76390ca3340d9da8d1c33bf303a1e507c7f SHA512 134b52b04a32f91b9d8b4a20d90d5868b9aba255c411bcad5a6692108c98571c8e0ffcd57342a037126d6f8931dc297133a1b4545892d9df6cc427593d503644 +EBUILD rocBLAS-5.1.3-r4.ebuild 3049 BLAKE2B 815430fdd86ba2e7afabce58d0b2b0495f6faa4cd483695e40d1af67508898b52569a575494f5c99402c68ef5ce9854add762322ae71e9269f4a7bb5db316100 SHA512 88a76f6e9b6a759e4d49a3fcdeb6731dfef2d521a6d91380c7c8b13236c80ec847d450235b45af2cc7e2b950ebd673f386669f95908d51b28c8b8c52bd8dc8f0 EBUILD rocBLAS-5.4.2-r3.ebuild 2688 BLAKE2B 08a03bdc96a5998ad04b42c2e86d6ec8fde2025f923ba5dfa5e34539cf2ea253018348afa4bed7fb25343b2801b40295f8486f4b3de39d07ddabd81b45cc05f1 SHA512 826ffb25f76c48cd044c54cdd6f318f8c6eba9bd03dc272391e3a3df7d5380f756459215b92879557da80afd149f32dac5af4f85316d91ce4372108eb300754a MISC metadata.xml 739 BLAKE2B 38ace9571ca717a5bf7251888b4537522326f34778be98cfe717a06dbbd3a04a2bf905ec1cabafe9bbd3fea90adfb5c25c8b41e46c034a7793363ea5fc0c7f29 SHA512 60f1d5aa2a6ebe17cfcf24780529e1eef521bb7c838e48d18180a52d580cf91430ac1f4fdd0e70b9804ec5f0b5957dbd431149f6e0b0b9033cf8ad683510c582 diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild index 7027067623c7..94c7e5177af0 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r3.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}" RESTRICT="!test? ( test )" BDEPEND=" - dev-util/rocm-cmake:${SLOT} + dev-util/rocm-cmake dev-util/Tensile:${SLOT} " diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index 3fccc728922e..caf24d8f6cff 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -3,5 +3,5 @@ AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325d AUX rocFFT-5.1.3-add-stdexcept-header.patch 340 BLAKE2B b21454151dd2c41948e00b50360b3adbc93c08e7e849b11c032ba0b8dc76d1159883349065d7c87bf3098d0e67d4da48db220b58934de39fcb3c4d006a902a5e SHA512 a49f2bad5ea87f67a7d5dc7adb820a42ab2b92b0f1436a564c3906dcc4598de154d18247d8b4e8f3e12c3947da05890a4a9ba6f76852bebd1fcf26928ee48e0c AUX rocFFT-5.1.3-unbundle-sqlite.patch 2326 BLAKE2B 5a08f2ec7486f0687c4af46e09a01678e8255254bb78ae864436353d10017f86f1b3b557527a32771de43fa24148c3be5d233639bdf3e6746b2d120623bf934d SHA512 c545053741c55abf1dbcda89e9ece1bccb42a5db86c0329499b332299c5c7b73150650634cc7506bef2ee7e16a25bf1aacd5477bf13884e2cb01c48a113b33ab DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43 -EBUILD rocFFT-5.1.3.ebuild 3900 BLAKE2B 0d309a54a713cc12642c37f9214675c76e31f8f4740a1c1d38aba1b639be98e8d89d48b088d426d75f70d068b3d9a1e678f1f596c99cbafcfcec51450ddd1321 SHA512 25b26c38acc498af9b83121da86c149a69b922e822937110d174471f41f5a7ca6d6c2b6509a97b8854b6dfc170f60d0deeddc0aee9547f487f9b7c126aa68546 +EBUILD rocFFT-5.1.3-r1.ebuild 3918 BLAKE2B 91899ac954ae093fe0f31437ca306085f2e14fcabfd1b89deb063cdfbf0219d5ec036a0c6a139148b494981518f2bfef660b67180ab9f1d838f0399073f8818e SHA512 a168e0fddf940b3ac0916063221dd8f61fd994bfe92bf41441fc2ac1841a8230aed5a241c06b2b4651da9492361eb9eca44761927ef69cc8c8468c7333d251ca MISC metadata.xml 676 BLAKE2B dbf1364ede458c08dde2ebd4a8ca7053a1dc00813f647fc09268ef5a97150945c19b2375f13cc74aec8ff0af831625221bfa675b5ded7769ff5e1a322ae8b5dc SHA512 352c744ece6202b976170615927c09b82513a73669cd5efc5ca626ac2b6929d18f8ecd0b8a91d87bef86aab17713158f1e7efaef0aee01b7ac6e7d6cd2a3a4f3 diff --git a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild index af9d3e7fad22..8d4bed88c3a0 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) ROCM_VERSION=${PV} inherit cmake check-reqs edo multiprocessing python-r1 rocm @@ -36,7 +36,7 @@ BDEPEND=" test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 - dev-util/rocm-cmake:${SLOT} + dev-util/rocm-cmake " CHECKREQS_DISK_BUILD="7G" @@ -80,7 +80,7 @@ pkg_setup() { src_prepare() { sed -e "s/PREFIX rocfft//" \ -e "/rocm_install_symlink_subdir/d" \ - -e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \ + -e "/<INSTALL_INTERFACE/s,include,include/rocfft," \ -i library/src/CMakeLists.txt || die sed -e "/rocm_install_symlink_subdir/d" \ @@ -107,7 +107,8 @@ src_configure() { -DCMAKE_SKIP_RPATH=On -DAMDGPU_TARGETS="$(get_amdgpu_flags)" -Wno-dev - -DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/" + -DCMAKE_INSTALL_INCLUDEDIR="include/rocfft/" + -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) -DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF) -DPYTHON3_EXE=${EPYTHON} diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest index d33a948753c0..3eb2d8794622 100644 --- a/sci-libs/rocRAND/Manifest +++ b/sci-libs/rocRAND/Manifest @@ -1,4 +1,9 @@ +AUX rocRAND-5.1.3_no-symlink.patch 1373 BLAKE2B a2909cb5c012c8a1b47ba543f2624195b6817fc1458c67a285994f379615698e36f52420868aacad7c9033e25072fb0f126f852a4285c768250387aadefbadcc SHA512 d055d5598e2e83846ff0383021b6107ab8762803744da588669ecc4f40b5b6fedec8598d39cd2626e6f9556be4292bad3b6263936746efb461f79e651a4aaae9 +AUX rocRAND-5.1.3_stdint-gcc13.patch 1025 BLAKE2B 96e4600eb83bb407c4590084a9cb3464dbeafc070584a40cd94ebd9c67d96b1a0cc5261ab0a7e0cc79f3f14d4af280dcbf320bbc857a6850cd581fbcf7a78688 SHA512 4711fc79ebc9c90db4213c729462a9d622e3eb81b000b1e432702151bb0a56cf693996b28037231d5f968020ec4be1fdb6f99a167a470ecb1253ad7799826b67 +AUX rocRAND-5.4.2_stdint-gcc13.patch 2025 BLAKE2B 373fcb39a4a10505ded1b97e1afde7191fcb94f56b34c6f0134a48199f038439a9911a9b5f8116b5051d331c765b96be7ffa2569892eec9312c3263ba547cdc7 SHA512 8d6cb0da359b27afdfe411fe84a7f6443e20c92753b825348932a407cffc24f8f4f239436ad1ed21966ec5cf4657c4033c821eae440f15737b63bed187023f15 DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28 -EBUILD rocRAND-5.1.3.ebuild 1943 BLAKE2B 35e25904fea875e8e940c35679ec3fae6f4d1eb195de7a00674d3ca961331855d1170734c5b9bcf5b4a614487a4338d772c4954d0b8aa6f3b06ff715bdf02910 SHA512 1be4d70c30d9f6f575f755a5a94b4ecdc553d38abaad04830fc55f23b5885feb2568e37e8ab2be3b964f5159f98b8fda2115a5818c7865c958e5d4706359759c +DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5 +EBUILD rocRAND-5.1.3.ebuild 1980 BLAKE2B 6280751e595cade52a2087da1080064cb5a827edc91a5679e1a3252f1dbe3f7ec35dc7f72d3a949c88c95fc44a18d054087b3d59b4d58614f9248045f59bf750 SHA512 2b788497096c4bd1ed83653d7bef0d73f362264f9cde01d421d1c12741fb397a1e96eb5fbbd84b13a55892e0538bb1648518fcaa4996774aa48acd20429df6d6 +EBUILD rocRAND-5.6.0.ebuild 1341 BLAKE2B 129b0f1175e2a9a4f0159241269c034d9b1a4a9f5f5700848177b3f5f68edce2301b08d7173eeac37cbca4ec0c8d4c81eb0c9cd3d2a6f7ecabb37e67956dcd03 SHA512 579522efd4bdb20cfce44b0321b9052b541300f47846ea4891bdc274ae8704a4f0f8cbb7599c0c090b5cc6033d79becc33da0dc8cbe8114e89755db1dae2566a MISC metadata.xml 583 BLAKE2B 5713db2187eb2c1c8f40e9f9774215a880b67ad90ffe943f66724619b90cff92ccc06e09e1f6d7092e4d6e374cd26300ca13c8654a3f2ca2cc65d796356b5a42 SHA512 a42e669f1ce6ed3a83a8648f7c43a85cc1223c2bf73fe14e2e06df5c6573dfa55751198b374f151ed36e75ada831406654d7f3d8429e3e05c14036e26057608c diff --git a/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch b/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch new file mode 100644 index 000000000000..e0a4b8d66ae1 --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch @@ -0,0 +1,38 @@ +commit 3b24ff660f83e18cadd3da272f182aaf8f98a755 +Author: Liam Wrubleski <Liam.Wrubleski@amd.com> +Date: Mon Jan 24 13:49:52 2022 -0700 + + Revert symlinks + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 17a8c4c..89322d8 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -60,27 +60,6 @@ rocm_install( + "${CMAKE_BINARY_DIR}/library/include" + ) + +-# Create symlinks +-if(WIN32) +- set(SYMLINK_COMMAND "file(COPY \${SRC} DESTINATION \${DEST_DIR})" ) +-else() +- set(SYMLINK_COMMAND "execute_process(COMMAND ln -sf \${SRC_REL} \${DEST})" ) +-endif() +-set(INSTALL_SYMLINK_COMMAND " +- set(SRC_DIR \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/include/rocrand) +- file(GLOB_RECURSE FILES RELATIVE \${SRC_DIR} \${SRC_DIR}/*) +- foreach(FILE \${FILES}) +- set(SRC \${SRC_DIR}/\${FILE}) +- set(DEST \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/rocrand/include/\${FILE}) +- get_filename_component(DEST_DIR \${DEST} DIRECTORY) +- file(MAKE_DIRECTORY \${DEST_DIR}) +- file(RELATIVE_PATH SRC_REL \${DEST_DIR} \${SRC}) +- message(STATUS \"symlink: \${SRC_REL} -> \${DEST}\") +- ${SYMLINK_COMMAND} +- endforeach() +-") +-rocm_install(CODE "${INSTALL_SYMLINK_COMMAND}") +- + set(FORTRAN_SRCS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/rocrand/src/fortran") + configure_file( + src/rocrand-fortran-config.cmake.in diff --git a/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch b/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch new file mode 100644 index 000000000000..e80155f24da7 --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch @@ -0,0 +1,33 @@ +commit d79e778080766cf359d6658367e1c7ce0668daa4 +Author: Benda Xu <orv@debian.org> +Date: Sat Jul 29 23:03:22 2023 +0800 + + sobol*_direction_vector_generator.cpp: include stdint.h for uint*_t + + Reference: https://gcc.gnu.org/gcc-13/porting_to.html + Signed-off-by: Benda Xu <heroxbd@gentoo.org> + +diff --git a/tools/sobol32_direction_vector_generator.cpp b/tools/sobol32_direction_vector_generator.cpp +index 16c4354..eb316c7 100644 +--- a/tools/sobol32_direction_vector_generator.cpp ++++ b/tools/sobol32_direction_vector_generator.cpp +@@ -20,6 +20,7 @@ + + #include <iostream> + #include <fstream> ++#include <cstdint> + #include <string> + #include <iomanip> + +diff --git a/tools/sobol64_direction_vector_generator.cpp b/tools/sobol64_direction_vector_generator.cpp +index e520903..ecdbdc4 100644 +--- a/tools/sobol64_direction_vector_generator.cpp ++++ b/tools/sobol64_direction_vector_generator.cpp +@@ -20,6 +20,7 @@ + + #include <iostream> + #include <fstream> ++#include <cstdint> + #include <string> + #include <iomanip> + diff --git a/sci-libs/rocRAND/files/rocRAND-5.4.2_stdint-gcc13.patch b/sci-libs/rocRAND/files/rocRAND-5.4.2_stdint-gcc13.patch new file mode 100644 index 000000000000..566ef5a1c45a --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-5.4.2_stdint-gcc13.patch @@ -0,0 +1,59 @@ +Upstream: https://github.com/ROCmSoftwarePlatform/rocRAND/pull/372 + +commit 78c5631acd58d218af0c61af5acc57e9f47bc9c7 +Author: Benda Xu <orv@debian.org> +Date: Sat Jul 29 23:03:22 2023 +0800 + + sobol*_direction_vector_generator.cpp: include stdint.h for uint*_t + + Reference: https://gcc.gnu.org/gcc-13/porting_to.html + Signed-off-by: Benda Xu <heroxbd@gentoo.org> + +diff --git a/tools/scrambled_sobol32_direction_vector_generator.cpp b/tools/scrambled_sobol32_direction_vector_generator.cpp +index 5623704..7addf4d 100644 +--- a/tools/scrambled_sobol32_direction_vector_generator.cpp ++++ b/tools/scrambled_sobol32_direction_vector_generator.cpp +@@ -21,6 +21,7 @@ + #include "../library/include/rocrand/rocrand_sobol32_precomputed.h" + #include <fstream> + #include <iomanip> ++#include <cstdint> + #include <iostream> + #include <string> + +diff --git a/tools/scrambled_sobol64_direction_vector_generator.cpp b/tools/scrambled_sobol64_direction_vector_generator.cpp +index 0aecd3e..4189006 100644 +--- a/tools/scrambled_sobol64_direction_vector_generator.cpp ++++ b/tools/scrambled_sobol64_direction_vector_generator.cpp +@@ -21,6 +21,7 @@ + #include "../library/include/rocrand/rocrand_sobol64_precomputed.h" + #include <fstream> + #include <iomanip> ++#include <cstdint> + #include <iostream> + #include <string> + +diff --git a/tools/sobol32_direction_vector_generator.cpp b/tools/sobol32_direction_vector_generator.cpp +index 16c4354..eb316c7 100644 +--- a/tools/sobol32_direction_vector_generator.cpp ++++ b/tools/sobol32_direction_vector_generator.cpp +@@ -20,6 +20,7 @@ + + #include <iostream> + #include <fstream> ++#include <cstdint> + #include <string> + #include <iomanip> + +diff --git a/tools/sobol64_direction_vector_generator.cpp b/tools/sobol64_direction_vector_generator.cpp +index e520903..ecdbdc4 100644 +--- a/tools/sobol64_direction_vector_generator.cpp ++++ b/tools/sobol64_direction_vector_generator.cpp +@@ -20,6 +20,7 @@ + + #include <iostream> + #include <fstream> ++#include <cstdint> + #include <string> + #include <iomanip> + diff --git a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild index 26ca0c5042b1..f5f90b407482 100644 --- a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild +++ b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,6 +20,9 @@ IUSE="benchmark test" REQUIRED_USE="${ROCM_REQUIRED_USE}" RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}"/${PN}-5.1.3_stdint-gcc13.patch + "${FILESDIR}"/${PN}-5.1.3_no-symlink.patch ) + RDEPEND="dev-util/hip" DEPEND="${RDEPEND} dev-util/rocm-cmake @@ -35,8 +38,6 @@ src_prepare() { # change installed include and lib dir, and avoid symlink overwrite the installed headers # avoid setting RPATH sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \ - -e "s:(hip|roc)rand/include:include/\1rand:" \ - -e '/\$\{INSTALL_SYMLINK_COMMAND\}/d' \ -e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die # remove GIT dependency @@ -54,6 +55,7 @@ src_configure() { -DCMAKE_SKIP_RPATH=On -DAMDGPU_TARGETS="$(get_amdgpu_flags)" -DBUILD_HIPRAND=ON + -DROCM_SYMLINK_LIBS=OFF -DBUILD_TEST=$(usex test ON OFF) -DBUILD_BENCHMARK=$(usex benchmark ON OFF) ) diff --git a/sci-libs/rocRAND/rocRAND-5.6.0.ebuild b/sci-libs/rocRAND/rocRAND-5.6.0.ebuild new file mode 100644 index 000000000000..b7b4ac7cc950 --- /dev/null +++ b/sci-libs/rocRAND/rocRAND-5.6.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="Generate pseudo-random and quasi-random numbers" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND" +SRC_URI="https://github.com/ROCmSoftwarePlatform/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-5.4.2_stdint-gcc13.patch ) + +RDEPEND="dev-util/hip" +DEPEND="${RDEPEND} +dev-util/rocm-cmake +test? ( dev-cpp/gtest )" +BDEPEND="dev-util/rocm-cmake +>=dev-util/cmake-3.22" + +S="${WORKDIR}/rocRAND-rocm-${PV}" + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=On + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_HIPRAND=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + export LD_LIBRARY_PATH="${BUILD_DIR}/library" + MAKEOPTS="-j1" cmake_src_test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/benchmark + dobin benchmark_rocrand_* + fi +} |