diff options
Diffstat (limited to 'sci-libs')
235 files changed, 4658 insertions, 5500 deletions
diff --git a/sci-libs/HighFive/HighFive-2.10.1.ebuild b/sci-libs/HighFive/HighFive-2.10.1.ebuild new file mode 100644 index 000000000000..8995434dd26f --- /dev/null +++ b/sci-libs/HighFive/HighFive-2.10.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="app-text/doxygen[dot]" +DOCS_DIR="doc" + +inherit cmake docs + +DESCRIPTION="Header-only C++ interface for libhdf5" +HOMEPAGE="https://github.com/BlueBrain/HighFive" +SRC_URI="https://github.com/BlueBrain/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mpi test" +RESTRICT="!test? ( test )" + +RDEPEND=" + sci-libs/hdf5[mpi?] +" +DEPEND=" + ${RDEPEND} + test? ( + >=dev-cpp/catch-3.4.0:0 + dev-libs/boost + dev-cpp/eigen + media-libs/opencv + ) +" + +DOCS=( {README,CHANGELOG}.md ) + +src_configure() { + default + local mycmakeargs=( + -DHIGHFIVE_PARALLEL_HDF5=$(usex mpi) + + -DHIGHFIVE_USE_BOOST=$(usex test) + -DHIGHFIVE_USE_EIGEN=$(usex test) + -DHIGHFIVE_USE_OPENCV=$(usex test) + -DHIGHFIVE_USE_XTENSOR=OFF + + -DHIGHFIVE_EXAMPLES=$(usex test) + -DHIGHFIVE_UNIT_TESTS=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + default + use test && cmake_src_compile + use doc && doxygen_compile +} + +src_test() { + # Set -j1 to prevent race + cmake_src_test -j1 +} diff --git a/sci-libs/HighFive/HighFive-2.8.0.ebuild b/sci-libs/HighFive/HighFive-2.8.0.ebuild index 066cfc924888..74fdeecedc86 100644 --- a/sci-libs/HighFive/HighFive-2.8.0.ebuild +++ b/sci-libs/HighFive/HighFive-2.8.0.ebuild @@ -13,9 +13,9 @@ DESCRIPTION="Header-only C++ interface for libhdf5" HOMEPAGE="https://github.com/BlueBrain/HighFive" SRC_URI="https://github.com/BlueBrain/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 ~x86" LICENSE="Boost-1.0" SLOT="0" +KEYWORDS="amd64 ~x86" IUSE="mpi test" RESTRICT="!test? ( test )" diff --git a/sci-libs/HighFive/Manifest b/sci-libs/HighFive/Manifest index f97e8caae161..75d36c8c1f66 100644 --- a/sci-libs/HighFive/Manifest +++ b/sci-libs/HighFive/Manifest @@ -1,3 +1,5 @@ +DIST HighFive-2.10.1.tar.gz 559344 BLAKE2B e605eb336c740ad2665130af35b05c92c9aa54c50e2b811ae97e56446b6f67047bc65278a1260850971b0ff5ec19daf48fb266f699636da63a5268987c839e43 SHA512 3daf16c2ced165ddc7a8f1e9a0d3bf3388836e3878c86f8bf3faf2c42996d5bfd449e71e75a871447c1e7ea9a3e87d4f4a80a2382f1b24095d6051b89f27d6d3 DIST HighFive-2.8.0.tar.gz 538050 BLAKE2B ad856be95365c6d94add457d76366e0a3143fd09bbb6354048f896e16f5445d1037367eaaeaa233a3b5f9c45d2a2611173e051d2bd9e7aff4a3472665d96ec7f SHA512 cabcf8f1507b4466b7438249a813ea36de5e5d220c5caf7656312e24dbe09042bf9573388ca7c3caa22f71bd3b8106923710f9459127f87c341e2b0ab953eede -EBUILD HighFive-2.8.0.ebuild 1152 BLAKE2B 23aaa5e9d688077c8991dd4e947414d4817e150947b53793c475966110b6c1e9a804e9633d479383d56aee17ce2e0c6e621db536bed1e93c015ae26894bb7bff SHA512 2ffb7449fc6e8d09b108f7d2437caaca305ea5dde8932fce8563f0b40f8612cb024f7b306b1542440bbe10b586f6e3f83e4ef9cebf9034fbf7e39677be452170 +EBUILD HighFive-2.10.1.ebuild 1153 BLAKE2B c937de448fe71acaa6e803273fca36b38d93bf458a2047190582de9139c20a9b085373941c26a5cc91ec4eec7cdf6e4089e4f025f9ea788e8dccfbc5f97f358d SHA512 16fa5f956b190833a146845d7734fa70023150a3578e4b29e794d7d4121cf47d80b4a8a50e8437e3d3ff8850f117c48adea88a2923508fcd5572f0f2830fb0fa +EBUILD HighFive-2.8.0.ebuild 1152 BLAKE2B b16fea5958269705b39c64e96072d47e223c744390d64584e98deb69234e542e19db8278ac95b94f2f936d47aa70f36ee964e49e2dd970956342fea3b9eac963 SHA512 61fb4baf68c01766ab15ca10af3cb246f4266bff2f3a82e5620a05760f1580622c98297df61fc761ce1f937b1120b979fef230b2a2c3cfbe0e2fb2c15b69ffcb MISC metadata.xml 470 BLAKE2B 22d0ea29f74f9d6924646cda2d547c25f88c6716fb84ab590e2d5adb7eabe434bcbcc79c1b0842d7ea49bb2c7a189a5adead6e7d873df4fd07107cbe838af2a0 SHA512 4d625697c4edd55658d6353842e299ab0ed6a3552824bf871e5c9f75986842be50b54fafa3ec0b3b87ac799901951ec07987ed1bddf30678f7f00171a73f3fed diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex a13da0c0391d..2fd01b981c4d 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/XNNPACK/Manifest b/sci-libs/XNNPACK/Manifest index 1ae0bff2ac93..8e8598202c65 100644 --- a/sci-libs/XNNPACK/Manifest +++ b/sci-libs/XNNPACK/Manifest @@ -1,8 +1,7 @@ AUX XNNPACK-2022.02.17-gentoo.patch 434 BLAKE2B 23c3f9b2f368c827f9ee13da6bec050aeeb2caf7c9ff17bd1b3a4ece60f15d2e0cbfd2aab655d643e85dc0ee0b7514834d487bf1befa68331aee86ca51530e61 SHA512 38f42606a83d6fc8ee74c2ca547c9bdad9c4e38393efa22757716b76c7f527a4648f67828bb39b9e7cf044860b087fce174eea156dc8cd54907d3e863f264bdc -DIST XNNPACK-2022.02.17.tar.gz 6761154 BLAKE2B 59be5d9efe6f46d22bc41d3152e6cd3103f6dfafd94cdf3229b86ecf44a46175c613760f3de35c98a24ccdec1783f205c1eceaf21133706fedd5f384529748eb SHA512 aacbe907bb2b7429143f4ec612881fb709fe37e7b3a7f4fd68193dee6bbe82e17d20b2c6f5a8025845a09f8269c1dfeaebfc5bd64ef196fa376d82ac9a44cb8f -DIST XNNPACK-2022.12.22.tar.gz 8342018 BLAKE2B 50426a47121418ef00a29b390ab4bb28211c17faaa7f4eacbf3a363fc3511b8655687e7f7f93f13b06a72ff9bcbde033305372687b6f2df1e1d5abaa910fe8be SHA512 1742ad4de3aa1a67cd5a3cbf15d82afc2cc8569a2abac92542f748a440ef37fef4e9d9c302b7b2813e3176934b637c761c1c0956d20ab1ba28b280d9b121d91b +AUX XNNPACK-2024.11.08-gentoo.patch 1093 BLAKE2B 46cdae35701b235ac8d82078ac499c5bceb887ff91674eb7105d5f7a880828f30a800998073c7f4cd8e96d838b89dc847740383d09e5b77d76798d75dee2baff SHA512 7e4da685a071ff6ff503633eda8d36b71d5e3eacf642e805bfbdaa7df768462b9d3be2131433adb5c6dadd808dfc14f11576d105910544e7753a4b5c2ff00ba6 DIST XNNPACK-2024.02.29.tar.gz 11561561 BLAKE2B bb3666edbf2ad87f4b6ba9dcaf28b3ed056b655bfa02e6f9bc350ce84db247ef3e0a6f9f908a0e05244e4b145b6993d465cd19ca763067ae619a7f94b97dc7bd SHA512 8063e27686f7b71cfba05b0c004c46db4506638689ffb112f013b3886de58653b60ca5487978c3f96275c17bb1136883ca4c93ddb2241a2c31925a950cb51759 -EBUILD XNNPACK-2022.02.17-r1.ebuild 1759 BLAKE2B 843b810e0c954364d486a72be711e16e6c1f338ef601f36ff4910fadc95a5c90c1a5649cacc04d6005f2b37ebe9a53b416aafdf73d885d4ddfb2946a56cfb310 SHA512 4c4cfb0cd4640fa72979895384abf3c03a820cf6aa04d578be354cbe516227379b0b1f2142ea0fd4a7bab861226ded30b9b1e0fcfdf8f1cfc9f894b403f75006 -EBUILD XNNPACK-2022.12.22.ebuild 1829 BLAKE2B 6e60bad3f9846a1d0571d61c2b5ea9fdb3c587a02328c7491f2020200a9b0d6233856a76034f4782f6ba3eca928fb231679a58e5df8e29cf25e98db541366418 SHA512 9b1088dffd03929dbc0fb77a829afcf414647c7d69e668be5cf6a410b348e31b0fb2136bf827fd6305795cb0ef10b2b3c798387c21ea5d4e4545184994eb1eb9 +DIST XNNPACK-2024.11.08.tar.gz 8923022 BLAKE2B 1e73ffc1e5d1e1248272910860e59a471b52f207945f0049188d64b944e442fd2bc814105b2fef59e9ec295e9871cae0a805de485a047f9eacedcee2695d6e99 SHA512 b9e711e1c69a24e347f64ee21c60a609bff25e36153216382acd3d431e466b127eea81b1d80f00f84699a426c44f8a3566d9b95d0e87079c34f527e05c2db787 EBUILD XNNPACK-2024.02.29.ebuild 1795 BLAKE2B ec43589501b79d65b93c56b760df97d1ded9f0d1a518b8fd826464b99bda7d261dabd5411be89fe137e22b5dbee43f8e1fe6ef0fdd99355e0072f6464baf244c SHA512 2e246ec46623b82c1236ccde896a52cabf37a486026860bdf2a126b98ba7bcb8cc6d023d29bff05708d8eec1e88027c39966c601fe65c0b2a6cc0fee22dc0208 +EBUILD XNNPACK-2024.11.08.ebuild 1937 BLAKE2B e646b1b6342d889fdc66883f2cd8ab43d94035c324c42fb953a85877f9b1f1b5c900a8b5edb5a3c3694a7d95fc65b0a3f8c2a6888e88270cec597c0e385770f5 SHA512 ac6678c3079ff544387daa565639c345e771157d3c610a45b001ac7fa70f841b78be9b7955daf89d7a6365640c5551d4990e4fb96c8c0a45783cc692d465eab5 MISC metadata.xml 614 BLAKE2B 4f33a22a79f975aaf528ba53bf6e26aeb91af4244f7aac4259a61033c0841f2ea3c29a62c6a984429bf2a87b8e8173df7481079e3438e76d2d7050a31856501a SHA512 e55c7b603f37211338d1472796015a24ff2d034339461eb67411ed4d59202ed52a9e8d554de5cd72636e35875421f983dee12b7173056c806cd9541148ca0f71 diff --git a/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild b/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild deleted file mode 100644 index 6cf32190a7b0..000000000000 --- a/sci-libs/XNNPACK/XNNPACK-2022.02.17-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -CommitId=84b02ad55f089598aa42a557573dc4eb6f92f3ff - -DESCRIPTION="library of floating-point neural network inference operators" -HOMEPAGE="https://github.com/google/XNNPACK/" -SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz - -> ${P}.tar.gz" - -S="${WORKDIR}"/${PN}-${CommitId} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+assembly jit +memopt +sparse static-libs test" - -RDEPEND=" - dev-libs/cpuinfo - dev-libs/pthreadpool -" -DEPEND="${RDEPEND} - dev-libs/FP16 - dev-libs/FXdiv -" - -BDEPEND="test? ( dev-cpp/gtest )" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( static-libs )" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - sed -i \ - -e "/PRIVATE fp16)/d" \ - -e "/PRIVATE fxdiv)/d" \ - -e "/PRIVATE clog)/d" \ - -e "/TARGET_LINK_LIBRARIES/s: fp16::" \ - CMakeLists.txt \ - || die - dropTest=( - "add-nd-test" - "subtract-nd-test" - "f32-velu-test" - "qc8-dwconv-minmax-fp32-test" - "qs8-dwconv-minmax-fp32-test" - "qs8-vadd-minmax-test" - "qs8-vaddc-minmax-test" - "qu8-dwconv-minmax-fp32-test" - "qu8-vadd-minmax-test" - "qu8-vaddc-minmax-test" - ) - for id in ${dropTest[@]} - do - sed -i \ - -e "/ADD_TEST(${id}/d" \ - CMakeLists.txt \ - || die - done - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DXNNPACK_BUILD_BENCHMARKS=OFF - -DXNNPACK_USE_SYSTEM_LIBS=ON - -DXNNPACK_BUILD_TESTS=$(usex test ON OFF) - -DXNNPACK_LIBRARY_TYPE=$(usex static-libs static shared) - -DXNNPACK_ENABLE_ASSEMBLY=$(usex assembly ON OFF) - -DXNNPACK_ENABLE_JIT=$(usex jit ON OFF) - -DXNNPACK_ENABLE_MEMOPT=$(usex memopt ON OFF) - -DXNNPACK_ENABLE_SPARSE=$(usex sparse ON OFF) - ) - - cmake_src_configure -} diff --git a/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild b/sci-libs/XNNPACK/XNNPACK-2024.11.08.ebuild index 5fdc3ebf2dd9..ea77e1c773da 100644 --- a/sci-libs/XNNPACK/XNNPACK-2022.12.22.ebuild +++ b/sci-libs/XNNPACK/XNNPACK-2024.11.08.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake flag-o-matic -CommitId=51a987591a6fc9f0fc0707077f53d763ac132cbf +CommitId=4ea82e595b36106653175dcb04b2aa532660d0d8 DESCRIPTION="library of floating-point neural network inference operators" HOMEPAGE="https://github.com/google/XNNPACK/" @@ -19,7 +19,7 @@ KEYWORDS="~amd64" IUSE="+assembly jit +memopt +sparse static-libs test" RDEPEND=" - dev-libs/cpuinfo + >=dev-libs/cpuinfo-2023.11.04 dev-libs/pthreadpool " DEPEND="${RDEPEND} @@ -31,54 +31,56 @@ BDEPEND="test? ( dev-cpp/gtest )" RESTRICT="!test? ( test )" REQUIRED_USE="test? ( static-libs )" -PATCHES=( - "${FILESDIR}"/${PN}-2022.02.17-gentoo.patch -) +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { - sed -i \ - -e "/PRIVATE fp16)/d" \ - -e "/PRIVATE fxdiv)/d" \ - -e "/PRIVATE clog)/d" \ - -e "/TARGET_LINK_LIBRARIES/s: fp16::" \ - CMakeLists.txt \ - || die dropTest=( - "add-nd-test" - "subtract-nd-test" - "f32-velu-test" - "qc8-dwconv-minmax-fp32-test" - "qs8-dwconv-minmax-fp32-test" - "qs8-vadd-minmax-test" - "qs8-vaddc-minmax-test" - "qu8-dwconv-minmax-fp32-test" - "qu8-vadd-minmax-test" - "qu8-vaddc-minmax-test" + fully-connected-test + fully-connected-nc-test + subgraph-fp16-test + static-reshape-test + qd8-f16-qc8w-gemm-minmax-test + qd8-f32-qc8w-gemm-minmax-test + qd8-f16-qc4w-gemm-minmax-test + qd8-f32-qc4w-gemm-minmax-test + unary-elementwise-nc-test ) for id in ${dropTest[@]} do sed -i \ - -e "/ADD_TEST(${id}/d" \ + -e "/ADD_TEST(NAME ${id}/d" \ CMakeLists.txt \ || die done + sed -i \ + -e "/f32-vrsubc/d" \ + -e "/f16-vsqr/d" \ + -e "/f16-vlrelu/d" \ + -e "/f32-f16-vcvt/d" \ + CMakeLists.txt \ + || die cmake_src_prepare } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/933414 + # https://github.com/google/XNNPACK/issues/6806 + filter-lto + local mycmakeargs=( -DXNNPACK_BUILD_BENCHMARKS=OFF -DXNNPACK_USE_SYSTEM_LIBS=ON -DXNNPACK_BUILD_TESTS=$(usex test ON OFF) -DXNNPACK_LIBRARY_TYPE=$(usex static-libs static shared) -DXNNPACK_ENABLE_ASSEMBLY=$(usex assembly ON OFF) - -DXNNPACK_ENABLE_JIT=$(usex jit ON OFF) -DXNNPACK_ENABLE_MEMOPT=$(usex memopt ON OFF) -DXNNPACK_ENABLE_SPARSE=$(usex sparse ON OFF) -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DPTHREADPOOL_SOURCE_DIR=/usr + -DCPUINFO_SOURCE_DIR=/usr ) cmake_src_configure - cd "${BUILD_DIR}" } diff --git a/sci-libs/XNNPACK/files/XNNPACK-2024.11.08-gentoo.patch b/sci-libs/XNNPACK/files/XNNPACK-2024.11.08-gentoo.patch new file mode 100644 index 000000000000..a44708a2a88e --- /dev/null +++ b/sci-libs/XNNPACK/files/XNNPACK-2024.11.08-gentoo.patch @@ -0,0 +1,30 @@ +--- a/src/reference/unary-elementwise.cc 2025-02-19 21:58:14.973845984 +0100 ++++ b/src/reference/unary-elementwise.cc 2025-02-19 22:06:55.224576694 +0100 +@@ -127,6 +127,16 @@ + } + }; + ++#ifdef XNN_HAVE_FLOAT16 ++template <> ++struct ConvertOp<xnn_bfloat16, _Float16> { ++ explicit ConvertOp(const xnn_unary_uparams*) {} ++ _Float16 operator()(xnn_bfloat16 x) const { ++ return static_cast<_Float16>(static_cast<float>(x)); ++ } ++}; ++#endif ++ + template <typename TIn, typename TOut> + const xnn_unary_elementwise_config* get_convert_config( + std::true_type /*input_quantized*/, std::true_type /*output_quantized*/) { +--- a/src/xnnpack/requantization.h 2025-02-19 22:36:23.417900964 +0100 ++++ b/src/xnnpack/requantization.h 2025-02-19 22:37:06.910367395 +0100 +@@ -121,7 +121,7 @@ + uint8_t zero_point, + uint8_t min, uint8_t max) { + assert(scale < 256.0f); +- assert(scale >= 0x1.0p-32f); ++ assert(scale >= 1.0f / 4294967296.0f /* 0x1.0p-32f */); + + struct ExpMul f32 = parse_f32(scale); + diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 45c169a56210..7f730d45426e 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,6 +1,8 @@ AUX armadillo-12.0.1-extratests.patch 743 BLAKE2B bd8bf0a2fd9ec52875804b92a86f2fe8a24e92008208071cd65bd78eb6fe92aac7add687be9455f276f8fd84f50208e2b6846f8c40cd521dd18e623284af94dd SHA512 de804fc620454ba41b859b4cc90583f25e82670f4f9c49dab27ac803529e024293e6254824eadafeb0b9c13a90696b9717aea338a672101c123e1f88493da113 DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195 DIST armadillo-12.8.2.tar.xz 6996368 BLAKE2B 63876486dcd72359b243a2ae217de751a9033c7f3e6c8599ba195b52fb493dbc4b6ec7f804916d40cef0c726d3ad42752a5cfb6fd3919935cbdf20e59488e474 SHA512 33bfe6f1fae2ef18ec3286742264dedd67730e47b5187568cb2fbe951286a5a8534a4b577894cc44415887241a46afb25b3fcf2b249ef15f9b71045e98fd0132 +DIST armadillo-14.2.3.tar.xz 7191700 BLAKE2B 5e5ba6d65cdc6638de78d7e1f7e5415e1ec345c37e193ff0d999c9c529a514e80b0edace15aad3f3a4467e006127245691c70709726852fc6f495614cc113d21 SHA512 2de9404eae45aa8c919f999202b70dd47b605431cce32da0647f444fbc8ee9f4e3714753d142afc31dfb5dbb27b774dc349390803eb344b9d910eb11ecc8956d EBUILD armadillo-12.4.0-r1.ebuild 3294 BLAKE2B ce1fc43065ec5fefd359aa10d1200e8a6cd3eaa8a638338f6e1a2c663968a2d40af7f185bffd591331c2609527b56466626cdccb8f2439a469163ef159691cb9 SHA512 7e73bad5eb4eb99c6eb0c69c78ed0a8fe5c58655213fab4c418c77261840086418b44f2b1a0c663070e3b8e1f7e7291c887ea5a2d77ad77ad7fa90f14bdceeb9 EBUILD armadillo-12.8.2.ebuild 3296 BLAKE2B e161d17708dd03a41aca4003d0af3e258c455315d462cb0d0b598613b1821f8cae38e944bf8b824a49341d00dd8305500f7a676c237a12bd7c1e0eab39fb5f3a SHA512 bdd184b59a8e506620ca9ab359e6f02d09948120a88bf3243264f78679963df6f6917d0c0877408a4ceae9014994da6732d88b3f668070a32667413f7d27cc74 +EBUILD armadillo-14.2.3.ebuild 3238 BLAKE2B e266f6c8c400a5fa185c0b8b28a6a1a944840087ed65045a04cb740e6fb47f07f41e52f237f3de003aef0c4cba1ea690b8133d528ae328d626e15252e409b279 SHA512 cc58f0322244f4d332e7f4c6bd0941e9014a424d3aefb5a94e3543c17afeadf4f97585c09d413f73478cc17d8dbd0637ca6f97f06601eca23a5d0936b6e0857f MISC metadata.xml 1525 BLAKE2B 3d1af2e67d98a9597d1b5dc6e49693a9712cb7c2d6712ae8e54635cd729504496dd65082528a5132907493a41b06be7bb83b93d3145831b978a315baef5b0a58 SHA512 2731e9bdc333b5d2867083f163dbcc54670a3a35ab1643fb63fa52732ed7fe5d4511330c5242eafd4f5bc111050482c836ce653ebc55d2c688f4cae5d29efa93 diff --git a/sci-libs/armadillo/armadillo-14.2.3.ebuild b/sci-libs/armadillo/armadillo-14.2.3.ebuild new file mode 100644 index 000000000000..086611447076 --- /dev/null +++ b/sci-libs/armadillo/armadillo-14.2.3.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs multilib + +DESCRIPTION="Streamlined C++ linear algebra library" +HOMEPAGE="https://arma.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/arma/${P}.tar.xz" + +LICENSE="Apache-2.0" +SLOT="0/14" +KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="arpack blas doc examples lapack mkl superlu test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( arpack lapack superlu )" + +# atlas? ( sci-libs/atlas[lapack] ) +RDEPEND=" + dev-libs/boost + arpack? ( sci-libs/arpack ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack ) + mkl? ( sci-libs/mkl ) + superlu? ( >=sci-libs/superlu-5.2 ) +" +DEPEND="${RDEPEND} + arpack? ( virtual/pkgconfig ) + blas? ( virtual/pkgconfig ) + lapack? ( virtual/pkgconfig ) +" + +src_prepare() { + # avoid the automagic cmake macros... + sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die + + # ... except for mkl, since without a license it's hard to figure out what to do there + if use mkl; then + sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + ) + if use arpack; then + mycmakeargs+=( + -DARPACK_FOUND=ON + -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" + ) + else + mycmakeargs+=( + -DARPACK_FOUND=OFF + ) + fi +# if use atlas; then +# local c=atlas-cblas l=atlas-clapack +# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads +# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads +# mycmakeargs+=( +# -DCBLAS_FOUND=ON +# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" +# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" +# -DCLAPACK_FOUND=ON +# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" +# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" +# ) +# fi + if use blas; then + mycmakeargs+=( + -DBLAS_FOUND=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + ) + else + mycmakeargs+=( + -DBLAS_FOUND=OFF + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + else + mycmakeargs+=( + -DLAPACK_FOUND=OFF + ) + fi + if use superlu; then + mycmakeargs+=( + -DSuperLU_FOUND=ON + -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" + -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" + ) + else + mycmakeargs+=( + -DSuperLU_FOUND=OFF + ) + fi + + cmake_src_configure +} + +src_test() { + cmake_src_test || die + + pushd tests2 > /dev/null + emake \ + CXX="$(tc-getCXX)" \ + CXX_FLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ + LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" + LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./main || die + emake clean + popd > /dev/null +} + +src_install() { + cmake_src_install + + dodoc README.md + use doc && dodoc *pdf *html + + if use examples; then + docinto examples + dodoc -r examples/* + docompress -x /usr/share/doc/${PF}/examples + fi +} diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 637ff46d96cb..573a9f8b161c 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -7,11 +7,12 @@ AUX caffe2-2.5.1-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8f AUX caffe2-2.5.1-newfix-functorch-install.patch 441 BLAKE2B 0caa9e43432aecba83e3ae1cc2974d8eeb9262c8547bd1a72b0651b80a5057adb0d2bbbd2f77b773fe1036bd933dadb9f4a40e886e363f5d0a961ace69e6d16a SHA512 b8b9262db9e76768e8a114857d9bfcae67528568b5e3b90a0330dc246329439da56600689a289e9bb8aee06bd5a9708bdc2b49f79abc139aaec2778b6d68458b AUX caffe2-2.5.1-unbundle_fmt.patch 499 BLAKE2B 06550f8e7ae3a932a585f8abe7653ac0b574d9ce1160c190a39f96b7d76e3a9e7a4e62b9e5e967e5884d0e38668f60af7737ea3c715d718deb7a634de98ccebd SHA512 afcb5f1123cbe5eeebdb2c5e312e37956dbc33a926cf379f531896f2c75fbb4b4dfa2c9d276a98bbad51bc587886bb572c3221be06e5116443c8ab44e1d12da5 AUX caffe2-2.5.1-unbundle_kineto.patch 830 BLAKE2B 80c9ebc30d0ca3b964141a5d9a7cb3662e6dc8472454ceabc2725f47277211cd495c4146dc9c2046cc5c5505909cf4e30c780685fceebdb05319aba5c4366346 SHA512 9645b11b5395f7a4626f17edae22c718c73d2e2f3de56e98653932a3c66f417942d54fd1dadc99112337c11513ac707a96d0caac4bf3d100db8f7079609b9b68 +AUX caffe2-2.6.0-gentoo.patch 6698 BLAKE2B 58c46bedcc71ef25ab3e70efbea98e2cd4f5c068deb289ae95ba985745edcacb258bcf5cf093f44ff60606b3f6dcd1f75c9463ee225dec5e79675d0f78196e05 SHA512 b835e24e903f4d4aeaa4c1c8611bdd3896e36631c163da4154201676d7c5236e6eb7d80e0f81700f47b5f5859ced4c7ec0bdfbef6646c6ccc0f982f0d893fe14 DIST caffe2-patches-20240809.tar.gz 15242 BLAKE2B 77503c61487e7d85cca5afcab9a6e638f9833a70861845638cf1b62bc492d7b6650e6db81d53ebb2f39c6313509250d339f725f04d03ec6dd23dd0cf70843d8c SHA512 74b3b0b6671b655ecac93f7436c4ed7cb0157a83aafbf6afcc0811e11cef341cd8f638db1a111bcbb01e1a6dd4daf3a36b96d7a8ce90f04c2fa091bd6e3a142b -DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22 DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289 -EBUILD caffe2-2.4.0-r1.ebuild 8334 BLAKE2B d867632884fad33fb7c19344574ce30e70651474650b2f5a6e79576a7338e501989bc4628c1a04f2b2ebf3a611226df68892abdabf856ab74e67df85db74a9f0 SHA512 52e8c0e3535a1a8b90cce9143f4ff8da398de9119d2f23ffeeb0a419dadc29dae68f5e993b1a854066f63ed4809a41a98f098447e318252ff316e70fc6498b32 +DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0 EBUILD caffe2-2.4.1-r4.ebuild 8557 BLAKE2B 2cefd7d0c818fb431b3eb6bc2be0a1b225790271b1108169256f8dccac99707fac3d36dc98b7e19a688c66053627d0a222d67e7f65eb6a600ed251677df5490a SHA512 ded17bc1e912f4691bfeee75c66676d331d03c21fe9c9c7416c874ef435e624bdc6109c128f0b5dbe9a5a5be81e648767c6020cd570b94e74f47061e5839f9b3 -EBUILD caffe2-2.5.1-r7.ebuild 8710 BLAKE2B 425e59df62e884643f9ea7024f942b6fd42948d4fb9d8e446dbba3c920d6f8efad2e78bd7a7ff54c04b08483dcb00572596a848f36d22dbdb0e1c6723e05cfec SHA512 3f056ebc8db1501e210f96a075286b788916de89099b3f2ded0e124220848dc6268ba5f1702e81b0c373f944ec53e0494ce862940b0bfa76925ef7ef55d8b678 +EBUILD caffe2-2.5.1-r8.ebuild 8709 BLAKE2B bc51fd52e4cc86d50c1793a592bb1b5a38466f0332c7c9c0010eb051e42db694049237fe9b5dabdfa6f179437708a3cca7cc45fe79991828044698484cdfc237 SHA512 9576827a35e5b380b7142dd8cb7ffe4a85aa30693011425c999790919865e541eac41fd481337019af584b07e21397e0095f576197185940c59a054cfa5ef216 +EBUILD caffe2-2.6.0.ebuild 8745 BLAKE2B 0880979760a4c2ea297bdad4a130bbe706dc74780ddada5d93a78f9fd51634e2fe745caf8ef395e2fb223b1c0de4c647669bab727de7482ad1f80817f7f0c771 SHA512 e93d9a21d7ac83e97e934d3b91c9f62fffbea3eb19ae26a154d9375853a567d0cf7f98f5586b01784bef9f9356c6ec00f4904c14e42d6b7e60b361ae5d3c68eb MISC metadata.xml 1081 BLAKE2B 57800165612fd555263cab4cf0bb0521acd7d41f0023da501a50ccc5a479d25ad7087661a6eec500333c3cf9cc3a85d7be8e9385869c14d92f351d8d9df68556 SHA512 71cc785a5b1688b6a0ac971d31d5fa85bef86966aa80009c34e97caa385c81a7c2fb64ae34d0a39c21548d8238efd008da24bd838a47886bfa3f0d952246b76e diff --git a/sci-libs/caffe2/caffe2-2.5.1-r7.ebuild b/sci-libs/caffe2/caffe2-2.5.1-r8.ebuild index 85a3c940b097..0e476ce00275 100644 --- a/sci-libs/caffe2/caffe2-2.5.1-r7.ebuild +++ b/sci-libs/caffe2/caffe2-2.5.1-r8.ebuild @@ -90,7 +90,7 @@ RDEPEND=" sci-libs/tensorpipe[cuda?] dev-cpp/cpp-httplib ) - xnnpack? ( >=sci-libs/XNNPACK-2024.02.29 ) + xnnpack? ( ~sci-libs/XNNPACK-2024.02.29 ) mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) " diff --git a/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild b/sci-libs/caffe2/caffe2-2.6.0.ebuild index c705aa0bac11..56dbe5d03370 100644 --- a/sci-libs/caffe2/caffe2-2.4.0-r1.ebuild +++ b/sci-libs/caffe2/caffe2-2.6.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) ROCM_VERSION=6.1 inherit python-single-r1 cmake cuda flag-o-matic prefix rocm toolchain-funcs @@ -13,8 +13,7 @@ MYP=${MYPN}-${PV} DESCRIPTION="A deep learning framework" HOMEPAGE="https://pytorch.org/" SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz - -> ${MYP}.tar.gz - https://dev.gentoo.org/~tupone/distfiles/${PN}-patches-20240809.tar.gz" + -> ${MYP}.tar.gz" S="${WORKDIR}"/${MYP} @@ -34,14 +33,15 @@ REQUIRED_USE=" ) " -# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 RDEPEND=" ${PYTHON_DEPS} + dev-cpp/abseil-cpp:= dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 + dev-cpp/nlohmann_json + dev-cpp/opentelemetry-cpp dev-libs/cpuinfo dev-libs/libfmt - dev-cpp/opentelemetry-cpp dev-libs/protobuf:= dev-libs/pthreadpool dev-libs/sleef @@ -51,7 +51,7 @@ RDEPEND=" cuda? ( dev-libs/cudnn >=dev-libs/cudnn-frontend-1.0.3:0/8 - <dev-util/nvidia-cuda-toolkit-12.4.0:=[profiler] + dev-util/nvidia-cuda-toolkit:=[profiler] ) fbgemm? ( >=dev-libs/FBGEMM-2023.12.01 ) gloo? ( sci-libs/gloo[cuda?] ) @@ -60,7 +60,7 @@ RDEPEND=" numpy? ( $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] ') ) - onednn? ( dev-libs/oneDNN ) + onednn? ( =dev-libs/oneDNN-3.5* ) opencl? ( virtual/opencl ) qnnpack? ( !sci-libs/QNNPACK @@ -94,8 +94,10 @@ RDEPEND=" mkl? ( sci-libs/mkl ) openblas? ( sci-libs/openblas ) " + DEPEND=" ${RDEPEND} + qnnpack? ( dev-libs/clog ) cuda? ( <=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd @@ -112,33 +114,47 @@ DEPEND=" " PATCHES=( - ../patches/${PN}-2.4.0-gentoo.patch - ../patches/${PN}-2.4.0-install-dirs.patch - ../patches/${PN}-1.12.0-glog-0.6.0.patch - ../patches/${PN}-1.13.1-tensorpipe.patch - ../patches/${PN}-2.3.0-cudnn_include_fix.patch - ../patches/${PN}-2.1.2-fix-rpath.patch - ../patches/${PN}-2.4.0-fix-openmp-link.patch - ../patches/${PN}-2.4.0-rocm-fix-std-cpp17.patch - ../patches/${PN}-2.2.2-musl.patch - ../patches/${PN}-2.4.0-exclude-aotriton.patch - ../patches/${PN}-2.3.0-fix-rocm-gcc14-clamp.patch - ../patches/${PN}-2.3.0-fix-libcpp.patch - "${FILESDIR}"/${PN}-2.4.0-libfmt-11.patch - "${FILESDIR}"/${P}-cpp-httplib.patch - "${FILESDIR}"/${P}-cstdint.patch + "${FILESDIR}"/${PN}-2.5.1-unbundle_fmt.patch + "${FILESDIR}"/${PN}-2.5.1-unbundle_kineto.patch + "${FILESDIR}"/${PN}-2.5.1-cudnn_include_fix.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-2.4.0-cpp-httplib.patch + "${FILESDIR}"/${PN}-2.5.1-glog-0.6.0.patch + "${FILESDIR}"/${PN}-2.5.1-newfix-functorch-install.patch ) src_prepare() { filter-lto #bug 862672 + + # Unbundle fmt + sed -i \ + -e 's|::fmt-header-only||' \ + c10/CMakeLists.txt \ + cmake/Dependencies.cmake \ + torch/CMakeLists.txt \ + || die + + # Drop third_party from CMake tree sed -i \ - -e "/third_party\/gloo/d" \ + -e '/add_subdirectory.*third_party/d' \ + CMakeLists.txt \ cmake/Dependencies.cmake \ + cmake/ProtoBuf.cmake \ + aten/src/ATen/CMakeLists.txt \ + || die + # Change libc10* path + sed -i \ + -e "/EXPORT/s|DESTINATION lib)|DESTINATION $(get_libdir))|" \ + c10/cuda/CMakeLists.txt \ + c10/CMakeLists.txt \ + c10/hip/CMakeLists.txt \ || die + cmake_src_prepare pushd torch/csrc/jit/serialization || die flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die popd + # prefixify the hardcoded paths, after all patches are applied hprefixify \ aten/CMakeLists.txt \ @@ -182,50 +198,51 @@ src_configure() { local mycmakeargs=( -DBUILD_CUSTOM_PROTOBUF=OFF - -DBUILD_SHARED_LIBS=ON - + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + -DPython_EXECUTABLE="${PYTHON}" + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) -DUSE_CCACHE=OFF -DUSE_CUDA=$(usex cuda) -DUSE_DISTRIBUTED=$(usex distributed) - -DUSE_MPI=$(usex mpi) -DUSE_FAKELOWP=OFF -DUSE_FBGEMM=$(usex fbgemm) -DUSE_FLASH_ATTENTION=$(usex flash) - -DUSE_MEM_EFF_ATTENTION=OFF -DUSE_GFLAGS=ON -DUSE_GLOG=ON -DUSE_GLOO=$(usex gloo) + -DUSE_ITT=OFF -DUSE_KINETO=OFF # TODO -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MEM_EFF_ATTENTION=OFF -DUSE_MKLDNN=$(usex onednn) + -DUSE_MPI=$(usex mpi) + -DUSE_NCCL=OFF -DUSE_NNPACK=$(usex nnpack) - -DUSE_XNNPACK=$(usex xnnpack) - -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) - -DUSE_TENSORPIPE=$(usex distributed) - -DUSE_PYTORCH_QNNPACK=$(usex qnnpack) + -DUSE_NUMA=OFF -DUSE_NUMPY=$(usex numpy) -DUSE_OPENCL=$(usex opencl) -DUSE_OPENMP=$(usex openmp) + -DUSE_PYTORCH_QNNPACK=$(usex qnnpack) + -DUSE_PYTORCH_METAL=OFF -DUSE_ROCM=$(usex rocm) -DUSE_SYSTEM_CPUINFO=ON - -DUSE_SYSTEM_PYBIND11=ON - -DUSE_UCC=OFF - -DUSE_VALGRIND=OFF - -DPython_EXECUTABLE="${PYTHON}" - -DUSE_ITT=OFF - -DUSE_SYSTEM_PTHREADPOOL=ON - -DUSE_SYSTEM_PSIMD=ON - -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_EIGEN_INSTALL=ON -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_FXDIV=ON -DUSE_SYSTEM_GLOO=ON -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_PSIMD=ON + -DUSE_SYSTEM_PSIMD=ON + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_PYBIND11=ON -DUSE_SYSTEM_SLEEF=ON - -DUSE_PYTORCH_METAL=OFF + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_TENSORPIPE=$(usex distributed) + -DUSE_UCC=OFF + -DUSE_VALGRIND=OFF + -DUSE_XNNPACK=$(usex xnnpack) -DUSE_XPU=OFF - -Wno-dev - -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) - -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) ) if use mkl; then @@ -266,7 +283,6 @@ src_configure() { if use onednn; then mycmakeargs+=( - -DUSE_MKLDNN=ON -DMKLDNN_FOUND=ON -DMKLDNN_LIBRARIES=dnnl -DMKLDNN_INCLUDE_DIR="${ESYSROOT}/usr/include/oneapi/dnnl" @@ -274,23 +290,37 @@ src_configure() { fi cmake_src_configure +} - # do not rerun cmake and the build process in src_install - sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die +src_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + cmake_src_compile } src_install() { cmake_src_install + # Used by pytorch ebuild insinto "/var/lib/${PN}" doins "${BUILD_DIR}"/CMakeCache.txt + dostrip -x /var/lib/${PN}/functorch.so rm -rf python - mkdir -p python/torch/include || die - mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die + mkdir -p python/torch || die cp torch/version.py python/torch/ || die - python_domodule python/caffe2 python_domodule python/torch + + mkdir "${D}"$(python_get_sitedir)/torch/bin || die + mkdir "${D}"$(python_get_sitedir)/torch/lib || die + mkdir "${D}"$(python_get_sitedir)/torch/include || die + ln -s ../../../../../include/torch \ "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269 + + mv "${D}"/usr/bin/torch_shm_manager \ + "${D}"/$(python_get_sitedir)/torch/bin/ || die + + mv "${D}"/usr/$(get_libdir)/libtorch_global_deps.so \ + "${D}"/$(python_get_sitedir)/torch/lib/ || die } diff --git a/sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch new file mode 100644 index 000000000000..0464c06ad376 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.6.0-gentoo.patch @@ -0,0 +1,156 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -984,12 +984,11 @@ endif() + # third_party/FBGEMM + include(cmake/public/utils.cmake) + if(NOT MSVC) +- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") ++ string(APPEND CMAKE_CXX_FLAGS " -O2") + # Eigen fails to build with some versions, so convert this to a warning + # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 + string(APPEND CMAKE_CXX_FLAGS " -Wall") + string(APPEND CMAKE_CXX_FLAGS " -Wextra") +- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS) +@@ -1091,7 +1091,6 @@ + endif() + append_cxx_flag_if_supported("-fno-math-errno" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-fno-trapping-math" CMAKE_CXX_FLAGS) +- append_cxx_flag_if_supported("-Werror=format" CMAKE_CXX_FLAGS) + if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13) + append_cxx_flag_if_supported("-Wno-error=dangling-reference" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Wno-error=redundant-move" CMAKE_CXX_FLAGS) +--- a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt ++++ b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt +@@ -323,16 +323,8 @@ set_target_properties(pytorch_qnnpack PROPERTIES PUBLIC_HEADER include/pytorch_q + set_target_properties(pytorch_qnnpack PROPERTIES PUBLIC_HEADER include/qnnpack_func.h) + + # ---[ Configure clog +-if(NOT TARGET clog) +- set(CLOG_BUILD_TESTS OFF CACHE BOOL "") +- set(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "") +- add_subdirectory( +- "${CLOG_SOURCE_DIR}" +- "${CONFU_DEPENDENCIES_BINARY_DIR}/clog") +- # We build static version of clog but a dynamic library may indirectly depend on it +- set_property(TARGET clog PROPERTY POSITION_INDEPENDENT_CODE ON) +-endif() +-target_link_libraries(pytorch_qnnpack PUBLIC clog) ++find_library(CLOG_LIBRARY NAMES clog REQUIRED) ++target_link_libraries(pytorch_qnnpack PUBLIC ${CLOG_LIBRARY}) + + # ---[ Configure cpuinfo + if(NOT TARGET cpuinfo AND USE_SYSTEM_CPUINFO) +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -87,7 +87,7 @@ endif() + # Note: the folders that are being commented out have not been properly + # addressed yet. + +-if(NOT MSVC AND USE_XNNPACK) ++if(FALSE) + if(NOT TARGET fxdiv) + set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") +@@ -1130,7 +1130,6 @@ if(USE_XPU) + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +--- a/cmake/Codegen.cmake ++++ b/cmake/Codegen.cmake +@@ -64,7 +64,7 @@ if(INTERN_BUILD_ATEN_OPS) + if(MSVC) + set(OPT_FLAG "/fp:strict ") + else(MSVC) +- set(OPT_FLAG "-O3 ") ++ set(OPT_FLAG " ") + if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") + set(OPT_FLAG " ") + endif() +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -467,7 +467,9 @@ + set_property(TARGET pytorch_qnnpack PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET cpuinfo PROPERTY POSITION_INDEPENDENT_CODE ON) + # QNNPACK depends on gemmlowp headers +- target_include_directories(pytorch_qnnpack PRIVATE "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") ++ find_package(gemmlowp REQUIRED) ++ get_target_property(GEMMLOWP_INCLUDE_DIRS gemmlowp::gemmlowp INTERFACE_INCLUDE_DIRECTORIES) ++ target_include_directories(pytorch_qnnpack PRIVATE ${GEMMLOWP_INCLUDE_DIRS}) + endif() + + list(APPEND Caffe2_DEPENDENCY_LIBS pytorch_qnnpack) +@@ -556,7 +556,7 @@ + find_library(microkernels-prod_LIBRARY microkernels-prod) + set_property(TARGET XNNPACK PROPERTY IMPORTED_LOCATION "${XNNPACK_LIBRARY}") + set_property(TARGET microkernels-prod PROPERTY IMPORTED_LOCATION "${microkernels-prod_LIBRARY}") +- if(NOT XNNPACK_LIBRARY or NOT microkernels-prod_LIBRARY) ++ if(FALSE) + message(FATAL_ERROR "Cannot find XNNPACK") + endif() + message("-- Found XNNPACK: ${XNNPACK_LIBRARY}") +@@ -693,7 +695,7 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) + endif() + + # ---[ FBGEMM +-if(USE_FBGEMM) ++if(FALSE) + set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") + if(NOT DEFINED FBGEMM_SOURCE_DIR) + set(FBGEMM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/fbgemm" CACHE STRING "FBGEMM source directory") +@@ -745,6 +747,7 @@ if(USE_FBGEMM) + endif() + + if(USE_FBGEMM) ++ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) + caffe2_update_option(USE_FBGEMM ON) + else() + caffe2_update_option(USE_FBGEMM OFF) +--- a/cmake/External/nnpack.cmake ++++ b/cmake/External/nnpack.cmake +@@ -56,7 +56,7 @@ + set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory") + set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory") + +- if(NOT TARGET nnpack) ++ if(FALSE) + set(NNPACK_BUILD_TESTS OFF CACHE BOOL "") + set(NNPACK_BUILD_BENCHMARKS OFF CACHE BOOL "") + set(NNPACK_LIBRARY_TYPE "static" CACHE STRING "") +--- a/cmake/public/utils.cmake ++++ b/cmake/public/utils.cmake +@@ -422,8 +422,6 @@ function(torch_compile_options libname) + endif() + + # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) +- target_compile_options(${libname} PRIVATE +- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>>:-O2>) + + endfunction() + +--- a/aten/src/ATen/CMakeLists.txt 2025-02-27 14:23:02.402742165 +0100 ++++ b/aten/src/ATen/CMakeLists.txt 2025-02-27 14:23:40.445850718 +0100 +@@ -269,8 +269,6 @@ + if(USE_CUDA) + list(APPEND ATen_CUDA_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cuda) + # Next two lines are needed because TunableOp uses third-party/fmt +- list(APPEND ATen_CUDA_INCLUDE $<TARGET_PROPERTY:fmt::fmt-header-only,INTERFACE_INCLUDE_DIRECTORIES>) +- list(APPEND ATen_CUDA_DEPENDENCY_LIBS fmt::fmt-header-only) + list(APPEND ATen_CUDA_CU_SRCS + ${cuda_cu} + ${native_cuda_cu} +@@ -315,8 +313,6 @@ + list(APPEND ATen_HIP_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/include) + list(APPEND ATen_HIP_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/composable_kernel/library/include) + # Next two lines are needed because TunableOp uses third-party/fmt +- list(APPEND ATen_HIP_INCLUDE $<TARGET_PROPERTY:fmt::fmt-header-only,INTERFACE_INCLUDE_DIRECTORIES>) +- list(APPEND ATen_HIP_DEPENDENCY_LIBS fmt::fmt-header-only) + list(APPEND ATen_HIP_SRCS + ${ATen_HIP_SRCS} + ${hip_hip} diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest index 6e7b2e8f262f..fdd3b5140aef 100644 --- a/sci-libs/cantera/Manifest +++ b/sci-libs/cantera/Manifest @@ -1,7 +1,11 @@ AUX cantera-3.0.0_env.patch 1439 BLAKE2B 8f4cd901f24f0b526887501ba16a0552acf8572f154f8494d66d3dd8096434621d6f2baaa57f905233919fc1b7872993bada9f373950330663c8315075d507b9 SHA512 065cdbcf620a3036c1bb0bb8b79503f76dbe7e6b2522e9f53fc582c15e5e10f1790f1b40cf0315d64cab4f858764446f4094370124bb9b5c4ee6dbcfd5e61b87 AUX cantera-3.0.1_add_fmt11_support.patch 1465 BLAKE2B 42130ee99361fab47f3fd41e3bec8f4994f503daffee1a6ecbb0dfd75cce2429c6020061ec27eda5078ff67e4613d95b635c4bfc1a39fc76a2c8abed096f0251 SHA512 dd929eaf899564f8d06263b45eec1ec33245090c2c5a5128098ab2b9ec35eaa36f5025cce1726ceede0e35a8f9cca3fe279199ac083473d0ee2c72e8e63a864c AUX cantera-3.0.1_fix_fmt_with_c++20.patch 13515 BLAKE2B e32655074dc2780ad765d96f297957c54ced57279b6f1b90e968b408b628cb46f688a21720f0738fbaef815ab72e0f04ecc359a5dfe1c236b7569026f8b7ada4 SHA512 7ca318959f86be4436d9923bc7611fb0b0f17ebeaea1c919df2282858ba2a51946cbb7dfcfc3a9ab5098d15fac0a9bc0169b20f9072cbc0177d81898a8037941 +AUX cantera-3.1.0_env.patch 1460 BLAKE2B 55eebc16f0ecd8874ef22d320881af307217c17fc5c76a755db1c0daec111c857a583a109a70d644c2fb6b4a499609fa07f4b48ccf5cc4b5419c7962d84aa3be SHA512 8d7a6c332ef0bc6ed2491235cb5d53362c3f278695200e9218fc4060e166d1d9d4c7f15f4378c745c5b84ca731142a90f8963cd870a85802a3da35a96c390610 DIST cantera-3.0.1.tar.gz 2451841 BLAKE2B b05771021a81d5266dfed382e2a6357e5b70653c6d9cfb5f03a6755095f4f8f4e7c0f78b79e0bf131c01fefce46bbc647c790ee412b6457c515cda39d4fc3054 SHA512 fa993b33867c6c0a0ca539f52116c4cdea739dfcd30deb5d2f66042f290f7f2f60112d7a37c38fbd8a38a119e5af00a7a85fd80b6e36388202b666be0ddd7715 +DIST cantera-3.1.0.tar.gz 2605640 BLAKE2B 6912b4e6b96ff71f02484a8fa051f8d34d0fc24c933e08e129531c6fe10e80fea74fcf6a6f7b00736de7b6ed5d4ab483f37a51b532d9bf154646546a8856e2a2 SHA512 0400a01ed0e244e6a34c9c04ffd5174ce6632c713c9bf003ab96e22b6f5a62713ee6a7eb07d7ae614e9f4e303e17df7fd234d66a48e43e46ede0246bb2bac52b +DIST cantera-3.1.0_example_data.tar.gz 244545 BLAKE2B c341a7d530ad2486660b1dfe870f6ddd49280101bc7e98d3a88dea3aaaab0ae6c25383746f688164a04385a462a513f706d0ee248a675806de22df467d4f074f SHA512 a6171a106460f8b7a84bf825db38826444c30f921ba27896a50e1b52177550deaa5f66e11f6f91a2b91c4023e3dfb55b46233d2b6176afa771154dd81f8b34ab EBUILD cantera-3.0.1-r1.ebuild 3416 BLAKE2B 67c638a33afe183ed672426bb38b8a91128ea8e6910fa39c0df986bfcb0842ac9f2f209f4bfb350f7cd40de6d88314b51d22e980a9fd38003783fefebca8b0a0 SHA512 53cec4ecb207e97faa92e204dea3a180c65b23aec570b5b261c0bc753900954165c4c5cb98ee973629e1332a407d9a3d3b616ddacd34c4aa7f29e498df7671d2 EBUILD cantera-3.0.1-r2.ebuild 3502 BLAKE2B d05ab5655059653d2f6db34b82dcac637adb29ca57426c96b810ffa2269f4a861a6270a8c29545ea5def545fc8f794e31a10e450b8a93d36a08ff6f4a8c02613 SHA512 daa644d36c411ae0ed67e9de1f5373bb7432d2b3aac10da51051f61fc60be3ce36c96689fc55077b47404cf09b2b47cbc5143607a61405a465807aef27769ab7 +EBUILD cantera-3.1.0.ebuild 3629 BLAKE2B 26e11bd8bf710df1a586b85739be43d59431f739a9ab437e5fcac7a211941a6685aece319901dd824f0c6c4ea2b611ff35dbf17872e3fb51ca1aea3c47d88330 SHA512 56c00d5d55538464fce7c39a278ce5d31457aaa5912f022cf7d3e9cc2a83dd6c56f7995bb7659af1c9e854e8a24eaae6cd6663dafc750d2c03a6c1d8f7de52e2 MISC metadata.xml 884 BLAKE2B 0f67510f6c09c58b0af3b820c9b38b88b0c60b0adb28c64148550f07df085cd8ea3d46f5afb59105c56bb7ccf2ca3fee4f2000bee2592ebafb835b9cf415b660 SHA512 0cdbc4cbd0dfdc90bb74c79f06d5f5d28a4edd0dcfacbddcc83ed804c592694eba27f337ce20a2a57248dd0456517bab2298faa22b78154f03e9369973fc174b diff --git a/sci-libs/cantera/cantera-3.1.0.ebuild b/sci-libs/cantera/cantera-3.1.0.ebuild new file mode 100644 index 000000000000..2f918ec6b1b6 --- /dev/null +++ b/sci-libs/cantera/cantera-3.1.0.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD="77 90" + +inherit flag-o-matic fortran-2 python-single-r1 scons-utils toolchain-funcs + +DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport" +HOMEPAGE="https://www.cantera.org" +SRC_URI=" + https://github.com/Cantera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/Cantera/cantera-example-data/archive/refs/tags/v${PV}.tar.gz -> ${P}_example_data.tar.gz +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="fortran hdf5 lapack +python test" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} +" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/yaml-cpp + hdf5? ( sci-libs/HighFive ) + !lapack? ( sci-libs/sundials:0= ) + lapack? ( + >=sci-libs/sundials-6.5.0:0=[lapack?] + virtual/lapack + ) + python? ( + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/ruamel-yaml[${PYTHON_USEDEP}] + ') + ) +" + +DEPEND=" + ${RDEPEND} + dev-cpp/eigen:3 + dev-libs/boost:= + dev-libs/libfmt + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ') + ) + test? ( + >=dev-cpp/gtest-1.11.0 + python? ( + $(python_gen_cond_dep ' + dev-python/h5py[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + ') + ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.1.0_env.patch" +) + +src_unpack() { + default + mv -T "${WORKDIR}/${PN}-example-data-${PV}" "${S}"/data/example_data || die +} + +pkg_setup() { + fortran-2_pkg_setup + python-single-r1_pkg_setup +} + +## Full list of configuration options of Cantera is presented here: +## https://cantera.org/3.1/develop/compiling/config-options.html +src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://github.com/Cantera/cantera/issues/1783 + filter-lto + + scons_vars=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + cc_flags="${CXXFLAGS}" + cxx_flags="-std=c++20" + debug="no" + FORTRAN="$(tc-getFC)" + FORTRANFLAGS="${FCFLAGS}" + optimize_flags="-Wno-inline" + renamed_shared_libraries="no" + use_pch="no" + ## In some cases other order can break the detection of right location of Boost: ## + system_fmt="y" + system_sundials="y" + system_eigen="y" + system_yamlcpp="y" + hdf_support=$(usex hdf5 y n) + system_blas_lapack=$(usex lapack y n) + env_vars="all" + extra_inc_dirs="/usr/include/eigen3" + use_rpath_linkage="yes" + extra_lib_dirs="/usr/$(get_libdir)/${PN}" + ) + use hdf5 && scons_vars+=( system_highfive="y" ) + use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" ) + use test || scons_vars+=( googletest="none" ) + + scons_targets=( + f90_interface=$(usex fortran y n) + ) + + if use python ; then + scons_targets+=( python_package="y" python_cmd="${EPYTHON}" ) + else + scons_targets+=( python_package="n" ) + fi +} + +src_compile() { + escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr" +} + +src_test() { + escons test +} + +src_install() { + escons install stage_dir="${D}" libdirname="$(get_libdir)" + if ! use python ; then + rm -r "${D}/usr/share/man" || die "Can't remove man files." + else + # Run the byte-compile of modules + python_optimize "${D}$(python_get_sitedir)/${PN}" + fi + + # User could remove this line if require static libs for development purpose + find "${ED}" -name '*.a' -delete || die +} + +pkg_postinst() { + local post_msg=$(usex fortran "and Fortran " "") + elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory." +} diff --git a/sci-libs/cantera/files/cantera-3.1.0_env.patch b/sci-libs/cantera/files/cantera-3.1.0_env.patch new file mode 100644 index 000000000000..31766f1afb13 --- /dev/null +++ b/sci-libs/cantera/files/cantera-3.1.0_env.patch @@ -0,0 +1,37 @@ +diff '--color=auto' -Naur a/SConstruct b/SConstruct +--- a/SConstruct ++++ b/SConstruct +@@ -170,11 +170,7 @@ + + cantera_git_commit = os.environ.get("CT_GIT_COMMIT") + if not cantera_git_commit: +- try: +- cantera_git_commit = get_command_output("git", "rev-parse", "--short", "HEAD") +- logger.info(f"Building Cantera from git commit {cantera_git_commit!r}") +- except (subprocess.CalledProcessError, FileNotFoundError): +- cantera_git_commit = "unknown" ++ cantera_git_commit = "unknown" + else: + logger.info(f"Building Cantera from git commit {cantera_git_commit!r}") + +@@ -866,7 +862,7 @@ + toolchain = ["default"] + + env = Environment(tools=toolchain+["textfile", "subst", "recursiveInstall", "UnitsInterfaceBuilder", "wix", "gch"], +- ENV={"PATH": os.environ["PATH"]}, ++ ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}, + toolchain=toolchain, + **extraEnvArgs) + +diff '--color=auto' -Naur a/src/SConscript b/src/SConscript +--- a/src/SConscript ++++ b/src/SConscript +@@ -90,7 +90,7 @@ + shim = pyenv.SharedObject("extensions/pythonShim.cpp") + pylibname = f"../lib/cantera_python{pyenv['py_version_short'].replace('.', '_')}" + lib = build(pyenv.SharedLibrary(pylibname, shim, SPAWN=get_spawn(pyenv))) +- install("$inst_shlibdir", lib) ++ install("$inst_shlibdir/cantera", lib) + + + # build the Cantera static library diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index c00ec013eba6..0d4ad980a2a3 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1,3 +1,5 @@ +AUX cfitsio-4.5.0-rename-nullptr.patch 1818 BLAKE2B c4accd8ebd77efa7cba49d531822b2c91e4b083556410f6ac924bfa266a45274a7b92266a412e65c02868c5123a86aa6ebf297fe3bb16011b195702c17e0135d SHA512 95558623d93a8733d5407136ef11413d05ed3707ef71a755fa92754876b930935abb0e85e97dcf8ee81e95ed19afaf3147b2d255e4600d56869b4cfa446095c7 DIST cfitsio-4.5.0.tar.gz 4648097 BLAKE2B 5e0e09a3e6f43ce00bb5e5dd90e88c1aa2a873b407f3156147b064904ab341da219e69dc2a763e6b02eea0392a78e0ce74c15f921054bf72cac9b6e425765f99 SHA512 03746bf49cfcd97991be54f3e4dd51fb45c7b3a75f581dc6ab9ee5726a342dc11b651667807fd67e5318576d9b15e3580dd62ceab02fd684feff7ee6bb2edc7c +EBUILD cfitsio-4.5.0-r1.ebuild 1564 BLAKE2B dc25c9254e63fcca390b4b06e35704903521d774dc0edd9f3ef6696ba79a511537ff857d02421b65bc69d432e9f571ae49db32cee212a446fb6c501f2957fe59 SHA512 593758480da7280a11ec4cf091784727f69e61c0009f6e6d5a14cd19c45697b665024f716f3bb200a9787c50aa7b13ae3d6f1e0ee6b42561e340cb7f1011b526 EBUILD cfitsio-4.5.0.ebuild 1508 BLAKE2B 550442eed75e8fe7e01493b21a298481aea1d4e134a38dc2f91043cb5603bea515ca9ba29857e3ff4ba7362aa64a144852737c361ac2f8d89665011e9b7df780 SHA512 4c983f1098a573e09ccebca7351d3226e3cad83d16823320168ca4ce600e56761dc6c4a55f72b55541e6f49fbcec0c7b048752502e30f8841b383d4b0ac54390 MISC metadata.xml 1032 BLAKE2B 4479a1c6a42796e7effcc1b53ecc30d11e7302140cee2a34f7deaa1270497d0b0add85ddf1ce38223b357a9cac5f11af9039246f41228aca7d73653fd58a0fcf SHA512 ad32ecfbeceae8d768e9fa63386bdf89887d36ca18a68a72965b4f9206d779a26ece545d618540538246be5307c066e823ce55117208533cd9e668a6010222df diff --git a/sci-libs/cfitsio/cfitsio-4.5.0-r1.ebuild b/sci-libs/cfitsio/cfitsio-4.5.0-r1.ebuild new file mode 100644 index 000000000000..c50383b46670 --- /dev/null +++ b/sci-libs/cfitsio/cfitsio-4.5.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib fortran-2 + +DESCRIPTION="C and Fortran library for manipulating FITS files" +HOMEPAGE="https://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html" +SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/10-r1" +KEYWORDS="~alpha ~amd64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="bzip2 curl test tools" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex +" +RDEPEND=" + sys-libs/zlib[${MULTILIB_USEDEP}] + bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + curl? ( net-misc/curl[${MULTILIB_USEDEP}] ) +" +# Bug #803350 +DEPEND=" + ${RDEPEND} + <dev-lang/cfortran-20110621 +" + +PATCHES=( "${FILESDIR}/${P}-rename-nullptr.patch" ) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # fix libdir + sed -e 's:lib/::' -i CMakeLists.txt || die + + # Avoid internal cfortran + rm cfortran.h || die +} + +multilib_src_configure() { + local libdir=$(get_libdir) + local mycmakeargs=( + # used for .pc file + -DLIB_SUFFIX=${libdir#lib} + + -DUSE_BZIP2=$(usex bzip2) + -DUSE_CURL=$(usex curl) + -DUSE_PTHREADS=ON + # just appending CFLAGS + -DUSE_SSE2=OFF + -DUSE_SSSE3=OFF + + -DTESTS=$(usex test) + -DUTILS=$(multilib_native_usex tools) + ) + cmake_src_configure +} + +multilib_src_install_all() { + dodoc README.md docs/*.pdf + + docinto examples + dodoc utilities/{cookbook.{c,f},testprog.c,testf77.f,speed.c,smem.c} +} diff --git a/sci-libs/cfitsio/files/cfitsio-4.5.0-rename-nullptr.patch b/sci-libs/cfitsio/files/cfitsio-4.5.0-rename-nullptr.patch new file mode 100644 index 000000000000..6281d7f7e324 --- /dev/null +++ b/sci-libs/cfitsio/files/cfitsio-4.5.0-rename-nullptr.patch @@ -0,0 +1,51 @@ +Nullptr is reserved keyword in C23. Rename to something that describes usage better +https://bugs.gentoo.org/944747 +--- a/putcol.c ++++ b/putcol.c +@@ -1226,7 +1226,7 @@ + long rept, rowrept, width, tnull, naxes[9] = {1,1,1,1,1,1,1,1,1}, groups; + double zeros = 0.; + char message[FLEN_ERRMSG], keyname[FLEN_KEYWORD], nullstr[FLEN_VALUE]; +- char **stringptr, *nullptr, *cptr; ++ char **stringptr, *ptr_to_null, *cptr; + + if (*status > 0) + return(*status); +@@ -2081,24 +2081,24 @@ + { + stringptr = cols[jj].array; + dataptr = stringptr + 1; +- nullptr = *stringptr; ++ ptr_to_null = *stringptr; + nbytes = 2; + } + else + { + dataptr = (char *) cols[jj].array + col[jj].nullsize; +- nullptr = (char *) cols[jj].array; ++ ptr_to_null = (char *) cols[jj].array; + nbytes = col[jj].nullsize; + } + +- if (memcmp(nullptr, &zeros, nbytes) ) ++ if (memcmp(ptr_to_null, &zeros, nbytes) ) + { + /* null value flag not zero; must check for and write nulls */ + if (hdutype == IMAGE_HDU) + { + if (ffppn(cols[jj].fptr, cols[jj].datatype, + felement, cols[jj].repeat * ntodo, dataptr, +- nullptr, &tstatus) > 0) ++ ptr_to_null, &tstatus) > 0) + break; + } + else +@@ -2113,7 +2113,7 @@ + + if (ffpcn(cols[jj].fptr, cols[jj].datatype, cols[jj].colnum, frow, + felement, cols[jj].repeat * ntodo, dataptr, +- nullptr, &tstatus) > 0) ++ ptr_to_null, &tstatus) > 0) + break; + } + } diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest index 0b7899cc6cb0..6f87eda9229b 100644 --- a/sci-libs/composable-kernel/Manifest +++ b/sci-libs/composable-kernel/Manifest @@ -13,4 +13,4 @@ DIST gtest-1.14.0_p20220421.tar.gz 849107 BLAKE2B e9c32d9c1d98959583b696430a6be4 EBUILD composable-kernel-5.7.1-r1.ebuild 1769 BLAKE2B 4e51c1eb8f331df322d9427b00d2cb8cba81f10b335533bc131142719d224d9bc89f98a0b54ec20d65f9622a081ab74d2a6bbae9289d1807958a9ded7f08fe4a SHA512 610bc66d4a374c6de7a0afb15a84255dae71911175c05674550478f5850b20f99a5bd0f5c40103c17e42ca774c80423d6a68b5bd0307be9c0ef3eaffa2912a58 EBUILD composable-kernel-6.1.1.ebuild 1885 BLAKE2B 07a795ad81748763eac5aa3fcb074eba9e11f96a8b81b7810f7bbe07e9ca8175bf00733376792ce3ed2385683b5cab6fc42e8396cc7720b8779d5a049a51f456 SHA512 5dcb45957ac5a8c659ea2f8cb796cc46b2d3432d44c5ae70d02e8a2835d80838610eff04e9a42e81c533afdc86f611419837e327251e5c9adb6eb648661ce2fb EBUILD composable-kernel-6.3.0.ebuild 2865 BLAKE2B 6bb823d2f1938f77c200adf8565298b9a9b20ecce5e0526cb188761b4f1187a9e42b209b9aa7bae54347109c79a17a0b4cfa921cb028ea2e88d009d02ddaa3d7 SHA512 375e3c356575f539e85f95a9c44cf3746c63c29b2d758503a19351f1b25bc9d5a0118e03c99cd54216f890b1e4efc7dae2ef6c18c3bf40ad52ed1beb2954c610 -MISC metadata.xml 565 BLAKE2B 9644f1c5275c8a60e37a7220d561b3461a9e76d27d6bf2c640e09a3fa38c902d1b1efc51fbc34eb987ba930b635b7969a73ae079f9de9df34d7f75c0226bcfc6 SHA512 f4b46d0faa827007925289f210e12977d8ce852d77da1e46cd1427132782dab78cd05c0137fa9632ace209ecfedf7b6eb99d53dacaba856c451491aab6b223d6 +MISC metadata.xml 569 BLAKE2B 4d2e3b37e3e5fda209b774afbf14bbd246c9212a5796219f32a1b983de50ee592de71931228cc83e1d6c5d68fb95e365c8e90a2ca8e5ac4a484c409fbcd29508 SHA512 5466e5a4b268d10adbe9142141cde695d77d5d12a0d36eede6106dbcdb71f944cd1f48a48da9917b7b765b4e7d4310f4a3bac3f3db84e4831eed9492b963e264 diff --git a/sci-libs/composable-kernel/metadata.xml b/sci-libs/composable-kernel/metadata.xml index 304ae9aafa5e..718a0d193bf7 100644 --- a/sci-libs/composable-kernel/metadata.xml +++ b/sci-libs/composable-kernel/metadata.xml @@ -9,9 +9,9 @@ <email>sci@gentoo.org</email> <name>Science Project</name> </maintainer> - <use> - <flag name="profiler">Build and install the Composable Kernal profiler (ckProfiler)</flag> - </use> + <use> + <flag name="profiler">Build and install the Composable Kernal profiler (ckProfiler)</flag> + </use> <upstream> <remote-id type="github">ROCm/composable_kernel</remote-id> </upstream> diff --git a/sci-libs/datasets/Manifest b/sci-libs/datasets/Manifest index a11dc30cb427..23eb263e247e 100644 --- a/sci-libs/datasets/Manifest +++ b/sci-libs/datasets/Manifest @@ -1,4 +1,4 @@ -AUX datasets-2.19.2-tests.patch 756 BLAKE2B d9bb33c2aa03f06bb42342da3bfefa0d916d7979c06725cf2c667df3d8ac4a03eb79e5129b6d0f7d232b4eb64a0cb993451e7da7661e692f50f8b8708aa8d8e2 SHA512 7ac8f060e6808b6d409508d7a9a8de4626d71b443db1df4e2489cdf3f61ab48e169ba336d8f8f6c78decb25c524ef5a291db0265813888a29c70661b04757d49 -DIST datasets-2.20.0.gh.tar.gz 2188840 BLAKE2B 3f246c3e069ec31b63dd785ca5e96b5b441cc51318baf91a9aed053c9d5d94de6871fc0f0f8c271a4782998d976407c94c3b7b4beccc60b7a12868685707090b SHA512 effa3150877ba8269940b47ae0d96d436b7d625ceb102812bbbad805b47b7661102b5ac1c2f16624630bf3039cc4265353f6b71a83122717e73575c7e8c4921f -EBUILD datasets-2.20.0.ebuild 13923 BLAKE2B 7d218b8a870eab77e4d3fd1abff1da59402fb20472cbc6ff991e8fe89a93c7a1b097a773b54013d69bcd48ffce6614d751fda5e53901ed799d86ca73adb39752 SHA512 a5563dd0dd864fa24c73089bf04bc2a6779f5c1b1f37a0e0bc9c1536653de9e6610d13343f1c8c0a09ea28c5914e518cd569b90654544a60c23ff7a978573492 +AUX datasets-2.21.0-tests.patch 721 BLAKE2B cf85b02a4eb5da27e52bf819f00e333d6e3fb3fb0b9f7279afff24e3fddf76fcd46cb5e06d29b4780d0ce6b48c9378df301c70f6339e2f2898560219ebab4210 SHA512 43cdc5af6ba3fff3e7641006be6d8e10a5ad00136c1cf137628456019cccbd3d05b888b7eeec1cb8cd42d5ce52091b2a66d32a5b41ff2193658c4257900ea45c +DIST datasets-2.21.0.gh.tar.gz 2198480 BLAKE2B 41a5e82013d26644db4f52b16728cee31c6ff27995b8a9b2ddef1512fcda5e9386e47f6726303fec64d5ed7e40432583a6ddcc2bdfbb76096dce5f23b0540149 SHA512 f4193e29505300f98ec026b1ed052ffd3d43ae05a9b191bb56105d703ba2e44752e97c0eeb36dd1b2df6499662915591ab850cdec5248af8c7c5b5a003437c5c +EBUILD datasets-2.21.0-r2.ebuild 7930 BLAKE2B f1f4b3166699245468a38e58e9193c9e554933d76cec01dab93a14d419553e3d49bade4e3dcbd1fa301f8e540198817a5ccdc604b3f82ae46431c7711b6ff9d1 SHA512 1569ed36893a419baf4cd46a3fdf31c65eb6bd446a530ed2d7f2acd5c1407cda6de419424bf78bf9d94034569596d815c084a01f6fcb80edd22fef55d88e560a MISC metadata.xml 379 BLAKE2B 48ebb9e7bfa8b58b0d15b82c4146def465e08cf3212ab4af04129d09c153b67b00d0fa05b94d6af54f643ec3a202f2335d3254b966f49d1394d3c7b9e5da56a5 SHA512 99560decfaa0e438980f372d99257695e9ca9585167d9aba091e0b775c2f8384657ddc017841c8f06f8b568017a54fb9e31da736f3c875da717e154cdce876d1 diff --git a/sci-libs/datasets/datasets-2.20.0.ebuild b/sci-libs/datasets/datasets-2.21.0-r2.ebuild index e2847e01db5c..780a495e070c 100644 --- a/sci-libs/datasets/datasets-2.20.0.ebuild +++ b/sci-libs/datasets/datasets-2.21.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,6 @@ RDEPEND=" sci-libs/pytorch[${PYTHON_SINGLE_USEDEP}] sci-libs/caffe2[${PYTHON_SINGLE_USEDEP},numpy] $(python_gen_cond_dep ' - dev-python/absl-py[${PYTHON_USEDEP}] dev-python/aiohttp[${PYTHON_USEDEP}] dev-python/dill[${PYTHON_USEDEP}] dev-python/filelock[${PYTHON_USEDEP}] @@ -36,10 +35,8 @@ RDEPEND=" dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] - dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/tqdm[${PYTHON_USEDEP}] dev-python/xxhash[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] sci-libs/huggingface_hub[${PYTHON_USEDEP}] ') " @@ -47,16 +44,19 @@ DEPEND="${RDEPEND}" BDEPEND="test? ( $(python_gen_cond_dep ' dev-python/absl-py[${PYTHON_USEDEP}] - dev-python/pytest-datadir[${PYTHON_USEDEP}] dev-python/decorator[${PYTHON_USEDEP}] + dev-python/pytest-datadir[${PYTHON_USEDEP}] + dev-python/scikit-learn[${PYTHON_USEDEP}] dev-python/sqlalchemy[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] sci-libs/jiwer[${PYTHON_USEDEP}] sci-libs/seqeval[${PYTHON_USEDEP}] ') + sci-libs/torchvision[${PYTHON_SINGLE_USEDEP}] )" PATCHES=( - "${FILESDIR}"/${PN}-2.19.2-tests.patch + "${FILESDIR}"/${P}-tests.patch ) distutils_enable_tests pytest @@ -76,76 +76,49 @@ src_test() { ) local EPYTEST_DESELECT=( + "tests/features/test_audio.py::test_dataset_with_audio_feature_map_undecoded" + "tests/features/test_audio.py::test_dataset_with_audio_feature_undecoded" + "tests/features/test_audio.py::test_formatted_dataset_with_audio_feature_undecoded" + "tests/io/test_parquet.py::test_parquet_read_geoparquet" + "tests/packaged_modules/test_cache.py::test_cache_multi_configs" + "tests/packaged_modules/test_cache.py::test_cache_single_config" "tests/test_arrow_dataset.py::BaseDatasetTest::test_filter_caching_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_filter_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_filter_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_flatten_indices_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_flatten_indices_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_batched_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_batched_on_disk" "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_caching_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_remove_columns_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_remove_columns_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_select_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_select_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_numpy_multiple_columns_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_numpy_multiple_columns_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_torch_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_set_format_torch_on_disk" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_train_test_split_in_memory" - "tests/test_arrow_dataset.py::BaseDatasetTest::test_train_test_split_on_disk" "tests/test_arrow_dataset.py::TaskTemplatesTest::test_task_automatic_speech_recognition" - "tests/test_arrow_dataset.py::StratifiedTest::test_train_test_split_startify" - "tests/test_arrow_dataset.py::test_dataset_format_with_unformatted_image" - "tests/test_arrow_dataset.py::test_map_cases" - "tests/test_dataset_dict.py::DatasetDictTest::test_set_format_numpy" - "tests/test_dataset_dict.py::DatasetDictTest::test_set_format_torch" + "tests/test_data_files.py::test_DataFilesDict_from_patterns_locally_or_remote_hashing" + "tests/test_data_files.py::test_DataFilesList_from_patterns_locally_with_extra_files" "tests/test_distributed.py::test_torch_distributed_run" - "tests/test_distributed.py::test_torch_distributed_run_streaming_with_num_workers" - "tests/test_file_utils.py::TestxPath::test_xpath_glob" + "tests/test_exceptions.py::test_error_deprecated" "tests/test_file_utils.py::TestxPath::test_xpath_rglob" - "tests/test_file_utils.py::test_xopen_remote" - "tests/test_file_utils.py::test_xexists_private" - "tests/test_file_utils.py::test_xlistdir_private" - "tests/test_file_utils.py::test_xisdir_private" - "tests/test_file_utils.py::test_xisfile_private" - "tests/test_file_utils.py::test_xgetsize_private" - "tests/test_file_utils.py::test_xglob_private" - "tests/test_file_utils.py::test_xwalk_private" - "tests/test_fingerprint.py::TokenizersHashTest::test_hash_regex" - "tests/test_fingerprint.py::TokenizersHashTest::test_hash_tokenizer" - "tests/test_fingerprint.py::TokenizersHashTest::test_hash_tokenizer_with_cache" - "tests/test_fingerprint.py::RecurseHashTest::test_hash_ignores_line_definition_of_function" - "tests/test_fingerprint.py::RecurseHashTest::test_hash_ipython_function" + "tests/test_file_utils.py::TestxPath::test_xpath_glob" "tests/test_fingerprint.py::HashingTest::test_hash_torch_compiled_module" "tests/test_fingerprint.py::HashingTest::test_hash_torch_generator" "tests/test_fingerprint.py::HashingTest::test_hash_torch_tensor" "tests/test_fingerprint.py::HashingTest::test_set_doesnt_depend_on_order" "tests/test_fingerprint.py::HashingTest::test_set_stable" + "tests/test_fingerprint.py::RecurseHashTest::test_hash_ignores_line_definition_of_function" + "tests/test_fingerprint.py::RecurseHashTest::test_hash_ipython_function" "tests/test_fingerprint.py::test_move_script_doesnt_change_hash" - "tests/test_formatting.py::ArrowExtractorTest::test_numpy_extractor" - "tests/test_formatting.py::ArrowExtractorTest::test_numpy_extractor_nested" - "tests/test_formatting.py::ArrowExtractorTest::test_numpy_extractor_temporal" - "tests/test_formatting.py::FormatterTest::test_numpy_formatter" - "tests/test_formatting.py::FormatterTest::test_numpy_formatter_image" - "tests/test_formatting.py::FormatterTest::test_numpy_formatter_np_array_kwargs" - "tests/test_formatting.py::FormatterTest::test_torch_formatter" - "tests/test_formatting.py::FormatterTest::test_torch_formatter_image" - "tests/test_formatting.py::FormatterTest::test_torch_formatter_torch_tensor_kwargs" - "tests/test_formatting.py::test_torch_formatter_sets_default_dtypes" - "tests/test_inspect.py::test_get_dataset_config_names[hf-internal-testing/librispeech_asr_dummy-expected4]" - "tests/test_inspect.py::test_get_dataset_default_config_name[hf-internal-testing/librispeech_asr_dummy-None]" - "tests/test_inspect.py::test_inspect_dataset" - "tests/test_inspect.py::test_inspect_metric" - "tests/test_inspect.py::test_get_dataset_config_info" - "tests/test_inspect.py::test_get_dataset_config_info_error[paws-None-ValueError]" - "tests/test_inspect.py::test_get_dataset_config_names" - "tests/test_inspect.py::test_get_dataset_default_config_name" - "tests/test_inspect.py::test_get_dataset_info" - "tests/test_inspect.py::test_get_dataset_split_names" - "tests/test_inspect.py::test_get_dataset_config_info_private" + "tests/test_fingerprint.py::TokenizersHashTest::test_hash_regex" + "tests/test_fingerprint.py::TokenizersHashTest::test_hash_tokenizer" + "tests/test_fingerprint.py::TokenizersHashTest::test_hash_tokenizer_with_cache" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_natural_questions/default@19ba7767b174ad046a84f46af056517a3910ee57" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki40b/en@7b21a2e64b90323b2d3d1b81aa349bb4bc76d9bf" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.multiset.no_index@b24a417d802a583f8922946c1c75210290e93108" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.nq.compressed@b24a417d802a583f8922946c1c75210290e93108" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.nq.no_index@b24a417d802a583f8922946c1c75210290e93108" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.de@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.en@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.fr@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.frr@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.it@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.simple@4d013bdd32c475c8536aae00a56efc774f061649" + "tests/test_hf_gcp.py::test_as_dataset_from_hf_gcs" + "tests/test_hf_gcp.py::test_as_streaming_dataset_from_hf_gcs" + "tests/test_hub.py::test_convert_to_parquet" + "tests/test_hub.py::test_delete_from_hub" + "tests/test_iterable_dataset.py::test_iterable_dataset_from_file" + "tests/test_iterable_dataset.py::test_iterable_dataset_from_hub_torch_dataloader_parallel" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_bertscore" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_bleurt" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_chrf" @@ -153,16 +126,16 @@ src_test() { "tests/test_metric_common.py::LocalMetricTest::test_load_metric_competition_math" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_coval" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_cuad" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_f1" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_frugalscore" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_glue" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_google_bleu" - "tests/test_metric_common.py::LocalMetricTest::test_load_metric_indic_glue" - "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mae" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mauve" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mean_iou" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_meteor" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_mse" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_precision" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_recall" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_roc_auc" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_rouge" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_sacrebleu" @@ -173,63 +146,7 @@ src_test() { "tests/test_metric_common.py::LocalMetricTest::test_load_metric_wiki_split" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_xnli" "tests/test_metric_common.py::LocalMetricTest::test_load_metric_xtreme_s" - "tests/test_metric_common.py::LocalMetricTest::test_load_metric_bleu" - "tests/commands/test_test.py::test_test_command" - "tests/features/test_array_xd.py::ExtensionTypeCompatibilityTest::test_array2d_nonspecific_shape" - "tests/features/test_array_xd.py::ExtensionTypeCompatibilityTest::test_extension_indexing" - "tests/features/test_array_xd.py::ExtensionTypeCompatibilityTest::test_multiple_extensions_same_row" - "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_2d" - "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_3d" - "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_4d" - "tests/features/test_array_xd.py::ArrayXDTest::test_from_dict_5d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_2d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_3d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_4d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_5d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_2d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_3d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_4d" - "tests/features/test_array_xd.py::ArrayXDTest::test_write_batch_5d" - "tests/features/test_array_xd.py::test_array_xd_numpy_arrow_extractor" - "tests/features/test_array_xd.py::test_array_xd_with_none" - "tests/features/test_array_xd.py::test_dataset_map" - "tests/features/test_audio.py::test_audio_feature_encode_example" - "tests/features/test_audio.py::test_audio_feature_encode_example_pcm" - "tests/features/test_audio.py::test_audio_decode_example_pcm" - "tests/features/test_audio.py::test_dataset_cast_to_audio_features" - "tests/features/test_audio.py::test_dataset_concatenate_audio_features" - "tests/features/test_audio.py::test_dataset_concatenate_nested_audio_features" - "tests/features/test_audio.py::test_dataset_with_audio_feature_undecoded" - "tests/features/test_audio.py::test_formatted_dataset_with_audio_feature_undecoded" - "tests/features/test_audio.py::test_dataset_with_audio_feature_map_undecoded" - "tests/features/test_image.py::test_formatted_dataset_with_image_feature_map" - "tests/features/test_image.py::test_formatted_dataset_with_image_feature" - "tests/features/test_image.py::test_formatted_dataset_with_image_feature_undecoded" - "tests/packaged_modules/test_cache.py::test_cache_multi_configs" - "tests/packaged_modules/test_cache.py::test_cache_single_config" - "tests/packaged_modules/test_cache.py::test_cache_capital_letters" - "tests/packaged_modules/test_folder_based_builder.py::test_data_files_with_different_levels_no_metadata" - "tests/packaged_modules/test_folder_based_builder.py::test_data_files_with_one_label_no_metadata" - "tests/test_data_files.py::test_DataFilesList_from_patterns_locally_with_extra_files" - "tests/test_data_files.py::test_DataFilesDict_from_patterns_locally_or_remote_hashing" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_natural_questions/default@19ba7767b174ad046a84f46af056517a3910ee57" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki40b/en@7b21a2e64b90323b2d3d1b81aa349bb4bc76d9bf" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.multiset.no_index@b24a417d802a583f8922946c1c75210290e93108" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.nq.compressed@b24a417d802a583f8922946c1c75210290e93108" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wiki_dpr/psgs_w100.nq.no_index@b24a417d802a583f8922946c1c75210290e93108" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.de@4d013bdd32c475c8536aae00a56efc774f061649" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.en@4d013bdd32c475c8536aae00a56efc774f061649" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.fr@4d013bdd32c475c8536aae00a56efc774f061649" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.frr@4d013bdd32c475c8536aae00a56efc774f061649" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.it@4d013bdd32c475c8536aae00a56efc774f061649" - "tests/test_hf_gcp.py::TestDatasetOnHfGcp::test_dataset_info_available_wikipedia/20220301.simple@4d013bdd32c475c8536aae00a56efc774f061649" - "tests/test_hf_gcp.py::test_as_dataset_from_hf_gcs" - "tests/test_hf_gcp.py::test_as_streaming_dataset_from_hf_gcs" - "tests/test_iterable_dataset.py::test_iterable_dataset_from_hub_torch_dataloader_parallel" "tests/test_offline_util.py::test_offline_with_timeout" - "tests/io/test_parquet.py::test_parquet_read_geoparquet" - tests/test_exceptions.py::test_error_deprecated - tests/test_hub.py::test_convert_to_parquet ) distutils-r1_src_test } diff --git a/sci-libs/datasets/files/datasets-2.19.2-tests.patch b/sci-libs/datasets/files/datasets-2.21.0-tests.patch index 64df833032c5..0a55459db109 100644 --- a/sci-libs/datasets/files/datasets-2.19.2-tests.patch +++ b/sci-libs/datasets/files/datasets-2.21.0-tests.patch @@ -1,6 +1,6 @@ --- a/tests/test_arrow_dataset.py 2024-02-20 21:53:24.248470991 +0100 +++ b/tests/test_arrow_dataset.py 2024-02-20 21:53:29.441804737 +0100 -@@ -4109,7 +4109,6 @@ +@@ -4131,7 +4131,6 @@ [ "relative/path", "/absolute/path", @@ -10,14 +10,13 @@ ], --- a/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:00:39.560876163 +0200 +++ b/tests/packaged_modules/test_audiofolder.py 2023-05-06 14:01:26.005212423 +0200 -@@ -1,10 +1,8 @@ +@@ -1,9 +1,8 @@ import shutil import textwrap --import librosa import numpy as np import pytest -import soundfile as sf from datasets import Audio, ClassLabel, Features, Value - from datasets.data_files import DataFilesDict, get_data_patterns + from datasets.builder import InvalidConfigName diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index dd30d596f2a7..6d0e22dc9a08 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -5,5 +5,5 @@ DIST dcmtk-3.6.8.tar.gz 9628364 BLAKE2B 367885c3fda65b7b2e42555ba648800f9585cbd4 DIST dcmtk-3.6.9.tar.gz 9628334 BLAKE2B c60a9620a522b2a2fb976549ec1a3addce9ccd2fee90dad85376b56c105b28450d8ac2c8e8afe397e1bce532f8dd08f3fdb1135513bce3b314bdd7bbae7c06c9 SHA512 1ea4140940f33b34e21895cd7aa6b05be109fcecfbed45f61f8a4a248ea98deae59f2b362e518051d6054f588189d5ef9bba0ab81afa73b219c9ebcf415a0ca0 EBUILD dcmtk-3.6.7-r1.ebuild 1989 BLAKE2B 47958171848d55e4e648abec64258fe3c6547f6c18daf6dc3f46e6e5e0c88afb3787d86dab6bda6c53ae13909cf1f7fd8fe956e1b4f1653a068fc6b3f06d5898 SHA512 902b2bd3dabfce90711f811eb0eafb14f3d61f9ff545046c3b223eda15aeb2985c6c7dfcd765014b179e4b177e5ca61a37561bbf5b19201fe19614ec8e7c4780 EBUILD dcmtk-3.6.8.ebuild 1963 BLAKE2B cedac0e5bbbd5ef840347d3af28ef8951cca68b4c00170ab2109286dd8d33e5ef25980e51f761da8404cc96c7bed494aa3d4c975388f4257a43722387aac86fd SHA512 a558ad80d191b25e120c92fe66aca9b1689a2a5de9b3c4df89fb8279addc35bc6e012e24c4b52308ab83786934c682d0da01bb3e5f54ebc0efc2964db17408cc -EBUILD dcmtk-3.6.9.ebuild 1751 BLAKE2B 22e2943d04bb9449ab7d03a016eb2a6c83d1521c4c29186bc92559c2a71a8dc140e633207ed8bf541a00b73281ff1cbf0eb0271954f74f944a1895d4a343688a SHA512 a29f07be93e3f9264624ef5934f4a716945efc8eff100f6e221472cdfc2fd7b074d7d5de558b9e6dbd067e8e9520248dc99b032fb9ed6ebca5a9db962b3e599e +EBUILD dcmtk-3.6.9.ebuild 1750 BLAKE2B e1cedd166cdfc485d055d43cda3076104f66d14df6aefd0f1b9cbaa29a6886d6c9bfe9864aaf920d2de780e740b04046de84ac55ec160c00d705d8683ad72928 SHA512 832c794a92f0b28813f2a103eeae46ce69986b8af879dd9bb76a91da89d74659ea0576f11a4412d5698f0480d9d14ffe650a70bf13cfb3c1fd5846f833f312f0 MISC metadata.xml 308 BLAKE2B 394345b977e2dd7598cd2acdf2af966f2efecef502a4f460e4fe323c095e3de8523c4217873d18f68198996e4ee08580f46543bf7e357a227f66dcd558191615 SHA512 b8117feeab19b0128c2378d36370e907338873a177c5d8f1cfaef79bf16e877fc455cc5096bccadb99a7238c02fd01c02ae9018a81aab013e0d1a1ccc4cd650c diff --git a/sci-libs/dcmtk/dcmtk-3.6.9.ebuild b/sci-libs/dcmtk/dcmtk-3.6.9.ebuild index 605e334411ec..cfcea801a361 100644 --- a/sci-libs/dcmtk/dcmtk-3.6.9.ebuild +++ b/sci-libs/dcmtk/dcmtk-3.6.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz" LICENSE="OFFIS" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="doc png ssl tcpd tiff +threads xml zlib" RDEPEND=" diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index 9629e1669e0b..cba6406946ee 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -1,21 +1,7 @@ -AUX dealii-9.1.1-no-ld-flags.patch 1044 BLAKE2B fed995fbd5563bfee6b4dd232d5d9aaecd8f0d206f06679b5d79022420c83ac2752414417499ac9181c25ddc594e492bf8d6b6af19fdfd1f047e7e089193de5d SHA512 15346b31f4ac5df3b1a3a3dcb215d4bd49e3e67480c86d4c78dbd5d27ae33f6cfa8b03fdc561e38090a2c22ae8ba71d13cd9b1bbdda3eedefd498f5cedfd0a09 -AUX dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch 2443 BLAKE2B f4df5afc449fd64951f21f9a243c504c57a2b8e6525b6215c9edf539b26cda863a311e31d65726091af239cb8d5aa1a00d32ec52ff0aca1cfa7f01523c934010 SHA512 dcc1e87c393437e0a13e19f70a2096af052eba34ae82c9f2e640a2cb83014aaaa71a20e2a2efcd91a55d08b2e796669113388b8953da7a412ff181628da50db6 -AUX dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch 894 BLAKE2B 097db57d5fbf5d7f6f4c1545da6fe0c49c2dad674c3da1a7a30e17d3a9c9b4da36946c24b3507c397d8f9f8551be1f934593eff79f15448863f8a7c6e416e323 SHA512 83f4085d88e67d6d93e045d6ce672c67273a86e96f1c608134637198e3acda25451af9b2fc13dc97fee8c76db3bdfb750c5bb6f46a4b74fcf96a45b2fd1bf821 -DIST dealii-9.4.1-offline_documentation.tar.gz 392007419 BLAKE2B 81404b02ba7dc97a0314f52fa9d775183981864288f4ab4ca81b550a1763d90cb5b04b32c056008ad60a7829b929c78edd80cbeeeb861e4ef638780c13d80aa7 SHA512 9bbaf6e9a478ac643e87f2f07918c8a5216e17b0ddaeba4beb2acde9ea54833e2f0e7d11f61b2cac8b986e442dbb181317b53e1a40a807e7c098167bfd073266 -DIST dealii-9.4.1-offline_documentation.tar.gz.asc 246 BLAKE2B 9ace22c9b174e642cd3fba94c165d816c62814f892f5f6f272efa0301613dc55251152825e726fc6cf7e89bbfb7fa3552ec58ad426a7d58a74ecb89b9072f742 SHA512 50b43dd34a0687395f516f4910581df71054fa8be3c98006566ea649d0af866d38c9793da548ba6bdb7a9fec452dfb6d928d336aace943522d7c3f854209b81b -DIST dealii-9.4.2.tar.gz 30298479 BLAKE2B bff5dd5a1b5458dd6e295b87cee9d24626ffce0b4c6a3329f190739d8fc67d34f11f0218dbbcd69dcf2e031e3e9f04cd1f2d0768d2fad32198bf1360d132a686 SHA512 6f6f032f6eef73421b53576e01f40bef0b4ce3d89583a016d057f8ec023c1f925a5c245991fd4639f9e73c4852d5cfd36da92258251a56179a98cd4a612cac9f -DIST dealii-9.4.2.tar.gz.asc 246 BLAKE2B b61a8e3e496ba34c87fe453fbcec9fd0fb0d59f8d7123f38352c65c81b3d0ea706a4f645444970857a9fd67a26a984fc5adcfe8ed6c43eae5656bba6dd3bed9e SHA512 b11a79da7eeaababf7ec2c2264b41d0a5df9fd2f870829c535f888f0f8c07a6765920e023fd9d74f24a5a4744bd8d68a6db1669e449ed1a81757ee6c3c60b873 DIST dealii-9.5.0-offline_documentation.tar.gz 412499027 BLAKE2B 521aa2488d84d48a624f4cbdbe9c173d0cdcee2df8d06b97b7c25ba28d4a2113a7da9fd9abd9eb64cd56b37f8edc716bd034fc3ba8823f8b1def26c34aaeeb55 SHA512 2e0d331f92d52b0fd909a0139157a1960a9222d46d537611f0508cdb79020a8e51ff0da6aefdf95adff732cea050b72df7dc1a8af7e93c736721970218815cfe DIST dealii-9.5.0-offline_documentation.tar.gz.asc 246 BLAKE2B 0a570885e80ad09ff154532b71c07e33894e93c96b3bca48dc8aae0b308883518cbb5eca57658c4e13de47efba47c3cb20bf376482ef7a26c6c0da93ee4dd689 SHA512 b63a9a0504fe5266b448ffda74e1d85ad5b6f344535c5b5f11d209546b51bb916ad69504ce5e4f1fd2287407c2d3d98a20b01bd830e8d45f510a85b7a057a8d5 -DIST dealii-9.5.2.tar.gz 31523493 BLAKE2B 4ad55b0c4c7b1c02de17007f44b345856ec18127d6326b08fda76747087039344324c911409502f293e61eecd6d574f8a774ec0a1bbb200a2a4ee62a2f81e6d8 SHA512 5989c2dfd66f803b0bcc32816f69048c0bbb411c8b792691df9bbfc0c965c1c95c7e8c3782e1a3d160e9d124fd0c5396b55372e28e477fa474c3f3c03a5bd4e9 -DIST dealii-9.5.2.tar.gz.asc 246 BLAKE2B bacd1dac5a6f3d0d6639329512f5c4cafe39ecd036a7a4e38b81d31b6ee452d496190e8ae26c814631cc62c42208a1df1cd081ac8accd97d2821d7091495b898 SHA512 1821b4763ddcda11baf37b88ae90ec73576d2cacdeb53f4196dcde9e1649e685eb1666b86317d4573944769642b09bc76fc1de34a5e8e436004552f8652cad23 -DIST dealii-9.6.0.tar.gz 40829532 BLAKE2B 0219f7586a79b22810ac4bb0aa6eba4630dd8002f39abb76c920c5456a7c9cf6e3c3eb66a2670f8a0fc1158a7a186482e65b210743b7f9900c081c67199e0d34 SHA512 d65b3c73900589f84713ff8e926d2cd566501c2498fd64d314f71d4d525009f36d194693f92608b83cacc1ac985ea1c413fc6a4bbf8c7ff598645f7773a632b4 -DIST dealii-9.6.0.tar.gz.asc 246 BLAKE2B 3b34f1cc6df91c9052a1c00ce66e462ad8e735a921a37bb2228dcf7b1725b44d543cef40823c4cab01e77e55f09becef8a192492d99f412b21d18f5fd7bf9d64 SHA512 9d9e390399792c6f9a19a4e9666ace7657abf01d1ba489084dfa8d9729635022ae25c2e1b02c8825bddc149c8249402d65e8cf5c1bbe1441858109d0c93826a5 DIST dealii-9.6.2.tar.gz 40863604 BLAKE2B 5214b9cfd78e48f2588046b1a3d68837f9d856191c77d179c384ddaa524a464bd2cd9eef6597bdc036e9fa7121843c048ff035fa926aa67a1a15e1c1f85f276e SHA512 79fe3c3baba4bcb479f30ae863e577e64d0a6ea488172a9d6bacecf1e5ec845f47eff9a8bf3cb4651e6803b9b0c38dc32ca745abc64737d66aedf7ec73c2e362 DIST dealii-9.6.2.tar.gz.asc 246 BLAKE2B 067b15614652e26a4ec16f8afc8b6842fbb8221b9840c54304611a0dcbedb9073209307bc2248e7b902738b3c120b31688df71b53efd8f603135b033811a8f53 SHA512 4845e485cf1f5b24efde38cd0da91a265e5dd73c81b5099e6638ee917e7e43c842688dac5388e0ec3306eae0aba28dac25ccc88f0d1680a9150d88aae4a6d6ee -EBUILD dealii-9.4.2-r1.ebuild 6038 BLAKE2B c40eacc59221b91a342919237171fe16bc8092189d1c4cb57fc3bd4c5c05af3ee58619d8e613be2d6181c80138d0463169272fe8805fb766fce1cfea50ac5071 SHA512 194ae81deec32c3da98610f7e28714d9f59c963eeb33538a07de7db1efdc1816e9792450d6b7c7cf934982b2d7126b56b3513657d2b93ade208413e2dbc70464 -EBUILD dealii-9.5.2-r1.ebuild 5704 BLAKE2B f15b66758e594fba1726f5aa5263aa3ea7c046e1825da8118f0a30ea214e25abb295b305885d90b30263ed838b1eace390422cbddb75dc065a2e76ae25bfcc5e SHA512 ff7081a7fb8c24fdd428b64d4df567509dd9c30559d4fc787e2e6f6b4dc801af451400c6a5cf5554076e9884fc407495c9bd95eec9ab8fa6dff5d60ec07c29b2 -EBUILD dealii-9.6.0.ebuild 5562 BLAKE2B 644bd108d4ac9616a33aae98938322ad631bdc06cf8e52a36e40e7f28888ec1d67bf38e6213f027f0c8144ec8d3921d2e6b0c7d894b98148ab6744f7e9211588 SHA512 2df99eba95d375ad5c4a6dfc76e1a123f0e5d421d50f3289750fdfb364fde708a8cb52ff8dd3a5f1d500ffd1286258aa37ec8cf639d1edb5517b4ae6bc81dde7 -EBUILD dealii-9.6.2.ebuild 5562 BLAKE2B 644bd108d4ac9616a33aae98938322ad631bdc06cf8e52a36e40e7f28888ec1d67bf38e6213f027f0c8144ec8d3921d2e6b0c7d894b98148ab6744f7e9211588 SHA512 2df99eba95d375ad5c4a6dfc76e1a123f0e5d421d50f3289750fdfb364fde708a8cb52ff8dd3a5f1d500ffd1286258aa37ec8cf639d1edb5517b4ae6bc81dde7 -EBUILD dealii-9999.ebuild 5169 BLAKE2B 593ee88766dbcba2df2c6f06795f27b24fce1948b9cf8611e257662b9300b505b15623d79d7fef47060029b1982688040b28ada5622bc13380879d61142ffa51 SHA512 43ea2366f56d21e25e3a5c323daf63023e3dedcdb45908765fe1f8c31535fc6dd99a48c17f3000170347950bb844e56b58495c55613336698479bf87b25670db +EBUILD dealii-9.6.2-r1.ebuild 5480 BLAKE2B 3fa137b1749922ce9504d90de3d4f9bcde254b2fff64ca3e694472830506264526c7da5f12c21d311ee2ff655391b1fbe7a5de68128c24fb7d84c7ced8caf09c SHA512 d4f23fc036522b91c8ee8e211702491d34ced75359e3084ea878f37e0a9d9a7f8d6113110e7222b3c090d8ed888c3e9fba4f31da76e73b17828d123cb5453aa1 +EBUILD dealii-9999.ebuild 5087 BLAKE2B d1950da9af8a4eedf8584235e34a73485b91219e5c0842a3360e6343ddfd3c73d9ec2ab8c55add00b2d3d55f4c573753d2ac3cd5ccb996c7561f592bb3d9c958 SHA512 d3591a6891874a7fbc7cc768bc72edc3235a55caa798b430607bab1fd6b18a437988aab774f92f7dbd63db3aef250a4f201f590dbcadf6cb63c3de377ccf3f72 MISC metadata.xml 2301 BLAKE2B 27f29025acaf1cdf2637c9ce38b7d94cb63a29064c3fc315b86818e155cb675ac387998855498754d42f10abcbd3c14b92bd0d9ce503b24614490d2d45668166 SHA512 28ce9b2664538cdd933fe72fec79a85ad75fc5f451d14fb5946b92bba7d8c387e9e6226f831bc5b02e841f9e94c28d404f34a1211ed3a00a49eaff5a8d7dc8a1 diff --git a/sci-libs/dealii/dealii-9.4.2-r1.ebuild b/sci-libs/dealii/dealii-9.4.2-r1.ebuild deleted file mode 100644 index 8fa359124ee9..000000000000 --- a/sci-libs/dealii/dealii-9.4.2-r1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# deal.II uses its own FindLAPACK.cmake file that calls into the system -# FindLAPACK.cmake module and does additional internal setup. Do not remove -# any of these modules: -CMAKE_REMOVE_MODULES_LIST="" - -inherit cmake flag-o-matic verify-sig - -DESCRIPTION="Solving partial differential equations with the finite element method" -HOMEPAGE="https://www.dealii.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dealii/dealii.git" - SRC_URI="" -else - DOC_PV=9.4.1 - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz.asc ) - doc? ( - https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz.asc ) - )" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE=" - adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f - cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 - +lapack metis mpi muparser opencascade p4est petsc scalapack slepc - +sparse static-libs sundials symengine trilinos -" - -# TODO: add slepc use flag once slepc is packaged for gentoo-science -REQUIRED_USE=" - arborx? ( trilinos ) - p4est? ( mpi ) - slepc? ( petsc ) - trilinos? ( mpi )" - -RDEPEND="dev-libs/boost:= - app-arch/bzip2 - sys-libs/zlib - dev-cpp/tbb:= - arborx? ( sci-libs/arborx[mpi=] ) - adolc? ( sci-libs/adolc ) - arpack? ( sci-libs/arpack[mpi=] ) - assimp? ( media-libs/assimp:= ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - ginkgo? ( sci-libs/ginkgo ) - gmsh? ( sci-libs/gmsh ) - gsl? ( sci-libs/gsl:= ) - hdf5? ( sci-libs/hdf5:=[mpi=] ) - lapack? ( virtual/lapack ) - metis? ( - >=sci-libs/metis-5 - mpi? ( >=sci-libs/parmetis-4 ) - ) - mpi? ( virtual/mpi[cxx] ) - muparser? ( dev-cpp/muParser ) - opencascade? ( sci-libs/opencascade:= ) - p4est? ( sci-libs/p4est[mpi] ) - petsc? ( sci-mathematics/petsc[mpi=] ) - scalapack? ( sci-libs/scalapack ) - slepc? ( sci-mathematics/slepc[mpi=] ) - sparse? ( sci-libs/umfpack ) - sundials? ( sci-libs/sundials:= ) - symengine? ( >=sci-libs/symengine-0.4:= ) - trilinos? ( sci-libs/trilinos )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-text/doxygen[dot] dev-lang/perl )" - -BDEPEND=" - verify-sig? ( <=sec-keys/openpgp-keys-dealii-20230904 )" - -PATCHES=( - "${FILESDIR}"/${PN}-9.1.1-no-ld-flags.patch - "${FILESDIR}"/${PN}-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch - "${FILESDIR}"/${PN}-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch -) - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dealii.asc" - -src_configure() { - # deal.II needs a custom build type: - local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) - - local mycmakeargs=( - -DDEAL_II_PACKAGE_VERSION="${PV}" - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DDEAL_II_ALLOW_AUTODETECTION=OFF - -DDEAL_II_ALLOW_BUNDLED=OFF - -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html" - -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}" - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples" - -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)" - -DDEAL_II_SHARE_RELDIR="share/${PN}" - -DDEAL_II_WITH_ZLIB=ON - -DDEAL_II_WITH_ADOLC="$(usex adolc)" - -DDEAL_II_WITH_ARBORX="$(usex arborx)" - -DDEAL_II_WITH_ASSIMP="$(usex assimp)" - -DDEAL_II_WITH_ARPACK="$(usex arpack)" - -DDEAL_II_WITH_CGAL="$(usex cgal)" - -DDEAL_II_WITH_CUDA="$(usex cuda)" - -DDEAL_II_WITH_GINKGO="$(usex ginkgo)" - -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)" - -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)" - -DDEAL_II_WITH_GMSH="$(usex gmsh)" - -DDEAL_II_WITH_GSL="$(usex gsl)" - -DDEAL_II_WITH_HDF5="$(usex hdf5)" - -DDEAL_II_WITH_KOKKOS="$(usex trilinos)" - -DDEAL_II_WITH_LAPACK="$(usex lapack)" - -DDEAL_II_WITH_METIS="$(usex metis)" - -DDEAL_II_WITH_MPI="$(usex mpi)" - -DDEAL_II_WITH_MUPARSER="$(usex muparser)" - -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)" - -DDEAL_II_WITH_P4EST="$(usex p4est)" - -DDEAL_II_WITH_PETSC="$(usex petsc)" - -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)" - -DDEAL_II_WITH_SLEPC="$(usex slepc)" - -DDEAL_II_WITH_SUNDIALS="$(usex sundials)" - -DDEAL_II_WITH_SYMENGINE="$(usex symengine)" - -DDEAL_II_WITH_UMFPACK="$(usex sparse)" - -DBUILD_SHARED_LIBS="$(usex !static-libs)" - -DDEAL_II_PREFER_STATIC_LIBS="$(usex static-libs)" - -DDEAL_II_WITH_TBB=ON - -DDEAL_II_WITH_TASKFLOW=OFF - -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" - ) - - use opencascade && mycmakeargs+=( - -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" - ) - - # Do a little dance for purely cosmetic QA reasons. The build system - # does query for the highest instruction set first and skips the other - # variables if a "higher" variant is set - if use cpu_flags_x86_avx512f; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes ) - append-cxxflags "-mavx512f" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes ) - append-cxxflags "-mavx2" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) - append-cxxflags "-msse2" - fi - - # Unconditionally enable strict C++17 standard. This is necessary for - # USE=cgal and USE=kokkos and safe to set for all presently supported - # compilers - append-cxxflags "-std=c++17" - - cmake_src_configure -} - -src_install() { - if use doc && [[ ${PV} != *9999* ]]; then - # copy missing images to the build directory: - cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ - "${BUILD_DIR}"/doc/doxygen/deal.II || die - # replace links: - sed -i \ - 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ - "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" - fi - cmake_src_install - - # decompress the installed example sources: - use examples && docompress -x /usr/share/doc/${PF}/examples -} diff --git a/sci-libs/dealii/dealii-9.5.2-r1.ebuild b/sci-libs/dealii/dealii-9.5.2-r1.ebuild deleted file mode 100644 index 772395b71298..000000000000 --- a/sci-libs/dealii/dealii-9.5.2-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# deal.II uses its own FindLAPACK.cmake file that calls into the system -# FindLAPACK.cmake module and does additional internal setup. Do not remove -# any of these modules: -CMAKE_REMOVE_MODULES_LIST="" - -inherit cmake flag-o-matic verify-sig - -DESCRIPTION="Solving partial differential equations with the finite element method" -HOMEPAGE="https://www.dealii.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dealii/dealii.git" - SRC_URI="" -else - DOC_PV=9.5.0 - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz.asc ) - doc? ( - https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz.asc ) - )" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE=" - adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f - cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 - +lapack metis mpi muparser opencascade p4est petsc scalapack slepc - +sparse sundials symengine trilinos -" - -# TODO: add slepc use flag once slepc is packaged for gentoo-science -REQUIRED_USE=" - arborx? ( trilinos ) - p4est? ( mpi ) - slepc? ( petsc ) - trilinos? ( mpi )" - -RDEPEND="dev-libs/boost:= - app-arch/bzip2 - sys-libs/zlib - dev-cpp/tbb:= - arborx? ( sci-libs/arborx[mpi=] ) - adolc? ( sci-libs/adolc ) - arpack? ( sci-libs/arpack[mpi=] ) - assimp? ( media-libs/assimp:= ) - cgal? ( sci-mathematics/cgal ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - ginkgo? ( sci-libs/ginkgo ) - gmsh? ( sci-libs/gmsh ) - gsl? ( sci-libs/gsl:= ) - hdf5? ( sci-libs/hdf5:=[mpi=] ) - lapack? ( virtual/lapack ) - metis? ( - >=sci-libs/metis-5 - mpi? ( >=sci-libs/parmetis-4 ) - ) - mpi? ( virtual/mpi[cxx] ) - muparser? ( dev-cpp/muParser ) - opencascade? ( sci-libs/opencascade:= ) - p4est? ( sci-libs/p4est[mpi] ) - petsc? ( sci-mathematics/petsc[mpi=] ) - scalapack? ( sci-libs/scalapack ) - slepc? ( sci-mathematics/slepc[mpi=] ) - sparse? ( sci-libs/umfpack ) - sundials? ( sci-libs/sundials:= ) - symengine? ( >=sci-libs/symengine-0.4:= ) - trilinos? ( sci-libs/trilinos ) - || ( - dev-cpp/kokkos - sci-libs/trilinos - ) - " - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-text/doxygen[dot] dev-lang/perl )" - -BDEPEND=" - verify-sig? ( <=sec-keys/openpgp-keys-dealii-20230904 )" - -PATCHES=( - "${FILESDIR}"/${PN}-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch - "${FILESDIR}"/${PN}-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch -) - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dealii.asc" - -src_configure() { - # deal.II needs a custom build type: - local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) - - local mycmakeargs=( - -DDEAL_II_PACKAGE_VERSION="${PV}" - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DDEAL_II_ALLOW_AUTODETECTION=OFF - -DDEAL_II_ALLOW_BUNDLED=OFF - -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html" - -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}" - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples" - -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)" - -DDEAL_II_SHARE_RELDIR="share/${PN}" - -DDEAL_II_WITH_ZLIB=ON - -DDEAL_II_WITH_ADOLC="$(usex adolc)" - -DDEAL_II_WITH_ARBORX="$(usex arborx)" - -DDEAL_II_WITH_ASSIMP="$(usex assimp)" - -DDEAL_II_WITH_ARPACK="$(usex arpack)" - -DDEAL_II_WITH_CGAL="$(usex cgal)" - -DDEAL_II_WITH_CUDA="$(usex cuda)" - -DDEAL_II_WITH_GINKGO="$(usex ginkgo)" - -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)" - -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)" - -DDEAL_II_WITH_GMSH="$(usex gmsh)" - -DDEAL_II_WITH_GSL="$(usex gsl)" - -DDEAL_II_WITH_HDF5="$(usex hdf5)" - -DDEAL_II_WITH_LAPACK="$(usex lapack)" - -DDEAL_II_WITH_METIS="$(usex metis)" - -DDEAL_II_WITH_MPI="$(usex mpi)" - -DDEAL_II_WITH_MUPARSER="$(usex muparser)" - -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)" - -DDEAL_II_WITH_P4EST="$(usex p4est)" - -DDEAL_II_WITH_PETSC="$(usex petsc)" - -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)" - -DDEAL_II_WITH_SLEPC="$(usex slepc)" - -DDEAL_II_WITH_SUNDIALS="$(usex sundials)" - -DDEAL_II_WITH_SYMENGINE="$(usex symengine)" - -DDEAL_II_WITH_UMFPACK="$(usex sparse)" - -DDEAL_II_WITH_TBB=ON - -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" - ) - - use opencascade && mycmakeargs+=( - -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" - ) - - # Do a little dance for purely cosmetic QA reasons. The build system - # does query for the highest instruction set first and skips the other - # variables if a "higher" variant is set - if use cpu_flags_x86_avx512f; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes ) - append-cxxflags "-mavx512f" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes ) - append-cxxflags "-mavx2" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) - append-cxxflags "-msse2" - fi - - cmake_src_configure -} - -src_install() { - if use doc && [[ ${PV} != *9999* ]]; then - # copy missing images to the build directory: - cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ - "${BUILD_DIR}"/doc/doxygen/deal.II || die - # replace links: - sed -i \ - 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ - "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" - fi - cmake_src_install - - # decompress the installed example sources: - use examples && docompress -x /usr/share/doc/${PF}/examples -} diff --git a/sci-libs/dealii/dealii-9.6.0.ebuild b/sci-libs/dealii/dealii-9.6.0.ebuild deleted file mode 100644 index bdf2169689c0..000000000000 --- a/sci-libs/dealii/dealii-9.6.0.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# deal.II uses its own FindLAPACK.cmake file that calls into the system -# FindLAPACK.cmake module and does additional internal setup. Do not remove -# any of these modules: -CMAKE_REMOVE_MODULES_LIST="" - -inherit cmake flag-o-matic verify-sig - -DESCRIPTION="Solving partial differential equations with the finite element method" -HOMEPAGE="https://www.dealii.org/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dealii/dealii.git" - SRC_URI="" -else - DOC_PV=9.5.0 - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz.asc ) - doc? ( - https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz - verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${DOC_PV}/${PN}-${DOC_PV}-offline_documentation.tar.gz.asc ) - )" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE=" - adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f - cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 - +lapack metis mpi muparser opencascade p4est petsc scalapack slepc - +sparse sundials symengine trilinos -" - -# TODO: add slepc use flag once slepc is packaged for gentoo-science -REQUIRED_USE=" - arborx? ( trilinos ) - p4est? ( mpi ) - slepc? ( petsc ) - trilinos? ( mpi )" - -RDEPEND="dev-libs/boost:= - app-arch/bzip2 - sys-libs/zlib - dev-cpp/tbb:= - arborx? ( sci-libs/arborx[mpi=] ) - adolc? ( sci-libs/adolc ) - arpack? ( sci-libs/arpack[mpi=] ) - assimp? ( media-libs/assimp:= ) - cgal? ( sci-mathematics/cgal ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - ginkgo? ( sci-libs/ginkgo ) - gmsh? ( sci-libs/gmsh ) - gsl? ( sci-libs/gsl:= ) - hdf5? ( sci-libs/hdf5:=[mpi=] ) - lapack? ( virtual/lapack ) - metis? ( - >=sci-libs/metis-5 - mpi? ( >=sci-libs/parmetis-4 ) - ) - mpi? ( virtual/mpi[cxx] ) - muparser? ( dev-cpp/muParser ) - opencascade? ( sci-libs/opencascade:= ) - p4est? ( sci-libs/p4est[mpi] ) - petsc? ( sci-mathematics/petsc[mpi=] ) - scalapack? ( sci-libs/scalapack ) - slepc? ( sci-mathematics/slepc[mpi=] ) - sparse? ( sci-libs/umfpack ) - sundials? ( sci-libs/sundials:= ) - symengine? ( >=sci-libs/symengine-0.4:= ) - trilinos? ( sci-libs/trilinos ) - || ( - dev-cpp/kokkos - sci-libs/trilinos - ) - " - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-text/doxygen[dot] dev-lang/perl )" - -BDEPEND=" - verify-sig? ( >=sec-keys/openpgp-keys-dealii-20240811 )" - -PATCHES=( -) - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dealii.asc" - -src_configure() { - # deal.II needs a custom build type: - local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) - - local mycmakeargs=( - -DDEAL_II_PACKAGE_VERSION="${PV}" - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF - -DDEAL_II_ALLOW_AUTODETECTION=OFF - -DDEAL_II_ALLOW_BUNDLED=OFF - -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_DOCHTML_RELDIR="share/doc/${P}/html" - -DDEAL_II_DOCREADME_RELDIR="share/doc/${P}" - -DDEAL_II_COMPILE_EXAMPLES=OFF - -DDEAL_II_EXAMPLES_RELDIR="share/doc/${P}/examples" - -DDEAL_II_LIBRARY_RELDIR="$(get_libdir)" - -DDEAL_II_SHARE_RELDIR="share/${PN}" - -DDEAL_II_WITH_ZLIB=ON - -DDEAL_II_WITH_ADOLC="$(usex adolc)" - -DDEAL_II_WITH_ARBORX="$(usex arborx)" - -DDEAL_II_WITH_ASSIMP="$(usex assimp)" - -DDEAL_II_WITH_ARPACK="$(usex arpack)" - -DDEAL_II_WITH_CGAL="$(usex cgal)" - -DDEAL_II_WITH_CUDA="$(usex cuda)" - -DDEAL_II_WITH_GINKGO="$(usex ginkgo)" - -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)" - -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)" - -DDEAL_II_WITH_GMSH="$(usex gmsh)" - -DDEAL_II_WITH_GSL="$(usex gsl)" - -DDEAL_II_WITH_HDF5="$(usex hdf5)" - -DDEAL_II_WITH_LAPACK="$(usex lapack)" - -DDEAL_II_WITH_METIS="$(usex metis)" - -DDEAL_II_WITH_MPI="$(usex mpi)" - -DDEAL_II_WITH_MUPARSER="$(usex muparser)" - -DDEAL_II_WITH_OPENCASCADE="$(usex opencascade)" - -DDEAL_II_WITH_P4EST="$(usex p4est)" - -DDEAL_II_WITH_PETSC="$(usex petsc)" - -DDEAL_II_WITH_SCALAPACK="$(usex scalapack)" - -DDEAL_II_WITH_SLEPC="$(usex slepc)" - -DDEAL_II_WITH_SUNDIALS="$(usex sundials)" - -DDEAL_II_WITH_SYMENGINE="$(usex symengine)" - -DDEAL_II_WITH_UMFPACK="$(usex sparse)" - -DDEAL_II_WITH_TBB=ON - -DDEAL_II_WITH_TASKFLOW=OFF - -DDEAL_II_WITH_TRILINOS="$(usex trilinos)" - ) - - use opencascade && mycmakeargs+=( - -DCMAKE_PREFIX_PATH="/usr/$(get_libdir)/opencascade" - ) - - # Do a little dance for purely cosmetic QA reasons. The build system - # does query for the highest instruction set first and skips the other - # variables if a "higher" variant is set - if use cpu_flags_x86_avx512f; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX512=yes ) - append-cxxflags "-mavx512f" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_AVX=yes ) - append-cxxflags "-mavx2" - elif use cpu_flags_x86_avx; then - mycmakeargs+=( -DDEAL_II_HAVE_SSE2=yes ) - append-cxxflags "-msse2" - fi - - cmake_src_configure -} - -src_install() { - if use doc && [[ ${PV} != *9999* ]]; then - # copy missing images to the build directory: - cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ - "${BUILD_DIR}"/doc/doxygen/deal.II || die - # replace links: - sed -i \ - 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ - "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" - fi - cmake_src_install - - # decompress the installed example sources: - use examples && docompress -x /usr/share/doc/${PF}/examples -} diff --git a/sci-libs/dealii/dealii-9.6.2.ebuild b/sci-libs/dealii/dealii-9.6.2-r1.ebuild index bdf2169689c0..9c4390f73f45 100644 --- a/sci-libs/dealii/dealii-9.6.2.ebuild +++ b/sci-libs/dealii/dealii-9.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,7 +32,7 @@ LICENSE="LGPL-2.1+" SLOT="0" IUSE=" adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f - cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 + cpu_flags_x86_sse2 +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse sundials symengine trilinos " @@ -53,7 +53,6 @@ RDEPEND="dev-libs/boost:= arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp:= ) cgal? ( sci-mathematics/cgal ) - cuda? ( dev-util/nvidia-cuda-toolkit ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) @@ -115,7 +114,6 @@ src_configure() { -DDEAL_II_WITH_ASSIMP="$(usex assimp)" -DDEAL_II_WITH_ARPACK="$(usex arpack)" -DDEAL_II_WITH_CGAL="$(usex cgal)" - -DDEAL_II_WITH_CUDA="$(usex cuda)" -DDEAL_II_WITH_GINKGO="$(usex ginkgo)" -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)" -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)" diff --git a/sci-libs/dealii/dealii-9999.ebuild b/sci-libs/dealii/dealii-9999.ebuild index 26b651fea08e..2c4c7db59fc1 100644 --- a/sci-libs/dealii/dealii-9999.ebuild +++ b/sci-libs/dealii/dealii-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -29,7 +29,7 @@ LICENSE="LGPL-2.1+" SLOT="0" IUSE=" adolc arborx assimp arpack cgal cpu_flags_x86_avx cpu_flags_x86_avx512f - cpu_flags_x86_sse2 cuda +debug doc +examples ginkgo gmsh +gsl hdf5 + cpu_flags_x86_sse2 +debug doc +examples ginkgo gmsh +gsl hdf5 +lapack metis mpi muparser opencascade p4est petsc scalapack slepc +sparse sundials symengine trilinos " @@ -50,7 +50,6 @@ RDEPEND="dev-libs/boost:= arpack? ( sci-libs/arpack[mpi=] ) assimp? ( media-libs/assimp:= ) cgal? ( sci-mathematics/cgal ) - cuda? ( dev-util/nvidia-cuda-toolkit ) ginkgo? ( sci-libs/ginkgo ) gmsh? ( sci-libs/gmsh ) gsl? ( sci-libs/gsl:= ) @@ -107,7 +106,6 @@ src_configure() { -DDEAL_II_WITH_ASSIMP="$(usex assimp)" -DDEAL_II_WITH_ARPACK="$(usex arpack)" -DDEAL_II_WITH_CGAL="$(usex cgal)" - -DDEAL_II_WITH_CUDA="$(usex cuda)" -DDEAL_II_WITH_GINKGO="$(usex ginkgo)" -DDEAL_II_COMPONENT_DOCUMENTATION="$(usex doc)" -DDEAL_II_COMPONENT_EXAMPLES="$(usex examples)" diff --git a/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch b/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch deleted file mode 100644 index 69c2c09e679c..000000000000 --- a/sci-libs/dealii/files/dealii-9.1.1-no-ld-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/config/config_debug.pc.in b/cmake/config/config_debug.pc.in -index 5ea03885cd..32e45d8121 100644 ---- a/cmake/config/config_debug.pc.in -+++ b/cmake/config/config_debug.pc.in -@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@ - URL: https://dealii.org/ - - Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_DEBUG@ @CONFIG_INCLUDE_DIRS_PC@ --Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_DEBUG@ @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@ -+Libs: @CONFIG_LIBRARIES_DEBUG_PC@ @CONFIG_RPATH_DEBUG_PC@ -diff --git a/cmake/config/config_release.pc.in b/cmake/config/config_release.pc.in -index 726a35d040..8a879d07e8 100644 ---- a/cmake/config/config_release.pc.in -+++ b/cmake/config/config_release.pc.in -@@ -8,4 +8,4 @@ Version: @DEAL_II_VERSION@ - URL: https://dealii.org/ - - Cflags: @DEAL_II_CXX_FLAGS@ @DEAL_II_CXX_FLAGS_RELEASE@ @CONFIG_INCLUDE_DIRS_PC@ --Libs: @DEAL_II_LINKER_FLAGS@ @DEAL_II_LINKER_FLAGS_RELEASE@ @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@ -+Libs: @CONFIG_LIBRARIES_RELEASE_PC@ @CONFIG_RPATH_RELEASE_PC@ diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch deleted file mode 100644 index 85a78c4c1326..000000000000 --- a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.cc-remove-superfluous-explicit-instantiatio.patch +++ /dev/null @@ -1,59 +0,0 @@ -From aafc2c19dfd3ebc43e37ba3f13eda5f790376b1c Mon Sep 17 00:00:00 2001 -From: Matthias Maier <tamiko@43-1.org> -Date: Thu, 15 Feb 2024 15:54:36 -0600 -Subject: [PATCH 1/2] base/mpi.cc: remove superfluous explicit instantiations - of template variable - -The `mpi.h` header already contains: -``` -template <typename T> -const MPI_Datatype mpi_type_id_for_type = /* implementation detail */; -``` -Meaning, the variable is known fully after including the header. -Furthermore, the `const` qualifier marks the (template) variable as -`static`. I.e., it has internal linkage. - -Thus, we must not explicitly instantiate the variables (suggesting -"extern" linkage in all but the `mpi.cc` compilation unit). This -apparently not an issue with OpenMPI because `MPI_Datatype` is a -complex data structure. But it is an issue with mpich where -`MPI_Datatype` is a simple `int` - leading to a segmentation fault when -during program startup. ---- - source/base/mpi.cc | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/source/base/mpi.cc b/source/base/mpi.cc -index dab88e2b97..f845845764 100644 ---- a/source/base/mpi.cc -+++ b/source/base/mpi.cc -@@ -100,26 +100,6 @@ namespace Utilities - - namespace MPI - { --#ifdef DEAL_II_WITH_MPI -- // Provide definitions of template variables for all valid instantiations. -- template const MPI_Datatype mpi_type_id_for_type<bool>; -- template const MPI_Datatype mpi_type_id_for_type<char>; -- template const MPI_Datatype mpi_type_id_for_type<signed char>; -- template const MPI_Datatype mpi_type_id_for_type<short>; -- template const MPI_Datatype mpi_type_id_for_type<int>; -- template const MPI_Datatype mpi_type_id_for_type<long int>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned char>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned short>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned long int>; -- template const MPI_Datatype mpi_type_id_for_type<unsigned long long int>; -- template const MPI_Datatype mpi_type_id_for_type<float>; -- template const MPI_Datatype mpi_type_id_for_type<double>; -- template const MPI_Datatype mpi_type_id_for_type<long double>; -- template const MPI_Datatype mpi_type_id_for_type<std::complex<float>>; -- template const MPI_Datatype mpi_type_id_for_type<std::complex<double>>; --#endif -- -- - MinMaxAvg - min_max_avg(const double my_value, const MPI_Comm mpi_communicator) - { --- -2.43.0 - diff --git a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch b/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch deleted file mode 100644 index 032b12237bd2..000000000000 --- a/sci-libs/dealii/files/dealii-9.4.2-base-mpi.h-mark-a-template-variable-to-have-const-in.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2ef67e3896a2a7d0ba93539cf79310384470fc91 Mon Sep 17 00:00:00 2001 -From: Matthias Maier <tamiko@43-1.org> -Date: Thu, 15 Feb 2024 16:03:22 -0600 -Subject: [PATCH 2/2] base/mpi.h: mark a template variable to have "const - inline" linkage. - ---- - include/deal.II/base/mpi.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/deal.II/base/mpi.h b/include/deal.II/base/mpi.h -index b77fd3e7c8..8ee55fbe41 100644 ---- a/include/deal.II/base/mpi.h -+++ b/include/deal.II/base/mpi.h -@@ -1728,8 +1728,8 @@ namespace Utilities - * not satisfied. - */ - template <typename T> -- const MPI_Datatype -- mpi_type_id_for_type = internal::MPIDataTypes::mpi_type_id( -+ inline const MPI_Datatype mpi_type_id_for_type = -+ internal::MPIDataTypes::mpi_type_id( - static_cast<std::remove_cv_t<std::remove_reference_t<T>> *>(nullptr)); - #endif - --- -2.43.0 - diff --git a/sci-libs/evaluate/Manifest b/sci-libs/evaluate/Manifest index 88a84ed06e08..c0b7f045dc4e 100644 --- a/sci-libs/evaluate/Manifest +++ b/sci-libs/evaluate/Manifest @@ -1,4 +1,4 @@ AUX evaluate-0.4.0-tests.patch 8354 BLAKE2B 45c6fbcd58eb1899a02b373f882917cb2d76a05f5737a50c60d96f1eeb9b0169f8e526a475ec8aab2829f3ce47082476b802813064ca912353b65652e3f7fc64 SHA512 e296c97d5bf3d06828ddda96f00b20cb763b9c9a8611b148cf0e5c55bb78995a45df1b2cd731e4c45bfe80817ce03485a958c01c2e081aef3cd5238a9011903b -DIST evaluate-0.4.0.gh.tar.gz 292250 BLAKE2B f88428b263820c1af43d02ae676625257251476092efe624490f29e63a045d698db01e4a7a802c2330027d01bc6ccf16986f28ecf8202ecbfd943c5d7c40f6ec SHA512 f2136196fc4e5717859e36e173cd49d049fc5ef50c89f466e13edd0142830574dec0b5485a4a1097eec9cb9df756a617216ff48c141db008cb0c2b85288d7fc9 -EBUILD evaluate-0.4.0-r4.ebuild 1462 BLAKE2B 28fb3cfcf694ff587cacc0d4cf75a35239d1233ddfcadc0e24087b5c656ad43c7d1de1e6f1a4f5f89ece6e9e2bdc55d72661c96f869d15b8c12e6508a94989ac SHA512 83c9544d605312993dca423983a564eee556e5960a019bd30a7e889c0cc7f0d0cd32e6b7e71c0f54621cfe7e8a934453c6ee787ce0bd01e5c9bc3c33be6d8a9a +DIST evaluate-0.4.3.gh.tar.gz 297000 BLAKE2B 5d658cf513a0083194829618bde53c1e6f4a41e48a9ff683c79bc5b57f9f25acc38b42bed5ad56c569b7cae442212fc3dda1ce4db406ab2a49789b485c5c27a0 SHA512 f19f22fb1625544d3e27f25b159449c9f656540b5dbc62f00d13bad2dd33d5591d80f6e81d671d51f802b671602b86b758d9a53be4f63378c181f66eb93c2830 +EBUILD evaluate-0.4.3.ebuild 1660 BLAKE2B ac1d54c139914c66da7e9a282f8590255288ea50cc36e2c1e92ac73a79f1195118900eb5185fd7201dab44e7c2e5112b857a037b8a793807e030cfe19e3dad88 SHA512 639af3ad6c47a80c685fdb45c1bbef5c3c74bc7597f3049e13acb809daad6ea318ee7bbd283235dc13d0749cec4fc94577e87a760c793e639db89d4199fcd0d5 MISC metadata.xml 379 BLAKE2B a717b46962e59358925c866c64b2d0bc1dcd5d55d73e814686a09f703e339d2c0de52f6c214c8f795518d6d9dbb46443be11374643d415ff681dedca1511732b SHA512 03d6b58cad73cad46f1101fedf88ec94dc6d7a2028399a20b39939bead4fa402d00224085206a175a33d92417176cc45853060b18faa13769b80527fac9254e1 diff --git a/sci-libs/evaluate/evaluate-0.4.0-r4.ebuild b/sci-libs/evaluate/evaluate-0.4.3.ebuild index 44de1b5ec03a..109f4f0d530f 100644 --- a/sci-libs/evaluate/evaluate-0.4.0-r4.ebuild +++ b/sci-libs/evaluate/evaluate-0.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,17 +36,19 @@ BDEPEND="test? ( ') )" -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.4.0-tests.patch ) distutils_enable_tests pytest -src_prepare() { - # These require packages not available on gentoo - rm -r metrics/{bertscore,bleurt,character,charcut_mt,chrf,code_eval} || die - rm -r metrics/{competition_math,coval,google_bleu,mauve,meteor} || die - rm -r metrics/{nist_mt,rl_reliability,rouge,sacrebleu,sari} || die - rm -r metrics/{ter,trec_eval,wiki_split,xtreme_s} || die - rm -r measurements/word_length || die - rm tests/test_evaluation_suite.py || die - distutils-r1_src_prepare +src_test() { + local EPYTEST_DESELECT=( + tests/test_evaluation_suite.py::TestEvaluationSuite::test_empty_suite + tests/test_evaluation_suite.py::TestEvaluationSuite::test_running_evaluation_suite + tests/test_evaluator.py::TestAudioClassificationEvaluator::test_class_init + tests/test_evaluator.py::TestAudioClassificationEvaluator::test_overwrite_default_metric + tests/test_evaluator.py::TestAudioClassificationEvaluator::test_pipe_init + tests/test_evaluator.py::TestAudioClassificationEvaluator::test_raw_pipe_init + tests/test_metric.py::TestEvaluationcombined_evaluation::test_modules_from_string_poslabel + ) + distutils-r1_src_test } diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index 607844580ad6..16d0b8df74f6 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -13,5 +13,5 @@ DIST flann-1.9.2_p20221027-patches.tar.xz 10232 BLAKE2B 197dd8b81f4a7a43472e440d DIST flann-1.9.2_p20221027.tar.gz 34644592 BLAKE2B 822afa518a1efcfd552cee7c9bd9e14587a450d5ddae50c4d225453ab56d7297ca73f5b5bda153aea9ff37e736942057ae071ac41e3d26ac1aeb03a408171162 SHA512 14cd7d3249109ce66c43258f8b9d158efa3b57f654708e76751290eba25e2cb7fc8044a1d882c6b24d0cda1a8b206709acdb5338086ca1f2d60fef35f0fa85be EBUILD flann-1.9.1-r6.ebuild 2281 BLAKE2B 60ae0b559e56a67e9283aa2330f3c244ec9bfe86a77f0dcc93fa44359f5badcf4df4107d2166a3ff504d3d0e17429836b4d0886b6aea05fe53159d9ec77c5ad4 SHA512 3b2e76a51c792ae720e9aadb134c1ddc40690065016bd0733692c43fd6ba16cea739e3481a64beabb2aff157cc73642a90af61e12e0ba6614386045657b25234 EBUILD flann-1.9.1-r7.ebuild 2331 BLAKE2B 3719c9a7e6c1eae072e94fca69ed06a036cc09f30a05a08943165ca484583ee60bc40a73b9ae00d376ed3ff75854811f08ce8dbe411e306997b7208d4c2ae05a SHA512 0e4b3d8c30d2a4de19fa16c5e45ed3ef8425d11c8c45242755aaefef4e0c0cf67c741344f6e5a58198418d5d711418622ecffc48f24ccb25c83c6106f781fcd6 -EBUILD flann-1.9.2_p20221027.ebuild 2794 BLAKE2B 2209493b04f3839be8b7a52418fa36dd3fc9d837451f67691b1007bcf0f50c9c4e1b48aabebf5c1caf7d54300d1637473750fbac4e8061610c6da66d633c8f4b SHA512 a5fe3acfaed3cde42a12dc160b3058f6f68a45e89b9a3f2c6305f54ca06bc3d4a441252eddde3a41275cee5b889dceb33408c94dd35280c5c3e53b16fbfc7223 +EBUILD flann-1.9.2_p20221027.ebuild 2792 BLAKE2B 13def83051132ba0d8a398d3ec6cea6fbcb1b8cc72af58d184f7985c471d2c8e088f6febd397c8854c99417dab6041807e3b2cd7b5346a6ad742d1982ae6cdc8 SHA512 f4733f08b70d49c13ce7ed30c0bfd4477d6c8c840b7c738bfd2b3dce2251dd2831576ab91f68e93681930bf9be1d7b047081e0c4488f5f4df7f48ef178f26448 MISC metadata.xml 911 BLAKE2B 91ff495b936d1f5314be65367c332cab0ca78f618e6ed8197f2aa4762670feb61e6bb8155b11f5127224e4ee0c716b3e71e290030be5331db4f0722b63d151b4 SHA512 996d48a77a00584b4fe2f0c170ddbfbb92282a0a3fdde5bf0619ffc2f1f1168d50fae282e5e7758da8b94a8cb284d7744d52e8b0ac12eaaff67339942f3f667b diff --git a/sci-libs/flann/flann-1.9.2_p20221027.ebuild b/sci-libs/flann/flann-1.9.2_p20221027.ebuild index d628a4efa00f..a683eaeb0953 100644 --- a/sci-libs/flann/flann-1.9.2_p20221027.ebuild +++ b/sci-libs/flann/flann-1.9.2_p20221027.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="cuda doc examples mpi octave openmp test" RESTRICT="!test? ( test )" diff --git a/sci-libs/foxi/Manifest b/sci-libs/foxi/Manifest index 47fed03db850..71d6245decfc 100644 --- a/sci-libs/foxi/Manifest +++ b/sci-libs/foxi/Manifest @@ -1,4 +1,4 @@ AUX foxi-2021.05.27-gentoo.patch 2398 BLAKE2B 53ed8efa8c86460768839ef071567632793fadca138d72b5e7f07619db769dbbd2d4497bfb71d63ba47c201b17fb6a415a116ee05f56083c8cbc1a00b147e31a SHA512 4b81687444653d1614226b6696ee6515e652b62746187e0b44dcff1db7bfea653cee4d9e20775d6b8e2aca7430f0f654db3da95e3a784d477373da528b05b39e DIST foxi-2021.05.27.tar.gz 28960 BLAKE2B 06c960f829b090eec4fe9e8c981e119578f358724e0b63991173bb7e318d23654261b901d1e15efeb6240bba75cc05fd45ab32fb30bbdf48369e139cf152f398 SHA512 ad42cfd70e40ba0f0a9187b34ae9e3bd361c8c0038669f4c1591c4f7421d12ad93f76f42b33c2575eea1a3ddb3ff781da2895cdc636df5b60422598f450203c7 -EBUILD foxi-2021.05.27.ebuild 517 BLAKE2B 27c2c8c28625565f346b6baeeea5bc39e5aaebf0817d0ea830e641abacff60a4d8e6a20c0c65ddaf8bb02218735e289cc6808670f99486e0bf8bb01200cb212d SHA512 6d52dd1f00a957a9a763f12c0f6da9541e9757cad2e3655b9c21824c6405868dfa781dcdfbce3aed6043f73bcfda51786b5fb80773ddff39ee330efb71b7ec2f +EBUILD foxi-2021.05.27.ebuild 524 BLAKE2B f591311b2823c831b826c95c5e75713115844279b150d7207be5fcadf6eb2adae554951d9a24d583c626dd8c734fef5962e9924b5ab3a935a69dc6f2aaf4d124 SHA512 736988b1d7cf20316e180276a5739549ad71f79e7d02a5bc4be8220cea78bb4c3f654f7f5c6d5ab533c6d96014c819c3f05ddc49749e8b7b7ce90e83721ad09f MISC metadata.xml 327 BLAKE2B d9b056783fbf66675262cb93b1faf4cd410f1ea34c877480896602f07b1a6e136d7e4168d41725d4b4bd8743155508500e1f9d80b9158acce72bca7a84596953 SHA512 4598a70431dd411d24237ec4b97ec2ab57d9a46fcbcfd3416edfa1623baf7f10599c932ae22d6bd9d69f7898a1e51322ae084ececd2a44c2d73d07cc9817f863 diff --git a/sci-libs/foxi/foxi-2021.05.27.ebuild b/sci-libs/foxi/foxi-2021.05.27.ebuild index ef8a2caf3511..44f1fdeca8c9 100644 --- a/sci-libs/foxi/foxi-2021.05.27.ebuild +++ b/sci-libs/foxi/foxi-2021.05.27.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${CommitId} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" RESTRICT="test" # No test available diff --git a/sci-libs/fplll/Manifest b/sci-libs/fplll/Manifest index e3da93d45d2f..67144495cd9c 100644 --- a/sci-libs/fplll/Manifest +++ b/sci-libs/fplll/Manifest @@ -1,5 +1,3 @@ -DIST fplll-5.4.5.tar.gz 2630275 BLAKE2B 43d1601f401c3a4eba60939028b26f99d32f92b9d53b763768427d05b2d709645532c4fbb14556c8d8d92cc14efe86468469ed69a77bdb03af75ec08499cc17e SHA512 3e1281f1b993ebe4a767b7fc526f49a27d58f24b1b4c6074310cc971f6f569388d6ba27102087a2eb11671d2d5b87bd60306e2597567f4ae8dd2a9efd13beb77 DIST fplll-5.5.0.tar.gz 2633527 BLAKE2B 47a5b53fea261cb08ac04a939108414f692280806a7c12ebf851f309cfccbeb360dd1777ac595e9eacae1f23b51c6437c11c91964a04242f3a45af9f8b28de75 SHA512 c070dab206ebf692aa2afd8e6cdf412b5497488e8205332b4b726dd69283f415f86d1bcb55937a678cacd47b2068eea3f776eae8e050c4096e48d1cefd3de291 -EBUILD fplll-5.4.5.ebuild 615 BLAKE2B 1b583bed4dd760c26d83229774da1eb4d8eb9bfa8df0e7eb5a72983c12ce479a9b97bfca366ea6c4cb3f8513a6d2d2c2390c272ed1fd3c7259a7f94d6538012a SHA512 65dc826315730285f465048e6876b8f7cc250b81b8d5cc932538c7eee821f6cdfa9cf37932b59f069cb75b15db38da19238071da576814c9fdb6fa96a21872d8 EBUILD fplll-5.5.0.ebuild 615 BLAKE2B 4241b11b4904678471e3efe1a05d4c7e9708c1bf16a4f0199e7876a76bc02c3c4674d3830941de4f89fbe732f0ca42260a871babf3287387827c7c504cb7fb93 SHA512 f132ee3b3042ca760cc5f7018b81f852dee05f9ebe0f8f7489f1778555734957d80adc73d6583c9dd4417c7dcef1c9fc4f4f0c8201159a82d1c11edfa5ab1be3 MISC metadata.xml 858 BLAKE2B e27b47f6a8d0bb3c17eb023c24f95472c5f791e8a9bf86c1805d1c832b0973a665fe2231f82a289c37afd5318deb89717029ae6694005ade8e112a2769a56170 SHA512 49b6fd4968670fb0da92a883b81420e4739a893a6866ae500106181df5182324e616ccee8e0f290a7cda20f3f4d850fbf9a9462d03f0057da9ced4ba1d835ba7 diff --git a/sci-libs/fplll/fplll-5.4.5.ebuild b/sci-libs/fplll/fplll-5.4.5.ebuild deleted file mode 100644 index 57108bc65cbf..000000000000 --- a/sci-libs/fplll/fplll-5.4.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Implementations of the floating-point LLL reduction algorithm" -HOMEPAGE="https://github.com/fplll/fplll" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0/8" -KEYWORDS="amd64 ~riscv ~x86" -IUSE="qd" - -BDEPEND="virtual/pkgconfig" -DEPEND="dev-libs/gmp:0 - dev-libs/mpfr:0 - qd? ( sci-libs/qd )" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_with qd) -} - -src_install() { - default - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index eecf2ebe85b6..6d144cd0ebdc 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,21 +1,11 @@ AUX gdal-3.6.4-abseil-cpp-20230125.2-c++17.patch 528 BLAKE2B c393c21cb29687a52fbbc2283021c60ee5d2accba1c558763a6f8ed6e102aef813f0e75650adb37bc1492d9f65d9125f8d0cb361666379dba9c5adf748413770 SHA512 3849e73d5871eb62a6cec2a14f1ad480a6fb1e75f8fbfe2b9574944c2f00c43eb3429e9183db4aa4ddd5388b18488a0e5381fd5142e9983e68c3e71e70c87d27 -AUX gdal-3.7.0-zlib-OF.patch 2272 BLAKE2B 81364de12d222689f7c681cf131cc2483b536043bf7907db70ce07c50871c9594a9a17853e28749484ab7c78f4d8168962c1024a7eefb3ce1ca783cb5501a655 SHA512 e46f2fd83ac6a56206567f5668ca4d644827440aa32938b87dc0b3beacc107fb5573fc228949e02d88a06f29d651699d6f0481ecba6666b0888dca76e196d547 -AUX gdal-3.8.0-java21.patch 911 BLAKE2B 69c2862b90b7c53d34200172fb17279608fbe2255550a27278bc4ad9012b15436fc950e41555fd79355400a1aa2856428ef9d3706eaf52dafd1280a180dc5916 SHA512 55cd5b466e45182699a8442461f95caa250521e21a77c9367ddfd6cdd04ed485a106b725144ef23e284f6505ce39ec4a266ded7932e41d6c535c5eb47a8724fa -AUX gdal-3.8.0-libxml2-2.12-1.patch 923 BLAKE2B e75eb8edb5507450ded3bca618a03a283ba49791df416b0a7732f859d93124704e8508fcd11271bbbeef299d05d3ad2df9e03bd805580445407cb6b8c003a98e SHA512 cace97fb0a690b9ef40a2038a8a40070257682e87ff5f90ebf57d3bbb444257a5f06e58403c8607f3f5b0195a6c756146f7d84f4bf7d34a7a0ac94ad07aa08bb -AUX gdal-3.8.0-libxml2-2.12-2.patch 1118 BLAKE2B 5c0abcfcfbb0ca2a96156abb4c7daaf4860fa30d553228172eb8def8b2f95e93bae9217974fba9621dcf9921e906a5ada9b710b1c0b29e7e580191a0a56a76e2 SHA512 acefa260368a85ab3d3c1436d3fdb60accf13424104c07f1100c9b84a45d99cde1b6baec09f01bd83316bce864e9347b89bfe0310ebe8e0f96c81858bed698ba -AUX gdal-3.8.5-poppler-24.05.0.patch 1007 BLAKE2B b0bed1a9b145226581e9047c0d810ea1101e6f83c9ee2c533dfff771d3ad57599738492994652bb39e6d0d79158efe953b530799f6861b45385a1e14c54badca SHA512 2fcb7ea4f09978b6c3542eef3ed1cf34eb86c4412bef129c3822e6b03d8ae240fedcdf90c6f490f5eb4bc173cb06af36cdba253a63924e63736aeef22071a4ab AUX gdal-3.9.1-poppler-24.12.patch 1020 BLAKE2B 34b60c612415fd4a8c1f001479ce4aee8282ab3364317fdc537808d52aa7a99c3aa1dcf142c3e7eba8f566fb61af5818d34a1d194961f1168cc2ba5c0e225ddf SHA512 fd8754288ba9844efb81410037c02aa64d6241f9bfb58d4547bded259773a51636cc30c37f223a5503a2adf0fb9beca249f593323ead2cc8eb9b52825438ad88 -DIST gdal-3.8.0.tar.xz 8853728 BLAKE2B 646aa91283e7228a054221d120bddb456c8b898f9155edd289f2b2e0bf8706fa3045a98d26e4cf5ba5dba6d8c1c7f0a7f4aaaded9457481a65910c2d313c8f9d SHA512 42b3a381190922e546ae83355f56532b92d519b1eac357a9c116ee19b67b67362f282e248e2d82c14ae04cae04dce175bb652f481879442ffa5b58f764a088dd -DIST gdal-3.8.5.tar.xz 8871404 BLAKE2B 2c5f9b3fa1c3d5d7879c2aa1c95f82c6360b35a259443a8ad68ff8f471f4efa8d2fd7935c57317ee5e94789244067706967f9c5df413bccd2556b5790d51d349 SHA512 4cdf1c45ea110cf6ba6ffe5b890ebd8f82654899ed6224ede6c59864f28626c758b5ea15f26c1840a4d3f70abaf9c1255754c565ef2fe5e5b39e0499ace63521 -DIST gdal-3.9.0.tar.xz 9081116 BLAKE2B 5b1453b889768359d36c6da435b27f6d31bb1ba95cecfd05d525d63258100705778d2675219711d0c2ab0e2392dd0eabffa1af3ffd055ebfc14840aaa1e768c0 SHA512 05e50a3898b4c71351125c59b0058eb8213858ef14f213b251dee44638522e7e87ed660d028677803a74728543531b0f438e53a543e6529bb8cdc391e9a09b02 +AUX gdal-3.9.3-poppler-25.02.patch 9102 BLAKE2B bb27230be483273810ccc13cfa897c7bbcc25af10c1eaf2f59987d6082ab04ff46dc39214cc79626ca8d004a4d3224fbab9b3ab2f13927928cb81c6dbda92a22 SHA512 cc4089d32ad2dfbfd053743e663ac479338d784d627a68847328c189a8c45f2ac8ee535cb02607a312d9a9b36dca7fe8f9ea8d7e9ef967b42f3af67e204d9253 +AUX gdal-3.9.3-poppler-autotest-25.02.patch 864 BLAKE2B 04e33f575f2b24db155663d2db9335a4f66876fb35ff73892e10fde445879dde45cd62eae2109b94025d2f7b3340310a8ac3d83e8b91c94c053b5c233fc0e1a1 SHA512 618f238ad14e772658c5ead4443c908ae37521b413583cc0dcfd027e335b6770ebeea41b3238cf8fb2919eb622da6b4ff0e5939d52d6793abdae8c8c2b7beb34 DIST gdal-3.9.1.tar.xz 9098844 BLAKE2B a9c5c20b1bc704a331ea54f1575f655197075dde75fa6144cff43763d57d64b9bd6e3c7a40bedb919567b45185688b206a3cc13278d0605c5be0b895b403bbab SHA512 5f4edc65ffb1eb187fa83259a25f4a078fbc75e21b39d21b17660a8ccf3322ca13de263ff91531cdf7a2e2871d1dd4275b88af37c122080fc16bef2436e1edb6 -DIST gdalautotest-3.8.0.tar.gz 15615239 BLAKE2B fa524bb796a6f5b28bea79b51c4ce34e231b1d10a108a4590e30a48dc946df45880828a5a1ee0db07ed191e0f7dd5631fb294f3a73d1ce24244b6132f5cc3de1 SHA512 e72705571a337412d379cdf36debbe01aca61e789527c5e1f1c47904ba817c390a04032913fde75f899b96ec4f0b3a849ec3ead2539c31b59ca5006cd5e4e431 -DIST gdalautotest-3.8.5.tar.gz 15711701 BLAKE2B 3f0a5ba7f6a2072aaf46e2867739faaba9fae89f2679ad5cb4cb356112b197141e996fc10365bb6a95c3fce648a440bd746aa68f5c52a8743995cf696d230ef0 SHA512 18251e2fe5870bcbbde9c4278d7ce969feb6397a727679f56e6cf051cf5a3ded29217c034566cb9c5ebb02d51ad4d12933ab918eeadb0017c78859892bbf4f19 -DIST gdalautotest-3.9.0.tar.gz 16280839 BLAKE2B e9d294dcbf98b052889b807992ec435837da37a8ecf6bf97ab3cac5c798feea4f69c930cfcecbe072f959c140788136f34525fed9086e14d9bf4fb1fe44e0113 SHA512 411037da7c8de6985dad7b5f3868527b8f59b280a2b7fd29addab81ae1ae58f8611843de355d9a39ea3fca09001b7931c669f379e88b407116784e597b2cda7f +DIST gdal-3.9.3.tar.xz 9110460 BLAKE2B 0ae536ff832a3659dd9e56d32f2695b9428c24b1a0d75845c860ce7c78eb462cf78df7e821d814287f4c37ccf79f938256fe662a09c4bd936843a75157f29c8c SHA512 e8d4c8c97946a68775d03ecf1f192d950bf01b7a40ff7bf35a6f535dd08b370a26d5646da84179e4864aa59ebfbceae7e77bbb04b745bdd26fde555f6ae0708e DIST gdalautotest-3.9.1.tar.gz 16681261 BLAKE2B c6eecb5bdd3d9b9730f49ba88dc9d5c1098990f1dfe34b9a181bf30a71570d382b36a7d22026e8ebb3c2e6e24ae4a4de321f70d6960784aed283d7e7511cb578 SHA512 e35c3dbd4239b1404b0fb774dae1d675bdfbc406d97ac909ec0e20b57d60fbc9236158871249fbdf9e3fb727b3d16a13a366803462afde9f2be4cb1efd91bf6e -EBUILD gdal-3.8.0-r1.ebuild 7637 BLAKE2B 880de2388b10f4de0a049ccee96fe53b857afbfd998e22479b64ed68dce3439c524315b06818dfc863c2258d3557e70fa63404008a443acc5e645400b11d7c14 SHA512 08c344e5faf22d9e2212850c4ac9018172e587cfe09bfc614086bdfcc6ee3e5561167eedc479e8ddcfab6e415f5da96fecd6ce3cf707955d109c94f7440ba3d1 -EBUILD gdal-3.8.5.ebuild 7592 BLAKE2B b84884742702cf708847a403e8069ed46916cd038a35013fddf94043994904001bfe6577e738e708b341759495ad9fd8e3c5726440498b08e9a3001d6152317a SHA512 86d8586f309023be222c0aa56a6a6dd7aa3851cd0ca8b4b3b7b40ea6cf388e8cb5dd1b70d945c22c06899461b275320a8a5ec1b1f785c849906a2094d1b3c786 -EBUILD gdal-3.9.0.ebuild 7570 BLAKE2B 62464361be497f14052f94cfff55ac357d0822b3fd95e461e8ced40516352a7333ec0fd4671238646775e593f2f64454d3416f01dfb0dd13944593983269279a SHA512 bf53744c3266dac39540c5e2a261e1b16ad92ca71877fb16bc7de0d83523151f6c2d02081967182fa3aea75d3981d41d9a0697852351f56362e1e87e9226f0fc -EBUILD gdal-3.9.1-r1.ebuild 7670 BLAKE2B dc70476a63d4bdc0b006dfdea2a4a99cdd1c17d0dac5ba65aed3a26e4977f6a4e6cbd697547ff55bede9f91aa7e975da3c2569f9b2117e9611a3c2cdbe273737 SHA512 d22370fb4978c54604ba475e660b3b4d5766d59153dcc7bf082675a33239caad00d9dbeefaf5d3fdcf41a8b9586e236fb7ea77e0ea010ffaf4be6d84ac72a8fa +DIST gdalautotest-3.9.3.tar.gz 17239532 BLAKE2B 991e24ac3181e1ab4837933183520828fc4f5416ce0f3e6e13a12052db301286898eaecd80f8b6765f19876be786b95854c1efef6cccfe02cacedae5f00302e6 SHA512 a9f44065bb5817cdc32995cd57f65f8a588dfaea77d4a5bc2d9ea361ef1423843358d7e31be2e27505b6e991d07b18f0f5c3fd9526cf697c74bc88f558205d61 EBUILD gdal-3.9.1.ebuild 7574 BLAKE2B 986054296a096755065582c067f0ded9c2161fa83c081624c6859a7e2cb7a995ffb50f622c89a36c36ba91c5542281e4c1dc18c48e3ccfb1e6b5ac6cd407da41 SHA512 1d74a6d9ead2365c65856dbb45f6f2af3df4aa7c02df28e07c1389131c37510ab6e44c7b2a7f1b78e64e49bfa5046fe5ef9131ca7d11be684f9ecc76ede09d4b +EBUILD gdal-3.9.3.ebuild 7777 BLAKE2B 41e042ee4b02154318e3dcc57259422648be7b56bb6f9d430c8d05a5636c15488ac2f9faea15d1937dfbbc7157f8868d581409c771f2e93aafa817fce76a43c6 SHA512 39456e34c0d9cde5ca778b7945e51f25c6f921bded4ec6353745c88558bff2cc7cf6191a2b5c65d4de02a9baf2113d38e7fddbea256438f3104b4097fa175a1b MISC metadata.xml 1401 BLAKE2B f76e292c72b879bf98dd9e009bdc3aabd5d1ca134d2f867a38faafa755db99b39d217b12105a184ca2ad4943704b8f1df6d129605f59485dc74114e88bfcbbed SHA512 54342a758b5d8c0b7dac325565cb7ace9ac32a6a27b621bea232ade813f9bc6b002049fb0293b7b838dd9f0ec10719ccf8f11197227acfbeddc77b4f87dc4a12 diff --git a/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch b/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch deleted file mode 100644 index 5f6dafeab525..000000000000 --- a/sci-libs/gdal/files/gdal-3.7.0-zlib-OF.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/frmts/zlib/contrib/infback9/minified_zutil.c -+++ b/frmts/zlib/contrib/infback9/minified_zutil.c -@@ -8,9 +8,9 @@ - #include "minified_zutil.h" - - #ifndef STDC --extern voidp malloc OF((uInt size)); --extern voidp calloc OF((uInt items, uInt size)); --extern void free OF((voidpf ptr)); -+extern voidp malloc (uInt size); -+extern voidp calloc (uInt items, uInt size); -+extern void free (voidpf ptr); - #endif - - voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size) ---- a/frmts/zlib/contrib/infback9/minified_zutil.h -+++ b/frmts/zlib/contrib/infback9/minified_zutil.h -@@ -191,9 +191,9 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ - /* provide prototypes for these when building zlib without LFS */ - #if !defined(_WIN32) && \ - (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) -- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); -- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); -- ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t)); -+ ZEXTERN uLong ZEXPORT adler32_combine64 (uLong, uLong, z_off_t); -+ ZEXTERN uLong ZEXPORT crc32_combine64 (uLong, uLong, z_off_t); -+ ZEXTERN uLong ZEXPORT crc32_combine_gen64 (z_off_t); - #endif - - /* common defaults */ -@@ -232,16 +232,16 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ - # define zmemzero(dest, len) memset(dest, 0, len) - # endif - #else -- void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); -- int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); -- void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); -+ void ZLIB_INTERNAL zmemcpy (Bytef* dest, const Bytef* source, uInt len); -+ int ZLIB_INTERNAL zmemcmp (const Bytef* s1, const Bytef* s2, uInt len); -+ void ZLIB_INTERNAL zmemzero (Bytef* dest, uInt len); - #endif - - /* Diagnostic functions */ - #ifdef ZLIB_DEBUG - # include <stdio.h> - extern int ZLIB_INTERNAL z_verbose; -- extern void ZLIB_INTERNAL z_error OF((char *m)); -+ extern void ZLIB_INTERNAL z_error (char *m); - # define Assert(cond,msg) {if(!(cond)) z_error(msg);} - # define Trace(x) {if (z_verbose>=0) fprintf x ;} - # define Tracev(x) {if (z_verbose>0) fprintf x ;} diff --git a/sci-libs/gdal/files/gdal-3.8.0-java21.patch b/sci-libs/gdal/files/gdal-3.8.0-java21.patch deleted file mode 100644 index 3e924c5206c1..000000000000 --- a/sci-libs/gdal/files/gdal-3.8.0-java21.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/swig/java/build.xml -+++ b/swig/java/build.xml -@@ -21,7 +21,7 @@ - <target name="compile" depends="init" description="Compile the source files."> - <mkdir dir="${build_dir}/build/classes"/> - <javac srcdir="${build_dir}/org" destdir="${build_dir}/build/classes" -- debug="on" source="7" target="7" -+ debug="on" source="8" target="8" - includeantruntime="false" deprecation="true"> - </javac> - <echo>compilation complete</echo> -@@ -38,7 +38,7 @@ - <target name="compile_tests" depends="archive" description="Compile the tests files."> - <mkdir dir="${build_dir}/build/apps"/> - <javac srcdir="${source_apps}" destdir="${build_dir}/build/apps" -- debug="on" source="7" target="7" -+ debug="on" source="8" target="8" - includeantruntime="false" deprecation="true" classpath="${build_dir}/gdal.jar"> - </javac> - <echo>compilation of tests complete</echo> diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch deleted file mode 100644 index 606dc3e05089..000000000000 --- a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cbed9fc91dffba30d0f9a6a06a412a04d9cd36fa Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Sat, 18 Nov 2023 15:38:46 +0100 -Subject: [PATCH] Fix build error with libxml2 2.12 - ---- - port/cpl_xml_validate.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp -index 7eb49ff40c90..29070d957b65 100644 ---- a/port/cpl_xml_validate.cpp -+++ b/port/cpl_xml_validate.cpp -@@ -914,7 +914,7 @@ static void CPLLibXMLWarningErrorCallback(void *ctx, const char *msg, ...) - - if (strstr(pszStr, "since this namespace was already imported") == nullptr) - { -- xmlErrorPtr pErrorPtr = xmlGetLastError(); -+ const xmlError *pErrorPtr = xmlGetLastError(); - const char *pszFilename = static_cast<char *>(ctx); - char *pszStrDup = CPLStrdup(pszStr); - int nLen = static_cast<int>(strlen(pszStrDup)); diff --git a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch b/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch deleted file mode 100644 index 410b79e2ec15..000000000000 --- a/sci-libs/gdal/files/gdal-3.8.0-libxml2-2.12-2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ec33f6d6dfe944f59dc5454d01b4d000d9479c02 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Sat, 18 Nov 2023 16:33:25 +0100 -Subject: [PATCH] Fix build error with libxml2 2.12 (cont'd) - ---- - gcore/gdaljp2metadatagenerator.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp -index b6caa2db9def..751fa3d5e9dd 100644 ---- a/gcore/gdaljp2metadatagenerator.cpp -+++ b/gcore/gdaljp2metadatagenerator.cpp -@@ -357,7 +357,12 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString &osTemplate, - /************************************************************************/ - - static void GDALGMLJP2XPathErrorHandler(void * /* userData */, -- xmlErrorPtr error) -+#if LIBXML_VERSION >= 21200 -+ const xmlError *error -+#else -+ xmlErrorPtr error -+#endif -+) - { - if (error->domain == XML_FROM_XPATH && error->str1 != nullptr && - error->int1 < static_cast<int>(strlen(error->str1))) diff --git a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch b/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch deleted file mode 100644 index 837a50f6b825..000000000000 --- a/sci-libs/gdal/files/gdal-3.8.5-poppler-24.05.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 60dcddbf5fab917338caf433b3e7dca283cf9720 Mon Sep 17 00:00:00 2001 -From: Even Rouault <even.rouault@spatialys.com> -Date: Thu, 4 Apr 2024 17:48:33 +0200 -Subject: [PATCH] Fix build with Poppler 24.05 (unreleased yet) - ---- - frmts/pdf/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt -index 9b9a1898a730..bcb19c3aa24c 100644 ---- a/frmts/pdf/CMakeLists.txt -+++ b/frmts/pdf/CMakeLists.txt -@@ -54,6 +54,9 @@ if (GDAL_USE_POPPLER) - if ("${Poppler_VERSION_MINOR}" MATCHES "0?[0-9]+") - string(REGEX REPLACE "0?([0-9]+)" "\\1" Poppler_VERSION_MINOR ${Poppler_VERSION_MINOR}) - endif () -+ if (Poppler_VERSION_STRING VERSION_GREATER_EQUAL "24.05") -+ target_compile_features(gdal_PDF PRIVATE cxx_std_20) -+ endif () - target_compile_definitions(gdal_PDF PRIVATE -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=${Poppler_VERSION_MAJOR} - -DPOPPLER_MINOR_VERSION=${Poppler_VERSION_MINOR}) - endif () diff --git a/sci-libs/gdal/files/gdal-3.9.3-poppler-25.02.patch b/sci-libs/gdal/files/gdal-3.9.3-poppler-25.02.patch new file mode 100644 index 000000000000..dd1e374be5ce --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.9.3-poppler-25.02.patch @@ -0,0 +1,240 @@ +From f6d4e0608dabfd4f2712172bdb604996178eb744 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Thu, 6 Feb 2025 14:41:52 +0100 +Subject: [PATCH] Build: fix build against Poppler 25.02.00 + +Fixes #11804 +--- + frmts/pdf/pdfdataset.cpp | 41 ++++++++++++++++++++++++++---- + frmts/pdf/pdfio.cpp | 17 +++++++++++++ + frmts/pdf/pdfio.h | 12 +++++++++ + frmts/pdf/pdfobject.cpp | 6 ++--- + frmts/pdf/pdfobject.h | 2 +- + frmts/pdf/pdfsdk_headers.h | 9 +++++-- + 6 files changed, 76 insertions(+), 11 deletions(-) + +diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +--- a/frmts/pdf/pdfdataset.cpp ++++ b/frmts/pdf/pdfdataset.cpp +@@ -1964,6 +1964,14 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize, + PDFDoc *poDoc = m_poDocPoppler; + poSplashOut->startDoc(poDoc); + ++ // Note: Poppler 25.2 is certainly not the lowest version where we can ++ // avoid the hack. ++#if !(POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)) ++#define USE_OPTCONTENT_HACK ++#endif ++ ++#ifdef USE_OPTCONTENT_HACK + /* EVIL: we modify a private member... */ + /* poppler (at least 0.12 and 0.14 versions) don't render correctly */ + /* some PDFs and display an error message 'Could not find a OCG with +@@ -1978,6 +1986,7 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize, + OCGs *poOldOCGs = poCatalog->optContent; + if (!m_bUseOCG) + poCatalog->optContent = nullptr; ++#endif + try + { + poDoc->displayPageSlice(poSplashOut, m_iPage, m_dfDPI, m_dfDPI, 0, +@@ -1988,14 +1997,19 @@ CPLErr PDFDataset::ReadPixels(int nReqXOff, int nReqYOff, int nReqXSize, + { + CPLError(CE_Failure, CPLE_AppDefined, + "PDFDoc::displayPageSlice() failed with %s", e.what()); ++ ++#ifdef USE_OPTCONTENT_HACK + /* Restore back */ + poCatalog->optContent = poOldOCGs; ++#endif + delete poSplashOut; + return CE_Failure; + } + ++#ifdef USE_OPTCONTENT_HACK + /* Restore back */ + poCatalog->optContent = poOldOCGs; ++#endif + + SplashBitmap *poBitmap = poSplashOut->getBitmap(); + if (poBitmap->getWidth() != nReqXSize || +@@ -3734,9 +3748,14 @@ void PDFDataset::ExploreLayersPoppler(GDALPDFArray *poArray, + } + else + osCurLayer = std::move(osName); +- // CPLDebug("PDF", "Layer %s", osCurLayer.c_str()); ++ // CPLDebug("PDF", "Layer %s", osCurLayer.c_str()); + +- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ OCGs *optContentConfig = ++ m_poDocPoppler->getOptContentConfig(); + struct Ref r; + r.num = poObj->GetRefNum().toInt(); + r.gen = poObj->GetRefGen(); +@@ -3772,11 +3791,19 @@ void PDFDataset::FindLayersPoppler(int iPageOfInterest) + if (poPages) + nPageCount = poPages->GetLength(); + +- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); + if (optContentConfig == nullptr || !optContentConfig->isOk()) + return; + +- Array *array = optContentConfig->getOrderArray(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ Array *array = optContentConfig->getOrderArray(); + if (array) + { + GDALPDFArray *poArray = GDALPDFCreateArray(array); +@@ -3812,7 +3839,11 @@ void PDFDataset::FindLayersPoppler(int iPageOfInterest) + + void PDFDataset::TurnLayersOnOffPoppler() + { +- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); + if (optContentConfig == nullptr || !optContentConfig->isOk()) + return; + +diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp +--- a/frmts/pdf/pdfio.cpp ++++ b/frmts/pdf/pdfio.cpp +@@ -237,23 +237,40 @@ int VSIPDFFileStream::lookChar() + /* reset() */ + /************************************************************************/ + ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++bool VSIPDFFileStream::reset() ++#else + void VSIPDFFileStream::reset() ++#endif + { + nSavedPos = VSIFTellL(f); + bHasSavedPos = TRUE; + VSIFSeekL(f, nCurrentPos = nStart, SEEK_SET); + nPosInBuffer = -1; + nBufferLength = -1; ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ return true; ++#endif + } + + /************************************************************************/ + /* unfilteredReset() */ + /************************************************************************/ + ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2) ++bool VSIPDFFileStream::unfilteredReset() ++{ ++ return reset(); ++} ++#else + void VSIPDFFileStream::unfilteredReset() + { + reset(); + } ++#endif + + /************************************************************************/ + /* close() */ +diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h +--- a/frmts/pdf/pdfio.h ++++ b/frmts/pdf/pdfio.h +@@ -48,8 +48,20 @@ class VSIPDFFileStream final : public BaseStream + virtual int getUnfilteredChar() override; + virtual int lookChar() override; + ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ virtual bool reset() override; ++#else + virtual void reset() override; ++#endif ++ ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2) ++ virtual bool unfilteredReset() override; ++#else + virtual void unfilteredReset() override; ++#endif ++ + virtual void close() override; + + bool FoundLinearizedHint() const +diff --git a/frmts/pdf/pdfobject.cpp b/frmts/pdf/pdfobject.cpp +--- a/frmts/pdf/pdfobject.cpp ++++ b/frmts/pdf/pdfobject.cpp +@@ -979,11 +979,11 @@ class GDALPDFDictionaryPoppler : public GDALPDFDictionary + class GDALPDFArrayPoppler : public GDALPDFArray + { + private: +- Array *m_poArray; ++ const Array *m_poArray; + std::vector<std::unique_ptr<GDALPDFObject>> m_v; + + public: +- GDALPDFArrayPoppler(Array *poArray) : m_poArray(poArray) ++ GDALPDFArrayPoppler(const Array *poArray) : m_poArray(poArray) + { + } + +@@ -1334,7 +1334,7 @@ std::map<CPLString, GDALPDFObject *> &GDALPDFDictionaryPoppler::GetValues() + /* GDALPDFCreateArray() */ + /************************************************************************/ + +-GDALPDFArray *GDALPDFCreateArray(Array *array) ++GDALPDFArray *GDALPDFCreateArray(const Array *array) + { + return new GDALPDFArrayPoppler(array); + } +diff --git a/frmts/pdf/pdfobject.h b/frmts/pdf/pdfobject.h +--- a/frmts/pdf/pdfobject.h ++++ b/frmts/pdf/pdfobject.h +@@ -405,7 +405,7 @@ class GDALPDFObjectPoppler : public GDALPDFObject + virtual int GetRefGen() override; + }; + +-GDALPDFArray *GDALPDFCreateArray(Array *array); ++GDALPDFArray *GDALPDFCreateArray(const Array *array); + + #endif // HAVE_POPPLER + +diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h +--- a/frmts/pdf/pdfsdk_headers.h ++++ b/frmts/pdf/pdfsdk_headers.h +@@ -51,10 +51,15 @@ + + #include <Dict.h> + +-#define private \ +- public /* Ugly! Catalog::optContent is private but we need it... */ ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++#include <Catalog.h> ++#else ++/* Ugly! Catalog::optContent is private but we need it for ancient Poppler versions. */ ++#define private public + #include <Catalog.h> + #undef private ++#endif + + #define private public /* Ugly! PDFDoc::str is private but we need it... */ + #include <PDFDoc.h> diff --git a/sci-libs/gdal/files/gdal-3.9.3-poppler-autotest-25.02.patch b/sci-libs/gdal/files/gdal-3.9.3-poppler-autotest-25.02.patch new file mode 100644 index 000000000000..6048c886b690 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.9.3-poppler-autotest-25.02.patch @@ -0,0 +1,23 @@ +From f6d4e0608dabfd4f2712172bdb604996178eb744 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Thu, 6 Feb 2025 14:41:52 +0100 +Subject: [PATCH] Build: fix build against Poppler 25.02.00 + +Fixes #11804 +--- + autotest/gdrivers/pdf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/autotest/gdrivers/pdf.py b/autotest/gdrivers/pdf.py +index 7b74e9b5384c..373604068ec3 100755 +--- a/autotest/gdrivers/pdf.py ++++ b/autotest/gdrivers/pdf.py +@@ -1524,7 +1524,7 @@ def test_pdf_extra_rasters(poppler_or_pdfium): + "LAYER_01_NAME=subbyte", + ], "did not get expected layers" + if pdf_is_poppler(): +- assert cs in (7926, 8177, 8174, 8165, 8172) ++ assert cs in (7926, 8177, 8174, 8165, 8172, 8193) + + + ############################################################################### diff --git a/sci-libs/gdal/gdal-3.8.0-r1.ebuild b/sci-libs/gdal/gdal-3.8.0-r1.ebuild deleted file mode 100644 index a903d1cf0d06..000000000000 --- a/sci-libs/gdal/gdal-3.8.0-r1.ebuild +++ /dev/null @@ -1,288 +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} ) -inherit cmake java-pkg-opt-2 python-single-r1 - -DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" -HOMEPAGE="https://gdal.org/" -SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz" -SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )" - -LICENSE="BSD Info-ZIP MIT" -SLOT="0/34" # subslot is libgdal.so.<SONAME> -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - spatialite? ( sqlite ) - test? ( ${PYTHON_REQUIRED_USE} ) -" - -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/doxygen ) - java? ( - >=dev-java/ant-1.10.14-r3:0 - dev-lang/swig - ) - python? ( - dev-lang/swig - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - test? ( - ${PYTHON_DEPS} - dev-cpp/gtest - ) -" -DEPEND=" - dev-libs/expat - dev-libs/json-c:= - dev-libs/libpcre2 - dev-libs/libxml2:2 - dev-libs/openssl:= - media-libs/tiff - >=sci-libs/libgeotiff-1.5.1-r1:= - >=sci-libs/proj-6.0.0:= - sys-libs/zlib[minizip(+)] - armadillo? ( sci-libs/armadillo:=[lapack] ) - curl? ( net-misc/curl ) - fits? ( sci-libs/cfitsio:= ) - geos? ( >=sci-libs/geos-3.8.0 ) - gif? ( media-libs/giflib:= ) - gml? ( >=dev-libs/xerces-c-3.1 ) - heif? ( media-libs/libheif:= ) - hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) - java? ( - >=virtual/jdk-1.8:*[-headless-awt] - ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - lzma? ( || ( - app-arch/xz-utils - app-arch/lzma - ) ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf:= ) - odbc? ( dev-db/unixODBC ) - ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) - opencl? ( virtual/opencl ) - oracle? ( dev-db/oracle-instantclient:= ) - pdf? ( app-text/poppler:= ) - png? ( media-libs/libpng:= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) - spatialite? ( dev-db/spatialite ) - sqlite? ( dev-db/sqlite:3 ) - webp? ( media-libs/libwebp:= ) - xls? ( dev-libs/freexl ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} - java? ( >=virtual/jre-1.8:* ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - _wstat64 # Windows LFS -) - -PATCHES=( - "${FILESDIR}/gdal-3.8.0-java21.patch" - "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch - "${FILESDIR}"/${PN}-3.7.0-zlib-OF.patch - "${FILESDIR}"/${P}-libxml2-2.12-{1,2}.patch # bug 917564 -) - -pkg_setup() { - if use python || use test ; then - python-single-r1_pkg_setup - fi - - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if use test ; then - mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_IPO=OFF - -DGDAL_USE_EXTERNAL_LIBS=ON - -DGDAL_USE_INTERNAL_LIBS=OFF - -DBUILD_TESTING=$(usex test) - - # bug #844874 and bug #845150 - -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" - - # Options here are generally off because of one of: - # - Not yet packaged dependencies - # - # - Off for autotools build and didn't want more churn by - # enabling during port to CMake. Feel free to request them - # being turned on if useful for you. - -DGDAL_USE_ARMADILLO=$(usex armadillo) - -DGDAL_USE_ARROW=OFF - -DGDAL_USE_BLOSC=OFF - -DGDAL_USE_BRUNSLI=OFF - -DGDAL_USE_CRNLIB=OFF - -DGDAL_USE_CFITSIO=$(usex fits) - -DGDAL_USE_CURL=$(usex curl) - -DGDAL_USE_CRYPTOPP=OFF - -DGDAL_USE_DEFLATE=OFF - -DGDAL_USE_ECW=OFF - -DGDAL_USE_EXPAT=ON - -DGDAL_USE_FILEGDB=OFF - -DGDAL_USE_FREEXL=$(usex xls) - -DGDAL_USE_FYBA=OFF - -DGDAL_USE_GEOTIFF=ON - -DGDAL_USE_GEOS=$(usex geos) - -DGDAL_USE_GIF=$(usex gif) - -DGDAL_USE_GTA=OFF - -DGDAL_USE_HEIF=$(usex heif) - -DGDAL_USE_HDF4=OFF - -DGDAL_USE_HDF5=$(usex hdf5) - -DGDAL_USE_HDFS=OFF - -DGDAL_USE_ICONV=ON # TODO dep - -DGDAL_USE_IDB=OFF - -DGDAL_USE_JPEG=$(usex jpeg) - - # https://gdal.org/build_hints.html#jpeg12 - # Independent of whether using system libjpeg - -DGDAL_USE_JPEG12_INTERNAL=ON - - -DGDAL_USE_JSONC=ON - -DGDAL_USE_JXL=OFF - -DGDAL_USE_KDU=OFF - -DGDAL_USE_KEA=OFF - -DGDAL_USE_LERC=OFF - -DGDAL_USE_LIBKML=OFF - -DGDAL_USE_LIBLZMA=$(usex lzma) - -DGDAL_USE_LIBXML2=ON - -DGDAL_USE_LURATECH=OFF - -DGDAL_USE_LZ4=OFF - -DGDAL_USE_MONGOCXX=OFF - -DGDAL_USE_MRSID=OFF - -DGDAL_USE_MSSQL_NCLI=OFF - -DGDAL_USE_MSSQL_ODBC=OFF - -DGDAL_USE_MYSQL=$(usex mysql) - -DGDAL_USE_NETCDF=$(usex netcdf) - -DGDAL_USE_ODBC=$(usex odbc) - -DGDAL_USE_ODBCCPP=OFF - -DGDAL_USE_OGDI=$(usex ogdi) - -DGDAL_USE_OPENCAD=OFF - -DGDAL_USE_OPENCL=$(usex opencl) - -DGDAL_USE_OPENEXR=OFF - -DGDAL_USE_OPENJPEG=$(usex jpeg2k) - -DGDAL_USE_OPENSSL=ON - -DGDAL_USE_ORACLE=$(usex oracle) - -DGDAL_USE_PARQUET=OFF - -DGDAL_USE_PCRE2=ON - -DGDAL_USE_PDFIUM=OFF - -DGDAL_USE_PNG=$(usex png) - -DGDAL_USE_PODOFO=OFF - -DGDAL_USE_POPPLER=$(usex pdf) - -DGDAL_USE_POSTGRESQL=$(usex postgres) - -DGDAL_USE_QHULL=OFF - -DGDAL_USE_RASTERLITE2=OFF - -DGDAL_USE_RDB=OFF - -DGDAL_USE_SPATIALITE=$(usex spatialite) - -DGDAL_USE_SQLITE3=$(usex sqlite) - -DGDAL_USE_SFCGAL=OFF - -DGDAL_USE_TEIGHA=OFF - -DGDAL_USE_TIFF=ON - -DGDAL_USE_TILEDB=OFF - -DGDAL_USE_WEBP=$(usex webp) - -DGDAL_USE_XERCESC=$(usex gml) - -DGDAL_USE_ZLIB=ON - -DGDAL_USE_ZSTD=$(usex zstd) - - # Bindings - -DBUILD_PYTHON_BINDINGS=$(usex python) - -DBUILD_JAVA_BINDINGS=$(usex java) - # bug #845369 - -DBUILD_CSHARP_BINDINGS=OFF - - # Check work/gdal-3.5.0_build/CMakeCache.txt after configure - # and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71 - # Commented out: not (yet?) implemented upstream. - # Also, arm64 stuff is a TODO upstream, but not there (yet?) - -Dtest_avx=$(usex cpu_flags_x86_avx) - -Dtest_avx2=$(usex cpu_flags_x86_avx2) - -Dtest_sse=$(usex cpu_flags_x86_sse) - -Dtest_sse2=$(usex cpu_flags_x86_sse2) - #-Dtest_sse3=$(usex cpu_flags_x86_sse3) - -Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1) - #-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2) - #-Dtest_sse4a=$(usex cpu_flags_x86_sse4a) - -Dtest_ssse3=$(usex cpu_flags_x86_ssse3) - #-Dtest_fma4=$(usex cpu_flags_x86_fma4) - #-Dtest_xop=$(usex cpu_flags_x86_xop) - ) - - if use test ; then - mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile doc -} - -src_test() { - export GDAL_RUN_SLOW_TESTS=0 - export GDAL_DOWNLOAD_TEST_DATA=0 - - # Two test suites: - # 1. autotests (much larger, uses pytest) - # 2. Small set of fuzzing tests (no download needed) - - # Missing file for test-unit? - cmake_src_test -E "(test-unit)" -} - -src_install() { - cmake_src_install - use python && python_optimize - - if use java; then - # Move the native library into the proper place for Gentoo. The - # library in ${D} has already had its RPATH fixed, so we use it - # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. - java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" - rm -rf "${ED}/usr/$(get_libdir)/jni" || die - fi - - # TODO: install docs? -} - -pkg_postinst() { - elog "Check available image and data formats after building with" - elog "gdalinfo and ogrinfo (using the --formats switch)." - - if use java; then - elog - elog "To use the Java bindings, you need to pass the following to java:" - elog " -Djava.library.path=$(java-config -i gdal)" - fi -} diff --git a/sci-libs/gdal/gdal-3.8.5.ebuild b/sci-libs/gdal/gdal-3.8.5.ebuild deleted file mode 100644 index e13e28e38bd1..000000000000 --- a/sci-libs/gdal/gdal-3.8.5.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake java-pkg-opt-2 python-single-r1 - -DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" -HOMEPAGE="https://gdal.org/" -SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz" -SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )" - -LICENSE="BSD Info-ZIP MIT" -SLOT="0/34" # subslot is libgdal.so.<SONAME> -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - spatialite? ( sqlite ) - test? ( ${PYTHON_REQUIRED_USE} ) -" - -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/doxygen ) - java? ( - >=dev-java/ant-1.10.14-r3:0 - dev-lang/swig - ) - python? ( - dev-lang/swig - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - test? ( - ${PYTHON_DEPS} - dev-cpp/gtest - ) -" -DEPEND=" - dev-libs/expat - dev-libs/json-c:= - dev-libs/libpcre2 - dev-libs/libxml2:2 - dev-libs/openssl:= - media-libs/tiff - >=sci-libs/libgeotiff-1.5.1-r1:= - >=sci-libs/proj-6.0.0:= - sys-libs/zlib[minizip(+)] - armadillo? ( sci-libs/armadillo:=[lapack] ) - curl? ( net-misc/curl ) - fits? ( sci-libs/cfitsio:= ) - geos? ( >=sci-libs/geos-3.8.0 ) - gif? ( media-libs/giflib:= ) - gml? ( >=dev-libs/xerces-c-3.1 ) - heif? ( media-libs/libheif:= ) - hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) - java? ( - >=virtual/jdk-1.8:*[-headless-awt] - ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - lzma? ( || ( - app-arch/xz-utils - app-arch/lzma - ) ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf:= ) - odbc? ( dev-db/unixODBC ) - ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) - opencl? ( virtual/opencl ) - oracle? ( dev-db/oracle-instantclient:= ) - pdf? ( app-text/poppler:= ) - png? ( media-libs/libpng:= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) - spatialite? ( dev-db/spatialite ) - sqlite? ( dev-db/sqlite:3 ) - webp? ( media-libs/libwebp:= ) - xls? ( dev-libs/freexl ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} - java? ( >=virtual/jre-1.8:* ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - _wstat64 # Windows LFS -) - -PATCHES=( - "${FILESDIR}"/${PN}-3.8.0-java21.patch - "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch - "${FILESDIR}"/${P}-poppler-24.05.0.patch # in 3.9.0 -) - -pkg_setup() { - if use python || use test ; then - python-single-r1_pkg_setup - fi - - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if use test ; then - mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_IPO=OFF - -DGDAL_USE_EXTERNAL_LIBS=ON - -DGDAL_USE_INTERNAL_LIBS=OFF - -DBUILD_TESTING=$(usex test) - - # bug #844874 and bug #845150 - -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" - - # Options here are generally off because of one of: - # - Not yet packaged dependencies - # - # - Off for autotools build and didn't want more churn by - # enabling during port to CMake. Feel free to request them - # being turned on if useful for you. - -DGDAL_USE_ARMADILLO=$(usex armadillo) - -DGDAL_USE_ARROW=OFF - -DGDAL_USE_BLOSC=OFF - -DGDAL_USE_BRUNSLI=OFF - -DGDAL_USE_CRNLIB=OFF - -DGDAL_USE_CFITSIO=$(usex fits) - -DGDAL_USE_CURL=$(usex curl) - -DGDAL_USE_CRYPTOPP=OFF - -DGDAL_USE_DEFLATE=OFF - -DGDAL_USE_ECW=OFF - -DGDAL_USE_EXPAT=ON - -DGDAL_USE_FILEGDB=OFF - -DGDAL_USE_FREEXL=$(usex xls) - -DGDAL_USE_FYBA=OFF - -DGDAL_USE_GEOTIFF=ON - -DGDAL_USE_GEOS=$(usex geos) - -DGDAL_USE_GIF=$(usex gif) - -DGDAL_USE_GTA=OFF - -DGDAL_USE_HEIF=$(usex heif) - -DGDAL_USE_HDF4=OFF - -DGDAL_USE_HDF5=$(usex hdf5) - -DGDAL_USE_HDFS=OFF - -DGDAL_USE_ICONV=ON # TODO dep - -DGDAL_USE_IDB=OFF - -DGDAL_USE_JPEG=$(usex jpeg) - - # https://gdal.org/build_hints.html#jpeg12 - # Independent of whether using system libjpeg - -DGDAL_USE_JPEG12_INTERNAL=ON - - -DGDAL_USE_JSONC=ON - -DGDAL_USE_JXL=OFF - -DGDAL_USE_KDU=OFF - -DGDAL_USE_KEA=OFF - -DGDAL_USE_LERC=OFF - -DGDAL_USE_LIBKML=OFF - -DGDAL_USE_LIBLZMA=$(usex lzma) - -DGDAL_USE_LIBXML2=ON - -DGDAL_USE_LURATECH=OFF - -DGDAL_USE_LZ4=OFF - -DGDAL_USE_MONGOCXX=OFF - -DGDAL_USE_MRSID=OFF - -DGDAL_USE_MSSQL_NCLI=OFF - -DGDAL_USE_MSSQL_ODBC=OFF - -DGDAL_USE_MYSQL=$(usex mysql) - -DGDAL_USE_NETCDF=$(usex netcdf) - -DGDAL_USE_ODBC=$(usex odbc) - -DGDAL_USE_ODBCCPP=OFF - -DGDAL_USE_OGDI=$(usex ogdi) - -DGDAL_USE_OPENCAD=OFF - -DGDAL_USE_OPENCL=$(usex opencl) - -DGDAL_USE_OPENEXR=OFF - -DGDAL_USE_OPENJPEG=$(usex jpeg2k) - -DGDAL_USE_OPENSSL=ON - -DGDAL_USE_ORACLE=$(usex oracle) - -DGDAL_USE_PARQUET=OFF - -DGDAL_USE_PCRE2=ON - -DGDAL_USE_PDFIUM=OFF - -DGDAL_USE_PNG=$(usex png) - -DGDAL_USE_PODOFO=OFF - -DGDAL_USE_POPPLER=$(usex pdf) - -DGDAL_USE_POSTGRESQL=$(usex postgres) - -DGDAL_USE_QHULL=OFF - -DGDAL_USE_RASTERLITE2=OFF - -DGDAL_USE_RDB=OFF - -DGDAL_USE_SPATIALITE=$(usex spatialite) - -DGDAL_USE_SQLITE3=$(usex sqlite) - -DGDAL_USE_SFCGAL=OFF - -DGDAL_USE_TEIGHA=OFF - -DGDAL_USE_TIFF=ON - -DGDAL_USE_TILEDB=OFF - -DGDAL_USE_WEBP=$(usex webp) - -DGDAL_USE_XERCESC=$(usex gml) - -DGDAL_USE_ZLIB=ON - -DGDAL_USE_ZSTD=$(usex zstd) - - # Bindings - -DBUILD_PYTHON_BINDINGS=$(usex python) - -DBUILD_JAVA_BINDINGS=$(usex java) - # bug #845369 - -DBUILD_CSHARP_BINDINGS=OFF - - # Check work/gdal-3.5.0_build/CMakeCache.txt after configure - # and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71 - # Commented out: not (yet?) implemented upstream. - # Also, arm64 stuff is a TODO upstream, but not there (yet?) - -Dtest_avx=$(usex cpu_flags_x86_avx) - -Dtest_avx2=$(usex cpu_flags_x86_avx2) - -Dtest_sse=$(usex cpu_flags_x86_sse) - -Dtest_sse2=$(usex cpu_flags_x86_sse2) - #-Dtest_sse3=$(usex cpu_flags_x86_sse3) - -Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1) - #-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2) - #-Dtest_sse4a=$(usex cpu_flags_x86_sse4a) - -Dtest_ssse3=$(usex cpu_flags_x86_ssse3) - #-Dtest_fma4=$(usex cpu_flags_x86_fma4) - #-Dtest_xop=$(usex cpu_flags_x86_xop) - ) - - if use test ; then - mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile doc -} - -src_test() { - export GDAL_RUN_SLOW_TESTS=0 - export GDAL_DOWNLOAD_TEST_DATA=0 - - # Two test suites: - # 1. autotests (much larger, uses pytest) - # 2. Small set of fuzzing tests (no download needed) - - # Missing file for test-unit? - cmake_src_test -E "(test-unit)" -} - -src_install() { - cmake_src_install - use python && python_optimize - - if use java; then - # Move the native library into the proper place for Gentoo. The - # library in ${D} has already had its RPATH fixed, so we use it - # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. - java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" - rm -rf "${ED}/usr/$(get_libdir)/jni" || die - fi - - # TODO: install docs? -} - -pkg_postinst() { - elog "Check available image and data formats after building with" - elog "gdalinfo and ogrinfo (using the --formats switch)." - - if use java; then - elog - elog "To use the Java bindings, you need to pass the following to java:" - elog " -Djava.library.path=$(java-config -i gdal)" - fi -} diff --git a/sci-libs/gdal/gdal-3.9.0.ebuild b/sci-libs/gdal/gdal-3.9.0.ebuild deleted file mode 100644 index 081199c9f7b8..000000000000 --- a/sci-libs/gdal/gdal-3.9.0.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake java-pkg-opt-2 python-single-r1 - -DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)" -HOMEPAGE="https://gdal.org/" -SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.xz" -SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.tar.gz )" - -LICENSE="BSD Info-ZIP MIT" -SLOT="0/34" # subslot is libgdal.so.<SONAME> -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle parquet pdf png postgres python spatialite sqlite test webp xls zstd" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - spatialite? ( sqlite ) - test? ( ${PYTHON_REQUIRED_USE} ) -" - -BDEPEND=" - virtual/pkgconfig - doc? ( app-text/doxygen ) - java? ( - >=dev-java/ant-1.10.14-r3:0 - dev-lang/swig - ) - python? ( - dev-lang/swig - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - test? ( - ${PYTHON_DEPS} - dev-cpp/gtest - ) -" -DEPEND=" - dev-libs/expat - dev-libs/json-c:= - dev-libs/libpcre2 - dev-libs/libxml2:2 - dev-libs/openssl:= - media-libs/tiff - >=sci-libs/libgeotiff-1.5.1-r1:= - >=sci-libs/proj-6.0.0:= - sys-libs/zlib[minizip(+)] - armadillo? ( sci-libs/armadillo:=[lapack] ) - curl? ( net-misc/curl ) - fits? ( sci-libs/cfitsio:= ) - geos? ( >=sci-libs/geos-3.8.0 ) - gif? ( media-libs/giflib:= ) - gml? ( >=dev-libs/xerces-c-3.1 ) - heif? ( media-libs/libheif:= ) - hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) - java? ( - >=virtual/jdk-1.8:*[-headless-awt] - ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - lzma? ( || ( - app-arch/xz-utils - app-arch/lzma - ) ) - mysql? ( virtual/mysql ) - netcdf? ( sci-libs/netcdf:= ) - odbc? ( dev-db/unixODBC ) - ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) - opencl? ( virtual/opencl ) - oracle? ( dev-db/oracle-instantclient:= ) - parquet? ( dev-libs/apache-arrow:=[parquet] ) - pdf? ( app-text/poppler:= ) - png? ( media-libs/libpng:= ) - postgres? ( >=dev-db/postgresql-8.4:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - ) - spatialite? ( dev-db/spatialite ) - sqlite? ( dev-db/sqlite:3 ) - webp? ( media-libs/libwebp:= ) - xls? ( dev-libs/freexl ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND=" - ${DEPEND} - java? ( >=virtual/jre-1.8:* ) -" - -QA_CONFIG_IMPL_DECL_SKIP=( - _wstat64 # Windows LFS -) - -PATCHES=( - "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch -) - -pkg_setup() { - if use python || use test ; then - python-single-r1_pkg_setup - fi - - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if use test ; then - mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_IPO=OFF - -DGDAL_USE_EXTERNAL_LIBS=ON - -DGDAL_USE_INTERNAL_LIBS=OFF - -DBUILD_TESTING=$(usex test) - - # bug #844874 and bug #845150 - -DCMAKE_INSTALL_INCLUDEDIR="include/gdal" - - # Options here are generally off because of one of: - # - Not yet packaged dependencies - # - # - Off for autotools build and didn't want more churn by - # enabling during port to CMake. Feel free to request them - # being turned on if useful for you. - -DGDAL_USE_ARMADILLO=$(usex armadillo) - -DGDAL_USE_ARROW=OFF - -DGDAL_USE_BLOSC=OFF - -DGDAL_USE_BRUNSLI=OFF - -DGDAL_USE_CRNLIB=OFF - -DGDAL_USE_CFITSIO=$(usex fits) - -DGDAL_USE_CURL=$(usex curl) - -DGDAL_USE_CRYPTOPP=OFF - -DGDAL_USE_DEFLATE=OFF - -DGDAL_USE_ECW=OFF - -DGDAL_USE_EXPAT=ON - -DGDAL_USE_FILEGDB=OFF - -DGDAL_USE_FREEXL=$(usex xls) - -DGDAL_USE_FYBA=OFF - -DGDAL_USE_GEOTIFF=ON - -DGDAL_USE_GEOS=$(usex geos) - -DGDAL_USE_GIF=$(usex gif) - -DGDAL_USE_GTA=OFF - -DGDAL_USE_HEIF=$(usex heif) - -DGDAL_USE_HDF4=OFF - -DGDAL_USE_HDF5=$(usex hdf5) - -DGDAL_USE_HDFS=OFF - -DGDAL_USE_ICONV=ON # TODO dep - -DGDAL_USE_IDB=OFF - -DGDAL_USE_JPEG=$(usex jpeg) - - # https://gdal.org/build_hints.html#jpeg12 - # Independent of whether using system libjpeg - -DGDAL_USE_JPEG12_INTERNAL=ON - - -DGDAL_USE_JSONC=ON - -DGDAL_USE_JXL=OFF - -DGDAL_USE_KDU=OFF - -DGDAL_USE_KEA=OFF - -DGDAL_USE_LERC=OFF - -DGDAL_USE_LIBKML=OFF - -DGDAL_USE_LIBLZMA=$(usex lzma) - -DGDAL_USE_LIBXML2=ON - -DGDAL_USE_LURATECH=OFF - -DGDAL_USE_LZ4=OFF - -DGDAL_USE_MONGOCXX=OFF - -DGDAL_USE_MRSID=OFF - -DGDAL_USE_MSSQL_NCLI=OFF - -DGDAL_USE_MSSQL_ODBC=OFF - -DGDAL_USE_MYSQL=$(usex mysql) - -DGDAL_USE_NETCDF=$(usex netcdf) - -DGDAL_USE_ODBC=$(usex odbc) - -DGDAL_USE_ODBCCPP=OFF - -DGDAL_USE_OGDI=$(usex ogdi) - -DGDAL_USE_OPENCAD=OFF - -DGDAL_USE_OPENCL=$(usex opencl) - -DGDAL_USE_OPENEXR=OFF - -DGDAL_USE_OPENJPEG=$(usex jpeg2k) - -DGDAL_USE_OPENSSL=ON - -DGDAL_USE_ORACLE=$(usex oracle) - -DGDAL_USE_PARQUET=$(usex parquet) - -DGDAL_USE_PCRE2=ON - -DGDAL_USE_PDFIUM=OFF - -DGDAL_USE_PNG=$(usex png) - -DGDAL_USE_PODOFO=OFF - -DGDAL_USE_POPPLER=$(usex pdf) - -DGDAL_USE_POSTGRESQL=$(usex postgres) - -DGDAL_USE_QHULL=OFF - -DGDAL_USE_RASTERLITE2=OFF - -DGDAL_USE_RDB=OFF - -DGDAL_USE_SPATIALITE=$(usex spatialite) - -DGDAL_USE_SQLITE3=$(usex sqlite) - -DGDAL_USE_SFCGAL=OFF - -DGDAL_USE_TEIGHA=OFF - -DGDAL_USE_TIFF=ON - -DGDAL_USE_TILEDB=OFF - -DGDAL_USE_WEBP=$(usex webp) - -DGDAL_USE_XERCESC=$(usex gml) - -DGDAL_USE_ZLIB=ON - -DGDAL_USE_ZSTD=$(usex zstd) - - # Bindings - -DBUILD_PYTHON_BINDINGS=$(usex python) - -DBUILD_JAVA_BINDINGS=$(usex java) - # bug #845369 - -DBUILD_CSHARP_BINDINGS=OFF - - # Check work/gdal-3.5.0_build/CMakeCache.txt after configure - # and https://github.com/OSGeo/gdal/blob/master/cmake/helpers/CheckCompilerMachineOption.cmake#L71 - # Commented out: not (yet?) implemented upstream. - # Also, arm64 stuff is a TODO upstream, but not there (yet?) - -Dtest_avx=$(usex cpu_flags_x86_avx) - -Dtest_avx2=$(usex cpu_flags_x86_avx2) - -Dtest_sse=$(usex cpu_flags_x86_sse) - -Dtest_sse2=$(usex cpu_flags_x86_sse2) - #-Dtest_sse3=$(usex cpu_flags_x86_sse3) - -Dtest_sse4.1=$(usex cpu_flags_x86_sse4_1) - #-Dtest_sse4.2=$(usex cpu_flags_x86_sse4_2) - #-Dtest_sse4a=$(usex cpu_flags_x86_sse4a) - -Dtest_ssse3=$(usex cpu_flags_x86_ssse3) - #-Dtest_fma4=$(usex cpu_flags_x86_fma4) - #-Dtest_xop=$(usex cpu_flags_x86_xop) - ) - - if use test ; then - mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile doc -} - -src_test() { - export GDAL_RUN_SLOW_TESTS=0 - export GDAL_DOWNLOAD_TEST_DATA=0 - - # Two test suites: - # 1. autotests (much larger, uses pytest) - # 2. Small set of fuzzing tests (no download needed) - - # Missing file for test-unit? - cmake_src_test -E "(test-unit)" -} - -src_install() { - cmake_src_install - use python && python_optimize - - if use java; then - # Move the native library into the proper place for Gentoo. The - # library in ${D} has already had its RPATH fixed, so we use it - # rather than ${BUILD_DIR}/swig/java/libgdalalljni.so. - java-pkg_doso "${D}/usr/$(get_libdir)/jni/libgdalalljni.so" - rm -rf "${ED}/usr/$(get_libdir)/jni" || die - fi - - # TODO: install docs? -} - -pkg_postinst() { - elog "Check available image and data formats after building with" - elog "gdalinfo and ogrinfo (using the --formats switch)." - - if use java; then - elog - elog "To use the Java bindings, you need to pass the following to java:" - elog " -Djava.library.path=$(java-config -i gdal)" - fi -} diff --git a/sci-libs/gdal/gdal-3.9.1-r1.ebuild b/sci-libs/gdal/gdal-3.9.3.ebuild index aed89b4d8a58..bbbff16fefe2 100644 --- a/sci-libs/gdal/gdal-3.9.1-r1.ebuild +++ b/sci-libs/gdal/gdal-3.9.3.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta LICENSE="BSD Info-ZIP MIT" SLOT="0/35" # subslot is libgdal.so.<SONAME> -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lerc lzma mysql netcdf odbc ogdi opencl oracle parquet pdf png postgres python spatialite sqlite test webp xls zstd" RESTRICT="!test? ( test )" @@ -102,7 +102,8 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch - "${FILESDIR}"/${P}-poppler-24.12.patch + "${FILESDIR}"/${PN}-3.9.1-poppler-24.12.patch + "${FILESDIR}"/${P}-poppler-25.02.patch ) pkg_setup() { @@ -114,11 +115,11 @@ pkg_setup() { } src_prepare() { - cmake_src_prepare - if use test ; then mv "${WORKDIR}"/gdalautotest-${PV} "${S}"/autotest || die + PATCHES+=( "${FILESDIR}"/${P}-poppler-autotest-25.02.patch ) fi + cmake_src_prepare } src_configure() { diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index 257aaab58cc7..821859958169 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,5 +1,5 @@ DIST geos-3.12.1.tar.bz2 6727199 BLAKE2B 4ffc9cb63f3ac15b3dcb0ba9fec6a1ccaeaf35962a057234f4da38d6bba19df39e800805badfd56fe927da09c9392f0feaf2b7d02085e8f293c4d9503ab28ff9 SHA512 192eba83c651e935b3c9a5cc19321285e4d28b9da9d7a1fa15d9471803027e630db7a7ecea96343d9c5f9846d279062ca3694fe47916a4ebf5698ae66dd5210d DIST geos-3.13.0.tar.bz2 6801211 BLAKE2B 8de35093e2819268df2cd15f1661dcbaba6b9c3bd978904fb992fd91905b0056cfa6580cae602511bd8c4b19686597abb81e0af71a8a73a684cafd8013755bad SHA512 8ffaa3f49a8365db693ac948e9d66cf55321eb12151734c7da2775070b7804ffa607de2474b7019d6ea2a99d5e037fb1e8561bf9025e65ddd4bd1ba049382b28 EBUILD geos-3.12.1.ebuild 990 BLAKE2B 9f113c7063dd91d7e09992c2a9d38fcd53b43ce281306ea7110d7128b7544b9249e977ef66a196887d0205a041495fcd7c9b9192f2e2c46c9c0928e0e63efbd2 SHA512 20f351d8ce25e4a923fb9b62c4c18f966c434752b3df7e7be5457e4e5a6bc75a98c9fa58c4ff70d9d800072d68f9fa2e66ddba90ecb6563dff32dc1a440cace8 -EBUILD geos-3.13.0.ebuild 995 BLAKE2B 5fc1f384b0c9d2b6cbeafd1d3f460aad12a635d026e7babeb0ad1286e1d88c87724d0133da4d85c3c4463dd4b99e808d6ff23e6af608e0e86fe694916f8a0697 SHA512 52563044f760f6894ec000c3ee8ba3860907c07783ffdbde8af931e65c81e20bdcebbf8262b5777aa30edd20bfd510167394db2a48739945b6ddde9de8462f3d +EBUILD geos-3.13.0.ebuild 990 BLAKE2B 57c38f024285712c0812fba8735e3a14764c763badac9bb14eb2fa9a7138d48a84541d452c870b8e15d1e7f9ab7e69fc5e88839de4f1fc78575ad07d79a67854 SHA512 38b15fcc581b3c19cd7bf8bdc29f55e00ca37177248d9c626e79f93c6bef56958febea26b618f2647ec0f3207e169f5e41d23f2d59a89763df6f88abd480a224 MISC metadata.xml 1101 BLAKE2B 10f27c3a69ee1ebe859c4862d0e9f0b2bc46f544e64e7fa5124b0e2fadd4d64a372cd59ccb96f92cfabb98c93ff6222d5ba5e1772def9a1174f49dba195d13d8 SHA512 4d100b031aa128cb98ea46963319e13a4c71c3de51e85b6cc7efafcafcf69bd32a11b0d4ff3dbbb55d145146df0fb9f709cdb5a70c6b47c9d69542259a71205b diff --git a/sci-libs/geos/geos-3.13.0.ebuild b/sci-libs/geos/geos-3.13.0.ebuild index bd059b420ac0..6131ff8c9f0b 100644 --- a/sci-libs/geos/geos-3.13.0.ebuild +++ b/sci-libs/geos/geos-3.13.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/geos/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest index 9c2539daebc9..109061ff497a 100644 --- a/sci-libs/gmsh/Manifest +++ b/sci-libs/gmsh/Manifest @@ -7,4 +7,5 @@ DIST gmsh-4.13.1-source.tgz 18383962 BLAKE2B bf0d002b7d0fa187b47440f167fc02ad41a EBUILD gmsh-4.11.1-r3.ebuild 3113 BLAKE2B dce0182a83b100cd3028c338dab8c6d925420f2e46faf5a0ce88cb15e9ff40937078f536b977b6b2537084c2b639d81aa0829543201279b1a5b86da92dbda1b6 SHA512 9e4f4141fbb7de0ddfce6bdc5f08c914111591611f65749a1bbd2e4fc85cf17240247c6ffc098168d1b51d15c205f91d125cf2c107f9d7d171e0d9fd44b1e126 EBUILD gmsh-4.12.2-r2.ebuild 3069 BLAKE2B 6e1068a7ab1e48a416c6fba8653dafa08d1318cbb73c90d8e8947d4c5a38b645e4116b47ced263f17287f0020e5e1fae8923365899616ad639e6a0d7cfa1c06c SHA512 f9aa6007672bd78c14222c414232461f88b73847c93cf7bf3e57706f73a6d4bfd6402ad3f601206e34f0eaae65ab206eaca4ae99255b34cb12aef9a4756c5524 EBUILD gmsh-4.13.1-r1.ebuild 3069 BLAKE2B 9ae3283caf14c2c39cc3396a577df6b0073e25045a2d72e5ddab5575d22afbe81d22f2824607284fd1c673f7f360c30c84b5103578180f7cac793a30fd988cab SHA512 118faccfc47e9560a144749ecb26d8b479333b2f8ab3a50fb6a7f7e99d8039b7c9c09fe6f913125ffe677bb7ec8cc27b7f32e23f1c0800815f989eec11294573 +EBUILD gmsh-4.13.1-r2.ebuild 3212 BLAKE2B a36fa5a1c420cdb808b137795961e116f79ce3d6f524ac46fe1091c2843082374080aa0fec5b671a6c430b44547ab2cf210206825387e8dfb0eccdeede117578 SHA512 fd85b33a5cebfacfd6f78e752308dbde9f4ba86656c73177ffff2b4aecb75ddec8e88f950265f34efd7b71ac6b560a0dee5dfc7cdaa3e9f69751df2b5ef8b065 MISC metadata.xml 1271 BLAKE2B 7ea0644b5ffb89478ba859f0bbd33fa5fcc8ebb57e64f2ca6ccba8123e23b4a7a44626d5fb1bd416d99071557652b247e90cc05b11d50bdded732f41f2acc524 SHA512 013798cf979fcb7fb954490970abdfc6ebbe23e8263a22cf8791af21f593aa46b7348e7673fa7fa318ce3cb8436c2d58435911984b40be3dafda40253ebcc71c diff --git a/sci-libs/gmsh/gmsh-4.13.1-r2.ebuild b/sci-libs/gmsh/gmsh-4.13.1-r2.ebuild new file mode 100644 index 000000000000..c12bdced483b --- /dev/null +++ b/sci-libs/gmsh/gmsh-4.13.1-r2.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake desktop fortran-2 python-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Three-dimensional finite element mesh generator" +HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" +SRC_URI="https://gmsh.info/src/${P}-source.tgz" +S="${WORKDIR}/${P}-source" + +LICENSE=" + GPL-2+ free-noncomm + alglib? ( MIT ) + gmm? ( LGPL-2.1+ ) + metis? ( Apache-2.0 ) + netgen? ( LGPL-2.1+ ) + voro? ( BSD ) +" +SLOT="0" +KEYWORDS="~amd64 ~x86" +## cgns is not compiling ATM, maybe fix cgns lib first +IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" + +REQUIRED_USE=" + ^^ ( blas eigen ) + mumps? ( blas ) + slepc? ( petsc ) + python? ( shared ${PYTHON_REQUIRED_USE} ) + " + +RDEPEND=" + virtual/fortran + X? ( x11-libs/fltk:1=[xft(+)] ) + alglib? ( sci-libs/alglib ) + blas? ( + virtual/blas + virtual/lapack + sci-libs/fftw:3.0 + ) + cgns? ( + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + ) + eigen? ( dev-cpp/eigen ) + gmm? ( sci-mathematics/gmm ) + jpeg? ( media-libs/libjpeg-turbo ) + med? ( + sci-libs/med[mpi=] + sci-libs/hdf5:=[mpi=] + ) + metis? ( >=sci-libs/metis-5.2.0 ) + mpi? ( virtual/mpi[cxx] ) + mumps? ( sci-libs/mumps[mpi=] ) + opencascade? ( sci-libs/opencascade:* ) + pdf? ( app-text/poppler:= ) + png? ( media-libs/libpng:0 ) + petsc? ( sci-mathematics/petsc[mpi=] ) + python? ( ${PYTHON_DEPS} ) + slepc? ( sci-mathematics/slepc[mpi=] ) + voro? ( sci-libs/voro++ ) + zlib? ( sys-libs/zlib ) + " + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + python? ( dev-lang/swig:0 ) + " + +PATCHES=( + "${FILESDIR}"/${PN}-4.9.5-opencascade.patch + "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_configure() { + local mycmakeargs=( ) + + use blas && \ + mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) + + mycmakeargs+=( + -DENABLE_ALGLIB="$(usex alglib)" + -DENABLE_BLAS_LAPACK="$(usex blas)" + -DENABLE_BUILD_DYNAMIC="$(usex shared)" + -DENABLE_CGNS="$(usex cgns)" + -DENABLE_EIGEN="$(usex eigen)" + -DENABLE_FLTK="$(usex X)" + -DENABLE_GMM="$(usex gmm)" + -DENABLE_GRAPHICS="$(usex X)" + -DENABLE_MED="$(usex med)" + -DENABLE_MPI="$(usex mpi)" + -DENABLE_METIS="$(usex metis)" + -DENABLE_MUMPS="$(usex mumps)" + -DENABLE_NETGEN="$(usex netgen)" + -DENABLE_OCC="$(usex opencascade)" + -DENABLE_PETSC="$(usex petsc)" + -DENABLE_POPPLER="$(usex pdf)" + -DENABLE_SLEPC="$(usex slepc)" + -DENABLE_PRIVATE_API="$(usex shared)" + -DENABLE_SYSTEM_CONTRIB="YES" + -DENABLE_VOROPP="$(usex voro)" + -DENABLE_WRAP_PYTHON="$(usex python)") + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples ; then + dodoc -r examples tutorials + docompress -x /usr/share/doc/${PF}/{examples,tutorials} + fi + + if use python; then + python_foreach_impl python_domodule api/gmsh.py + fi + + if use X ; then + newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png + make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" + fi +} + +pkg_postinst() { + if use X ; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use X ; then + xdg_icon_cache_update + fi +} diff --git a/sci-libs/hipBLAS-common/Manifest b/sci-libs/hipBLAS-common/Manifest index 1a3f12967ec1..faae45217f41 100644 --- a/sci-libs/hipBLAS-common/Manifest +++ b/sci-libs/hipBLAS-common/Manifest @@ -1,3 +1,5 @@ -DIST hipBLAS-common-6.3.0.tar.gz 7512 BLAKE2B d074cd925f06619028bf1a5b5ae69f10b8852ef321a9ec6f92b3fe1f63baadc90f8fa39872e433f81bbed072364dd63d0b37bfa49bdc0d9faef5027b52af6c1e SHA512 3812a277fbde7bee2f3ab6040e89b97dd60385797bdab942907d59d01d684cc4ec84476333e9e6efded90400d6f99daad669d027ceb46c9dfe3a0d5d24e584d3 -EBUILD hipBLAS-common-6.3.0.ebuild 456 BLAKE2B 14976552e0872b0b2b6399668605f49b7f4c2dbcdbe582f4befa9d4cc82bdf3c1df0a9f9f6d9146ed71c9a9034f5e0aab373b4a2b38a33f53e5560db833bc7de SHA512 ac8ce8a7ba6e4b49080f302eb3aba96c3f99c15bd0c2cfbdfec400049a6c77087c2d8005e9fbbf6a36752052d0ebd5fba75ec08338a35722930483f0bb83fb6b +DIST hipBLAS-common-6.3.2.tar.gz 7507 BLAKE2B f8a59ba428d48f2999e4b6b16b11f392cb8b3f9c04603b212b721c8f87d0779343abc721a39910100f253d633f6a037f61cb6558a40899a3eabafe8bbef55dc5 SHA512 a6d8fabbaa9db8fe61e5788c1ee27ae2c36da75dbb2e7fa17437c610641fbd141aea1f5c20f30e19420c108343ba05452d7dedde0e88c6ecc1486d0085ab7c6c +DIST hipBLAS-common-6.3.3.tar.gz 7508 BLAKE2B fbb5d17085daf0edb13c15f2a50098802ee616246d5d1fcf26067333932998c3c8d75b4d8123dca8fbae0ab69281bc07ba8c2a69d1ff177cd549ee0aacd3b88d SHA512 52d526e91df3a3dae9720ca4f1b3b5ec5a4daa684b770270e268762cd8683bd65b5908ede29425a0d14ca884b2cf9c4da4b55aedffc994c3527738716106d50d +EBUILD hipBLAS-common-6.3.2.ebuild 456 BLAKE2B 89f85e32ea9115d53f81af98bd0861772d0cf84c68a8167192b037d9bb0c3c579177464f7540c9ddf69395cad66f8e73d20b2184e47bf14feda040eac9bada21 SHA512 449b7cf4f9ffa6337e00a14797e67aa1e90a0f05890661cfd9f428a5168b56cc60d82e9dcc0d94843399f1e5dfc30d2d45cac75bf89eeea4b5e6c29190d1ef7a +EBUILD hipBLAS-common-6.3.3.ebuild 456 BLAKE2B 89f85e32ea9115d53f81af98bd0861772d0cf84c68a8167192b037d9bb0c3c579177464f7540c9ddf69395cad66f8e73d20b2184e47bf14feda040eac9bada21 SHA512 449b7cf4f9ffa6337e00a14797e67aa1e90a0f05890661cfd9f428a5168b56cc60d82e9dcc0d94843399f1e5dfc30d2d45cac75bf89eeea4b5e6c29190d1ef7a MISC metadata.xml 421 BLAKE2B 17cb718822d85b314a5dd8d334b972275537269cff854e2a30460fc4e370b45dbe109c9fbadedb48bef2756a3fdd221577e62b7b2bf99fd541eb0dd814bd0354 SHA512 6a3e92e63c84a8b7930b00512247bda003350d5b427416828e6522ea680461a02f8edf9217a884851c9474b3612c297dcf2f367c30c9084fb2dd4502ea7eb2f2 diff --git a/sci-libs/hipBLAS-common/hipBLAS-common-6.3.0.ebuild b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.2.ebuild index 8b3b0df3907e..867f3cde4720 100644 --- a/sci-libs/hipBLAS-common/hipBLAS-common-6.3.0.ebuild +++ b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/hipBLAS-common/hipBLAS-common-6.3.3.ebuild b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.3.ebuild new file mode 100644 index 000000000000..867f3cde4720 --- /dev/null +++ b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.3.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake +DESCRIPTION="Common files shared by hipBLAS and hipBLASLt" +HOMEPAGE="https://github.com/ROCm/hipBLAS-common" +SRC_URI="https://github.com/ROCm/hipBLAS-common/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipBLAS-common-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +BDEPEND="dev-build/rocm-cmake" diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest index 2705a9dd544d..fb7cc90a52c0 100644 --- a/sci-libs/hipBLAS/Manifest +++ b/sci-libs/hipBLAS/Manifest @@ -1,12 +1,10 @@ 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 -EBUILD hipBLAS-5.1.3.ebuild 1290 BLAKE2B 2d5722359ad1192d245a0d344aa2d3ab794f49be3cf7d6e0e90936d8813c29e7d2b96fb571f0b34aa5cf2883186bf20c5a4e8d974bba148ac20370b032176d1d SHA512 a95a0f8ae694e346aa00d4de3b09938515e8f104e731fa14936dd6f335996c32136d043f326887b8bcde718b5782cb464fc9a23641ea9641492fa21efee4b3a3 -EBUILD hipBLAS-5.4.2.ebuild 929 BLAKE2B ce433ff82d693d8b446bc47ce93e7ded4a4401cb423d45cbe9040d5a6b19bd1daa1b0b62e227c69505f941778fd3832827e867894f1ddb92538aebedddc26f67 SHA512 09813a2e0878222efdee2a5e87401671337dedb76441bbc5cca3c42f2aea3e88281ac503feb93b5ec3d4a904ceebe34bb9344ac577b9fdedb9f65e6678ead8fa +DIST hipBLAS-6.3.2.tar.gz 993139 BLAKE2B a053f8b54318a169518f084e0bca3c9272cb51fab564c8d874b19483232cfeacb92707ad5224f4d0c3848b52d82973c36f0d4fdb429c9f5d995b3c56b1194075 SHA512 8581905a923484662471da786b795d7f960b45cc5eed991b101a88a4e3d4ea5217582c813192dde8eb35eafba9867c3ac448aeb4d7ef470e6da544f09397d902 +DIST hipBLAS-6.3.3.tar.gz 993121 BLAKE2B 7cfe71112a8083a0f5fd1f2629bde12a79b13f2d289dd82405978f7713fb30b132d002d01566b077650265e8ee6746b51e4e3defb92bd1416ec83ce7c490407c SHA512 a14ba19557236ef8affa557d5139c6c380120a68eac5d6b7172b279380a52be4d451a3c2a7ee2a7e4d169c16081ea4639dc058b5231d2a33429fb0f065db5b18 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 +EBUILD hipBLAS-6.3.2.ebuild 1128 BLAKE2B 45c1131ee455c26c2aeb1141ec04c90931d4e2296644b929ed37ec7fedfc804724e45a2c43fe5e73a4107eb0ff8ca440ea8be03ad3442382cf006207ef1c3483 SHA512 99d089246917c80aa203c5cbbbccc47c711d69706c477dc5f1904f9d2870a03f0f17d66c4b47f3f0d4588fcc96ebb0c11479ead0192f62a849f38e9c83099bd6 +EBUILD hipBLAS-6.3.3.ebuild 1128 BLAKE2B 45c1131ee455c26c2aeb1141ec04c90931d4e2296644b929ed37ec7fedfc804724e45a2c43fe5e73a4107eb0ff8ca440ea8be03ad3442382cf006207ef1c3483 SHA512 99d089246917c80aa203c5cbbbccc47c711d69706c477dc5f1904f9d2870a03f0f17d66c4b47f3f0d4588fcc96ebb0c11479ead0192f62a849f38e9c83099bd6 MISC metadata.xml 647 BLAKE2B b4e941583a6b55bfa45a58e3173c6cecfcadaffd5e782c052f9cc8a46b37e1a09d9fd48b93fd0bd2977a982ec6752aed254f341caad0035a5dd8d2a1dad98b18 SHA512 d3ca380b71547c0e28be4dfbcc0b568fc2e2d89ae2ed0eca3bd087650d352539e5921d89d28bfd255e1564ec6c79dff5df2cddd3c008f91990f8c6f37ae3f3a8 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/hipBLAS/hipBLAS-6.3.0.ebuild b/sci-libs/hipBLAS/hipBLAS-6.3.2.ebuild index 1faf7edbf78c..1faf7edbf78c 100644 --- a/sci-libs/hipBLAS/hipBLAS-6.3.0.ebuild +++ b/sci-libs/hipBLAS/hipBLAS-6.3.2.ebuild diff --git a/sci-libs/hipBLAS/hipBLAS-6.3.3.ebuild b/sci-libs/hipBLAS/hipBLAS-6.3.3.ebuild new file mode 100644 index 000000000000..1faf7edbf78c --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-6.3.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2025 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/ROCm/hipBLAS" +SRC_URI="https://github.com/ROCm/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipBLAS-rocm-${PV}" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND=" + dev-util/hip:${SLOT} + sci-libs/hipBLAS-common:${SLOT} + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}] +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.3.0-no-git.patch +) + +src_configure() { + # Note: hipcc is enforced; clang fails when libc++ is enabled + # with an error similar to https://github.com/boostorg/config/issues/392 + rocm_use_hipcc + + local mycmakeargs=( + # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_BENCHMARKS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + cmake_src_configure +} diff --git a/sci-libs/hipBLASLt/Manifest b/sci-libs/hipBLASLt/Manifest index 7f3b1978843d..e196624fb22b 100644 --- a/sci-libs/hipBLASLt/Manifest +++ b/sci-libs/hipBLASLt/Manifest @@ -8,6 +8,10 @@ AUX hipBLASLt-6.3.0-min-pip-install.patch 770 BLAKE2B a30eb865998ddd7bb3f1802dcb AUX hipBLASLt-6.3.0-no-arch-extra.patch 674 BLAKE2B b02f01364f71824c6bd74c8202c1916156a53a2f41b244c55d18786e576bbf0e0b250ff67194e55c230ec9156e6461839698fb86caedc665a601290bf791155b SHA512 2fbb6fa3d9a6b7f19d326014836efdd9d1c1aa7a5306511700f89b8f1d24acaf336092f33b60de4ddd1fc8d7fd885596e6edf8f5350913adaff27f376cfed78a DIST hipBLASLt-6.1.1.tar.gz 78448557 BLAKE2B 08ac9ce45d7d1e4384a36939af22f65589ed87e25b4db77f5f7ff5fbe65b8070e9c55fbb09db3b7bd49be98981dc8bf939e646ea27571bf1d1ccfa52a50b0f92 SHA512 1aa3a1cb8e9c7f653db66909b38be065b7386b97d4bd6b52ecc6c2bf72c6cdfabde6f12ebc6016b5fa195f979359af875eda8d54ea6772329312cb357bc2ebc5 DIST hipBLASLt-6.3.1.tar.gz 89385330 BLAKE2B 4bcf083e41ad6f22f61321bd066d79a6a387ea677cdb05f96f474e1b409f0b1cc5dc0c61259d7d6456ced2b77191388e1bd4b260bd7d185875241f55246ed1a8 SHA512 7a6443ab7a66bae1d6273945ea91814b2d5f9846d8276040cda7f43ed7ea0c2cb6063009e7fe092742d396c8d87c2cf62ed4cf8249e936eed69c0cad6db02193 +DIST hipBLASLt-6.3.2.tar.gz 89385514 BLAKE2B 785ee2951b76100f29eed4891cdc3fc58abbee866a9eac7109bc49e56854007d57d15bc6d605a7527ecc685e59500567581d194ede67cff566fba3b582d7b3c4 SHA512 2f4f497a5228162f4fffda9f549f943d26c86d7160a50c0aadc403340cee4466e9f16bd5cfcd386535b7f05cc8d1839a4d146c52761b6eb29e2e53962437e781 +DIST hipBLASLt-6.3.3.tar.gz 89385318 BLAKE2B b307e4c418bda7583efdf5dc646f05368c195f6df0077823ae179efb52a56ba4f13b5fce6a10ff38e0ad593bf5b415fc6e5b4132488b2dbf9da58198af15d230 SHA512 9fb523e614dd790aa3c01337f3d93f9df0a135d25e9efda2375e88818f6097d661e5159336258631cc0a25d923efcddb4b39378bf54c33d0e5a01bba387f1368 EBUILD hipBLASLt-6.1.1-r1.ebuild 3296 BLAKE2B 26c2c36cfece4e6d5dc59cb32c4b7c4649cf56fbaa831ff19e34f1609801146ab48145a8dc8e37e0aa7c66e0b4fdf4e87ba134803ea09b8f1e7f2651c99b8d56 SHA512 69ce9c6ddc8e97a475a646a10234b53ac7c803f80adf61cd44baee1a21e1254f95300a8e7d10201e39c1a25d6ee10c075dc2dde475414ff834e0f3527f91d4cb EBUILD hipBLASLt-6.3.1.ebuild 3918 BLAKE2B 2d63262bb72370f98638dcaab6b36500d9f867614177bdf3f77650d66bd4fd80a30d04b8e4d01c12792c96067208d01a40d49a12dbd20982bee7d626c89c9530 SHA512 f137c4725dd75ffa1653b756dac66973ac994c3fcdec052f4ba7dc53113cdd77a735b339a59ef279f7d11b435147fa57f60ba6bef022b81f5a416de14733f69b +EBUILD hipBLASLt-6.3.2.ebuild 3918 BLAKE2B 2d63262bb72370f98638dcaab6b36500d9f867614177bdf3f77650d66bd4fd80a30d04b8e4d01c12792c96067208d01a40d49a12dbd20982bee7d626c89c9530 SHA512 f137c4725dd75ffa1653b756dac66973ac994c3fcdec052f4ba7dc53113cdd77a735b339a59ef279f7d11b435147fa57f60ba6bef022b81f5a416de14733f69b +EBUILD hipBLASLt-6.3.3.ebuild 3918 BLAKE2B 2d63262bb72370f98638dcaab6b36500d9f867614177bdf3f77650d66bd4fd80a30d04b8e4d01c12792c96067208d01a40d49a12dbd20982bee7d626c89c9530 SHA512 f137c4725dd75ffa1653b756dac66973ac994c3fcdec052f4ba7dc53113cdd77a735b339a59ef279f7d11b435147fa57f60ba6bef022b81f5a416de14733f69b MISC metadata.xml 500 BLAKE2B 1ff23ba7bd97b462ec9f17174ca25d072bb830651b7f9ebb2ad7b3a269d0ef51789a9f96538ed79981ccc7419bb246658db90df4d2bdea1d57819884602d40a9 SHA512 50c685230927192c701385841afff049c7e297c2b3fe7a4df67294e02186e9d429a41ad60a0fd0b0e3811b030917796b14baf786262e1b83293862a6249bfd1b diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.3.2.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.3.2.ebuild new file mode 100644 index 000000000000..27266b0b717a --- /dev/null +++ b/sci-libs/hipBLASLt/hipBLASLt-6.3.2.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_SKIP_GLOBALS=1 +PYTHON_COMPAT=( python3_{10..13} ) + +LLVM_COMPAT=( 19 ) + +inherit cmake flag-o-matic llvm-r1 python-any-r1 rocm +DESCRIPTION="General matrix-matrix operations library for AMD Instinct accelerators" +HOMEPAGE="https://github.com/ROCm/hipBLASLt" +SRC_URI="https://github.com/ROCm/hipBLASLt/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipBLASLt-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +SUPPORTED_GPUS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 ) +IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" ) +IUSE="${IUSE_TARGETS[@]/#/+} test benchmark" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip:${SLOT} + dev-cpp/msgpack-cxx +" + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/rocm-cmake + sci-libs/hipBLAS-common:${SLOT} + $(python_gen_any_dep ' + dev-python/msgpack[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/joblib[${PYTHON_USEDEP}] + ') + $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') + test? ( + dev-cpp/gtest + virtual/blas + dev-util/rocm-smi:${SLOT} + ) + benchmark? ( + virtual/blas + llvm-runtimes/openmp + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch + "${FILESDIR}"/${PN}-6.1.1-no-arch.patch + "${FILESDIR}"/${PN}-6.1.1-no-git.patch + "${FILESDIR}"/${PN}-6.1.1-clang-19.patch + "${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch + "${FILESDIR}"/${PN}-6.3.0-no-arch-extra.patch + "${FILESDIR}"/${PN}-6.3.0-min-pip-install.patch +) + +python_check_deps() { + python_has_version "dev-python/msgpack[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" && + python_has_version "dev-python/joblib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +pkg_pretend() { + if [[ "${AMDGPU_TARGETS[@]}" = "" ]]; then + ewarn "hipBLASLt supports only few GPUs: ${SUPPORTED_GPUS[@]}," + ewarn "but none of them were defined in AMDGPU_TARGETS USE_EXPAND variable." + ewarn + ewarn "Library will continue to be built in \"dummy\" mode," + ewarn "serving as a non-functional placeholder for end-user applications." + fi +} + +src_prepare() { + sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \ + "${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die + eapply "${S}"/gentoopath.patch + + local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die)) + python_fix_shebang -q ${shebangs[*]} + + sed -e "s:\${rocm_path}/bin/amdclang++:$(get_llvm_prefix)/bin/clang++:" \ + -i library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh || die + + cmake_src_prepare +} + +src_configure() { + rocm_use_hipcc + + # too many warnings + append-cxxflags -Wno-explicit-specialization-storage-class + + local targets="$(get_amdgpu_flags)" + local build_with_tensile=$([ "${AMDGPU_TARGETS[@]}" = "" ] && echo OFF || echo ON ) + + local mycmakeargs=( + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_WITH_TENSILE="${build_with_tensile}" + -DAMDGPU_TARGETS="${targets}" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark ON OFF)" + -Wno-dev + ) + + cmake_src_configure +} + +src_compile() { + local -x ROCM_PATH="${EPREFIX}/usr" + # set PYTHONPATH to load Tensile from virtualenv, not the system-wide one + local -x PYTHONPATH="${S}_build/virtualenv/lib/${EPYTHON}/site-packages" + local -x TENSILE_ROCM_ASSEMBLER_PATH="$(get_llvm_prefix)/bin/clang++" + # TensileCreateLibrary reads CMAKE_CXX_COMPILER again + local -x CMAKE_CXX_COMPILER="$(get_llvm_prefix)/bin/clang++" + cmake_src_compile +} + +src_install() { + cmake_src_install + + # Stop llvm-strip from removing .strtab section from *.hsaco files, + # otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes + dostrip -x /usr/$(get_libdir)/hipblaslt/library/ +} + +src_test() { + check_amdgpu + + # Expected time for 7900 XTX: 340s (full) or 5s with GTEST_FILTER='*quick*' + cmake_src_test +} diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.3.3.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.3.3.ebuild new file mode 100644 index 000000000000..27266b0b717a --- /dev/null +++ b/sci-libs/hipBLASLt/hipBLASLt-6.3.3.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_SKIP_GLOBALS=1 +PYTHON_COMPAT=( python3_{10..13} ) + +LLVM_COMPAT=( 19 ) + +inherit cmake flag-o-matic llvm-r1 python-any-r1 rocm +DESCRIPTION="General matrix-matrix operations library for AMD Instinct accelerators" +HOMEPAGE="https://github.com/ROCm/hipBLASLt" +SRC_URI="https://github.com/ROCm/hipBLASLt/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/hipBLASLt-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +SUPPORTED_GPUS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 ) +IUSE_TARGETS=( "${SUPPORTED_GPUS[@]/#/amdgpu_targets_}" ) +IUSE="${IUSE_TARGETS[@]/#/+} test benchmark" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip:${SLOT} + dev-cpp/msgpack-cxx +" + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/rocm-cmake + sci-libs/hipBLAS-common:${SLOT} + $(python_gen_any_dep ' + dev-python/msgpack[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/joblib[${PYTHON_USEDEP}] + ') + $(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}') + test? ( + dev-cpp/gtest + virtual/blas + dev-util/rocm-smi:${SLOT} + ) + benchmark? ( + virtual/blas + llvm-runtimes/openmp + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-fix-msgpack-dependency.patch + "${FILESDIR}"/${PN}-6.1.1-no-arch.patch + "${FILESDIR}"/${PN}-6.1.1-no-git.patch + "${FILESDIR}"/${PN}-6.1.1-clang-19.patch + "${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch + "${FILESDIR}"/${PN}-6.3.0-no-arch-extra.patch + "${FILESDIR}"/${PN}-6.3.0-min-pip-install.patch +) + +python_check_deps() { + python_has_version "dev-python/msgpack[${PYTHON_USEDEP}]" && + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" && + python_has_version "dev-python/joblib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +pkg_pretend() { + if [[ "${AMDGPU_TARGETS[@]}" = "" ]]; then + ewarn "hipBLASLt supports only few GPUs: ${SUPPORTED_GPUS[@]}," + ewarn "but none of them were defined in AMDGPU_TARGETS USE_EXPAND variable." + ewarn + ewarn "Library will continue to be built in \"dummy\" mode," + ewarn "serving as a non-functional placeholder for end-user applications." + fi +} + +src_prepare() { + sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \ + "${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die + eapply "${S}"/gentoopath.patch + + local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die)) + python_fix_shebang -q ${shebangs[*]} + + sed -e "s:\${rocm_path}/bin/amdclang++:$(get_llvm_prefix)/bin/clang++:" \ + -i library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh || die + + cmake_src_prepare +} + +src_configure() { + rocm_use_hipcc + + # too many warnings + append-cxxflags -Wno-explicit-specialization-storage-class + + local targets="$(get_amdgpu_flags)" + local build_with_tensile=$([ "${AMDGPU_TARGETS[@]}" = "" ] && echo OFF || echo ON ) + + local mycmakeargs=( + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_WITH_TENSILE="${build_with_tensile}" + -DAMDGPU_TARGETS="${targets}" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark ON OFF)" + -Wno-dev + ) + + cmake_src_configure +} + +src_compile() { + local -x ROCM_PATH="${EPREFIX}/usr" + # set PYTHONPATH to load Tensile from virtualenv, not the system-wide one + local -x PYTHONPATH="${S}_build/virtualenv/lib/${EPYTHON}/site-packages" + local -x TENSILE_ROCM_ASSEMBLER_PATH="$(get_llvm_prefix)/bin/clang++" + # TensileCreateLibrary reads CMAKE_CXX_COMPILER again + local -x CMAKE_CXX_COMPILER="$(get_llvm_prefix)/bin/clang++" + cmake_src_compile +} + +src_install() { + cmake_src_install + + # Stop llvm-strip from removing .strtab section from *.hsaco files, + # otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes + dostrip -x /usr/$(get_libdir)/hipblaslt/library/ +} + +src_test() { + check_amdgpu + + # Expected time for 7900 XTX: 340s (full) or 5s with GTEST_FILTER='*quick*' + cmake_src_test +} diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest index 06c7df6ca629..9228f0b892b7 100644 --- a/sci-libs/hipCUB/Manifest +++ b/sci-libs/hipCUB/Manifest @@ -1,10 +1,9 @@ -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 -EBUILD hipCUB-5.1.3.ebuild 1930 BLAKE2B 9a686ada92902f9ee2fed32ac68e5599a38fd25ab639a22316293efe868701399d6d26c401d9c09b328139d94fe4fccbe8a33e6dd3eb675b7b9704c906af3ce9 SHA512 91a0e1284bb43502525120d031586b12238a71c28583135848b824e555c5ed84ab7d2258eb38945090a00def1ba060ae2ba8aefa7c2fe5cd35ae38808b4df94d +DIST hipCUB-6.3.2.tar.gz 387546 BLAKE2B b0d4d487fc1f799e10cd684255fe4bb31ed7329d0ea628c818df560d506aa2b4e5bdb08b007aab9ee95492a3fecf6f559c5c9724df15fe7da86d9aed84951c6b SHA512 735610735e4584ded05b30d99ae9042d3ccd4590689fc2c415eb45fb2fd0d7ab431704709bdd066341ec10284ca0f4c1ad108c188f95949ce962b6a75eb57e19 +DIST hipCUB-6.3.3.tar.gz 387580 BLAKE2B e0b605835be2b685c1cfa099a807e30fa061af8b14bafa1167c8249383230761a0d08532c831d3cb015e8e1b58119899d3cb7330990ca046045ea40058ee03e5 SHA512 2ec96088d34edeff48f8ee103a619f2ca7c741dcb020a3d1833a00e2072510790a563e98662aef7aa2a348034f3c8169ee39dcc61ab95202c734901ba53dfa4b 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 +EBUILD hipCUB-6.3.2.ebuild 1378 BLAKE2B 662956e626b1defc7274a6e6b93cd49f4ed7d6fe875c7949930b689ace2b836a5451c153864d93e24dc2b59abd09a738003768cf0c89dbcc8b2ecf7721946562 SHA512 3418a67fe0e234c0c367c68631bd6f0ba680d01db668ccda6476438bbf955e43049c87fc66de8e260b992e5d1b04ea633248dcfe0f331698eb21aff77f471df6 +EBUILD hipCUB-6.3.3.ebuild 1378 BLAKE2B 662956e626b1defc7274a6e6b93cd49f4ed7d6fe875c7949930b689ace2b836a5451c153864d93e24dc2b59abd09a738003768cf0c89dbcc8b2ecf7721946562 SHA512 3418a67fe0e234c0c367c68631bd6f0ba680d01db668ccda6476438bbf955e43049c87fc66de8e260b992e5d1b04ea633248dcfe0f331698eb21aff77f471df6 MISC metadata.xml 716 BLAKE2B 433c3fdc53e3748b67a65d62ce8380044a4c5456191a14cc723e614d90da63b2e4bf4ff6d8f1fd9a7595041f6380a17c502d3bb5f17d8d0c08e0b7b1205ac8f5 SHA512 5130451d65a122a242bc9c553efed4289f54aa3e7bd56c1b3ac636ae902ce0df4502d9bbdca61e58c4a94bb4ea8adb00d94baacced1e487ed563c6c489377587 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/hipCUB/hipCUB-6.3.0.ebuild b/sci-libs/hipCUB/hipCUB-6.3.2.ebuild index ae5c0e0c441f..ae5c0e0c441f 100644 --- a/sci-libs/hipCUB/hipCUB-6.3.0.ebuild +++ b/sci-libs/hipCUB/hipCUB-6.3.2.ebuild diff --git a/sci-libs/hipCUB/hipCUB-6.3.3.ebuild b/sci-libs/hipCUB/hipCUB-6.3.3.ebuild new file mode 100644 index 000000000000..ae5c0e0c441f --- /dev/null +++ b/sci-libs/hipCUB/hipCUB-6.3.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 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/ROCm/hipCUB" +SRC_URI="https://github.com/ROCm/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz" +S="${WORKDIR}/hipCUB-rocm-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE=" + benchmark? ( ${ROCM_REQUIRED_USE} ) + test? ( ${ROCM_REQUIRED_USE} ) +" +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip:${SLOT} + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" \ + -i cmake/ROCMExportTargetsHeaderOnly.cmake || die + + cmake_src_prepare +} + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + # Expected time on gfx1100 (-j32) is 85s + # hipcub.BlockShuffle fails in parallel tests, but adding -j1 makes tests too slow. + local CMAKE_SKIP_TESTS=(hipcub.BlockShuffle) + cmake_src_test +} diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest index cb0d45c2d7b9..c7f9d20de23b 100644 --- a/sci-libs/hipFFT/Manifest +++ b/sci-libs/hipFFT/Manifest @@ -1,14 +1,12 @@ 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 -EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e +DIST hipFFT-rocm-6.3.2.tar.gz 267935 BLAKE2B cb2f2f616f70578d98b47eeb1c89e81b769c5e615ec3f5421fc1a4fd8deb2695a3e69f8f41da3aa93adbb61d0c85596d89301437ad2d092779355976ff8d7b9c SHA512 788c1a4313c4b863051d0f7ea1a4ccd1d7955469dfcc604644041a6936279211b58850589aac90fde76b96cbe6452e87feb8ab2c01186a924ae8de47ff792cb7 +DIST hipFFT-rocm-6.3.3.tar.gz 267940 BLAKE2B a04284d719c33ef214a7cd4e64cdb5babb8bff45c2965ca6d20718f034970e736ff2056dee9ca9e8aba0c00d14bc21f013ad82ed7948f5c9874cc1138fb38671 SHA512 87c03985167d2eb18b72e2ed2fbca34ad2a9ce5cabf2fa9260f00139425b5cadab4a79f23e1beaf300eee6d1029d842bddf8ebd293f6897882f91331b93a404c 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 +EBUILD hipFFT-6.3.2.ebuild 936 BLAKE2B 3988d401a96a328bd4f1431edcfc845482ab1aeb8964524b3506e3bff804b6c5de5d3c1d8dd110cf79992aedd112bda3d279352389d859dd14d8df4ded0a2c4f SHA512 0db6b0d82036dda5bab983deef22f94cf5bbdb02988ac22dcf85df54f8c20c109c5bc31b4bef4e27eb554693b3674400fb5a1d81a61f9ab7c35956bc58721820 +EBUILD hipFFT-6.3.3.ebuild 936 BLAKE2B 3988d401a96a328bd4f1431edcfc845482ab1aeb8964524b3506e3bff804b6c5de5d3c1d8dd110cf79992aedd112bda3d279352389d859dd14d8df4ded0a2c4f SHA512 0db6b0d82036dda5bab983deef22f94cf5bbdb02988ac22dcf85df54f8c20c109c5bc31b4bef4e27eb554693b3674400fb5a1d81a61f9ab7c35956bc58721820 MISC metadata.xml 714 BLAKE2B 092bc9b24f4f4471096402455b42f65bc7850a46a08dc1e5721d25d630a9dbfd3ba9e770e7c529187cb483161a47e6fd0bdbd617e54b80280704c58a6c6256e8 SHA512 4da0b797299b620d14b2f1ce5dd2c7adcad555dacf11a5f1aa991773895730330c381759e29f43b2a2bbd3d3f50995b1cbb654fdd0d2e8b622db1e1385b9a8d1 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-6.3.0.ebuild b/sci-libs/hipFFT/hipFFT-6.3.2.ebuild index 8cc68e63e149..d1dcfdf8e9fe 100644 --- a/sci-libs/hipFFT/hipFFT-6.3.0.ebuild +++ b/sci-libs/hipFFT/hipFFT-6.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild b/sci-libs/hipFFT/hipFFT-6.3.3.ebuild index 79eb8052324f..d1dcfdf8e9fe 100644 --- a/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild +++ b/sci-libs/hipFFT/hipFFT-6.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,37 +8,33 @@ 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" +HOMEPAGE="https://github.com/ROCm/hipFFT" +SRC_URI="https://github.com/ROCm/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +S="${WORKDIR}/hipFFT-rocm-${PV}" + REQUIRED_USE="${ROCM_REQUIRED_USE}" LICENSE="MIT" -KEYWORDS="~amd64" SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" 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() { + # Note: hipcc is enforced; clang fails when libc++ is enabled + # with an error similar to https://github.com/boostorg/config/issues/392 + rocm_use_hipcc + local mycmakeargs=( - -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft" -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_TESTS=OFF -DBUILD_CLIENTS_RIDER=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF ) - CXX=hipcc cmake_src_configure + cmake_src_configure } diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest index 96b7e5783aea..23bb87c207b2 100644 --- a/sci-libs/hipRAND/Manifest +++ b/sci-libs/hipRAND/Manifest @@ -1,9 +1,9 @@ -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 -EBUILD hipRAND-5.6.0-r1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b +DIST hipRAND-rocm-6.3.2.tar.gz 125506 BLAKE2B 836eb474c4b88a4729e3e9176736b28c090cf2add0ef463bf594deede353b755a1a07ef5898ec51e3ae66c2972cbfe6a71815020dd5f3e3b1aca105d8d8ca8e2 SHA512 8f3893ec89f76b859847b75acf3ec20f751924cd16d3ea25dbb0e1f2a5b7d75832c214e6ce9e180e3f74fbcb0c4bf95b75bf3ad32e9ac34e5e0f7522554f38a6 +DIST hipRAND-rocm-6.3.3.tar.gz 125512 BLAKE2B 3a1c5fbdc115e6372dd88501abebab729022fcda03c9a3a39848fdce15f335abd772f82660af09c48abe9b88f138866a31273f5ee2b4290400ecf8cc3f8e2456 SHA512 ee2e4364d07e7ed3515f3c1094119e54055d052e396b5dece738241c8404eecb75e737f43e513262474140c78046430ea5d7f3d915c321c5d9ba4b20778ccc6e 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 +EBUILD hipRAND-6.3.2.ebuild 801 BLAKE2B ff4dfefb1ed8ccdaeeb2102344d34213f8eeb76ea14fabc12bea7f65950bcd5abff8d2985a2e2aba13aea0d976755a4c2f8e019cfc31f03830901f3be386a303 SHA512 24724c2c7d21c358d2f0cbbd9115800d0f44b365f79f42972958163efa0e24ce9d783bb48db8a001259fd32ada0aaf3dab7dde98407f9480a2b445fafc5e9845 +EBUILD hipRAND-6.3.3.ebuild 801 BLAKE2B ff4dfefb1ed8ccdaeeb2102344d34213f8eeb76ea14fabc12bea7f65950bcd5abff8d2985a2e2aba13aea0d976755a4c2f8e019cfc31f03830901f3be386a303 SHA512 24724c2c7d21c358d2f0cbbd9115800d0f44b365f79f42972958163efa0e24ce9d783bb48db8a001259fd32ada0aaf3dab7dde98407f9480a2b445fafc5e9845 MISC metadata.xml 586 BLAKE2B 98f8745143ec4d1c89f1e12747e1f1abe97ec74bab97f2afeea257f3a900b87c76efccebb39abd500f36ff88eab2284ec73a89db90ff0c5e616dba912f084f11 SHA512 71778ca99fb19bf30fc2f301f188e4ded754eafd2eba8abe1143cbecbf143d7f3cc8ce908592dee9e7cdc242d4f05f4a2d10739893357abb0a30362ec4448b85 diff --git a/sci-libs/hipRAND/hipRAND-6.3.0.ebuild b/sci-libs/hipRAND/hipRAND-6.3.2.ebuild index 1bbe4255434b..10c1112facb7 100644 --- a/sci-libs/hipRAND/hipRAND-6.3.0.ebuild +++ b/sci-libs/hipRAND/hipRAND-6.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild b/sci-libs/hipRAND/hipRAND-6.3.3.ebuild index 1674ad72718f..10c1112facb7 100644 --- a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild +++ b/sci-libs/hipRAND/hipRAND-6.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,13 +8,15 @@ 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" +HOMEPAGE="https://github.com/ROCm/hipRAND" +SRC_URI="https://github.com/ROCm/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz" +S="${WORKDIR}/hipRAND-rocm-${PV}" + REQUIRED_USE="${ROCM_REQUIRED_USE}" LICENSE="MIT" -KEYWORDS="~amd64" SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" RESTRICT="test" @@ -22,14 +24,15 @@ RDEPEND="dev-util/hip sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]" DEPEND="${RDEPEND}" -S="${WORKDIR}/hipRAND-rocm-${PV}" - src_configure() { + rocm_use_hipcc + local mycmakeargs=( + -Wno-dev -DAMDGPU_TARGETS="$(get_amdgpu_flags)" -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF -DROCM_SYMLINK_LIBS=OFF ) - CXX=hipcc cmake_src_configure + cmake_src_configure } diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest index 1098df279208..95609e27ffcf 100644 --- a/sci-libs/hipSOLVER/Manifest +++ b/sci-libs/hipSOLVER/Manifest @@ -2,8 +2,10 @@ AUX hipSOLVER-6.1.1-find-cholmod.patch 965 BLAKE2B 0d4f37dbae67bf2605a981f3a01c9 AUX hipSOLVER-6.3.0-find-cholmod.patch 2171 BLAKE2B 5e85019a3c25dc535ac9ce1d03a55e82b015e10e3c28b4cc0850003cbf8453c391f008ccf4549d9b9dca46b1b4662eabb13ff33ec77c0b27544d34693d69137d SHA512 c41a1c9ba2d1d49f4ba81267bf5e35d319a0d54049f26781e11d0a7ed170aef7d56c82e6066ddb137cc60874b59611f530e2355558171e3e6c0d480ff32378b6 DIST hipSOLVER-rocm-5.7.1.tar.gz 1516012 BLAKE2B 8d0966d34877978784b9872150283719602465c85036c3a74a72a2fe7c516b6029af3f4aefbc022088b2cf37bb1e0a450c0221aef0ac3227018020de340adfcd SHA512 f9c14b51ea582f17d1b323c7d066d9c0c95f4250f08515768d7a11067774fd2841fa3dec7354d3c98e56bd8dd53cff3b993c68b1d7df4b24f562b3afe9c4625e DIST hipSOLVER-rocm-6.1.1.tar.gz 2553462 BLAKE2B 77731b876a7fe5f80f79e5af5128a84d8a5d4dee6d511f3e1cf4964845b636380f7f1e19f07e84ed24b98e99c3bdfbba623b97b48cf4ea1bc09a4c1bd3dccaed SHA512 4f28ecd807717013318f293df8c48d7674f64fd3a538c2b827f4188a00a36165f48277d5ac50e806461d52a8a3b6d626cab91ff7c6687b17fea2580461e08de9 -DIST hipSOLVER-rocm-6.3.0.tar.gz 2575560 BLAKE2B 293a149e162e74bbf5ddc143bb5bb3fffe52fbe0a53f7ad2d3141fb91cd2fe1108f6a12c976e5b4b91de98b146a84f7290f073d6226214e2dbc13ccd1ddca26c SHA512 a648472695c917e3eab49414ceb6eb9a1c4a6dc3f667907f7d9a67f873d8826588dad823f74b8498bc81c23741a52b745451d13e78079e86d95b36da9b789a7b +DIST hipSOLVER-rocm-6.3.2.tar.gz 2575541 BLAKE2B b61e50de293ef5b37e5296a194ce3ecef3fafa624345d1d0be1ef987db5bc15b9d8d8a5399faa5ab6745d2af9326c8d19b002411d143aa4f0b0bd4b47bae8070 SHA512 fb7de8eccd8691723b1ff86f1e9a7fe5f3ceccb77eb4fe6f2098987904cd874bb442d9b4728f980ed2c41f145e0f46fe6beae9a001305792ff50c81b5baffc7a +DIST hipSOLVER-rocm-6.3.3.tar.gz 2573877 BLAKE2B 54d9736b63bfd314a155968737bf59c26685237e63e41a1500aa22841bb3c92a126645629dee8e9a87e0ee7a62035738dd85347a7dd0e4f05c7044755ef5e71e SHA512 d6213c1000e640bf29d96917df6f51f8f5fc30ec808d6473b7dd159f9ce160535170cec0f769c3749934e1896b9d3fcc1df21d5cda27b4d233e6a8c50e23c114 EBUILD hipSOLVER-5.7.1.ebuild 820 BLAKE2B 2e172aea78616bb75696b6dcf81e7ebee8902ff15335a5d7d36e9728e74eb20c320124491bccfb6cef9b4804e14fd7c58accacce500d13c043f6a104407f0c77 SHA512 83d99abbb856cfe7ce029fd8c7529fdd07be56e60a4ce6f00b662c5a6c3c829e99e66081fa907e61ee673320991fcbccca26b493022cdcae5e6d12dac04b62ea EBUILD hipSOLVER-6.1.1.ebuild 1017 BLAKE2B 7cc5d1b9f2e22bae160652364884bfea62fe106661df928cf3b21c91db898c88a169157eba24bda216a51f5d1d2a99e4f72e874ea0c25913a698ce4ccafb8d23 SHA512 82ceee4649fdb98531331325a9d9db11d17ab4782861aa8d89e1f07646e517a0be896190cc0f279f3f72c35a20d9465bddba6ed16db7270a48f0f23fa8df2d73 -EBUILD hipSOLVER-6.3.0.ebuild 1017 BLAKE2B a85de77721e5ec40fdc36502bff6fd256162231fcba6880e4145bb0f15baea7a9760e8f9e4b156bf3a80c799136cc9f3049e6239a9675691e375c7d7b8d44003 SHA512 a0a23cca7699c4bdda606d3f1fcc5851f61eb3e96a8beeb357ed33647ac34616ea2e33aabf3865e428cd28d371792762c6b80afea0069c53a12463d99b095a3d +EBUILD hipSOLVER-6.3.2.ebuild 1017 BLAKE2B edeb4d422fdb6b9119a2840e355cab3b1fc30db3a214b7bda407a7ca714d2c5d95fdc2649bc902469267d25d40a1d6a098fc4a3187c32ef46cc886a6f01cad38 SHA512 a766290bfce69f200cc393e8a1a08dbeb80326ae4d09c10da1ced7077b0273c3b7f8969a2f3e9f1348d47203ef87bd0e7e2bbea877310247617a4cd9807057ee +EBUILD hipSOLVER-6.3.3.ebuild 1017 BLAKE2B edeb4d422fdb6b9119a2840e355cab3b1fc30db3a214b7bda407a7ca714d2c5d95fdc2649bc902469267d25d40a1d6a098fc4a3187c32ef46cc886a6f01cad38 SHA512 a766290bfce69f200cc393e8a1a08dbeb80326ae4d09c10da1ced7077b0273c3b7f8969a2f3e9f1348d47203ef87bd0e7e2bbea877310247617a4cd9807057ee MISC metadata.xml 711 BLAKE2B 4b6209b802e7fe231e87d5fd020c864cbbc3511ae471648bfb0ba3afb294c17a3a279d243e5b5531626aa7e0b3324099a073738ec3656c6a918d6f7f299913ee SHA512 54b14188dfc59bbcf4fd21d44b41508b01ee939c7591fea77ae601c337c7812b679aba3201e97ff5760baedc144b9ce6ad98855e1fd8976c60fff366cd0c7f7c diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.3.2.ebuild index ea8bafabf7c5..fcd2d71089d6 100644 --- a/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild +++ b/sci-libs/hipSOLVER/hipSOLVER-6.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.3.3.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.3.3.ebuild new file mode 100644 index 000000000000..fcd2d71089d6 --- /dev/null +++ b/sci-libs/hipSOLVER/hipSOLVER-6.3.3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2025 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 marshalling library for LAPACK routines on the GPU" +HOMEPAGE="https://github.com/ROCm/hipSOLVER" +SRC_URI="https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-${PV}.tar.gz -> hipSOLVER-rocm-${PV}.tar.gz" +S="${WORKDIR}/hipSOLVER-rocm-${PV}" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="sparse" + +RESTRICT="test" + +RDEPEND=" + dev-util/hip:${SLOT} + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}] + sparse? ( + sci-libs/suitesparseconfig + sci-libs/cholmod + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-6.3.0-find-cholmod.patch +) + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_WITH_SPARSE=$(usex sparse ON OFF) + ) + + cmake_src_configure +} diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest index 915da68aa7f2..dbb689d30126 100644 --- a/sci-libs/hipSPARSE/Manifest +++ b/sci-libs/hipSPARSE/Manifest @@ -1,10 +1,8 @@ -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 +DIST hipSPARSE-6.3.3.tar.gz 537761 BLAKE2B 3f4bac3b35ecaf033dbbee9f802a28f8f3cbd0155443d198ae450f22034293c48cebf60745e297b83a44ce0bdedeba44a643650af4980e4823c64edd344ac084 SHA512 aaf8d31d5102ed02fc861a90e9e6ccca22a7242559d8c775735f5d893c423bbbcf1c72ed96eade1c630aefd6154de64de8fe60cff54b9837c4ef249cbf4db06e DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff @@ -24,8 +22,7 @@ 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 +EBUILD hipSPARSE-6.3.3.ebuild 3807 BLAKE2B f2b432f1ace5b011740d9ab1c4b11db6d5e857c81a8bec610931d76915317e9b2b4efb05f5c408cd9c52384f13b2811a18edbf00a52c8fd42d7e7d6daff1c886 SHA512 20e34d49c226f26e3f0758a4d8cb26a799dd87a861c6bcfaeca6e88870081aa8b88e3bde4ba7633f4a9a58e0f8b52449901b266083cba3ffa7a8bf560f74b302 MISC metadata.xml 786 BLAKE2B 5cbf3033ba3d8a6d086ff13019ad9af8bd3262325fa493505a37ea24c5a31edee5a63bf2ab86514d1e815ff593ad5868432510cafc10edf32bebcc6d4030fbd4 SHA512 891e14524e3903284a7fec56b4be4bf50ef08e092b84e8a2a82d58d62446a7724768103d88793d43f09d7846c2b69da50731aa0d2c55598aa8fac4aa65613522 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/hipSPARSE/hipSPARSE-6.3.0.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.3.3.ebuild index 62a5615be846..40ea76c8faa0 100644 --- a/sci-libs/hipSPARSE/hipSPARSE-6.3.0.ebuild +++ b/sci-libs/hipSPARSE/hipSPARSE-6.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ inherit cmake edo rocm toolchain-funcs DESCRIPTION="ROCm SPARSE marshalling library" HOMEPAGE="https://github.com/ROCm/hipSPARSE" # share some test datasets with rocSPARSE -SRC_URI="https://github.com/ROCm/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz +SRC_URI="https://github.com/ROCm/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-${PV}.tar.gz test? ( http://sparse-files.engr.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz http://sparse-files.engr.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz diff --git a/sci-libs/huggingface_hub/Manifest b/sci-libs/huggingface_hub/Manifest index 5b012c7b6e53..15841baa5666 100644 --- a/sci-libs/huggingface_hub/Manifest +++ b/sci-libs/huggingface_hub/Manifest @@ -1,7 +1,7 @@ -DIST huggingface_hub-0.20.3.gh.tar.gz 3276706 BLAKE2B 2dd9fe557db4e88481bcc675dd1d6d35ec26244b723ea6bed01555e20fcba1dfa269ab3a1de9c8afa21d25b57550f822ca05bfd9d54db7e7b4740116c5ea3469 SHA512 b6eb9875da4d3c0b7190e61beee14ba913fb0f967967a70a6a65e5d42881e06710fb132e471c6e9b0ea1cd0987b2ebd31754d90aded3a84f4ddcfb0a0efe2f21 -DIST huggingface_hub-0.21.4.gh.tar.gz 3565936 BLAKE2B 8aac3ca36369040fe8f7b628cc07a5d890b845d3bfec0dcf6cf7fc477c5c30d680c2dc0531d92c5e814d86f098fad87c80113f37719b41a1eac696f6abd82372 SHA512 886e553c474b59a47d1c5e04c7429ca5c1eb6bcb88a0f7ed6f1396d43c3195bb1f376093384f40497f18fb2220e3e0d9c4b7787c009b84d1d38b6d706307f67f DIST huggingface_hub-0.24.7.gh.tar.gz 4009372 BLAKE2B e1a949dc204af152538bb95e226c3e1fa9faaf0b77a49c6a5adee9d751c0b1344c9c76670baf840fe7eb04e8a2dd8816fcac7e143e26c6fe589bb9e4325120f3 SHA512 e944e5091121197ee78f4b199795fad3f984fd7177103357303010b412ff3e88c613efe1c8fc328f602475f3e4d747d8262e0675ea9ff831310875bb70e5fef9 -EBUILD huggingface_hub-0.20.3.ebuild 806 BLAKE2B bff4576ffe4422a47b7531e2159e815330c221e22c3102a14973840674906a61f64c269cc75145e5bd3aa14413259d0e6d971628360923093aa0be79b4ec7e4b SHA512 112d2dee042a41af9189e1cef7872fbbe697c1886169751d6ea2a17ce0a3e7391dfd604e9e8a5de050b2feb917d110bed0583fe02096a02b0311fb661ff6d5ca -EBUILD huggingface_hub-0.21.4.ebuild 806 BLAKE2B bff4576ffe4422a47b7531e2159e815330c221e22c3102a14973840674906a61f64c269cc75145e5bd3aa14413259d0e6d971628360923093aa0be79b4ec7e4b SHA512 112d2dee042a41af9189e1cef7872fbbe697c1886169751d6ea2a17ce0a3e7391dfd604e9e8a5de050b2feb917d110bed0583fe02096a02b0311fb661ff6d5ca +DIST huggingface_hub-0.25.2.gh.tar.gz 4033422 BLAKE2B 77c5d40c65e0da4d006d33c6f6663521a5bf52c8ef315a329ff3ed9e9ab234a40183abc1b22ef63d236bc982255eca2038962c98a1f63cc5702c958395918720 SHA512 8933e469cd1e8fc43e9da3991f6acb598531c01bcd833218a1838419774d613102c095ce3beebab8dae1ff2708946d8f417b9861c69a460d38eae24f9bb9d718 +DIST huggingface_hub-0.26.5.gh.tar.gz 4056959 BLAKE2B 719c7abd00a822929ec4a14924ea200b91c8b8be2fb45b71e8f98a8e4e178613bc444bd67f9b013f94bd808b8229171872014249013e32f37e74a3ea709c0ae9 SHA512 e151e216b681b72ecb28e82d05bb5c6edf25bbbd34d6ce10d2896b54d9fdaf5ec062b2f777a2e5c61fbc92c901351adfb1f9fcfac2efb360e2a3076d5dd08c34 EBUILD huggingface_hub-0.24.7.ebuild 843 BLAKE2B 57ae5a4639b2ff2086a38581ed2dddd1e433878ba6df8d0d1f94c17f1e0adb996cd1075a65fa00cdfb29afd1213123d83c34c3adf4553bcb42d7e4508e9e99f8 SHA512 0fb4c915ee94daf170a5482b7f371f07f4c2dc139c0bd328d86566414cdf0d0880f222480d74e225f04c128b90e3857a780b18989b52e06f5d2f1a3679365f13 +EBUILD huggingface_hub-0.25.2.ebuild 1769 BLAKE2B 71c96e38f3142e41fa8410b84442a0f245d1bca705debc9c51b8ea246a0c0f18023ef5800c97473bbd6060f4f124d65d52613dca90adc7065f3316135463a98f SHA512 ace3885bbea8b66657b1b943dba69947e04bf9251f83e533668e9bfeb1b2129a78e873a86fd6f3a33664de04f3f944bd751f05311237c3017ab81f68ba6d3644 +EBUILD huggingface_hub-0.26.5.ebuild 1769 BLAKE2B 71c96e38f3142e41fa8410b84442a0f245d1bca705debc9c51b8ea246a0c0f18023ef5800c97473bbd6060f4f124d65d52613dca90adc7065f3316135463a98f SHA512 ace3885bbea8b66657b1b943dba69947e04bf9251f83e533668e9bfeb1b2129a78e873a86fd6f3a33664de04f3f944bd751f05311237c3017ab81f68ba6d3644 MISC metadata.xml 393 BLAKE2B 1703224359804943e921acb978be119c5ae48c6dae23177d9ba2a4b843a1f8cf10487c7dfc5af83600bb98f1443cb5d3cdad1d48ddc5db7117ebb3092af5fe44 SHA512 74ac25236d7cd4b169ec6281480b140e25f0b2579998ca441eb2ab5c070ed87690c49b7af1bb7b83d8782685c18dc3d2cd5f7ef27e8a51fa8863badc58214461 diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.20.3.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.20.3.ebuild deleted file mode 100644 index c033a2a89d94..000000000000 --- a/sci-libs/huggingface_hub/huggingface_hub-0.20.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -DESCRIPTION="a client library to interact with the Hugging Face Hub" -HOMEPAGE=" - https://pypi.org/project/huggingface_hub/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" #Several modules not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.21.4.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.21.4.ebuild deleted file mode 100644 index c033a2a89d94..000000000000 --- a/sci-libs/huggingface_hub/huggingface_hub-0.21.4.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -DESCRIPTION="a client library to interact with the Hugging Face Hub" -HOMEPAGE=" - https://pypi.org/project/huggingface_hub/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" #Several modules not yet packaged - -RDEPEND=" - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.25.2.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.25.2.ebuild new file mode 100644 index 000000000000..9a275233607b --- /dev/null +++ b/sci-libs/huggingface_hub/huggingface_hub-0.25.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="a client library to interact with the Hugging Face Hub" +HOMEPAGE=" + https://pypi.org/project/huggingface_hub/ +" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/fsspec[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +src_test() { + local EPYTEST_IGNORE=( + contrib/sentence_transformers/test_sentence_transformers.py + contrib/spacy/test_spacy.py + contrib/timm/test_timm.py + tests/test_command_delete_cache.py + tests/test_inference_api.py + tests/test_inference_async_client.py + tests/test_inference_client.py + tests/test_inference_text_generation.py + tests/test_init_lazy_loading.py + tests/test_cache_no_symlinks.py + tests/test_file_download.py + tests/test_hf_api.py + tests/test_repocard.py + tests/test_repository.py + tests/test_snapshot_download.py + tests/test_utils_cache.py + tests/test_utils_telemetry.py + tests/test_webhooks_server.py + ) + + local EPYTEST_DESELECT=( + tests/test_cache_layout.py::ReferenceUpdates::test_update_reference + tests/test_commit_scheduler.py::TestCommitScheduler::test_sync_local_folder + tests/test_hub_mixin.py::HubMixinTest::test_push_to_hub + tests/test_hub_mixin_pytorch.py::PytorchHubMixinTest::test_push_to_hub + ) + + distutils-r1_src_test +} diff --git a/sci-libs/huggingface_hub/huggingface_hub-0.26.5.ebuild b/sci-libs/huggingface_hub/huggingface_hub-0.26.5.ebuild new file mode 100644 index 000000000000..9a275233607b --- /dev/null +++ b/sci-libs/huggingface_hub/huggingface_hub-0.26.5.ebuild @@ -0,0 +1,63 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="a client library to interact with the Hugging Face Hub" +HOMEPAGE=" + https://pypi.org/project/huggingface_hub/ +" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/fsspec[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +src_test() { + local EPYTEST_IGNORE=( + contrib/sentence_transformers/test_sentence_transformers.py + contrib/spacy/test_spacy.py + contrib/timm/test_timm.py + tests/test_command_delete_cache.py + tests/test_inference_api.py + tests/test_inference_async_client.py + tests/test_inference_client.py + tests/test_inference_text_generation.py + tests/test_init_lazy_loading.py + tests/test_cache_no_symlinks.py + tests/test_file_download.py + tests/test_hf_api.py + tests/test_repocard.py + tests/test_repository.py + tests/test_snapshot_download.py + tests/test_utils_cache.py + tests/test_utils_telemetry.py + tests/test_webhooks_server.py + ) + + local EPYTEST_DESELECT=( + tests/test_cache_layout.py::ReferenceUpdates::test_update_reference + tests/test_commit_scheduler.py::TestCommitScheduler::test_sync_local_folder + tests/test_hub_mixin.py::HubMixinTest::test_push_to_hub + tests/test_hub_mixin_pytorch.py::PytorchHubMixinTest::test_push_to_hub + ) + + distutils-r1_src_test +} diff --git a/sci-libs/ideep/Manifest b/sci-libs/ideep/Manifest index ae7d1f499c59..30940df7d479 100644 --- a/sci-libs/ideep/Manifest +++ b/sci-libs/ideep/Manifest @@ -1,5 +1,7 @@ DIST ideep-3.3.2.tar.gz 57631 BLAKE2B 57ec733a3bf9e6e8ebdebdeb63000adcef8e9ecda00118c88bca24a80fd71602b5dc3d46892410d0231d2ecf2111d5a08c3a4e95bb785964cfc4c5d6c81537f0 SHA512 e0a9ca99f25b488e38b8887099c015ed0e67cc5c350c922b85f746e25c88e07a3291f8f5d71aef5f37c72814f32e00d81ec16853a425e0fe735c71c5fccc6a41 DIST ideep-3.5.3_p2.tar.gz 63267 BLAKE2B 8797b5ff222824ef135496c39cdeb41c646ae2d7538a75688d554933529de1fa5126fa19e95d0d0199e6cef348c6ede49ccb7a10235d9f434c4f108991c1b299 SHA512 033ec14e50b50fde7f213656c784cc81a12b4ff0a67b019e8efc00e0703bdff5b5aed44bad5cab75e50d014ea9db5a2ec5490f62ff7208824d08a5df451cc64a +DIST ideep-3.5.3_p3.tar.gz 63303 BLAKE2B 18e1f1d410e0ff772c8e8e0df2d5121570929ad3c73540c3de3697388b0a88a2e591a054927a2451c9f35274821aabbbc1d0c57a618f382152111c0f6521630c SHA512 a814afd5a0924e2336cad2fd651606ac2a2fd191d793cdf6674d2172402b025a3e5175efd2fc23c163843659597fbc20a02330bbec175107ed3fab4775873c00 EBUILD ideep-3.3.2.ebuild 423 BLAKE2B 30d3cb5ddccd79f3b91199e76ae018b7b429919c3bead84b73279132dd9092c04f4304c5ec2d0c781c1c612e5639a118580b7a0054412c631f66f49581d5f335 SHA512 943fc82a21a027b717a0f4d5966462cf318ddabc80204ec9c8c57926223ef1961116a526593f6eac2078dc574be419ec3fe9cfc17812a68abab738c2f72cf9d4 EBUILD ideep-3.5.3_p2.ebuild 427 BLAKE2B aa5d169e448d5f5a728f3a6c259c20448f330fec1435316f1744a68155f9267ca893dddd8d97e39bb84a0d3a138c3da06bcb01080fa7118111cb065109c87e00 SHA512 bef3115cb6010e145994d4521d171c64229e770647020304f2dfe2ebd2a3d279e3c15eba0dda9deb65317b7e0df206f6c3512334a3d04a13da12549ba3356338 +EBUILD ideep-3.5.3_p3.ebuild 432 BLAKE2B 2cd827b79c29ecedf9b2aecf5f76522ee40bc44c7d34cd1eb5ae9fdf932fc4c825f81842b9001e6fc450a798a9cdba859a2de5f29f2404438d382215fd4a2a2e SHA512 36e954009d52f440f687d307ba8af0c4bccc581569f5ef74609b40efadd1f4a98e7c921aa8a1bb3b0c62526d16a57717c0b9d32a09e52d65525281fe9463a041 MISC metadata.xml 324 BLAKE2B 64ab7e6f3c76c6627e6d86be6650cd725a10b4bb8c886aeda603c94817c949a55579a4bf630dfaf82757f1245c9362a5378685378ee2f725e591e3f28b6703f2 SHA512 ff287f7f251a1c27d35876a89f2adf622c43a2bf02569d5035a28ba44a5381afc1ca9e801c628a07cfec776bdd53810948116eaacdf1dcc3e7dc1b073e29eb6e diff --git a/sci-libs/ideep/ideep-3.5.3_p3.ebuild b/sci-libs/ideep/ideep-3.5.3_p3.ebuild new file mode 100644 index 000000000000..c01174665e58 --- /dev/null +++ b/sci-libs/ideep/ideep-3.5.3_p3.ebuild @@ -0,0 +1,20 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MYP=pytorch-rls-v${PV/_p/-} +DESCRIPTION="Intel® Optimization for Chainer" +HOMEPAGE="https://github.com/intel/ideep" +SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${MYP}.tar.gz + -> ${P}.tar.gz" + +S="${WORKDIR}"/ideep-${MYP} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +src_install() { + doheader -r include/* +} diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 668fd6b198e8..d819b9835bad 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,5 +1,5 @@ DIST indilib-2.1.1.tar.gz 2929685 BLAKE2B 565199451a2ebbf6757bb854e0dad576397a6154c6043543243364b6072375afd775ed0b54ed116b2702bdea222b47e4f68673da617e68ebf626d1725e66d2a7 SHA512 3224afb13776462e906398be2b85802807e739042494b29701d106731423640a4dceaeb262cd62d3a87f032ba0655da7ceaa150e6912be20508e090ad93c3ba7 -DIST indilib-2.1.2.tar.gz 2940192 BLAKE2B 61a8f73cb5d7561852db0e63f7332eed7f0ea65279c05fe3c13e8891acaae81fe60c86da78ee0eeea1adc6a183065bd92af519493087c6959a29a3fae84107b5 SHA512 77838f7b64443f68a0aa6f0bc0232fbacaeed3d0759bc16496f11e434cf6d3eb2cb5ae07f49b1fa200c9dadc91e9418f6f5ea8f593e03543719a2d73ddb061d2 +DIST indilib-2.1.2.1.tar.gz 2941118 BLAKE2B 43928220243867a2c648855a38de3c3e49c754b135694215b24ddda6b71eb8a421a1d11dd199b5df9adcedb8c63de46288a8fe246f4ba27adfd6e98c38d825a2 SHA512 b59b23a26509922fae33d6080510a7fdce170baa59d86f5abbb955313e0a62d45f489b08021144a44cc0ca1d172825a6b524c778bb2bb24148b246e574fc0918 EBUILD indilib-2.1.1.ebuild 1774 BLAKE2B 8ca6b34c559118a344321380145f824949cd7ecdd1ede2d07aa3a61ebd61e98c6e4ad585f91f1b65bb395d276e01e9cc8c94794ba1b31276625139347b173404 SHA512 8751a102de63c176e732a53257a6a0edc236ab69c73b602ada4842fe2ade8d2661b4346160f1b269ef120854841cba50b90f4abc911c15d06baee5b7c6dd2c29 -EBUILD indilib-2.1.2.ebuild 1776 BLAKE2B d1fed6d0aa012b7db3b3398f70c44193abec7e48e3dcf40d3648f70d0f3e38223f403e0933f367c23868eda3f9bbcd8286e1e74e79c6c75181ce7b875621ecbd SHA512 8af2a487c439c1935b202ee04141c77b1ed3736070f2cbcf747b71bfd337d2d68b02651bfa533f8dce1e04b0188281bb1168cd6c090fa9dbde51a637a54c4bd2 +EBUILD indilib-2.1.2.1.ebuild 1776 BLAKE2B d1fed6d0aa012b7db3b3398f70c44193abec7e48e3dcf40d3648f70d0f3e38223f403e0933f367c23868eda3f9bbcd8286e1e74e79c6c75181ce7b875621ecbd SHA512 8af2a487c439c1935b202ee04141c77b1ed3736070f2cbcf747b71bfd337d2d68b02651bfa533f8dce1e04b0188281bb1168cd6c090fa9dbde51a637a54c4bd2 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f diff --git a/sci-libs/indilib/indilib-2.1.2.ebuild b/sci-libs/indilib/indilib-2.1.2.1.ebuild index ebd639ac9384..ebd639ac9384 100644 --- a/sci-libs/indilib/indilib-2.1.2.ebuild +++ b/sci-libs/indilib/indilib-2.1.2.1.ebuild diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest index 67d80a7e5da1..f4a8eb734912 100644 --- a/sci-libs/kineto/Manifest +++ b/sci-libs/kineto/Manifest @@ -1,8 +1,7 @@ AUX kineto-0.4.0-gcc13.patch 255 BLAKE2B 5633abeae41fd306a6d66d4e0f72040abbcc27b052a9802c94235c4afcff5ed99f3ac0df9ed712c6d4a57345d666442ea89bcc84f9f7d333d2ec77be9246a1d5 SHA512 db55567e22355f7ca98959f6a385b103474b2aeed0684f48e0c2e043754defc888fbd6ae997c3e5909329777d662b2e4e1b85520192da7fcae32845798c4565d AUX kineto-0.4.0_p20231031-gentoo.patch 2997 BLAKE2B 123603ac81512b12800a0ef82fd0f573891c4170a16156f87afbdb7004608cf2593eccd23541aa2f042137762dc5d4a1d4013e9fa42303fb8e60066f96529030 SHA512 e7f4d0c7418cb3d4b00cd231b03692dd6b0fd3c29d54f6db557bb87d4ab000e5020d03fffec1583b7c2df8b0431e7f263a4c892eadc16e04ce8af2c9032b47fe -AUX kineto-0.4.0_p20240525-libfmt-11.patch 2191 BLAKE2B c6fec2eb3f79222d1224572801864d55759b75ea73de6273566b83a47dfdb051235da1290021125a113cd6152e24cf753b177890d022d98e3904e346eb47b54a SHA512 e039c0c0845cf807eb6550ff6f9de1e736786df7b78ec4aac370025377e28c64dcb05e776040244c43d819ed3fe0200ae50d8b4d1f77d34ab0c3819c01ab14b8 -DIST kineto-0.4.0_p20240525.tar.gz 8243259 BLAKE2B 677529d327254c26000271a6c845356604598fb05ba57befd0e5cbd0f112f6776d2851ea1e2a7671a38ee6cb06df45db68ff0435fcddbf69496db43f5ec1e7ee SHA512 41a08c7da9eea7d12402f80a5550c9d4df79798719cc52b12a507828c8c896ba28a37c35d8adf809ca72589e1d84965d5ef6dd01f3f8dc1c803c5ed67b03a43a DIST kineto-0.4.0_p20240807.tar.gz 8263052 BLAKE2B 79a9035939164595f30f55c6cdfdc72ab42fd93d6d8fc63dc028cae50498823916993cb2d856c4b4dc43f4107602e28e8cf70584b4aea4cacda2a700b9e856e3 SHA512 f037fac78e566c40108acf9eace55a8f67a2c5b71f298fd3cd17bf22cf05240c260fd89f017fa411656a7505ec9073a06a3048e191251d5cfc4b52c237b37d0b -EBUILD kineto-0.4.0_p20240525.ebuild 1067 BLAKE2B d8bf1c1c5b4e8c407ca1d1716895f3a5ccb95f4a691901fe84bd2e637e43fb01610addfba0a983c1461721fda33f95fa4cbe2d30ad4a32965f585f38eecbe949 SHA512 db4b499cd3c8973d4ce40e35588b91bbb3177292d3989251084c3cf2167f6225ab2ff9de317155fe48037b9bf977d1017e62f2585298aea5beba9dc3ae671550 +DIST kineto-0.4.0_p20241109.tar.gz 8275370 BLAKE2B 976e629eda6b967e3169e4179e021d8e6e62671d53ceadae420dc2c586445ab701a1f4b479d7e2abd8f0bd689e4679e66d57dcadc42f5e763c127fb371bb389c SHA512 e56500c3fb967d808b9aa052587a4bdeb5561bd47ab4de87cc636496867089c5b480e1c7634a0269b97262504e03ced047dc612903fa0f56a018c23adef4e686 EBUILD kineto-0.4.0_p20240807.ebuild 1070 BLAKE2B 282ea15bb12a06ad03115b3b9cb67d8e2ac78b5fffc61639e70c83abbf2e48df056c52d41f5e903a576f781adb50dafa1d6fdda2d3eba14a7da49de1a5655e65 SHA512 c2300f43bfcebb1ef66416851be9f3c4229488fa01a3781c619f75b80c22ef659cb01a87d52212cdc71d5e19cbbc3a4393579e9c580a250209826a223497b958 +EBUILD kineto-0.4.0_p20241109.ebuild 1021 BLAKE2B 0569a26b9094272766a3cfee6ba7f26e674eaff6201dc4e811a337d01caa9228c58468d28e02a036e675381b1a1649fb840d1104c973257eeab5413516af24a9 SHA512 0c760eeb8be389021fb20be5a62e153cc23e70304f164d56e7252666b33946b47babafac606f82dcfa89eefed849d0b54a79bdd298b16b36df7d9b67b1bc1ce9 MISC metadata.xml 327 BLAKE2B f48b87396bdfbc5a12b807941e162b596bbf760252fbfd08dc05ef8aeb9dcd8fc1b0ed3c8d4ec5f531da5a7315a041b8db7b0f6449c86fc52fba4f6d4476beb5 SHA512 9f6906e171f530b6f5de417338af00c26681fe757d823b4ab88cb9749506404c2d9baa96ea3c71c4fe523f6f5877a81e20f2378abe4a2e9895e501829e3fe85d diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch b/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch deleted file mode 100644 index d9ad7a3dbae9..000000000000 --- a/sci-libs/kineto/files/kineto-0.4.0_p20240525-libfmt-11.patch +++ /dev/null @@ -1,91 +0,0 @@ -https://github.com/pytorch/kineto/commit/eb34f147f2af821da931c18457c26b076c8491dd -https://github.com/pytorch/kineto/pull/959 -https://github.com/pytorch/kineto/issues/958 - -From eb34f147f2af821da931c18457c26b076c8491dd Mon Sep 17 00:00:00 2001 -From: Aaron Gokaslan <aaronGokaslan@gmail.com> -Date: Fri, 12 Jul 2024 09:23:33 -0700 -Subject: [PATCH] Update libfmt to 11-0-0. Closes #958. (#959) - -Summary: -Fixes https://github.com/pytorch/kineto/issues/958 - -Pull Request resolved: https://github.com/pytorch/kineto/pull/959 - -Reviewed By: davidberard98, yoyoyocmu - -Differential Revision: D59637583 - -Pulled By: aaronenyeshi - -fbshipit-source-id: 48def339ed3097ecb4746d7870203040ac535858 ---- a/src/Config.cpp -+++ b/src/Config.cpp -@@ -12,6 +12,7 @@ - - #include <fmt/chrono.h> - #include <fmt/format.h> -+#include <fmt/ranges.h> - #include <chrono> - #include <fstream> - #include <functional> ---- a/src/CuptiRangeProfilerConfig.cpp -+++ b/src/CuptiRangeProfilerConfig.cpp -@@ -12,6 +12,7 @@ - #include <stdlib.h> - - #include <fmt/format.h> -+#include <fmt/ranges.h> - #include <ostream> - - ---- a/src/DeviceProperties.cpp -+++ b/src/DeviceProperties.cpp -@@ -9,6 +9,7 @@ - #include "DeviceProperties.h" - - #include <fmt/format.h> -+#include <fmt/ranges.h> - #include <vector> - - #if defined(HAS_CUPTI) ---- a/src/EventProfiler.cpp -+++ b/src/EventProfiler.cpp -@@ -10,6 +10,7 @@ - - #include <assert.h> - #include <fmt/format.h> -+#include <fmt/ranges.h> - #include <time.h> - #include <algorithm> - #include <cmath> ---- a/test/CuptiActivityProfilerTest.cpp -+++ b/test/CuptiActivityProfilerTest.cpp -@@ -7,6 +7,7 @@ - */ - - #include <fmt/format.h> -+#include <fmt/ranges.h> - #include <folly/json/json.h> - #include <gmock/gmock.h> - #include <gtest/gtest.h> ---- a/test/CuptiRangeProfilerConfigTest.cpp -+++ b/test/CuptiRangeProfilerConfigTest.cpp -@@ -10,6 +10,7 @@ - #include "src/CuptiRangeProfilerConfig.h" - - #include <fmt/format.h> -+#include <fmt/ranges.h> - #include <gtest/gtest.h> - #include <time.h> - #include <chrono> ---- a/test/CuptiRangeProfilerTest.cpp -+++ b/test/CuptiRangeProfilerTest.cpp -@@ -16,6 +16,9 @@ - #include <fcntl.h> - #endif - -+#include <fmt/format.h> -+#include <fmt/ranges.h> -+ - #include "include/libkineto.h" diff --git a/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild b/sci-libs/kineto/kineto-0.4.0_p20241109.ebuild index 2c0e437f0197..9ebae4ffc2d4 100644 --- a/sci-libs/kineto/kineto-0.4.0_p20240525.ebuild +++ b/sci-libs/kineto/kineto-0.4.0_p20241109.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,17 +6,17 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) inherit python-any-r1 cmake prefix -CommitId=be1317644c68b4bfc4646024a6b221066e430031 +CommitId=338140f58a28d599da3434ced4fd2d75dd1a213d DESCRIPTION="part of the PyTorch Profiler" HOMEPAGE="https://github.com/pytorch/kineto" SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/${PN}-${CommitId} +S="${WORKDIR}"/${PN}-${CommitId}/libkineto LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" IUSE="test" RDEPEND=" @@ -32,19 +32,14 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-0.4.0-gcc13.patch - "${FILESDIR}"/kineto-0.4.0_p20240525-libfmt-11.patch ) -src_prepare() { - cd libkineto - cmake_src_prepare -} - src_configure() { - cd libkineto local mycmakeargs=( -DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/ -DKINETO_BUILD_TESTS=OFF # tests require cuda toolkit + -DCUDA_SOURCE_DIR=/opt/cuda + -DLIBKINETO_NOXPUPTI=Yes ) eapply $(prefixify_ro "${FILESDIR}"/${PN}-0.4.0_p20231031-gentoo.patch) diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest index 0edce58bf5c2..456fdf032c21 100644 --- a/sci-libs/libgeotiff/Manifest +++ b/sci-libs/libgeotiff/Manifest @@ -1,5 +1,9 @@ AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee AUX libgeotiff-1.7.1-gnuinstalldirs.patch 4645 BLAKE2B 40deb94bd4eeb55d59d7682b03e34b4b6e3889779a4a134324e4fdc11bcdfe0b1a9b1653256bfe3c58e42f24fc818d2b63e6f651f559efe2e99ce1f7c2badffe SHA512 64e0c4b7ad4e37b910332cc4128f8836ef0215478cc5e8b38b9168c83f6ee718dbf152ec456a983c5ae942d883613d9e201897f83f90e720d355151a765bfbf1 DIST libgeotiff-1.7.1.tar.gz 542779 BLAKE2B e26a14fcb463f4a9e5a3652b978223da6b11dcb4ec6a3b6068460f929a57e9affafdb652f16fad23a2da4612c6ae3c2624bfb4f26c96fc4290a33f1e0629b726 SHA512 af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1 +DIST libgeotiff-1.7.3.tar.gz 547548 BLAKE2B cc22000d71c30d178c190a4e10487a49c970590148c92474e805957e3f7dee8211b3cb3543455a9c8a9aa48a9ee79c95e116bdb0741c458b9c7fe91fa2a8fd63 SHA512 a523d6117c7433fe37b7c0cdcba81698426cd4b084bcb35c7dacc9e87bfda1ab7a4c16a9aa64a69dedb78edc2f85e8032bf8b158411f50909603e04d13821cd3 +DIST libgeotiff-1.7.4.tar.gz 549848 BLAKE2B c2eb314b1e318e707831d548442d047bacf84b8040750e99df191b38b0d56f0f6e4a98eb8921fc86a3688ab77d9d7053e9fc93a25656226f66ce067f1884cc72 SHA512 72e81075348ef92c56f84c51bb8234eaf38e10fd88dc786c317ee6c1cf9fb1c07178b8cf4fc6348b1ddf6e42d5888861f8c57dac57273a278d157c59e9803eb1 EBUILD libgeotiff-1.7.1-r3.ebuild 1245 BLAKE2B 321b09888f980799975376bdd6d5453250a7c9b4e5042ee299f3502c63e08bf0c07a0979eecbe3f6cb8d4ab1391afe88c4a293d5d7c3941847ce74b5eb6f6b4c SHA512 bdc584ec35e980ae0527a0f279bf43211c1691c5e8588dabdde8d468f1786e8284c7418d36f160f790a9f8a2d7ead0f9e5e8d9df26881364e8f836d0e1d82f04 -MISC metadata.xml 361 BLAKE2B 880dd2e10e5cc19d0d735f23c844c8f8730b0119555ad79f19bfbbc8f3d64fe1cda0228450ce975fb1a0888cf13b1ff87054463db7a1f930bd447776c2b4e2a5 SHA512 4e48120c42d321362e73b95734f3882792d954a4b56ff8f9e2c1250e67ff7dd18732f06265795efe425cf984caffed1391d58282352aaea5ea94a96ab5186c22 +EBUILD libgeotiff-1.7.3.ebuild 1867 BLAKE2B 69e1905055df7efb675870a5a4243e1c393888a2f11e272e7d5f513cd20d8e1e8e38d59ab389b10c223acfc4e35d36a11b2a1e2a9fb704edc513648b9598f05b SHA512 46d15ee90845352a0e6068a5bcd737dadbf852b36458e70f7cf98bb0d3e35cdf26cb73f183b369effd0de8fade9c33a6dedd85cd8d549167ebbb6b0a13481b29 +EBUILD libgeotiff-1.7.4.ebuild 2040 BLAKE2B 4f01dd189e827c8851d642e071fe06e6293834cd681beefe02fc32658ad6ebcf8e64d584e7b293a6f623bedaf458900861967df62e8affc33b9c0d0d2b9a355c SHA512 e78cdafedceabbb7ba0c98e9d4d5195474698e2561f8160cb0a264d2b35d62178d0ab9989ea9f8539cd0b6de0613972506014d5abfe4688312b99b41ee860dea +MISC metadata.xml 518 BLAKE2B efa4007863eceb308c160e7f6e991a93cddd423ae485981d787b1e909458b937d3079eb012ba7c4984787d8ae11ed2a5df894055a29697bdae9db7c9fb56af95 SHA512 93d5b122b800e3ac4f2c38e17ce4cb9a25f9f7359b83a3fa7f6f89dfeff6422e554265b866bbaa1e5f17d185824dd6b2d0c979f01ca2274afab1b8014e7e2532 diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.3.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.3.ebuild new file mode 100644 index 000000000000..27e1af474c68 --- /dev/null +++ b/sci-libs/libgeotiff/libgeotiff-1.7.3.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information" +HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff" +SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +# TODO: add tiff when resolved: https://github.com/OSGeo/libgeotiff/issues/125 +IUSE="doc jpeg zlib" + +DEPEND=" + >=sci-libs/proj-6.0.0:= + >=media-libs/tiff-3.9.1:= + jpeg? ( media-libs/libjpeg-turbo:= ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + >=media-libs/tiff-3.9.1 + doc? ( app-text/doxygen ) +" + +src_configure() { + # in >1.7.3 there is BUILD_{DOC,MAN}, it should be added + local mycmakeargs=( + -DWITH_JPEG=$(usex jpeg) + -DWITH_TIFF=ON # bug 837287 + -DWITH_TOWGS84=OFF # default + -DWITH_ZLIB=$(usex zlib) + ) + use doc && HTML_DOCS=( docs/api/. ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + mkdir -p docs/api || die + cp "${FILESDIR}"/Doxyfile Doxyfile || die + doxygen -u Doxyfile || die "updating doxygen config failed" + doxygen Doxyfile || die "docs generation failed" + fi +} + +src_test() { + # https://github.com/OSGeo/libgeotiff?tab=readme-ov-file#testing + # Check if still needed: https://github.com/OSGeo/libgeotiff/issues/126 + pushd "${BUILD_DIR}"/bin || die + + # prepare file + ./makegeo || die "makegeo failed" + [[ -f "newgeo.tif" ]] || die "makegeo did not produce a file" + + # test + ./listgeo newgeo.tif > metadata.txt || die "listgeo metadata extraction failed" + ./geotifcp -g metadata.txt newgeo.tif newer.tif > /dev/null || die + cmp new{geo,er}.tif || die "geotifcp produces different files" + popd || die +} diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.4.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.4.ebuild new file mode 100644 index 000000000000..25055f2a42a3 --- /dev/null +++ b/sci-libs/libgeotiff/libgeotiff-1.7.4.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" + +inherit cmake docs + +DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information" +HOMEPAGE=" + https://trac.osgeo.org/geotiff/ + https://github.com/OSGeo/libgeotiff/tree/master/libgeotiff +" +SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +# TODO: add tiff when resolved: https://github.com/OSGeo/libgeotiff/issues/125 +IUSE="jpeg zlib" + +DEPEND=" + >=sci-libs/proj-6.0.0:= + >=media-libs/tiff-3.9.1:= + jpeg? ( media-libs/libjpeg-turbo:= ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" +BDEPEND=">=media-libs/tiff-3.9.1" +# Upstream DOCS are a mess, install the bare minimum +DOCS=( NEWS README ) + +src_configure() { + # in >1.7.3 there is BUILD_{DOC,MAN}, it should be added + local mycmakeargs=( + -DBUILD_MAN=ON # 12K + -DBUILD_DOC=OFF # installs AUTHORS, COPYING... + -DWITH_TOWGS84=ON # default + -DWITH_UTILITIES=ON # default + + -DWITH_JPEG=$(usex jpeg) + -DWITH_TIFF=ON # bug 837287 + -DWITH_ZLIB=$(usex zlib) + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then # use our Doxyfile, upstream violates the sandbox + mkdir -p docs/api || die + ln -s "${FILESDIR}"/Doxyfile ./ || die + doxygen -u Doxyfile || die "updating doxygen config failed" + fi + docs_compile +} + +src_test() { + # https://github.com/OSGeo/libgeotiff?tab=readme-ov-file#testing + # Check if still needed: https://github.com/OSGeo/libgeotiff/issues/126 + pushd "${BUILD_DIR}"/bin || die + + # prepare file + ./makegeo || die "makegeo failed" + [[ -f "newgeo.tif" ]] || die "makegeo did not produce a file" + + # test + ./listgeo newgeo.tif > metadata.txt || die "listgeo metadata extraction failed" + ./geotifcp -g metadata.txt newgeo.tif newer.tif > /dev/null || die + cmp new{geo,er}.tif || die "geotifcp produces different files" + popd || die +} diff --git a/sci-libs/libgeotiff/metadata.xml b/sci-libs/libgeotiff/metadata.xml index 4a868130c3b5..8885661c78b0 100644 --- a/sci-libs/libgeotiff/metadata.xml +++ b/sci-libs/libgeotiff/metadata.xml @@ -6,6 +6,8 @@ <name>Gentoo Geosciences Project</name> </maintainer> <upstream> + <bugs-to>https://github.com/OSGeo/libgeotiff/issues</bugs-to> + <changelog>https://github.com/OSGeo/libgeotiff/blob/master/libgeotiff/NEWS</changelog> <remote-id type="github">OSGeo/libgeotiff</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index 0345680aecc7..05a9f7e051f8 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,9 +1,7 @@ -DIST libqalculate-5.3.0.tar.gz 2705592 BLAKE2B 8a42ab386e6b028c8e8429abedf0606e409c552a722b785bf621ea205fc792d9174fe8f62311fd7587c4a7f5d91fcbf7c1ce99ceb5d0c08ad2b696aba2f6856a SHA512 41aa83a6448158ddfbf6b4e0a88062d20dd199d8bc1fa6f12b704fa0c4085ddac19bc1bc0a7e01e063221e157b1597cf8cc387ee226a90e228723fc0e2e2bed1 -DIST libqalculate-5.4.0.1.tar.gz 2203512 BLAKE2B ccecbfdb9dc026f00bc072124d9582b8f364293d60443fb6136bf2520492b50a76db7bd6a1e678c4c4eea1ff18c9033098d8046415daaba49add765e8fa68fa5 SHA512 453e5048fca023b787f4bc68ef6cf9aac6b9aeb64ef6048543a7d3729c918976dff4336e2a1f697e5e1e7489fe6c2cc92ab016802e0ee8a1a3085b0f807e38cc -DIST libqalculate-5.4.0.tar.gz 2720059 BLAKE2B e6ec9536a8b0ed3769c2a013bd267ca8202f58ebf54cd4c629d0d993cede797f2f547d02da50ced4ce94d41bbb8d54db9b4136451e960340c6bcd03c040080d6 SHA512 0539fe8053c903653b72716d0f7e5bc17d2ba954854d61f51bf62f2d9b6a02d3160be6a9f0208c67960ae5f9d831cc29eae4e80438cae482e6fb97e7686207e4 DIST libqalculate-5.5.0.tar.gz 2209195 BLAKE2B 64781eeb1ad06bb25ac604fce10fb6a158e5f704ad311d52d0b3494ddf4f96d6240795b9f1d25aaf415b4e06f9916af12ca3db71d6b97c00f07fd0e31ebc6036 SHA512 c19dd210c03eb3a2966937dafade9f15e5289a04b5c498180b3bff37e202b6707e1942e02dd76fd4f461d5f80bd7ab7b99ba7802916b7ed6a25d1e59b16472e7 -EBUILD libqalculate-5.3.0-r1.ebuild 2024 BLAKE2B 0d97cc798bca2a1be1a0f9476fc0bfed859eeef6a91a14f97bce3d73d7a9264fb2b5aa5fd7bc8abbb446bc328477c9568de8a1a5d9d41229fb165be5be3109fb SHA512 209f7f45bd48e5465bf8baf0148b5a743501f38231111053ca368432ed5c96ea39559fa4a015b9aa44a0eed55c8a2dac5a8e5473ff763c289ea3d833b7dc8188 -EBUILD libqalculate-5.4.0.1.ebuild 2061 BLAKE2B 2696d8020836145b18b74458992487d937ec98705899826c900f660d1abfca8ed40594e753c6d302318cc2e7c2b2dc54a87aef52d43dc9330ca82149c5b53bc9 SHA512 6ff5ca49604af47b430ab11761a5a7f3b3db5031a81db06ecbee31d9daf05449f60678529d34c93c23a5bb1788b4790d37446887e27db0b6f26b3889998747f1 -EBUILD libqalculate-5.4.0.ebuild 2030 BLAKE2B a8c68135617a95f870d188bdf5d6930ba0e6f88797e61109fb4767e31555a1ea10e8f34cd630ebc4b03ef9c43db4667786d48babdff704b37eaac80c5c7ca8a5 SHA512 dfeaeb60112fc043b0dadb7d01cae32033973809283019d4f77e41514eb8776bc3354380818175e54f72cb4c21e0ce6f106279220e7e91e3d0bc772b094e8e0c -EBUILD libqalculate-5.5.0.ebuild 2061 BLAKE2B 15cffc65c467b5e4d59dedc3edcba449772cc7b9c81e49e973929bd851dede7ddd6ec3cf81ac8702eec71627be86512401d2483ee02453ec5fe0104d3b6d2a81 SHA512 14d9d6980d19264b3451f488e25256b5206aaf703d69a01828e24bc69dc3c017b8decaaac0ff27d2922bf55d1e526615d3590f810efd037e3a7b3df63a216211 +DIST libqalculate-5.5.1.tar.gz 2212026 BLAKE2B dd10a0e2a5d6454c545465cafa21ab3d2d999b4671617ca98b95af4850f7275a9a53b59b923e0f34866cc6814298f82cdff714250df945ae3673a1e9e6d3c1b9 SHA512 97fca04ef8ccd9596a40f36095fd418ebcb9b98cd2c9f412b9bf8475454024b1d8942adc869b03f501656fa2d36a6dc2c8a2fc7e366325e8da382d6194346977 +DIST libqalculate-5.5.2.tar.gz 2211598 BLAKE2B b9f3dbbe01d95e5bcc358c6070f42a3ca27bbc9cb5e8d0de3e8150d29262f0d1f509287f3fdee8949eb7af9e5c56e625d31bf5bb94839018ee7c87742eb95b51 SHA512 5042e97a2f252ea2808681d1c14265f01d9e353262c7719bc664c6d9a6c4756dc287aa9828314e6ad236baa0b74d3914f7b4fec88c862b28cd9e880384ea10d6 +EBUILD libqalculate-5.5.0.ebuild 2055 BLAKE2B 3e06de568764eb87ba1c6583e9488afc6c55363f97887f6e174e1dca34d98ab1941658652d6026da35a6fc0e1abec25123d09d05f94d273852e1d5fbd64c9512 SHA512 390a56f0437e02f8249316ec7e121705269fd594f08f01b0b5b73ac2d3d8c490396b6cde5c148ec47935f605203960e8582cf5305e452f3ac2ea8548799f4ea7 +EBUILD libqalculate-5.5.1.ebuild 2061 BLAKE2B 15cffc65c467b5e4d59dedc3edcba449772cc7b9c81e49e973929bd851dede7ddd6ec3cf81ac8702eec71627be86512401d2483ee02453ec5fe0104d3b6d2a81 SHA512 14d9d6980d19264b3451f488e25256b5206aaf703d69a01828e24bc69dc3c017b8decaaac0ff27d2922bf55d1e526615d3590f810efd037e3a7b3df63a216211 +EBUILD libqalculate-5.5.2.ebuild 2061 BLAKE2B 15cffc65c467b5e4d59dedc3edcba449772cc7b9c81e49e973929bd851dede7ddd6ec3cf81ac8702eec71627be86512401d2483ee02453ec5fe0104d3b6d2a81 SHA512 14d9d6980d19264b3451f488e25256b5206aaf703d69a01828e24bc69dc3c017b8decaaac0ff27d2922bf55d1e526615d3590f810efd037e3a7b3df63a216211 MISC metadata.xml 807 BLAKE2B 84adb8d9b92f233d93cc630d9dbf89630a9ca1ea839f0d7d5100763c9c6e4a7065753bfe55f013e6aa99370822b4d638e7e788c8cb7bd30cae4b7bed2d7befd9 SHA512 d96812e36a70e9c1a776fe5882e1ded9fe2e7a3d1406a619202af25fc0d20180ed3209ed6df79e147697e450edb42cfcc6f38ee99ecec4e1513949b92576b4fd diff --git a/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild b/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild deleted file mode 100644 index 97c095f1c488..000000000000 --- a/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt - -inherit flag-o-matic toolchain-funcs - -MY_PV="${PV//b/}" - -DESCRIPTION="A modern multi-purpose calculator library" -HOMEPAGE="https://qalculate.github.io/" -SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${MY_PV}/${P}.tar.gz" -S="${WORKDIR}"/"${PN}-${MY_PV}" - -LICENSE="GPL-2+" -# SONAME changes pretty often on bumps. Check! -SLOT="0/23.3" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="curl icu gnuplot +hardened readline test" -RESTRICT="!test? ( test )" - -DEPEND="dev-libs/gmp:= - dev-libs/libxml2:2 - dev-libs/mpfr:= - virtual/libiconv - curl? ( net-misc/curl ) - icu? ( dev-libs/icu:= ) - readline? ( sys-libs/readline:= )" -RDEPEND="${DEPEND} - gnuplot? ( >=sci-visualization/gnuplot-3.7 )" -BDEPEND="dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - default - cat >po/POTFILES.skip <<-EOF || die - # Required by make check - data/currencies.xml.in - data/datasets.xml.in - data/elements.xml.in - data/functions.xml.in - data/planets.xml.in - data/prefixes.xml.in - data/units.xml.in - data/variables.xml.in - src/defs2doc.cc - EOF -} - -src_configure() { - # Needed for po-defs/Makefile - export CXX_FOR_BUILD="$(tc-getBUILD_CXX)" - export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E" - - # bug #792027 - tc-export CC - - # bug #924939 - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - local myeconfargs=( - $(use_enable test tests) - $(use_enable test unittests) - $(use_with curl libcurl) - $(use_with gnuplot gnuplot-call) - $(use_enable !hardened insecure) - $(use_with icu) - $(use_with readline) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - # docs/reference/Makefile.am -> referencedir= - emake \ - DESTDIR="${D}" \ - referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ - install - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/libqalculate/libqalculate-5.5.0.ebuild b/sci-libs/libqalculate/libqalculate-5.5.0.ebuild index 091c29f432b9..b9213fc29c4d 100644 --- a/sci-libs/libqalculate/libqalculate-5.5.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-5.5.0.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}"/"${PN}-${MY_PV}" LICENSE="GPL-2+" # SONAME changes pretty often on bumps. Check! SLOT="0/23.3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="curl icu gnuplot +hardened readline test" RESTRICT="!test? ( test )" diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild b/sci-libs/libqalculate/libqalculate-5.5.1.ebuild index 1565a70bf69f..091c29f432b9 100644 --- a/sci-libs/libqalculate/libqalculate-5.4.0.1.ebuild +++ b/sci-libs/libqalculate/libqalculate-5.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.ebuild b/sci-libs/libqalculate/libqalculate-5.5.2.ebuild index 341483a69648..091c29f432b9 100644 --- a/sci-libs/libqalculate/libqalculate-5.4.0.ebuild +++ b/sci-libs/libqalculate/libqalculate-5.5.2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 # Bump with sci-calculators/qalculate-gtk and sci-calculators/qalculate-qt -inherit flag-o-matic toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs MY_PV="${PV//b/}" DESCRIPTION="A modern multi-purpose calculator library" HOMEPAGE="https://qalculate.github.io/" -SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${MY_PV}/${P}.tar.gz" +SRC_URI="https://github.com/Qalculate/libqalculate/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/"${PN}-${MY_PV}" LICENSE="GPL-2+" @@ -48,6 +48,8 @@ src_prepare() { data/variables.xml.in src/defs2doc.cc EOF + + eautoreconf } src_configure() { diff --git a/sci-libs/libsigrokdecode/Manifest b/sci-libs/libsigrokdecode/Manifest index 72de9a64af93..d2692507dce0 100644 --- a/sci-libs/libsigrokdecode/Manifest +++ b/sci-libs/libsigrokdecode/Manifest @@ -1,6 +1,5 @@ AUX libsigrokdecode-0.5.3-py3.13.patch 1214 BLAKE2B e102818a60fa3a8c773c3e6770d6e485e27f04040a99dd64b3449555ba5885e1ebc00e2f1c3b1fed8fac29fa95ec969c672ee1f32bfe9da7115a97a63302a4d7 SHA512 9c8f347b6a582c1fed2f3e21d830c2457fb85a1dee8498a0b863a7ca96f0a24b3b2d1ae631f8282e7c080a03031c250e3eb7bfae301df219a3ac56efc20550ee DIST libsigrokdecode-0.5.3.tar.gz 892783 BLAKE2B 45bae2488e4872be3bb891813083ed540617ac88558bb6c2d971fbb0c05585d3fcb74192fc83ce7d67ee466bc04c61fbccf6f475e549b80c86fe5f0cc191c7c1 SHA512 23393504b68135ed4ae8e8a654df024620af02e84fa3955956c61899388812229108155b4ae8d946e61f33dc8a8807db090d608350548a7a717d966442b07b9e -EBUILD libsigrokdecode-0.5.3-r2.ebuild 1117 BLAKE2B 831f02abc39abb0415f1bce7164ded153440ba07c293635491f608b6d987d456e1a09e9092555a765d113757c455d24faf95d15e155cb350cbb27a0866e3c957 SHA512 01a765b1f0fa95cf1e77560903f8dd9b7273199cdb2b50272b38b691e426853b904005283b5afbcabed4f8263e31d1f3e395b8829ff2a525e7aef14a658caeab EBUILD libsigrokdecode-0.5.3-r3.ebuild 1163 BLAKE2B 66c819c03fa499fe0a225ef20e0bc584b0b47052c970645a35507a821cd30894c757eac280d2a687938a836932215d60c78a430d9fa5042f475fdf2f12e9db61 SHA512 d51c7d69e9e21f4dafef210b876e94d7811a525f34b130c8aa7596ad37c76ebe0956662f10e3c4703f8cd0624c0de355c2ca67de0e39fb3301b94c45347b8f36 EBUILD libsigrokdecode-9999.ebuild 1117 BLAKE2B ac0d7271ab92c4586f876d39d096aba0eb6c20242482997270cf055ce021ce21b827c9217cf218ff692e74815460e26f6ef61869a1d8de5f74d5bdaadbe05a85 SHA512 eea481b1567df4d41bb6eb6314f8a3c2d5224b7e185bd2b14ab238ffe09435ac7d31f6957ceb6bd2f38d112317f7c212002ddbd3edd51c94d02f2e355b4430ac MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5 diff --git a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild b/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild deleted file mode 100644 index 5e6f74c7e12d..000000000000 --- a/sci-libs/libsigrokdecode/libsigrokdecode-0.5.3-r2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools python-single-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/sigrokproject/${PN}.git" - inherit git-r3 -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Provide (streaming) protocol decoding functionality" -HOMEPAGE="https://sigrok.org/wiki/Libsigrokdecode" - -LICENSE="GPL-3" -SLOT="0/4" -IUSE="static-libs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/glib-2.34.0 -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -src_prepare() { - default - - # bug #794592 - sed -i -e "s/\[SRD_PKGLIBS\],\$/& [python-${EPYTHON#python}-embed], [python-${EPYTHON#python}],/" configure.ac || die - - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) PYTHON3="${PYTHON}" -} - -src_test() { - emake check -} - -src_install() { - default - python_optimize "${D}"/usr/share/libsigrokdecode/decoders - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest index 7d7e09778eb4..1cab2586dc14 100644 --- a/sci-libs/linux-gpib-modules/Manifest +++ b/sci-libs/linux-gpib-modules/Manifest @@ -1,9 +1,6 @@ AUX linux-gpib-modules-4.3.4-depmod.patch 744 BLAKE2B 6079d0523cafcd15e38a7e73e8a0d98e107220e6816bd7646c254044acaa1d39d19e983987dff70c249a67b7accbc74a836f8ddd9f39503cdd510edc2d6bdbc2 SHA512 417193e768b0b5bd41b053a86ebbab163a74662e7f2912c70ae76a873243fb218b24f0680699f9988d4e9097b8bbd8a23902d3f5652675f8a3dbb02915308f12 -AUX linux-gpib-modules-4.3.4-kernel-6.4.patch 957 BLAKE2B 0acd630a4ba05dd168813b6b8641d189eb4a4dae57a3a6b558ca0ee0de97c4287ddc7fc756c9f1b3c90e4d378ffec8afe4af16c33b0bb4394b10fc726518fa14 SHA512 62d3b8add27b43b2419de1b49fdb2e10b03bb50f179558fa2bda0d2dee13c3e44b871713f6c695224478c5dfd0f461b53e4bd70a2576e467e74cf37877d4d9b5 AUX linux-gpib-modules-9999-depmod.patch 684 BLAKE2B 7113fb2814a5a14deeda43a909a71904bd3dc8cf35e036f930c6aec2331f50066795e9d3cad17bef48a6128ab3e5f938606c594ae19d24523fcb5d1f29ef3b0a SHA512 8e4bdb3ac012d8fe79ab3cb4307c7efa7538db8f15e487b0c3c2cd49cfce36828d7013e8fa4ac258d2dcfd89f602681d61ea45e5ae34ba0b3bc0f93fbf4c2876 -DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566 SHA512 018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76 DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B 64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98 SHA512 a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35 -EBUILD linux-gpib-modules-4.3.5-r3.ebuild 1353 BLAKE2B 51698e92eb8d8b2259aba9eb67655cfe86d13e07375780c1695bb643537cb15990f55743698fa883352b093f1bda546a4c640d41663ae60ec3dd250d00cb0050 SHA512 3d580b9b7938c31666ccfd66efd44ce969c37c849519fc42033d87131eb5e5d3caebb9b0cdc4e2098519e46b45ef41a64408753e0b6a58627454a3e4e0e32efb EBUILD linux-gpib-modules-4.3.6.ebuild 1258 BLAKE2B 16af3bfb802a2d644e92ac1bd833bada06031a69c02f48915c74fa1a92d5a8e99e003f3658e15318f88d2a57b94d6a6f78a267d2616ff9794f74a3f85d89ff85 SHA512 c4b3edc833fa21489e89c288ef649b7c5edb96bcf5f23ce1b1e9358ca4ab08f6bbe42c62145112c0676e084338857e2bf1423be3e0125ce499ddb78d73e02cf3 EBUILD linux-gpib-modules-9999.ebuild 1448 BLAKE2B a3de97a66bbcb5b0cc9857ebfd6d56f57e645cba1c8578b9510e12b821820292bc4261e846a92171d8b4d0bd38e5023f51072134b5614aac7e17b136531fb161 SHA512 be57147c941b5544e0b1542efd1e44ea9315ab792d349725a69184ae2e95f2a07a6539052bb8a3e86f873fd16726dd569f9b561ca5f8eb527dad55fa2b5a7cab MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4 diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch deleted file mode 100644 index 90112106584d..000000000000 --- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- linux-gpib-kernel/compat/include/linux/device.h (revision 2052) -+++ linux-gpib-kernel/compat/include/linux/device.h (revision 2053) -@@ -47,6 +47,13 @@ - * for kernel versions prior to 2.6.26, so the 'drvdata' parameter of - * CLASS_DEVICE_CREATE() is pretty useless. - */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) -+#define CLASS_CREATE(owner, name) \ -+ class_create(owner, name) -+#else -+#define CLASS_CREATE(owner, name) \ -+ class_create(name) -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) - #include <pcmcia/cs_types.h> ---- linux-gpib-kernel/drivers/gpib/sys/osinit.c (revision 2052) -+++ linux-gpib-kernel/drivers/gpib/sys/osinit.c (revision 2053) -@@ -207,7 +207,7 @@ - printk( "gpib: can't get major %d\n", GPIB_CODE ); - return -EIO; - } -- gpib_class = class_create(THIS_MODULE, "gpib_common"); -+ gpib_class = CLASS_CREATE(THIS_MODULE, "gpib_common"); - if(IS_ERR(gpib_class)) - { - printk("gpib: failed to create gpib class\n"); diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild deleted file mode 100644 index 4306cc4b7fe7..000000000000 --- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-mod-r1 - -DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware" -HOMEPAGE="https://linux-gpib.sourceforge.io/" -SRC_URI="https://downloads.sourceforge.net/linux-gpib/linux-gpib-${PV}.tar.gz" -S="${WORKDIR}/linux-gpib-kernel-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" -IUSE="debug" - -COMMONDEPEND="" -RDEPEND="${COMMONDEPEND} - acct-group/gpib -" -DEPEND="${COMMONDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - # don't fix debian bugs if they break gentoo - "${FILESDIR}/${PN}-4.3.4-depmod.patch" - # https://sourceforge.net/p/linux-gpib/code/2053/ - "${FILESDIR}/${PN}-4.3.4-kernel-6.4.patch" -) - -MODULES_KERNEL_MIN=2.6.8 - -src_unpack() { - default - unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz" -} - -src_configure() { - MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" ) - use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' ) -} - -src_compile() { - # The individual modules don't have separate targets so we can't use - # modlist here. - emake "${MODULES_MAKEARGS[@]}" -} - -src_install() { - emake \ - "${MODULES_MAKEARGS[@]}" \ - DESTDIR="${ED}" \ - INSTALL_MOD_PATH="${ED}" \ - docdir="${ED}/usr/share/doc/${PF}/html" \ - install - - modules_post_process - - dodoc ChangeLog AUTHORS README* NEWS - einstalldocs -} diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest index 4709b5b9de8a..4d165cee437e 100644 --- a/sci-libs/m4ri/Manifest +++ b/sci-libs/m4ri/Manifest @@ -1,7 +1,5 @@ AUX m4ri-20200125-testfix.patch 1199 BLAKE2B 07759b0dcff67b1f454738ba4320ca23f19875b62e5414a6dfb3a84db805072c8d8e3901248a0c41d6c13c2837ebbbdc392f89beb398abb4e8050249354fb1b5 SHA512 85a5eec07776b5a5baafdf80c2d249583754dc25baff5b22031f7758e3d3119961444fa0a7c320a44b36cff7da67cfa9ceb7c2a0773bc9f5127c0a761898dabf AUX m4ri-20240729-pkgconfig.patch 1231 BLAKE2B 0b209b9ed0656ec7e0c0c99726fde8bb625248024f37529734d7e7c975885d3f396ee11488f6634cff973828097266b8274cc1a8dbfb5144e980e64e9d966787 SHA512 aded91b0d4368ed22fc001093010c9669ed1f8054903711a8426d28b15602fda508b70a86512f378161cca40a112dc53ce4ea99ace92456e2c3183ea05f3ea97 -DIST m4ri-20200125.tar.gz 511132 BLAKE2B 637dbf7f17b84dc5fc91c9d8f501fa223cfacd687cb953ce3b9c4716e9a6d39318ef168c2ec8a4b5eeb469a4b46abbcd8802aaf694991d82deb20c832843c3ab SHA512 212ea58a93b792c1901f62411b06cd1a2ee60b3506c987e45ded73c146f2fa6baf5461b1dcabf31a5771ab5a44eab050d64714f7a5fca3df2d141d0d80c6c51a DIST release-20240729.tar.gz 178851 BLAKE2B 7a8bee1417da56d561add3b2e7d79f005f03ebf825a150a105d14caeb64b75ba4e30658b616a03cedc49d4e5c1b1a70393c6d5c6231bb1ba35abf20aaf93fb2e SHA512 afd74b0f9a1e3f16b313dca9a73fde85bd08aa431f0ad7064f09600434f27d6cabddc117cf99396dc8d83d245f81b7ed4185e305caad56dad79ecfefc11cf817 -EBUILD m4ri-20200125.ebuild 1321 BLAKE2B 335a40f7e0b586ab38fbc0034a78309845b9a7459a0f9c2c7f98fc17cacbf85c13afa99efccfa90bfb9a046567f687088929297e90438588f3915b1589a19b8d SHA512 d9fc94bb55f61b9004a43dc04c9687b90bdcdbbc00614b591caa3ab68801f33ec0d4ccc2e7a0ea869dce5897d15d7a50869db1ca961dacdf8fabdf045117f06e -EBUILD m4ri-20240729.ebuild 1330 BLAKE2B b63bb587a58a2998aa7004d52c21411ecba59949b1fe7894718a4b68cfa1493f46969575ddb07bdd869a61a03163ae7ff686e9ee1987530897e299be2bf02cf9 SHA512 ec715f7ad442e5c21e887f24c9cf9812049602c694237dc8bf4b66607083624185d129c8ebd5fe00e376ab122d9acbf56a78477be4d61bc8ddbb603a10b0ef76 +EBUILD m4ri-20240729.ebuild 1328 BLAKE2B e1154f7a5f13704f2217c556d042ec5ee61a664780405253ed0c85d492ae57e71051c6d317de1d1b14a8872255ea0e8c9ac757444d93dc2b72d2315962ad0a5d SHA512 4934d0a54e0a3a252f8a2aa93f3158af7e3e25a82fcdb06589d8f18f5d1addcfa6f2995a50ee4857935699435ba71bcfc7a277340b449cdb2c6a3b055407d279 MISC metadata.xml 1187 BLAKE2B b5428f60e018c6503ec91f9a13949c6e3571c94474d234317e416fa81e2370d473db9ecb5a1c73306e071673c27b02d57feae552b12f9ce791b426d7a8a488a4 SHA512 a984f783b8bb1971663a75ac655aba7e0a4ddbdb8db6d01105bb6a75711d8e83c9b598076207e1a9619198cca0ed901a5aef64a5443b6efe89a28c2571cdfa71 diff --git a/sci-libs/m4ri/m4ri-20200125.ebuild b/sci-libs/m4ri/m4ri-20200125.ebuild deleted file mode 100644 index c0230257e175..000000000000 --- a/sci-libs/m4ri/m4ri-20200125.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Method of four russian for inversion (M4RI)" -HOMEPAGE="https://github.com/malb/m4ri" -SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="debug openmp cpu_flags_x86_sse2 png static-libs" - -BDEPEND="virtual/pkgconfig" -DEPEND="png? ( media-libs/libpng:= )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-testfix.patch" ) - -# NEWS and ChangeLog are empty as of 2020-01-01, and README.md -# didn't make it into the release tarball. -DOCS=( AUTHORS ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - # when using openmp and -O0 the testsuite fails - # https://github.com/cschwan/sage-on-gentoo/issues/475 - # Still current as of 20200115 - use openmp && replace-flags -O0 -O1 - - econf \ - $(use_enable debug) \ - $(use_enable openmp) \ - $(use_enable png) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/m4ri/m4ri-20240729.ebuild b/sci-libs/m4ri/m4ri-20240729.ebuild index 04e50795ca67..a184dea026af 100644 --- a/sci-libs/m4ri/m4ri-20240729.ebuild +++ b/sci-libs/m4ri/m4ri-20240729.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug openmp cpu_flags_x86_sse2 png" BDEPEND="virtual/pkgconfig" diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest index 2f4e0f04add5..68e526f468cc 100644 --- a/sci-libs/m4rie/Manifest +++ b/sci-libs/m4rie/Manifest @@ -1,7 +1,5 @@ AUX m4rie-20200115-link-libm.patch 654 BLAKE2B af7ff7b56c14078817b6a12a8184c81e1547a0c75b682d7398a040645be7e392ce3f923be56110bbf282f0ed729aa5ea2fadb23d6815aa96370d99ba29f7b2b6 SHA512 6d85c998f0f2f85c9f3cb77861318eab31b38bcb88ff3133fc3bbef0492fcb412e832d92f5d76c63aa3c979cd21e55164a2a53bc08c67da6f22bd1d27d08e883 AUX m4rie-20250103-pkgconfig-r1.patch 1438 BLAKE2B a52cccee4862232e810b671db49f7f8ac3c8635e5e455a89dabd320314b5796cc6c2c78f35563d3e93527750ba980fa50b2c71a79dd91ca865944696f8a3c0b7 SHA512 62880c1b956e98b638538543e329a3a30d8e7b634305033497786fb30c28c49ed7c1e0710be9aca14666ca68dbd887a096be7d26ededb564860498b0b342c4af -DIST m4rie-20200115.tar.gz 500702 BLAKE2B d8b1506ef9902def6577851a97dd6f7da986dce39b3250f9f9b66f9caf8f811568b7975165fb75b6b8ab3c9faf65d890f7c2254725224266f1250a0bcf18a464 SHA512 22c990cf06de9ac790f82f48e498b2bfc87fdf6834257f4e4a4c44e2446b4226438d21692d654008b58df36d8da746bba04dcf1a3d50e34ccf8c678efd5b642b DIST release-20250103.tar.gz 167745 BLAKE2B b4f76e51ef9561ce7fc10c0fc0f50c8ebff1c65c9e4c51d0f120db48a9b4b4417057c2bb919b6a4d1ba23f68179c59e2a5d97063063654723f210a5d10d0e5ce SHA512 8fd80fa265d234101ee56f464a59ce5aaf0f3c600e70ee9495ec490d06b758e0073a084474ad72d79d8ade5ac4421c53ed6b12cbaaaeda96287d94137c8c61b1 -EBUILD m4rie-20200115-r1.ebuild 935 BLAKE2B 5161268c8b5a0afd48a3f3c93fcf3094abdfead19c2ed043dd4ea1879ee149937ab009875ef5ed4bd16935141d9300824767a699c551464dbc51cefa718a50f7 SHA512 b0e42e030ccf6ac85ee90e5caae476d0a2112e7a82f2e66f15eed3f2bff9c3694bbe135c20a8f51bd4b7f60cd05364c6d9211597f3fb03945a882c93a0527426 -EBUILD m4rie-20250103-r1.ebuild 927 BLAKE2B 6a514951b76556e7a5c9efede32f12403b24866415211af89448001c084460bd87c43d064c412eca619685d967b3b59b9b01c18da743e5efccbbfa108124ef8f SHA512 2c73f7f4b9037a65f718cc41ad1a64729c67eecb4067b5aa122a9a146b9e3e3a0735163865edefbf3943bff74949f7efe1aaf88211fe34cc7a43a13d138ff946 +EBUILD m4rie-20250103-r1.ebuild 926 BLAKE2B 95bdbdb2a30e629376c5c9015d54296be60d81a9044000e55e5e39a7fc2cba7c9afc05aae0830e12eb350f848f9a7d5d090800fefef18371972e0b613350ae99 SHA512 b1b3b86d4405d02683412f46931abcf1b715bf1c51c662524c510f5230659918245fd23af33e26d66c5da8e622116e83a8f2ecedd2f1628cf846ee44e85ba35c MISC metadata.xml 985 BLAKE2B 0b5601161f57de941bf8cff616bc4c92260587517200e0f44a1501d56a938eb2e0727d61659bc2eda2dc42bf376fc8a40db4c7edde32c65c5d2d2d3c7ca82828 SHA512 6e9b2e0467d85aa9a1d18b185ccb7798e4a0cd75c86d70ff6facb644d7bb8657d9e195b38577fd874fe08accd576f231bcdc4b988a9478ab27cd5893d6fb3c51 diff --git a/sci-libs/m4rie/m4rie-20200115-r1.ebuild b/sci-libs/m4rie/m4rie-20200115-r1.ebuild deleted file mode 100644 index be0f41e475fd..000000000000 --- a/sci-libs/m4rie/m4rie-20200115-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16" -HOMEPAGE="https://github.com/malb/m4rie" -SRC_URI="https://bitbucket.org/malb/${PN}/downloads/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="debug static-libs" - -DEPEND="sci-libs/m4ri" -RDEPEND="${DEPEND}" - -# Requires eautoreconf. -PATCHES=( "${FILESDIR}/${P}-link-libm.patch" ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # m4rie doesn't actually have any openmp code. The configure flag - # stems from a mistaken belief that it needs to be there to use the - # openmp code in m4ri. - econf \ - --disable-openmp \ - $(use_enable debug) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/sci-libs/m4rie/m4rie-20250103-r1.ebuild b/sci-libs/m4rie/m4rie-20250103-r1.ebuild index 2751bfeee7d5..b44918b27665 100644 --- a/sci-libs/m4rie/m4rie-20250103-r1.ebuild +++ b/sci-libs/m4rie/m4rie-20250103-r1.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug" DEPEND=">=sci-libs/m4ri-20240729" diff --git a/sci-libs/mc/Manifest b/sci-libs/mc/Manifest index 7d10f3c31124..81a97abe4be2 100644 --- a/sci-libs/mc/Manifest +++ b/sci-libs/mc/Manifest @@ -2,7 +2,8 @@ AUX 1.4-doc.patch 526 BLAKE2B 3efa5258c1d96745cc7c2a477ad18e574f6fa1a7d59feddf6d AUX 1.4-multilib.patch 693 BLAKE2B ab7e4713bebd56ebed816efe0d66b1498b02238bdc48ad87896e4c51b47f4f51508650b74906ef3e56f74bbc53c6c679148fc3201c25efc1306c0241029b8daa SHA512 878d0ff033ae1926fe53c43bb3e6118612e328b395879359c930c10b7699d0180d024693b9bdc9da21a5dd904557101001683079127657122c7140d49ae9b43b AUX 1.4-overflow.patch 426 BLAKE2B 36d988eb5eab0160983cd9120ec390371b6905aca6b1aa680d4c284aa28350f10144079e6156becbb0055120ee4fd3b33cd0ca4e501056105ad3500ff54eba7d SHA512 8eef4fcacb4c9b676b071483a7ff7c214110e8af1819552dc732919da2b4138754391cf578c90991e0fb36a475446b73bc9e5764b9e83224ab82519084d1aaee AUX 1.4-superlu.patch 695 BLAKE2B a3cacc3a95a690d79c69885e69157cf8cf43550082971c5f454ea9d0c614b091645eb0010ea0491647ac59475f6788cdfa65732520f51345a8a5d4f2b276a43b SHA512 9ada97571a91a8b4d832c61e373c2f64267ed4f0730a4e8543f388167daafe8800ed95e74e143d1644019f934b1e5b6b658b5ee639e97a01ad0a78bfe653296b +AUX mc-1.5-missing-decl.patch 473 BLAKE2B 1eaaac51e205a54ce1fa209db993b1957546e311af35d85535972f2cbb0851b2d5a9896cf29cb328ab9f94cb002f664532ef70eccac61a533afde3ffd618241f SHA512 2365424c397a43fc7a5fd9637682b5571684ca812f4eec30e9ed1e5fe0080ffb179ee62e8a1e7a2475727a2ba7c1662872d5e98a5ba97f20110ad13d80fc924c AUX mc-1.5-unbundle.patch 1825 BLAKE2B f77f91126b87e2430d1ed12b8f5f08229327fa26de52eeadb67a9bb6f0a791e7f64c612bc31dbc7fd9d2c973163630a4944529a46818f43d02912ddc0c3b7a22 SHA512 45565bd8ffd7525798f21f878c9d4f34c46dd198d40fa475d00bdf1461a2ae6372e836bef59f2686a9af52d31a3b061e43868fdc6a7da17838316294ba689d92 DIST mc-1.5.tar.gz 18140539 BLAKE2B a58277b6755a43c0f9a9d67789c2fe28858580babfd4251d5d9223fffec43ead47d3dab9cda3c739309b9f18bc7bf558d7974a5189194a4bc92f72e857d81f1a SHA512 6db79c677b1a326ea50c78a07b8cc088eb5e23e9d8821a3a3802017e9e8d4011307ba024d3354dc24cb31d822da2023a150787a137b7806f6344b0834e7f194b -EBUILD mc-1.5.ebuild 1875 BLAKE2B dd2a5f92aa92ab0c531a88604dc7689d31fde116068808c0b0b3c2fdeaab0c7d67990a4008aee645a6a2beff7a5f7fbade41332e0650963791cb0d6a592854dc SHA512 d9e84aeae09e86945af383efa19ac9a811dd6d4b2d9b73c3cd6fa0f0141ea904bd8663e6cd3e752e0338a8903128ec0df76efc1ad16bb17e373ae60a17bc790e +EBUILD mc-1.5-r1.ebuild 1914 BLAKE2B cbdcf219bf6bb031639a9c810dcddb98ab086a1018e026471923bdea4557abd0ea973bd8e148bf1e9ec7e549b4ceab5ac0138028bea2d5322519e9f19f6ab12f SHA512 bf5cf5d1f2b977b8f36c177e83bf1418d1e017cc275440bef51b63d8155115e865c68cdc1a886602c241a7fca9e1c4815131f1583751c5554f692d390f68a4ab MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045 diff --git a/sci-libs/mc/files/mc-1.5-missing-decl.patch b/sci-libs/mc/files/mc-1.5-missing-decl.patch new file mode 100644 index 000000000000..8c4b72af6e7a --- /dev/null +++ b/sci-libs/mc/files/mc-1.5-missing-decl.patch @@ -0,0 +1,13 @@ +Fix missing function declaration, so package could build with modern compilers +https://bugs.gentoo.org/886457 +--- a/src/aprx/estim.c ++++ b/src/aprx/estim.c +@@ -41,6 +41,8 @@ + Bvec *u, Bvec *ud, Bvec *r); + VEXTERNC void Aprx_estFaceBump(Aprx *thee, int color, + Bvec *u, Bvec *ud, Bvec *r); ++VPUBLIC int Aprx_markRefineDorfler (Aprx *thee, double percentToRefine, ++ int color); + + /* + * *************************************************************************** diff --git a/sci-libs/mc/mc-1.5.ebuild b/sci-libs/mc/mc-1.5-r1.ebuild index 68c2785c6417..c7f303666e58 100644 --- a/sci-libs/mc/mc-1.5.ebuild +++ b/sci-libs/mc/mc-1.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools fortran-2 @@ -38,6 +38,7 @@ PATCHES=( "${FILESDIR}"/1.4-multilib.patch "${FILESDIR}"/1.4-doc.patch "${FILESDIR}"/${P}-unbundle.patch + "${FILESDIR}"/${P}-missing-decl.patch ) src_prepare() { diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest index 585e3f4d296f..c3c17a16d79d 100644 --- a/sci-libs/med/Manifest +++ b/sci-libs/med/Manifest @@ -5,5 +5,5 @@ AUX med-4.1.0-0003-build-against-hdf5-1.14.patch 4749 BLAKE2B 2968edac958b96a66c DIST med-4.1.1.tar.gz 50506725 BLAKE2B fb9bc3239c18c53fa42c5dd1101559746e8d38db2a3cb5fb47d1bf0cb578facc4ab95409af8524f5c20251848842cc1a331f6a816ce0754e9a6c95f507174ed1 SHA512 8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768 EBUILD med-4.1.1-r1.ebuild 3420 BLAKE2B 57dd4c3ffd7c3d9cd7413252ae04a58f0cbe86223e7bca74eafc4caf808c7c194232ada980d652528f727e19a9a12a8e9d098d805d00d7b63169d30b05113de1 SHA512 30c185c5e7b88b8756af77c207138900745e7906721ab9fe675f663c01670754774ce34f366dc154bc128803f614453d1c448ea828f06d03320c39c8f2a31a2d EBUILD med-4.1.1-r3.ebuild 3187 BLAKE2B a0507b98b5f91eca0fad6a99f85e1ca886248deeacc00f6174774fc3d8fe3b5345fb7a7e3e43c05c56604e7aa6e5b20feed3dcf4cf91ca5c02785da2e26f4c07 SHA512 ead43d7ba64af6ee56ea6060294f194939d5311790e5b326b2c4f4d1ae54980e848c3812c8b341523a807afd6e2f7615ac2b2b456d15461004a927f420a2870d -EBUILD med-4.1.1-r4.ebuild 3294 BLAKE2B e83528ccf87e99a460b4901ad48bd52a55ef5b281e8323bfb713e52c5a63c95615673d3875e73e13343b306e6d39c05d634f5aaf89a26ec7b303ee14f12cc6b3 SHA512 343f4ab9c74a6b2193135a6d5db9f72e08d52584187abe566dafac119fd07b00794bd5abff81569aa22ca0badba157f8e4e3ff42058312938468f99e4d3e5b58 +EBUILD med-4.1.1-r4.ebuild 3293 BLAKE2B b40f0eb28cfe476173dbcf6e802c482f5792dcb3389c56e434506a6520920bf743a1d7c57c981fc22080afb13a6fe7b3919cf67b470b2144b9ce98c648852a3d SHA512 aa0c3a15d22cc96587a1f49d86ba16168724ba619a30b51e012d43fa17efd50a687c37d2f4af9eff1b7424516b60e8d790129afa868a95678691cfe76c5c0bdd MISC metadata.xml 636 BLAKE2B de5e1c1d3f715459d5ca0945d0d795c1c549e6e20c27283140190bdc24289f4ccc0c12940e00aa689b90fd9af53749f0eabab44cecaf6815ef37adc1795f43e9 SHA512 60a3c3afd0db34569993b73d795830d86eb51778f9a7f0375d0b196c6f0862ca10a77c4c33ad2c906c56c6715be6f4452b61ffab5a25c254e480e50b64c021e4 diff --git a/sci-libs/med/med-4.1.1-r4.ebuild b/sci-libs/med/med-4.1.1-r4.ebuild index 2b8c3a7cf96c..3d13e18e8117 100644 --- a/sci-libs/med/med-4.1.1-r4.ebuild +++ b/sci-libs/med/med-4.1.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}_SRC" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc fortran mpi python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test ) python? ( test )" diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest index 8264574e838f..d5fcad9eb922 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,13 @@ 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 MIOpen-6.3.3.tar.gz 104157223 BLAKE2B 10b793594ed47397dd695ada4da1ba93935c78512c27291449df20fc7760aad2b224eaa50d3526453e7b4451828769937c66069a11f6f6fb6a636a16c6f90957 SHA512 9749d04d9a6b92ba19b3534966feb4ed21eaca3fd4a20aaec050bcf725091a8706044136f836ed20e08e7ec3b4074e1f99a08b51b4cbe449aedb7f86eb5cc87f 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 +EBUILD miopen-6.3.2.ebuild 3562 BLAKE2B 0de29e719ad2797bd537b4d82f2dbe1266b7427d08264257c1dd8fe5433c7989f62f6c8141ae5bfcd3d6c5934d034fc572cadd77b642903cc534cbe05d15588b SHA512 04dda9e5d2e7bed2b0e04cae64059a092c401abea78c0c3d410d2c5ba66da77c345c1c056665496827c5fd96b6b270c31c8628968cf381a720da12b91b5275e5 +EBUILD miopen-6.3.3.ebuild 3562 BLAKE2B 0de29e719ad2797bd537b4d82f2dbe1266b7427d08264257c1dd8fe5433c7989f62f6c8141ae5bfcd3d6c5934d034fc572cadd77b642903cc534cbe05d15588b SHA512 04dda9e5d2e7bed2b0e04cae64059a092c401abea78c0c3d410d2c5ba66da77c345c1c056665496827c5fd96b6b270c31c8628968cf381a720da12b91b5275e5 MISC metadata.xml 992 BLAKE2B 1dc36cb359f2ccd2bf0eb0f5fda6140710db00346584a04c212dc3bebea553f51cf62b5749be317582422c26784190ec07164a0f06ff99c684fa1e8145a8959d SHA512 c0eec9a57ce335830b0cbfd59752905d4c06a647dd416c0434f78caf676d56ed3f9d9a706fea4e45c3cbdd40706f31fc0116ebb77dd3e8d9a3d6b905622bc3c8 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/miopen/miopen-6.3.0.ebuild b/sci-libs/miopen/miopen-6.3.2.ebuild index 45b1214c37cd..c8ade5eed8c2 100644 --- a/sci-libs/miopen/miopen-6.3.0.ebuild +++ b/sci-libs/miopen/miopen-6.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/miopen/miopen-6.3.3.ebuild b/sci-libs/miopen/miopen-6.3.3.ebuild new file mode 100644 index 000000000000..c8ade5eed8c2 --- /dev/null +++ b/sci-libs/miopen/miopen-6.3.3.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} +LLVM_COMPAT=( 19 ) + +inherit cmake flag-o-matic llvm-r1 rocm + +DESCRIPTION="AMD's Machine Intelligence Library" +HOMEPAGE="https://github.com/ROCm/MIOpen" +SRC_URI="https://github.com/ROCm/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz" +S="${WORKDIR}/MIOpen-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +IUSE="composable-kernel debug hipblaslt rocblas roctracer test" + +# tests can freeze machine depending on gpu/kernel +RESTRICT="test" + +RDEPEND=" + dev-util/hip:${SLOT} + >=dev-db/sqlite-3.17 + sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}] + >=dev-libs/boost-1.72 + dev-cpp/nlohmann_json + dev-cpp/frugally-deep + + composable-kernel? ( sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}] ) + hipblaslt? ( + sci-libs/hipBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/hipBLASLt:${SLOT} + ) + rocblas? ( sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] ) + roctracer? ( dev-util/roctracer:${SLOT}[${ROCM_USEDEP}] ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + >=dev-libs/half-1.12.0-r1 + dev-build/rocm-cmake + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-build-all-tests.patch + "${FILESDIR}"/${PN}-6.1.1-fix-libcxx.patch + "${FILESDIR}"/${PN}-6.3.0-conditional-ck-components.patch + "${FILESDIR}"/${PN}-6.3.0-isnan-include.patch +) + +src_prepare() { + cmake_src_prepare + + # complementary replacements for conditional-ck-components patch + find src -name '*mha*.cpp' -type f | while IFS= read -r file; do + sed -i "s/MIOPEN_USE_COMPOSABLEKERNEL/MIOPEN_USE_CK_MHA_OPS/g" "$file" || die + done + + sed -i "s/MIOPEN_USE_COMPOSABLEKERNEL/MIOPEN_USE_CK_XDL_OPS/g" \ + src/mlo_dir_conv.cpp \ + src/solver/conv_ck_igemm_fwd_bias_res_add_activ_fused.cpp \ + src/solver/conv_ck_igemm_fwd_bias_activ_fused.cpp || die + find src -name '*xdl*.cpp' -type f | while IFS= read -r file; do + sed -i "s/MIOPEN_USE_COMPOSABLEKERNEL/MIOPEN_USE_CK_XDL_OPS/g" "$file" || die + done + + sed -e '/MIOPEN_TIDY_ERRORS ALL/d' \ + -e 's/FLAGS_RELEASE} -s/FLAGS_RELEASE}/g' \ + -i CMakeLists.txt || die + + sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" \ + -i test/CMakeLists.txt || die + + sed -e "s:\${PROJECT_BINARY_DIR}/miopen/include:\${PROJECT_BINARY_DIR}/include:" \ + -i src/CMakeLists.txt || die +} + +src_configure() { + rocm_use_hipcc + + 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 + -DMIOPEN_USE_ROCTRACER=$(usex roctracer ON OFF) + -DMIOPEN_USE_ROCBLAS=$(usex rocblas ON OFF) + -DMIOPEN_USE_HIPBLASLT=$(usex hipblaslt ON OFF) + -DMIOPEN_USE_COMPOSABLEKERNEL=$(usex composable-kernel ON OFF) + -DBUILD_TESTING=$(usex test ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DMIOPEN_HIP_COMPILER="${ESYSROOT}/usr/bin/hipcc" + -DMIOPEN_AMDGCN_ASSEMBLER="$(get_llvm_prefix)/bin/clang" + -DHIP_OC_COMPILER="$(get_llvm_prefix)/bin/clang" + ) + + if use test; then + mycmakeargs+=( + -DMIOPEN_TEST_ALL=ON + -DMIOPEN_TEST_GDB=OFF + ) + # needed by rocminfo + addpredict /dev/random + check_amdgpu + fi + + cmake_src_configure +} + +src_test() { + check_amdgpu + LD_LIBRARY_PATH="${BUILD_DIR}"/lib MIOPEN_SYSTEM_DB_PATH="${BUILD_DIR}"/share/miopen/db/ cmake_src_test -j1 +} + +src_install() { + cmake_src_install +} diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest index b53b04cee23f..1196c7c046cf 100644 --- a/sci-libs/netcdf/Manifest +++ b/sci-libs/netcdf/Manifest @@ -1,5 +1,5 @@ AUX netcdf-4.7.4-big-endian-test.patch 689 BLAKE2B ab28269ee5922816e7ef7834dddec974c98951a41c0025041f9ee67d92c7bfe57887f5ac8d8beb2426e2c095fc06cf4b29046a9b29873b125d681b169c9613b6 SHA512 72575f890615a05a6f1beeebfd3edcd367fe148be017a32847b0a7db96c594e6bb5d01acd865257b25410e0a22699b1beef2c54748ccb09ea5e41009f4e0f9ee DIST netcdf-c-4.9.2.tar.gz 7142536 BLAKE2B b24135070d2f1f0b53fe738f8839039547eceba16d36905bb8cd7be983ce0c1127b7b01ae37dbde50087aa82fd56f00fab9bfa75c7d94fd4478031bb8a6da247 SHA512 7a96bcf673d5a9e1537d660aaf085a1dfaefc7dfb0fc96358462d92e7bbfe541184583681797e6a54d11b8588504b7d8a9b0b9bd850eecd02ed73aa2eb5ffa0d -EBUILD netcdf-4.9.2-r1.ebuild 2573 BLAKE2B 965cd1b5d214144ba1f105296b1cb39c388df09aeb939e86705033d93a921885911b78aa2668e4ea1c71c7471556ad85e2751bb5cdc045fc0e990a38b039a741 SHA512 e7a9081a10895f383c7fdcd5ed6f0dfd01e2855d07aac47dd96894472a61b43af3b383a73a0793506280d5c0c5837a5e470a4641a5857be6fd60ea6cb7d70611 +EBUILD netcdf-4.9.2-r1.ebuild 2573 BLAKE2B c606f7181974379ad1a88b08a2e06281ebe43287b7a1b18d3c61e8c065e3ce709eeb613eba20520cec38b75c38305532fb349abe43010f677cfe84980c6683b9 SHA512 6bc6abe06b55ed277ddacab048580eb32ef13122260e18f0d3a3e56d2f3bd7756377ba85be4b3b4adeffc00452af00c6a024a2ccf735861efadf36e196d49ab9 EBUILD netcdf-4.9.2.ebuild 1648 BLAKE2B f1f30ed05877856c3f27d3b440392227906fb6c5ea1f8485065679b449ecb3b1f6d0faf7aa25cb40831366953fa5f544492de25f653e624c7cdfa5bbb2ac32d8 SHA512 02929bbe44e62cdd83d3f11e7d5cd05f3a6c1ce6554754b209dfcf3dfca77593c0d98fd1e2a5400d7d2749cf81763a8a41b85f077d3f87c84c8b1ed595e5ff23 MISC metadata.xml 1131 BLAKE2B 2578a44e7142d8d072820f31db58de4e5550e4e9d1b3fb7d420f7d41d810580b98757d7fead672e28ea615820fa3e7f27738fe6a04c4201250596f8b37533271 SHA512 77b14836750cc93bbc38613c00ef125ebc89705bcc29b68823675662fdaeb1ddb43d6c0023a71920e23e458bd10c55e89248676fa7994d6d15992c9fdc2bce38 diff --git a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild index 58ffa1e50216..7ef685731602 100644 --- a/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild +++ b/sci-libs/netcdf/netcdf-4.9.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV} LICENSE="UCAR-Unidata" # SONAME of libnetcdf.so SLOT="0/19" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 -riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd" RESTRICT="!test? ( test )" diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest index 5534b5673abe..afe761dd8032 100644 --- a/sci-libs/onnx/Manifest +++ b/sci-libs/onnx/Manifest @@ -1,6 +1,6 @@ AUX onnx-1.15.0-hidden.patch 511 BLAKE2B 857a4ff9597a25430e2236c2d9de47c1203e630a4adfe8e4cdb72ddfb928f0327e2a625ad91e936e4d3f71bc4aa135bbd15abcf348958238075d356d47d3291b SHA512 a4dbcbae79af1ef1edc8ec8aa27eb0303c1a52baf7db74e70f2d1e6a35db7d5ed2205f7f10f34fdcd3ac536b029edf749b9eb8f7926ac2b620ac7a4b59884182 -DIST onnx-1.16.1.tar.gz 12428832 BLAKE2B 15a7db2fa263914957c671bd8e94eb8b80afeba0b396e8b54f8fb2deda2965885055efae7a6f6e402eb085b5795025020f650132023ba3d4df1f395d99ec353c SHA512 0ae1b36563ddeaa9947bf452eb20b83174e4c2bc4696b61768f096c401666323343fac0f699f756da99d3c29df15a0bd78fe3fa51da15f133617d7310c5b28d4 DIST onnx-1.16.2.tar.gz 12429500 BLAKE2B 1541fd9e80e305bc0764d1f5d236a89a2f0d0d8819bd6f235c88d35985daf02f575854a537af193befbeab861b2fe6a9d5b8803975b8ae6a47d5d5a6dc28b661 SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d -EBUILD onnx-1.16.1-r1.ebuild 1467 BLAKE2B f90fa2964d0bfce4fd5131eb113be3e193a77323ac1073674f8898b61c0061b70834375557673d5d3c1885c1b14b68a409255be3e3440cee2de3e2a63f6fc458 SHA512 b57ad0a3eac550ff7f56bd9e478636ce95e55f794f657aba27b81b1eee2827a525219688f3235d14851b3768e6db283d1c5524176398ca221195295f7c6665e1 -EBUILD onnx-1.16.2.ebuild 1467 BLAKE2B f90fa2964d0bfce4fd5131eb113be3e193a77323ac1073674f8898b61c0061b70834375557673d5d3c1885c1b14b68a409255be3e3440cee2de3e2a63f6fc458 SHA512 b57ad0a3eac550ff7f56bd9e478636ce95e55f794f657aba27b81b1eee2827a525219688f3235d14851b3768e6db283d1c5524176398ca221195295f7c6665e1 +DIST onnx-1.17.0.tar.gz 12475304 BLAKE2B 17e3cdd4bf101749ba841599d1b4e89ad80cfa3de6adabc10491f84ec928c385b1fe517e32657b24ca57d14780d51cc9a641860c06194cec082d9a9950004c8c SHA512 5a18e2b19ec9c18c8b115fb7e12ed98eddaa581c95f15c4dd420cd6c86e7caa04f9a393da589e76b89cf9b3544abd3749a8c77c2446782f37502eb74e9b1f661 +EBUILD onnx-1.16.2-r1.ebuild 1478 BLAKE2B c673170582e8eb3986185d71e213dac55f1b6e9e8d1d9d2dfe1ec8dbf0f4249f2d9662217205940d6c9a473349f4b7bc2e839af61a3dc5056679cb20611fe8c7 SHA512 ed31b08bfa27810e6f737de6c5ac64d2e4b98564e12d93b8a4d9933c1d4e4ca3625299f5de2f586f7ac327011b7310e841d21d5af675b594eecb7ab94a9ac415 +EBUILD onnx-1.17.0.ebuild 1485 BLAKE2B e44eee6ff15b1aca952786d9fa43ab0490ab62c917f813a29e7aeba98b8452e3d0ec1af85cf9a851300405eb30479368e5af300d160312dac83560258ccf8a83 SHA512 a27e58b83bd77dbcd98983ddecac6fd3ec07905aad4cc3de4908787a1cf6b0c1f24a2f69f9a64a063a16921fe6dd2b654ac9db07f03b76fce2302d39bd9297c2 MISC metadata.xml 404 BLAKE2B 363f1790f0dd2eace0368d7eb1875c166ba6dd0b2514232050f2f1813ccba854b4f8e58e22a329792126188f06d21bf87436c1dcc10d68b018f7abc8eb8ec3e9 SHA512 6a80de77d763a261cafee9cd69337de5282fa39772a1d2a82c3d954d29221596036346339926a124f9df9b261050d17b58d004cdd01ff2f57347379e9df2e45f diff --git a/sci-libs/onnx/onnx-1.16.1-r1.ebuild b/sci-libs/onnx/onnx-1.16.2-r1.ebuild index 9d71aeffe047..555c3bac3c40 100644 --- a/sci-libs/onnx/onnx-1.16.1-r1.ebuild +++ b/sci-libs/onnx/onnx-1.16.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ RESTRICT="test" RDEPEND=" dev-python/protobuf[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] - dev-libs/protobuf:= + dev-libs/protobuf:=[protoc(+)] dev-cpp/abseil-cpp:= " DEPEND="${RDEPEND}" diff --git a/sci-libs/onnx/onnx-1.16.2.ebuild b/sci-libs/onnx/onnx-1.17.0.ebuild index 9d71aeffe047..557c1014ad16 100644 --- a/sci-libs/onnx/onnx-1.16.2.ebuild +++ b/sci-libs/onnx/onnx-1.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,15 +14,15 @@ SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="disableStaticReg" RESTRICT="test" RDEPEND=" + dev-cpp/abseil-cpp:= + dev-libs/protobuf:=[protoc(+)] dev-python/protobuf[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] - dev-libs/protobuf:= - dev-cpp/abseil-cpp:= " DEPEND="${RDEPEND}" diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest index bcab8e5a0adf..97252ce8eeb1 100644 --- a/sci-libs/openblas/Manifest +++ b/sci-libs/openblas/Manifest @@ -1,7 +1,10 @@ AUX openblas-0.3.23-shared-blas-lapack.patch 2128 BLAKE2B 42e6ac46c9d62609731e3d7efd57569712325fb4f35b0bc1b119f51babf9b728acc569216c784e30980e20accee70baee20850b5600c7e0800ff04f19415cf08 SHA512 c6358b9682e358082bd862bbc376412c5b33bc967153f544fa2514205bcb4841cfbbc61e93932fcd4b0653ded2d5f853d62ac05081fc970fb541f4cc7281768f +AUX openblas-0.3.29-shared-blas-lapack.patch 1730 BLAKE2B 538a3c6573880ada184f72dbe4e68261d8a6fca599760977acb077e5b8b8075e1b69b3f093c11fe26b5586c46347bf4b93997560554a3ecbe67e00d09a7f8906 SHA512 a023c5c7dbc72cc7ad06717669bb44d9c4729ef464db499d0bc2227fbcadc17fc868e4c499ee5f7d97762284a737cb745d47b6abc3428b27bc2f0978a4fa0742 DIST OpenBLAS-0.3.25.tar.gz 24073168 BLAKE2B c2a173b50f6931e7782c7d429487abd4b1a4ed05aec4f08febbc5cc73b9ed5cb36c9e308bf7cb89ce116b1c25556615d2384087cf7d1b489a4784901951558bc SHA512 69bcf8082575b01ce1734fc9d33454314964a7e81ff29a7c1a764af3083ac0dc24289fd72bbe22c9583398bda7b658d6e4ab1d5036e43412745f0be3c2185b3c DIST OpenBLAS-0.3.26.tar.gz 24404912 BLAKE2B d72f02492b3ce58c5012943ea84190cb8a8efdfe438fb4fe945a713e4abbcb77f3a0603ca266df234efe8e6d6e4bab4a7386ac02b95512281165bf7ae2f9181d SHA512 01d3a536fbfa62f276fd6b1ad0e218fb3d91f41545fc83ddc74979fa26372d8389f0baa20334badfe0adacd77bd944c50a47ac920577373fcc1d495553084373 +DIST OpenBLAS-0.3.29.tar.gz 24671913 BLAKE2B 54075d623c2241c0153d84111b94945dbb2ab3adaf8ffddcdffe882fbb80b1e0182bb4af2a9ebe352a0c4e920644a68a43b0f1369328c8c001df8a8d8454c4e7 SHA512 046316b4297460bffca09c890ecad17ea39d8b3db92ff445d03b547dd551663d37e40f38bce8ae11e2994374ff01e622b408da27aa8e40f4140185ee8f001a60 EBUILD openblas-0.3.25-r1.ebuild 5998 BLAKE2B b34389f4c292ab5ac1506616c31d0be394e256206c2db8ded4574626a0298a5ee0d0d745c96fd9c68d063543b7be51e9a980f6a2f4a73c6c9c23f83f01770de5 SHA512 d0fb3979242ba04ccbf437a97e77ef4780d57b102c92c1596e6455e13581fc03c5bdc2b03a25a01385ef0cdbb9ef01cd3e4cd30215a8237fa440f6be8fd483e9 EBUILD openblas-0.3.26-r1.ebuild 6058 BLAKE2B 2091a64c7555c0db8f6dfd825e91a8a872e5c4d387bc7a65d97871b8bec26b9e8442e625fef2aac717d213f1235c0b446233ae4eb146b3d35507c652e923be5b SHA512 f2f4c50250ae2d33dc70483ed6c8971b11c39a2f3e41141f3ba6c9aef30f822bc63b13f24ca49e04b07b5fb2446505da9537735e6108edadb45ee717e67c175c EBUILD openblas-0.3.26.ebuild 5999 BLAKE2B cc659bbc1ba9856927e05dd331848a0c58214d513ad49cf168a52498c0ec81fe305e8e3e681d70e2a4da577f16ccee1cdbd2e1eba0cb7757d4c1018190373f69 SHA512 efa071a6469fa258c200c2548bd6c3b0cd6842898c7ac40d1b0dff36ee8d6165b83a4abbafa4b887ae30d3aa7a002516c2f647f38bbd98c26ee6f0b1ae58db6a +EBUILD openblas-0.3.29.ebuild 6058 BLAKE2B 3f5bd539837838d96e008c2270f5cd6e218e8562839d65bae889602342bcf608de7530d67d642d240fb36335a63cdec25f53e4992f79088f337f035dc7779613 SHA512 99dce0e7bc1788836bd80ef41312fb2e845758b662537451497d00ce955b79836b3b39c4ffec1cf1b26286a682ccc02ca7d9d2424d6e37a2b82177f61dda84d8 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48 diff --git a/sci-libs/openblas/files/openblas-0.3.29-shared-blas-lapack.patch b/sci-libs/openblas/files/openblas-0.3.29-shared-blas-lapack.patch new file mode 100644 index 000000000000..db2134a8127b --- /dev/null +++ b/sci-libs/openblas/files/openblas-0.3.29-shared-blas-lapack.patch @@ -0,0 +1,26 @@ +--- a/intertace/Makefile 2025-02-03 00:34:22.497814588 +0900 ++++ b/interface/Makefile 2025-02-03 00:37:34.974798211 +0900 +@@ -2461,3 +2461,23 @@ + + cblas_zgemm_batch.$(SUFFIX) cblas_zgemm_batch.$(PSUFFIX) : gemm_batch.c ../param.h + $(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F) ++ ++##### ++shared-blas-lapack: libblas.so.3 libcblas.so.3 liblapack.so.3 liblapacke.so.3 ++ ++# The list of prerequisite is created by comparing with NETLIB BLAS public API. ++libblas.so.3: $(SBLAS1OBJS) $(SBLAS2OBJS) $(SBLAS3OBJS) $(DBLAS1OBJS) $(DBLAS2OBJS) $(DBLAS3OBJS) $(CBLAS1OBJS) $(CBLAS2OBJS) $(CBLAS3OBJS) $(ZBLAS1OBJS) $(ZBLAS2OBJS) $(ZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o ++ $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libblas.so.3 -L.. -lopenblas $(EXTRALIB) ++ ++libcblas.so.3: $(CSBLAS1OBJS) $(CSBLAS2OBJS) $(CSBLAS3OBJS) $(CDBLAS1OBJS) $(CDBLAS2OBJS) $(CDBLAS3OBJS) $(CCBLAS1OBJS) $(CCBLAS2OBJS) $(CCBLAS3OBJS) $(CZBLAS1OBJS) $(CZBLAS2OBJS) $(CZBLAS3OBJS) ../kernel/lsame.o ../kernel/scabs1.o ../kernel/dcabs1.o ../driver/others/xerbla.o ++ $(CC) $(LDFLAGS) -shared -o $@ $^ -Wl,-soname,libcblas.so.3 -L.. -lopenblas $(EXTRALIB) ++ ++# The prerequisites must match the symbols deleted in target delete-duplicate-lapack-objects ++liblapack.so.3: $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) ../kernel/lsame.o ../driver/others/xerbla.o ++ $(CC) $(LDFLAGS) -shared -o $@ $^ ../lapack-netlib/SRC/*.o -Wl,-soname,liblapack.so.3 -L.. -lopenblas $(EXTRALIB) ++ ++liblapacke.so.3: liblapack.so.3 ++ $(CC) $(LDFLAGS) -shared -o $@ `find ../lapack-netlib/LAPACKE -name "*.o"` -Wl,-soname,liblapacke.so.3 -L.. -lopenblas $(EXTRALIB) ++ ++clean:: ++ rm -f libblas.so.3 libcblas.so.3 liblapack.so.3 diff --git a/sci-libs/openblas/openblas-0.3.29.ebuild b/sci-libs/openblas/openblas-0.3.29.ebuild new file mode 100644 index 000000000000..e52f67a83318 --- /dev/null +++ b/sci-libs/openblas/openblas-0.3.29.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic fortran-2 toolchain-funcs + +MY_P=OpenBLAS-${PV} +DESCRIPTION="Optimized BLAS library based on GotoBLAS2" +HOMEPAGE="https://github.com/xianyi/OpenBLAS" +SRC_URI="https://github.com/OpenMathLib/OpenBLAS/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test" +REQUIRED_USE="?? ( openmp pthread )" +RESTRICT="!test? ( test )" + +RDEPEND=" + eselect-ldso? ( + >=app-eselect/eselect-blas-0.2 + >=app-eselect/eselect-lapack-0.2 + ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-0.3.29-shared-blas-lapack.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + elog "This software has a massive number of options that" + elog "are configurable and it is *impossible* for all of" + elog "those to fit inside any manageable ebuild." + elog "The Gentoo provided package has enough to build" + elog "a fully optimized library for your targeted CPU." + elog "You can set the CPU target using the environment" + elog "variable - OPENBLAS_TARGET or it will be detected" + elog "automatically from the target toolchain (supports" + elog "cross compilation toolchains)." + elog "You can control the maximum number of threads" + elog "using OPENBLAS_NTHREAD, default=64 and number of " + elog "parallel calls to allow before further calls wait" + elog "using OPENBLAS_NPARALLEL, default=8." +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + fortran-2_pkg_setup +} + +src_prepare() { + default + + # TODO: Unbundle lapack like Fedora does? + # https://src.fedoraproject.org/rpms/openblas/blob/rawhide/f/openblas-0.2.15-system_lapack.patch + + # Don't build the tests as part of "make all". We'll do + # it explicitly later if the test phase is enabled. + sed -i -e "/^all :: tests/s: tests::g" Makefile || die + + # If 64bit-index is needed, create second library with LIBPREFIX=libopenblas64 + if use index-64bit; then + cp -aL "${S}" "${S}-index-64bit" || die + fi +} + +src_configure() { + # List of most configurable options is in Makefile.rule. + + # Not an easy fix, https://github.com/xianyi/OpenBLAS/issues/4128 + filter-lto + + tc-export CC FC LD AR AS RANLIB + + # HOSTCC is used for scripting + export HOSTCC="$(tc-getBUILD_CC)" + + # Threading options + export USE_THREAD=0 + export USE_OPENMP=0 + if use openmp; then + USE_THREAD=1 + USE_OPENMP=1 + elif use pthread; then + USE_THREAD=1 + USE_OPENMP=0 + fi + + # Disable submake with -j and default optimization flags in Makefile.system + # Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT... + export MAKE_NB_JOBS=-1 COMMON_OPT=" " FCOMMON_OPT=" " + + # Target CPU ARCH options generally detected automatically from cross toolchain + # + # TODO: Rename USE=dynamic -> USE=cpudetection like dev-libs/gmp, media-video/ffmpeg? + # (may want to then restrict bindist w/ USE=-cpudetection.) + if use dynamic ; then + export DYNAMIC_ARCH=1 NO_AFFINITY=1 TARGET=GENERIC + fi + + export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} NUM_THREADS=${OPENBLAS_NTHREAD:-64} + + # Allow setting OPENBLAS_TARGET to override auto detection in case the + # toolchain is not enough to detect. + # https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt + if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then + export TARGET="${OPENBLAS_TARGET}" + fi + + export NO_STATIC=1 + export BUILD_RELAPACK=$(usex relapack 1 0) + export PREFIX="${EPREFIX}/usr" +} + +src_compile() { + emake shared + + use eselect-ldso && emake -C interface shared-blas-lapack + + if use index-64bit; then + emake -C "${S}-index-64bit" \ + INTERFACE64=1 \ + LIBPREFIX=libopenblas64 shared + fi +} + +src_test() { + emake tests +} + +src_install() { + emake install DESTDIR="${D}" \ + OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \ + OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir) + + dodoc GotoBLAS_*.txt *.md Changelog.txt + + if use index-64bit; then + dolib.so "${S}-index-64bit"/libopenblas64*.so* + fi + + if use eselect-ldso; then + insinto /usr/$(get_libdir)/blas/openblas/ + doins interface/libblas.so.3 + dosym -r /usr/$(get_libdir)/blas/openblas/libblas.so.3 /usr/$(get_libdir)/blas/openblas/libblas.so + doins interface/libcblas.so.3 + dosym -r /usr/$(get_libdir)/blas/openblas/libcblas.so.3 /usr/$(get_libdir)/blas/openblas/libcblas.so + + insinto /usr/$(get_libdir)/lapack/openblas/ + doins interface/liblapack.so.3 + dosym -r /usr/$(get_libdir)/lapack/openblas/liblapack.so.3 /usr/$(get_libdir)/lapack/openblas/liblapack.so + doins interface/liblapacke.so.3 + dosym -r /usr/$(get_libdir)/lapack/openblas/liblapacke.so.3 /usr/$(get_libdir)/lapack/openblas/liblapacke.so + fi +} + +pkg_postinst() { + use eselect-ldso || return + local libdir=$(get_libdir) me="openblas" + + # check blas + eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me} + local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2) + if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then + eselect blas set ${libdir} ${me} + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + else + elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]." + elog "To use blas [${me}] implementation, you have to issue (as root):" + elog "\t eselect blas set ${libdir} ${me}" + fi + + # check lapack + eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me} + local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2) + if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then + eselect lapack set ${libdir} ${me} + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + else + elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]." + elog "To use lapack [${me}] implementation, you have to issue (as root):" + elog "\t eselect lapack set ${libdir} ${me}" + fi +} + +pkg_postrm() { + if use eselect-ldso; then + eselect blas validate + eselect lapack validate + fi +} diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest index c731515b9cd5..51a6ccf75e33 100644 --- a/sci-libs/openlibm/Manifest +++ b/sci-libs/openlibm/Manifest @@ -1,9 +1,5 @@ AUX openlibm-0.8.3-fix-loong-riscv-fenv.patch 749 BLAKE2B 27f062b7bc9212a487812efc923fd584a03d0641fb81f6b4b683b161c6f3e1c255b5141c63418f9e0be96250d5cda09fae5ebf611aeaf79562d32cb0c266bbee SHA512 d0290460c8fb444496ef3978eb77bdf691df380d4e11080fffb7060b5e2b7ab4da287b424eda4fef7f719b53d24d244c128f4c118deb4e07f1a00f6b32d46474 AUX openlibm-0.8.3-stack-protection.patch 2065 BLAKE2B 213710329df83d08798cea61d952e6ced7218bad7e80eb9ee8004ccbfaf85a27fc70fb1ac4f6f5b313b47453be1197567296c8cca23fcd65ad037599ff0b17a7 SHA512 7e750cdb2fe9871b1e83291ffac5d255a73f2f577b05f3a3dcb35ee919c38fa26980416d38352805b1b32f91de3b7bcba8fab0f0757bb506786ddbdeb4429739 -DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799 -DIST openlibm-0.8.0.tar.gz 367130 BLAKE2B e516fee18203040b8f3cdffab10c4ca22df638551b420ec7e679ff373221973a013c93520b29395c61c8ef0f0f6c87516c1d4a9885c3bbb5e8cae8900efee6ea SHA512 336dfac1fd4ab6ce256aa0129a211c3556eac46d2e775e5cec9626dc5bbcb4d5e65c86617d72e531694e8c8e6320a0fabc76600a02b0ac9f1d652774d0a94440 DIST openlibm-0.8.3.tar.gz 374991 BLAKE2B 91474b5c9480753dafb2f85521a8909eaa00febc871bd71d6ffecfd1001200ce66c66c43f4f5738215f04bc109035dcceb2a9f6319e8b9405e6cab65e802aafb SHA512 1c6969e6e3117ddc066697318e43cf42d170750cb85cbed6013eb29d7513d5998eeffbff4a658d222cf637977cb7dca34b7a15814f8870f4e36e880673d757c0 -EBUILD openlibm-0.7.5.ebuild 820 BLAKE2B de0436b2b7598936c32951ad3063a4eea11d4f34f16abb30c675d387948cd44eb832c25b7ae6004bba879061d56fd97684761a06eb47619c7d408b0f1384a7d4 SHA512 3d96a505d1f15647ab229e5ef1f1e60f1b1ff9cdb063af2bc20e07b6eee49d76ac2e61939f2f948e311fef034af7c42c75b465110ef748dd770aefcc343d3862 -EBUILD openlibm-0.8.0.ebuild 908 BLAKE2B f966b0c1ce4c6437061fc01caf15c79634350222865e7bea12da31897805bb56d50c43a75fa63060bf0a369b2c4ff394ce559ae0a26a171f9279859662ec0e8c SHA512 a62983295d2e90209e97b311e95d67e93bb2203d66bb9d9b1ba5aa00c034ab4b082bd34dd1fa25b5b2c9abfcbfed98938bf22aa278cfd3e494e17a02716f8f4d -EBUILD openlibm-0.8.3.ebuild 1263 BLAKE2B a0fc12c11c9485f8f61e8bf1ec4461a3ed922a75556a9e6fc51f2a6104da9411558d758af20e005aa93e06ac87e3d0d7458edc6c8eee7cfefc2e7162f6879f6c SHA512 733c1aedccd1ae1f0d0f85dad82f71ad42464b8b8167d97286912cebe0155b36bcb7104dfb1bf0cff99d85a0c90e0bd649d0b90fbcdcff594a9caa0b293ba91c +EBUILD openlibm-0.8.3.ebuild 1289 BLAKE2B f1fca0ac05dbcd2b866d30da8d41534c92f004ffb13d1c2f18f7c4fbc801fe882f9f8855b5efcac7b0bd6a920b44d87acb3e838f598371e88a69025a4c3ede30 SHA512 5af51b73144eb00c5aa7c6ce66955ed54844f613dda3499435e5609dd8443def0128e16587b1e44f081653e8fc7ee16585da22f71c92d666b918e27a5f3f813d MISC metadata.xml 785 BLAKE2B 160415de6f1dd61dfe42488a2aaf716bb6ecb00396ae541c8b385116fb0b5017bc546fdcdd6394ce5c547cd85e7ccf94b7996128355ce3fa9fc7b17478c2949d SHA512 cdc602bce059702ad03d57a67ad9e2897fdcf999fd2d664e76293ddd22741817a042abafd6603c424839780d30b647a82901c468a5d55dc1794fdafd2a281b8c diff --git a/sci-libs/openlibm/openlibm-0.7.5.ebuild b/sci-libs/openlibm/openlibm-0.7.5.ebuild deleted file mode 100644 index ca3ab8af5117..000000000000 --- a/sci-libs/openlibm/openlibm-0.7.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="High quality system independent, open source libm" -HOMEPAGE="https://github.com/JuliaLang/openlibm" -SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+" -# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm -SLOT="0/3" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -src_prepare() { - default - sed -e "/^OLM_LIBS :=/s/^/#/" \ - -e "/install: /s/install-static//" \ - -i Makefile || die -} - -src_configure() { - tc-export CC CXX FC AR LD - default -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \ - libdir="${EPREFIX}/usr/$(get_libdir)" install - dodoc README.md -} diff --git a/sci-libs/openlibm/openlibm-0.8.0.ebuild b/sci-libs/openlibm/openlibm-0.8.0.ebuild deleted file mode 100644 index df09fa8e2592..000000000000 --- a/sci-libs/openlibm/openlibm-0.8.0.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 - -inherit toolchain-funcs - -DESCRIPTION="High quality system independent, open source libm" -HOMEPAGE="https://github.com/JuliaLang/openlibm" -SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -IUSE="static-libs" -LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+" -# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm -SLOT="0/4" -KEYWORDS="~amd64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux" - -src_prepare() { - default - sed -e "/^OLM_LIBS :=/s/^/#/" -i Makefile || die - if ! use static-libs ; then - sed -e "/install: /s/install-static//" -i Makefile || die - fi -} - -src_configure() { - tc-export CC CXX FC AR LD - default -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \ - libdir="${EPREFIX}/usr/$(get_libdir)" install - dodoc README.md -} diff --git a/sci-libs/openlibm/openlibm-0.8.3.ebuild b/sci-libs/openlibm/openlibm-0.8.3.ebuild index c7e00790e40a..2252f0e806cd 100644 --- a/sci-libs/openlibm/openlibm-0.8.3.ebuild +++ b/sci-libs/openlibm/openlibm-0.8.3.ebuild @@ -13,7 +13,7 @@ IUSE="static-libs" LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+" # See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm SLOT="0/4" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux" PATCHES=( "${FILESDIR}"/${P}-stack-protection.patch @@ -33,6 +33,7 @@ src_compile() { case "${ARCH}" in loong) export ARCH=loongarch64 ;; riscv) export ARCH=riscv64 ;; + x86) export ARCH=i387 ;; esac emake \ diff --git a/sci-libs/parmetis/Manifest b/sci-libs/parmetis/Manifest index db3bc886adf1..95ec6ae14d67 100644 --- a/sci-libs/parmetis/Manifest +++ b/sci-libs/parmetis/Manifest @@ -5,5 +5,5 @@ AUX parmetis-4.0.3_p20230326-respect-user-flags.patch 1394 BLAKE2B c688028d35235 DIST parmetis-4.0.3.tar.gz 5567670 BLAKE2B 69a44ea8e50d8fd78046a342807b994220d03da3ab1695533d92772b1840302917a7d5d6f9eb020d9ff8ab7e5372bff0386d6354b662f58495b74f8f596c45f9 SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132 DIST parmetis-4.0.3_p20230326.tar.gz 5312266 BLAKE2B 52f34982cff0aa3dbc26dde1bab72ff1a8f5fa20feba72deedc600fcb0d73c9d05f3a43bf5713f9a7db74695affaedd5ea5f691396f5d02c58ad26dc5a779592 SHA512 a71d212a1c8682eb662ef6bb8bdcb124bc13c353e76ac236b01e544bddb975740c36be54c05305e1114e4daf20fec56642ffa319a6426c87c5538ea2225c156b EBUILD parmetis-4.0.3-r2.ebuild 1691 BLAKE2B e98b150bcc070c23b5dd922354ff49c1bf45b000ba9bcee08a97d0825e7c22bb64fb95f2be47d59cb2a80551af7d5a58fa85c277d58c54fdc6f17a4c5d25ef50 SHA512 1759d4972aef4974695b013710da8c35b65cc6c49aff665371ab16b6ab919c324d151d85a27501ba2d115ee4a36f2dc19d1353eacd75a0b96322da5a43a398d3 -EBUILD parmetis-4.0.3_p20230326-r1.ebuild 1704 BLAKE2B 127ed2801daadd357c5ed4c0ef200360dc57facfaeee6034677e3d9388c9ed41e748cfc5679a80c8e3a0f63b3901a90a0834c575744f86cacb6d82f938d95c88 SHA512 7fba39e4448d903dc26602ca0e94a2d2219ad3cb13ae75915b4ff1e69653ad89633a4ae38bdce6ca7a2bb1705d1e27bbfa82a317ed7eea0f78dd6502648e4170 +EBUILD parmetis-4.0.3_p20230326-r1.ebuild 1702 BLAKE2B 279143ca06c1559a73d2a3d6020492855db1de032b267d3553050c2dccd5b697814e591712c50c9261b14cb50bacb356908e2cb95269e7bc92d2bebb1b2a7e5a SHA512 13390ea188438038892abc98925e8904f4c587fc8b5a9ae570743d33dfceffd2ddd6879cad0b72f24097f6287dffcef0312d56bca0fdaf7abffee0f607c24139 MISC metadata.xml 745 BLAKE2B be3f5f93243ec90f867d88af721f18f6ab0d4ef43faf2739eedbc4a0f1bef6180d17254fbbff1d0c0c6912b21d249ca145037ca17634382dfe6111c875c8e8eb SHA512 c1a78d446d63b6939396f698fa188b7acea2e50615d079e62bcfc17a0d96327dea376f5714fda34bf6223c2b9a8c87f14bfd87ddde0fae28909f8a4e4419e8d4 diff --git a/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild b/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild index 48a2e554f84a..712c6585ee2e 100644 --- a/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild +++ b/sci-libs/parmetis/parmetis-4.0.3_p20230326-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,13 +14,13 @@ S="${WORKDIR}/ParMETIS-${COMMIT}" LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86 ~amd64-linux" +KEYWORDS="amd64 arm64 ~loong ~riscv ~x86 ~amd64-linux" IUSE="examples openmp pcre" RESTRICT="mirror bindist" DEPEND=" sci-libs/gklib - >=sci-libs/metis-5.1.0-r5 + >=sci-libs/metis-5.2.1-r2 virtual/mpi[fortran] pcre? ( dev-libs/libpcre:= ) " @@ -62,7 +62,7 @@ src_install() { dodoc manual/manual.pdf if use examples; then docinto examples - dodoc -r Graphs programs + dodoc -r graphs programs fi cat > ${PN}.pc <<-EOF diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest index d856df48af33..21781d51e005 100644 --- a/sci-libs/pdal/Manifest +++ b/sci-libs/pdal/Manifest @@ -3,5 +3,5 @@ DIST PDAL-2.8.1-src.tar.bz2 87507277 BLAKE2B 634ba5f2c5548bfa1fbdcc257185dcd99d2 DIST PDAL-2.8.2-src.tar.bz2 87504277 BLAKE2B b2037a4fe5ac369380d2b2d83a2210a3c17757f9e6f749e819854d7356ba07d85b83fe3221ab9024f40f8a9f0ec6ee86573092914ac633af56b361a2f128cb00 SHA512 82dc84192e0cda809f4b12233e009c0c92328bf78001fc6394f56b28514a4b20de17dd354904d44cebc40c28a78828c47a1324b749143cc5b41b6c322902a442 EBUILD pdal-2.8.0.ebuild 1499 BLAKE2B 70d7f4061f630eace363b334efa95fa7e56dcf602d7b5036ff3300108175385563072907dc9dde305d302e07ad851485032ae1ea72c0ac74e8f184a9927b60f4 SHA512 9fa63a1b410e51a5b8ceaa13c44ad5a741c0dcd263dd0d024c27eb1a4a5ef0efcafb103a705fe837ffd4630d7062d76094fc75d4a76fbd2f8301a0b279ddf73f EBUILD pdal-2.8.1.ebuild 1499 BLAKE2B 70d7f4061f630eace363b334efa95fa7e56dcf602d7b5036ff3300108175385563072907dc9dde305d302e07ad851485032ae1ea72c0ac74e8f184a9927b60f4 SHA512 9fa63a1b410e51a5b8ceaa13c44ad5a741c0dcd263dd0d024c27eb1a4a5ef0efcafb103a705fe837ffd4630d7062d76094fc75d4a76fbd2f8301a0b279ddf73f -EBUILD pdal-2.8.2.ebuild 1500 BLAKE2B 45c7dc32cfaf105bbb3848dd46360c02b41f7cb927b182e469ad6ec47a7e2048f0c66fc898421800a5be50bec9f0c6bb4b7a9afac43cff5fe3a656f9255b3e52 SHA512 d0564d156c9d19fb02bb73ef2ef4ed5d7ab8397998d83531e52d9d619e6e8d83a5b49b6196a366b2f88d0f3afe12678fa157c02f20b19c305ba9d3b3517cd9af +EBUILD pdal-2.8.2.ebuild 1499 BLAKE2B efc6c643627cc7dfd8b9f35752a1256ad9cf044f13c76245d578d3104612e0a1d1691ea2257c11ef562e88967390139a1a7a8304f5131c68b0f1e4c6895894b1 SHA512 53ea602871426911ab071fa6387f1abc701d7a40e6f00df47ca070849184be0baec3e23b94c9d24cf424ec8b4bc57b559882daeb8ea42fd73f76d261dfdb86db MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2 diff --git a/sci-libs/pdal/pdal-2.8.2.ebuild b/sci-libs/pdal/pdal-2.8.2.ebuild index d1a156dda0ca..12a63f0852e2 100644 --- a/sci-libs/pdal/pdal-2.8.2.ebuild +++ b/sci-libs/pdal/pdal-2.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}/PDAL-${PV}-src" LICENSE="BSD" SLOT="0/18" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="debug postgres test" BDEPEND=" diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest index 7df2609f938a..6a5b9feb276e 100644 --- a/sci-libs/pgplot/Manifest +++ b/sci-libs/pgplot/Manifest @@ -1,3 +1,4 @@ +AUX pgplot-C99.patch 10860 BLAKE2B 784a3f73a474a4647c33c11304af4f9e72d1d545cb4c290d443baadf39b1786b132a41e50247fad8ed2afdb22c0f67f9e5f8881a9e466c59cae86e1163da7a76 SHA512 d6dc501aab036bc79d41f9096c0fc5055243e7ad7edb9746ecd61138aab382f8453165a4b0d1c772e2704bc6038e4da3188ca922564ef369342ea2273f5f4e46 AUX pgplot-compile-setup.patch 3038 BLAKE2B a0a7eca212630c9395680ebfb6fd1bb5e0d45a9d3dbb2933b95a4b9f99954160a60ee129eddc235878324d068f79772c66ffb71ba6214119c0f6132523a8e2be SHA512 83cf82d37bb6d29787ef86db8467629d16a3c429d728049d2ff842d1778e09cd9991ac1576dd023fb43455a955cd3e4677e7e1694c0f5a321be673f25f613e21 AUX pgplot-drivers.patch 7430 BLAKE2B be574ee9ae10fce7262e6f35f45cae36076cf034fcfb7b3c58374ceb43733af0c7bf3fa4d9a8ca15693b040a6dd0105e58f601a570da3a473db0c51eaf4fb5d3 SHA512 91203108d4e054f7505a324de2a2d0c96d6379f8c928c5e912d72ecd604fbfd6591cbf241b842ce3ec094079d43a916c9d0446dfb26692b5861f61f2bd7a4dc4 AUX pgplot-headers.patch 2681 BLAKE2B b4b4fdce5aed84b41a8ee47ef1a6e9e6ec58dc94654410f34cc7e233da7612b61d7f517e1d85b61a5ebb74b5fc637de895708a9d597aeb919584b3e38f6e0e97 SHA512 a8134726467341ec0cce84d6f44355a874dfee6fce1c33ea07cc39134180787f2628e84c0acf9b021d81decb948ccf0f96a294481c564b251df8d0be379da469 @@ -6,4 +7,5 @@ AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc94457 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f EBUILD pgplot-5.2.2-r8.ebuild 4165 BLAKE2B 4e22d01b9bdd429092a33e2ecd33b84827b3c54171ff59968dee7a28a1df32421a0373dd25898754cec9f9fa27442e62560648a5a135d71cfe34a071d7eed92d SHA512 30d458602269e1aeb43669064188d6e192302d850f5239bb0d5b04ec628d654846eadff436a8a47e28da48567fe5d980405629b01c5476768795b8d6a5a03171 +EBUILD pgplot-5.2.2-r9.ebuild 4208 BLAKE2B a1ddfd4a4994e26016eb455debd33e7b32e8bb9e5d0253a47d43d86d8abba73788eac523fddeb3eda6460615ced43d3806f93d95e8cf6db384a5fcddbad3a36f SHA512 c47db757dd316b89bc5fef1fcf699f3a2a06a55c8782d03f84b9b2608570adc37e41a4a07e3597af29594d7227a9b985f541f84315d91b5f70885fea771cebde MISC metadata.xml 625 BLAKE2B bbd521da84f7e10f6f09957ba02f4d731705784b7958951f9b508642e17ecb8840bb4ff33d81cfbd21b19723416f3a4e44bbe22a568f79731fefd2c25ce1cb8a SHA512 52ee7b04c1294da75229ca6c7ad407e7b278c78998962a818519c5312ed4babdbb9a62c31ecfba12aa39b439aa0477a7170f6f644d90097d149ad3a5839f766f diff --git a/sci-libs/pgplot/files/pgplot-C99.patch b/sci-libs/pgplot/files/pgplot-C99.patch new file mode 100644 index 000000000000..ba3c5e46f6c2 --- /dev/null +++ b/sci-libs/pgplot/files/pgplot-C99.patch @@ -0,0 +1,331 @@ +https://bugs.gentoo.org/875437 +diff -ru a/pgdispd/figcurs.c b/pgdispd/figcurs.c +--- a/pgdispd/figcurs.c 2024-05-14 13:48:50.018175785 +0400 ++++ b/pgdispd/figcurs.c 2024-05-14 13:43:58.801142627 +0400 +@@ -55,8 +55,7 @@ + /* Return Values: */ + /* Whatever getcurs returns */ + +-int pggcurs(buf) +-short *buf; ++int pggcurs(short *buf) + { + int getcurs (); + +@@ -64,8 +63,7 @@ + } + + #ifndef PGDISP +-int bmgcurs(buf) +-short *buf; ++int bmgcurs(short *buf) + { + int getcurs (); + +@@ -79,10 +77,7 @@ + /* 0 There are no cursor positions to return */ + /* 1 The buffer was set properly */ + +-int getcurs(buf,curlist,listend) +-short *buf; +-struct curpos **curlist; +-struct curpos **listend; ++int getcurs(short *buf, struct curpos **curlist,struct curpos **listend) + { + struct curpos *tmpptr; + +@@ -106,8 +101,7 @@ + /* on the line graphics window. */ + /* Return Value: 1 (no matter what) */ + +-int pgcursor(event) +-XEvent event; ++int pgcursor(XEvent event) + { + short val; /* the "value" of the event" */ + +@@ -159,8 +153,7 @@ + /* on the bitmap graphics window. */ + /* Return Value: 1 (no matter what) */ + +-int bmcursor(event) +-XEvent event; ++int bmcursor(XEvent event) + { + short val; /* The value associated with the cursor event */ + +@@ -211,9 +204,7 @@ + /* The getbuttonval routine updates val to correspond to the appropriate */ + /* keypress. */ + +-void getbuttonval(button,val) +-unsigned int button; +-short *val; ++void getbuttonval(unsigned int button, short *val) + { + switch(button) + { +@@ -244,9 +235,7 @@ + /* 0 A modifier key was pressed */ + /* 1 A regular key was pressed */ + +-int getkeyval(event,val) +-XEvent event; +-short *val; ++int getkeyval(XEvent event, short *val) + { + char tmpchr; + KeySym keysym; +@@ -264,8 +253,7 @@ + /* cursor events and does not do anything visible unless this position is */ + /* different than the previousrecorded line graphics cursor location. */ + +-void pgscurs(x,y) +-int x,y; ++void pgscurs(int x, int y) + { + if (lgcurses != NULL) return; + +@@ -285,8 +273,7 @@ + /* position is different than the previous recorded line graphics cursor */ + /* location. */ + +-void bmscurs(x,y) +-int x,y; ++void bmscurs(int x, int y) + { + if (bmcurses != NULL) return; + +diff -ru a/pgdispd/getcolors.c b/pgdispd/getcolors.c +--- a/pgdispd/getcolors.c 2024-05-14 13:23:54.984716132 +0400 ++++ b/pgdispd/getcolors.c 2024-05-14 13:34:48.860787865 +0400 +@@ -30,17 +30,20 @@ + static int rovis[]={TrueColor, StaticColor, StaticGray}; + static int nrovis=sizeof(rovis)/sizeof(rovis[0]); + +-int getcolors(vistype, visual, cmap, pix, maxcolors, mincolors, depth, +- maxdepth, mindepth) +-int vistype; /* The type of visual to use */ +-Visual **visual; /* The visual actually used */ +-Colormap *cmap; /* The color map actually used */ +-unsigned long *pix; /* The pixels allocated */ +-int maxcolors; /* The maximum number of colors to allocate */ +-int mincolors; /* The minimum number of colors to allocate */ +-int *depth; /* The depth of the visual actually used */ +-int maxdepth; /* The maximum allowed visual depth */ +-int mindepth; /* The minimum allowed visual depth */ ++int getcolors(int vistype, Visual **visual, Colormap *cmap, ++ unsigned long *pix, int maxcolors, int mincolors, ++ int *depth,int maxdepth, int mindepth) ++/* ++int vistype; The type of visual to use ++Visual **visual; The visual actually used ++Colormap *cmap; The color map actually used ++unsigned long *pix; The pixels allocated ++int maxcolors; The maximum number of colors to allocate ++int mincolors; The minimum number of colors to allocate ++int *depth; The depth of the visual actually used ++int maxdepth; The maximum allowed visual depth ++int mindepth; The minimum allowed visual depth ++*/ + { + XVisualInfo vinfo; /* The template for our visual */ + unsigned long pmtmp[1]; /* temporary for plane masks */ +diff -ru a/pgdispd/getdata.c b/pgdispd/getdata.c +--- a/pgdispd/getdata.c 2024-05-14 13:23:54.985716126 +0400 ++++ b/pgdispd/getdata.c 2024-05-14 13:46:09.874257376 +0400 +@@ -36,13 +36,13 @@ + #include "messages.h" + + +-int getdata(event,rbuf,rbuflen,srcwin,selset) +-XSelectionEvent event; /* the event we're handling */ +-short *rbuf; /* a return buffer, if needed */ +-int *rbuflen; /* the length of the return buffer. If it's 0, no return */ ++int getdata(XSelectionEvent event, short *rbuf, int *rbuflen, Window srcwin, int *selset) ++/*XSelectionEvent event; the event we're handling */ ++/*short *rbuf; a return buffer, if needed */ ++/*int *rbuflen; the length of the return buffer. If it's 0, no return */ + /* message should be sent. */ +-Window srcwin; /* the source of our data */ +-int *selset; /* whether or not the selection is owned by a user program */ ++/*Window srcwin; the source of our data */ ++/*int *selset; whether or not the selection is owned by a user program */ + { + short *buffer; /* buffer for the data received */ + /* the max buffer length (in 16-bit words) */ +diff -ru a/pgdispd/getvisuals.c b/pgdispd/getvisuals.c +--- a/pgdispd/getvisuals.c 2024-05-14 13:23:54.984716132 +0400 ++++ b/pgdispd/getvisuals.c 2024-05-14 13:39:07.775108180 +0400 +@@ -34,6 +34,10 @@ + + #define MAX_DEPTH 24 /* the maximum visual depth to use */ + ++extern int getcolors(int vistype, Visual **visual, Colormap *cmap, ++ unsigned long *pix, int maxcolors, int mincolors, ++ int *depth, int maxdepth, int mindepth); ++ + int getvisuals() + { + int i; /* Silly loop variable */ +@@ -277,10 +281,10 @@ + + if ((bm.colors=getcolors(UseDefaultCmap, &bitvisual, &bitcmap, bm.pix, + res.maxcolors+res.leavecolors, res.mincolors+res.leavecolors, +- &bitdepth)) ++ &bitdepth, MAX_DEPTH, 1)) + || (bm.colors=getcolors(UseRWVisual, &bitvisual, &bitcmap, bm.pix, + res.maxcolors+res.savecolors, res.mincolors+res.savecolors, +- &bitdepth))) ++ &bitdepth, MAX_DEPTH, 1))) + { /* success! */ + if (bitcmap == DefaultColormap(display, screen)) + { +@@ -323,7 +327,7 @@ + while (res.lgcolors > 2) + { + if (lg.colors=getcolors(UseROVisual, &linevisual, &linecmap, +- lg.pix, res.lgcolors, res.lgcolors, &linedepth)) break; ++ lg.pix, res.lgcolors, res.lgcolors, &linedepth,MAX_DEPTH, 1)) break; + + /* lower our standards */ + if (res.lgcolors > 16) res.lgcolors=16; +diff -ru a/pgdispd/handlexevent.c b/pgdispd/handlexevent.c +--- a/pgdispd/handlexevent.c 2024-05-14 13:23:54.985716126 +0400 ++++ b/pgdispd/handlexevent.c 2024-05-14 13:49:17.490990237 +0400 +@@ -46,12 +46,15 @@ + #include "globals.h" + #include "messages.h" + ++extern int pggcurs(short *buf); ++extern int getdata(XSelectionEvent event, short *rbuf, int *rbuflen, Window srcwin, int *selset); ++extern int pgcursor(XEvent event); ++ + int luttransoff=0; + int modluttransoff=0; + +-int handlexevent(event,go_on) +-XEvent event; +-int *go_on; /* whether the calling routine shoudl exit successfully */ ++int handlexevent(XEvent event,int *go_on) ++/* *go_on; whether the calling routine shoudl exit successfully */ + { + #ifndef PGDISP + static int slitxs= -1,slitys; /* the starting point for the slit */ +diff -ru a/pgdispd/mainloop.c b/pgdispd/mainloop.c +--- a/pgdispd/mainloop.c 2024-05-14 13:23:54.984716132 +0400 ++++ b/pgdispd/mainloop.c 2024-05-14 13:41:28.880155175 +0400 +@@ -58,6 +58,9 @@ + #include "figdisp.h" + #include "globals.h" + ++extern int waitevent(); ++int handlexevent(XEvent event,int *go_on); ++ + int mainloop() + { + XEvent event; /* the current event */ +diff -ru a/pgdispd/pgdisp.c b/pgdispd/pgdisp.c +--- a/pgdispd/pgdisp.c 2024-05-14 13:23:54.985716126 +0400 ++++ b/pgdispd/pgdisp.c 2024-05-14 13:27:23.658462490 +0400 +@@ -43,9 +43,12 @@ + #undef DEFINE_GLOBALS + #undef INC_HEADER_RCS + +-int main(argc,argv) +-int argc; +-char **argv; ++extern int initlock(); ++extern int getvisuals(); ++extern int initlgwin(); ++extern int mainloop(); ++ ++int main(int argc,char **argv) + { + Display *XOpenDisplay(); + +diff -ru a/pgdispd/proccom.c b/pgdispd/proccom.c +--- a/pgdispd/proccom.c 2024-05-14 13:23:54.984716132 +0400 ++++ b/pgdispd/proccom.c 2024-05-14 13:44:27.000952169 +0400 +@@ -117,11 +117,13 @@ + /* A trivial macro */ + #define min(x,y) (((x) > (y)) ? (y) : (x)) + +-int proccom(buf,len,retbuf,retbuflen) +-unsigned short *buf; /* the buffer of commands and arguments */ +-int len; /* the length of the buffer */ +-unsigned short *retbuf; /* a buffer for return values */ +-int *retbuflen; /* the length of retbuf */ ++extern int pggcurs(short *buf); ++ ++int proccom(unsigned short *buf, int len, unsigned short *retbuf, int *retbuflen) ++/*unsigned short *buf; the buffer of commands and arguments */ ++/*int len; the length of the buffer */ ++/*unsigned short *retbuf; a buffer for return values */ ++/*int *retbuflen; the length of retbuf */ + { + static short bufcont[7]; /* the buffer contents while we're */ + /* working on things */ +diff -ru a/pgdispd/resdb.c b/pgdispd/resdb.c +--- a/pgdispd/resdb.c 2024-05-14 13:23:54.984716132 +0400 ++++ b/pgdispd/resdb.c 2024-05-14 13:29:59.091528701 +0400 +@@ -371,7 +371,7 @@ + char *strtype[20]; + XrmValue value; + int flags; +- char resource[80]; ++ char resource[180]; + + (void)sprintf(resource, "%s.bm.geometry", prog); + if (XrmGetResource(resdb, resource, "*Geometry", strtype, &value) +diff -ru a/pgdispd/returnbuf.c b/pgdispd/returnbuf.c +--- a/pgdispd/returnbuf.c 2024-05-14 13:23:54.985716126 +0400 ++++ b/pgdispd/returnbuf.c 2024-05-14 13:47:02.256903591 +0400 +@@ -15,10 +15,10 @@ + #include <X11/Xlib.h> + #include <X11/Xatom.h> + +-void returnbuf(msg,len,destwin) +-short *msg; /* the message to send to the client. */ +-int len; /* The length of the message. */ +-Window destwin; /* The window who's atom should be changed. */ ++void returnbuf(short *msg, int len, Window destwin) ++/*short *msg; the message to send to the client. */ ++/*int len; The length of the message. */ ++/*Window destwin; The window who's atom should be changed. */ + { + /* If the window is still around, then send the reply */ + if (selset) XChangeProperty(display,destwin,selatom,XA_STRING,8, +diff -ru a/pgdispd/updatelgtitle.c b/pgdispd/updatelgtitle.c +--- a/pgdispd/updatelgtitle.c 2024-05-14 13:23:54.985716126 +0400 ++++ b/pgdispd/updatelgtitle.c 2024-05-14 13:42:06.519900960 +0400 +@@ -15,6 +15,7 @@ + #include "globals.h" + #include <X11/Xlib.h> + #include <string.h> ++#include <stdio.h> + + void updatelgtitle(x,y) + int x,y; /* cursor position */ +@@ -28,7 +29,7 @@ + int i; + + #ifndef _AIX +- char *sprintf(); ++// char *sprintf(); + #endif + + /* make sure we don't confuse anything. */ +diff -ru a/pgdispd/waitevent.c b/pgdispd/waitevent.c +--- a/pgdispd/waitevent.c 2024-05-14 13:23:54.985716126 +0400 ++++ b/pgdispd/waitevent.c 2024-05-14 13:47:12.777832534 +0400 +@@ -63,6 +63,9 @@ + #define SELECT /* Use the select call to wait */ + #endif + ++extern int proccom(unsigned short *buf, int len, unsigned short *retbuf, int *retbuflen); ++void returnbuf(short *msg, int len, Window destwin); ++ + int waitevent() + { + short retbuf; diff --git a/sci-libs/pgplot/pgplot-5.2.2-r9.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r9.ebuild new file mode 100644 index 000000000000..97679c1a25dd --- /dev/null +++ b/sci-libs/pgplot/pgplot-5.2.2-r9.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fortran-2 flag-o-matic toolchain-funcs + +MY_P="${PN}${PV//.}" + +DESCRIPTION="FORTRAN/C device-independent scientific graphic library" +HOMEPAGE="https://www.astro.caltech.edu/~tjp/pgplot/" +SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="free-noncomm" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc motif static-libs tk" + +RDEPEND=" + media-libs/libpng:= + x11-libs/libX11:= + x11-libs/libXt:= + motif? ( x11-libs/motif:= ) + tk? ( dev-lang/tk:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( virtual/latex-base ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-drivers.patch + "${FILESDIR}"/${PN}-makemake.patch + "${FILESDIR}"/${PN}-compile-setup.patch + "${FILESDIR}"/${PN}-headers.patch + "${FILESDIR}"/${PN}-libpng15.patch + "${FILESDIR}"/${PN}-tk86.patch + "${FILESDIR}"/${PN}-C99.patch +) + +src_prepare() { + default + + # fix pointers for 64 bits + if use amd64 || use ia64; then + sed -e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \ + -i drivers/{gi,pp,wd}driv.f || die "sed 64bits failed" + fi + + cp sys_linux/g77_gcc.conf local.conf + + sed -e "s:FCOMPL=.*:FCOMPL=\"$(tc-getFC)\":g" \ + -e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \ + -i local.conf || die "sed flags failed" + + if [[ "$(tc-getFC)" = if* ]]; then + sed -e 's/-Wall//g' \ + -e 's/TK_LIBS="/TK_LIBS="-nofor-main /' \ + -i local.conf || die "sed drivers failed" + fi + + sed -e "s:/usr/local/pgplot:${EPREFIX}/usr/$(get_libdir)/pgplot:g" \ + -e "s:/usr/local/bin:${EPREFIX}/usr/bin:g" \ + -i src/grgfil.f makehtml maketex || die "sed path failed" + + use motif && sed -i -e '/XMDRIV/s/!//' drivers.list + use tk && sed -i -e '/TKDRIV/s/!//' drivers.list +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862918 + # + # Upstream contact method is email. I have sent one. + filter-lto + + # GCC 10 workaround + # bug #722190 + append-fflags $(test-flags-FC -fallow-argument-mismatch) + + ./makemake . linux + # post makefile creation prefix hack + sed -i -e "s|/usr|${EPREFIX}/usr|g" makefile || die +} + +src_compile() { + emake \ + CFLAGS="${CFLAGS} -fPIC" \ + FFLAGS="${FFLAGS} -fPIC" \ + shared cpg-shared pgxwin_server pgdisp pgplot.doc + + use tk && emake CFLAGS="${CFLAGS} -fPIC" libtkpgplot.so + use motif && emake CFLAGS="${CFLAGS} -fPIC" libXmPgplot.so + + emake -j1 clean + use static-libs && emake all cpg + + if use doc; then + export VARTEXFONTS="${T}/fonts" + emake pgplot.html pgplot-routines.tex + pdflatex pgplot-routines.tex + pdflatex pgplot-routines.tex + fi + + # this just cleans out not needed files + emake -j1 clean +} + +src_test() { + # i can go to 16 + local i j + for i in 1 2 3; do + emake pgdemo${i} + # j can also be LATEX CPS... + for j in NULL PNG PS CPS LATEX; do + local testexe=./test_${j}_${i} + echo "LD_LIBRARY_PATH=. ./pgdemo${i} <<EOF" > ${testexe} + echo "/${j}" >> ${testexe} + echo "EOF" >> ${testexe} + sh ${testexe} || die "test ${i} failed" + done + done +} + +src_install() { + insinto /usr/$(get_libdir)/pgplot + doins grfont.dat grexec.f *.inc rgb.txt + echo "PGPLOT_FONT=${EPREFIX}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot + doenvd 99pgplot + + dolib.so libpgplot.so* + dobin pgxwin_server pgdisp + + # C binding + insinto /usr/include + doins cpgplot.h + dolib.so libcpgplot.so* + + if use motif; then + insinto /usr/include + doins XmPgplot.h + dolib.so libXmPgplot.so* + fi + + if use tk; then + insinto /usr/include + doins tkpgplot.h + dolib.so libtkpgplot.so* + fi + + use static-libs && dolib.a lib*pgplot.a + + # minimal doc + dodoc aaaread.me pgplot.doc + newdoc pgdispd/aaaread.me pgdispd.txt + + if use doc; then + dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc pgplot.html + dodoc pgplot-routines.pdf pgplot-routines.tex + docinto examples + dodoc -r examples/. cpg/cpgdemo.c + docompress -x /usr/share/doc/${PF}/examples + dodoc -r applications + docompress -x /usr/share/doc/${PF}/applications + if use motif; then + docinto pgm + dodoc -r pgmf/. drivers/xmotif/pgmdemo.c + docompress -x /usr/share/doc/${PF}/pgm + fi + if use tk; then + docinto pgtk + dodoc drivers/xtk/pgtkdemo.* + docompress -x /usr/share/doc/${PF}/pgtk + fi + fi +} diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest index 48c2ebf3735a..5a75e6c459e2 100644 --- a/sci-libs/punc/Manifest +++ b/sci-libs/punc/Manifest @@ -1,5 +1,6 @@ AUX 1.4-doc.patch 534 BLAKE2B b4b41b83913efb5e92eeb6c92d4db04129e795a17c5749d8b031452a4808d72c66f90b7499e13a795e386c315e9f717f88540987b262c22efac52318261a83ec SHA512 388855f15bd17f5bc42ea3dc1d76d338a5586ed6cdb005442d46d158d36a1ffd32c2b08f10f992de30c44c1f160c005ef7499b6c2a629a0e7fab93f59d15bf65 AUX 1.5-linking.patch 6247 BLAKE2B a50a4bc8a7c28f3e140ba8d241fcc9d9bf02becf13dd3ef50fbf6e06af3444c5135309d9f4026826b228a62fb531d4f62bb9b8ebddd4df43233b56f41bfd3a53 SHA512 d7b8f8f99a2d26cb3e0cace7f31c72eff997786fcdca4a80e81493f7e255df0975743870543881348814d777507a96f328bacb1115fdc118c848a3a0be4c833f +AUX punc-1.5-explicit-main.patch 352 BLAKE2B c7ae372e7040f39dcee79484d852d82adc5d099a3a09ed2203eb9cedbe9e8225ff9f7f5d19f3ddbcb79775986907e32aedc3f194c08575b0548c22afcc3cfeee SHA512 5676dd877ae674213f877396bb9fe0d62a149ae592bbb8b517c6d1d0d645b092fe50b80879b4dac65fd4760064ee59ef2aa50b392aa192cb051351d919b16d42 DIST punc-1.5.tar.gz 7036275 BLAKE2B aa87b824c3426b5573cf1c40575901cea079e4c244565015b39b52adff74424e49086146cd518acb54594545650340a32a0c8438c9add28c5737253d49091093 SHA512 8b454f5de9cd01e87a30083f975ce8901c5d5a2cac7256cb535c8698221ce6d1ddb93a3663b2e903e5cae93ef76b48932ff7f13a816ba7da6bb07ea25490503b -EBUILD punc-1.5.ebuild 2092 BLAKE2B b576a713943afff1a8f52e36d94e7b301277cae02aa60b6dabbfaba19719a5925196d61a7add8f36ef9ad83aab9de18ce5a60fa31f328ea0cf3a535fede9e242 SHA512 1632ceebd6fb4ed8e6fd89755f3c34bca5cd245ebb718c065371eef0918fda292f235bbeab7078b123c953e0689e3aec7e1505261500e3840a7e4497134ce810 +EBUILD punc-1.5-r1.ebuild 2132 BLAKE2B 2a2ebeaa7e6e82eb42d80b6c8859519760d4ddc43adf7bc942d0537a4093e4f0546541d1655035697507f523ca3bcb6a6da94d985bf578c00e1f394597548679 SHA512 0633afff1759ef25ccfbff01719bec598d19c5a0efa058605f92b1ecfa31352db23dd4d11a5d552dfbce6c2ee3abdd6560e4e76222573c3f24539298062ea538 MISC metadata.xml 1313 BLAKE2B c805f8af184fd77b98dfd0c6339cd89cb59e29e6f0e75fac6a5c48300a557d614882584fef379f5a8c03661b43df69329fc9c34b8a862b4b8cd884327de66716 SHA512 25ce2843f1c6f8f11a38fb2b6060bdc51e2eae7f7a577dcea24e5f2f2aa11332e7ae6fa16a00ada33ac72e1ac7f630574cc825d4d0a981a05f88c4486aea8d6a diff --git a/sci-libs/punc/files/punc-1.5-explicit-main.patch b/sci-libs/punc/files/punc-1.5-explicit-main.patch new file mode 100644 index 000000000000..f952d18c3ab1 --- /dev/null +++ b/sci-libs/punc/files/punc-1.5-explicit-main.patch @@ -0,0 +1,16 @@ +Return type of functions must be explicit, C99 +https://bugs.gentoo.org/886461 +--- a/src/vf2c/main.c ++++ b/src/vf2c/main.c +@@ -110,9 +110,9 @@ + #endif + + #ifdef KR_headers +-main(argc, argv) int argc; char **argv; ++int main(argc, argv) int argc; char **argv; + #else +-main(int argc, char **argv) ++int main(int argc, char **argv) + #endif + { + xargc = argc; diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5-r1.ebuild index 0577c9eef733..cec749996b82 100644 --- a/sci-libs/punc/punc-1.5.ebuild +++ b/sci-libs/punc/punc-1.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools fortran-2 toolchain-funcs @@ -37,6 +37,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PV}-linking.patch "${FILESDIR}"/1.4-doc.patch + "${FILESDIR}"/${P}-explicit-main.patch ) src_prepare() { diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 3222de0be27b..0329ef2247aa 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -6,10 +6,11 @@ AUX pytorch-2.4.0-global-dlopen.patch 887 BLAKE2B 044e7708619070f93b1157a0c4e560 AUX pytorch-2.4.0-torch_shm_manager.patch 367 BLAKE2B f03c002cbd50fb959dfc3ccf89cb8aa9fe6e001ff2cb47bee45cde28cac262e20df1d06f396776ce069f0a9e92cd370c96788db0aa5d1b9d9f3bc1832701502a SHA512 94f095908385b3058863d05a78a0e243f8614bbde406d457e50bdba574a8e1911b77790a0806f705644dc0c0ae235888314ea4a31aed7c0eb8ddfb29ff42636e AUX pytorch-2.5.1-dontbuildagain.patch 420 BLAKE2B 42935902e5cb98d5d013fd4e409107c7fa95b91a09ee34723b67dbee37eed4575bb008de0aaab4d00b36bb19d87b4d6855829498fe5b7de95e47b4d536edc71c SHA512 e78b572110ff62d7d90ecd8dfb3f9f6a72c05e5190991ee8084107bbe11f0fe4f85d6fa440b2b4d3ce5e2611685e6e6f35d4fb026eef43131e3e4e60dba53bcf AUX pytorch-2.5.1-setup.patch 437 BLAKE2B 4107ad2dfde10b25e7422f65c7f87833bb662958eb3fca3ac0c1a5c2e203f7186c31142ac6cdf2a10009a95408e45caaa09fd85a5cc35ee6c9106f8c630a8beb SHA512 a51b3840763f960c1c63df0181c2d35747697a57e11bb08681acf21af06b64d2fca45f6bb3647034d20860e497cab53cec9bd2b5719c5c5aab7bf01080da9103 -DIST pytorch-2.4.0.tar.gz 115031093 BLAKE2B d206477963977011627df284efa01482fbf57e9fcb5f58f51d679c742b8e5dde6aa6affd8745ab817fcd09477d129a81e74e07be576b5d3585eaca1c735b8e01 SHA512 804d25944035f33de6591fd942fbda44d3de037717a4397d38a97474b01775d30eaf93d16dd708a832c0119050d24d73b90990fd3e3773be79d26ada25244d22 +AUX pytorch-2.6.0-dontbuildagain.patch 757 BLAKE2B 2de63f16f26bdf2df95fc040ab1d69cb2026a1785f37be6be75744c7cb8d62e59552b18598fe740c1551415b1bf915ab57e0d0cb7791ede86541a1cc68305dfc SHA512 0f072dc1b7b568d1c3a6e3fea5a9566bebfc113a32a51fa25ce3aee35f8ff77f8a8a7681dd7ebb121136b55605c52592439c9b2d1ccc0ded241deacefe33940b DIST pytorch-2.4.1.tar.gz 115029469 BLAKE2B c2909ff27d527bc57cba56b780d3b8cd07a043ab045caa6c6b27857a16f9ad10aaab2116b26226b1e46ee08ffb44007965d914464418e4ae14ca48c3f3f383bb SHA512 7e9b4485e242eaf0d648765c6621d73d95e7107b766646a098175436d1ab2e2b864badd0757a3bab6b7c318233f2120bad9ac07b39bb9e357897919580c87631 DIST pytorch-2.5.1.tar.gz 116091366 BLAKE2B 7838b17562b94ffc7d798031348689db607dd5eae2a3c35be365972e2b52a2c1b12067068d5aca5ab00cf0977d9c2c3c9ae5337d69534c864c732e6256cbeef6 SHA512 a913a466324a65fa3d79c5e9ad4d605fc7976f0134fda2f81aaa3cea29d56926604999b8a238759646d211e63b47bbb446cdffa86ca8defd8159f11e30301289 -EBUILD pytorch-2.4.0.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c +DIST pytorch-2.6.0.tar.gz 119594438 BLAKE2B 3152eb341cf42295e147e59625beb9c06608aa4b78f9618c1c0024b10c1c767715d07fe8c4be52d029ac47f808cd0d5e65c9530ec90d951a64b993083b4067ad SHA512 a70da80ff09d226085e18228132cf6bb236ad8cc47eed52375d0d2a615f09dd33849da947270b5670c184eab60cb8e2adf11d801babfbda7aa621400501d07b0 EBUILD pytorch-2.4.1.ebuild 1616 BLAKE2B 6d2b4012e2ee45eff08e7d38cd6f8177b94ae556337cde21fe5352aca2bbfeecda582159f45bb947d96775468aed2617eaf28cdc4d42e0e0d2cb2c662dbe70ed SHA512 a0ea63813cac1cdc2d23f99982574786417b8f9a829f7166be2b33eb9b2f7dcb20a174ca2a70bc7e887d415efea361a7491c1642b3bbeb68446a8cbee4ed4a1c EBUILD pytorch-2.5.1-r1.ebuild 1484 BLAKE2B c7a2ffa0e2da094a4563aff1017b6a30ad2255a660ca7e6a52e7b4ab0265376507f569babaa0dec4af45cc7658f1fcfdaeda82fba4cb63ed6ef1e42627acc5ce SHA512 69b7f6ee48639a45b4662a9f315f168aa2994085e997c710d1a89a79e8055d77e388d2b7339c30bae14bc27c46433c5df85fcc624eabaa6fb53617125a695e91 -MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 +EBUILD pytorch-2.6.0.ebuild 1445 BLAKE2B 667667dbe58341c6378b0e4c2f1299dcbeed89bc0ac69a93f923468f7d7b3b9971ea4ddd88c93c8a670c551bf930fc911ecd367b9e9e01119ca607026e20e2ba SHA512 361281ee20731e7281ec4aa9a49597a5f84d6d4908dd1de622ca40e78945095bc9622a96fa83eebc76e9e9ec96cbf9ebbc3cba4bb4cc5b6b02667f3c13fc968e +MISC metadata.xml 516 BLAKE2B 91217d92fb2a588197740116e4d60d2429c1e4dc21845605bcaba4f6f5c941d27024175eae9cbd3dd89deb30496fb3d56f2a771f115887548e4a81b1947837d4 SHA512 85e43fc8be4da3677d1bfadaaeb8d23a17277fa4a684e89f5d8da0279f6b2d9744716ca82d7fe5e070b163de4d153e4d0c433b2d5ef9b609b7b9b53d57e32906 diff --git a/sci-libs/pytorch/files/pytorch-2.6.0-dontbuildagain.patch b/sci-libs/pytorch/files/pytorch-2.6.0-dontbuildagain.patch new file mode 100644 index 000000000000..75a386ce2969 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-2.6.0-dontbuildagain.patch @@ -0,0 +1,25 @@ +--- a/setup.py ++++ b/setup.py +@@ -256,6 +256,7 @@ + import setuptools.command.sdist + from setuptools import Extension, find_packages, setup + from setuptools.dist import Distribution ++sys.path[:0] = os.getcwd() + from tools.build_pytorch_libs import build_pytorch + from tools.generate_torch_version import get_torch_version + from tools.setup_helpers.cmake import CMake +@@ -483,14 +483,6 @@ + check_submodules() + check_pydep("yaml", "pyyaml") + build_python = not BUILD_LIBTORCH_WHL +- build_pytorch( +- version=version, +- cmake_python_library=cmake_python_library, +- build_python=build_python, +- rerun_cmake=RERUN_CMAKE, +- cmake_only=CMAKE_ONLY, +- cmake=cmake, +- ) + + if CMAKE_ONLY: + report( diff --git a/sci-libs/pytorch/metadata.xml b/sci-libs/pytorch/metadata.xml index d12749aa5c21..eea3cea19850 100644 --- a/sci-libs/pytorch/metadata.xml +++ b/sci-libs/pytorch/metadata.xml @@ -6,6 +6,9 @@ <name>Tupone Alfredo</name> </maintainer> <upstream> + <bugs-to>https://github.com/pytorch/pytorch/issues</bugs-to> + <changelog>https://github.com/pytorch/pytorch/releases</changelog> + <doc>https://pytorch.org/docs/stable/index.html</doc> <remote-id type="github">pytorch/pytorch</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/pytorch/pytorch-2.4.0.ebuild b/sci-libs/pytorch/pytorch-2.6.0.ebuild index 31e3b0439a9d..9cb0e5814c84 100644 --- a/sci-libs/pytorch/pytorch-2.4.0.ebuild +++ b/sci-libs/pytorch/pytorch-2.6.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2024 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_EXT=1 inherit distutils-r1 prefix @@ -23,6 +23,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE} RDEPEND=" ${PYTHON_DEPS} ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] + >=sci-libs/caffe2-2.5.1-r5 $(python_gen_cond_dep ' dev-python/typing-extensions[${PYTHON_USEDEP}] dev-python/sympy[${PYTHON_USEDEP}] @@ -35,13 +36,7 @@ DEPEND="${RDEPEND} " src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-2.4.0-dontbuildagain.patch \ - "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ - "${FILESDIR}"/${PN}-2.4.0-global-dlopen.patch \ - "${FILESDIR}"/pytorch-2.4.0-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - "${FILESDIR}"/${PN}-2.2.1-emptyso.patch \ + eapply "${FILESDIR}"/${P}-dontbuildagain.patch # Set build dir for pytorch's setup sed -i \ @@ -50,6 +45,9 @@ src_prepare() { || die distutils-r1_src_prepare + # Get object file from caffe2 + cp /var/lib/caffe2/functorch.so functorch/functorch.so || die + hprefixify tools/setup_helpers/env.py } diff --git a/sci-libs/qfits/Manifest b/sci-libs/qfits/Manifest index 6d4cb9e2fa5d..b55c46946e41 100644 --- a/sci-libs/qfits/Manifest +++ b/sci-libs/qfits/Manifest @@ -1,5 +1,7 @@ +AUX qfits-6.2.0-includes.patch 834 BLAKE2B a72dbd038c9f753b98d7bde23b8eceffd80e2bc639bb618fb0200a0c4559ee2afb2e9bb219d37cecf93b3cce5d4562c4ea77bfed76ca85bbbf7e7bb2d70f2d6b SHA512 260b1b68e02142dc490e11d1c66e3c0876df3c331f5a5ad799fd984456c6eda56b4265be899f20cfff404d84ad770843c7c1947aeb8cb59cafc787015bca8151 +AUX qfits-6.2.0-m4.patch 725 BLAKE2B 66950bbfda444e58bab84197443c9746f71e75251f73b24d76c8ba023f4c5b1a4abc997c3416e2a6016a70bd6e403d5bee4a37f7dfb1f523517fc91e180d44f6 SHA512 77f001a3e45d8d85abed5c7933cfba9157fbb3f7530e905c1f581a58b90bf8492ccc4d1f2be42f836d67dba2697a7c8ff41a3292deffc2ce87e622bb61b97047 AUX qfits-6.2.0-open.patch 512 BLAKE2B a3701d2a9f8d6cbee3d5d9e95b281068b29b2d2f327140086830462a89cb657b00fd1a6e57fd5b593ada0788ba398cfda1fbdd15c9bf302fe84d6b7e09d32e14 SHA512 83bb2d96725e62fd1f593cd38f86d7c4dba2248b34d9eeecb6af11d41b20fde2a5b0bf22e3b64001d9d473b0344120f3df604982ab7d998c37c08771f17309b5 AUX qfits-6.2.0-ttest.patch 304 BLAKE2B a5cebbd782f1d8fd9090a20f51a52fd756509b479ec199c1efea734e557eae5994515ab003ac920dde1781ee98afff0cb25ed0eb91a92e8821d269e1e9188c8d SHA512 dde0bfbe7aef8ec381ec57b4fdae5419c9ad23ec20d90ee795bf5cc124abf3e6e936f7069d3cc56ff86b766425c2a94304048263310fcf3f7c84415638e073f8 DIST qfits-6.2.0.tar.gz 475191 BLAKE2B fea94bf77b07e5fbc9493f4bafbf37387b4f9ae83212ffc5a6c0607cad972a592e3937ba042ee94f053f30fd05cbafb8fcbcf2df1c4cd6ee4d2422bf108d9395 SHA512 a0f6863a9e5b26d08de487cfdf468b3d04218a36a01cd9df8b786b1cdf2ffa61acf12b087f4fbd751ba023f02b5a32410949a4ee08432108a7129a283ab3d824 -EBUILD qfits-6.2.0.ebuild 596 BLAKE2B 90ec42dfc65cdc7352b05d357ac0974ebbc0283b35bc07dbd883ffd0f0c92b1bed80a3b017a54341e5d6710a16eee8ac8a25c7a653e9c196a21c820004c8a0ed SHA512 4ca8e8669e922ebf91bd1a4fa1295bf33abec479e050211531af77c969574ec4dacd7f51b0743d5d7e651acbe72c521db6f160168a13956d6a9c5b2f772da41e +EBUILD qfits-6.2.0-r1.ebuild 744 BLAKE2B 06a83bb880abbe28a4eb72e3f48dda87a503c46eb0155be7d49a162e06810bac1823c1ae14fd3c00f8c8724f9cc86fb28b0977dd6b8c548cc118b2d54f1bc6eb SHA512 25fcb91cb89427d0e48f5e4d028d612e5e6423e82ee85ab68fcfd4e3f163146d2361c3a2b40c14fff5c4333aa9597a33ff19d433d8c8d5ae5120c58ab413ac37 MISC metadata.xml 852 BLAKE2B 8845945452ba7410e80bc386662acfdf3dc2fa5ff512f22964efdccb3b10207f0276c781a4ee81fccedd60fcc995049a7ff3010fd53e8b5f3c14508b1b57ae46 SHA512 8dff179d349cb4f91e2b1292b8830071a22d3611fa8800be6ff015a4750277587153a19213fe458e2b7b6632ef60b06c9e00ff782d955ae7ab04b279cd0a9e7c diff --git a/sci-libs/qfits/files/qfits-6.2.0-includes.patch b/sci-libs/qfits/files/qfits-6.2.0-includes.patch new file mode 100644 index 000000000000..7589b49301a1 --- /dev/null +++ b/sci-libs/qfits/files/qfits-6.2.0-includes.patch @@ -0,0 +1,32 @@ +Missing includes in main library and in tests +https://bugs.gentoo.org/886463 +--- a/main/dtfits.c ++++ b/main/dtfits.c +@@ -33,6 +33,7 @@ + #include <string.h> + + #include "qfits_table.h" ++#include "qfits_tools.h" + + /*----------------------------------------------------------------------------- + Define +--- a/main/qextract.c ++++ b/main/qextract.c +@@ -32,6 +32,7 @@ + #include "qfits_table.h" + #include "qfits_image.h" + #include "qfits_rw.h" ++#include "qfits_tools.h" + + /*----------------------------------------------------------------------------- + Function prototypes +--- a/test/test_pixio.c ++++ b/test/test_pixio.c +@@ -41,6 +41,7 @@ + + #include "qfits_header.h" + #include "qfits_image.h" ++#include "qfits_rw.h" + #include "qfits_md5.h" + #include "qfits_memory.h" + diff --git a/sci-libs/qfits/files/qfits-6.2.0-m4.patch b/sci-libs/qfits/files/qfits-6.2.0-m4.patch new file mode 100644 index 000000000000..99b39bdad451 --- /dev/null +++ b/sci-libs/qfits/files/qfits-6.2.0-m4.patch @@ -0,0 +1,36 @@ +Missing system inlude in self-defined autoconf tests +https://bugs.gentoo.org/908483 +--- a/m4macros/eso.m4 ++++ b/m4macros/eso.m4 +@@ -252,6 +252,7 @@ + AC_RUN_IFELSE([ + #include <stdio.h> + #include <stdarg.h> ++#include <stdlib.h> + + int + doit(char * s, ...) +@@ -701,6 +702,7 @@ + [ + AC_RUN_IFELSE([ + #include <stdarg.h> ++#include <stdlib.h> + + void f(int i, ...) + { +@@ -733,6 +735,7 @@ + [ + AC_RUN_IFELSE([ + #include <stdarg.h> ++#include <stdlib.h> + + void f(int i, ...) + { +@@ -784,6 +787,7 @@ + [ + AC_RUN_IFELSE([ + #include <stdarg.h> ++#include <stdlib.h> + + void f(int i, ...) + { diff --git a/sci-libs/qfits/qfits-6.2.0.ebuild b/sci-libs/qfits/qfits-6.2.0-r1.ebuild index 181c4777ba8a..99af0c8cacb7 100644 --- a/sci-libs/qfits/qfits-6.2.0.ebuild +++ b/sci-libs/qfits/qfits-6.2.0-r1.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="ESO stand-alone C library offering easy access to FITS files" -HOMEPAGE="http://www.eso.org/projects/aot/qfits/" +HOMEPAGE="https://www.eso.org/sci/software/eclipse/qfits/" SRC_URI="ftp://ftp.hq.eso.org/pub/${PN}/${P}.tar.gz" LICENSE="GPL-2" @@ -12,10 +14,18 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc" -PATCHES=( "${FILESDIR}"/${P}-{ttest,open}.patch ) +PATCHES=( + "${FILESDIR}/${P}-ttest.patch" + "${FILESDIR}/${P}-open.patch" + "${FILESDIR}/${P}-includes.patch" + "${FILESDIR}/${P}-m4.patch" +) + +src_prepare() { + default -src_configure() { - econf --disable-static + # https://bugs.gentoo.org/908483 + eautoreconf } src_install() { diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index b19675890869..1f8d84b395b5 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -1,25 +1,16 @@ -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 -EBUILD rocBLAS-5.1.3-r4.ebuild 3060 BLAKE2B fc5dba7b188129cc7c1c7fc07737d96ac86bc6aa2dc86779cceca028d31f0177592dba7698850a504451a253421511a445498a0df4654b12e60ab895b2efeadd SHA512 f6eba78811b8d581a7a4417a1ab637824012b5a30b5c76c6ec5a504d759691d432c53e15ede8ba5edc729a2a8863e86b819aa472589e146e8841c605ff138ba3 -EBUILD rocBLAS-5.4.2-r3.ebuild 2699 BLAKE2B a1b5134614e21bb3741530843d17d6016a1629ac9008908004b7743e2c9ff08509ba016db06a127a82679e3864d3e3cb12f1e2808e2edb2223c8993c10cc85d3 SHA512 9208a43e7ec94d9b2dcd61202695f3a78ec89d1062e64500f664a322c3b11e8fadb6e30ec5063012029b28ded5abc819dcd72b0d2b30781cca8b4d0d1897f880 +DIST rocm-rocBLAS-6.3.2.tar.gz 57909504 BLAKE2B 0ed000a10c9e71465f83fb9abdb9a745c82bf32552e3d86c61bf0c802f3728f7fd4c47fbf677d01aa35c457dc5281c916ca80fdc033b2752afd6733aefa4653f SHA512 ecfb6c68b0a44ddae0e4e6cf5c41c0c33a9685c590004ffe48fdb163bd059d534181d3faed2a23142078c5f621b1955c91725357c3e8e0f9307b139b19af46fd +DIST rocm-rocBLAS-6.3.3.tar.gz 57909385 BLAKE2B a51274e2895419cc517ac24a0235c90f3b2551945b6936789abc78a08c8dde151de6d853d6378a702138227604af4cc185bde3acb5bf8999e09699d293bb2b85 SHA512 fcc8718e0c3dde8715f758e83f3a1ca45dde88ac56680e7723e2041dd3c1d7b9f575b1686552d04e7ef12b57188164c8abb5a6e4c568ade03d534edc30846c9e 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 +EBUILD rocBLAS-6.3.2.ebuild 3153 BLAKE2B 3660826d5d9482c37b2fecf25cf63b53c62f6ee77e088e7230a6d014adb9a1df05bd5052449226a13fdf4a8bc057d544a3937ba764616618def5dd771b9dd498 SHA512 1a1dbf60a04e708fc27311efa893175e1c42965920fd037ed1c5e461cd221291e841c2141e51ba6534adcb5955ee800015605717d26084c899ba322ea5b68514 +EBUILD rocBLAS-6.3.3.ebuild 3153 BLAKE2B 3660826d5d9482c37b2fecf25cf63b53c62f6ee77e088e7230a6d014adb9a1df05bd5052449226a13fdf4a8bc057d544a3937ba764616618def5dd771b9dd498 SHA512 1a1dbf60a04e708fc27311efa893175e1c42965920fd037ed1c5e461cd221291e841c2141e51ba6534adcb5955ee800015605717d26084c899ba322ea5b68514 MISC metadata.xml 951 BLAKE2B 932f1bf013b1a322d19013e6f60905b9b9923650d2feaeb7d907fb6a5a95feba90ad62da496fb09965afd43d972d695158fe3f0a6d7377fab53db8cfa7a8e45d SHA512 0c7cbdeb1325718901040d76cc8b80640d849b7fe647c6f5168e86a42d7e571f0d272dc24d987bf2ca11d62b8f5a6093c833d33da121bc82ea12a3dedc7f19e9 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/rocBLAS/rocBLAS-6.3.0.ebuild b/sci-libs/rocBLAS/rocBLAS-6.3.2.ebuild index f35ee735d2fb..f35ee735d2fb 100644 --- a/sci-libs/rocBLAS/rocBLAS-6.3.0.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-6.3.2.ebuild diff --git a/sci-libs/rocBLAS/rocBLAS-6.3.3.ebuild b/sci-libs/rocBLAS/rocBLAS-6.3.3.ebuild new file mode 100644 index 000000000000..f35ee735d2fb --- /dev/null +++ b/sci-libs/rocBLAS/rocBLAS-6.3.3.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DIR="docs/.doxygen" +DOCS_DEPEND="media-gfx/graphviz" +LLVM_COMPAT=( 19 ) +ROCM_VERSION=${PV} + +inherit cmake docs edo flag-o-matic multiprocessing rocm llvm-r1 + +DESCRIPTION="AMD's library for BLAS on ROCm" +HOMEPAGE="https://github.com/ROCm/rocBLAS" +SRC_URI="https://github.com/ROCm/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark hipblaslt test video_cards_amdgpu" +RESTRICT="!test? ( test )" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +BDEPEND=" + >=dev-build/rocm-cmake-5.3 + video_cards_amdgpu? ( + dev-util/Tensile:${SLOT} + ) + hipblaslt? ( sci-libs/hipBLASLt:${SLOT} ) + test? ( dev-cpp/gtest ) +" + +DEPEND=" + >=dev-cpp/msgpack-cxx-6.0.0 + dev-util/hip:${SLOT} + 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-add-missing-header.patch + "${FILESDIR}"/${PN}-5.4.2-link-cblas.patch + "${FILESDIR}"/${PN}-6.0.2-expand-isa-compatibility.patch + "${FILESDIR}"/${PN}-6.3.0-no-git.patch + "${FILESDIR}"/${PN}-6.3.0-find-cblas.patch +) + +src_prepare() { + cmake_src_prepare + sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die +} + +src_configure() { + rocm_use_hipcc + + # too many warnings + append-cxxflags -Wno-explicit-specialization-storage-class + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_WITH_TENSILE="$(usex video_cards_amdgpu)" + -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_CLIENTS_TESTS="$(usex test ON OFF)" + -DBUILD_CLIENTS_BENCHMARKS="$(usex benchmark ON OFF)" + -DBUILD_WITH_PIP=OFF + -DBUILD_WITH_HIPBLASLT="$(usex hipblaslt ON OFF)" + -DLINK_BLIS=OFF + -Wno-dev + ) + + if usex video_cards_amdgpu; then + mycmakeargs+=( + -DTensile_LOGIC="asm_full" + -DTensile_COMPILER="hipcc" + -DTensile_LIBRARY_FORMAT="msgpack" + -DTensile_CODE_OBJECT_VERSION="default" + -DTensile_ROOT="${EPREFIX}/usr/share/Tensile" + -DTensile_CPU_THREADS="$(makeopts_jobs)" + ) + fi + + 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" + + # `--gtest_filter=*quick*:*pre_checkin*-*known_bug*` is >1h on 7900XTX + edob ./rocblas-test --yaml rocblas_smoke.yaml +} + +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 + + # Stop llvm-strip from removing .strtab section from *.hsaco files, + # otherwise rocclr/elf/elf.cpp complains with "failed: null sections(STRTAB)" and crashes + dostrip -x "/usr/$(get_libdir)/rocblas/library/" +} diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index 7e1cb8e7b698..eef116366899 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -1,15 +1,11 @@ -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 -EBUILD rocFFT-5.1.3-r1.ebuild 3926 BLAKE2B ef9cf52ee86139887f87b96f02d28bcb80420af8d3538060596a51b3b8b7369eee5da63d90e8132935acf32cba06024840427cf2e5a2b7662388e75c1b1b4272 SHA512 3a34f05845f726fd6cb71d0315ee6338e1e381910a8dca2d6c655ae80e1ba3f1765a2313f2795be8eb737195fa23e2597bcda89a1e6db778cfddf35485462beb +DIST rocFFT-6.3.2.tar.gz 1385667 BLAKE2B 3415cca976b31534498b87b1bc800d96aa00c9c8b2665350323f03c47eff922ff3d0b46374af7cee5958572487c51432ef55ffe8c19c8b19e093c7ca7ec05961 SHA512 e58d00810c661ef640d4e33894b41847e69de150fbdf4cd72c14d44b9298a514df7e47bd52902482beb6fb52de6e7cd01e298dec756fec150de967049a370d33 +DIST rocFFT-6.3.3.tar.gz 1386087 BLAKE2B 239f42cbb6ddc2f275a9ea2e356cab1b62670ebea3ed0e660f36ed816703bef650cd6e1181d1bcc4403a379c432ea033a2ee90a308b885bf82f1a4616643c07d SHA512 76dcc4bbb6bca97a5b87f88f7b60badde31ee2ff3254d16e99c3d6c7fb9fb6c7eb5166edd50dfb0dada54f4dbdd2436a9e507c806118a05ec93cea480ac1e1c4 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 +EBUILD rocFFT-6.3.2.ebuild 3774 BLAKE2B 5dc6cba52c92afc16321ce3ede491a7aceb502a1228a9cf755be11fca6510a7d9330ef9f4e868f246608e0eec321ceba7467864f90a994bf064160093960e9de SHA512 789b6ad1e5ff3a95bdaf32c1aacbfd2495713e5b3c1af77459b5a0f36e1b2ae72601741e05bce8ecbca6f7fc10286bf2e62c4b841cc0365ecfd7b119d04e2ee1 +EBUILD rocFFT-6.3.3.ebuild 3774 BLAKE2B 5dc6cba52c92afc16321ce3ede491a7aceb502a1228a9cf755be11fca6510a7d9330ef9f4e868f246608e0eec321ceba7467864f90a994bf064160093960e9de SHA512 789b6ad1e5ff3a95bdaf32c1aacbfd2495713e5b3c1af77459b5a0f36e1b2ae72601741e05bce8ecbca6f7fc10286bf2e62c4b841cc0365ecfd7b119d04e2ee1 MISC metadata.xml 764 BLAKE2B 0490d64e75e9269408f31d4ac87f4845f01a306adf829d57d89401cab19c84412896f351c1dc9f6a918679447f1fe62a7fc958bff9c98f1990fe021f99b35e01 SHA512 0135bae193ac9439a86dca5e26a32366eae7b67175c955aace1a1d620f1df5176a3e3a302a5e6f1e6473777e5b51ab772aa67a01ba023e9c8bbb180352ae8e0b 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-6.3.0.ebuild b/sci-libs/rocFFT/rocFFT-6.3.2.ebuild index 474f33952068..474f33952068 100644 --- a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.3.2.ebuild diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-6.3.3.ebuild index 7b75953d510f..474f33952068 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.3.3.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..13} ) 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" +HOMEPAGE="https://github.com/ROCm/rocFFT" +SRC_URI="https://github.com/ROCm/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz" +S="${WORKDIR}/rocFFT-rocm-${PV}" LICENSE="MIT" -KEYWORDS="~amd64" SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" # RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask RDEPEND=" @@ -29,39 +30,48 @@ perfscripts? ( dev-python/pandas[${PYTHON_USEDEP}] ) ${PYTHON_DEPS}" -DEPEND="dev-util/hip - ${PYTHON_DEPS}" +DEPEND="=dev-util/hip-6* + ${PYTHON_DEPS} + benchmark? ( + dev-libs/boost + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) + test? ( + dev-cpp/gtest + dev-libs/boost + >=sci-libs/fftw-3 + llvm-runtimes/openmp + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) +" BDEPEND=" - test? ( dev-cpp/gtest dev-libs/boost - >=sci-libs/fftw-3 llvm-runtimes/openmp ) >=dev-build/cmake-3.22 dev-build/rocm-cmake + dev-db/sqlite " 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" ) + "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch + "${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.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} + # count how many archs user specified in ${AMDGPU_TARGETS} + local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) else - local NARCH=7 # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future. + # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future. + local NARCH=7 fi echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required fi @@ -78,21 +88,13 @@ pkg_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 + sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \ + -i perflib/pdf.py perflib/generators.py || die popd fi @@ -100,30 +102,27 @@ src_prepare() { } src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ + rocm_use_hipcc local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On + -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) + -DBUILD_CLIENTS_BENCH=$(usex benchmark ON OFF) + -DSQLITE_USE_SYSTEM_PACKAGE=ON + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF ) - CXX=hipcc cmake_src_configure + 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 + edob ./rocfft-test } src_install() { @@ -131,7 +130,14 @@ src_install() { if use benchmark; then cd "${BUILD_DIR}"/clients/staging || die - dobin *rider + dobin dyna-rocfft-bench rocfft-bench + dosym dyna-rocfft-bench /usr/bin/dyna-rocfft-rider + dosym rocfft-bench /usr/bin/dyna-rocfft-rider + + if ! use perfscripts; then + # prevent collision with dev-util/perf + rm -rf "${ED}"/usr/bin/perf || die + fi fi if use perfscripts; then diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest index 4fdd45b6c51a..24e784af0b46 100644 --- a/sci-libs/rocPRIM/Manifest +++ b/sci-libs/rocPRIM/Manifest @@ -2,12 +2,12 @@ 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 -EBUILD rocPRIM-5.1.3.ebuild 2012 BLAKE2B db384e213038bbe8dc5e925905b9637bf5dc14de1b59f1f574abcc0f46aebe876484c0b9704acd0bf447a01727e1a94b388de9989669f64569043bf46cfb6e5e SHA512 3cf65a5a20fcb5b90cc871e266df7d96e791c70f82c33f088349a5cf03a39f0b114972a7fbf25ce8df4d80fc47af379f8cc0bd0466d261a1acee79e4ca7b3dbe +DIST rocPRIM-6.3.2.tar.gz 745935 BLAKE2B 21ffbd746e51aa7ed7028be9eea1009757d7d92403999b35310f5c249d76e2dc793d754d2eeaf44e3d0da8aa00c5ca93dfa45ed2a654fd26f88510f422a7ea11 SHA512 e5c57d95cb25a498f9ef8c555dbf89f6be2d0088a04c8fdc470dd98f851ac15dde7ce0493719d544e7f911f3438e780b12aadc42f5d47e25723828149f6279e0 +DIST rocPRIM-6.3.3.tar.gz 745961 BLAKE2B 7ab15f623390de9052258717fa568b41c0f0dbe2e70c5c59089ad52bd00bdb44905a0f371dd71673af4b6f5d5ca21ab5bc6e41c04721e3b812f9543ad849c236 SHA512 5e216ff18d0a3eeb901f3ad4e8b74f9d8661a0bb943edea064529bdb973f3955e6791c415e492a89456eb0f19376f74528c3b348c4e32755a48e6b3f855a91e2 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 +EBUILD rocPRIM-6.3.2.ebuild 1773 BLAKE2B aadbf8399d3a1aba01ff2ad3d6f112f89bb07ee47e711645c8045fc3a1b5e7918c86c6c8f9cdf3f8f56fdeb4b3c574a223095400fc494ef355f26287c7e0fc4c SHA512 dc4a3fe2b522b6281ba53e70796df1f0dce771bacc0ea61c0908fbebbb4d913f9e05c33b7d1652e92323f04ca22ed877a37668a07929ca7e127b065f23a856d0 +EBUILD rocPRIM-6.3.3.ebuild 1773 BLAKE2B aadbf8399d3a1aba01ff2ad3d6f112f89bb07ee47e711645c8045fc3a1b5e7918c86c6c8f9cdf3f8f56fdeb4b3c574a223095400fc494ef355f26287c7e0fc4c SHA512 dc4a3fe2b522b6281ba53e70796df1f0dce771bacc0ea61c0908fbebbb4d913f9e05c33b7d1652e92323f04ca22ed877a37668a07929ca7e127b065f23a856d0 MISC metadata.xml 672 BLAKE2B 93644f07bd8f34b43e335ec631b69abdfee76bfe55fcccc9c33b772945e72870f4307803a121226d2d87aa55a07f31274f376a6d8a44a9f5996a861d21dc5c38 SHA512 e8f5caa76c96a1ef5affce0a29f07e12fc4a10057c77bbc9f53288fd886488fddde59a713be80fd72dbaa9656abb6d4851995a000e160398c09ed28000a53712 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/rocPRIM/rocPRIM-6.3.0.ebuild b/sci-libs/rocPRIM/rocPRIM-6.3.2.ebuild index cd561fb6b22d..5610ed3b3605 100644 --- a/sci-libs/rocPRIM/rocPRIM-6.3.0.ebuild +++ b/sci-libs/rocPRIM/rocPRIM-6.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/rocPRIM/rocPRIM-6.3.3.ebuild b/sci-libs/rocPRIM/rocPRIM-6.3.3.ebuild new file mode 100644 index 000000000000..5610ed3b3605 --- /dev/null +++ b/sci-libs/rocPRIM/rocPRIM-6.3.3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} +inherit cmake flag-o-matic rocm + +DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm" +HOMEPAGE="https://github.com/ROCm/rocPRIM" +SRC_URI="https://github.com/ROCm/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz" +S="${WORKDIR}/rocPRIM-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE=" + benchmark? ( ${ROCM_REQUIRED_USE} ) + test? ( ${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}" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.3.0-expand-isa-compatibility.patch + "${FILESDIR}"/${PN}-6.3.0-fix-clang-template.patch + "${FILESDIR}"/${PN}-6.3.0-fix-libcxx.patch +) + +src_prepare() { + # 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 + + cmake_src_prepare +} + +src_configure() { + rocm_use_hipcc + + # too many warnings in tests + append-cxxflags -Wno-explicit-specialization-storage-class -Wno-deprecated-declarations + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + ROCPRIM_USE_HMM="1" cmake_src_test -j1 +} diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest index f2d839a68719..bf6f28a8d43e 100644 --- a/sci-libs/rocRAND/Manifest +++ b/sci-libs/rocRAND/Manifest @@ -1,17 +1,12 @@ -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 -EBUILD rocRAND-5.1.3.ebuild 1983 BLAKE2B ea0f8aeebc7d7eaf8bbfe682ea1b4f52c789df5250b05cba6728db6af46c30f852d783c9c5254bde7f7eec36854ab857a18ab0d3536db50ebd0bc016bf82bbb6 SHA512 f4a139505f8b64ae36d912730ac40c78b14dee492cc75499536f8b0697bc3fdaa31c37efc1572faba02ff10952cef0f489a90a72904fc589cd71f5a222f2e2aa -EBUILD rocRAND-5.6.0-r1.ebuild 1381 BLAKE2B 398870e0a0a5d68eaccf173fca87e1d5086e8818e45b56a9811113e3d2038add46bf370af35771079928dfd0770575c74d79aeff92cc149eacf4dbf55ee67643 SHA512 a0d94616f9b63904aab41dbee8e73ba013a6e1e59a8be3526d7f48ec0c7b2463b7282c66f6ad1c0984ee254b9a13d39ae40ea9a272cf9f2213c1a0b5d680a586 +DIST rocRAND-6.3.2.tar.gz 44906513 BLAKE2B fba5f0dcc1a6fb5636ffb1c9a13f0d03d908d99c277c783ec53ffbb0b2ff4798c65c9bbf27c591690a5f17db43eb8309ee1648da39c631eba32d183560b645d8 SHA512 6eac3c27f970e75e57a864b26070e1327235a42367e9d137ebeaed8d4a20a85638edfb3d81b142171c260c71403021159c1e3b9bcb0f97c08251c33ca9e62641 +DIST rocRAND-6.3.3.tar.gz 44906478 BLAKE2B 018cb0a18c9fce92391a7e3f1047a9702bde1a28d2eddd179326b2f96b0d046e47a5efd14e258586fb1c88ce0cbd2dca9d37ac1fd8054b539044d7d9d246c15c SHA512 4ef056c27e1f964c2dd53a2373fea42ce58965e90e4450246880d099561116853517e0122936dffc0b3548df72ec55b54ed430d99fec86842cf3e83fc531ed4f 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 +EBUILD rocRAND-6.3.2.ebuild 1410 BLAKE2B 0aaf8249465e6214b5c45829a720abf4e0daca21736a1c7b17b6f6509e6aab44e4ae0e2786b3eac7136de52032de0fb794f8fe94e663934538aa28b28be3e143 SHA512 53aa1b6f44f05fc4818c9cceaa3670cd3a603500cfa00e5d5dd6d1daed0d084da792d625d1c1763da026c56c8009218112e3d6276a52c209b4b2cdcb0816b6b7 +EBUILD rocRAND-6.3.3.ebuild 1410 BLAKE2B 0aaf8249465e6214b5c45829a720abf4e0daca21736a1c7b17b6f6509e6aab44e4ae0e2786b3eac7136de52032de0fb794f8fe94e663934538aa28b28be3e143 SHA512 53aa1b6f44f05fc4818c9cceaa3670cd3a603500cfa00e5d5dd6d1daed0d084da792d625d1c1763da026c56c8009218112e3d6276a52c209b4b2cdcb0816b6b7 MISC metadata.xml 672 BLAKE2B 418c0adb9c54e60ffbcfdc6abf3bee2c7ca17a5d4e4022f84ed9cdd654f6470a2bb2336f6fdf01766f9ff42eb599d1a155fa575a658c1459c3580396a21847c4 SHA512 9be6210f28457c4e71adaabf3f66f0f58bf8f1db78bb69ea43ed9e621d8f8115a04f05d8db7814725198f2a3e70dbcb723d89ccf5b88ed08b090c5f15f6e370f 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-6.3.0.ebuild b/sci-libs/rocRAND/rocRAND-6.3.2.ebuild index d5b38455f3d0..d5b38455f3d0 100644 --- a/sci-libs/rocRAND/rocRAND-6.3.0.ebuild +++ b/sci-libs/rocRAND/rocRAND-6.3.2.ebuild diff --git a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild b/sci-libs/rocRAND/rocRAND-6.3.3.ebuild index cadf2c863445..d5b38455f3d0 100644 --- a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild +++ b/sci-libs/rocRAND/rocRAND-6.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,17 +8,22 @@ 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" +HOMEPAGE="https://github.com/ROCm/rocRAND" +SRC_URI="https://github.com/ROCm/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/rocRAND-rocm-${PV}" LICENSE="MIT" -KEYWORDS="~amd64" SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" IUSE="benchmark test" REQUIRED_USE="${ROCM_REQUIRED_USE}" + RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/${PN}-5.4.2_stdint-gcc13.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch + "${FILESDIR}"/${PN}-6.3.0-benchmark-1.8.patch +) RDEPEND="dev-util/hip" DEPEND="${RDEPEND} @@ -28,29 +33,26 @@ DEPEND="${RDEPEND} BDEPEND="dev-build/rocm-cmake >=dev-build/cmake-3.22" -S="${WORKDIR}/rocRAND-rocm-${PV}" - src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ + rocm_use_hipcc local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On + -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 + cmake_src_configure } src_test() { check_amdgpu export LD_LIBRARY_PATH="${BUILD_DIR}/library" - MAKEOPTS="-j1" cmake_src_test + # uses HMM to fit tests to default <512M iGPU VRAM + ROCRAND_USE_HMM="1" cmake_src_test -j1 } src_install() { diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index 567bb80f4cdd..b6362ee317a7 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1,14 +1,9 @@ -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 -EBUILD rocSOLVER-5.1.3-r1.ebuild 1939 BLAKE2B 5106e36577bdfbbba5039de1007a9d96587354bb634f2ae4cec76c644144ab6b5527082ba96a0039c42c2e0984c1abf99cc30c6d8bb3a3867c45348245ced66f SHA512 8d6abd695f2596fef6f6c2fb66e168ba5b087b71360ffebfd4a0aaa3796d21b9e9deb215e4368ca36a42ede7ac91415ed6641e20e4ac1d40fa420bbdf1cf44b9 -EBUILD rocSOLVER-5.4.2.ebuild 1537 BLAKE2B 8881bd0881366f2315011b8fca3562bf85f2fbed0c5522b47b18794366e6d26bf800da60a5f1d73f74b0f4397b6407cea042e6ed9e10595017e51441fe221ea6 SHA512 b9d212bc359301a901750ce682f4658a9ba927950800f5e4692f26991ee1aee86d0465e9a7af5eeef61750fe5799a7e4e636dffd097a8a604208ef8764e961b9 +DIST rocSOLVER-6.3.2.tar.gz 3077213 BLAKE2B ab05f0388f4845e7cbd6279aaa7c6a0774b99153ca0739837186792a8e5c271498d5c18a3305602d979aad65e5bc399305e0c6447bce118694ebbdcb1f26b5a3 SHA512 7a9b705783dde897a8b343e832a7775d131cc0c5caca14ee9abe4349aeff896bb1b073ea077ed1bcced6a358e4b61d9a0155c499c73fccba1d50b0ebc535dd6c +DIST rocSOLVER-6.3.3.tar.gz 3077208 BLAKE2B b3c5a8377b503b2639f81ae7457d233dd225f8422a9134148826d875cacac2cb03429734915c25ca8971c651c31071daccfad9ad4fcb66a034f38b5b991380aa SHA512 5effc07c9ed5a22bfbb114fc9777e61e9b524c439ea98e0802e63490a27d4e17747de5eee74df59138bf8dcb8700b00a9074079ee3666bba630af2bab800a541 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 +EBUILD rocSOLVER-6.3.2.ebuild 1678 BLAKE2B 64cc0c35bcbfae7cab035747071d83a69fd1f58c9dbd097df1f5326ef8d383912128d903bfcf62e0dea773cb8f0773082848ac290ffc25b0a9daf269fe85c63d SHA512 25b7e8b4ce820b18ee53c45228560022adb2c7991a43678d955ff35d81719071f080c232e5d37979c2e5393bf86461112f9aad6470823f2c4c90da138addb1d0 +EBUILD rocSOLVER-6.3.3.ebuild 1678 BLAKE2B 64cc0c35bcbfae7cab035747071d83a69fd1f58c9dbd097df1f5326ef8d383912128d903bfcf62e0dea773cb8f0773082848ac290ffc25b0a9daf269fe85c63d SHA512 25b7e8b4ce820b18ee53c45228560022adb2c7991a43678d955ff35d81719071f080c232e5d37979c2e5393bf86461112f9aad6470823f2c4c90da138addb1d0 MISC metadata.xml 846 BLAKE2B 4f740804d76db5a55b3ee7bfc1e4e79edb192a0cb3962bee1e1326af0e1b2cdf9e1e410bf0557d0adc2a8e34592b8bf01eb49b951c50c4af3a97c7275c9e3629 SHA512 c8c0d4b5559b2ebb6323137bb6d7017cf50d674e05fb36533c75d3ffe53711b126798cc787521b0f9920c9e510ac163aaefd723b509fe1563d138f393bccbf2c 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-6.3.0.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.3.2.ebuild index 0cb4a4616a06..0cb4a4616a06 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-6.3.0.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-6.3.2.ebuild diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.3.3.ebuild index 10fb52f40af2..0cb4a4616a06 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-6.3.3.ebuild @@ -1,25 +1,27 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ROCM_VERSION=${PV} -inherit cmake edo rocm +inherit cmake edo flag-o-matic 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" +HOMEPAGE="https://github.com/ROCm/rocSOLVER" +SRC_URI="https://github.com/ROCm/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz" +S=${WORKDIR}/${PN}-rocm-${PV} LICENSE="BSD" -KEYWORDS="~amd64" SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" IUSE="test benchmark" REQUIRED_USE="${ROCM_REQUIRED_USE}" RDEPEND="dev-util/hip - sci-libs/rocBLAS[${ROCM_USEDEP}] + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}] dev-libs/libfmt benchmark? ( virtual/blas )" DEPEND="${RDEPEND}" @@ -27,19 +29,16 @@ 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/ + rocm_use_hipcc + + # too many warnings + append-cxxflags -Wno-explicit-specialization-storage-class local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On + -DCMAKE_SKIP_RPATH=ON -DAMDGPU_TARGETS="$(get_amdgpu_flags)" -Wno-dev -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF @@ -49,13 +48,16 @@ src_configure() { -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) ) - CXX=hipcc cmake_src_configure + cmake_src_configure } src_test() { check_amdgpu cd "${BUILD_DIR}"/clients/staging || die - LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test + # No filters: 64m28s on gfx1100 + # 'checkin*-*known_bug*': 1m35s + HIP_VISIBLE_DEVICES=0 LD_LIBRARY_PATH="${BUILD_DIR}/library/src" \ + edob ./rocsolver-test --gtest_filter='checkin*-*known_bug*:*GVD*batched*' } src_install() { diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest index bfafd4b77a63..aaab51d3f82a 100644 --- a/sci-libs/rocSPARSE/Manifest +++ b/sci-libs/rocSPARSE/Manifest @@ -1,10 +1,7 @@ -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 +DIST rocSPARSE-6.3.2.tar.gz 1490331 BLAKE2B 77317b2cd7bbfe69577c49d738b3aa829db6a9c54e93f1e5cb874825210658582f084e97e0cb8e76be9d767a3dc95625441604600b948ccebb4e634b24703ea7 SHA512 b1377749cd07ea858a06e9bbd372008d42f6afad8eb48334bbbd8a8e7ab48a4671fb9d23ac8c896e8b3f546a03118f57345ebab8473795fdaa7a49b49f368a49 +DIST rocSPARSE-6.3.3.tar.gz 1490318 BLAKE2B 5df9d3af2904bf793714c5e5d79f7e102eade2ddcf693e41724e02e52f65827c36d6ae1ba48311ccefa63304ecb692a5e3f02a02f866b43e22523c0f5efcd981 SHA512 e91108da47e7f3b742fcc33be3b2dae44e388c5445963ad8cb98e63e0e01013628c6df3cfe19e5522763d565164d49c0287cd2ea6117040a00f03b90c670a6c5 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256 @@ -29,8 +26,8 @@ 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 +EBUILD rocSPARSE-6.3.2.ebuild 4574 BLAKE2B 4ea562dda11e2ae9fd4aee0982a935436b7249c73d29f812b702a41bcf154746efd8a2ce53f08f6d74bdced9ac5b8ecb799964b1333cddf5478559eff68f3b75 SHA512 3bfd3d5dc507f1a3423572c17381e276d74e1aedcdd40129f29816314343dcc68f788fa2c1c6b58f51dcb29767029cb35d2908ea0670852613ec83ebcfbdbd39 +EBUILD rocSPARSE-6.3.3.ebuild 4574 BLAKE2B 4ea562dda11e2ae9fd4aee0982a935436b7249c73d29f812b702a41bcf154746efd8a2ce53f08f6d74bdced9ac5b8ecb799964b1333cddf5478559eff68f3b75 SHA512 3bfd3d5dc507f1a3423572c17381e276d74e1aedcdd40129f29816314343dcc68f788fa2c1c6b58f51dcb29767029cb35d2908ea0670852613ec83ebcfbdbd39 MISC metadata.xml 669 BLAKE2B 62133bd86a945eedaba10a5507a30d2dac62984558e74540860bbde3d12cf971de129d5c6e046b3916f4cf048c60aeb87553385b8f28d50ce0046ec04e90385d SHA512 6717bc1ad49a85001695265b3571c3936da67d3ded431149d6d9c98b094386a8899fcbf2375ca799c3e9c742c48460ac482418a53189097f5a12510f8a3ce628 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/rocSPARSE/rocSPARSE-6.3.0.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.3.2.ebuild index 87320ae0e017..b3db8b403676 100644 --- a/sci-libs/rocSPARSE/rocSPARSE-6.3.0.ebuild +++ b/sci-libs/rocSPARSE/rocSPARSE-6.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/rocSPARSE/rocSPARSE-6.3.3.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.3.3.ebuild new file mode 100644 index 000000000000..b3db8b403676 --- /dev/null +++ b/sci-libs/rocSPARSE/rocSPARSE-6.3.3.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +ROCM_VERSION=${PV} + +inherit cmake edo flag-o-matic python-any-r1 toolchain-funcs rocm + +DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation" +HOMEPAGE="https://github.com/ROCm/rocSPARSE" + +SRC_URI="https://github.com/ROCm/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz +test? ( +http://sparse-files.engr.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz +http://sparse-files.engr.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz +http://sparse-files.engr.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz +http://sparse-files.engr.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz +http://sparse-files.engr.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz +http://sparse-files.engr.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz +http://sparse-files.engr.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz +http://sparse-files.engr.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz +http://sparse-files.engr.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz +http://sparse-files.engr.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz +http://sparse-files.engr.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz +http://sparse-files.engr.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz +http://sparse-files.engr.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz +http://sparse-files.engr.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz +http://sparse-files.engr.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz +http://sparse-files.engr.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz +http://sparse-files.engr.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz +)" + +S="${WORKDIR}/rocSPARSE-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="=dev-util/hip-6* + 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}]') +) +" + +RESTRICT="!test? ( test )" + +python_check_deps() { + if use test; then + python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" + fi +} + +src_prepare() { + # use python interpreter specifyied by python-any-r1 + sed -e "s/\${python}/${EPYTHON}/" \ + -i clients/tests/CMakeLists.txt || die + + cmake_src_prepare + + # Test need download data from https://sparse-files.engr.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() { + rocm_use_hipcc + + # tons of warnings in tests + append-cxxflags -Wno-explicit-specialization-storage-class + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}/clients/staging" || die + LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./rocsparse-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 0bd9efefbd45..752c9ea1361d 100644 --- a/sci-libs/rocThrust/Manifest +++ b/sci-libs/rocThrust/Manifest @@ -1,12 +1,12 @@ 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 rocThrust-6.3.3.tar.gz 1205828 BLAKE2B 4b65353de456558fbc4ad43630353d89336d23a4a9da00df21c34caedbcc25b9b05e0a3e4048f3709a63eb9a8882d60a906b2e7cf4976fd3953b089e9bcb04b7 SHA512 964ef583485d4885b4cf6e95a0cb65d54f1690ab4af9c18a9909d9356e19d3b431f510801ac0a26cd31b8539857840fc218e0bdf779e9a4ab7b03bb0e31f73da 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 +EBUILD rocThrust-6.3.2.ebuild 1558 BLAKE2B 7f81eae26b3b8294450fe5b5b5e73629a33be89229163f1282d475d73105dec443fb8899241525bc72aa294d39be7f39031850576b5ef4aef98ace97d6fb2e79 SHA512 3abe1945a4fc3bf91b74c50e03fa457eaf6b5b3589bc572b82707b37c12a89f1fb96bfb9fdb2acb410813531408e5699c3203bab8dfe3583891b86a3b64d32ef +EBUILD rocThrust-6.3.3.ebuild 1558 BLAKE2B 7f81eae26b3b8294450fe5b5b5e73629a33be89229163f1282d475d73105dec443fb8899241525bc72aa294d39be7f39031850576b5ef4aef98ace97d6fb2e79 SHA512 3abe1945a4fc3bf91b74c50e03fa457eaf6b5b3589bc572b82707b37c12a89f1fb96bfb9fdb2acb410813531408e5699c3203bab8dfe3583891b86a3b64d32ef MISC metadata.xml 631 BLAKE2B 99edd995566ee67d4e2fb4fdc67eca30299e81bd657d57c24932b0bc0545c805abce9d2542dfcb9d61d7aa5639ac02dc5385a5d90bfa5fcb757b5fab9f1f11d6 SHA512 bc0f9411724711f1806f1681c6c55877b828807e9deb22123a92b1b1cfc19c2f423ddd111978bf04a3993555cdc984f654c049617e5919e18d09a093c4559136 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 -} diff --git a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild b/sci-libs/rocThrust/rocThrust-6.3.2.ebuild index 9588f9f0fc74..9588f9f0fc74 100644 --- a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild +++ b/sci-libs/rocThrust/rocThrust-6.3.2.ebuild diff --git a/sci-libs/rocThrust/rocThrust-6.3.3.ebuild b/sci-libs/rocThrust/rocThrust-6.3.3.ebuild new file mode 100644 index 000000000000..9588f9f0fc74 --- /dev/null +++ b/sci-libs/rocThrust/rocThrust-6.3.3.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2025 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/ROCm/rocThrust" +SRC_URI=" + https://github.com/ROCm/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz + test? ( https://www.sqlite.org/2023/sqlite-amalgamation-3430200.zip ) +" +S="${WORKDIR}/rocThrust-rocm-${PV}" + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE=" + benchmark? ( ${ROCM_REQUIRED_USE} ) + test? ( ${ROCM_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + test? ( dev-cpp/gtest ) + benchmark? ( + dev-cpp/benchmark + sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/cmake-3.22 + test? ( app-arch/unzip ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.0-operator_new.patch" + "${FILESDIR}/${PN}-6.3.0-fix-libcxx.patch" +) + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARKS=$(usex benchmark ON OFF) + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + if use test; then + mycmakeargs+=( + -DFETCHCONTENT_SOURCE_DIR_SQLITE_LOCAL="${WORKDIR}"/sqlite-amalgamation-3430200 + ) + fi + + cmake_src_configure +} + +src_test() { + check_amdgpu + # uses HMM to fit tests to default <512M iGPU VRAM + ROCTHRUST_USE_HMM="1" cmake_src_test -j1 +} diff --git a/sci-libs/rocWMMA/Manifest b/sci-libs/rocWMMA/Manifest index fdb695e3b988..55aef9ddbc2e 100644 --- a/sci-libs/rocWMMA/Manifest +++ b/sci-libs/rocWMMA/Manifest @@ -3,8 +3,10 @@ AUX rocWMMA-6.0.2-use-system-googletest.patch 1292 BLAKE2B 358e7024dd80664ffc3f9 AUX rocWMMA-6.1.1-no-test-install.patch 854 BLAKE2B b8d4c15e578cae34eb116a633819eeb941ec85d98e3209fb0359ae9943e9a82ae905513f9ffdd5eed1f1f33fa613b7acb9544dfd314891863a72c54698d3f9ad SHA512 ae2b22e44092d876ad29c8bcabc01aae2ef4279e0ee8b2e8fa80ff2bae0bf3ef30f8f0d7a3e873d12b8ba876cb3aa7ca8cc4b919167f8d229263fc4f982e3e49 DIST rocWMMA-5.7.1.tar.gz 3163060 BLAKE2B 47ca55c0cd388ca51ad3843e656a31ce04d9e07988c26bfb69a7c61bfe497609408cfd20dcbe9c6698bd79b800a114ab67d582ced43dc6f1c4db4072e2901d99 SHA512 92c9c634fdf1f5319d34fabbf691df45600abdc5285a76b40255e7d6d260553076f65baa1eda566a163725e2a0cec0a85372eb07add39c65368e84505c176f50 DIST rocWMMA-6.1.1.tar.gz 3189782 BLAKE2B fd96d8f3ba8f21ee3544d532a59ffdefa1aefc94d73401f48d470f7f699e28771d5495e98c1ee316d8379167b70b945220be6670dee2757a62af162276a2fb0f SHA512 db2bfe805a4f33c48ee98c821efe0b261eca474af9e954843c83faa3335459bfe635326ba2cfc7b8b8ece2cf0f2c418f49ff6aa81537f8d3747cc729738a6b18 -DIST rocWMMA-6.3.0.tar.gz 3225622 BLAKE2B bfcb872393a11c809d1f7d09aeca554c24669650f4e61d5846104d0559b50a584081260ad566b1d79a2d107cc1f2bf9ea26751e0611cba9108a455a2ba48a3cb SHA512 5c72df14eabd0e766ffc03e41cd2e5a07ffb4ab518f7e6c2b1f23517c20a1c076d08a45f9940e499ede02c0d2c77f3f76f65f4748c7c8dfa2e747a406acf0aa1 +DIST rocWMMA-6.3.2.tar.gz 3225614 BLAKE2B ee4c8ba96d5603c1eb029b473a8ab7c80bad0917be58d2a0d3673d84a2ccd743e3f9ee1487c49a866c685426cb1486601de0d94470f0d2de09fcde47bb063353 SHA512 01a3db5234d747273eb925db3c803651bf475d3685f7e0488be880bddceaa008f1988e476d465aba9564e95d5d5c370320d0465605e02ff88e9e7bd67d68e27d +DIST rocWMMA-6.3.3.tar.gz 3225632 BLAKE2B ff3fc4b8d980233052236c4850346c171147d25b5c0e32d81271f22eb1b844150f3998e10cfb5d01797cb8d03630406226eb33ce71d9c6004b0aacc4e40da772 SHA512 e775b1e540baaa67caf65b6bb1815fab860b28e3431a52e8158afab5c4b358407ca4085e9bb68eeb9117f7147d9872baa47fac1bcefac4fc87982c543ce35c9b EBUILD rocWMMA-5.7.1.ebuild 1212 BLAKE2B e0bd4413db21ddf0c3933154fd60c561462f21f054bac0990ce3788de9d437a51d128447cf38a59ba29f352e8a39d9e66f3c27ee1eb794f09edcdbf757a9a32f SHA512 cd78d160bee5e49c085b33defc407c26d493e4c9405003dc4d09a5f3fcde7fa22a0db140a6a0736e21e59bd8af39758dd519ba7d8c52c924799fc56bd55808b8 EBUILD rocWMMA-6.1.1.ebuild 1538 BLAKE2B 83267e2a8db5b56fa922592b5e99af37decc33f1b0061a893f73466329adea7b4f1366533b9c1d09a80d96d97c18bac435eef6dc1fc19d09a02920c2f38bf1a7 SHA512 f8c8e9263651f573e22a5f789604de21b56b99e1da7d270c185b450bbb87e589a2c32fb0f098776131d5b59837ce37e06bad87bc8236d28d25a6e00f6987b553 -EBUILD rocWMMA-6.3.0.ebuild 1755 BLAKE2B dac9f015c0321dac151e9aa023da3ec13eeb1e0b8b2682e23025a4fc7af43b1f9f7f79a3ec89abc71380579ef6a571c316e05dc0cd21102e2cc12fc9f0cd0431 SHA512 d5335a4c91daa1ed8be3cfed6ebb7cdef87a2e18821c6bb8cf6c2df21c94bf1061f0856e96e1dee26aaa3982313b7906eb68c28b0adb303f1cc08996c1b0cae6 +EBUILD rocWMMA-6.3.2.ebuild 1755 BLAKE2B dac9f015c0321dac151e9aa023da3ec13eeb1e0b8b2682e23025a4fc7af43b1f9f7f79a3ec89abc71380579ef6a571c316e05dc0cd21102e2cc12fc9f0cd0431 SHA512 d5335a4c91daa1ed8be3cfed6ebb7cdef87a2e18821c6bb8cf6c2df21c94bf1061f0856e96e1dee26aaa3982313b7906eb68c28b0adb303f1cc08996c1b0cae6 +EBUILD rocWMMA-6.3.3.ebuild 1755 BLAKE2B dac9f015c0321dac151e9aa023da3ec13eeb1e0b8b2682e23025a4fc7af43b1f9f7f79a3ec89abc71380579ef6a571c316e05dc0cd21102e2cc12fc9f0cd0431 SHA512 d5335a4c91daa1ed8be3cfed6ebb7cdef87a2e18821c6bb8cf6c2df21c94bf1061f0856e96e1dee26aaa3982313b7906eb68c28b0adb303f1cc08996c1b0cae6 MISC metadata.xml 468 BLAKE2B 00be6e38c18a77eebb430632acdd9da61aaa299c92cb733735bc7a40e1017e33d778783dd821f4122f46e9f390d7bc37c05c1b43e0abda915586eb83928e5f0a SHA512 9ed778246d9895dfdb2e881b533a2f53a0f6c0361671c33c065ce37e5f2ea4677e9885e28a66466c95e261dea909ec5de9fb79de44d9857520ed269849145247 diff --git a/sci-libs/rocWMMA/rocWMMA-6.3.0.ebuild b/sci-libs/rocWMMA/rocWMMA-6.3.2.ebuild index 5a803b20ae90..5a803b20ae90 100644 --- a/sci-libs/rocWMMA/rocWMMA-6.3.0.ebuild +++ b/sci-libs/rocWMMA/rocWMMA-6.3.2.ebuild diff --git a/sci-libs/rocWMMA/rocWMMA-6.3.3.ebuild b/sci-libs/rocWMMA/rocWMMA-6.3.3.ebuild new file mode 100644 index 000000000000..5a803b20ae90 --- /dev/null +++ b/sci-libs/rocWMMA/rocWMMA-6.3.3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_SKIP_GLOBALS=1 + +inherit cmake rocm + +DESCRIPTION="library for accelerating mixed precision matrix multiply-accumulate operations" +HOMEPAGE="https://github.com/ROCm/rocWMMA" +SRC_URI="https://github.com/ROCm/rocWMMA/archive/rocm-${PV}.tar.gz -> rocWMMA-${PV}.tar.gz" +S="${WORKDIR}/rocWMMA-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +DEPEND="dev-util/hip:${SLOT}" + +IUSE_TARGETS=( gfx908 gfx90a gfx940 gfx941 gfx942 gfx1100 gfx1101 gfx1102 ) +IUSE_TARGETS=( "${IUSE_TARGETS[@]/#/amdgpu_targets_}" ) +ROCM_USEDEP_OPTFLAGS=${IUSE_TARGETS[*]/%/(-)?} +ROCM_USEDEP=${ROCM_USEDEP_OPTFLAGS// /,} +ROCM_REQUIRED_USE=" || ( ${IUSE_TARGETS[*]} )" + +BDEPEND=" + test? ( + dev-cpp/gtest + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + ) + dev-build/rocm-cmake +" + +IUSE="${IUSE_TARGETS[*]/#/+} test" + +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-no-test-install.patch +) + +src_prepare() { + # unknown arguments for hipcc + sed -e "s/ -parallel-jobs=4//" \ + -e "s/ -Xclang -fallow-half-arguments-and-returns//" \ + -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DROCM_SYMLINK_LIBS=OFF + -DROCWMMA_BUILD_SAMPLES=OFF + -DROCWMMA_BUILD_TESTS="$(usex test)" + ) + use test && mycmakeargs+=(-DROCWMMA_USE_SYSTEM_GOOGLETEST=ON) + cmake_src_configure +} + +src_test() { + check_amdgpu + + # Expected time on gfx1100 is 1260s (-j1) or 936s (-j32) + # Visible devices are limited to the first one to exclude APU (if not disabled in the BIOS) + HIP_VISIBLE_DEVICES=0 cmake_src_test +} diff --git a/sci-libs/rpp/Manifest b/sci-libs/rpp/Manifest index 2e5953d991f8..904d216e5988 100644 --- a/sci-libs/rpp/Manifest +++ b/sci-libs/rpp/Manifest @@ -1,6 +1,6 @@ AUX rpp-6.1.1-skip-install-license.patch 1046 BLAKE2B 3000d90e9d2ccb3191e18cba7b74c4318ded903103cc31a998cca9591297bd3203c578bac2a1415db7980dcd7db0c5678f9f5dbdce66bc0112b4fdbe6405909d SHA512 5b2818a151dd3dd27c1af9ae19a73cbdf3c1bb69ad16d51ad075f50e2488742792bd1ec6f00b38392660e765911942fb41fdea2c5f31bc76998d5f9b5c9fd2db DIST rpp-6.1.1.tar.gz 37016755 BLAKE2B 884090ab50e0a4a3aed4e52c5bbd934a8c5b62eca310471c30cf4c5a7cafdd36fed7894320b4d5246620b3c47e90fafd0f8160a7d4ed0295c7668c8d147f4b18 SHA512 a7c10bdd08739eba08209783decf0f4fd7c12194b9ebc63bd16e4cb998645110c089833efb83a77d4bed7f8599cf3a320608be28633f0dc956079f9d70e765f8 -DIST rpp-6.3.0.tar.gz 56092581 BLAKE2B 1a36d98b64745e7cb36322cf21a6983a7efcde737136cbf12c428edd315ce1dff5f92540e5f23750cce01a65d25c0a87e4429bb3ea98059c747569591fb0e22a SHA512 8bab18af168dca51f6a5c2d32e46ca133307d2cf48057c4e9cda6100ea17df54b22533fedbad6d4273904eca53df5a322153a2d7eb45c6ce7faff54d2e57a482 +DIST rpp-6.3.3.tar.gz 56093678 BLAKE2B de0933386d7c6a3cce88a36e22c25bea0cdda766dbc9a297bb6f5271b7a310670faa2d1dd3cc56f52e2752946f930ad02c4de2680dea3456e09ca97d4fa6c520 SHA512 024211ab05d95fbe0bb960a08b083e5b777d4842dd717a6280b1de84402426f5f9016e3b258ef81042281d775bd5504b285dd06d246f4d3479ffe57e59935184 EBUILD rpp-6.1.1.ebuild 2127 BLAKE2B ee7e07eab9440959df1123a23d1112905e7af4763d9a2ca636424d9a4d60492f509016e4004808a90680410cc2d42bafd968117fb355e0759f4cdc306682e1d2 SHA512 90191804e681c39aa9c7059976436fabb7efab91f947cc04930fdd9d444429b222fc8c01fafd9ac5b53b78caaba6738b24bbdc379834b7d8b83e8dd76f4fc5a1 -EBUILD rpp-6.3.0.ebuild 2187 BLAKE2B 67b2c085b61082b8ebe9c3d796af7e055d3196e7a8860e46295ccfcd60b729eedd400047e273fe0bece3e53b020aeb2819278fdd6c6e5b6b97e6874089afe572 SHA512 0e1e0a104db0f3152ba0bccc28de071eb1b5419b6e4f0f766853df0ca0d9ac00a41ec51ecc03a323a322655ab3fe306d858736d65f490715666b410f206792b4 +EBUILD rpp-6.3.3.ebuild 2187 BLAKE2B 7f0d94e2cf2fe1a6aef891e904aa1113e20549000d3861c0aab7dc7d583cdce7c64f8dd6e5cc40147aef8e046d0562819417e4a4f5f982074c509293d75910fe SHA512 36259a5146ff7dc98be5e0843019ecabaad6470e85919087061696f8c8e2a891b52b40302c662c4bbf564f9d4b79b615c8fae691cb90b68697f603b4bec92b84 MISC metadata.xml 410 BLAKE2B 196192c40a427e78cfb88efe5ba4cd77399a2945bc1c8bb8728f0c43cab51f95ecf992e832c95e6607b48043a04f0680b21cd059cdfca3def9286530a4899e7b SHA512 a66340c6c4d62c10a5fdada9b63cab9784f75973a5132be56e52233341796c93423ed766a58733e3f22091057488aed9e0731e7cedd55caa0721e703df137d31 diff --git a/sci-libs/rpp/rpp-6.3.0.ebuild b/sci-libs/rpp/rpp-6.3.3.ebuild index e1bd48117964..4088548c165a 100644 --- a/sci-libs/rpp/rpp-6.3.0.ebuild +++ b/sci-libs/rpp/rpp-6.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sci-libs/superlu/Manifest b/sci-libs/superlu/Manifest index 063376373ae9..06cfdec2d5ed 100644 --- a/sci-libs/superlu/Manifest +++ b/sci-libs/superlu/Manifest @@ -5,6 +5,6 @@ DIST superlu-5.3.0.tar.gz 2483070 BLAKE2B 2e877c12b698fae6649d3146d4a22a8c701df8 DIST superlu_4.3.new.tar.gz 2875951 BLAKE2B 4208edb7df0babc0bb7e21077c6e0a00a10766a2d01b2da47f05ecdb232ca3309a2bce00f2cd1b709a8c01b7de2276e4f7d63856ace2e93c3598f1cdcdc12712 SHA512 57799051c5cd394e4cb1b89481a4706ee0a21159f06941bab4a39dfe30f4b6ccdf67042c6ec2c479a12deee0ed26c3707069a5b53281fb26b6c752ca77102aad DIST superlu_4.3.tar.gz 2876631 BLAKE2B 0a563e6730394f8e69fe13f1418f9f046bd37c848c51063e93a24a209e50a67f91b725eb3978fd6c4d28e51615806d6c0b6a2539cbc0d7fd11b5e4f0a9360148 SHA512 5c13da47b79160be14719f62ccdf5d59142a172e25a988fa340eaeb001a64d7f45ba39e675cb7aa3571bec52cb3a7cda0bb7a708c9608184ba6251edb7990e8c EBUILD superlu-4.3-r2.ebuild 1912 BLAKE2B b523fdeec625e5aef64b1c99236bb43b917317750d7cfa8eff0f4a74b0cb2b706e6680b0f703bd345814e55a6d9e2fbf9d720b0ff5a75b2c660db1756efd79ef SHA512 cc77568098aef343bd1497c8a2bc7d8e96dc5c195be597621a3e68b961cb6fbdb0fe393e0206dc22c374386072aafa4d53c8c145826cb61ab3e0ba25206ca5ec -EBUILD superlu-4.3-r3.ebuild 1727 BLAKE2B 3ed7e5656ba7ab422121df6e38c631e05e3f717b05c4b9b8414699304ffbefad0ec1940ce071b9a2fe7080c3032adba985cad8a5b5b503e574eed35dda55742f SHA512 57674e8175b17f5cbf7f1df09a07c7df13b0742aacaf92f002109d62451f0feb337a2dda973f44d40e98477c24b4314608a51bc5b8a55f0b20509fc5daa33045 +EBUILD superlu-4.3-r4.ebuild 1766 BLAKE2B 15487c713e5be95077741ac83d5f36eccbd718006fc85a95585246532fb0a1b72bf4d3d44c8657bcc6973bfbb8a818fabb2eb3ce2c122326ca87222a0603b414 SHA512 aa669dd97ded1491f99253a4eb107f5bf6fa8d8ca745daedade419e6ab084144d90543ce29e95c9431bb93b3bd79936c74f2280f9c101ac7c24c4c7d5275cba6 EBUILD superlu-5.3.0.ebuild 1206 BLAKE2B ecec22d1525db90b6d54c8185a963f5878e4339fb6ab37baf40629c2f5b6d39b039e4b0eec683473c581455617f01ea23ff76e5c35fc99a895bdfed1ee6dea49 SHA512 6ee11ef48b3eef039d5bce4de31d8e91e90059c6fe9e5c9105a0006873d157b4be7a2fc6fa4390f32e462781dbf968752e64575d2440c249bd66cf6acb30556c MISC metadata.xml 1405 BLAKE2B 37c946ec0b73a5bdbd2b856cf571475ed8e85e220f200bde8028278dafb8ace158c21d42c9a4a2e7c3373ac4c5bdd4e39cef7947113d99baea5bd86992912dd0 SHA512 6e07a544afc19f7704a7babf09441a223b24f7772bbf856e06889ffac2ac09f20ef9e8a03003407e0ce372db42850cd075560c4b006082f4fcc569786bf868ad diff --git a/sci-libs/superlu/superlu-4.3-r3.ebuild b/sci-libs/superlu/superlu-4.3-r4.ebuild index 028c3d805d0c..3d6ee03311d3 100644 --- a/sci-libs/superlu/superlu-4.3-r3.ebuild +++ b/sci-libs/superlu/superlu-4.3-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools fortran-2 multilib toolchain-funcs +inherit autotools fortran-2 multilib toolchain-funcs flag-o-matic MY_PN=SuperLU @@ -33,6 +33,7 @@ PATCHES=( src_prepare() { unset VERBOSE + append-cflags -std=gnu89 sed \ -e "s:= ar:= $(tc-getAR):g" \ -e "s:= ranlib:= $(tc-getRANLIB):g" \ diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest index ee6943c7eba0..580d4bb9a837 100644 --- a/sci-libs/symengine/Manifest +++ b/sci-libs/symengine/Manifest @@ -4,7 +4,9 @@ AUX symengine-0.8.1-fix_llvm.patch 2674 BLAKE2B f7d493318389f63a8b61f47ee2ba6429 DIST symengine-0.11.1.tar.gz 898181 BLAKE2B ef14e09ceb7e9783711ca7f9f06a59362c40222e7f85de5545be834ecd79bbf41fcd34141bb3a63c106ee45067dd0b957377f937097183ffd5b93c6943976571 SHA512 076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac DIST symengine-0.12.0.tar.gz 898768 BLAKE2B 81bca3f59e864d2e37598a058cb4db97b1f9c8536ee841c10df6f01c6322fa744281ecdeb338e5bf33bf599ead66adcaaa724650535df9b3d4bd7f07e22a3ad2 SHA512 fbc73a75299c19155a09f1854888a5050150aaad5bc3df683d43e8036af8005f8152a36ae79029e00bc8422c3edd7252baaf3a0da6a21d1d754d80a44c5c68bf DIST symengine-0.13.0.gh.tar.gz 942757 BLAKE2B 9c7e1a067fd2baff0c6fc360b1512f04ee0c77c1f408180c2384b29aac1feecc56bcd0453afce402c6963c2fc638202f623592eb5c0bcdf0a1715056e8fec425 SHA512 3d64149b507be586daabad4b9a99436b0d329b16b89db756c9a72812b37049199c0be1ed77b18d55063a6445d04bf44120e7afd90a961aebbc89df815e52ed5d +DIST symengine-0.14.0.gh.tar.gz 944589 BLAKE2B f5c52080153f548e866aa98afee6296888b020b633b7738109fa839b7fd70cda5059c079ba119604571060639b33d46692818d99d8c7b9a371a59efd14eb9dce SHA512 2b6012ed65064ff81c8828032c5a3148340582274e3604db2a43797ddbaa191520ed97da41efc2e842ba4a25326f53becc51f1e98935e8c34625bc5eaac8397f EBUILD symengine-0.11.1.ebuild 2714 BLAKE2B cbbfbae23bdb9e6d4b7430f836fc97c7705fb71ed51d9ed009f9d3ea192248581d9bf7eddd658f1a577c71dc84a184fc98111a1662899392e3bebcaa4f9ab183 SHA512 184878e9e6bdaf672b7a40bd07d2797840146bd820b1638ce3428f518a8ceb31b51f2c5d3d9959c8c542601c8f3c6c5387d79dd27ea6afccf3d964cac02fc989 EBUILD symengine-0.12.0.ebuild 2474 BLAKE2B 8f2bf1b821e74abff81705e6889c8329e0cd584c020d2810cadddb5a3db0a9da88ee68ff48cf46138aeb97b2e20ed4c1ca5904f0eb0d1cb8a92d89b1c580401e SHA512 0a050721cfb402fdda35df3ebdd18f05f26ba3de736821dcf2f41ec312730e6b7c29314b190ce837ce1987f46820f4961d8bb0c586fbb1509779c88bb09594e2 EBUILD symengine-0.13.0.ebuild 2512 BLAKE2B 28be0dea1ff6013aa8a76ebac934036ee146491261b6bcca25d0f6ac34ee97f5bc68149bff48a54929f4b7bcafa68d6862a5bc28d832612f3b5fe127e1629eb4 SHA512 113c1e78b833352c21ba362d24cfc9971aedf1e50996d3df41d065c4c8d88c3a82c2bc513a28a62a38c77cd23aad6e12666fdd76ef8d0728c29d2ce6dbe93b19 +EBUILD symengine-0.14.0.ebuild 2347 BLAKE2B 171841910c93609cb26c3ffa8ad9595975587153734eabd5da4565554a6d2037b3c2a4eadc2fc777fa74f9a965313d53988c5db3ca456af170129165fc2ec6b5 SHA512 1901457fa361fc8919da65abc909b1e745db11bb6d408bfd3b47a667dbd557dcda5d89fbc19ee4f58d959a42afdba84583fdad4c556fbfb4504534546155aeac MISC metadata.xml 1351 BLAKE2B 04ace153dd5a24c402e1a0759dd285e1e22b7813c59fba81058fc1503c8b0f80affaa9dea3158ee0dc0e9cb6215db237201af37f7ffcac2060a439d65d04c986 SHA512 c24ff488ac5a5ed54a7cf3b0ceefa55e069eaec4125e91f9e77f8490e64e82f1fd3f6feeacd0427671c493df748c810071b6360b41bfe5aa21bfc7d70c6c0b47 diff --git a/sci-libs/symengine/symengine-0.14.0.ebuild b/sci-libs/symengine/symengine-0.14.0.ebuild new file mode 100644 index 000000000000..b38f20d1542b --- /dev/null +++ b/sci-libs/symengine/symengine-0.14.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_COMPAT=( {18..20} ) +LLVM_OPTIONAL=1 + +inherit cmake llvm-r2 toolchain-funcs + +DESCRIPTION="Fast symbolic manipulation library, written in C++" +HOMEPAGE="https://github.com/symengine/symengine/" +SRC_URI=" + https://github.com/symengine/${PN}/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE=" + boost debug ecm +flint llvm +mpc +mpfr openmp primesieve tcmalloc + test +" +REQUIRED_USE=" + boost? ( !flint !mpc !mpfr ) + llvm? ( ${LLVM_REQUIRED_USE} ) + mpc? ( mpfr ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + boost? ( dev-libs/boost:= ) + !boost? ( dev-libs/gmp:= ) + debug? ( sys-libs/binutils-libs:= ) + ecm? ( sci-mathematics/gmp-ecm:= ) + flint? ( sci-mathematics/flint:= ) + mpc? ( dev-libs/mpc:= ) + mpfr? ( dev-libs/mpfr:= ) + llvm? ( $(llvm_gen_dep 'llvm-core/llvm:${LLVM_SLOT}=') ) + primesieve? ( sci-mathematics/primesieve:= ) + tcmalloc? ( dev-util/google-perftools ) +" +DEPEND=" + ${RDEPEND} + dev-libs/cereal +" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local int_class + + if use flint; then + int_class=flint + elif use mpfr; then + int_class=gmpxx + elif use boost; then + int_class=boostmp + else + int_class=gmp + fi + + einfo "Building with integer class: ${int_class}" + + local mycmakeargs=( + -DINSTALL_CMAKE_DIR="${EPREFIX}/usr/$(get_libdir)/cmake/symengine" + -DINTEGER_CLASS=${int_class} + # not installed + -DBUILD_BENCHMARKS=OFF + # broken with out-of-tree builds + -DBUILD_DOXYGEN=OFF + -DBUILD_TESTS=$(usex test) + # -DWITH_ARB provided by flint >= 2 + -DWITH_BFD=$(usex debug) + -DWITH_ECM=$(usex ecm) + -DWITH_FLINT=$(usex flint) + -DWITH_LLVM=$(usex llvm) + -DWITH_MPC=$(usex mpc) + -DWITH_MPFR=$(usex mpfr) + -DWITH_OPENMP=$(usex openmp) + -DWITH_PRIMESIEVE=$(usex primesieve) + -DWITH_PTHREAD=ON + -DWITH_SYMENGINE_ASSERT=$(usex debug) + -DWITH_SYMENGINE_THREAD_SAFE=ON + -DWITH_SYSTEM_CEREAL=ON + # TODO: package it + # -DWITH_SYSTEM_FASTFLOAT=ON + -DWITH_TCMALLOC=$(usex tcmalloc) + ) + if use llvm; then + mycmakeargs+=( + -DLLVM_ROOT="$(get_llvm_prefix -d)" + ) + fi + + cmake_src_configure +} diff --git a/sci-libs/taucs/Manifest b/sci-libs/taucs/Manifest index 393f1d8f7ea6..d11acc935b79 100644 --- a/sci-libs/taucs/Manifest +++ b/sci-libs/taucs/Manifest @@ -1,4 +1,9 @@ +AUX taucs-2.2-missing-include.patch 832 BLAKE2B c2187358f0aedaf10564d39de771e06d4683dacd354bb9dadb063c8e4b1294b4085281cfc20d1bebf293d0a5c29e8f10d5dc6cf3a82bd7b565589996b21feff7 SHA512 1260dbbb69e7e67cbe4488999dad83fd49d5347f1cc7711bcf7f7cf8aa818c9c1c10884a4b06a2663ae8af4d8e4a48a1a02ffdab48aef517c1880d287bc5792b AUX taucs-2.2-respect-ar.patch 635 BLAKE2B 59ea54427651adc597caf85bf5eafe8055a6223e3c588939519e660661ffec4082d574c08aebff8106508f4b5afe147d1f7ef5c1972b17461d286273c9cbb76a SHA512 b18551f3d386ebd203b422c9848bfb14c7d8bb67e0facb450869d0846ca23e35902339cfa519ef7b33d1cf0dfb6301bad5b9f2fcd2035d1e02b150a0c15a26e3 +AUX taucs-2.2.1-C23.patch 2966 BLAKE2B 11d3dc4752539589999650680e231f8a5bac252683bfd2c527f68ab06c5230763e8b0821badd1fb4883e692ed783ed5e8f841c6381c038650600d2a9fd1a467f SHA512 47662bb2ad8c4dfcb27c7455e43e969d99e4891b5b4bc388aa897e7b7f6e1403f63e7f60a30ea8c11df84b82d805bb139dfd59fc9af49d829bc130520044a558 +AUX taucs-2.2.1-allocate-memory-in-test.patch 777 BLAKE2B 4d5ccc3a4297126f648e17907188a3b8ffc4bad4fac7e14e9082b706baac601d11aff5f5995cdd6107aaaa680e260c5be9431d97c86e34fdf235b84ec5b8f8d9 SHA512 ccb0a81c68bad2da8797ac81f352cec328f2e82bb32165fc5af62bd9e4f2ec2e26273d9fd25dece263102590cc732998964b02725d296aa599f9e853913e734f +DIST taucs-2.2.1.tar.gz 1594127 BLAKE2B 426f5a6f919415480a14d231233214d4e560ecfb257b67751fc26ce0897acab504ee50d0dd074dd99c9c0b74c1bcad2c2f88e8a9708107a5c2dfe52d452eba02 SHA512 727f05a7ea89cb74893905b17571ae9275db283e0fbe1d5538dfd72c0f9ed1a47325b1845b1e8b381793a513b4b538b35d503f5dbb63db222e1b01fd1169f1e9 DIST taucs-2.2.tgz 1573863 BLAKE2B 21cf7479d7ce1f27678431e0d3dcaea1b3f8b11071b44651207791d6980bf5be0ed51cab7915f9e8da88d5da777c0f03a8d058e2ac8881e0d0b244ddfd796f5c SHA512 d8652de2da343dfd19c4278ac99313bcb577d976decdd3bd3875f0c9576832605b787feaef916eb4e82f22907c8bd029125c2ae56c827639e4d535ad62f20fcf EBUILD taucs-2.2-r1.ebuild 1967 BLAKE2B a9e232cadb1bd1a1f35335fd645b4103a2e9d44539bae7b83b009c79c1ae946fa6c423ef6def6f1a806ecc527f2305d4e650f667cd1ee14b3d221d42e415a450 SHA512 e2931a7f3ef767f77a04bb1b7bb9ad2d200181a45b34d782d92f73049c8406e3b7230a30bf3744231c6565e5705df539a4d0aa38fec0a0a877d1d0a63cc1e124 -MISC metadata.xml 1070 BLAKE2B 587dedd3574665d544778ab9048c5c5558072f25fe7e471bcfb9d4482c7dcafeb3dd64534df8fde8ddb2f6a78beb359b8d50b9db571ae6e572852121e8cdf512 SHA512 adc87df19bdb8589cade774312a3f056cb4abc373166e5a9a6b84d52e99c65b0344ef2e045ad641e168abfcbd74b92c6d1e40fbf33bc51a507e6591ac0bd0b4a +EBUILD taucs-2.2.1.ebuild 2306 BLAKE2B 6d21ec6d2c5625c8d51e0113fa6447e3cb25fe552c0d80cb2a348f68380c838af48a14c8db355846694f59c4c3755600cda25a7fc29f9a9e062586799349f930 SHA512 e5a1159ff124cf61aef079a860acefb3c13e435f53518cbfbb799b61bd6fce651b4559ea9333465b4f87bf7ba2a184a799820385e26dfd2d2754ce33da5ad295 +MISC metadata.xml 1152 BLAKE2B f8ecec1047be757e7b2300b2e6c7aad30c9e60ad5746d0ecf9d65343d6346b198538dcc559282e612605af95942f6cdb77955d35a94e41e71957d722e0823da1 SHA512 3d097acdbb9514f129d00190be4029cab5cf0736469dfbf6bf7bf01af6d2fcb529ace2eb086547d4d7755d1924188d6a57091412e2d2b03b176cb3942029bdbc diff --git a/sci-libs/taucs/files/taucs-2.2-missing-include.patch b/sci-libs/taucs/files/taucs-2.2-missing-include.patch new file mode 100644 index 000000000000..b5186aef3911 --- /dev/null +++ b/sci-libs/taucs/files/taucs-2.2-missing-include.patch @@ -0,0 +1,36 @@ +I don't know why he uses number of arguments to distinguish if +it's windows or not. Add correct header, section off wrong +mkdirs on Windows +https://bugs.gentoo.org/898294 +--- a/configurator/taucs_config.c ++++ b/configurator/taucs_config.c +@@ -1,6 +1,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/stat.h> + + #include "taucs_structure.h" + +@@ -242,8 +242,10 @@ + sprintf(name,"%s%c%s", configdir,pathsep,ostype); + + if (win32) { ++#if defined _WIN32 || defined __CYGWIN__ + mkdir(configdir); + mkdir(name); ++#endif + } + else { + mkdir(configdir,0777); +@@ -301,8 +303,10 @@ + sprintf(name,"%s%c%s", configdir,pathsep,ostype); + + if (win32) { ++#if defined _WIN32 || defined __CYGWIN__ + mkdir(configdir); + mkdir(name); ++#endif + } + else { + mkdir(configdir,0777); diff --git a/sci-libs/taucs/files/taucs-2.2.1-C23.patch b/sci-libs/taucs/files/taucs-2.2.1-C23.patch new file mode 100644 index 000000000000..dec900f8603b --- /dev/null +++ b/sci-libs/taucs/files/taucs-2.2.1-C23.patch @@ -0,0 +1,120 @@ +Port to C23. Various problems without the bug +found in bumping package version +--- a/src/taucs_ccs_ooc_llt.c ++++ b/src/taucs_ccs_ooc_llt.c +@@ -281,7 +281,7 @@ + int do_order, + int ipostorder[], + double given_mem, +- void (*sn_struct_handler)(), ++ void (*sn_struct_handler)(void* argument, int sn, int sn_up_size, int* sn_struct_ptr[]), + void* sn_struct_handler_arg + ) + { +@@ -455,7 +455,7 @@ + int do_order, + int do_column_to_sn_map, + double given_mem, +- void (*sn_struct_handler)(), ++ void (*sn_struct_handler)(void* argument, int sn, int sn_up_size, int* sn_struct_ptr[]), + void* sn_struct_handler_arg + ) + { +--- a/src/taucs_vaidya.c ++++ b/src/taucs_vaidya.c +@@ -3046,7 +3046,7 @@ + int row, col; + int *pi1 = 0; /* warning */ + double x, y, min, max, not; +- byte bool=1; ++ byte Bool=1; + edge *p,*dummy, *pe ,*max_pe; + int count = 0; + +@@ -3116,18 +3116,18 @@ + + for(minrho=1;minrho<maxdist;minrho++) + { +- bool = 1; ++ Bool = 1; + for(k=0;k<min(j,classes);k++) + { + if ((double)(findrho[(minrho+1)*classes+k]-findrho[minrho*classes+k]) > (findrho[minrho*classes+k])/x) +- bool = 0; ++ Bool = 0; + } +- if (bool) ++ if (Bool) + goto afterr; + } + + afterr: +- if (bool) ++ if (Bool) + { + for(i=0;i<n;i++) + if ((d[i] <= minrho) && (d[i] != -1) ) +--- a/progs/direct.c ++++ b/progs/direct.c +@@ -691,7 +691,6 @@ + /***********************************************************/ + + if (A->flags & TAUCS_SINGLE) { +- float snrm2_(); + int one = 1; + + NormErr = 0.0; +@@ -704,7 +703,6 @@ + } + + if (A->flags & TAUCS_DOUBLE) { +- double dnrm2_(); + int one = 1; + + NormErr = 0.0; +@@ -718,7 +716,6 @@ + + #ifdef TAUCS_CONFIG_DCOMPLEX + if (A->flags & TAUCS_DCOMPLEX) { +- double dznrm2_(); + int one = 1; + double* pX = (double*) Xz; + double* pNX = (double*) NXz; +--- a/progs/direct_coverage.c ++++ b/progs/direct_coverage.c +@@ -729,7 +729,6 @@ + /***********************************************************/ + + if (A->flags & TAUCS_SINGLE) { +- float snrm2_(); + int one = 1; + + NormErr = 0.0; +@@ -742,7 +741,6 @@ + } + + if (A->flags & TAUCS_DOUBLE) { +- double dnrm2_(); + int one = 1; + + NormErr = 0.0; +@@ -755,7 +753,6 @@ + } + + if (A->flags & TAUCS_DCOMPLEX) { +- double dznrm2_(); + int one = 1; + double* pX = (double*) Xz; + double* pNX = (double*) NXz; +diff '--color=auto' -ur taucs-2.2.1.old/progs/test_cilk_snmf.c taucs-2.2.1/progs/test_cilk_snmf.c +--- taucs-2.2.1.old/progs/test_cilk_snmf.c 2025-02-21 22:18:08.370013676 +0400 ++++ taucs-2.2.1/progs/test_cilk_snmf.c 2025-02-21 22:18:37.175471226 +0400 +@@ -27,8 +27,6 @@ + #define my_dnrm2 dnrm2 + #endif + +-double my_dnrm2(); +- + int main() + { + int xyz = 30; diff --git a/sci-libs/taucs/files/taucs-2.2.1-allocate-memory-in-test.patch b/sci-libs/taucs/files/taucs-2.2.1-allocate-memory-in-test.patch new file mode 100644 index 000000000000..2aed8c1bc757 --- /dev/null +++ b/sci-libs/taucs/files/taucs-2.2.1-allocate-memory-in-test.patch @@ -0,0 +1,24 @@ +There may be more actions needed, before that memory was unallocated +and nullptrs were dereferenced. +--- a/progs/test_cilk_snmf.c ++++ b/progs/test_cilk_snmf.c +@@ -54,6 +54,7 @@ + + Xd =(double*)malloc((A->n)*sizeof(double)); + for(i=0; i<A->n; i++) (Xd)[i]=(float)((double)random()/RAND_MAX); ++ Bd =(double*)malloc((A->n)*sizeof(double)); + taucs_ccs_times_vec(A,Xd,Bd); + + taucs_ccs_order(A,&perm,&invperm,"metis"); +@@ -74,8 +75,11 @@ + return 1; + } + ++ PBd =(double*)malloc((A->n)*sizeof(double)); + taucs_vec_permute(A->n,A->flags,Bd,PBd,perm); ++ NXd =(double*)malloc((A->n)*sizeof(double)); + taucs_supernodal_solve_llt(L,PBd,NXd); /* direct solver */ ++ PXd =(double*)malloc((A->n)*sizeof(double)); + taucs_vec_ipermute(A->n,A->flags,PXd,NXd,perm); + + { diff --git a/sci-libs/taucs/metadata.xml b/sci-libs/taucs/metadata.xml index db08cf08723b..dda4de5504d0 100644 --- a/sci-libs/taucs/metadata.xml +++ b/sci-libs/taucs/metadata.xml @@ -25,4 +25,7 @@ * Multilevel-Support-Graph Preconditioners. * Utility Routines </longdescription> + <upstream> + <remote-id type="github">sivantoledo/taucs</remote-id> + </upstream> </pkgmetadata> diff --git a/sci-libs/taucs/taucs-2.2.1.ebuild b/sci-libs/taucs/taucs-2.2.1.ebuild new file mode 100644 index 000000000000..c8bc53a1478d --- /dev/null +++ b/sci-libs/taucs/taucs-2.2.1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fortran-2 toolchain-funcs + +DESCRIPTION="C library of sparse linear solvers" +HOMEPAGE="https://github.com/sivantoledo/taucs/" +SRC_URI="https://github.com/sivantoledo/taucs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc" +RESTRICT="test" + +RDEPEND=" + sci-libs/metis + virtual/blas + virtual/lapack" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + # bug 725588 + "${FILESDIR}"/${PN}-2.2-respect-ar.patch + "${FILESDIR}"/${PN}-2.2-missing-include.patch + "${FILESDIR}"/${P}-C23.patch + "${FILESDIR}"/${P}-allocate-memory-in-test.patch +) + +src_configure() { + cat > config/linux_shared.mk <<-EOF || die + AR=$(tc-getAR) + FC=$(tc-getFC) + CC=$(tc-getCC) + LD=$(tc-getFC) + RANLIB=$(tc-getRANLIB) + CFLAGS=${CFLAGS} -fPIC + FFLAGS=${FFLAGS} -fPIC + LDFLAGS=${LDFLAGS} -fPIC + LIBBLAS=$($(tc-getPKG_CONFIG) --libs blas) + LIBLAPACK=$($(tc-getPKG_CONFIG) --libs lapack) + LIBMETIS=$($(tc-getPKG_CONFIG) --libs metis) + LIBF77= + EOF + # no cat <<EOF because -o has a trailing space + cp config/linux.mk config/linux-musl.mk + cp config/linux_shared.mk config/linux-musl_shared.mk +} + +src_compile() { + # not autotools configure. Uses difference in mkdir signature + # between windows and linux to recognize system. + CC="$(tc-getCC)" ./configure variant=_shared || die + emake + + cd lib/linux$(usev elibc_musl -musl)_shared || die + $(tc-getFC) ${LDFLAGS} -shared -Wl,-soname=libtaucs.so.1 \ + -Wl,--whole-archive libtaucs.a -Wl,--no-whole-archive \ + $($(tc-getPKG_CONFIG) --libs blas lapack metis) \ + -o libtaucs.so.1.0.0 \ + || die "shared lib linking failed" +} + +src_test() { + LD_LIBRARY_PATH=lib/linux$(usev elibc_musl -musl)_shared \ + ./testscript variant=_shared || die "compile test failed" + if grep -q FAILED testscript.log; then + eerror "Test failed. See ${S}/testscript.log" + die "test failed" + fi +} + +src_install() { + ln -s libtaucs.so.1.0.0 lib/linux$(usev elibc_musl -musl)_shared/libtaucs.so.1 || die + ln -s libtaucs.so.1 lib/linux$(usev elibc_musl -musl)_shared/libtaucs.so || die + dolib.so lib/linux$(usev elibc_musl -musl)_shared/libtaucs.so* + + doheader build/*/*.h src/*.h + + use doc && dodoc doc/*.pdf +} diff --git a/sci-libs/torchvision/Manifest b/sci-libs/torchvision/Manifest new file mode 100644 index 000000000000..6e9f2d7f3f10 --- /dev/null +++ b/sci-libs/torchvision/Manifest @@ -0,0 +1,4 @@ +AUX torchvision-0.20.0-gentoo.patch 520 BLAKE2B 2312d5fcc51047e229481e58793919e1167a5c41757028b85978512f76977861ae360bf66c071f21c5bab46cff42aeb76383a94e90bbc61ac4c767224738e3de SHA512 815118c9b440f91bf77be55dc12e7c71346fbf8b11d4291cabe57e5a7cf8822c31427f096335b812b857ce87da2b407189477550da3894d4bf2dc0886291d40d +DIST torchvision-0.20.0.tar.gz 13149734 BLAKE2B 49493f2b088305f2d4a7502201c233304dc149dc96f4da2a3e93341e2d4e094fc6cdbc7c0d60cf25b97e698120065378408b557b2b0237d6afda7d1ed534487d SHA512 1db98fcc0ef4c018cd00a2c540bc60a47dd3b161f5128337e4a2f0bcce792273b9902108dc01e7d091a3331d9e35f8ab53503cbdba3f2a3cb3865471e7f63baf +EBUILD torchvision-0.20.0.ebuild 2123 BLAKE2B c0bf80ad7e21fb3ceafb7daf3d1828772393c1b77b456029ca4c5d1c9bb2cd27bd776edaf366a03bc84e954455511165b05f365c875ccc5f11b56eb0237a0446 SHA512 97589f5e6a08f6cf83de4cf91984add39c816548e2bbfef5db22cc44256858581c65ddf236520b2ce44129b1c3e5766da0bf98fa66bb08b69d964a348dafb7f2 +MISC metadata.xml 327 BLAKE2B e101d8dc63891696a8a17c908253b6302aeb9623b57cc67ad051e9f7df0fb693fe5360e8b41127eba78584c99caf105e5a1f5a76fad74a435dab99808a73d9eb SHA512 6e3d0588c3724fa18573df4001c81e40eb6fb93bb2254f8d03d8e9a908fbf89b8d734ed0f6549e2a4460f905c2daabfe125137e1f39cd4b6830ef2369f4ee91a diff --git a/sci-libs/torchvision/files/torchvision-0.20.0-gentoo.patch b/sci-libs/torchvision/files/torchvision-0.20.0-gentoo.patch new file mode 100644 index 000000000000..2633660cafa5 --- /dev/null +++ b/sci-libs/torchvision/files/torchvision-0.20.0-gentoo.patch @@ -0,0 +1,19 @@ +--- a/setup.py 2025-02-22 16:44:42.102439182 +0100 ++++ b/setup.py 2025-02-22 16:46:52.393841294 +0100 +@@ -6,6 +6,7 @@ + import subprocess + import sys + import warnings ++import shlex + from pathlib import Path + + import torch +@@ -127,7 +128,7 @@ + if NVCC_FLAGS is None: + nvcc_flags = [] + else: +- nvcc_flags = nvcc_flags.split(" ") ++ nvcc_flags = shlex.split(NVCC_FLAGS) + extra_compile_args["nvcc"] = nvcc_flags + + if sys.platform == "win32": diff --git a/sci-libs/torchvision/metadata.xml b/sci-libs/torchvision/metadata.xml new file mode 100644 index 000000000000..c79707bc8e29 --- /dev/null +++ b/sci-libs/torchvision/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>tupone@gentoo.org</email> + <name>Alfredo Tupone</name> + </maintainer> + <upstream> + <remote-id type="github">pytorch/vision</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/torchvision/torchvision-0.20.0.ebuild b/sci-libs/torchvision/torchvision-0.20.0.ebuild new file mode 100644 index 000000000000..c0a1f3942189 --- /dev/null +++ b/sci-libs/torchvision/torchvision-0.20.0.ebuild @@ -0,0 +1,78 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 +inherit cuda distutils-r1 multiprocessing + +DESCRIPTION="Datasets, transforms and models to specific to computer vision" +HOMEPAGE="https://github.com/pytorch/vision" +SRC_URI="https://github.com/pytorch/vision/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +S="${WORKDIR}"/vision-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda" + +RDEPEND=" + =sci-libs/pytorch-2.5*[${PYTHON_SINGLE_USEDEP}] + =sci-libs/caffe2-2.5*[cuda?] + dev-python/numpy + dev-python/pillow + media-libs/libjpeg-turbo:= + media-libs/libpng:= +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/lmdb[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_prepare() { + use cuda && cuda_src_prepare + distutils-r1_src_prepare +} + +distutils_enable_tests pytest + +python_compile() { + addpredict /dev/kfd + + FORCE_CUDA=$(usex cuda 1 0) \ + NVCC_FLAGS="${NVCCFLAGS}" \ + MAX_JOBS="$(makeopts_jobs)" \ + distutils-r1_python_compile -j1 +} + +python_test() { + rm -rf torchvision || die + + local EPYTEST_DESELECT=( + test/test_backbone_utils.py::TestFxFeatureExtraction::test_forward_backward + test/test_backbone_utils.py::TestFxFeatureExtraction::test_jit_forward_backward + test/test_models.py::test_classification_model + test/test_extended_models.py::TestHandleLegacyInterface::test_pretrained_pos + test/test_extended_models.py::TestHandleLegacyInterface::test_equivalent_behavior_weights + test/test_image.py::test_decode_bad_encoded_data + test/test_image.py::test_decode_webp + test/test_models.py::test_quantized_classification_model + test/test_ops.py::test_roi_opcheck + test/test_ops.py::TestDeformConv::test_aot_dispatch_dynamic__test_backward + test/test_ops.py::TestDeformConv::test_aot_dispatch_dynamic__test_forward + test/test_videoapi.py::TestVideoApi::test_frame_reading_mem_vs_file + test/test_videoapi.py::TestVideoApi::test_metadata + ) + epytest +} diff --git a/sci-libs/transformers/Manifest b/sci-libs/transformers/Manifest index 6a11ab949c2b..e241ee15a2b6 100644 --- a/sci-libs/transformers/Manifest +++ b/sci-libs/transformers/Manifest @@ -1,3 +1,7 @@ -DIST transformers-4.45.2.gh.tar.gz 19105135 BLAKE2B 7bccd916de08d480789597c76f042b3941663e9bc9882c9c6b2c3d12ca49a505725ebc944306318fe5f418a36105247ef0729b8a8afc63adfe7c321a2367dea1 SHA512 1006949935b44d6ae0dc464cef9cc23b6c2074ef4a4947c4296ae177fb5348ea8ab0f4fed7da01ed9b67e20985494b07820605b396c30fd02d3ecc01549746d2 -EBUILD transformers-4.45.2.ebuild 1074 BLAKE2B dd3872eb7b640e84476e7c33cf32e0115c6a9ffb088ea790ec2905c0fedf0b87289c6114c566aef752dcf54a0a837747066b5bc7050f5c2f64592bf7a9d7971b SHA512 40307ef58aa1bb6687f0aac32a12ba641b11dc6c20edc624b895dc251cba00da0fc4079867e137c55fdc68d44621d9caa9e3cb2d6eb405e44d4f359a959d430c +DIST transformers-4.47.1.gh.tar.gz 19755552 BLAKE2B 7fbfde2f4b84ffcf411ead2b1c7d43ce0cd9615795dee6bf7271c5c17a125537d87506a4c663e454e10938f7482cf4acc14972cbaa50ef8884ecbc091c346b8d SHA512 105f60899aa05fb9e1e79b8e2e7c60ec5463c73707f8b77f744ad0ac0e83c6e8cd38d1838f74e93377891617b9f0e0d58533cf083db2550999f33a34c159b1c8 +DIST transformers-4.48.3.gh.tar.gz 19569408 BLAKE2B 563c93580742ca2357509812292a31b9416f111653193ee030a36b55a7f055b16f9f041cc515ff56ba5b496aa1032fb41d5fff471111c47d24ba9cf7b8c632db SHA512 eac0c6ff05b4be10653ad98fcbf4f5ae9377e331cf23040fc304823783c5013be8e56c428fb928534c322bffb58255e8a3ffae74f9786fc0046a0fe6e0d9da16 +DIST transformers-4.49.0.gh.tar.gz 19922847 BLAKE2B 66d70f417099b46183755bf705c9d2fa522c5e33c508cf5054b9fba260fd0e3011198d3eccae6671bcc02014836e3055712e0462e00551a34c5a89c430116a41 SHA512 72439dd4535a1622d57230a0180d5f3d96a53e450978e7916fb93638d5a1aeb0da775f1f6b189cc8a3be9d1bd557ab70a2ea90455a5b5129d2067b5ec61e49b8 +EBUILD transformers-4.47.1.ebuild 4560 BLAKE2B 3c2d5b9ff0ca162b1dd312e235ff1a2f0be255d1ed58a8aaba018a6d057cc5a28e66962022d1477491e119a4fa4c4a2418855c09226556a00a8f6cfe32a4491e SHA512 e8de46fa297eb4b2c055866fb94b23d5a8d7540f0d316515ddc0bb44725cdf1584cedd65273cd5e94c3fc22ae055695a790ee86a454fb98d09e45dd0c07c82fa +EBUILD transformers-4.48.3.ebuild 4788 BLAKE2B 75d579d38e607bbe38b433592beda7061a834a2f911effad144747177ce28320befe520a62d57a459291f004d3d567ffd59a6cd0646ad1e5f0a6a88d8ca30d3f SHA512 b56a0539587ae55ca69ae17a1951f9cff3072a2e1b9aa652a82758c01096c0c2da5b94451d3599b926bd509cf1bf96b7f111c53106710c08e6edaeb4e6801efa +EBUILD transformers-4.49.0.ebuild 4795 BLAKE2B 207d7fb010df0aae736e943202aff3f0a7e352fba6b2f8cdd0b7a0a8833924f77256a16a5830d899244199008272dc18fe9b7cc2175f9df3ecb5ccdd4516f930 SHA512 f36627f7c45ffe6ded3fb2099e92631cee61a3fa5274b7765f3442ce399e0b429a685012f749df9102ebfc0cc0edbbda0432dad43d2dc41e2741b6d34e0fab34 MISC metadata.xml 387 BLAKE2B 3f22d78a1aa32d40204f0c028a564cae5950a3294a7f0ed13c171683a63d2e62892a3740834735a5165745bb477538ac75826fd0c495883bacb32fe22d124621 SHA512 f800c33c27db9b23289e0086f82a80c593b7eeca00cec7bd9c3619e4f074878302c9110117d1a4ddaf789c53a58c4b274d46f4bcea9b8eec477b4fcf8e317a29 diff --git a/sci-libs/transformers/transformers-4.45.2.ebuild b/sci-libs/transformers/transformers-4.45.2.ebuild deleted file mode 100644 index 00493e1100e1..000000000000 --- a/sci-libs/transformers/transformers-4.45.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 - -DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" -HOMEPAGE=" - https://pypi.org/project/transformers/ - https://huggingface.co/ -" -SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -RESTRICT="test" # Need some modules, not yet packaged - -RDEPEND=" - =sci-libs/tokenizers-0.20*[${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/filelock[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] - sci-libs/huggingface_hub[${PYTHON_USEDEP}] - >=sci-libs/safetensors-0.4.1[${PYTHON_USEDEP}] - ') -" - -distutils_enable_tests pytest diff --git a/sci-libs/transformers/transformers-4.47.1.ebuild b/sci-libs/transformers/transformers-4.47.1.ebuild new file mode 100644 index 000000000000..262bf065885b --- /dev/null +++ b/sci-libs/transformers/transformers-4.47.1.ebuild @@ -0,0 +1,114 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" +HOMEPAGE=" + https://pypi.org/project/transformers/ + https://huggingface.co/ +" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" # Need some modules, not yet packaged, need network + +RDEPEND=" + =sci-libs/tokenizers-0.21*[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + sci-libs/huggingface_hub[${PYTHON_USEDEP}] + >=sci-libs/safetensors-0.4.1[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/timeout-decorator[${PYTHON_USEDEP}] + ') +" + +distutils_enable_tests pytest + +src_test() { + local EPYTEST_IGNORE=( + tests/deepspeed/test_deepspeed.py + tests/deepspeed/test_model_zoo.py + tests/fsdp/test_fsdp.py + tests/models/audio_spectrogram_transformer/test_feature_extraction_audio_spectrogram_transformer.py + tests/models/bartpho/test_tokenization_bartpho.py + tests/models/beit/test_image_processing_beit.py + tests/models/big_bird/test_modeling_big_bird.py + tests/models/clap/test_feature_extraction_clap.py + tests/models/clip/test_image_processing_clip.py + tests/models/clvp/test_feature_extraction_clvp.py + tests/models/conditional_detr/test_image_processing_conditional_detr.py + tests/models/cpm/test_tokenization_cpm.py + tests/models/dac/test_feature_extraction_dac.py + tests/models/encodec/test_feature_extraction_encodec.py + tests/models/grounding_dino/test_image_processing_grounding_dino.py + tests/models/idefics/test_image_processing_idefics.py + tests/models/idefics2/test_image_processing_idefics2.py + tests/models/layoutxlm/test_processor_layoutxlm.py + tests/models/layoutxlm/test_tokenization_layoutxlm.py + tests/models/llava_next/test_image_processing_llava_next.py + tests/models/llava_next_video/test_image_processing_llava_next_video.py + tests/models/llava_onevision/test_image_processing_llava_onevision.py + tests/models/markuplm/test_feature_extraction_markuplm.py + tests/models/mask2former/test_image_processing_mask2former.py + tests/models/maskformer/test_image_processing_maskformer.py + tests/models/mluke/test_tokenization_mluke.py + tests/models/musicgen_melody/test_feature_extraction_musicgen_melody.py + tests/models/nllb/test_tokenization_nllb.py + tests/models/oneformer/test_image_processing_oneformer.py + tests/models/oneformer/test_processor_oneformer.py + tests/models/pix2struct/test_image_processing_pix2struct.py + tests/models/pop2piano/test_feature_extraction_pop2piano.py + tests/models/qwen2_audio/test_modeling_qwen2_audio.py + tests/models/qwen2_vl/test_image_processing_qwen2_vl.py + tests/models/seamless_m4t/test_feature_extraction_seamless_m4t.py + tests/models/seamless_m4t/test_processor_seamless_m4t.py + tests/models/segformer/test_image_processing_segformer.py + tests/models/seggpt/test_image_processing_seggpt.py + tests/models/speech_to_text/test_feature_extraction_speech_to_text.py + tests/models/speech_to_text/test_processor_speech_to_text.py + tests/models/speech_to_text/test_tokenization_speech_to_text.py + tests/models/speecht5/test_feature_extraction_speecht5.py + tests/models/speecht5/test_processor_speecht5.py + tests/models/speecht5/test_tokenization_speecht5.py + tests/models/superpoint/test_image_processing_superpoint.py + tests/models/trocr/test_processor_trocr.py + tests/models/univnet/test_feature_extraction_univnet.py + tests/models/wav2vec2/test_feature_extraction_wav2vec2.py + tests/models/whisper/test_feature_extraction_whisper.py + tests/models/yolos/test_image_processing_yolos.py + tests/repo_utils/test_check_docstrings.py + tests/repo_utils/test_tests_fetcher.py + tests/trainer/test_trainer.py + tests/trainer/test_trainer_callback.py + tests/trainer/test_trainer.py + tests/trainer/test_trainer_callback.py + ) + + local EPYTEST_DESELECT=( + tests/agents/test_agents.py::AgentTests::test_init_agent_with_different_toolsets + ) + + EPYTEST_FLAGS="--dist=loadfile -s ./tests/" + + distutils-r1_src_test +} diff --git a/sci-libs/transformers/transformers-4.48.3.ebuild b/sci-libs/transformers/transformers-4.48.3.ebuild new file mode 100644 index 000000000000..b7e1221a6232 --- /dev/null +++ b/sci-libs/transformers/transformers-4.48.3.ebuild @@ -0,0 +1,118 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" +HOMEPAGE=" + https://pypi.org/project/transformers/ + https://huggingface.co/ +" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" # Need network, too long to execute + +RDEPEND=" + =sci-libs/tokenizers-0.21*[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + sci-libs/huggingface_hub[${PYTHON_USEDEP}] + >=sci-libs/safetensors-0.4.1[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/timeout-decorator[${PYTHON_USEDEP}] + ') +" + +distutils_enable_tests pytest + +src_test() { + local EPYTEST_IGNORE=( + tests/deepspeed/test_deepspeed.py + tests/deepspeed/test_model_zoo.py + tests/fsdp/test_fsdp.py + tests/models/audio_spectrogram_transformer/test_feature_extraction_audio_spectrogram_transformer.py + tests/models/bartpho/test_tokenization_bartpho.py + tests/models/beit/test_image_processing_beit.py + tests/models/big_bird/test_modeling_big_bird.py + tests/models/clap/test_feature_extraction_clap.py + tests/models/clip/test_image_processing_clip.py + tests/models/clvp/test_feature_extraction_clvp.py + tests/models/conditional_detr/test_image_processing_conditional_detr.py + tests/models/cpm/test_tokenization_cpm.py + tests/models/dac/test_feature_extraction_dac.py + tests/models/encodec/test_feature_extraction_encodec.py + tests/models/grounding_dino/test_image_processing_grounding_dino.py + tests/models/idefics/test_image_processing_idefics.py + tests/models/idefics2/test_image_processing_idefics2.py + tests/models/layoutxlm/test_processor_layoutxlm.py + tests/models/layoutxlm/test_tokenization_layoutxlm.py + tests/models/llava_next/test_image_processing_llava_next.py + tests/models/llava_next_video/test_image_processing_llava_next_video.py + tests/models/llava_onevision/test_image_processing_llava_onevision.py + tests/models/markuplm/test_feature_extraction_markuplm.py + tests/models/marian/test_modeling_marian.py + tests/models/mask2former/test_image_processing_mask2former.py + tests/models/maskformer/test_image_processing_maskformer.py + tests/models/mluke/test_tokenization_mluke.py + tests/models/musicgen_melody/test_feature_extraction_musicgen_melody.py + tests/models/nllb/test_tokenization_nllb.py + tests/models/oneformer/test_image_processing_oneformer.py + tests/models/oneformer/test_processor_oneformer.py + tests/models/pix2struct/test_image_processing_pix2struct.py + tests/models/pop2piano/test_feature_extraction_pop2piano.py + tests/models/qwen2_audio/test_modeling_qwen2_audio.py + tests/models/qwen2_vl/test_image_processing_qwen2_vl.py + tests/models/seamless_m4t/test_feature_extraction_seamless_m4t.py + tests/models/seamless_m4t/test_processor_seamless_m4t.py + tests/models/segformer/test_image_processing_segformer.py + tests/models/seggpt/test_image_processing_seggpt.py + tests/models/speech_to_text/test_feature_extraction_speech_to_text.py + tests/models/speech_to_text/test_processor_speech_to_text.py + tests/models/speech_to_text/test_tokenization_speech_to_text.py + tests/models/speecht5/test_feature_extraction_speecht5.py + tests/models/speecht5/test_processor_speecht5.py + tests/models/speecht5/test_tokenization_speecht5.py + tests/models/superpoint/test_image_processing_superpoint.py + tests/models/textnet/test_image_processing_textnet.py + tests/models/trocr/test_processor_trocr.py + tests/models/univnet/test_feature_extraction_univnet.py + tests/models/vitpose/test_image_processing_vitpose.py + tests/models/wav2vec2/test_feature_extraction_wav2vec2.py + tests/models/whisper/test_feature_extraction_whisper.py + tests/models/yolos/test_image_processing_yolos.py + tests/repo_utils/test_check_docstrings.py + tests/repo_utils/test_tests_fetcher.py + tests/trainer/test_trainer.py + tests/trainer/test_trainer_callback.py + tests/trainer/test_trainer.py + tests/trainer/test_trainer_callback.py + ) + + local EPYTEST_DESELECT=( + tests/agents/test_agents.py::AgentTests::test_init_agent_with_different_toolsets + tests/models/textnet/test_image_processing_textnet.py::TextNetImageProcessingTester + ) + + EPYTEST_FLAGS="--dist=loadfile -s ./tests/" + + distutils-r1_src_test +} diff --git a/sci-libs/transformers/transformers-4.49.0.ebuild b/sci-libs/transformers/transformers-4.49.0.ebuild new file mode 100644 index 000000000000..c25cee353474 --- /dev/null +++ b/sci-libs/transformers/transformers-4.49.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +DESCRIPTION="State-of-the-art Machine Learning for JAX, PyTorch and TensorFlow" +HOMEPAGE=" + https://pypi.org/project/transformers/ + https://huggingface.co/ +" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" # Need network, too long to execute + +RDEPEND=" + =sci-libs/tokenizers-0.21*[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/filelock[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + >=sci-libs/huggingface_hub-0.26[${PYTHON_USEDEP}] + >=sci-libs/safetensors-0.4.1[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/timeout-decorator[${PYTHON_USEDEP}] + ') +" + +distutils_enable_tests pytest + +src_test() { + local EPYTEST_IGNORE=( + tests/deepspeed/test_deepspeed.py + tests/deepspeed/test_model_zoo.py + tests/fsdp/test_fsdp.py + tests/models/audio_spectrogram_transformer/test_feature_extraction_audio_spectrogram_transformer.py + tests/models/bartpho/test_tokenization_bartpho.py + tests/models/beit/test_image_processing_beit.py + tests/models/big_bird/test_modeling_big_bird.py + tests/models/clap/test_feature_extraction_clap.py + tests/models/clip/test_image_processing_clip.py + tests/models/clvp/test_feature_extraction_clvp.py + tests/models/conditional_detr/test_image_processing_conditional_detr.py + tests/models/cpm/test_tokenization_cpm.py + tests/models/dac/test_feature_extraction_dac.py + tests/models/encodec/test_feature_extraction_encodec.py + tests/models/grounding_dino/test_image_processing_grounding_dino.py + tests/models/idefics/test_image_processing_idefics.py + tests/models/idefics2/test_image_processing_idefics2.py + tests/models/layoutxlm/test_processor_layoutxlm.py + tests/models/layoutxlm/test_tokenization_layoutxlm.py + tests/models/llava_next/test_image_processing_llava_next.py + tests/models/llava_next_video/test_image_processing_llava_next_video.py + tests/models/llava_onevision/test_image_processing_llava_onevision.py + tests/models/markuplm/test_feature_extraction_markuplm.py + tests/models/marian/test_modeling_marian.py + tests/models/mask2former/test_image_processing_mask2former.py + tests/models/maskformer/test_image_processing_maskformer.py + tests/models/mluke/test_tokenization_mluke.py + tests/models/musicgen_melody/test_feature_extraction_musicgen_melody.py + tests/models/nllb/test_tokenization_nllb.py + tests/models/oneformer/test_image_processing_oneformer.py + tests/models/oneformer/test_processor_oneformer.py + tests/models/pix2struct/test_image_processing_pix2struct.py + tests/models/pop2piano/test_feature_extraction_pop2piano.py + tests/models/qwen2_audio/test_modeling_qwen2_audio.py + tests/models/qwen2_vl/test_image_processing_qwen2_vl.py + tests/models/seamless_m4t/test_feature_extraction_seamless_m4t.py + tests/models/seamless_m4t/test_processor_seamless_m4t.py + tests/models/segformer/test_image_processing_segformer.py + tests/models/seggpt/test_image_processing_seggpt.py + tests/models/speech_to_text/test_feature_extraction_speech_to_text.py + tests/models/speech_to_text/test_processor_speech_to_text.py + tests/models/speech_to_text/test_tokenization_speech_to_text.py + tests/models/speecht5/test_feature_extraction_speecht5.py + tests/models/speecht5/test_processor_speecht5.py + tests/models/speecht5/test_tokenization_speecht5.py + tests/models/superpoint/test_image_processing_superpoint.py + tests/models/textnet/test_image_processing_textnet.py + tests/models/trocr/test_processor_trocr.py + tests/models/univnet/test_feature_extraction_univnet.py + tests/models/vitpose/test_image_processing_vitpose.py + tests/models/wav2vec2/test_feature_extraction_wav2vec2.py + tests/models/whisper/test_feature_extraction_whisper.py + tests/models/yolos/test_image_processing_yolos.py + tests/repo_utils/test_check_docstrings.py + tests/repo_utils/test_tests_fetcher.py + tests/trainer/test_trainer.py + tests/trainer/test_trainer_callback.py + tests/trainer/test_trainer.py + tests/trainer/test_trainer_callback.py + ) + + local EPYTEST_DESELECT=( + tests/agents/test_agents.py::AgentTests::test_init_agent_with_different_toolsets + tests/models/textnet/test_image_processing_textnet.py::TextNetImageProcessingTester + ) + + EPYTEST_FLAGS="--dist=loadfile -s ./tests/" + + distutils-r1_src_test +} |