diff options
Diffstat (limited to 'sci-libs')
56 files changed, 0 insertions, 2982 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 9754af820510..197ec9eabdc8 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest index e5754169c9a1..7afeb25629cc 100644 --- a/sci-libs/hipBLAS/Manifest +++ b/sci-libs/hipBLAS/Manifest @@ -1,12 +1,8 @@ AUX hipBLAS-6.3.0-no-git.patch 627 BLAKE2B 1fe3e6345aa97c904a928ab3bef93bcc7617822baab3448d79c4865571e6a54c8367743fabea670d1f82b30be1cea7daf7172fc5ef43ec16bfb1d8c79b878c80 SHA512 ea2d640bf5c530c2595595eadfacd0df5f56d812f688370eee8b946651bff85c607a6170d4ad08bf6b9e8844ffe603ad541a8eefacb950c4fb4f9a8ee637ae87 -DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707 -DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8 DIST hipBLAS-5.7.1.tar.gz 669163 BLAKE2B e065f77eba0bb99d347f71920e733d30b7693f9eaf0c1f2a87a169360ccff23b8294e367eebfd6489440308b9bb1ae662c39617c5bb94275bf9b0ed60d555f85 SHA512 24c074f07865e1a3dfb0aca0b1d494e340a584ecb408813bb5b053f8282437cfd3644d730163f4faf1b93da306626ba68904141f9c3730a29749537fb7fd1a63 DIST hipBLAS-6.1.1.tar.gz 835570 BLAKE2B dc8a54f3b6c780f63e57f208d67b15e965d3a7c98e20766ef22ecfd41e8780a6b9464e31efad8003b52562222ec7ad06801d93a502ff99f8456f415db09e5ace SHA512 390b9a9bf0238a5c72d51d034c0053ec8c6b007547b1ec9561064828c24335e099ddb0402ad76e60018ec96742d5acfbb29b9d218a613e1c6d54e4b8b05ceca7 DIST hipBLAS-6.3.0.tar.gz 993145 BLAKE2B 6bd6108c90c511fb9e68f628714545569dac9afe9f022f9d59e365f44177ae574a4e3b94c9276b64aad3c72c94d5b3d87babe79edbb9cc2e6d5cbaebb82f3a83 SHA512 c5d40a6dcce467e44b091c610d35dc7abfe9e863b37438642e98568a3f8b084ffd94ee41e466a60f21151df765c0df377d553700e2df2b08375a58f40654f7dc DIST hipBLAS-6.3.2.tar.gz 993139 BLAKE2B a053f8b54318a169518f084e0bca3c9272cb51fab564c8d874b19483232cfeacb92707ad5224f4d0c3848b52d82973c36f0d4fdb429c9f5d995b3c56b1194075 SHA512 8581905a923484662471da786b795d7f960b45cc5eed991b101a88a4e3d4ea5217582c813192dde8eb35eafba9867c3ac448aeb4d7ef470e6da544f09397d902 -EBUILD hipBLAS-5.1.3.ebuild 1290 BLAKE2B 2d5722359ad1192d245a0d344aa2d3ab794f49be3cf7d6e0e90936d8813c29e7d2b96fb571f0b34aa5cf2883186bf20c5a4e8d974bba148ac20370b032176d1d SHA512 a95a0f8ae694e346aa00d4de3b09938515e8f104e731fa14936dd6f335996c32136d043f326887b8bcde718b5782cb464fc9a23641ea9641492fa21efee4b3a3 -EBUILD hipBLAS-5.4.2.ebuild 929 BLAKE2B ce433ff82d693d8b446bc47ce93e7ded4a4401cb423d45cbe9040d5a6b19bd1daa1b0b62e227c69505f941778fd3832827e867894f1ddb92538aebedddc26f67 SHA512 09813a2e0878222efdee2a5e87401671337dedb76441bbc5cca3c42f2aea3e88281ac503feb93b5ec3d4a904ceebe34bb9344ac577b9fdedb9f65e6678ead8fa EBUILD hipBLAS-5.7.1.ebuild 919 BLAKE2B 35676f043ad9ab3f3dc3398915e285fd5d8f15fd7ada8b1f3dc9af667853e7c57f79a51a3868141f91b8804b31353794038c0dd8be4a206ad44843609e385fb3 SHA512 2d825e3e69473d0fb0c8b718b0bc2751363bf0cf6f77f7afef54a9a4d2616cc09d8910a8196e44eb31aac8a3d3db389d702d5f2fa70107eae2ff8b38b72c15e0 EBUILD hipBLAS-6.1.1.ebuild 1031 BLAKE2B 7cf62b4427339cf3deaca50d30b95587240578e24cb2ad47ce01852e33141a4bd4c8208b28eb8923103ce8023bbef14da51a7e401a774f65b80c1efef8f4229d SHA512 82a4cd120f1ad40a3239d6e09542c04bede0c6619d53532276597b4aeafbb2773d75e8b3af49751e675ab4e7fd9eb90e162e9bf2e372408546c9150dbab38fd9 EBUILD hipBLAS-6.3.0.ebuild 1128 BLAKE2B 45c1131ee455c26c2aeb1141ec04c90931d4e2296644b929ed37ec7fedfc804724e45a2c43fe5e73a4107eb0ff8ca440ea8be03ad3442382cf006207ef1c3483 SHA512 99d089246917c80aa203c5cbbbccc47c711d69706c477dc5f1904f9d2870a03f0f17d66c4b47f3f0d4588fcc96ebb0c11479ead0192f62a849f38e9c83099bd6 diff --git a/sci-libs/hipBLAS/hipBLAS-5.1.3.ebuild b/sci-libs/hipBLAS/hipBLAS-5.1.3.ebuild deleted file mode 100644 index 3ac3a0ae1200..000000000000 --- a/sci-libs/hipBLAS/hipBLAS-5.1.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake rocm -DESCRIPTION="ROCm BLAS marshalling library" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS" -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND="dev-util/hip - sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] - sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="" - -S="${WORKDIR}/hipBLAS-rocm-${PV}" - -src_prepare() { - sed -e "s:<INSTALL_INTERFACE\:include:<INSTALL_INTERFACE\:include/hipblas/:" -i library/src/CMakeLists.txt || die - sed -e "/PREFIX hipblas/d" -i library/src/CMakeLists.txt || die - sed -e "/rocm_install_symlink_subdir( hipblas )/d" -i library/src/CMakeLists.txt || die - sed -e "s:hipblas/include:include/hipblas:" -i library/src/CMakeLists.txt || die - - eapply_user - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DBUILD_CLIENTS_TESTS=OFF # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here - -DBUILD_CLIENTS_BENCHMARKS=OFF - ) - - cmake_src_configure -} diff --git a/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild b/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild deleted file mode 100644 index b61f8865b925..000000000000 --- a/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# 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="ROCm BLAS marshalling library" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS" -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND="dev-util/hip - sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] - sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="" - -S="${WORKDIR}/hipBLAS-rocm-${PV}" - -src_configure() { - local mycmakeargs=( - -DBUILD_CLIENTS_TESTS=OFF # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here - -DBUILD_CLIENTS_BENCHMARKS=OFF - -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DROCM_SYMLINK_LIBS=OFF - ) - - CXX=hipcc cmake_src_configure -} diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest index bc721e941c6b..dfe7454f59b8 100644 --- a/sci-libs/hipCUB/Manifest +++ b/sci-libs/hipCUB/Manifest @@ -1,10 +1,7 @@ -AUX hipCUB-4.3.0-add-memory-header.patch 421 BLAKE2B cd05a027dbf75098fd199783c0abc2c37627e5b55b92f1b4ffb828995fbdb7ebf46f3f1d66a87c37eb35ddd16bd472541537d1ea250474c541bd01b10bd386c5 SHA512 7865f3942b7b157095c477da8790bf9632a630aa3456cde3b1a7b267e62db720a257e1c0e0501b88f8a0b187aa8ec520c4e7693e97af72358a6ff518be1f10a3 -DIST hipCUB-5.1.3.tar.gz 278021 BLAKE2B f30e567370fea80ef63a455c2c27b3f4ff241e7e405688fa4dc33d1e0ce3dffb016a1a1523b20613a7963bff061758eac0c0d110243a9a6cedbc100bb087d7d4 SHA512 dd3ca341b78cf6985ba723feeeb560c0503ab283b63067e9a5e68d12ad42f752a7f56fd60f0f0c26c2853538853e09a102cfc6006c18c31c3162fa7b536ffb9f DIST hipCUB-5.7.1.tar.gz 322980 BLAKE2B a9b2a69b47661532858f18e7296ef37be41da814bb4886f7b8b444829e6ad1374d1c3117b57e7599095253ed56ea2403c895bb820dbde9cec77c28a041af3898 SHA512 7cf7dc819a3d8bac2cf70aa077616e65d785d76bae3ad3991db7b940a061f694ac82b1e4219aa16476351f1329e3f0d09a818b0ff0b9c5ad261937879c21dca8 DIST hipCUB-6.1.1.tar.gz 343181 BLAKE2B 3943278597c5e9d41c225ad86c3cdcc113f35cf1bf218ba357a112c25ae14df8d0e3f385aacd82ab4c694ae2382012aea06c02d40d982d00929d03d0d3908b55 SHA512 37297f6791146cc9db11d3d494555672c021dea06bec1e8a780ca926df1e5de140c8ee560657668df6221279a0418af9e34a235b3b52df3df2a66adabea7ca6f DIST hipCUB-6.3.0.tar.gz 387560 BLAKE2B cd5712267d9284a42364e0563503f1213b32bff69f17faea4fbcb7c85e5f95ac742f89a957b9924abd54beff8b010a03ceb095c669e27c870244731a5f05f7ee SHA512 2b3a8fbdae8a2146788d7a34956572bbf63188c7bd871b4eab78017b3144b6e4e0cd902d152f9624eb485b365cdca1d81681dcfeea44e1f57f112f1a12bfead1 DIST hipCUB-6.3.2.tar.gz 387546 BLAKE2B b0d4d487fc1f799e10cd684255fe4bb31ed7329d0ea628c818df560d506aa2b4e5bdb08b007aab9ee95492a3fecf6f559c5c9724df15fe7da86d9aed84951c6b SHA512 735610735e4584ded05b30d99ae9042d3ccd4590689fc2c415eb45fb2fd0d7ab431704709bdd066341ec10284ca0f4c1ad108c188f95949ce962b6a75eb57e19 -EBUILD hipCUB-5.1.3.ebuild 1930 BLAKE2B 9a686ada92902f9ee2fed32ac68e5599a38fd25ab639a22316293efe868701399d6d26c401d9c09b328139d94fe4fccbe8a33e6dd3eb675b7b9704c906af3ce9 SHA512 91a0e1284bb43502525120d031586b12238a71c28583135848b824e555c5ed84ab7d2258eb38945090a00def1ba060ae2ba8aefa7c2fe5cd35ae38808b4df94d EBUILD hipCUB-5.7.1-r1.ebuild 1303 BLAKE2B b5702011d5ef9ffc482cec9a74bf6b05bc952d8d071b38d7dfe8ae5aa48d8944ec248d23eef9bbdf25e25085cb99e5b578a291b206fb6dfb97f2ca257245b515 SHA512 97e716391c5f75d05396b46cf05f73130eefc12566c07f550d25ed38fb764a02d3bee0b77ab0cdb849261bce8dba0fe66d01e9d261a110e4a06dbde1d201ffe5 EBUILD hipCUB-6.1.1.ebuild 1272 BLAKE2B 6bc38cd3d84b2c88e3926a54f52f7e3918f5fb2f9e723bb9fa4ce766b9b847890a42238d30c2c982ccd64ff95960ebb43da0fb83893f206b54eab6ed0771462f SHA512 aedac3ee24b853953f22d6beeddcbeff4e62acd5f33e69c5d1c85e4b7c398b25d466afdf95a90634aae1a3572eb9544ef19cfd7a5fadb2f80cd1d7d3fc1c5be7 EBUILD hipCUB-6.3.0.ebuild 1378 BLAKE2B 662956e626b1defc7274a6e6b93cd49f4ed7d6fe875c7949930b689ace2b836a5451c153864d93e24dc2b59abd09a738003768cf0c89dbcc8b2ecf7721946562 SHA512 3418a67fe0e234c0c367c68631bd6f0ba680d01db668ccda6476438bbf955e43049c87fc66de8e260b992e5d1b04ea633248dcfe0f331698eb21aff77f471df6 diff --git a/sci-libs/hipCUB/files/hipCUB-4.3.0-add-memory-header.patch b/sci-libs/hipCUB/files/hipCUB-4.3.0-add-memory-header.patch deleted file mode 100644 index c9991944101a..000000000000 --- a/sci-libs/hipCUB/files/hipCUB-4.3.0-add-memory-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -resolves compilation error: no template named 'shared_ptr' in namespace 'std' - ---- orig/benchmark/benchmark_device_radix_sort.cpp 2021-08-26 11:37:12.587196186 +0800 -+++ hipCUB-rocm-4.3.0/benchmark/benchmark_device_radix_sort.cpp 2021-08-26 11:37:27.459196285 +0800 -@@ -21,6 +21,7 @@ - // SOFTWARE. - - #include "common_benchmark_header.hpp" -+#include <memory> - - // HIP API - #include "hipcub/device/device_radix_sort.hpp" diff --git a/sci-libs/hipCUB/hipCUB-5.1.3.ebuild b/sci-libs/hipCUB/hipCUB-5.1.3.ebuild deleted file mode 100644 index 4588711d36b2..000000000000 --- a/sci-libs/hipCUB/hipCUB-5.1.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake rocm - -DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB" -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" -IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND="dev-util/hip - sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] - benchmark? ( dev-cpp/benchmark ) - test? ( dev-cpp/gtest ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/hipCUB-rocm-${PV}" - -PATCHES="${FILESDIR}/${PN}-4.3.0-add-memory-header.patch" - -src_prepare() { - sed -e "/PREFIX hipcub/d" \ - -e "/DESTINATION/s:hipcub/include/:include/:" \ - -e "/rocm_install_symlink_subdir(hipcub)/d" \ - -e "/<INSTALL_INTERFACE/s:hipcub/include/:include/hipcub/:" -i hipcub/CMakeLists.txt || die - - sed -e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die - - # disable downloading googletest and googlebenchmark - sed -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die - - # remove GIT dependency - sed -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die - - if use benchmark; then - sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \ - -e "/add_executable/a\ install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die - fi - - eapply_user - cmake_src_prepare -} - -src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DBUILD_TEST=$(usex test ON OFF) - -DBUILD_BENCHMARK=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - MAKEOPTS="-j1" cmake_src_test -} diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest index 50e62b14f49c..c1feafd86c2c 100644 --- a/sci-libs/hipFFT/Manifest +++ b/sci-libs/hipFFT/Manifest @@ -1,14 +1,10 @@ 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 AUX hipFFT-5.7.1_hip-config.patch 1256 BLAKE2B 240423151a9eede7398289049294c28322dca1480038ca6a88b234e5222df12bd56ef1ad1c56939ce695e1aa0161ca838327902a047a92cd509beaa330a9247c SHA512 915b512e847ccaf02466c9f105365c354d4e51a1a54506844cdefc895eca555d10c0e10716686aebbd1e3b5f6a547fa8ab093b56ccf655e172a0154171f4f2c2 -DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706 DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6 SHA512 4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465 DIST hipFFT-rocm-6.1.1.tar.gz 170796 BLAKE2B 8c957db8e7e2548918539c94262d912c2f33b70d8482b727c78c13323bdb6822c3e95439854b8ab4fed970d21ed0c6fd2ab8c2805db59d3a3606d73e7eb47468 SHA512 531be32b12ed5f0f2352e3e0a893ca988a4c8492e66fc9347b6754ae4e769549d6f638a760de35cb15ef2d301ab4200a76c832d769ecb0cd55e9e42f839a1876 DIST hipFFT-rocm-6.3.0.tar.gz 267945 BLAKE2B 33d9013ddb20b37b17a05dc647e74eaccede7e952723a177cb0f1e54f2b25cd6a76b1a8b00f419cf197e495dd654b04f418d28ca1023ea4bc88f0ccf8191d6c0 SHA512 a210e044a87845a861c127529143ea8517f5eef30a07007f43bd29a85b5c2999bd6002d12cd2a06c1c8b469ea3d52c081bbcc5146c5fc585df8505ddfa6a3e06 DIST hipFFT-rocm-6.3.2.tar.gz 267935 BLAKE2B cb2f2f616f70578d98b47eeb1c89e81b769c5e615ec3f5421fc1a4fd8deb2695a3e69f8f41da3aa93adbb61d0c85596d89301437ad2d092779355976ff8d7b9c SHA512 788c1a4313c4b863051d0f7ea1a4ccd1d7955469dfcc604644041a6936279211b58850589aac90fde76b96cbe6452e87feb8ab2c01186a924ae8de47ff792cb7 -EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e EBUILD hipFFT-5.7.1-r1.ebuild 988 BLAKE2B 8a15335790603e3499c1824bfc0dd5aa4fb305320bacc37dc17579fab895b1d7dbfca8da3a47efdf8a8fc1f32d7eca72db24d59fc764fc5c09997e2e1a232ff1 SHA512 7af50918064c2792e194ad9da8e00b96c84f275c2f38f8ad831109024d16e92c0aaad059e4da7bb3862368e1b776b416628b743e5ff7e7831fa9253cce11f645 EBUILD hipFFT-6.1.1.ebuild 936 BLAKE2B 180d9f0d4d9f83d8b161f1d8d8b7ac83bb6ab9a1c7accb28b0957a24dd72076d0cd02b2e718c1ed7fe9794df7054c706ab591c0af4c7126a1e0441214906228c SHA512 6911033e816d9c914be257781d778914996b21dbbcfaf9e58b8435e7a995dfe092c95138ae2da6d3a9fae667e0a18272af2a9e38971a6c84aa212727ed1da8b3 EBUILD hipFFT-6.3.0.ebuild 936 BLAKE2B 180d9f0d4d9f83d8b161f1d8d8b7ac83bb6ab9a1c7accb28b0957a24dd72076d0cd02b2e718c1ed7fe9794df7054c706ab591c0af4c7126a1e0441214906228c SHA512 6911033e816d9c914be257781d778914996b21dbbcfaf9e58b8435e7a995dfe092c95138ae2da6d3a9fae667e0a18272af2a9e38971a6c84aa212727ed1da8b3 diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch b/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch deleted file mode 100644 index fe395de42f86..000000000000 --- a/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix install location to meet FHS, and remove useless symlink -=================================================================== ---- hipFFT-rocm-5.1.3.orig/library/CMakeLists.txt -+++ hipFFT-rocm-5.1.3/library/CMakeLists.txt -@@ -81,7 +81,7 @@ target_include_directories( hipfft - PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include> - $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> - $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}> -- $<INSTALL_INTERFACE:include> -+ $<INSTALL_INTERFACE:include/hipfft> - ${HIP_INCLUDE_DIRS} - ) - -@@ -142,13 +142,11 @@ if( ROCM_FOUND ) - rocm_install_targets( TARGETS hipfft - INCLUDE - ${CMAKE_SOURCE_DIR}/library/include -- ${CMAKE_BINARY_DIR}/include -- PREFIX hipfft ) -+ ${CMAKE_BINARY_DIR}/include ) - rocm_export_targets( TARGETS hip::hipfft -- PREFIX hipfft -+ PREFIX . - DEPENDS PACKAGE hip - NAMESPACE hip:: ) -- rocm_install_symlink_subdir( hipfft ) - - # Package specific CPACK vars - if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) 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 deleted file mode 100644 index 2f63a0f8e6f7..000000000000 --- a/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch +++ /dev/null @@ -1,90 +0,0 @@ -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-r1.ebuild b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild deleted file mode 100644 index 79eb8052324f..000000000000 --- a/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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 FFT implementation" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT" -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/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/rocFFT:${SLOT}[${ROCM_USEDEP}]" -DEPEND="${RDEPEND}" -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_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft" - -DROCM_SYMLINK_LIBS=OFF - -DBUILD_CLIENTS_TESTS=OFF - -DBUILD_CLIENTS_RIDER=OFF - ) - - CXX=hipcc cmake_src_configure -} diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest index 8a8f06ba1b32..af353b87c8e0 100644 --- a/sci-libs/hipRAND/Manifest +++ b/sci-libs/hipRAND/Manifest @@ -1,9 +1,7 @@ -DIST hipRAND-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 DIST hipRAND-rocm-5.7.1.tar.gz 478352 BLAKE2B 5f435cf53d213b1d95ee8b766df2c9bc4b4d590ccf63fe867bd033eeb4b7fef67e2bde22242525686a8dee59fd811363857312481e9cb3575357c612ab519a41 SHA512 b3c51728c1d7cc37760f49f36ab7765c166f105bc5b1b6ce65ac4a1de9bb70f8e2c10f5c41f89040288b09c9257d913d745a416bd4785b71f170a4f57e1f95e2 DIST hipRAND-rocm-6.1.1.tar.gz 119063 BLAKE2B dc314d8b09c15351075594335d14f65024be54597e7cbdfb7671ebea29fa208c9a33530a2d406a8a2a9d8738f0aae7e9fc25d8c39304ef2ef27aaf8b327b5975 SHA512 4c350c8a75e6b4064e22cd73679f66e5caf28f7922fc47ef9670c1023b58b36bf3a2a35580463ee7c89e26ed924aaaa68166a11f64823b99f2f8302f80d6e87a DIST hipRAND-rocm-6.3.0.tar.gz 125500 BLAKE2B 80b64692c5bc8dc1cb6861f98c927d14215c1115dfb69153cb2d69d17dbe7a8e53c9985d3457762740866f6f773999ed8fc91c70133e8996f50a1413b064bf8c SHA512 47a2b21618ee3f0c91df7a7b707473ef2f82ee75f4084e8acc07e90cf0d668c7903ab4fe44fbb105a476a4730782a9de30446f620e0ba0cfca62257e8ac0fffd DIST hipRAND-rocm-6.3.2.tar.gz 125506 BLAKE2B 836eb474c4b88a4729e3e9176736b28c090cf2add0ef463bf594deede353b755a1a07ef5898ec51e3ae66c2972cbfe6a71815020dd5f3e3b1aca105d8d8ca8e2 SHA512 8f3893ec89f76b859847b75acf3ec20f751924cd16d3ea25dbb0e1f2a5b7d75832c214e6ce9e180e3f74fbcb0c4bf95b75bf3ad32e9ac34e5e0f7522554f38a6 -EBUILD hipRAND-5.6.0-r1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b EBUILD hipRAND-5.7.1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b EBUILD hipRAND-6.1.1.ebuild 790 BLAKE2B 1eac4994b7c6dc84110e1bf3163f82ee201173588002a1524f413290b7de6bf1c7289af0e07e91d4a3658d0288feed0b5e360f5ca89ee0ee0e620fb2591fca9c SHA512 4dec1a6d7b6a180dfe6a44b5cdd75775fb6599b696ca39197edd6ac46e9a64f286ae0db8345f14c5c2fb25a0f9a8165ab701007d9cfe86ea8bb2237e478e9896 EBUILD hipRAND-6.3.0.ebuild 801 BLAKE2B 874f9628a1fd54556603289ef36c83025e2981d0c0de972849826b2e3befe49c9cf806f6b85d8810afa2127f5220f7dce41b7b151018cc9f21cfbdd4d9410d32 SHA512 c94b9e7fedc8c8f40b9889f66f3c3bb8db578e0c7720d9e163691429b5b023a7d8586dd47403ad128b96608a706a96fbd960b1942d76d9c91e8e303f27acc727 diff --git a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild deleted file mode 100644 index 1674ad72718f..000000000000 --- a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2024 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 -> hipRAND-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}" - -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/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest index 915da68aa7f2..b8513db5daca 100644 --- a/sci-libs/hipSPARSE/Manifest +++ b/sci-libs/hipSPARSE/Manifest @@ -1,7 +1,5 @@ -AUX hipSPARSE-5.0.2-remove-matrices-unpacking.patch 3940 BLAKE2B e3815659b32856206bc3291d09f59514e59dc06c3c33454c24afb68955d6a55411c71535693325be06bdb097e7cedc558ec2b8fa6a2d3886d774d79e038557ad SHA512 39db7d6fe0a085ef5a92f6ec1613376ffd9152d8d31a78f0864c971e7b61d4dfbda2e170940c82dae286d024333621722b249d5bd601399e76e68e8029fc7e81 AUX hipSPARSE-6.3.0-fix-filesystem.patch 976 BLAKE2B e17bd3ec5263deb7a5dacd7051c31134f203682d1f5f4b7b79394babee0e0b68bfddf57d123ee752c5e2c57a26cb7559dac7bf15103396366948c10a4e693ede SHA512 798efc0858b09512e04dce020dd380808c87f3fa0d2b87f52c2c367aecc0562a8e1b2cda9cf6817604f2a9a1a6a68a3cc879d0e73e8658729599899a10ff5f71 AUX hipSPARSE-6.3.0-no-gtest-in-benchmark.patch 837 BLAKE2B 038e43d4e62fb68f714c03dc1e9277cef03f635355721c95e1613ba2e7e85657a41c368732d9edd12657ff39626f6a7687802827230da8df121623e68af17e91 SHA512 8082aa0e3020cf3d37dbd37c251eff84e130757fb3b352dd43e9b738b8bec9e84c57ba1c530af3675c5d1c88ba48ae9e48db6560b4030b916dfe7b0289d13185 -DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64 DIST hipSPARSE-5.7.tar.gz 458521 BLAKE2B 94695ef3cf4294f571723e31ab5d4295b5aaa24528e90838375ee8477cf0957b297663d80e5fe3406762b475b6ef4741f9ccfb4dfb1448ce71ea4014da14b46e SHA512 bb28cd81b7ec298eb2e6462a8588ed93eee7b4892923b11087a91d1c32341f29f488fd4e6797debe51a989f463db31030eae02d07be6512d6b755367ba221aac DIST hipSPARSE-6.1.tar.gz 471148 BLAKE2B 18119ac355e180adb5ce38561f44e39119226d209a970ae8cac6b85575bad1ab2a690a3bb72de1c179c1190aa2c29d691e6ce02855f3df89a58f634d42e54103 SHA512 09f9e94c5f976e6f17c07f9be2fde31c2e740871215a6b77b49675644b883bd9994fcaacb19864ace3883bb5aea7a7dc589ddbaf9b6aaf3d9f411c7e452a0b78 DIST hipSPARSE-6.3.tar.gz 537764 BLAKE2B 2989c81ac1f024246fdcf8081fa6969f1efd81d680f39b45edac290b4db7d453154d5d432e0ad3d0bc1e08948e03886a89ff4ec051b30cb7eca6bfe4f433d4a7 SHA512 c011b7d7a2121a20ceb2eee8d7217717ff06196f085f0996b0952b5afdbf2350e7288c4cfd2cfe9214b84c2add203788a1860d9a89bb426df2bc376b348a7f55 @@ -24,7 +22,6 @@ DIST rocSPARSE_scircuit.tar.gz 8635362 BLAKE2B 3f1d6e35a6a774664bd653dd466fa3c07 DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b648e3c396a5ab2379efdc7de218adec519a235e2e94904f85a4f24c8d4ff15af096ca089379e00db47519023f64b85c16 SHA512 e027097e74f8ffc058339855b1c38cab52c68b661058318b429487e7188e11e907f6734894f9c71d1e38d262986525fba8d0f165bc0a1b4632d7e25be8db4f17 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161 -EBUILD hipSPARSE-5.1.3-r1.ebuild 3603 BLAKE2B 648b6b8edc22efc9d95713e935e8e8a9cff2b086be1eae1e503f537e6fb656f76970aa6919963d2c3febf8ba262555604102cb89b8e3ad3900379e6889f44b5a SHA512 a5c206f818df8b9e64253b136d819cf385769b496271a9b8049a9d2d0ba3305f2a2a46e6c1e52f61a8b3e862e660ec7f8b16597489706ed3b5aba22b30e853f1 EBUILD hipSPARSE-5.7.1.ebuild 3559 BLAKE2B bd8957a817978ede880a1c7d924994967aaa27474c4da9152980ba1c1463d636e841a025b549ab10e4a0b376d61dbbb8a51f10cdbbe042a33c5168462691283d SHA512 9223c6d530e1951732de1ab9d24522bea70869bb1f61f6b86d1b283692416c8c5d6d8d5302c429a74fa9b587c0953d3c836ca39488cea21a83e08a0d3f286700 EBUILD hipSPARSE-6.1.1.ebuild 3301 BLAKE2B f299978cb0999cfcace7af71164cbb4893260d194d2d331d60f2a0faaaf804f20f88f877956f58374f4c6d212f108ae5f5aa044de426f5ad55f7dd84a083a645 SHA512 e17a904c40af97e304adfc2abe42843494a18b6dfdf0e4d5de2e63e5549a081a7a456f08473535e729815044a6a1b1a7ca05dda21222b885912c9d686a48e534 EBUILD hipSPARSE-6.3.0.ebuild 3816 BLAKE2B 028054220dfee983f29ee3d079e73614ee96e0b2e6aba71d9fc1d121e30fc950ca3bb1f617bf22c9eccea8b55afa28fa5a0f52b84a9c12ee1f6abe5024e89853 SHA512 9df1da0d5fe4e3c7e75ea1607530b7e1fa8bcca7c2c3b0d3981205612ef5d4a6d9e4f1572b9b566add08d6ecceda7f6ee6bfd114cf12f3fcf2b69faf6f462ad9 diff --git a/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch b/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch deleted file mode 100644 index 021e10b7ab2c..000000000000 --- a/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch +++ /dev/null @@ -1,126 +0,0 @@ -Adopted from 4.3.0 patch to remove downloads during test. - -Ultimately the to be downloaded matrices should be in DISTFILES. - -Index: hipSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt -=================================================================== ---- hipSPARSE-rocm-5.0.2.orig/clients/tests/CMakeLists.txt -+++ hipSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt -@@ -23,117 +23,6 @@ - - find_package(GTest REQUIRED) - --# Download some test matrices --set(TEST_MATRICES -- SNAP/amazon0312 -- Muite/Chebyshev4 -- FEMLAB/sme3Dc -- Williams/webbase-1M -- Bova/rma10 -- JGD_BIBD/bibd_22_8 -- Williams/mac_econ_fwd500 -- Williams/mc2depi -- Hamm/scircuit -- Sandia/ASIC_320k -- GHS_psdef/bmwcra_1 -- HB/nos1 -- HB/nos2 -- HB/nos3 -- HB/nos4 -- HB/nos5 -- HB/nos6 -- HB/nos7 -- DNVS/shipsec1 --) -- --set(TEST_MD5HASH -- f567e5f5029d052e3004bc69bb3f13f5 -- e39879103dafab21f4cf942e0fe42a85 -- a95eee14d980a9cfbbaf5df4a3c64713 -- 2d4c239daad6f12d66a1e6a2af44cbdb -- a899a0c48b9a58d081c52ffd88a84955 -- 455d5b699ea10232bbab5bc002219ae6 -- f1b0e56fbb75d1d6862874e3d7d33060 -- 8c8633eada6455c1784269b213c85ea6 -- 3e62f7ea83914f7e20019aefb2a5176f -- fcfaf8a25c8f49b8d29f138f3c65c08f -- 8a3cf5448a4fe73dcbdb5a16b326715f -- b203f7605cb1f20f83280061068f7ec7 -- b0f812ffcc9469f0bf9be701205522c4 -- f185514062a0eeabe86d2909275fe1dc -- 04b781415202db404733ca0c159acbef -- c98e35f1cfd1ee8177f37bdae155a6e7 -- c39375226aa5c495293003a5f637598f -- 9a6481268847e6cf0d70671f2ff1ddcd -- 73372e7d6a0848f8b19d64a924fab73e --) -- --if(NOT TARGET hipsparse) -- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/../deps/convert.cpp) --else() -- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/deps/convert.cpp) --endif() -- --if(BUILD_ADDRESS_SANITIZER) -- execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CONVERT_SOURCE} -O3 -fsanitize=address -shared-libasan -o ${PROJECT_BINARY_DIR}/mtx2csr.exe) --else() -- execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CONVERT_SOURCE} -O3 -o ${PROJECT_BINARY_DIR}/mtx2csr.exe) --endif() -- --list(LENGTH TEST_MATRICES len) --math(EXPR len1 "${len} - 1") -- --foreach(i RANGE 0 ${len1}) -- list(GET TEST_MATRICES ${i} m) -- list(GET TEST_MD5HASH ${i} md5) -- -- string(REPLACE "/" ";" sep_m ${m}) -- list(GET sep_m 0 dir) -- list(GET sep_m 1 mat) -- -- # Download test matrices if not already downloaded -- set(CMAKE_MATRICES_DIR ${PROJECT_BINARY_DIR}/matrices) -- if(NOT EXISTS "${CMAKE_MATRICES_DIR}/${mat}.bin") -- message("-- Downloading and extracting test matrix ${m}.tar.gz") -- file(DOWNLOAD https://sparse.tamu.edu/MM/${m}.tar.gz ${CMAKE_MATRICES_DIR}/${mat}.tar.gz -- INACTIVITY_TIMEOUT 3 -- STATUS DL) -- -- list(GET DL 0 stat) -- list(GET DL 1 msg) -- -- if(NOT stat EQUAL 0) -- message("-- Timeout has been reached, trying mirror ...") -- # Try again using ufl links -- file(DOWNLOAD https://www.cise.ufl.edu/research/sparse/MM/${m}.tar.gz ${CMAKE_MATRICES_DIR}/${mat}.tar.gz -- INACTIVITY_TIMEOUT 3 -- STATUS DL) -- -- list(GET DL 0 stat) -- list(GET DL 1 msg) -- -- if(NOT stat EQUAL 0) -- message(FATAL_ERROR "${msg}") -- endif() -- endif() -- -- # Check MD5 hash before continuing -- file(MD5 ${CMAKE_MATRICES_DIR}/${mat}.tar.gz hash) -- -- # Compare hash -- if(NOT hash STREQUAL md5) -- message(FATAL_ERROR "${mat}.tar.gz is corrupted") -- endif() -- execute_process(COMMAND tar xf ${mat}.tar.gz WORKING_DIRECTORY ${CMAKE_MATRICES_DIR}) -- -- file(RENAME ${CMAKE_MATRICES_DIR}/${mat}/${mat}.mtx ${CMAKE_MATRICES_DIR}/${mat}.mtx) -- execute_process(COMMAND ${PROJECT_BINARY_DIR}/mtx2csr.exe ${mat}.mtx ${mat}.bin WORKING_DIRECTORY ${CMAKE_MATRICES_DIR}) -- # TODO: add 'COMMAND_ERROR_IS_FATAL ANY' once cmake supported version is 3.19 -- file(REMOVE_RECURSE ${CMAKE_MATRICES_DIR}/${mat}.tar.gz ${CMAKE_MATRICES_DIR}/${mat} ${CMAKE_MATRICES_DIR}/${mat}.mtx) -- -- endif() --endforeach() -- - set(HIPSPARSE_TEST_SOURCES - hipsparse_gtest_main.cpp - test_axpyi.cpp diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild deleted file mode 100644 index 3a05960c2cc7..000000000000 --- a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake edo rocm toolchain-funcs - -DESCRIPTION="ROCm SPARSE marshalling library" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE" -# share some test datasets with rocSPARSE -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz -test? ( -https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz -https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz -https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz -https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz -https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz -https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz -https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz -https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz -https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz -https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz -https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz -https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz -https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz -https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz -https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz -https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz -https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz -https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz -https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz -)" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0"/$(ver_cut 1-2) -IUSE="test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND="dev-util/rocminfo - dev-util/hip - sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="dev-build/rocm-cmake - >=dev-build/cmake-3.22 - test? ( dev-cpp/gtest )" - -S="${WORKDIR}/hipSPARSE-rocm-${PV}" - -PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch" ) - -src_prepare() { - sed -e "s/PREFIX hipsparse//" \ - -e "/<INSTALL_INTERFACE/s,include,include/hipsparse," \ - -e "s:rocm_install_symlink_subdir(hipsparse):#rocm_install_symlink_subdir(hipsparse):" \ - -i library/CMakeLists.txt || die - - cmake_src_prepare - - # remove GIT dependency - sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die - - # Fix install path - sed -i -e "s.set(CMAKE_INSTALL_LIBDIR.#set(CMAKE_INSTALL_LIBDIR." CMakeLists.txt || die - - if use test; then - mkdir -p "${BUILD_DIR}"/clients/matrices - # compile and use the mtx2bin converter. Do not use any optimization flags! - edo $(tc-getCXX) deps/convert.cpp -o deps/convert - find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 | - while IFS= read -r -d '' mtxfile; do - destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin - ebegin "Converting ${mtxfile} to ${destination}" - deps/convert ${mtxfile} ${destination} - eend $? - done - fi -} - -src_configure() { - local mycmakeargs=( - -DHIP_RUNTIME="ROCclr" - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_SAMPLES=OFF - -DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse - ) - - cmake_src_configure -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}"/clients/staging || die - edob ./${PN,,}-test -} diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest index 0152019ae479..67dbecd71ef5 100644 --- a/sci-libs/miopen/Manifest +++ b/sci-libs/miopen/Manifest @@ -2,10 +2,6 @@ AUX miopen-4.2.0-disable-no-inline-boost.patch 447 BLAKE2B ed62e94b4a557c06654ec AUX miopen-4.2.0-gcc11-numeric_limits.patch 461 BLAKE2B 4502c7dc41e0e4ebf4105076c4415ce36e56e596bf98672ecf3d77de4a984499be0990a762c2b05d5e395a06c7df511c9f7629362c7849b31a0d2868b45d99d0 SHA512 04ce10c55af9b979651ef0c345bd12156c850139809601f29ab9305235499b53034efe1928a6dbb77d04114ddf8d93c71d37cc7bef373b07620c2169f88aebc3 AUX miopen-4.3.0-enable-test.patch 1046 BLAKE2B a9a103eee9b3b6890c02349f36dba7c4cc4459969ebe07915d0cccd3aecbd0edab21de8acbdaee17daae602733965ec1bdda60456f2e0c6bd91ae9795c24622e SHA512 cadc3844aaa32713f0d630ae3ffb9a947c303cf80410785339187ad0ee3cce8bac1b201c12134ba0241c54c296e2752a1076a3826735ccfe4d2cf5f15504f390 AUX miopen-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch 954 BLAKE2B 11f260c1ab9dd1569cf25363626e6431615f8853f334b0123d82b0e3404dcdb1b4ecd9e26658e2f39e4fa6a15ba672cb6940b0279e0ef22535e46992721fd060 SHA512 28724e7e1c1de5cee2d18b6c3da76fa857f95aee64a286262c8426149787f62d07f4a3892472cef91d3c091ec53c7f474a70616ce63e5fbbb4c531ed2ab91a50 -AUX miopen-5.0.2-strip-xnack-in-flags.patch 1205 BLAKE2B d1ba065387050b51288dba37631adea42398b2f7cd8b604e5c305d3491fb661dce8c448e31db42c70f8b6e4dec84c4214ce869dd1419eb67c2ea4c33f18849b5 SHA512 ad32335831c7d1057b53469aa2d1f8f3366b23ccdc71cb7e9a4e7813e7da7e9bb73e62465f1086391653538ccbab2f662baf2446e10e8dbc0f0db631d7368a4d -AUX miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch 10748 BLAKE2B 582b362a54d9ee00c8f6062b4ec16bebdaea7734adadcd5f6201801cb8ce3a7ca64e8148a10f2f3ab682560ced1f037b217bdcd161869d80a8489f4d56bd5241 SHA512 08cd489d23a48d0b227dacc514e3f84999c1e9a0ac3dd5424d9376c77c4d745c65f48c0f470cb5e65c20e9dbbfcb457995301a74bfe27a81604bf89213a2f1d2 -AUX miopen-5.1.3-deprecate-clang-ocl.patch 2884 BLAKE2B 4f45f66d87dea51d9f87878f52520863b36defa1403055a580e5f33c18e3de08daad1b3d3d5fad06d7d3f16da4f0945390872f573f168d1893f5f635070f1463 SHA512 c4835559a4005ffd2aac7afb38213d06857ab1a8d4bc5bd5c150b82226671fb1d66c6ef1d4eab2106ad11c475007af441182ca26f659a3fd779cd7d4f5c90247 -AUX miopen-5.1.3-gfx1031.patch 19268 BLAKE2B b3d10c57601fd5f39ae431d101687863de34b149ee08df25c987d18ef0bd89d8419a4a18659a22060093eba1cf97c2774e92abf8a38449a202e8770070b29dbf SHA512 44fb3445065087a3952ac143fba88addb4cc634dbd13e15d85d234c64fabba9cf7b83d8161a361e847375a2bc92efc86489e12cfa23ecce1b035d2ccb028db56 AUX miopen-5.1.3-include-array.patch 343 BLAKE2B 993a8f3e301f4c16088ca216b2d820b17ceb42eeda4550b4291a70e00592281f992bf184407d024a0f8b2207a26fef2d56c26ef95e7a452d3b97090e1335a404 SHA512 887ac13f25c1bfd524bb2a3be701bf688f002a95ef8218cb798e41feaeb0678dbbd2ffaf905c59070a125001093bf5ede1bb6a77fdfe6f7a4ff19cbccfdc6624 AUX miopen-5.1.3-no-strip.patch 608 BLAKE2B 3173d95219542a48c6dcd2b87e7157dcf483ff714c3d1c1c47aab8fc8af7b1fd4f6ac52b9d8e892cc25bff973597f4a05426fa4714b0764733b810867af59cfe SHA512 201357718203ee9a4062362541c483e069321b825708c6aa0e8892cc7722bcd520808797307e320df34c4fbf0003198f7a46717d5ff3819b1e2c3a5a3a045725 AUX miopen-5.7.1-fix-miopendriver-gemm.patch 2818 BLAKE2B fd839ec500b297272f70cc1ee2fa87e74b8a70197cc72291c99c1372c9eeb7f2af33de8067fa1dc42d873bd96f93615074521c00f00b0676835c912ec0e2b73b SHA512 22c852082e0de5115acfa208c325cdb7870823dfe3b5984887c848b702a2fc5072c1d1944b218e27776f0e116d391c6039c3f8485ca65282e9699f3fc1885985 @@ -13,13 +9,11 @@ AUX miopen-6.1.1-build-all-tests.patch 548 BLAKE2B be700c5401e288a4da5423047303a AUX miopen-6.1.1-fix-libcxx.patch 7454 BLAKE2B 143e69445abef40e30879ad8e38730b585a1acb17c7fee711dcc9f957cc42805ccd79457aabfd77587c790b8bb99b87c7b9d39525977b5e940a665134bf49856 SHA512 7605ab2db5c2f6d7a06ffd073f8b6bae77f04c710ffa08364af079817e5686c18e468159afec43832029c9b099a34678bd4269f10f31c141beb44ff2a59fea76 AUX miopen-6.3.0-conditional-ck-components.patch 2393 BLAKE2B cf41a17b7078664042d851ddf99ed9a702f30f6b2d9f2af9f8c164066e8cc127cd7bf99d950e4cae4d8718887c96632171804a17fd0a2dcb36a73e24299b79c0 SHA512 281c9f64c924c1cd7acf808678f52b7b32417b2b6532c0d9413b71e08c85392b296cde88a9fa50f3f18a91091a280cfaa1820ac389196d9637b0a57e4807e090 AUX miopen-6.3.0-isnan-include.patch 636 BLAKE2B 78eb4506461059191ef7999ea8252a0c50e99317ae32d25ee19f26cdc8086cca7cfbffa2b87cde8fc298696483961067929e5c68e5851582d8e94256ab08d770 SHA512 91154725cc22b52f5d6f72fe6bf11f496b033a16889f08041e81c4a814f5095ae75dcad1a00e8e93b7102c712f8b9f5ed58efc86f0fb949e85db0560ecb83468 -DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd DIST MIOpen-5.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a DIST MIOpen-6.3.0.tar.gz 104152308 BLAKE2B 46c238314393599a1bd4d3c49b0c95386b36cbee1831bf442ab127082b4c740116e81cf643c773627125b59c3974a2344753939b4287aa4adbbc51e4c4833988 SHA512 14ca2967ed6545ad68c362128be93b8e6a9d4aa69e16e989b187463d15351eca2fc437d07e88c41f693138131a7449add607333c698e24efaf0207077e15ae55 DIST MIOpen-6.3.2.tar.gz 104156821 BLAKE2B e7611ea2d37d3c72cde2e6be153271dacd7150083ec63ec2357e1c808dc9e79c1928f06fd4e70712989c5ab13a604a91d3fba1819723da12b49f6a447a561f3c SHA512 bf219459244c8f0962c54a8e94273aeeafe4b9b093c72ac962fa9d373526c9dc406c46d0464ec6b20d52b1e6c01e2cf2544267b573a0e774c7afd4ba9adc9fb9 DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a -EBUILD miopen-5.1.3-r1.ebuild 3182 BLAKE2B a6ae78e487ea88d31693fcf1b96a7ce6a1cb0505311c2f101be498bcafce5436cc678ca83e10dafc27549b3121c01cbf0c5d2a35e7f6117de086879002ecc138 SHA512 2165e4d250f125f699963bc7b6f1c22598467e962c9aac1bb7eeff24d6091fa3b72a696a11e1ab80ea18710525ef00f99889cc5b972068e23340c4eb14b621ef EBUILD miopen-5.7.1-r1.ebuild 3338 BLAKE2B bbd84a39a04c4ef9e1b2dc42ff1bbe7b7e4ceda90ca0c82f416a05a55b1324727418e1c2c1446fe7a82800d23380cfb9a3e30463289a18e9af20ab10239cbfc7 SHA512 5a8ddf01d2c088325fd377499f80b3c1f84881d52596b53450f2ce07714e53a552304bd8a24aecf394a57ee039fd6f364642f93e7920d8d9df63bb7dd312057e EBUILD miopen-6.1.1.ebuild 2347 BLAKE2B e00b587186711d0a4d51cf354c9cac89fdf0d3a3b05be358adcbb30a1e2cf86f68ad3c4ea136d2015755d814f9f347662343e84be8d7a6aa9f7366f193fa3108 SHA512 d94bef9186d91886d3fcc9310a9d2b12dc6885efb1dc340d8c78e8cf1899a180cf4cd8db2f0749f6ffde19f10e9db23d768d3690ddc758b17b3281c02248e0ae EBUILD miopen-6.3.0.ebuild 3562 BLAKE2B 86359acdab8fc60cf038fa829ec1c9a1a68717c3d3eb72fef93a36d106b4ca2453616ad4b4682ed25ca5658414f0a082b840dfbdf6bd82cd2d9d965315a3fcff SHA512 3d20eaf391ffe598e7707a1e12d41ae0e0383dc38b4b97a5b9848f13365547456bd504d9776a71d54798c6bfbfdfa0628f63eec1d4ad9afdb107a3c547cf9198 diff --git a/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch b/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch deleted file mode 100644 index 14d2c5b9daa5..000000000000 --- a/sci-libs/miopen/files/miopen-5.0.2-strip-xnack-in-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ -if options like :xnack- exists in ${AMDGPU_TARGETS}, CMakeLists cannot handle HIP_COMPILER_FLAGS well - -the original regex replace should include :+- so xnack- is stripped as well. Otherwise clang complation at MIOpen runtime will fail. - -Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com> -Index: MIOpen-rocm-5.0.2/CMakeLists.txt -=================================================================== ---- MIOpen-rocm-5.0.2.orig/CMakeLists.txt -+++ MIOpen-rocm-5.0.2/CMakeLists.txt -@@ -198,8 +198,8 @@ find_package(hip REQUIRED PATHS /opt/roc - message(STATUS "Build with HIP ${hip_VERSION}") - target_flags(HIP_COMPILER_FLAGS hip::device) - # Remove cuda arch flags --string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}") --string(REGEX REPLACE --offload-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}") -+string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}") -+string(REGEX REPLACE --offload-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}") - string(REPLACE "$<LINK_LANGUAGE:CXX>" "1" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}") - string(REPLACE "SHELL:" "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}") - diff --git a/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch b/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch deleted file mode 100644 index 3dca20f1fb12..000000000000 --- a/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch +++ /dev/null @@ -1,183 +0,0 @@ -Together with find-sed command in 5.1.3 ebuild, this fixes -https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1731 -index 71b2cabf1..60e7fab6e 100644 ---- a/src/kernels/Conv_Winograd_v13_3_12_epilogue.inc -+++ b/src/kernels/Conv_Winograd_v13_3_12_epilogue.inc -@@ -76,7 +76,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc b/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc -index 36d47c862..f8f677ec6 100644 ---- a/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc -+++ b/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc -@@ -76,7 +76,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/Conv_Winograd_v21_1_3_metadata.inc b/src/kernels/Conv_Winograd_v21_1_3_metadata.inc -index deff81e84..ed47abea7 100644 ---- a/src/kernels/Conv_Winograd_v21_1_3_metadata.inc -+++ b/src/kernels/Conv_Winograd_v21_1_3_metadata.inc -@@ -51,7 +51,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv1x1u.s b/src/kernels/conv1x1u.s -index 5dc213546..c890d45a4 100644 ---- a/src/kernels/conv1x1u.s -+++ b/src/kernels/conv1x1u.s -@@ -1076,7 +1076,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv1x1u_bias_activ.s b/src/kernels/conv1x1u_bias_activ.s -index 1675e819a..6bbdd9936 100644 ---- a/src/kernels/conv1x1u_bias_activ.s -+++ b/src/kernels/conv1x1u_bias_activ.s -@@ -1230,7 +1230,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv1x1u_stride2.s b/src/kernels/conv1x1u_stride2.s -index c5ea1e90c..6241edcf7 100644 ---- a/src/kernels/conv1x1u_stride2.s -+++ b/src/kernels/conv1x1u_stride2.s -@@ -1162,7 +1162,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv1x1wrw.s b/src/kernels/conv1x1wrw.s -index b13b6ffa4..eb63f17c6 100644 ---- a/src/kernels/conv1x1wrw.s -+++ b/src/kernels/conv1x1wrw.s -@@ -1243,7 +1243,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv3x3wrw.s b/src/kernels/conv3x3wrw.s -index a3f73aeae..b6fb1632c 100755 ---- a/src/kernels/conv3x3wrw.s -+++ b/src/kernels/conv3x3wrw.s -@@ -1033,7 +1033,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc -index 358772e63..b27ad5284 100644 ---- a/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc -+++ b/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc -@@ -76,7 +76,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc -index d3296969a..f873ce153 100644 ---- a/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc -+++ b/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc -@@ -76,7 +76,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc -index a253cc0f9..1582d002c 100644 ---- a/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc -+++ b/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc -@@ -76,7 +76,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc -index e40ac1f60..78495e024 100644 ---- a/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc -+++ b/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc -@@ -76,7 +76,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/xform_bidirect_winograd_code.inc b/src/kernels/xform_bidirect_winograd_code.inc -index 724845f49..d03314ef5 100644 ---- a/src/kernels/xform_bidirect_winograd_code.inc -+++ b/src/kernels/xform_bidirect_winograd_code.inc -@@ -1566,7 +1566,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } -diff --git a/src/kernels/xform_metadata.inc b/src/kernels/xform_metadata.inc -index 960a9a2d8..83b736bee 100644 ---- a/src/kernels/xform_metadata.inc -+++ b/src/kernels/xform_metadata.inc -@@ -74,7 +74,7 @@ amdhsa.kernels: - .max_flat_workgroup_size: \wg_x - .wavefront_size: 64 - .args: -- - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: N } -+ - { .size: 4, .offset: 0, .value_kind: by_value, .value_type: i32, .name: X } - - { .size: 4, .offset: 4, .value_kind: by_value, .value_type: i32, .name: C } - - { .size: 4, .offset: 8, .value_kind: by_value, .value_type: i32, .name: H } - - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W } diff --git a/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch b/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch deleted file mode 100644 index 93c66fd3ef05..000000000000 --- a/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch +++ /dev/null @@ -1,55 +0,0 @@ -This is a cherry picked PR on 5.1.3, which replace clang-ocl with clang -From 98f001dfe61208af04ecf7690023efd772ee7d43 Mon Sep 17 00:00:00 2001 -From: Jehandad Khan <jahandad@gmail.com> -Date: Tue, 19 Jul 2022 17:24:05 -0500 -Subject: [PATCH] Remove clang-ocl and replace with clang - ---- - CMakeLists.txt | 7 +------ - README.md | 1 - - src/hipoc/hipoc_program.cpp | 7 ++++++- - 3 files changed, 7 insertions(+), 8 deletions(-) - -Index: MIOpen-rocm-5.1.3/CMakeLists.txt -=================================================================== ---- MIOpen-rocm-5.1.3.orig/CMakeLists.txt -+++ MIOpen-rocm-5.1.3/CMakeLists.txt -@@ -241,7 +241,7 @@ if( MIOPEN_BACKEND STREQUAL "HIP" OR MIO - # miopentensile default off - set(MIOPEN_USE_MIOPENTENSILE OFF CACHE BOOL "") - -- find_program(HIP_OC_COMPILER clang-ocl -+ find_program(HIP_OC_COMPILER clang - PATH_SUFFIXES bin - PATHS - /opt/rocm -Index: MIOpen-rocm-5.1.3/README.md -=================================================================== ---- MIOpen-rocm-5.1.3.orig/README.md -+++ MIOpen-rocm-5.1.3/README.md -@@ -14,7 +14,6 @@ MIOpen supports two programming models - - * OpenCL - OpenCL libraries and header files - * HIP - - * HIP and HCC libraries and header files -- * [clang-ocl](https://github.com/RadeonOpenCompute/clang-ocl) -- **required** - * [MIOpenGEMM](https://github.com/ROCmSoftwarePlatform/MIOpenGEMM) to enable various functionalities including transposed and dilated convolutions. This is optional on the HIP backend. Users can enable this library using the cmake configuration flag `-DMIOPEN_USE_MIOPENGEMM=On`. - * ROCm cmake modules can be installed from [here](https://github.com/RadeonOpenCompute/rocm-cmake) - * [Half](http://half.sourceforge.net/) - IEEE 754-based half-precision floating point library -Index: MIOpen-rocm-5.1.3/src/hipoc/hipoc_program.cpp -=================================================================== ---- MIOpen-rocm-5.1.3.orig/src/hipoc/hipoc_program.cpp -+++ MIOpen-rocm-5.1.3/src/hipoc/hipoc_program.cpp -@@ -255,7 +255,12 @@ void HIPOCProgramImpl::BuildCodeObjectIn - if(miopen::IsEnabled(MIOPEN_DEBUG_OPENCL_WAVE64_NOWGP{})) - params += " -mwavefrontsize64 -mcumode"; - WriteFile(src, dir->path / filename); -- dir->Execute(HIP_OC_COMPILER, params + " " + filename + " -o " + hsaco_file.string()); -+ params += " -target amdgcn-amd-amdhsa -x cl -D__AMD__=1 -O3"; -+ params += " -cl-kernel-arg-info -cl-denorms-are-zero"; -+ params += " -cl-std=CL1.2 -mllvm -amdgpu-early-inline-all"; -+ params += " -mllvm -amdgpu-internalize-symbols "; -+ params += " " + filename + " -o " + hsaco_file.string(); -+ dir->Execute(HIP_OC_COMPILER, params); - } - if(!boost::filesystem::exists(hsaco_file)) - MIOPEN_THROW("Cant find file: " + hsaco_file.string()); diff --git a/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch b/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch deleted file mode 100644 index de22d66d887a..000000000000 --- a/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch +++ /dev/null @@ -1,375 +0,0 @@ -Enable gfx1031 support -====================== ---- MIOpen-rocm-5.1.3/fin/src/include/conv_fin.hpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/fin/src/include/conv_fin.hpp 2022-09-01 18:36:18.630980283 +0800 -@@ -111,6 +111,10 @@ class ConvFin : public Fin - { - assert(num_cu == 72 || num_cu == 36); - } -+ else if(arch == "gfx1031") -+ { -+ assert(num_cu == 40 || num_cu == 20); -+ } - else if(arch == "gfx90a") - { - assert(num_cu == 110); -Only in MIOpen-rocm-5.1.3: patches ---- MIOpen-rocm-5.1.3/src/composable_kernel/composable_kernel/include/utility/config.hpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/composable_kernel/composable_kernel/include/utility/config.hpp 2022-09-01 18:36:18.634980274 +0800 -@@ -13,7 +13,7 @@ - // GPU target - // should enable one and only one GPU target - #if !(defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900) || defined(CK_AMD_GPU_GFX906) || \ -- defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A) || defined(CK_AMD_GPU_GFX1030)) -+ defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A) || defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031)) - #error Need to define (only) one GPU target - #endif - -@@ -29,7 +29,7 @@ - #if defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900) || defined(CK_AMD_GPU_GFX906) || \ - defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A) - #define CK_BUFFER_RESOURCE_3RD_DWORD 0x00020000 --#elif defined(CK_AMD_GPU_GFX1030) -+#elif (defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031)) - #define CK_BUFFER_RESOURCE_3RD_DWORD 0x31014000 - #endif - -@@ -37,7 +37,7 @@ - #if defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900) - #define CK_USE_AMD_V_MAC_F32 - #elif defined(CK_AMD_GPU_GFX906) || defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90a) || \ -- defined(CK_AMD_GPU_GFX1030) -+ (defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031)) - #define CK_USE_AMD_V_FMAC_F32 - #define CK_USE_AMD_V_DOT2_F32_F16 - #define CK_USE_AMD_V_DOT4_I32_I8 ---- MIOpen-rocm-5.1.3/src/include/miopen/solver/ck_utility_common.hpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/include/miopen/solver/ck_utility_common.hpp 2022-09-01 18:36:18.638980266 +0800 -@@ -54,6 +54,7 @@ static inline bool is_ck_supported_hardw - StartsWith(handle.GetDeviceName(), "gfx908") || - StartsWith(handle.GetDeviceName(), "gfx90a") || - StartsWith(handle.GetDeviceName(), "gfx1030"); -+ StartsWith(handle.GetDeviceName(), "gfx1031"); - } - - static inline bool is_support_amd_buffer_atomic_fadd(const std::string& device_name) -@@ -83,6 +84,8 @@ static inline auto get_ck_common_compile - compiler_flag << " -DCK_AMD_GPU_GFX90A"; - else if(StartsWith(device_name, "gfx1030")) - compiler_flag << " -DCK_AMD_GPU_GFX1030"; -+ else if(StartsWith(device_name, "gfx1031")) -+ compiler_flag << " -DCK_AMD_GPU_GFX1031"; - - // buffer atomic-fadd - compiler_flag << " -DCK_USE_AMD_BUFFER_ATOMIC_FADD=" ---- MIOpen-rocm-5.1.3/src/include/miopen/solver/implicitgemm_util.hpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/include/miopen/solver/implicitgemm_util.hpp 2022-09-01 18:36:18.638980266 +0800 -@@ -469,7 +469,7 @@ static inline bool is_use_amd_buffer_loa - { - #if WORKAROUND_MIOPEN_ISSUE_557 - const auto device_name = ctx.GetStream().GetDeviceName(); -- return !StartsWith(device_name, "gfx1030"); -+ return !StartsWith(device_name, "gfx1030") && !StartsWith(device_name, "gfx1031"); - #else - return true; - #endif -@@ -478,7 +478,7 @@ static inline bool is_use_amd_buffer_loa - static inline bool is_use_v_fmac_f32(const ConvolutionContext& ctx) - { - const auto device_name = ctx.GetStream().GetDeviceName(); -- return StartsWith(device_name, "gfx1030"); -+ return StartsWith(device_name, "gfx1030") || StartsWith(device_name, "gfx1031"); - } - - static inline bool support_amd_buffer_atomic_fadd(const std::string& device_name) -@@ -599,7 +599,8 @@ static inline bool IsComposableKernelSup - StartsWith(c.GetStream().GetDeviceName(), "gfx906") || - StartsWith(c.GetStream().GetDeviceName(), "gfx908") || - StartsWith(c.GetStream().GetDeviceName(), "gfx90a") || -- StartsWith(c.GetStream().GetDeviceName(), "gfx1030"); -+ StartsWith(c.GetStream().GetDeviceName(), "gfx1030")|| -+ StartsWith(c.GetStream().GetDeviceName(), "gfx1031"); - } - - // greatest common divisor, aka highest common factor ---- MIOpen-rocm-5.1.3/src/kernels/batchnorm_functions.h 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/kernels/batchnorm_functions.h 2022-09-01 18:36:18.858979772 +0800 -@@ -159,6 +159,10 @@ - #define MIO_BN_GFX1030 0 - #endif - -+#ifndef MIO_BN_GFX1031 -+#define MIO_BN_GFX1031 0 -+#endif -+ - #define UNUSED __attribute__((__unused__)) - - #if(MIO_BN_VARIANT != 4) ---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdPerAct.cl 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/kernels/MIOpenBatchNormActivBwdPerAct.cl 2022-09-01 18:36:18.858979772 +0800 -@@ -34,7 +34,7 @@ - #endif - - #define MIOPEN_USE_AMDGCN 0 --#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 -+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1 - #undef MIOPEN_USE_AMDGCN - #define MIOPEN_USE_AMDGCN 1 - #endif ---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdSpatial.cl 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/kernels/MIOpenBatchNormActivBwdSpatial.cl 2022-09-01 18:36:18.858979772 +0800 -@@ -32,7 +32,7 @@ - #endif - - #define MIOPEN_USE_AMDGCN 0 --#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 -+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1 - #undef MIOPEN_USE_AMDGCN - #define MIOPEN_USE_AMDGCN 1 - #endif ---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl 2022-09-01 18:36:18.858979772 +0800 -@@ -33,7 +33,7 @@ - #endif - - #define MIOPEN_USE_AMDGCN 0 --#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 -+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1 - #undef MIOPEN_USE_AMDGCN - #define MIOPEN_USE_AMDGCN 1 - #endif ---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormBwdSpatial.cl 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/kernels/MIOpenBatchNormBwdSpatial.cl 2022-09-01 18:36:18.858979772 +0800 -@@ -33,7 +33,7 @@ - #endif - - #define MIOPEN_USE_AMDGCN 0 --#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 -+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1 - #undef MIOPEN_USE_AMDGCN - #define MIOPEN_USE_AMDGCN 1 - #endif ---- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl 2022-09-01 18:36:18.858979772 +0800 -@@ -33,7 +33,7 @@ - #endif - - #define MIOPEN_USE_AMDGCN 0 --#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 -+#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1 - #undef MIOPEN_USE_AMDGCN - #define MIOPEN_USE_AMDGCN 1 - #endif ---- MIOpen-rocm-5.1.3/src/md_graph.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/md_graph.cpp 2022-09-01 18:36:18.630980283 +0800 -@@ -738,8 +738,8 @@ void FusionMDGraph::InitConv(FusionMDGra - - add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 1); - add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 2); -- add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 1); -- add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 2); -+ add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 1); -+ add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 2); - } - } - ---- MIOpen-rocm-5.1.3/src/ocl/fusionopbiasbnactivocl.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/ocl/fusionopbiasbnactivocl.cpp 2022-09-01 18:36:18.634980274 +0800 -@@ -392,7 +392,8 @@ miopenStatus_t BatchNormBwdTrainFusionOp - " -DMIO_BN_USESAVED=" + std::to_string(static_cast<int>(true)) + - " -DMIO_BN_VARIANT=" + std::to_string(variant) + - " -DMIO_BN_CBA_WRITE_INTERMEDIATE=" + std::to_string(0) + -- " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0"); -+ " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") + -+ " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0"); - - compile_config += add; - MIOPEN_LOG_I2(add); -@@ -607,7 +608,8 @@ miopenStatus_t BatchNormFwdTrainFusionOp - " -DMIO_SAVE_MEAN_VARIANCE=" + (saveBatchStats ? "1" : "0") + - " -DMIO_RUNNING_RESULT=" + ((savePopStats) ? "1" : "0") + - " -DMIO_BN_VARIANT=" + std::to_string(variant) + -- " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0"); -+ " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") + -+ " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0"); - - compile_config += add; - MIOPEN_LOG_I2(add); ---- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_per_activation.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/solver/batchnorm/backward_per_activation.cpp 2022-09-01 18:36:18.638980266 +0800 -@@ -113,6 +113,7 @@ BnBwdTrainingPerActivation::GetSolution( - {"MIO_BN_GRP1", ylocalsize}, - {"MIO_BN_GRP2", zlocalsize}, - {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")}, -+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")}, - }; - - kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{}); ---- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_multiple.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/solver/batchnorm/backward_spatial_multiple.cpp 2022-09-01 18:36:18.638980266 +0800 -@@ -210,6 +210,7 @@ ConvSolution BnBwdTrainingSpatialMultipl - {"MIO_BN_GRP1", ylocalsize}, - {"MIO_BN_GRP2", zlocalsize}, - {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")}, -+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")}, - {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())}, - }; - ---- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_single.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/solver/batchnorm/backward_spatial_single.cpp 2022-09-01 18:36:18.638980266 +0800 -@@ -247,6 +247,7 @@ BnBwdTrainingSpatialSingle::GetSolution( - - build_params << KernelBuildParameters{ - {"MIO_BN_GFX1030", (handle.GetDeviceName() == "gfx1030") ? "1" : "0"}, -+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")}, - }; - - kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{}); ---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_inference.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/solver/batchnorm/forward_inference.cpp 2022-09-01 18:36:18.638980266 +0800 -@@ -103,6 +103,7 @@ ConvSolution BnFwdInference::GetSolution - {"MIO_BN_GRP1", ylocalsize},
- {"MIO_BN_GRP2", zlocalsize},
- {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
-+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
- };
-
- kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{});
---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_per_activation.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/solver/batchnorm/forward_per_activation.cpp 2022-09-01 18:36:18.638980266 +0800 -@@ -105,6 +105,7 @@ BnFwdTrainingPerActivation::GetSolution( - {"MIO_BN_GRP1", ylocalsize}, - {"MIO_BN_GRP2", zlocalsize}, - {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")}, -+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")}, - }; - - auto kernel = KernelInfo{}; ---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_multiple.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/solver/batchnorm/forward_spatial_multiple.cpp 2022-09-01 18:36:18.638980266 +0800 -@@ -177,6 +177,7 @@ ConvSolution BnFwdTrainingSpatialMultipl - {"MIO_BN_GRP1", ylocalsize}, - {"MIO_BN_GRP2", zlocalsize}, - {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")}, -+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")}, - {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())}, - }; - ---- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_single.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/solver/batchnorm/forward_spatial_single.cpp 2022-09-01 18:36:18.638980266 +0800 -@@ -211,6 +211,7 @@ BnFwdTrainingSpatialSingle::GetSolution( - {"MIO_BN_GRP1", ylocalsize}, - {"MIO_BN_GRP2", zlocalsize}, - {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")}, -+ {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")}, - {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())}, - }; - ---- MIOpen-rocm-5.1.3/src/target_properties.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/src/target_properties.cpp 2022-09-01 18:36:18.630980283 +0800 -@@ -54,6 +54,7 @@ static std::string GetDeviceNameFromMap( - {"Vega10", "gfx900"}, - {"gfx901", "gfx900"}, - {"10.3.0 Sienna_Cichlid 18", "gfx1030"}, -+ {"10.3.1 Navi_flounder 18", "gfx1031"}, - }; - - const char* const p_asciz = miopen::GetStringEnv(MIOPEN_DEBUG_ENFORCE_DEVICE{}); ---- MIOpen-rocm-5.1.3/test/CMakeLists.txt 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/test/CMakeLists.txt 2022-09-01 18:36:19.022979405 +0800 -@@ -38,6 +38,7 @@ option( MIOPEN_TEST_GFX90A "Test on gfx9 - option( MIOPEN_TEST_GFX900 "Test on Vega10 (gfx900)" OFF ) - option( MIOPEN_TEST_GFX906 "Test on Vega20 (gfx906)" OFF ) - option( MIOPEN_TEST_GFX1030 "Test on Navi21 (gfx1030)" OFF ) -+option( MIOPEN_TEST_GFX1031 "Test on Navi21 (gfx1031)" OFF ) - option( MIOPEN_TEST_GPU_XNACK_ENABLED "Test as if XNACK mode is enabled" OFF ) - option( MIOPEN_TEST_CONV Off) - option( MIOPEN_TEST_DEEPBENCH Off) -@@ -74,7 +75,7 @@ endif() - # Also we do not detect GPU when target GPU for testing is specified explicitly. - set(MIOPEN_TEST_GPU_DETECTION_FAILED FALSE) - set(MIOPEN_NO_GPU FALSE) --if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TEST_GFX906 OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_HIP_NOGPU)) -+if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TEST_GFX906 OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 OR MIOPEN_TEST_HIP_NOGPU)) - find_program(ROCMINFO - NAMES rocminfo - PATHS -@@ -96,6 +97,8 @@ if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TES - elseif (NOT ROCMINFO_EXIT_STATUS EQUAL 0) - message(WARNING "ROCMINFO FAILED, GPU TYPE UNKNOWN. Manually set respective MIOPEN_TEST_GFX* CMake variable to specify target GPU for testing.") - set(MIOPEN_TEST_GPU_DETECTION_FAILED TRUE) -+ elseif(ROCMINFO_OUTPUT MATCHES "gfx1031") -+ set(MIOPEN_TEST_GFX1031 ON) - elseif(ROCMINFO_OUTPUT MATCHES "gfx1030") - set(MIOPEN_TEST_GFX1030 ON) - elseif(ROCMINFO_OUTPUT MATCHES "gfx900") -@@ -125,6 +128,7 @@ message(STATUS "MIOPEN_TEST_GFX906 ${MIO - message(STATUS "MIOPEN_TEST_GFX908 ${MIOPEN_TEST_GFX908}") - message(STATUS "MIOPEN_TEST_GFX90A ${MIOPEN_TEST_GFX90A}") - message(STATUS "MIOPEN_TEST_GFX1030 ${MIOPEN_TEST_GFX1030}") -+message(STATUS "MIOPEN_TEST_GFX1031 ${MIOPEN_TEST_GFX1031}") - message(STATUS "MIOPEN_TEST_GPU_XNACK_ENABLED ${MIOPEN_TEST_GPU_XNACK_ENABLED}") - message(STATUS "MIOPEN_TEST_GPU_DETECTION_FAILED ${MIOPEN_TEST_GPU_DETECTION_FAILED}") - -@@ -167,10 +171,10 @@ endmacro() - set_var_to_condition(WORKAROUND_ISSUE_1187_DEFAULT MIOPEN_TEST_GFX90A AND MIOPEN_TEST_FLOAT) - option( WORKAROUND_ISSUE_1187 "" ${WORKAROUND_ISSUE_1187_DEFAULT}) - --set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT) -+set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT) - option( WORKAROUND_ISSUE_1148 "" ${WORKAROUND_ISSUE_1148_DEFAULT}) - --set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT) -+set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT) - option( WORKAROUND_ISSUE_1334 "" ${WORKAROUND_ISSUE_1334_DEFAULT}) - - if(NOT MIOPEN_TEST_MIOTENSILE) -@@ -216,7 +220,7 @@ if (MIOPEN_NO_GPU) - test_pooling3d test_perfdb) - endif() - --if(MIOPEN_TEST_GFX1030) -+if(MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031) - if(WORKAROUND_ISSUE_1053 AND MIOPEN_TEST_ALL) - list(APPEND SKIP_TESTS test_lrn_test) - endif() -@@ -439,7 +443,7 @@ endfunction() - # If nothing is specified, the default value is taken. - # Default: FLOAT_ENABLED HALF_DISABLED BF16_DISABLED INT8_DISABLED - # --# GPU types: GFX900, GFX906, GFX908, GFX90A, GFX1030 -+# GPU types: GFX900, GFX906, GFX908, GFX90A, GFX1030, GFX1031 - # The option can be enabled or disabled by using '_ENABLED' and '_DISABLED' suffix. - # If nothing is specified, the default value is taken. - # Default: GFX900_ENABLED, GFX906_ENABLED, GFX908_ENABLED, GFX90A_ENABLED, GFX1030_DISABLED -@@ -571,7 +575,7 @@ function(add_custom_test NAME) - set_tests_properties(${NAME} PROPERTIES RUN_SERIAL On) - endif() - -- if( (is_gfx900_check OR is_gfx906_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx90a_check) -+ if( (is_gfx900_check OR is_gfx906_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx1031_check OR is_gfx90a_check) - AND is_full_check - AND is_xnack_on_check - AND (is_miotensile_check AND is_mlir_check) ---- MIOpen-rocm-5.1.3/test/handle_test.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/test/handle_test.cpp 2022-09-01 18:36:19.018979413 +0800 -@@ -234,7 +234,7 @@ void test_warnings(kernel_type_t kern_ty - void test_arch_name() - { - auto&& h = get_handle(); -- auto known_arch = {"gfx908", "gfx90a", "gfx906", "gfx900", "gfx803", "gfx1030"}; -+ auto known_arch = {"gfx908", "gfx90a", "gfx906", "gfx900", "gfx803", "gfx1030", "gfx1031"}; - auto this_arch = h.GetDeviceName(); - EXPECT(std::any_of( - known_arch.begin(), known_arch.end(), [&](std::string arch) { return arch == this_arch; })); ---- MIOpen-rocm-5.1.3/test/mdgraph.cpp 2022-05-08 14:08:05.000000000 +0800 -+++ gfx1031/test/mdgraph.cpp 2022-09-01 18:36:19.022979405 +0800 -@@ -222,7 +222,7 @@ struct mdgraph_driver : test_driver - auto target = h.GetTargetProperties(); - - auto wino_supported_arch = { -- "gfx1030", "gfx1012", "gfx1011", "gfx90a", "gfx908", "gfx906", "gfx900", "gfx803"}; -+ "gfx1030", "gfx1031","gfx1012", "gfx1011", "gfx90a", "gfx908", "gfx906", "gfx900", "gfx803"}; - - auto is_wino_support = !xnack_enabled && - !miopen::IsDisabled(MIOPEN_DEBUG_GCN_ASM_KERNELS{}) && diff --git a/sci-libs/miopen/miopen-5.1.3-r1.ebuild b/sci-libs/miopen/miopen-5.1.3-r1.ebuild deleted file mode 100644 index 7d02435948f7..000000000000 --- a/sci-libs/miopen/miopen-5.1.3-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake flag-o-matic llvm rocm - -LLVM_MAX_SLOT=15 - -DESCRIPTION="AMD's Machine Intelligence Library" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/MIOpen" -SRC_URI="https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-util/hip-5.1.3 - >=dev-db/sqlite-3.17 - sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] - >=dev-libs/boost-1.72 -" - -DEPEND="${RDEPEND}" - -BDEPEND="dev-libs/half:0/1 - dev-build/rocm-cmake -" - -S="${WORKDIR}/MIOpen-rocm-${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-disable-no-inline-boost.patch" - "${FILESDIR}/${PN}-4.2.0-gcc11-numeric_limits.patch" - "${FILESDIR}/${PN}-5.0.2-strip-xnack-in-flags.patch" - "${FILESDIR}/${PN}-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch" - "${FILESDIR}/${PN}-4.3.0-enable-test.patch" - "${FILESDIR}/${PN}-5.1.3-gfx1031.patch" - "${FILESDIR}/${PN}-5.1.3-deprecate-clang-ocl.patch" - "${FILESDIR}/${PN}-5.1.3-no-strip.patch" - "${FILESDIR}/${PN}-5.1.3-include-array.patch" - "${FILESDIR}/${PN}-5.1.3-avoid-metadata-error-for-vanilla-clang.patch" -) - -src_prepare() { - cmake_src_prepare - - sed -e "s:/opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}) NO_DEFAULT_PATH:" \ - -e "s:/opt/rocm/hip:$(hipconfig -p) NO_DEFAULT_PATH:" \ - -e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \ - -e '/MIOPEN_TIDY_ERRORS ALL/d' \ - -i CMakeLists.txt || die - - sed -e "/rocm_install_symlink_subdir(\${MIOPEN_INSTALL_DIR})/d" -i src/CMakeLists.txt || die - sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" -i test/CMakeLists.txt || die - - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i cmake/hip-config.cmake || die - - # This plus avoid-metadata-error-for-vanilla-clang.patch fix bug mentioned - # in https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1731 - find src/kernels -name "*.s" -exec \ - sed -e "s/.name: n /.name: x /g" -e "s/.name: y /.name: z /g" \ - -e "s/.name: y,/.name: z,/g" -i {} \; || die -} - -src_configure() { - if ! use debug; then - append-cflags "-DNDEBUG" - append-cxxflags "-DNDEBUG" - CMAKE_BUILD_TYPE="Release" - else - CMAKE_BUILD_TYPE="Debug" - fi - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DMIOPEN_BACKEND=HIP - -DBoost_USE_STATIC_LIBS=OFF - -DMIOPEN_USE_MLIR=OFF - -DBUILD_TESTS=$(usex test ON OFF) - -DMIOPEN_TEST_ALL=$(usex test ON OFF) - -DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half" - ) - - if use test; then - for gpu_target in ${AMDGPU_TARGETS}; do - mycmakeargs+=( -DMIOPEN_TEST_${gpu_target^^}=ON ) - done - fi - - addpredict /dev/kfd - addpredict /dev/dri/ - append-cxxflags "--rocm-path=$(hipconfig -R)" - append-cxxflags "--hip-device-lib-path=${EPREFIX}/usr/lib/amdgcn/bitcode" - CXX="$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin/clang++" cmake_src_configure -} - -src_test() { - check_amdgpu - export LD_LIBRARY_PATH="${BUILD_DIR}"/lib - MAKEOPTS="-j1" cmake_src_test -} diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index e9e535fb3db1..1acdb477e43c 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -1,25 +1,14 @@ -AUX rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch 1254 BLAKE2B d3bcf526f374065ed0615c89ab74cbc203d2d6b6d0a1c49072f3328aaa40aa52f0fa155b23a936a865d353db32f48f348a64f05f157eb6bb2d55c93f9da364d1 SHA512 e899b26e3dc4717cb7854c16d104b9e070067f49e308fe6a38f1be5735a83a814da46ab41752cf4431b4c378d29f31c6082e1fe63e1bf5ae72a55b54a9017c15 -AUX rocBLAS-5.0.2-change-default-Tensile-library-dir.patch 2070 BLAKE2B b90c31653c68583432f54c3a17067a92e7fd91e66f902f37e96a7a413b885de57820b93c5a98458b1d6f4b4283138dac274ece1ec97f3fc0dd3ea00ce6002542 SHA512 946f9d66ac703628829ff585890ea9eae71f441e10bb1ff21f8dfad9a5d73279ed4880c4b96ac662be76af10ebe63ccbe0ef9f2c55fb2ebfc5c9087f32119b2a -AUX rocBLAS-5.0.2-cpp_lib_filesystem.patch 1546 BLAKE2B e9a794a87b76a41d059c755565ae5da9a361b0c4648a92dd5ce35f9b5bd8c743827fcf79752c393a786c30083cd7db59bc334599d414920ce72c24216d014124 SHA512 e80ac744ce44bc9023de2600290c37577bda6161bfe750ac2b746d8fea7b45334a96461baa74131d0e31db497f8dd123ccd5dc181a40b265c2e2c72e1e479e88 -AUX rocBLAS-5.0.2-unbundle-Tensile.patch 1352 BLAKE2B 48300030abee9898397919cbbea187fd16d770e20cdcfddd7665c160f47e362ad63acf9f443f86d824a999398d0c6f5aee8295a963dce2653bc94518c8ac9674 SHA512 39c4aff4fc60692e0450aa844ce979afe031c3ba3adb0cdf0866d0766714bf28a4c5664c18de7520b63d3fc2864de51939a596e864e97d0b8935681cabd7a84d AUX rocBLAS-5.4.2-add-missing-header.patch 271 BLAKE2B 19e401ef1cc6d0d852a1338b79fd5b99c03077d830d75c9260c8437c984d85431ae3d508a4178116ae4ddb000e904ff01de759d86d65056671704c4e79b9f0a1 SHA512 055e35eb53b582f1da270f3ccab4b8705600814461ceeae80ce73e1845380a716e1ccc7c1ec66def6ff17b4daee3f279ab468e2d7c9c704def9d7d80c2756e3a AUX rocBLAS-5.4.2-cpp_lib_filesystem.patch 898 BLAKE2B 403b42f0193f2d21585fe8f8a851f673177930bea8ef0f1816bfebf7cc8765928f392bf6262128da8760b0283d4768bcfa1ff9a7cd2673dec4c1f0a114a61bd1 SHA512 ff914510474fb1869a75f161c7bbe8a9a82079b820e95fcb3ab87bf21cfbfb80cf91a17603e198411a20c25b5fd76771de6745203e4bcad2cbca0dfbfccdffd2 AUX rocBLAS-5.4.2-link-cblas.patch 508 BLAKE2B ab53db7c73cc174039880ebd8987adc88f83d61e84bf024e2a6367f5bc9414ac343843610382bae43b4dcf874f6cf9e91bc3bd865264e37517f280d50881b4ff SHA512 fa91f817a06f517b38d3d3a71110da59d6579bf7915d6f47deefc46c532ca10d17802815662d8909ee52fb155b82339122601793858e52c13c6cc93cac283fc9 -AUX rocBLAS-5.4.2-unbundle-Tensile.patch 1373 BLAKE2B 944771b7511de883aa106016cf59e3cb94248119af472aed75c76c712fc9ee2e9e765d472ef727776d95ee478f1701c12853c37be269ee4940a3cde9e1f41cc7 SHA512 bdf01803a0594b53f248bc57594e7bed2f3f4cc772de8b5a043fa849798887291cb14d273511d33453c0685a113a9064a218a56d57631d2e9c1126eb62853668 AUX rocBLAS-5.7.1-expand-isa-compatibility.patch 3771 BLAKE2B 3be8a45734c4d3ce0d54981e48685c500d6cf8ba1981b6035f2cb83cad1c221afcf50e5d9fbdaa9966ce64e99845c57b32267adda7983bb9a511fec661a0cfeb SHA512 86eedaa1bf6d0430f4b059d9257539dd95d56bdfc0cb61ceb0d180e29f76e280505c8b0002eba71c8152522c637917cd0b9ac7fb2f07059b3b5b6076f8ac7c59 AUX rocBLAS-6.0.2-expand-isa-compatibility.patch 3792 BLAKE2B 55a57fad4cce821f83d04156942c33ab1842389dc0c4ad1ceea0c2435a37d9912bf24f0359023735b503bea5505b47e2e707b0798d93cdc5622d34821b1e3950 SHA512 c21de66ddc126b5ac5b588c9e68283e8d32574ec0a28963e62244a176edfb0c9188236a75b3985d2cf9043f4fb919a837326ede94045dce9158e9651228b0c38 AUX rocBLAS-6.3.0-find-cblas.patch 826 BLAKE2B efb788243bb137bf2519757928d1594478f560db75e92ed0b7fc1f1d40c9e5ed2047692e4c17a11a8f7d0b283227b38b0b3bacc323606d2f4b33f122699512b5 SHA512 cbf29a83375d6eca6efc319e7becd198ed205b1288c108e98a69968c629c979c07950d4743ef96e7ba88a9a28db9898e07b6c72bcd447370f4a00ae6812828f3 AUX rocBLAS-6.3.0-no-git.patch 781 BLAKE2B 74e58498aec88b586c949288b3f9e5c58f77198fd1c277a7bd797fc0a7004e6786797672a419912ef4d53589edf142b9335c82c77b34defd5409ca7240e8ee70 SHA512 137ee786ac1f3515a706106d8d5057b8fc1e0d4b0470a0eb46aca252f3e64cee21734a90e194e01db95a0439c48b798e81c3993a615d31275c925f81004f9da6 -DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fccf1f8829ad41baf15ad31bbbb313b48825841834c7ec1b9f8ece794aebdf9fda42b54a38f642beb1bc1e374f2f3b4e43d8ba9dfd1eb6e3ece5 SHA512 8f6946cf9d68afd195640ae7e0da8dc33341c67f28813813b5361a56531fa2af4453d075703ea52c66d93a1936cf74688b86aa2fa62b52a7ed5f03272290c232 -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 DIST rocm-rocBLAS-5.7.1.tar.gz 55389700 BLAKE2B 9e58b1d29c8a04aa58ce17fdd9b0c2504934261851619dc5b696a04e8c6a79e7c44d86a6db7a9c76a434d76593de8c191cba6f163cf398d01cfc001e5fa32b5a SHA512 cfc73f6c490595a3c153c2ac2a3cb5926c48c2c19baa07ff3dcdf3a7ccaed82cfdff64ed5a3be64c349cb43d654d4b104d9090e2ec9f2061049d6a4921c07722 DIST rocm-rocBLAS-6.1.1.tar.gz 100103895 BLAKE2B df89a21e47730714b80c62717a86d65ac0d819c2d33b2a3c6252b60b8d7cc9eb5f8f1db27159b0a8dfc87aba7ccad97e2f832bc0044e92d0b69c526d382c745a SHA512 74e847c4ddee16cae7f41e268a815ea03875519c365abe7dfce313a9545df245baa73301b432f64a36cc988281fec7530629a0d72583e9ea287c98ec8a0b3907 DIST rocm-rocBLAS-6.3.0.tar.gz 57907324 BLAKE2B a3cce68e0cc06e8df56e1622889254c75744b0f85c9fe66cb94bbc158f7ce45e40a5798d30e6a10430092490c1e347f19f38b36db767ccb784c5757581b0bccb SHA512 45a524d680f1f0760fd37d49b9bd7c6257731ad5d840d832a8e40c121f7f1045a8d5b57ca8ef0943fdf333c55bccb341b529d2ca24664694203b906e510ecab5 DIST rocm-rocBLAS-6.3.2.tar.gz 57909504 BLAKE2B 0ed000a10c9e71465f83fb9abdb9a745c82bf32552e3d86c61bf0c802f3728f7fd4c47fbf677d01aa35c457dc5281c916ca80fdc033b2752afd6733aefa4653f SHA512 ecfb6c68b0a44ddae0e4e6cf5c41c0c33a9685c590004ffe48fdb163bd059d534181d3faed2a23142078c5f621b1955c91725357c3e8e0f9307b139b19af46fd -EBUILD rocBLAS-5.1.3-r4.ebuild 3060 BLAKE2B fc5dba7b188129cc7c1c7fc07737d96ac86bc6aa2dc86779cceca028d31f0177592dba7698850a504451a253421511a445498a0df4654b12e60ab895b2efeadd SHA512 f6eba78811b8d581a7a4417a1ab637824012b5a30b5c76c6ec5a504d759691d432c53e15ede8ba5edc729a2a8863e86b819aa472589e146e8841c605ff138ba3 -EBUILD rocBLAS-5.4.2-r3.ebuild 2699 BLAKE2B a1b5134614e21bb3741530843d17d6016a1629ac9008908004b7743e2c9ff08509ba016db06a127a82679e3864d3e3cb12f1e2808e2edb2223c8993c10cc85d3 SHA512 9208a43e7ec94d9b2dcd61202695f3a78ec89d1062e64500f664a322c3b11e8fadb6e30ec5063012029b28ded5abc819dcd72b0d2b30781cca8b4d0d1897f880 EBUILD rocBLAS-5.7.1-r2.ebuild 2728 BLAKE2B e8256cd30876c89d9d84180e4621884d87c873e9680980369b6ec1a377fac3ba441bfbe5ebd160dbe5a7c13f868a15afd14328f663ff05afae136670a1a7ce97 SHA512 390911c868c8cb4bdec520bcf0d189922e528200c2b43946542034a3bd72141a47730ce67a5d755c4469100165194c8bcdfd81f9e6d6394ee7e51e0f84cac13f EBUILD rocBLAS-6.1.1-r1.ebuild 3032 BLAKE2B d0815d198208beaa77059ccadeca6c0e9331e52ec1292c1467fecf38ebf8356ddc7b5b8b2e84e1dfe541215cfc54f15b11d20877f56983ec06688edc5119e657 SHA512 91d95e5654369256a1691e204f54f9c71c2aec0a5f09d8fb1bf739d75af38a5ae7e55a6435524832996ed7eaa218709581fd73d6c9f176509ec7f2a488275e7a EBUILD rocBLAS-6.3.0.ebuild 3153 BLAKE2B 3660826d5d9482c37b2fecf25cf63b53c62f6ee77e088e7230a6d014adb9a1df05bd5052449226a13fdf4a8bc057d544a3937ba764616618def5dd771b9dd498 SHA512 1a1dbf60a04e708fc27311efa893175e1c42965920fd037ed1c5e461cd221291e841c2141e51ba6534adcb5955ee800015605717d26084c899ba322ea5b68514 diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch deleted file mode 100644 index a4d9f0bab344..000000000000 --- a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://sourceware.org/glibc/wiki/Release/2.32#Deprectation_sys_siglist.2C__sys_siglist.2C_sys_sigabbrev - ---- rocBLAS-rocm-4.1.0/clients/gtest/rocblas_test.cpp -+++ rocBLAS-rocm-4.1.0/clients/gtest/rocblas_test.cpp -@@ -173,7 +173,7 @@ void catch_signals_and_exceptions_as_fai - // Set up the return point, and handle siglongjmp returning back to here - if(sigsetjmp(t_handler.sigjmp_buf, true)) - { -- FAIL() << "Received " << sys_siglist[t_handler.signal] << " signal"; -+ FAIL() << "Received " << strsignal(t_handler.signal) << " signal"; - } - else - { - ---- rocBLAS-rocm-4.1.0/clients/include/utility.hpp -+++ rocBLAS-rocm-4.1.0/clients/include/utility.hpp -@@ -39,7 +39,7 @@ - // puts, putchar, fputs, printf, fprintf, vprintf, vfprintf: Use rocblas_cout or rocblas_cerr - // sprintf, vsprintf: Possible buffer overflows; us snprintf or vsnprintf instead - // strerror: Thread-unsafe; use snprintf / dprintf with %m or strerror_* alternatives --// strsignal: Thread-unsafe; use sys_siglist[signal] instead -+// strsignal: Thread-unsafe; use strsignal(signal) instead - // strtok: Thread-unsafe; use strtok_r - // gmtime, ctime, asctime, localtime: Thread-unsafe - // tmpnam: Thread-unsafe; use mkstemp or related functions instead diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-change-default-Tensile-library-dir.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-change-default-Tensile-library-dir.patch deleted file mode 100644 index 618847b8fb8d..000000000000 --- a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-change-default-Tensile-library-dir.patch +++ /dev/null @@ -1,47 +0,0 @@ -change the default rocm tensile library search path -Index: rocBLAS-rocm-5.0.1/library/src/tensile_host.cpp -=================================================================== ---- rocBLAS-rocm-5.0.1.orig/library/src/tensile_host.cpp -+++ rocBLAS-rocm-5.0.1/library/src/tensile_host.cpp -@@ -558,40 +558,8 @@ namespace - // Find the location of librocblas.dll/.so - // Fall back on hard-coded path if static library or not found - --#ifndef ROCBLAS_STATIC_LIB --#ifdef WIN32 -- // wchar_t wpath[MAX_PATH + 1] = {0}; -- // if(GetModuleFileNameW(GetModuleHandle("rocblas.dll"), wpath, MAX_PATH + 1)) -- // { -- // std::wstring wspath(wpath); -- // std::string tmp(wspath.begin(), wspath.end()); - -- std::vector<TCHAR> dll_path(MAX_PATH + 1); -- if(GetModuleFileNameA( -- GetModuleHandleA("rocblas.dll"), dll_path.data(), MAX_PATH + 1)) -- { -- std::string tmp(dll_path.begin(), dll_path.end()); -- std::filesystem::path exepath = tmp; -- if(exepath.has_filename()) -- { -- path = exepath.remove_filename().string(); -- } -- } --#else -- dl_iterate_phdr(rocblas_dl_iterate_phdr_callback, NULL); -- if(rocblas_so_path.size()) -- path = std::string{dirname(&rocblas_so_path[0])}; --#endif --#endif // ifndef ROCBLAS_STATIC_LIB -- -- // Find the location of the libraries -- if(TestPath(path + "/../../Tensile/library")) -- path += "/../../Tensile/library"; -- else -- path += "/library"; -- -- if(TestPath(path + "/" + processor)) -- path += "/" + processor; -+ path="@GENTOO_PORTAGE_EPREFIX@/usr/lib64/rocblas/library"; - } - - // only load modules for the current architecture diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-cpp_lib_filesystem.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-cpp_lib_filesystem.patch deleted file mode 100644 index 500abbacfdc2..000000000000 --- a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-cpp_lib_filesystem.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- b/clients/common/utility.cpp 2022-01-26 03:31:42.000000000 +0800 -+++ a/clients/common/utility.cpp 2022-02-22 18:45:35.319732953 +0800 -@@ -23,6 +23,7 @@ - #include <fcntl.h> - #endif - -+#include <version> - #ifdef __cpp_lib_filesystem - #include <filesystem> - #else ---- b/clients/include/rocblas_data.hpp 2022-01-26 03:31:42.000000000 +0800 -+++ a/clients/include/rocblas_data.hpp 2022-02-22 18:44:51.275733070 +0800 -@@ -17,6 +17,7 @@ - #include <string> - #include <utility> - -+#include<version> - #ifdef __cpp_lib_filesystem - #include <filesystem> - #else ---- b/clients/include/singletons.hpp 2022-01-26 03:31:42.000000000 +0800 -+++ a/clients/include/singletons.hpp 2022-02-22 18:47:55.139732583 +0800 -@@ -3,6 +3,6 @@ - * ************************************************************************ */ - - // global for device memory padding see d_vector.hpp -+#include<cstddef> -- - extern size_t g_DVEC_PAD; - void d_vector_set_pad_length(size_t pad); ---- b/clients/include/testing_logging.hpp 2022-01-26 03:31:42.000000000 +0800 -+++ a/clients/include/testing_logging.hpp 2022-02-22 18:44:13.115733171 +0800 -@@ -22,6 +22,7 @@ - #include <unistd.h> - #endif - -+#include<version> - #ifdef __cpp_lib_filesystem - #include <filesystem> - #else ---- b/clients/include/testing_ostream_threadsafety.hpp 2022-01-26 03:31:42.000000000 +0800 -+++ a/clients/include/testing_ostream_threadsafety.hpp 2022-02-22 18:45:19.055732996 +0800 -@@ -30,6 +30,7 @@ - #include <sys/types.h> - #endif - -+#include <version> - #ifdef __cpp_lib_filesystem - #include <filesystem> - #else diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-unbundle-Tensile.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-unbundle-Tensile.patch deleted file mode 100644 index 75f673f63d47..000000000000 --- a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-unbundle-Tensile.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: rocBLAS-rocm-5.0.2/CMakeLists.txt -=================================================================== ---- rocBLAS-rocm-5.0.2.orig/CMakeLists.txt -+++ rocBLAS-rocm-5.0.2/CMakeLists.txt -@@ -271,20 +271,6 @@ if(NOT SKIP_LIBRARY) - set( Tensile_ROOT "${CMAKE_BINARY_DIR}/virtualenv/Lib/site-packages/Tensile" ) - endif() - -- include(virtualenv) -- if (Tensile_TEST_LOCAL_PATH) -- virtualenv_install(${Tensile_TEST_LOCAL_PATH}) -- message (STATUS "using local Tensile from ${Tensile_TEST_LOCAL_PATH}, copied to ${Tensile_ROOT}") -- else() -- # Use the virtual-env setup and download package from specified repot: -- set( tensile_fork "ROCmSoftwarePlatform" CACHE STRING "Tensile fork to use" ) -- file (STRINGS "tensile_tag.txt" read_tensile_tag) -- set( tensile_tag ${read_tensile_tag} CACHE STRING "Tensile tag to download" ) -- virtualenv_install("git+https://github.com/${tensile_fork}/Tensile.git@${tensile_tag}") -- message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}") -- endif() -- message(STATUS "Adding ${VIRTUALENV_HOME_DIR} to CMAKE_PREFIX_PATH") -- list(APPEND CMAKE_PREFIX_PATH ${VIRTUALENV_HOME_DIR}) - if (TENSILE_VERSION) - find_package(Tensile ${TENSILE_VERSION} EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}") - else() diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.4.2-unbundle-Tensile.patch b/sci-libs/rocBLAS/files/rocBLAS-5.4.2-unbundle-Tensile.patch deleted file mode 100644 index 114c10502e68..000000000000 --- a/sci-libs/rocBLAS/files/rocBLAS-5.4.2-unbundle-Tensile.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: rocBLAS-rocm-5.4.2/CMakeLists.txt -=================================================================== ---- rocBLAS-rocm-5.4.2.orig/CMakeLists.txt -+++ rocBLAS-rocm-5.4.2/CMakeLists.txt -@@ -138,21 +138,6 @@ if(NOT SKIP_LIBRARY) - - set( Tensile_TEST_LOCAL_PATH "" CACHE PATH "Use local Tensile directory instead of fetching a GitHub branch" ) - -- include(virtualenv) -- -- if (Tensile_TEST_LOCAL_PATH) -- virtualenv_install(${Tensile_TEST_LOCAL_PATH}) -- message (STATUS "using local Tensile from ${Tensile_TEST_LOCAL_PATH}, copied to ${Tensile_ROOT}") -- else() -- # Use the virtual-env setup and download package from specified repot: -- set( tensile_fork "ROCmSoftwarePlatform" CACHE STRING "Tensile fork to use" ) -- file (STRINGS "tensile_tag.txt" read_tensile_tag) -- set( tensile_tag ${read_tensile_tag} CACHE STRING "Tensile tag to download" ) -- virtualenv_install("git+https://github.com/${tensile_fork}/Tensile.git@${tensile_tag}") -- message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}") -- endif() -- message(STATUS "Adding ${VIRTUALENV_HOME_DIR} to CMAKE_PREFIX_PATH") -- list(APPEND CMAKE_PREFIX_PATH ${VIRTUALENV_HOME_DIR}) - if (TENSILE_VERSION) - find_package(Tensile ${TENSILE_VERSION} EXACT REQUIRED HIP LLVM OpenMP PATHS "${INSTALLED_TENSILE_PATH}") - else() diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild deleted file mode 100644 index a77c621f57ce..000000000000 --- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DIR="docs" -DOCS_DEPEND="media-gfx/graphviz" -ROCM_VERSION=${PV} -inherit cmake docs edo multiprocessing prefix rocm - -DESCRIPTION="AMD's library for BLAS on ROCm" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz - https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${PN}-5.0.2-Tensile-asm_full-navi22.tar.gz" -S="${WORKDIR}/${PN}-rocm-${PV}" - -LICENSE="BSD" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" -IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-build/rocm-cmake - dev-util/Tensile:${SLOT} -" - -DEPEND=" - >=dev-cpp/msgpack-cxx-6.0.0 - dev-util/hip - test? ( - virtual/blas - dev-cpp/gtest - llvm-runtimes/openmp - ) - benchmark? ( - virtual/blas - llvm-runtimes/openmp - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3.0-fix-glibc-2.32-and-above.patch - "${FILESDIR}"/${PN}-5.0.2-change-default-Tensile-library-dir.patch - "${FILESDIR}"/${PN}-5.0.2-cpp_lib_filesystem.patch - "${FILESDIR}"/${PN}-5.0.2-unbundle-Tensile.patch - ) - -src_prepare() { - cmake_src_prepare - cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die - # Fit for Gentoo FHS rule - sed -e "/PREFIX rocblas/d" \ - -e "/<INSTALL_INTERFACE/s:include:include/rocblas:" \ - -e "s:rocblas/include:include/rocblas:" \ - -e "s:\\\\\${CPACK_PACKAGING_INSTALL_PREFIX}rocblas/lib:${EPREFIX}/usr/$(get_libdir)/rocblas:" \ - -e "s:share/doc/rocBLAS:share/doc/${P}:" \ - -e "/rocm_install_symlink_subdir( rocblas )/d" -i library/src/CMakeLists.txt || die - - sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die - - eprefixify library/src/tensile_host.cpp -} - -src_configure() { - addpredict /dev/random - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DTensile_LOGIC="asm_full" - -DTensile_COMPILER="hipcc" - -DTensile_LIBRARY_FORMAT="msgpack" - -DTensile_CODE_OBJECT_VERSION="V3" - -DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile" - -DTensile_ROOT="${EPREFIX}/usr/share/Tensile" - -DBUILD_WITH_TENSILE=ON - -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" - -DBUILD_TESTING=OFF - -DBUILD_CLIENTS_SAMPLES=OFF - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) - -DTensile_CPU_THREADS=$(makeopts_jobs) - ) - - CXX=hipcc cmake_src_configure -} - -src_compile() { - docs_compile - cmake_src_compile -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}"/clients/staging || die - export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library" - export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src" - edob ./${PN,,}-test -} - -src_install() { - cmake_src_install - - if use benchmark; then - cd "${BUILD_DIR}" || die - dolib.so clients/librocblas_fortran_client.so - dobin clients/staging/rocblas-bench - fi -} diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild deleted file mode 100644 index 9050d13eb312..000000000000 --- a/sci-libs/rocBLAS/rocBLAS-5.4.2-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DIR="docs" -DOCS_DEPEND="media-gfx/graphviz" -ROCM_VERSION=${PV} -inherit cmake docs edo multiprocessing rocm - -DESCRIPTION="AMD's library for BLAS on ROCm" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS" -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz - https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${PN}-5.4.2-Tensile-asm_full-navi22.tar.gz" -S="${WORKDIR}/${PN}-rocm-${PV}" - -LICENSE="BSD" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" -IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-build/rocm-cmake-5.3 - dev-util/Tensile:${SLOT} -" - -DEPEND=" - >=dev-cpp/msgpack-cxx-6.0.0 - dev-util/hip - test? ( - virtual/blas - dev-cpp/gtest - llvm-runtimes/openmp - ) - benchmark? ( - virtual/blas - llvm-runtimes/openmp - ) -" - -QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*" - -PATCHES=( - "${FILESDIR}"/${PN}-5.4.2-cpp_lib_filesystem.patch - "${FILESDIR}"/${PN}-5.4.2-unbundle-Tensile.patch - "${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch - "${FILESDIR}"/${PN}-5.4.2-link-cblas.patch - ) - -src_prepare() { - cmake_src_prepare - cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die - sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die -} - -src_configure() { - addpredict /dev/random - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On - -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DROCM_SYMLINK_LIBS=OFF - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DTensile_LOGIC="asm_full" - -DTensile_COMPILER="hipcc" - -DTensile_LIBRARY_FORMAT="msgpack" - -DTensile_CODE_OBJECT_VERSION="V3" - -DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile" - -DTensile_ROOT="${EPREFIX}/usr/share/Tensile" - -DBUILD_WITH_TENSILE=ON - -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" - -DBUILD_CLIENTS_SAMPLES=OFF - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) - -DTensile_CPU_THREADS=$(makeopts_jobs) - ) - - CXX=hipcc cmake_src_configure -} - -src_compile() { - docs_compile - cmake_src_compile -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}"/clients/staging || die - export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library" - export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src" - edob ./${PN,,}-test -} - -src_install() { - cmake_src_install - - if use benchmark; then - cd "${BUILD_DIR}" || die - dolib.a clients/librocblas_fortran_client.a - dobin clients/staging/rocblas-bench - fi -} diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index 4747c02d543a..744d4bc70bfc 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -1,15 +1,9 @@ -AUX rocFFT-4.2.0-add-functional-header.patch 426 BLAKE2B 82c289bb6663690163c11950d05c21acf73ac3c759b9c081f30bd2f86e8416a1d9e064d6879e3e5624b44488a6caf3d6d215e8a3c37647e5bfb0d58b85985081 SHA512 09bcfe421f20a6e5ba66a0efc4beecbdb591b2422eecc851c99c6cde12da904ab2bb86c5985bbc68fe9a859fdc986b21f6ae855cb631eb5e15819b6f39e3ef00 -AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325dc3f0c8869b109cdeb46892d597346532dcae2bd51739b85b97ecb6982935ec38f1332a4857d719b1c7c9e3a1e83f60623d1 SHA512 f714ba071838ebba8c6ab32b92eab52430622ef5f7eeea04f7a8c71b8a2a547688faf0f8d93a9be90183aebb976ec51722bcee81d960545046c82fd3df9b6f01 -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 AUX rocFFT-5.7.1-fix-rocm-link-path.patch 492 BLAKE2B daf4d865d8b2b5f3dc97a845f262c266588da910f517e31a10cf7896c6bc1c4fd794c01be39c7aa74d5eb80e4066b8d3dd8a8841210e0075ad4e593dc0f85f66 SHA512 b715c08515b6d289f1b045db7053ff08a27aa9cf940beacba47167a72f168d75f4652d98b33fc2bef303832f0689cf51d71f893e415ba4b4cd7a0f21c677de69 AUX rocFFT-6.1.1-find-hip-use-config.patch 1108 BLAKE2B 9ae46c2dc754d3a9d68863012c46b6642c71459facd75a4425f8942fad1df1df15d3030255e1b54c537152b521ca4becdc8426003e05aceedc92087aeffd14bf SHA512 02322003c1e6385fb4cff1049a9554baa91d2eca75bc0c9869b92e95c6c579d7f5e361b5b2ce98ca2ab5613891c24230833ae13f13a814f863510ef4340b9260 -DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9 DIST rocFFT-6.3.0.tar.gz 1386056 BLAKE2B 1aab60818328cb3a6448f6d555faf2db3b3839e2b3abd7a37cc48054e67321e7c98c319b2f078dfd351f56263c35731608ae65fca427fc3eaaf06c8410b99d89 SHA512 4ac2dac24e77a9d767fa08a9d393cb2c94bc2a8ca32cb75ea53dd83011989bd344ae3c11c9bfc557e71c645ebea34c53a5e050ce6810259f84287e6baf829c08 DIST rocFFT-6.3.2.tar.gz 1385667 BLAKE2B 3415cca976b31534498b87b1bc800d96aa00c9c8b2665350323f03c47eff922ff3d0b46374af7cee5958572487c51432ef55ffe8c19c8b19e093c7ca7ec05961 SHA512 e58d00810c661ef640d4e33894b41847e69de150fbdf4cd72c14d44b9298a514df7e47bd52902482beb6fb52de6e7cd01e298dec756fec150de967049a370d33 -EBUILD rocFFT-5.1.3-r1.ebuild 3926 BLAKE2B ef9cf52ee86139887f87b96f02d28bcb80420af8d3538060596a51b3b8b7369eee5da63d90e8132935acf32cba06024840427cf2e5a2b7662388e75c1b1b4272 SHA512 3a34f05845f726fd6cb71d0315ee6338e1e381910a8dca2d6c655ae80e1ba3f1765a2313f2795be8eb737195fa23e2597bcda89a1e6db778cfddf35485462beb EBUILD rocFFT-5.7.1-r2.ebuild 4003 BLAKE2B ec65bb2120e61d38bc2a3d8f920c5d1553c4658b99f4171dbdb5b1f6b233652432aa45bc36b61b2c842ff20a20ab288c8b7236cbb6b972ab12647d127dbdabf4 SHA512 12ceadc7a10d718d36aeee65179335f7335a4db15f55b2da6bd6f0df8de3037d021a166c86dc35228efb18cafdd33f0209702e05e2e4ca80d0b9b960c76a0bfa EBUILD rocFFT-6.1.1.ebuild 3800 BLAKE2B 54624734bdc9c4583c50dac8f802f3ef648734146a70e5b1fae26f77556e60f97b9a5a7fff2a73782dae3eec8df4578650f0ecf2c6608a3009f5e645ab0bdd2a SHA512 77b86a3ac007c317f6aae00a6fb9895ab1cda1fad9ca4c889812134fa8368e26d2d1f943288c39342977ecf54ae71463a97e449cbc82a102825590cd4d670255 EBUILD rocFFT-6.3.0.ebuild 3774 BLAKE2B 5dc6cba52c92afc16321ce3ede491a7aceb502a1228a9cf755be11fca6510a7d9330ef9f4e868f246608e0eec321ceba7467864f90a994bf064160093960e9de SHA512 789b6ad1e5ff3a95bdaf32c1aacbfd2495713e5b3c1af77459b5a0f36e1b2ae72601741e05bce8ecbca6f7fc10286bf2e62c4b841cc0365ecfd7b119d04e2ee1 diff --git a/sci-libs/rocFFT/files/rocFFT-4.2.0-add-functional-header.patch b/sci-libs/rocFFT/files/rocFFT-4.2.0-add-functional-header.patch deleted file mode 100644 index 75dee06362b6..000000000000 --- a/sci-libs/rocFFT/files/rocFFT-4.2.0-add-functional-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -resolves compilation error: no member named 'multiplies' in namespace 'std' for library/src/twiddles.cpp - ---- a/library/src/include/twiddles.h 2021-04-15 10:24:46.000000000 -0700 -+++ b/library/src/include/twiddles.h 2021-07-21 22:27:10.760604147 -0700 -@@ -9,6 +9,7 @@ - #include "../../../shared/gpubuf.h" - #include "rocfft.h" - #include <cassert> -+#include <functional> - #include <math.h> - #include <numeric> - #include <tuple> diff --git a/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch b/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch deleted file mode 100644 index 1a35126f1d8c..000000000000 --- a/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -fix compilation issue: error: use of undeclared identifier 'ceil' 'floor' -=================================================================== ---- rocFFT-rocm-5.0.2.orig/library/src/device/generator/stockham_gen_base.h -+++ rocFFT-rocm-5.0.2/library/src/device/generator/stockham_gen_base.h -@@ -20,6 +20,7 @@ - - #pragma once - #include "stockham_gen.h" -+#include <math.h> - - // Base class for stockham kernels. Subclasses are responsible for - // different tiling types. diff --git a/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch b/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch deleted file mode 100644 index edfd89ea4b70..000000000000 --- a/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch +++ /dev/null @@ -1,11 +0,0 @@ -Contributed-by: perestoronin https://bugs.gentoo.org/693200#c25 ---- a/library/src/include/twiddles.h -+++ b/library/src/include/twiddles.h -@@ -14,6 +14,7 @@ - #include <numeric> - #include <tuple> - #include <vector> -+#include <stdexcept> - - static const size_t LTWD_BASE_DEFAULT = 8; - static const size_t LARGE_TWIDDLE_THRESHOLD = 4096; diff --git a/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch b/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch deleted file mode 100644 index b18b55eb8048..000000000000 --- a/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch +++ /dev/null @@ -1,67 +0,0 @@ -Disable rocFFT fetching SQLite3 and link to system libsqlite.so -Index: rocFFT-rocm-5.1.3/library/src/CMakeLists.txt -=================================================================== ---- rocFFT-rocm-5.1.3.orig/library/src/CMakeLists.txt -+++ rocFFT-rocm-5.1.3/library/src/CMakeLists.txt -@@ -134,49 +134,22 @@ set( rocfft_source - rtcsubprocess.cpp - ) - --# SQLite 3.36.0 enabled the backup API by default, which we need --# for cache serialization. We also want to use a static SQLite, --# and distro static libraries aren't typically built --# position-independent. --include( FetchContent ) -- --set(SQLITE_SRC_URL https://sqlite.org/2021/sqlite-amalgamation-3360000.zip CACHE STRING "Location of SQLite source code") --set(SQLITE_SRC_SHA256 999826fe4c871f18919fdb8ed7ec9dd8217180854dd1fe21eea96aed36186729 CACHE STRING "SHA256 hash of SQLite source code") -- --# embed SQLite --FetchContent_Declare(sqlite_local -- URL ${SQLITE_SRC_URL} -- URL_HASH SHA256=${SQLITE_SRC_SHA256} --) --FetchContent_MakeAvailable(sqlite_local) --add_library( sqlite3 OBJECT ${sqlite_local_SOURCE_DIR}/sqlite3.c ) --set_target_properties( sqlite3 PROPERTIES -- C_VISIBILITY_PRESET "hidden" -- VISIBILITY_INLINES_HIDDEN ON -- POSITION_INDEPENDENT_CODE ON -- ) -- --# we don't need extensions, and omitting them from SQLite removes the --# need for dlopen/dlclose from within rocFFT --target_compile_options( -- sqlite3 -- PRIVATE -DSQLITE_OMIT_LOAD_EXTENSION --) -- - set_property( - SOURCE rtc.cpp - PROPERTY OBJECT_DEPENDS ${kgen_embed_h} - ) - -+find_package( SQLite3 REQUIRED ) -+ - prepend_path( ".." rocfft_headers_public relative_rocfft_headers_public ) - - add_library( rocfft - ${rocfft_source} - ${relative_rocfft_headers_public} -- $<TARGET_OBJECTS:sqlite3> - ) - add_library( roc::rocfft ALIAS rocfft ) - -+target_link_libraries( rocfft PRIVATE ${SQLite3_LIBRARIES} ) - if( NOT WIN32 ) - target_link_libraries( rocfft PRIVATE -lstdc++fs ) - endif() -@@ -209,7 +182,7 @@ endif() - target_include_directories( rocfft - PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/include> - $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/library/src/device> -- ${sqlite_local_SOURCE_DIR} -+ ${SQLite3_LIBRARIES} - PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/include> - $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> - $<INSTALL_INTERFACE:include> diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild deleted file mode 100644 index 7b75953d510f..000000000000 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -ROCM_VERSION=${PV} - -inherit cmake check-reqs edo multiprocessing python-r1 rocm - -DESCRIPTION="Next generation FFT implementation for ROCm" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT" -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask -RDEPEND=" -perfscripts? ( - >=media-gfx/asymptote-2.61 - dev-texlive/texlive-latex - dev-tex/latexmk - sys-apps/texinfo - dev-python/sympy[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/scipy[${PYTHON_USEDEP}] - dev-python/pandas[${PYTHON_USEDEP}] ) -${PYTHON_DEPS}" - -DEPEND="dev-util/hip - ${PYTHON_DEPS}" - -BDEPEND=" - test? ( dev-cpp/gtest dev-libs/boost - >=sci-libs/fftw-3 llvm-runtimes/openmp ) - >=dev-build/cmake-3.22 - dev-build/rocm-cmake -" - -CHECKREQS_DISK_BUILD="7G" - -IUSE="benchmark perfscripts test" -REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/rocFFT-rocm-${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-add-functional-header.patch" - "${FILESDIR}/${PN}-5.1.3-unbundle-sqlite.patch" - "${FILESDIR}/${PN}-5.0.2-add-math-header.patch" - "${FILESDIR}/${PN}-5.1.3-add-stdexcept-header.patch" ) - -required_mem() { - if use test; then - echo "52G" - else - if [[ -n "${AMDGPU_TARGETS}" ]]; then - local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) # count how many archs user specified in ${AMDGPU_TARGETS} - else - local NARCH=7 # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future. - fi - echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required - fi -} - -pkg_pretend() { - return # leave the disk space check to pkg_setup phase -} - -pkg_setup() { - export CHECKREQS_MEMORY=$(required_mem) - check-reqs_pkg_setup - python_setup -} - -src_prepare() { - sed -e "s/PREFIX rocfft//" \ - -e "/rocm_install_symlink_subdir/d" \ - -e "/<INSTALL_INTERFACE/s,include,include/rocfft," \ - -i library/src/CMakeLists.txt || die - - sed -e "/rocm_install_symlink_subdir/d" \ - -e "$!N;s:PREFIX\n[ ]*rocfft:# PREFIX rocfft\n:;P;D" \ - -i library/src/device/CMakeLists.txt || die - - if use perfscripts; then - pushd scripts/perf || die - sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir - sed -e "/^top/,+1d" -i rocfft-perf suites.py || die - sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die - sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," -i perflib/pdf.py perflib/generators.py || die - popd - fi - - cmake_src_prepare -} - -src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -Wno-dev - -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} - -DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}/clients/staging" || die - export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device - edob ./${PN,,}-test - edob ./${PN,,}-selftest -} - -src_install() { - cmake_src_install - - if use benchmark; then - cd "${BUILD_DIR}"/clients/staging || die - dobin *rider - fi - - if use perfscripts; then - cd "${S}"/scripts/perf || die - python_foreach_impl python_doexe rocfft-perf - python_moduleinto ${PN}_perflib - python_foreach_impl python_domodule perflib/*.py - insinto /usr/share/${PN}-perflib - doins *.asy suites.py - fi -} diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest index eda5f1596e3c..3b2072b904f2 100644 --- a/sci-libs/rocPRIM/Manifest +++ b/sci-libs/rocPRIM/Manifest @@ -2,12 +2,10 @@ AUX rocPRIM-5.7.1-expand-isa-compatibility.patch 1655 BLAKE2B 23392f6237ec706e07 AUX rocPRIM-6.3.0-expand-isa-compatibility.patch 1821 BLAKE2B 4e2964d6627ce135766a789e4c6ae3b7461f2024fb77d22c29a8630a5182953cc586d659604433580c855e97bf0372536c6e154a904b934bb125d5faec5269c8 SHA512 30bfd36c5a5be5ba1f11df572fa175ebdb61d17735cbcb71dac644d800a374f3253ff0cda9aac47a4941c43c8010806ec5ba0a97e6b12a32ed78746011b57a66 AUX rocPRIM-6.3.0-fix-clang-template.patch 1539 BLAKE2B d9bf6f6cbe67eb247b5f0507b4fc3e4c837b4c0727192a026de55f325dc2f49b3a7d13d4b5b6713b031402e57d4d3b6e4769af8f011d74bc8a3ddc5c02363cf6 SHA512 77aa48c0f351ec46a77fb9d53eeae5cae6218b3520595c50ef87bf68b08bd7ca83a6fd9e4d96651a15b4dbf4b5d4e1257daacb124e25704d5ff417890e071361 AUX rocPRIM-6.3.0-fix-libcxx.patch 2660 BLAKE2B 08e6a8504c1efc7ae79ea9c456ce64d5795b5c4b2f0632633e0356c097cc5ac5eb1255c86f8000f75de061dfa59cdf1d0c1fe0eb0bcb260d746471c527b06f15 SHA512 da832438d7f8ccb2e0abe353a8de4c982cc31bf728ad191cf41818b749a2876d63f39ae567f96f5a4ce6b12ca81699847912a13f63197dd6e518ba0fcd25b752 -DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a DIST rocPRIM-5.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879e5f82e539881d79bda57d23c25a9b114466042258e87862a88cd53d260155d7785c9a69a1800b0d05e931f56d SHA512 b2f0bc07dbc5cd111dd513f6c05dbc533908c52ea99caf77d6a4dd35db2b28f98c80006bd1f50a232873eab00b70e54231c38bfd1035c8845029d53690fd5e71 DIST rocPRIM-6.1.1.tar.gz 611372 BLAKE2B 984df214179a6d2c90b31bd30ec9472a0b985d9d488ea195968f25df4cac97ce48bfa4c322f2d578771ac63caeafc2c69c9dae911bc3a9d920ab9558ba7d6e15 SHA512 298eebc8a5d3fd7da71ab98a22fd39183436b3d9e14945e450f0fb35e38ea8fb99c5f2b342f1f77f21899a14d506ce96a965fbdb24f106ec9638dcd6afe6ae98 DIST rocPRIM-6.3.0.tar.gz 745936 BLAKE2B 1cdcf886c823959bbb03f53cb6e17abdb009fa48f8e00e96f8d962dd28ef9fb8b6ed796be079b0a3948adc832de8e3449d6439711db821b8a26c5cdc7122ce61 SHA512 c38f3cebfb32c0c9d4f9c1ad261c1dbe793dec1ebc92cf024ef32606f99c91e178526d77a24ad18792099e6f3aafcea43f7bc9282bbc144672684cd5fe296a8b DIST rocPRIM-6.3.2.tar.gz 745935 BLAKE2B 21ffbd746e51aa7ed7028be9eea1009757d7d92403999b35310f5c249d76e2dc793d754d2eeaf44e3d0da8aa00c5ca93dfa45ed2a654fd26f88510f422a7ea11 SHA512 e5c57d95cb25a498f9ef8c555dbf89f6be2d0088a04c8fdc470dd98f851ac15dde7ce0493719d544e7f911f3438e780b12aadc42f5d47e25723828149f6279e0 -EBUILD rocPRIM-5.1.3.ebuild 2012 BLAKE2B db384e213038bbe8dc5e925905b9637bf5dc14de1b59f1f574abcc0f46aebe876484c0b9704acd0bf447a01727e1a94b388de9989669f64569043bf46cfb6e5e SHA512 3cf65a5a20fcb5b90cc871e266df7d96e791c70f82c33f088349a5cf03a39f0b114972a7fbf25ce8df4d80fc47af379f8cc0bd0466d261a1acee79e4ca7b3dbe EBUILD rocPRIM-5.7.1.ebuild 2234 BLAKE2B 504db3f20d2bc78f46e3a93d5eac96b275197444448185b0ebce64df866f6e27aa966cc940be9d91cdb3756bfaad2bb00e76cea40fe489e7603e63571d50f590 SHA512 bb10e2ded213c8e5554707e25cde78205cd0b6eb217e68242def0c2126fcd2dbc1dd0182c56df65e6bba5ed7c1931637079106d012a748cf3c53eeb13589e04a EBUILD rocPRIM-6.1.1.ebuild 1543 BLAKE2B 70aebece6353eed300659e250f714964d9d3565b165e0f43b670e881f7fe13ed9f7e2998500e7ccdc518f6832bc1ef6920b5b7aae67ecb943619392e4a1f8e91 SHA512 36134f4158d97463a798686d2e5e5881c55f96b2ec91b81f402476a2d0ed9a0fe0d2cdb6cd156d1ef4319e8ea635c0706248706b3e5aafa3e180c1e92b06c428 EBUILD rocPRIM-6.3.0.ebuild 1773 BLAKE2B e66bef09d0499d7015c1e29d54598f80a309eec0a989552bce43a89b5d2233c4f1887e765d9228f863be01828550b78a9986fd99da0960ebbc4407b5733312e2 SHA512 46b8d6ae1eeef2654397f39512194bfcf27088d6885eacd97b22d0991f198e2b7e630005b20c1e59af17ec87c1e73222a53aaf59e16e7b0815281bce0f07fa63 diff --git a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild b/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild deleted file mode 100644 index b95730533189..000000000000 --- a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} -inherit cmake rocm - -DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocPRIM" -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" -IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -RDEPEND="dev-util/hip - benchmark? ( dev-cpp/benchmark ) - test? ( dev-cpp/gtest )" -BDEPEND="dev-build/rocm-cmake - >=dev-build/cmake-3.22" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/rocPRIM-rocm-${PV}" - -RESTRICT="!test? ( test )" - -src_prepare() { - # "hcc" is depcreated, new platform ist "rocclr" - sed -e "/HIP_PLATFORM STREQUAL/s,hcc,rocclr," -i cmake/VerifyCompiler.cmake || die - - # Install according to FHS - sed -e "/PREFIX rocprim/d" \ - -e "/INSTALL_INTERFACE/s,rocprim/include,include/rocprim," \ - -e "/DESTINATION/s,rocprim/include,include," \ - -e "/rocm_install_symlink_subdir(rocprim)/d" \ - -i rocprim/CMakeLists.txt || die - - # disable downloading googletest and googlebenchmark - sed -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die - - # remove GIT dependency - sed -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die - - # install benchmark files - if use benchmark; then - sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \ - -e "/add_executable/a\ install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die - fi - - eapply_user - cmake_src_prepare -} - -src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DSKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DBUILD_TEST=$(usex test ON OFF) - -DBUILD_BENCHMARK=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - MAKEOPTS="-j1" cmake_src_test -} diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest index dcd15271a500..768db1ff2cb8 100644 --- a/sci-libs/rocRAND/Manifest +++ b/sci-libs/rocRAND/Manifest @@ -1,17 +1,10 @@ -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 AUX rocRAND-5.7.1_fix_generator_alignment.patch 622 BLAKE2B 53443aaca64c848864233f443bf4e89c1ab0231ba7071e5b628b0b51bd144c720ea3a801acf449a3410f81bbe6d5f28450d2046b53472ef74307b54077dcc4bd SHA512 368e76a0223e50196727547ca4fad51404e38ec191adb4b39cb7b066c24a28d2c8bfb970e7ffc1cb1b5347bbbddc2014b729c4e66110865a98b0b01fad797aa3 AUX rocRAND-6.3.0-benchmark-1.8.patch 1216 BLAKE2B 437e940107eef2cd5be67f1488ed6c55fff9f149d4613515983757de4574cf6c043b44a52f88330c657c12fbe00e18ea34e0a6206c374153ef3439b9f1c641c4 SHA512 9dfbf23e444e343baf277f4617659e793f2b57c80f3636aa6da5b0950b451413fe37a7a66b085ace8448d94917cd82c6cbf279ddeee765ddbaab598921950300 -DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85 -DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28 -DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5 DIST rocRAND-5.7.1.tar.gz 23189653 BLAKE2B c70ab6f3b718c2430394f63b93bee15fa72daae704883fdb203b98b0dc4763b46bc27886af64c48bf4ebe8da9b919158b8cd346f70f9b76bf0492ce3b2c1e20e SHA512 4d74bce9fbd3cb45e3f057d38df747270c6986fea7ad524f7a88109b6a53a4ea5dcd60d4bbf2364888501e9444245fb6898bb79fccad0e37b61e819e8c4ed863 DIST rocRAND-6.1.1.tar.gz 26683143 BLAKE2B 4108584c6372adbf2f9ef887cf1aa08f5afdfa489ba0739d247e693628f3e23978fe023c2896e7bff666b8822b0011fd3f635338b013898f8d76b3f31ec21f6c SHA512 d8df0e6bf843719e59434c952ef56b112ada23d0c226bec9f2974ed762500202ac809f495de61a4086289e35c2f4b670f4ed7dcd7092a158c0a731c368950a44 DIST rocRAND-6.3.0.tar.gz 44906536 BLAKE2B 204ba943ba840d78dfc7a69f762dca270f7cb9633dcb9f47df0832958b0c6bf279b0154539c01d0a6037aed9c8ec38edbd566fc102410687d188ff7299d23515 SHA512 aa8f6abc798ac1b24908ec5ef45b38bc63ee79ccf7c333b42f16cb0155f22d1fea34753e61de93a4eaf485457124f23626dd79d35021e3e896bff915a2722455 DIST rocRAND-6.3.2.tar.gz 44906513 BLAKE2B fba5f0dcc1a6fb5636ffb1c9a13f0d03d908d99c277c783ec53ffbb0b2ff4798c65c9bbf27c591690a5f17db43eb8309ee1648da39c631eba32d183560b645d8 SHA512 6eac3c27f970e75e57a864b26070e1327235a42367e9d137ebeaed8d4a20a85638edfb3d81b142171c260c71403021159c1e3b9bcb0f97c08251c33ca9e62641 -EBUILD rocRAND-5.1.3.ebuild 1983 BLAKE2B ea0f8aeebc7d7eaf8bbfe682ea1b4f52c789df5250b05cba6728db6af46c30f852d783c9c5254bde7f7eec36854ab857a18ab0d3536db50ebd0bc016bf82bbb6 SHA512 f4a139505f8b64ae36d912730ac40c78b14dee492cc75499536f8b0697bc3fdaa31c37efc1572faba02ff10952cef0f489a90a72904fc589cd71f5a222f2e2aa -EBUILD rocRAND-5.6.0-r1.ebuild 1381 BLAKE2B 398870e0a0a5d68eaccf173fca87e1d5086e8818e45b56a9811113e3d2038add46bf370af35771079928dfd0770575c74d79aeff92cc149eacf4dbf55ee67643 SHA512 a0d94616f9b63904aab41dbee8e73ba013a6e1e59a8be3526d7f48ec0c7b2463b7282c66f6ad1c0984ee254b9a13d39ae40ea9a272cf9f2213c1a0b5d680a586 EBUILD rocRAND-5.7.1.ebuild 1512 BLAKE2B 52baabeaa5bf7af55555cde6afb2165f36a409150a5d64a0662145d59cff880352a10a42c352b1d989626283295061222be87c9ecff74b998bc3bd4adff98488 SHA512 a909992ee8631bbd0fc4b875d5bc10ca9cb2f6aaead2611978632f0df55a078cf784e9833613c45b28916e6806de5bfecdeb9872784eba7eea990b9c3f720884 EBUILD rocRAND-6.1.1.ebuild 1363 BLAKE2B d76f7774ae483209e47b4a9ecfd79e45e800b4f7d37b0294a565ffced89ea4522239aca07b145720060564108f93d8445dd1b239e38047cedca47ce32d6fac39 SHA512 6bb257e6620b24195328b1c6da356e6b8ec20a79c6317e4c8c8f2be503b49def57257f493306598a24b74ccdf579808ca6651f0dcb99b20d68586bd148bec40e EBUILD rocRAND-6.3.0.ebuild 1410 BLAKE2B 0aaf8249465e6214b5c45829a720abf4e0daca21736a1c7b17b6f6509e6aab44e4ae0e2786b3eac7136de52032de0fb794f8fe94e663934538aa28b28be3e143 SHA512 53aa1b6f44f05fc4818c9cceaa3670cd3a603500cfa00e5d5dd6d1daed0d084da792d625d1c1763da026c56c8009218112e3d6276a52c209b4b2cdcb0816b6b7 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 deleted file mode 100644 index e0a4b8d66ae1..000000000000 --- a/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index e80155f24da7..000000000000 --- a/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/rocRAND-5.1.3.ebuild b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild deleted file mode 100644 index bb518842e253..000000000000 --- a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 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" -HIPRAND_COMMIT_HASH=de941a7eb9ede2a862d719cd3ca23234a3692d07 -SRC_URI="https://github.com/ROCmSoftwarePlatform/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz -https://github.com/ROCmSoftwarePlatform/hipRAND/archive/${HIPRAND_COMMIT_HASH}.tar.gz -> hipRAND-${HIPRAND_COMMIT_HASH}.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.1.3_stdint-gcc13.patch - "${FILESDIR}"/${PN}-5.1.3_no-symlink.patch ) - -RDEPEND="dev-util/hip" -DEPEND="${RDEPEND} -dev-build/rocm-cmake -test? ( dev-cpp/gtest )" -BDEPEND="dev-build/rocm-cmake ->=dev-build/cmake-3.22" - -S="${WORKDIR}/rocRAND-rocm-${PV}" - -src_prepare() { - rmdir hipRAND || die - mv -v ../hipRAND-${HIPRAND_COMMIT_HASH} hipRAND || die - # 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 "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die - - # remove GIT dependency - sed -e "/find_package(Git/,+4d" -i cmake/Dependencies.cmake || die - - eapply_user - cmake_src_prepare -} - -src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -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) - ) - - 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 -} diff --git a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild b/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild deleted file mode 100644 index cadf2c863445..000000000000 --- a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 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-build/rocm-cmake - benchmark? ( dev-cpp/benchmark ) - test? ( dev-cpp/gtest )" -BDEPEND="dev-build/rocm-cmake - >=dev-build/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 -} diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index 33424f250060..19583ba614f4 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1,14 +1,7 @@ -AUX rocSOLVER-4.2.0-add-stdint-header.patch 475 BLAKE2B 268a1813d4e26dbaaa2360d0a187ce2a1448da075ae5f98a4a829c979411ab7e0c06f150ddcb445c9b295268a1e9f1770adbe7e68a1c3f84edde3c3477a57610 SHA512 ede56f9579e655ddd098ca9006612537f8ed61dc585274afe6b2b0bdee875431b62e0c6da6bc01e2cabeeb5244a91bb1e00b442bb549c075a286eefd8d9edc09 -AUX rocSOLVER-5.0.2-libfmt8.patch 7493 BLAKE2B 0327f78dd94f0102a5c4aabf13cab2ec6adaec3efee82acdb24d223b56a58bece34b505b9fdb2964ffa6f3f574730c2e74110e12e198fe26bc682ea294038749 SHA512 124dd445e188475777e3dee017f7380675594717b1e58458397780dc5c32ee8221935234954554510bd169af10a3bdb4fef0674bf93030081c5c12c1f3061a13 -AUX rocSOLVER-5.4.2-libfmt9.patch 1478 BLAKE2B a5f3774483c38bb059873509d326d46a5ec4b476578a76045e44d4826c4f2401edd5b2e0c0d9c20d906ba4efaf539bf1aad42183b1eafcaf28aa60a16f76efc1 SHA512 061286d3f328958c7d5ffc8a54322c5e2cb9d08b71f51ac4e76bcc06804624ac8181bba6c328da58e5f6c4410fbe778db43633bbfcac1afe2f5c49d9d238fac7 -DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753 -DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6 DIST rocSOLVER-5.7.1.tar.gz 1859403 BLAKE2B f7a40494deda9dd66f2fb2f57e13665688e89e1f82733701ec60a520bc4b9f7d5899ada618a37e73baa3a910757be4f11d5fced5d4d2ad82c56918b34d265511 SHA512 78e0a2b5b069378696afebf5e3e023449b3d7705aa79099eb7721c142d7525255825b41bf413324c33178091315e3909980a1bf0cbb66e0891c85e757858ee1c DIST rocSOLVER-6.1.1.tar.gz 2971118 BLAKE2B 2611b6b65704e7cd64df682728013f07d20c6e17e6729cec7befb91dbed57aabaaed2887a252d4ae610fe0bcb336dfcd4b98d63c107694c22e35be06d06363db SHA512 a96901226cbe5b410fa2885023a080b5ca7dc4659be92b363c37e10eba97d3da09d97488ecdc040452a535ad3284017c64b3b68646f258655583302baa009f34 DIST rocSOLVER-6.3.0.tar.gz 3077185 BLAKE2B 2ac2260aa631756d32a92b9386bda16a46a1b16922072d6962497b2f009c237a0386cc0006ffdd56e6396322fc2408d49fc18e2ccd7120492a2270fce3eba3d9 SHA512 a2655cce8c2eb287893988e8b69e77e2dbcad0f627fac74916be2789cd3357cf29f3e3090a9c88a86ef9a0e80dd0aa949ddfb145a6a0d1c128eac0a8fe708d94 DIST rocSOLVER-6.3.2.tar.gz 3077213 BLAKE2B ab05f0388f4845e7cbd6279aaa7c6a0774b99153ca0739837186792a8e5c271498d5c18a3305602d979aad65e5bc399305e0c6447bce118694ebbdcb1f26b5a3 SHA512 7a9b705783dde897a8b343e832a7775d131cc0c5caca14ee9abe4349aeff896bb1b073ea077ed1bcced6a358e4b61d9a0155c499c73fccba1d50b0ebc535dd6c -EBUILD rocSOLVER-5.1.3-r1.ebuild 1939 BLAKE2B 5106e36577bdfbbba5039de1007a9d96587354bb634f2ae4cec76c644144ab6b5527082ba96a0039c42c2e0984c1abf99cc30c6d8bb3a3867c45348245ced66f SHA512 8d6abd695f2596fef6f6c2fb66e168ba5b087b71360ffebfd4a0aaa3796d21b9e9deb215e4368ca36a42ede7ac91415ed6641e20e4ac1d40fa420bbdf1cf44b9 -EBUILD rocSOLVER-5.4.2.ebuild 1537 BLAKE2B 8881bd0881366f2315011b8fca3562bf85f2fbed0c5522b47b18794366e6d26bf800da60a5f1d73f74b0f4397b6407cea042e6ed9e10595017e51441fe221ea6 SHA512 b9d212bc359301a901750ce682f4658a9ba927950800f5e4692f26991ee1aee86d0465e9a7af5eeef61750fe5799a7e4e636dffd097a8a604208ef8764e961b9 EBUILD rocSOLVER-5.7.1.ebuild 1536 BLAKE2B c85b59fc74642843d586c33e81b6d0e3504e8b53d639072eb65a46112ca56fb229fa6a312b5b2f7e3d8061e89716530b38a4f497ed1c0a512117312c81cafc67 SHA512 36f9bcff6650fe09fbe4227904d1b05259208fed1935f4b8a29e297102e81d77ded767c3392a78b126790ea56413fc56e6828774881bc4313a2714c2a0b9ef2c EBUILD rocSOLVER-6.1.1.ebuild 1439 BLAKE2B 637f2a432d41dc71231021e419c46303f0882820d268b68b03dacb386b0bb58d7deecba8d8fa2a2b6be80f7040df244ccea90da5546f69f84d348367d7f18e5a SHA512 704a0ba8930b519afd224f6f7713d6ee743ea6d40f9c3bc7a53ffe449b2e9a6fb1ad4c1407891ea2129d43ebbc04308db235e6cc3ff558f9456068499a13fa05 EBUILD rocSOLVER-6.3.0.ebuild 1678 BLAKE2B 64cc0c35bcbfae7cab035747071d83a69fd1f58c9dbd097df1f5326ef8d383912128d903bfcf62e0dea773cb8f0773082848ac290ffc25b0a9daf269fe85c63d SHA512 25b7e8b4ce820b18ee53c45228560022adb2c7991a43678d955ff35d81719071f080c232e5d37979c2e5393bf86461112f9aad6470823f2c4c90da138addb1d0 diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch b/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch deleted file mode 100644 index 4afff8f467ea..000000000000 --- a/sci-libs/rocSOLVER/files/rocSOLVER-4.2.0-add-stdint-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -fix compilation error rocsolver-extra-types.h:11:9: error: unknown type name 'uint32_t' ---- a/library/include/rocsolver-extra-types.h -+++ b/library/include/rocsolver-extra-types.h -@@ -5,6 +5,8 @@ - #ifndef ROCSOLVER_EXTRAS_H_ - #define ROCSOLVER_EXTRAS_H_ - -+#include "stdint.h" -+ - /*! \brief Used to specify the logging layer mode using a bitwise combination - *of rocblas_layer_mode values. - ********************************************************************************/ diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch deleted file mode 100644 index 3f2c0553689b..000000000000 --- a/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch +++ /dev/null @@ -1,173 +0,0 @@ -Backported from upstream to fix dev-cpp/libfmt-8 compatibility - -remove changes of CHANGELOG.md from original git commit - -From 2bbfb8976f6e4d667499c77e41a6433850063e88 Mon Sep 17 00:00:00 2001 -From: Cory Bloor <Cordell.Bloor@amd.com> -Date: Tue, 8 Feb 2022 23:53:57 -0700 -Subject: [PATCH] Fix compatibility with fmt v8.1 (#371) - -* Make rocsolver_logvalue fmt specializations const - -This allows for compile-time format string processing in fmt v8.0. - -* Fix compatibility with fmt v7.1 - -* Update CHANGELOG.md ---- - CHANGELOG.md | 2 ++ - library/src/include/rocsolver_logvalue.hpp | 38 +++++++++++++--------- - 2 files changed, 25 insertions(+), 15 deletions(-) - -diff --git a/library/src/include/rocsolver_logvalue.hpp b/library/src/include/rocsolver_logvalue.hpp -index 199f8d57d..9b3791031 100644 ---- a/library/src/include/rocsolver_logvalue.hpp -+++ b/library/src/include/rocsolver_logvalue.hpp -@@ -1,5 +1,5 @@ - /* ************************************************************************ -- * Copyright (c) 2021 Advanced Micro Devices, Inc. -+ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc. - * ************************************************************************ */ - - #pragma once -@@ -8,6 +8,14 @@ - - #include "rocsolver_datatype2string.hpp" - -+/* The format function for user-defined types cannot be const before fmt v8.0 -+ but must be const in fmt v8.1 if the type is used in a tuple. */ -+#if FMT_VERSION < 80000 -+#define ROCSOLVER_FMT_CONST -+#else -+#define ROCSOLVER_FMT_CONST const -+#endif -+ - /*************************************************************************** - * Wrapper for types passed to logger, so we can more easily adjust the - * default way of printing built-in types without doing it globally. (e.g. -@@ -37,7 +45,7 @@ template <typename T> - struct formatter<rocsolver_logvalue<T>> : formatter<T> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<T> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<T>::format(wrapper.value, ctx); - } -@@ -49,7 +57,7 @@ template <> - struct formatter<rocsolver_logvalue<bool>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<bool> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(wrapper.value ? '1' : '0', ctx); - } -@@ -58,7 +66,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_operation>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_operation> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_operation(wrapper.value), ctx); - } -@@ -67,7 +75,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_fill>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_fill> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_fill(wrapper.value), ctx); - } -@@ -76,7 +84,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_diagonal>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_diagonal> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_diagonal(wrapper.value), ctx); - } -@@ -85,7 +93,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_side>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_side> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_side(wrapper.value), ctx); - } -@@ -94,7 +102,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_direct>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_direct> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_direct(wrapper.value), ctx); - } -@@ -104,7 +112,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_storev>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_storev> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_storev(wrapper.value), ctx); - } -@@ -113,7 +121,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_workmode>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_workmode> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_workmode(wrapper.value), ctx); - } -@@ -122,7 +130,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_svect>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_svect> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_svect(wrapper.value), ctx); - } -@@ -131,7 +139,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_evect>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_evect> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_evect(wrapper.value), ctx); - } -@@ -140,7 +148,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_eform>> : formatter<char> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_eform> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<char>::format(rocblas2char_eform(wrapper.value), ctx); - } -@@ -149,7 +157,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_datatype>> : formatter<string_view> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_datatype> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<string_view>::format(rocblas2string_datatype(wrapper.value), ctx); - } -@@ -158,7 +166,7 @@ template <> - struct formatter<rocsolver_logvalue<rocblas_initialization>> : formatter<string_view> - { - template <typename FormatCtx> -- auto format(rocsolver_logvalue<rocblas_initialization> wrapper, FormatCtx& ctx) -+ auto format(rocsolver_logvalue<rocblas_initialization> wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST - { - return formatter<string_view>::format(rocblas2string_initialization(wrapper.value), ctx); - } diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch deleted file mode 100644 index 3e0ef897b71e..000000000000 --- a/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit bafa8f30b6f83d5f02bb65bb47b2943a0cb3c290 -Author: Cory Bloor <Cordell.Bloor@amd.com> -Date: Wed Jan 25 14:52:35 2023 -0700 - - Fix use of fmt 9.0 and later in logging test (#515) - - The implicitly defined formatter that rocsolver was using for - std::filesystem::path has been removed from fmt 9.0 and later. - - This change doesn't actually fix compatibility with the official - fmt 9.0 or 9.1 releases, because those releases are still - incompatible with HIP. However, the change is sufficient for using - rocsolver with fmt@9 from Spack (because the fix has been backported). - -diff --git a/clients/gtest/logging_gtest.cpp b/clients/gtest/logging_gtest.cpp -index e4f594a..da7ae04 100644 ---- a/clients/gtest/logging_gtest.cpp -+++ b/clients/gtest/logging_gtest.cpp -@@ -1,5 +1,5 @@ - /* ************************************************************************ -- * Copyright (c) 2022 Advanced Micro Devices, Inc. -+ * Copyright (c) 2022-2023 Advanced Micro Devices, Inc. - * ************************************************************************ */ - - #include <cstdlib> -@@ -49,7 +49,7 @@ protected: - { - if(HasFailure() && std::getenv("ROCSOLVER_TEST_DEBUG")) - fmt::print(stderr, "ROCSOLVER_TEST_DEBUG is set so {} was not removed.\n", -- log_filepath); -+ log_filepath.string()); - else - EXPECT_TRUE(fs::remove(log_filepath)); - } diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild deleted file mode 100644 index 7af286e20569..000000000000 --- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake edo rocm - -DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER" -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -IUSE="test benchmark" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -RDEPEND="dev-util/hip - sci-libs/rocBLAS[${ROCM_USEDEP}] - dev-libs/libfmt - benchmark? ( virtual/blas )" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-cpp/gtest - >=dev-build/cmake-3.22 - virtual/blas )" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-add-stdint-header.patch" - "${FILESDIR}/${PN}-5.0.2-libfmt8.patch" -) - -RESTRICT="!test? ( test )" - -S=${WORKDIR}/${PN}-rocm-${PV} - -src_prepare() { - sed -e "s: PREFIX rocsolver:# PREFIX rocsolver:" -i library/src/CMakeLists.txt - sed -e "s:\$<INSTALL_INTERFACE\:include>:\$<INSTALL_INTERFACE\:include/rocsolver>:" -i library/src/CMakeLists.txt - sed -e "s:rocm_install_symlink_subdir( rocsolver ):#rocm_install_symlink_subdir( rocsolver ):" -i library/src/CMakeLists.txt - - cmake_src_prepare -} - -src_configure() { - # avoid sandbox violation - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -Wno-dev - -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/rocsolver" - -DBUILD_CLIENTS_SAMPLES=NO - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}"/clients/staging || die - LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test -} - -src_install() { - cmake_src_install - - if use benchmark; then - cd "${BUILD_DIR}" || die - dobin clients/staging/rocsolver-bench - fi -} diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild deleted file mode 100644 index 10fb52f40af2..000000000000 --- a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake edo rocm - -DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER" -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -IUSE="test benchmark" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -RDEPEND="dev-util/hip - sci-libs/rocBLAS[${ROCM_USEDEP}] - dev-libs/libfmt - benchmark? ( virtual/blas )" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-cpp/gtest - >=dev-build/cmake-3.22 - virtual/blas )" - -PATCHES=( "${FILESDIR}"/${PN}-5.4.2-libfmt9.patch ) - -RESTRICT="!test? ( test )" - -S=${WORKDIR}/${PN}-rocm-${PV} - -src_configure() { - # avoid sandbox violation - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -Wno-dev - -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DROCM_SYMLINK_LIBS=OFF - -DBUILD_CLIENTS_SAMPLES=NO - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}"/clients/staging || die - LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test -} - -src_install() { - cmake_src_install - - if use benchmark; then - cd "${BUILD_DIR}" || die - dobin clients/staging/rocsolver-bench - fi -} diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest index a469c5a77758..b420f80f8031 100644 --- a/sci-libs/rocSPARSE/Manifest +++ b/sci-libs/rocSPARSE/Manifest @@ -1,7 +1,3 @@ -AUX rocSPARSE-5.0.2-enable-gfx1031.patch 645 BLAKE2B 4e20882057d1f8687f47831cc8945b787606b6f6d1d676ba5e5e12d8ff61e1c22711da57b50d988d44b2962c6001d270ebe2ffcb751901a6eb64635e553a7cd9 SHA512 24fbfed3cafdf00c7e13d25136427b30c573191e32830431f7185fd9a2f537c110f83f4e6f8603f3c17381d316f13c3b626eeaa9331f9035e7bc9b34d0c7c70e -AUX rocSPARSE-5.0.2-remove-incorrect-assert.patch 1658 BLAKE2B 26aa66d7d61657eb591f7b345b64211f3cfb47f0a1b656716b32e299799bb8172483b4898878e532f7c6ca3f99bcb4a8789a1b6a913bc40dfebdc144613b0f27 SHA512 bfae11079c621b3372678ade78bea979b751777a48060b5ef26b3567fb89b1cf8591c998e199be649b03157662ef9b4889ca79498b16cf0bf6fbd1b9a532e485 -AUX rocSPARSE-5.0.2-remove-matrices-unpacking.patch 1205 BLAKE2B 0d903453692025f6f239c8b5d2f11dd6f9dfe5c09a63395898920326e0dbd6aeff37fdf2dde8e89ea1cbdc60252ab87b7ef020b56a726853d2f7261addcf00c8 SHA512 52ec3913f89f7886d6b8fb9ef54ca313c64e4c9d374507a0d89a8c7cf846e8f8f6b8a4ad266b23015869a79d2eaadb75c5540ca53e40163cb0fbdc2b1819e645 -DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3 SHA512 735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3 DIST rocSPARSE-5.7.1.tar.gz 1167162 BLAKE2B 20ed88c87afbb041a31aa8bf867dca7ee670af093347c9c6a68b0750e70c796e7cfd599f84a58de2b8038f7681524bcb5909230fc340d1575dae3b72089ec650 SHA512 cd48884c51fcddcb26c42920cf477999160b3f06da4ab182f746a18d1fe54f697d89b1e470c550bd2330b26fb596d4a5baadf64366145e0d07f3fd8891f9af59 DIST rocSPARSE-6.1.1.tar.gz 1367035 BLAKE2B fc981df5913ea527bb4a7d3eba69373ebc7b74319f387e9f42a94feb1ec029ecca15618ea2d5ff7a91cb6e8959f164ab4be57755ee17db5f155f3b0e373cc487 SHA512 f87bd724b92fdb35e1c70cafcf09d95ab65f514bacfe1c59c5f0a2a75a8bae7a7dca2ee093ecd2e05adf542cc00165c0f8bf0a67e98013e2c4c72145ba951db2 DIST rocSPARSE-6.3.0.tar.gz 1490336 BLAKE2B 05260170c757247a93c4169603dd8f0c0ce8e1e83ca83775783bee243ed9d174af7762a39f252b1434fb6af8a86fdcc11a7994af79e8a8b9ea9f199670ab3a74 SHA512 c8ddd942ba5765f01457391d028599e8daecd107771a2ff7948f537756c323be516d40fc52f7443472db76f5d7411dcd266f8dbc7f0ae9d9cee8270ec8dcb1f7 @@ -30,7 +26,6 @@ DIST rocSPARSE_scircuit.tar.gz 8635362 BLAKE2B 3f1d6e35a6a774664bd653dd466fa3c07 DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b648e3c396a5ab2379efdc7de218adec519a235e2e94904f85a4f24c8d4ff15af096ca089379e00db47519023f64b85c16 SHA512 e027097e74f8ffc058339855b1c38cab52c68b661058318b429487e7188e11e907f6734894f9c71d1e38d262986525fba8d0f165bc0a1b4632d7e25be8db4f17 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161 -EBUILD rocSPARSE-5.1.3-r1.ebuild 4960 BLAKE2B db6aa536d619dcadf79787ea73d5cae6098b9344c30d290423f582cdeff23df09d493e9df698c79c768afc9f6c61143db14835ae8ccff1f66a9eaa764605b812 SHA512 2a713a8630a399292646191b1ae7dee2acddcffddc1cbbff2ed66408715e64b7bf370ace80a3206c47f1560a51385f9413f4b61e4516d56b3934d921ef3bc111 EBUILD rocSPARSE-5.7.1-r2.ebuild 4917 BLAKE2B 0f671c24cbdaaab4f2c5f41394a0164bb152b82c45c9f55c169c4785bb7ec51c82ebc47911cdc1d5fd1285a809c860f609437cefb19c34a37a02285102211c2a SHA512 055e7eca53225cd1b14e2fb6c86a30505506dd83c1cbe3b84abd9b2081fb06f993e54376a1f04e4ef4322a9c4cbe8367a6cc797993bd5f104acba8e9422c0de6 EBUILD rocSPARSE-6.1.1.ebuild 4319 BLAKE2B e46bdae6c3c2b29fbddee9152b930d021c752622c4f2fce93ca20a8f63cc111bb20f5ae9bb4b640f136e255ea89e22dcaf1754bc98181f8f6b258c8108e4b656 SHA512 29949ce5def2c52c93c6f85d00dc84d3978ba1425070d4a32639002a6840604742d68664ff196846f43f60ce5b3b780d886994c9a5df2dc3c62aa78cadb1a7f2 EBUILD rocSPARSE-6.3.0.ebuild 4574 BLAKE2B 2187f8f70f4870402daf9d55b1ac292e7f51b22f75153612b4febbae354c129410ce467d9eaed99731f0e7f7207904e8e22cb0b50d1b75762c1e477224d51feb SHA512 2b1f293255445fcb7eaed05b5a4a7523741a696d6e4073c5edc2e21d69882b8d50cf661c3d0041ed61d1a93c518be33740fdc8259cc28e1046bad5954faff660 diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch deleted file mode 100644 index fd44bb938406..000000000000 --- a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rocSPARSE-rocm-5.0.2/library/src/include/common.h -=================================================================== ---- rocSPARSE-rocm-5.0.2.orig/library/src/include/common.h -+++ rocSPARSE-rocm-5.0.2/library/src/include/common.h -@@ -167,7 +167,7 @@ __device__ __forceinline__ void rocspars - if(BLOCKSIZE > 1) { if(i < 1 && i + 1 < BLOCKSIZE) { data[i] = min(data[i], data[i + 1]); } __syncthreads(); } - } - --#ifndef __gfx1030__ -+#if !defined(__gfx1030__) && !defined(__gfx1031__) - // DPP-based wavefront reduction maximum - template <unsigned int WFSIZE> - __device__ __forceinline__ void rocsparse_wfreduce_max(int* maximum) diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch deleted file mode 100644 index 9baa962c05f5..000000000000 --- a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 48b763f01b658dece7f71784fe4362e56167db2f Mon Sep 17 00:00:00 2001 -From: James Sandham <33790278+jsandham@users.noreply.github.com> -Date: Fri, 28 Jan 2022 10:24:08 -0800 -Subject: [PATCH] remove incorrect assert from spmm_bell (#302) - -Co-authored-by: jsandham <james.sandham@amd.com> ---- - library/src/level3/rocsparse_bellmm_template_general.cpp | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/library/src/level3/rocsparse_bellmm_template_general.cpp b/library/src/level3/rocsparse_bellmm_template_general.cpp -index 81f36a32..bbce9a17 100644 ---- a/library/src/level3/rocsparse_bellmm_template_general.cpp -+++ b/library/src/level3/rocsparse_bellmm_template_general.cpp -@@ -1,6 +1,6 @@ - /*! \file */ - /* ************************************************************************ -- * Copyright (c) 2021 Advanced Micro Devices, Inc. -+ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal -@@ -101,9 +101,8 @@ rocsparse_status rocsparse_bellmm_template_general(rocsparse_handle han - I ldc) - { - hipStream_t stream = handle->stream; -- assert(block_dim > 32); -- dim3 bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1); -- dim3 bellmm_threads(32, 32, 1); -+ dim3 bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1); -+ dim3 bellmm_threads(32, 32, 1); - assert(trans_A == rocsparse_operation_none); - // - // What happends if A needs to be transposed? diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch deleted file mode 100644 index 81d2b4ab1458..000000000000 --- a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch +++ /dev/null @@ -1,42 +0,0 @@ -Don't let cmake handle test data download, unpack and convert - -Index: rocSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt -=================================================================== ---- rocSPARSE-rocm-5.0.2.orig/clients/tests/CMakeLists.txt -+++ rocSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt -@@ -23,35 +23,6 @@ - - find_package(GTest 1.10.0 REQUIRED) - --# --# Client matrices. --# -- --if(NOT EXISTS "${CMAKE_MATRICES_DIR}") -- # -- # Download. -- # -- set(CMAKE_MATRICES_DIR ${PROJECT_BINARY_DIR}/matrices CACHE STRING "Matrices directory.") -- -- if(NOT TARGET rocsparse) -- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/../deps/convert.cpp CACHE STRING "Convert tool mtx2csr.") -- include(${CMAKE_SOURCE_DIR}/../cmake/ClientMatrices.cmake) -- else() -- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/deps/convert.cpp CACHE STRING "Convert tool mtx2csr.") -- include(${CMAKE_SOURCE_DIR}/cmake/ClientMatrices.cmake) -- endif() -- --else() -- -- # -- # Copy. -- # -- if(NOT CMAKE_MATRICES_DIR STREQUAL "${PROJECT_BINARY_DIR}/matrices") -- execute_process(COMMAND cp -r ${CMAKE_MATRICES_DIR} ${PROJECT_BINARY_DIR}/matrices) -- endif() -- --endif() -- - set(ROCSPARSE_TEST_SOURCES - test_axpby.cpp - test_axpyi.cpp diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild deleted file mode 100644 index c18eeff84c43..000000000000 --- a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -ROCM_VERSION=${PV} - -inherit cmake edo python-any-r1 toolchain-funcs rocm - -DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE" - -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz -test? ( -https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz -https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz -https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz -https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz -https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz -https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz -https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz -https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz -https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz -https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz -https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz -https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz -https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz -https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz -https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz -https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz -https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz -https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz -https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz -https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz -https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz -https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz -https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz -https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz -)" - -LICENSE="MIT" -KEYWORDS="~amd64" -IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND="dev-util/hip - sci-libs/rocPRIM:${SLOT}" -DEPEND="${RDEPEND}" -BDEPEND="test? ( - dev-cpp/gtest - >=dev-build/cmake-3.22 - $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') -) -benchmark? ( app-admin/chrpath ) -" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/rocSPARSE-rocm-${PV}" - -PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch" - "${FILESDIR}/${PN}-5.0.2-enable-gfx1031.patch" - "${FILESDIR}/${PN}-5.0.2-remove-incorrect-assert.patch" ) - -python_check_deps() { - if use test; then - python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" - fi -} - -src_prepare() { - sed -e "s/PREFIX rocsparse//" \ - -e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \ - -e "/rocm_install_symlink_subdir(rocsparse)/d" \ - -e "s:rocsparse/include:include/rocsparse:" \ - -i "${S}/library/CMakeLists.txt" || die - - # remove GIT dependency - sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die - - # Fix install path - sed -i -e "s.set(CMAKE_INSTALL_LIBDIR.#set(CMAKE_INSTALL_LIBDIR." CMakeLists.txt || die - - # use python interpreter specifyied by python-any-r1 - sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND ${EPYTHON} ," -i clients/tests/CMakeLists.txt || die - - cmake_src_prepare - - # Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, unpack and convert them into csr format - # This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage. - if use test; then - mkdir -p "${BUILD_DIR}"/clients/matrices - # compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error! - edo $(tc-getCXX) deps/convert.cpp -o deps/convert - find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 | - while IFS= read -r -d '' mtxfile; do - destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr - ebegin "Converting ${mtxfile} to ${destination}" - deps/convert ${mtxfile} ${destination} - eend $? - done - fi -} - -src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DBUILD_CLIENTS_SAMPLES=OFF - -DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse" - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}/clients/staging" || die - LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./${PN,,}-test -} - -src_install() { - cmake_src_install - - if use benchmark; then - cd "${BUILD_DIR}" || die - dobin clients/staging/rocsparse-bench - fi -} diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest index dbf44651f708..bb7d77d53f8d 100644 --- a/sci-libs/rocThrust/Manifest +++ b/sci-libs/rocThrust/Manifest @@ -1,12 +1,10 @@ AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2c107b15b7f670c430ff5db5bb3657fdcafcea7933890176537c6147c1bee3cb675464d6d948724ba186868ff277eaa71f2 SHA512 5d9d48561e7feabc9341f13877d7e6bd49b59b140fe249956e87e785ed8afd1222aa1e7d77759af6ad8843e87d21362ba85ac9204bfcf160f30a4bcfb3d2e88b AUX rocThrust-6.3.0-fix-libcxx.patch 479 BLAKE2B 89c97bd8dccad195a3486a3e6741734e8dab9523ddb1c766372aef83406ff41293aef78b4c727198be44b91e1faa6d40e396f1286b6b1123afd6ecd1241314da SHA512 f7934cc0b38bc1e35335978b30dde69c47ba211f5c6798f6fbf4981fd0d9da7ba090f3f3e96050b4f6ed3a90ed8d4c1d90ed5447e1f3ea47b18ca99d6b5151d9 -DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74 DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc26eee8a2f388897eb9b9f9fad3cdad81e2a79932c5b9a6d88b4e1596bf64e59e01337943a036ddb792f7b352ecd31 SHA512 52a9640808f0ed78ae2d6f25e741af59ae4e977535a0431f16c0fa1ee9a395e6f389cf29e61c02ac274cf16fcd193e5df6fb2edc340059ab282ed7cd877fc8b4 DIST rocThrust-6.1.1.tar.gz 1147635 BLAKE2B e71288a4666ba1f23cf85d2d269f61f9085efaeb2921b7f3142c5ce0808380b27a8c07945a44b6a651747046020b412838a667232b1ba65308fd7fd336b840b4 SHA512 30eeb6df73ee0dc2361879337faae09cf19cd151510c6e22d774c22b4be19272f9980cc6ba2b2e42f43738a1e475f49fcb4384d66b24639746a05685a90e37d4 DIST rocThrust-6.3.0.tar.gz 1205810 BLAKE2B bdf617ffac39deb345a2738a7d61ccf282af1ba2d49210aa15e5d3181f64f38bcb609d52d41db892579d9d03013b0ddcad6bc88cd58a3a90fa8e7989e01edfcc SHA512 e73e0fd743dcb5625099aad226b578145e350666eb52ce9682e53a40f4cb17a34f812a94321397acad8dfcf6c573eab86565a220bb42e501296b78450e42647e DIST rocThrust-6.3.2.tar.gz 1205797 BLAKE2B 355da53bbc69a6b79909fe48bfa326fc9bc8eabf4b80d3870bd4ef73ff87ebaba5ec06ce2096efd9d4655d1f19970ca60069c14e91b6bf953263145f8ff3a178 SHA512 5f699957ef79346e38d7d8d462b25f67248e5d7b1c2ea71a153fe7f87279d442e181a721b95a2878d52ae08ff3b53797a320f51f707b852ec67d5dfaa50a1bc7 DIST sqlite-amalgamation-3430200.zip 2676699 BLAKE2B b09c59772c920ddef7ba0b15b1721645541678bad9ecb23fb8ecfbb1733177cad836d1d75db8e0722ea7ab4701cfaca187b72c127e9959f7e4f116f1ec7fe41c SHA512 5ef0e65ee92a088187376fa82ccb182dffa35391dd4dbcb3fafeb0a6f1602ced1e212753837079a9cad007d73d3f5b8a67ca1a6596eba6cf0c695052fa307392 -EBUILD rocThrust-5.1.3.ebuild 1929 BLAKE2B 04ef6dbe75793a05c9d2f994eb82d7816ec99abed0415e0a3a555aeda4e09267adac4db686d76c409a942c636f035433d33d0727e9c793cf3afdf8bfeaedc371 SHA512 e3867e21e481ccfb13318cb2ba02596e81be6e86b5026083b7091916adc850fe74a926cb98c129a3dbe6ee0ea9c12665849979d63628e081fe56465f746098c4 EBUILD rocThrust-5.7.1.ebuild 2054 BLAKE2B 16f51ff532eb679fa80ab0494066e3113962d01f7fd0927fa70efc923017cabcf09149df2f730a15d17fbd2f95162f051fa8b9b71cd984109236c0be090f2574 SHA512 ca20c3485ab1a0a5f19d15f0275a440176671a808411352582460c203ff00dcd8cde327cf70b54227b2e7eb3ae29005a00eb5e9b6f2a492080086b620a88d1d9 EBUILD rocThrust-6.1.1.ebuild 1313 BLAKE2B 6b420f4a5a8ee338d9ab33288f6fdeb69c3e7c25c6cc73b2fc292b043aea4af3e112fc36592bec1c20239115d3065b736b37d8acb74096f0e816a986e303b62a SHA512 cc6eb3585fccc752b7bd4c2e09a1cd5fdc1ba5a6b5782a85866b5ef89ea5f25a05339eb086514d2b79f3f929fbd9817c548a02009a6d5a462b684a9aa6931e4d EBUILD rocThrust-6.3.0.ebuild 1558 BLAKE2B 7f81eae26b3b8294450fe5b5b5e73629a33be89229163f1282d475d73105dec443fb8899241525bc72aa294d39be7f39031850576b5ef4aef98ace97d6fb2e79 SHA512 3abe1945a4fc3bf91b74c50e03fa457eaf6b5b3589bc572b82707b37c12a89f1fb96bfb9fdb2acb410813531408e5699c3203bab8dfe3583891b86a3b64d32ef diff --git a/sci-libs/rocThrust/rocThrust-5.1.3.ebuild b/sci-libs/rocThrust/rocThrust-5.1.3.ebuild deleted file mode 100644 index 6fa60fff62dc..000000000000 --- a/sci-libs/rocThrust/rocThrust-5.1.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake rocm - -DESCRIPTION="HIP back-end for the parallel algorithm library Thrust" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust" -SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz" - -LICENSE="Apache-2.0" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" -IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND="dev-util/hip - sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] - test? ( dev-cpp/gtest )" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-build/cmake-3.22" - -S="${WORKDIR}/rocThrust-rocm-${PV}" - -PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" ) - -src_prepare() { - sed -e "/PREFIX rocthrust/d" \ - -e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \ - -e "/rocm_install_symlink_subdir(rocthrust)/d" \ - -e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/:" -i thrust/CMakeLists.txt || die - - sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \ - -e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die - - # disable downloading googletest and googlebenchmark - sed -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die - - # remove GIT dependency - sed -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die - - eapply_user - cmake_src_prepare -} - -src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DSKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DBUILD_TEST=$(usex test ON OFF) - -DBUILD_BENCHMARKS=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - MAKEOPTS="-j1" cmake_src_test -} - -src_install() { - cmake_src_install - - use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench -} |