diff options
Diffstat (limited to 'sci-libs')
327 files changed, 8891 insertions, 6597 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 054b113dc427..2b3f54c7c7c1 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/NNPACK/Manifest b/sci-libs/NNPACK/Manifest index 1fe6049cd827..7b38e893ae2c 100644 --- a/sci-libs/NNPACK/Manifest +++ b/sci-libs/NNPACK/Manifest @@ -1,4 +1,4 @@ AUX NNPACK-2020.12.22-gentoo.patch 6218 BLAKE2B 1bc9d1bb20504b90d99492fd0c93324830aa84a58a59101288677ba0d622c5a50e8f6181089fef1e14d14f563824a9c42979387e6f3efbb0add3211d68f6ce6c SHA512 1a52cc158c4c6259a9f5fbd8ce40f8647a96ce7c7f67bbdcfe495647b75f6c2f5baa826390b8474f48a91ee4a043bfb2085915730f0dd32f4edd34a733b2cc13 DIST NNPACK-2020.12.22.tar.gz 219318 BLAKE2B 6b6619c8a706ef9630f20fda1e276314b2ef7f6c9aed26836a48bdaa0ae198a86383e68b04c651f37c07d34e400bc54b5daa75b06fc18cdb0a9c55e2cb33bbe1 SHA512 f0b261e8698b412d12dd739e5d0cf71c284965ae28da735ae22814a004358ba3ecaea6cd26fa17b594c0245966b7dd2561c1e05c6cbf0592fd7b85ea0f21eb37 -EBUILD NNPACK-2020.12.22-r2.ebuild 1122 BLAKE2B 97ea9e94d738eba05a93b442eccba63193e6e819bf8147c6cc2ea234ffbaeb2afd31ac85b84244d25c62336b0a420c0eb728950fc9353df13f7fd8311440fc25 SHA512 3c1b621dbfb87941518c92618ed32cf352c71dc33120bcd131de321112f17ceec0977b0505245f3519d3e687e2ef402a57af28b45cb76c7181ec350c09347c31 +EBUILD NNPACK-2020.12.22-r3.ebuild 1124 BLAKE2B 56cdfbd8b679f0c56d6e2ddfc15fcbb46d4daed1408e34f2dc164b6117866621aae50ae8ea980caa3647861101d3a0b6040bd556ef749991dc539c817df34aaa SHA512 9f4c6ad47f6b518c4cbfcfdd7e4782b72756868cacb2b91a4e6ff0678e3ed72cf75dd25518cf6c77e8782bb837a94c9856e8f732cc56865d927013250b626d27 MISC metadata.xml 331 BLAKE2B 433021dbfc82b3a36aa6e63f719c18bf785cd23fa150cb1e546f01a138b06dbfa81b2fd1588fe33ebcf4c50731c173ce2bfc87e2ff4b7f1bb2e80a62b2cca82a SHA512 3499be333f3ed44729a9abb464cdcdcb39f01bb7da604433db73654886ff8e340e176cfbdcd95479e6805753e735f185d621186ab9e317ee99cbc0458970a10b diff --git a/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild b/sci-libs/NNPACK/NNPACK-2020.12.22-r3.ebuild index 73905610fde2..413cbf8eac5e 100644 --- a/sci-libs/NNPACK/NNPACK-2020.12.22-r2.ebuild +++ b/sci-libs/NNPACK/NNPACK-2020.12.22-r3.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 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-any-r1 +inherit cmake python-single-r1 CommitId=c07e3a0400713d546e0dea2d5466dd22ea389c73 @@ -20,30 +20,28 @@ SLOT="0" KEYWORDS="~amd64" IUSE=test RESTRICT="test" # consuming too much CPU +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" + ${PYTHON_DEPS} dev-libs/pthreadpool dev-libs/cpuinfo + $(python_gen_cond_dep ' + <=dev-libs/FP16-2024.05.27[${PYTHON_USEDEP}] + dev-python/peachpy[${PYTHON_USEDEP}] + ') " DEPEND="${RDEPEND} - dev-libs/FP16 dev-libs/FXdiv dev-libs/psimd " BDEPEND=" - ${PYTHON_DEPS} + ${RDEPEND} test? ( dev-cpp/gtest ) - $(python_gen_any_dep ' - dev-python/peachpy[${PYTHON_USEDEP}] - ') " PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -python_check_deps() { - python_has_version "dev-python/peachpy[${PYTHON_USEDEP}]" -} - src_prepare() { sed -i -e "/-O/d" CMakeLists.txt || die cmake_src_prepare diff --git a/sci-libs/XNNPACK/Manifest b/sci-libs/XNNPACK/Manifest index 1ae0bff2ac93..a644375b79ef 100644 --- a/sci-libs/XNNPACK/Manifest +++ b/sci-libs/XNNPACK/Manifest @@ -1,8 +1,11 @@ AUX XNNPACK-2022.02.17-gentoo.patch 434 BLAKE2B 23c3f9b2f368c827f9ee13da6bec050aeeb2caf7c9ff17bd1b3a4ece60f15d2e0cbfd2aab655d643e85dc0ee0b7514834d487bf1befa68331aee86ca51530e61 SHA512 38f42606a83d6fc8ee74c2ca547c9bdad9c4e38393efa22757716b76c7f527a4648f67828bb39b9e7cf044860b087fce174eea156dc8cd54907d3e863f264bdc +AUX XNNPACK-2024.11.08-gentoo.patch 1093 BLAKE2B 46cdae35701b235ac8d82078ac499c5bceb887ff91674eb7105d5f7a880828f30a800998073c7f4cd8e96d838b89dc847740383d09e5b77d76798d75dee2baff SHA512 7e4da685a071ff6ff503633eda8d36b71d5e3eacf642e805bfbdaa7df768462b9d3be2131433adb5c6dadd808dfc14f11576d105910544e7753a4b5c2ff00ba6 DIST XNNPACK-2022.02.17.tar.gz 6761154 BLAKE2B 59be5d9efe6f46d22bc41d3152e6cd3103f6dfafd94cdf3229b86ecf44a46175c613760f3de35c98a24ccdec1783f205c1eceaf21133706fedd5f384529748eb SHA512 aacbe907bb2b7429143f4ec612881fb709fe37e7b3a7f4fd68193dee6bbe82e17d20b2c6f5a8025845a09f8269c1dfeaebfc5bd64ef196fa376d82ac9a44cb8f DIST XNNPACK-2022.12.22.tar.gz 8342018 BLAKE2B 50426a47121418ef00a29b390ab4bb28211c17faaa7f4eacbf3a363fc3511b8655687e7f7f93f13b06a72ff9bcbde033305372687b6f2df1e1d5abaa910fe8be SHA512 1742ad4de3aa1a67cd5a3cbf15d82afc2cc8569a2abac92542f748a440ef37fef4e9d9c302b7b2813e3176934b637c761c1c0956d20ab1ba28b280d9b121d91b DIST XNNPACK-2024.02.29.tar.gz 11561561 BLAKE2B bb3666edbf2ad87f4b6ba9dcaf28b3ed056b655bfa02e6f9bc350ce84db247ef3e0a6f9f908a0e05244e4b145b6993d465cd19ca763067ae619a7f94b97dc7bd SHA512 8063e27686f7b71cfba05b0c004c46db4506638689ffb112f013b3886de58653b60ca5487978c3f96275c17bb1136883ca4c93ddb2241a2c31925a950cb51759 +DIST XNNPACK-2024.11.08.tar.gz 8923022 BLAKE2B 1e73ffc1e5d1e1248272910860e59a471b52f207945f0049188d64b944e442fd2bc814105b2fef59e9ec295e9871cae0a805de485a047f9eacedcee2695d6e99 SHA512 b9e711e1c69a24e347f64ee21c60a609bff25e36153216382acd3d431e466b127eea81b1d80f00f84699a426c44f8a3566d9b95d0e87079c34f527e05c2db787 EBUILD XNNPACK-2022.02.17-r1.ebuild 1759 BLAKE2B 843b810e0c954364d486a72be711e16e6c1f338ef601f36ff4910fadc95a5c90c1a5649cacc04d6005f2b37ebe9a53b416aafdf73d885d4ddfb2946a56cfb310 SHA512 4c4cfb0cd4640fa72979895384abf3c03a820cf6aa04d578be354cbe516227379b0b1f2142ea0fd4a7bab861226ded30b9b1e0fcfdf8f1cfc9f894b403f75006 EBUILD XNNPACK-2022.12.22.ebuild 1829 BLAKE2B 6e60bad3f9846a1d0571d61c2b5ea9fdb3c587a02328c7491f2020200a9b0d6233856a76034f4782f6ba3eca928fb231679a58e5df8e29cf25e98db541366418 SHA512 9b1088dffd03929dbc0fb77a829afcf414647c7d69e668be5cf6a410b348e31b0fb2136bf827fd6305795cb0ef10b2b3c798387c21ea5d4e4545184994eb1eb9 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-2024.11.08.ebuild b/sci-libs/XNNPACK/XNNPACK-2024.11.08.ebuild new file mode 100644 index 000000000000..ea77e1c773da --- /dev/null +++ b/sci-libs/XNNPACK/XNNPACK-2024.11.08.ebuild @@ -0,0 +1,86 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake flag-o-matic + +CommitId=4ea82e595b36106653175dcb04b2aa532660d0d8 + +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-2023.11.04 + 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() { + dropTest=( + 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(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_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 +} 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 2d84fa7d26aa..573a9f8b161c 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -2,19 +2,17 @@ AUX caffe2-2.4.0-cpp-httplib.patch 414 BLAKE2B fabe646c86f4c6736600fa44733ab6ea2 AUX caffe2-2.4.0-cstdint.patch 263 BLAKE2B 52705466cc1f170f7c6f6ef2474fd92b294e8a07e6ab640804efa38e7e0526a72e7ff51c3b214662cc586eac7118b768b1a40df62a133834d617d5c8f7a712db SHA512 22f3c024ca11fe4483263956825f8190245c61eb6f200d1466a734a927729a0e3bc244d77050c85403b469ea647046941b5ba42e59c4f6410f8c8fa192de4268 AUX caffe2-2.4.0-libfmt-11.patch 1560 BLAKE2B 816201b6abc3ad4c4924c649905068306f3a0c674eab36fb6a6772b84d2bf0806dd55d586d6873952b0eac56afae00513966071a380b9e60eff3c668e6aec737 SHA512 acdc879f2ed8ae546a6ce4db1b63faba3b6672374c61940d58e0c2b747c4b0d8d38fb34a2e66f3805f9f328fd4e0115dd705b541871b2fd99a2782756ca583e5 AUX caffe2-2.5.1-cudnn_include_fix.patch 587 BLAKE2B 8ffeb9080ee77b953e7a77c9bea9af8c078adf147c314e07cf40d6f9ce1c988ac201e282ffd67a29703ced5885329d44be013c54cf3ba870c009aed40e65fefc SHA512 b37427e35d8147e603331eb344a3542ed31d0b133df3c7ce10ebecec93b1d09d040f77c33f23f70e9835db10fa209c0318b89b70b3b91263655d160ed737d6f3 -AUX caffe2-2.5.1-exclude-aotriton.patch 1107 BLAKE2B d1e0289c6e937b9f6611b1ffd5eb8398594839f8c7edd8be99be4b29d33b0466dbf9cc16c6eaaf6d71e3defd217651516272d7791a318c0afd7c15b162a4b5e9 SHA512 24079cc24361d07170276ea7e9771ec8e00ab849d42344a33d1eb3885bc963b21a9a5bc0f56a5a22b3896253010f0d6c14aa4dbeff3f9adb4bd3d20769eafb81 -AUX caffe2-2.5.1-fix-functorch-install.patch 448 BLAKE2B f8b0ebfe0cdb8318bc376d8afb2ece66ac6ef23e7f57f9f0371aa99c55fd6663f34392c5c696333144e6523f5ceada4fe4978b0db68db5e8ab5d761e42cbdfe9 SHA512 3cc38769df9f5d96b108c0235bd7a5346f591bd826d8156fb0bdf3735e147fa541f7df4baeb72af6f3509cf3bcbd640889c6f4ed2c98c5be12e28c3a88042287 AUX caffe2-2.5.1-gentoo.patch 5181 BLAKE2B 146e49ea90dbdd3bfb12a8f1b135b9ac8ed849c408a81081a5308c8dd761e1b3a8e714b905c2b88a785f436123347899b7a72eccacc2fbc54d9efad2d1dc3550 SHA512 885e79edc67d7eff1e895bdd3589704220714b6024635444dac1452e41a947c2b2a4a33866acbfc19af66d42f340038395aeb53d1477294712578e4bdbe06673 AUX caffe2-2.5.1-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8ff65ef9ca9ea1e5ad93ecef3cbaa595808105bbf6c8d3dcb9047559d23bc0398cda5922fb41e29a7588644c90c90fd8 SHA512 5873f11930ae5947c7dfbb19d0377d5535e395fcc1ab213e3c65c77b2e3bd911efc11cde2ca3e7134e9e7798ca7a483910113f331c0a23b73a5546aaaded40c5 -AUX caffe2-2.5.1-install-dirs.patch 542 BLAKE2B 7a96287f826a44c7a1eee3f44516c5e4e3011a5ddf864aeb7c4ae9a363d89d393fec4c2c86677c2cd3cc38c345323eba3d6b4c9d6686ee13e16a1c4acbdc1f18 SHA512 79de43b4bdcf1cb609bf953f3d698a38231a76f299296b1cc131639f6b0e1d29f634ac9c6858d52742e988c94d39cb5a3daa1bf36d6dc1bf6a1354ca055e5edf 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 8655 BLAKE2B d6ff077b69ba62b5e5c5d2c2b72c18f8125ba4f21d79fec139c0bedbdaf323adb8e3b1a904570fe30f73aa9e568ac3f368ac9f3855540d803e0e10b29ff58a61 SHA512 b78f8bf92a57a1dcb96cc4c07e79bc783e3d8afbeb2340ce8512aa7b9602361026257a82980baec8152d0f5e893f2b9cacd0384fcde44e88177099e9239d378f +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 8cb8a0b152fa..0e476ce00275 100644 --- a/sci-libs/caffe2/caffe2-2.5.1-r7.ebuild +++ b/sci-libs/caffe2/caffe2-2.5.1-r8.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 @@ -90,13 +90,14 @@ 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 ) " DEPEND=" ${RDEPEND} + qnnpack? ( dev-libs/clog ) cuda? ( <=dev-libs/cutlass-3.4.1 ) onednn? ( sci-libs/ideep ) dev-libs/psimd @@ -146,6 +147,7 @@ src_prepare() { -e "/EXPORT/s|DESTINATION lib)|DESTINATION $(get_libdir))|" \ c10/cuda/CMakeLists.txt \ c10/CMakeLists.txt \ + c10/hip/CMakeLists.txt \ || die cmake_src_prepare 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.5.1-exclude-aotriton.patch b/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch deleted file mode 100644 index 340d6e45c95a..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.5.1-exclude-aotriton.patch +++ /dev/null @@ -1,22 +0,0 @@ -Disables aotriton download when both USE_FLASH_ATTENTION and USE_MEM_EFF_ATTENTION cmake flags are OFF -Backports upstream PR to 2.3.0: https://github.com/pytorch/pytorch/pull/130197 ---- a/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp -+++ b/aten/src/ATen/native/transformers/cuda/sdp_utils.cpp -@@ -659,7 +659,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) { - array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16); - constexpr auto less_than_sm80_mem_efficient_dtypes = - array_of<at::ScalarType>(at::kHalf, at::kFloat); --#ifdef USE_ROCM -+#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION) - constexpr auto aotriton_mem_efficient_dtypes = - array_of<at::ScalarType>(at::kHalf, at::kFloat, at::kBFloat16); - #endif -@@ -709,7 +709,7 @@ bool can_use_mem_efficient_attention(sdp_params const& params, bool debug) { - } - } - --#ifdef USE_ROCM -+#if defined(USE_ROCM) && defined(USE_MEM_EFF_ATTENTION) - return check_tensor_dtype(params, aotriton_mem_efficient_dtypes, debug); - #else - auto dprop = at::cuda::getCurrentDeviceProperties(); diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch b/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch deleted file mode 100644 index ffce0028a556..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.5.1-fix-functorch-install.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/functorch/CMakeLists.txt 2024-11-10 11:18:29.151992840 +0100 -+++ b/functorch/CMakeLists.txt 2024-11-10 11:20:19.642389982 +0100 -@@ -42,4 +42,4 @@ - if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "") - set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) - endif() --install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}") -+install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch b/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch deleted file mode 100644 index e99b7e59cb5b..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.5.1-install-dirs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/c10/CMakeLists.txt -+++ b/c10/CMakeLists.txt -@@ -162,7 +162,7 @@ if(NOT BUILD_LIBTORCHLESS) - # Note: for now, we will put all export path into one single Caffe2Targets group - # to deal with the cmake deployment need. Inside the Caffe2Targets set, the - # individual libraries like libc10.so and libcaffe2.so are still self-contained. -- install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib) -+ install(TARGETS c10 EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} 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/cfitsio/Manifest b/sci-libs/cfitsio/Manifest index 98ae8d4768e8..c00ec013eba6 100644 --- a/sci-libs/cfitsio/Manifest +++ b/sci-libs/cfitsio/Manifest @@ -1,5 +1,3 @@ -DIST cfitsio-4.4.1.tar.gz 4308170 BLAKE2B 237a2f899b39a01ed73e3e41b420874c7654faf1f93e3c3b3454d2001a472f64b1c44fa2c88598ea21e3a8d60a1dcb76aa3001fee1e4443f91bcd565ce605a4f SHA512 a49e4e09a2e5f6e0ae823a68f02b3f6285cf3e0af66c9a1f8dadcd2867fa83c17fd27e446e8e5af9374ff2dc7b7a18334663ce977a1691c4ed4ced14d33232b7 DIST cfitsio-4.5.0.tar.gz 4648097 BLAKE2B 5e0e09a3e6f43ce00bb5e5dd90e88c1aa2a873b407f3156147b064904ab341da219e69dc2a763e6b02eea0392a78e0ce74c15f921054bf72cac9b6e425765f99 SHA512 03746bf49cfcd97991be54f3e4dd51fb45c7b3a75f581dc6ab9ee5726a342dc11b651667807fd67e5318576d9b15e3580dd62ceab02fd684feff7ee6bb2edc7c -EBUILD cfitsio-4.4.1.ebuild 1833 BLAKE2B defdf2cbdede916f77d0851ef686eb5756896a5caef1c383260624b9c00f3a01f6a7ca25c2d9000fe062c281150c59bd9407fa17d0f25f8c8337a4b57124ab82 SHA512 59c4adef378d805734499999e82b2e9db022e159b6bdf2f1d4e86997cd62fa8fee842bafc3bb0d7deeef6fd3b91f606118b80f94457159226056e2fe82ab41d5 -EBUILD cfitsio-4.5.0.ebuild 1504 BLAKE2B 8db0090c8f79406972d65596766fd184e3e256165621eadbd26f06eb4688380353884d0a62e862e6b5342537570b27a399781232f8491fb07590d1bf381ceb99 SHA512 93266aa0cdff66ccfd7d03ea8095e3a4ef2217cead1f6bf2fa35093a15685e504dcce52bfd73b713f2765763546b98812b36ba70a4826a325463b0af6a07db92 +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.4.1.ebuild b/sci-libs/cfitsio/cfitsio-4.4.1.ebuild deleted file mode 100644 index bd4c4375ffd6..000000000000 --- a/sci-libs/cfitsio/cfitsio-4.4.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2024 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" -KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="bzip2 curl test threads tools cpu_flags_x86_sse2 cpu_flags_x86_ssse3" -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 -" - -pkg_setup() { - fortran-2_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if ! grep -q 'CFITSIO_SONAME,10' configure.in; then - die "Update subslot!" - fi - - # fix libdir & sync SONAME to configure.in - sed -e 's:lib/:${CMAKE_INSTALL_LIBDIR}/:' \ - -e "/SOVERSION/s:VERSION :VERSION ${SLOT#0/}.:" \ - -e "s:SOVERSION :SOVERSION ${SLOT#0/}.:" \ - -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=$(usex threads) - -DUSE_SSE2=$(usex cpu_flags_x86_sse2) - -DUSE_SSSE3=$(usex cpu_flags_x86_ssse3) - - -DTESTS=$(usex test) - -DUTILS=$(multilib_native_usex tools) - ) - cmake_src_configure -} - -multilib_src_install_all() { - dodoc README.md docs/changes.txt docs/*.pdf - - docinto examples - dodoc utilities/{cookbook.{c,f},testprog.c,testf77.f,speed.c,smem.c} -} diff --git a/sci-libs/cfitsio/cfitsio-4.5.0.ebuild b/sci-libs/cfitsio/cfitsio-4.5.0.ebuild index ef31390aa516..9d18e9b89812 100644 --- a/sci-libs/cfitsio/cfitsio-4.5.0.ebuild +++ b/sci-libs/cfitsio/cfitsio-4.5.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://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz" LICENSE="ISC" SLOT="0/10-r1" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +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 )" diff --git a/sci-libs/composable-kernel/Manifest b/sci-libs/composable-kernel/Manifest index 52fbc7b635e5..6f87eda9229b 100644 --- a/sci-libs/composable-kernel/Manifest +++ b/sci-libs/composable-kernel/Manifest @@ -3,9 +3,14 @@ AUX composable-kernel-6.1.1-enable-examples.patch 379 BLAKE2B 38c3909c98686f97d5 AUX composable-kernel-6.1.1-fix-clang-17-no-offload-uniform-block.patch 918 BLAKE2B 04a17e4e9fd1a2c340a3d93a41f072ad24a836dcf5956644e3eeccb9269f7058a18135f324327aadf48f0e4369bcce8af900a72344515b46992c6deb68b15c71 SHA512 f8ac68ecc9d42673b1b66d3ddde80d042dab2e548a89ebeb50db153c3ec60308f1019a67d1a644d3320435936af0aef4e744b1c12a9f504dc32b18b808921767 AUX composable-kernel-6.1.1-fix-libcxx.patch 1383 BLAKE2B e1b77cb7926d843e71f8b3cc3642966ea1f5612cef527e08b7eddeca7dccbc7af2992d9bea9d61e84acd0dcb523fecbb5f8055a3f5916f6e5e56faa57c060a5b SHA512 fa2a5bb0f9347da46d509c47026f9af38933cb7d883c28f86c880b397341eb3f98fd67ecd46d4ddb857b16b3294933c18887abb99d221db558c5337bd224f841 AUX composable-kernel-6.1.1-no-git-no-hash.patch 688 BLAKE2B e3588a306816cf4380bf8987a6fc1660a70a6fc29b811d31381bae4aa2a00b55340d13f43246b70bbc439a462fcb8f664505bfaaac0e4cab793f2e4cb0611aed SHA512 94c59971b95b48e267280989d332240e236cea4cda8b6153945940f01c8f367a8da569403d802d733b7d46728861110b1d916b32be797e62c7a927a42b7b72b7 +AUX composable-kernel-6.3.0-conditional-ckprofiler.patch 483 BLAKE2B e82e3a25d9ea9d222dec60b04ac2047ee5f82a8d39586dd770d28df09efdbb004c94c5c74e7083543d17e1ae774a884d1c72055bfeff535a4688e5867265657f SHA512 b77875f6ebef73893a5161cbf1fcdac3cbed7964da562ae60c938fd442c3bab72ee266195a6b30cd6b7880a494e0c10f4d5814bf2d870824aad08f2fd157d71c +AUX composable-kernel-6.3.0-conditional-kernels.patch 837 BLAKE2B e803daf002c5711306df18c07ca2a9fea5e1b3cfe3bf589b8766e7b5eeefbd86f5773afda158161066e45c78f4a03684de27100143518df89a3eb25c2a255070 SHA512 ceb831cf69d90ce6c3638ab6d428aa1d0a4c737873a5227596a4a2f91973820773128438cc3dfe30cd2cb5fe730d57a16e28ac03ac1aa98171e3a6720021240e +AUX composable-kernel-6.3.0-no-inline-all.patch 831 BLAKE2B 44430951aff2aa3a74dc72d4092637fe777b4dd49b0fb588011e431a0426b9c19237d1b4ced996ece62b854f95be8c93891fc010af33a717f4c0350692263170 SHA512 9b0b3491f595572213246be8f78aa27ddb2b033d89b723effdd6a010658957e88be0c990f29eb4712f78aeebfc3e2a949712bbbda342c6440ea33465a2c9b3cf DIST composable-kernel-5.7.1.tar.gz 2158402 BLAKE2B 660c205c2a99cd17f29a9077e9e7b8b88e41f42ab40d92d0a235e7a60683a04234cce6b2eb6110265c2f461dd132c40151b2521b7d64df4cebb7f27094d8b2b0 SHA512 3931c5dbcab59513541103ebf7446311a1e318421a9e12aeafa7a98cf0717a75e1519140e6b2fbcaf4cb90829a11f03a724ff3ccc6636139c61667ac82558c55 DIST composable-kernel-6.1.1.tar.gz 2520967 BLAKE2B 549d76c5c36b0a273a4c51159abd162403ad035520f97c43dd4b66560ad30021199d2f4cf7e2c12ffe33beee2fb49604db6d7c40b3b33fdcbfde111b9d4833aa SHA512 3f7667cea91760447c3f6ac0bfc261c0bca95abafbfce209d1c889e04f01ec29849e8d7f0e1cb1d77a4309ac06b3c2557721a773e4a67be383de91668cb279b2 +DIST composable-kernel-6.3.0.tar.gz 3376552 BLAKE2B ad3dde27d0134fa8bf6b5935603f7cac17c959ab7b123e8d69cfe82bee188ade0fe9d3666d46d9819de479e875e46c0fdad2574f68a3bcf0e9acbb871f163b24 SHA512 4fa7be3f54d06d894dca7ef9fa8e3db24971fb857fee96e7ccff89844fa466789756d5f140d2791a984311d59a044b5351d0358e676c218ea0b0aadf60954d8e DIST gtest-1.14.0_p20220421.tar.gz 849107 BLAKE2B e9c32d9c1d98959583b696430a6be411f5d69e3db96669b16cffc0f1dcad42512391c0a4733f6e829c82953ff33fa243ee782f3cf6e86436f0d290f45d1a3db7 SHA512 967aac7d85da0e216fe13b17d10f894a31d763d9b88201bac7d3dfc37600552b5472d30a166a6ef27f2778677e73fd3e43d082695a48f47824262eb9cd4fcd2f EBUILD composable-kernel-5.7.1-r1.ebuild 1769 BLAKE2B 4e51c1eb8f331df322d9427b00d2cb8cba81f10b335533bc131142719d224d9bc89f98a0b54ec20d65f9622a081ab74d2a6bbae9289d1807958a9ded7f08fe4a SHA512 610bc66d4a374c6de7a0afb15a84255dae71911175c05674550478f5850b20f99a5bd0f5c40103c17e42ca774c80423d6a68b5bd0307be9c0ef3eaffa2912a58 -EBUILD composable-kernel-6.1.1.ebuild 1877 BLAKE2B 22e3ef40648776eee7c698a57a5c280dacc8b54ef8c55897e17f9c02e258e795844dd3b61e396ae8fd528b9270fc799da6475cfb0d0e77d0fd9ab3dfa78c89a4 SHA512 bbd1a01db84259a430bae47d768091b081a7a0ca04f809649290cd568e5b7e12d77a2b06f9909b5fc2cc12446c06a60751d89a702e05ebf18301ca4c949ddd86 -MISC metadata.xml 457 BLAKE2B 3ea71ee5eb1ef715b76f1ff2132c8d487f9360d5ea4a062bcb785eda19a997bed1ffcb251a98046661d647c3eac24db5cf5eeb9b3a6792c450c277038ac8c9e3 SHA512 efc4309c8c4ac98a59cb9634d64410d8a0c8b136accc13aff2f943594a0b4fe8d333010fd5ad59b46fbd7c2d29a244839bb3687cfef6e2c880431ffd80ed873b +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 569 BLAKE2B 4d2e3b37e3e5fda209b774afbf14bbd246c9212a5796219f32a1b983de50ee592de71931228cc83e1d6c5d68fb95e365c8e90a2ca8e5ac4a484c409fbcd29508 SHA512 5466e5a4b268d10adbe9142141cde695d77d5d12a0d36eede6106dbcdb71f944cd1f48a48da9917b7b765b4e7d4310f4a3bac3f3db84e4831eed9492b963e264 diff --git a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild index 44abf5d59c81..59853bd41e85 100644 --- a/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild +++ b/sci-libs/composable-kernel/composable-kernel-6.1.1.ebuild @@ -25,7 +25,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/hip + dev-util/hip:${SLOT} >=dev-db/sqlite-3.17 sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] >=dev-libs/boost-1.72 diff --git a/sci-libs/composable-kernel/composable-kernel-6.3.0.ebuild b/sci-libs/composable-kernel/composable-kernel-6.3.0.ebuild new file mode 100644 index 000000000000..bbd6854cb1e8 --- /dev/null +++ b/sci-libs/composable-kernel/composable-kernel-6.3.0.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# shellcheck disable=SC2317 +EAPI=8 + +ROCM_VERSION=${PV} +PYTHON_COMPAT=( python3_{10..13} python3_13t ) + +inherit cmake flag-o-matic python-r1 rocm + +GTEST_COMMIT="b85864c64758dec007208e56af933fc3f52044ee" +GTEST_FILE="gtest-1.14.0_p20220421.tar.gz" + +DESCRIPTION="High Performance Composable Kernel for AMD GPUs" +HOMEPAGE="https://github.com/ROCm/composable_kernel" +SRC_URI="https://github.com/ROCm/composable_kernel/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" +S="${WORKDIR}/composable_kernel-rocm-${PV}" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +IUSE="debug profiler test" +REQUIRED_USE="${ROCM_REQUIRED_USE} ${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/hip:${SLOT} + ${PYTHON_DEPS} +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + dev-build/rocm-cmake +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1.1-enable-examples.patch + "${FILESDIR}"/${PN}-6.1.1-no-git-no-hash.patch + "${FILESDIR}"/${PN}-6.3.0-no-inline-all.patch + "${FILESDIR}"/${PN}-6.3.0-conditional-kernels.patch + "${FILESDIR}"/${PN}-6.3.0-conditional-ckprofiler.patch +) + +pkg_pretend() { + targets=($AMDGPU_TARGETS) + if [[ ${#targets[@]} -gt 1 ]]; then + ewarn "composable-kernel will be compiled for multiple GPU architectures," + ewarn "which will take a significant amount of time." + ewarn "Please consider setting AMDGPU_TARGETS USE_EXPAND variable to a single architecture." + fi +} + +src_prepare() { + sed -e '/-Werror/d' -i cmake/EnableCompilerWarnings.cmake || die + cmake_src_prepare +} + +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 + -DBUILD_DEV=OFF + -DGPU_TARGETS="$(get_amdgpu_flags)" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DBUILD_TESTING=$(usex test ON OFF) + -DCK_USE_PROFILER=$(usex profiler ON OFF) + -Wno-dev + ) + + if use test; then + mycmakeargs+=( + -DFETCHCONTENT_SOURCE_DIR_GTEST="${WORKDIR}/googletest-${GTEST_COMMIT}" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + + installation() { + python_domodule python/ck4inductor + + # install package-data manually, as there is no PEP517 compliance + shopt -s globstar + package_data=( + include/ck/**/*.hpp + library/src/tensor_operation_instance/gpu/gemm_universal/**/*.hpp + ) + shopt -u globstar + + inst_path="${D}$(python_get_sitedir)/ck4inductor" + for file in "${package_data[@]}"; do + location="${inst_path}/$(dirname "$file")" + mkdir -p "${location}" + cp "${file}" "${location}" + done + } + python_foreach_impl installation +} + +src_test() { + check_amdgpu + LD_LIBRARY_PATH="${BUILD_DIR}"/lib cmake_src_test -j1 +} diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-ckprofiler.patch b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-ckprofiler.patch new file mode 100644 index 000000000000..5a0c81de9879 --- /dev/null +++ b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-ckprofiler.patch @@ -0,0 +1,17 @@ +Add a flag to build without ckprofiler, which takes few GB of space and not used in many cases. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -561,11 +561,13 @@ if(NOT GPU_ARCHS AND USER_GPU_TARGETS) + endif() + endif() + ++if(CK_USE_PROFILER) + rocm_package_setup_component(profiler + LIBRARY_NAME composablekernel + PACKAGE_NAME ckprofiler + ) + add_subdirectory(profiler) ++endif() + + if(CK_USE_CODEGEN AND (GPU_TARGETS MATCHES "gfx9" OR GPU_ARCHS)) + add_subdirectory(codegen) diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-kernels.patch b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-kernels.patch new file mode 100644 index 000000000000..64a8e0b96905 --- /dev/null +++ b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-conditional-kernels.patch @@ -0,0 +1,16 @@ +Fix component discovery, when some targets are not installed. +Upstream bug: https://github.com/ROCm/composable_kernel/issues/1646 +--- a/Config.cmake.in ++++ b/Config.cmake.in +@@ -6,6 +6,10 @@ foreach(_comp ${composable_kernel_FIND_COMPONENTS}) + if(NOT _comp IN_LIST _composable_kernel_supported_components) + set(composable_kernel_FOUND False) + set(composable_kernel_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}") ++ elseif(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake") ++ set(composable_kernel_FOUND False) ++ set(composable_kernel_NOT_FOUND_MESSAGE "Unsupported component for current targets: ${_comp}") ++ else() ++ include("${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake") + endif() +- include("${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake") + endforeach() diff --git a/sci-libs/composable-kernel/files/composable-kernel-6.3.0-no-inline-all.patch b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-no-inline-all.patch new file mode 100644 index 000000000000..5ccf5239cb1e --- /dev/null +++ b/sci-libs/composable-kernel/files/composable-kernel-6.3.0-no-inline-all.patch @@ -0,0 +1,16 @@ +Flag -amdgpu-early-inline-all explodes memory consumption, so that build does not fit 64GB of RAM. +LLVM bug: https://github.com/llvm/llvm-project/issues/86332 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -213,11 +213,6 @@ if(NOT WIN32 AND check-coerce AND ${hip_VERSION_FLAT} GREATER 600241132 AND ${hi + message("Adding the amdgpu-coerce-illegal-types=1") + add_compile_options("SHELL: -mllvm -amdgpu-coerce-illegal-types=1") + endif() +-if(NOT WIN32 AND ${hip_VERSION_FLAT} GREATER 600241132) +- message("Adding -amdgpu-early-inline-all=true and -amdgpu-function-calls=false") +- add_compile_options("SHELL: -mllvm -amdgpu-early-inline-all=true") +- add_compile_options("SHELL: -mllvm -amdgpu-function-calls=false") +-endif() + # + # Seperate linking jobs from compiling + # Too many concurrent linking jobs can break the build diff --git a/sci-libs/composable-kernel/metadata.xml b/sci-libs/composable-kernel/metadata.xml index afd22272458c..718a0d193bf7 100644 --- a/sci-libs/composable-kernel/metadata.xml +++ b/sci-libs/composable-kernel/metadata.xml @@ -9,6 +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> <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..2085f7bd7278 100644 --- a/sci-libs/datasets/Manifest +++ b/sci-libs/datasets/Manifest @@ -1,4 +1,7 @@ AUX datasets-2.19.2-tests.patch 756 BLAKE2B d9bb33c2aa03f06bb42342da3bfefa0d916d7979c06725cf2c667df3d8ac4a03eb79e5129b6d0f7d232b4eb64a0cb993451e7da7661e692f50f8b8708aa8d8e2 SHA512 7ac8f060e6808b6d409508d7a9a8de4626d71b443db1df4e2489cdf3f61ab48e169ba336d8f8f6c78decb25c524ef5a291db0265813888a29c70661b04757d49 +AUX datasets-2.21.0-tests.patch 721 BLAKE2B cf85b02a4eb5da27e52bf819f00e333d6e3fb3fb0b9f7279afff24e3fddf76fcd46cb5e06d29b4780d0ce6b48c9378df301c70f6339e2f2898560219ebab4210 SHA512 43cdc5af6ba3fff3e7641006be6d8e10a5ad00136c1cf137628456019cccbd3d05b888b7eeec1cb8cd42d5ce52091b2a66d32a5b41ff2193658c4257900ea45c DIST datasets-2.20.0.gh.tar.gz 2188840 BLAKE2B 3f246c3e069ec31b63dd785ca5e96b5b441cc51318baf91a9aed053c9d5d94de6871fc0f0f8c271a4782998d976407c94c3b7b4beccc60b7a12868685707090b SHA512 effa3150877ba8269940b47ae0d96d436b7d625ceb102812bbbad805b47b7661102b5ac1c2f16624630bf3039cc4265353f6b71a83122717e73575c7e8c4921f +DIST datasets-2.21.0.gh.tar.gz 2198480 BLAKE2B 41a5e82013d26644db4f52b16728cee31c6ff27995b8a9b2ddef1512fcda5e9386e47f6726303fec64d5ed7e40432583a6ddcc2bdfbb76096dce5f23b0540149 SHA512 f4193e29505300f98ec026b1ed052ffd3d43ae05a9b191bb56105d703ba2e44752e97c0eeb36dd1b2df6499662915591ab850cdec5248af8c7c5b5a003437c5c EBUILD datasets-2.20.0.ebuild 13923 BLAKE2B 7d218b8a870eab77e4d3fd1abff1da59402fb20472cbc6ff991e8fe89a93c7a1b097a773b54013d69bcd48ffce6614d751fda5e53901ed799d86ca73adb39752 SHA512 a5563dd0dd864fa24c73089bf04bc2a6779f5c1b1f37a0e0bc9c1536653de9e6610d13343f1c8c0a09ea28c5914e518cd569b90654544a60c23ff7a978573492 +EBUILD datasets-2.21.0.ebuild 7878 BLAKE2B e5c57815b23607a8562b279143eac657810a12fcd5f38ac5367e77fd9d244c3d8508861ccd2cb82a0120b953aadd4ed39dd9aa1d3db30be68de3d8600462ea42 SHA512 e702c77a7bddc855427f193f7b499befbe1240b6eb81cd8a4ae3cbbe0a7c978ab879130ac5a3adc9d690267136caa3b23bc7d9909f5e4bb02271cb8c7b1cadc9 MISC metadata.xml 379 BLAKE2B 48ebb9e7bfa8b58b0d15b82c4146def465e08cf3212ab4af04129d09c153b67b00d0fa05b94d6af54f643ec3a202f2335d3254b966f49d1394d3c7b9e5da56a5 SHA512 99560decfaa0e438980f372d99257695e9ca9585167d9aba091e0b775c2f8384657ddc017841c8f06f8b568017a54fb9e31da736f3c875da717e154cdce876d1 diff --git a/sci-libs/datasets/datasets-2.21.0.ebuild b/sci-libs/datasets/datasets-2.21.0.ebuild new file mode 100644 index 000000000000..7dac47f07a8e --- /dev/null +++ b/sci-libs/datasets/datasets-2.21.0.ebuild @@ -0,0 +1,151 @@ +# 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="Access and share datasets for Audio, Computer Vision, and NLP tasks" +HOMEPAGE="https://pypi.org/project/datasets/" +SRC_URI="https://github.com/huggingface/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" + +RDEPEND=" + ${PYTHON_DEPS} + 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}] + dev-python/fsspec[${PYTHON_USEDEP}] + dev-python/multiprocess[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] + 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}] + ') +" +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/sqlalchemy[${PYTHON_USEDEP}] + sci-libs/jiwer[${PYTHON_USEDEP}] + sci-libs/seqeval[${PYTHON_USEDEP}] + ') +)" + +PATCHES=( + "${FILESDIR}"/${P}-tests.patch +) + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + sed -i -e \ + "/pyarrow_hotfix/d" \ + src/datasets/features/features.py || die +} + +src_test() { + local EPYTEST_IGNORE=( + tests/test_upstream_hub.py + tests/packaged_modules/test_spark.py + tests/test_load.py + ) + + local EPYTEST_DESELECT=( + "tests/test_arrow_dataset.py::BaseDatasetTest::test_filter_caching_on_disk" + "tests/test_arrow_dataset.py::BaseDatasetTest::test_map_caching_on_disk" + "tests/test_arrow_dataset.py::TaskTemplatesTest::test_task_automatic_speech_recognition" + "tests/test_distributed.py::test_torch_distributed_run" + "tests/test_exceptions.py::test_error_deprecated" + "tests/test_file_utils.py::TestxPath::test_xpath_glob" + "tests/test_file_utils.py::TestxPath::test_xpath_rglob" + "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_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::test_move_script_doesnt_change_hash" + "tests/test_iterable_dataset.py::test_iterable_dataset_from_file" + "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" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_code_eval" + "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_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" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_sari" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_spearmanr" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_super_glue" + "tests/test_metric_common.py::LocalMetricTest::test_load_metric_ter" + "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/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/packaged_modules/test_cache.py::test_cache_multi_configs" + "tests/packaged_modules/test_cache.py::test_cache_single_config" + "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_hub.py::test_convert_to_parquet" + "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" + ) + distutils-r1_src_test +} diff --git a/sci-libs/datasets/files/datasets-2.21.0-tests.patch b/sci-libs/datasets/files/datasets-2.21.0-tests.patch new file mode 100644 index 000000000000..0a55459db109 --- /dev/null +++ b/sci-libs/datasets/files/datasets-2.21.0-tests.patch @@ -0,0 +1,22 @@ +--- 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 +@@ -4131,7 +4131,6 @@ + [ + "relative/path", + "/absolute/path", +- "s3://bucket/relative/path", + "hdfs://relative/path", + "hdfs:///absolute/path", + ], +--- 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,9 +1,8 @@ + import shutil + import textwrap + + import numpy as np + import pytest +-import soundfile as sf + + from datasets import Audio, ClassLabel, Features, Value + from datasets.builder import InvalidConfigName diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index c2d8a38311e6..dd30d596f2a7 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -1,6 +1,9 @@ AUX dcmtk-3.6.8-docdir.patch 754 BLAKE2B 3e2ee8a6a213015b14489f63ef002c8d2568e2c992c55a21f66387c962541be271e8e925c0d0924b2d25b72d8b878731ce64741cab5fa0dcdb21d9da8fd02d8a SHA512 addbbb9e2b12cc296ae68e3dd9103f9d473e0f61e96934dc078ad13ba60b8f92e9b8459b71d8df39b2e0c28f3283f66e31581fb8a124cc8f35f99e1c4afb1dfa +AUX dcmtk-3.6.9-docdir.patch 842 BLAKE2B 9bc32bcfbe3d5ea4c302f1abab054fe1a3288de91224701be30a6e42be91ef687289bb881524ac3f2e675e2bc3c5504f82074cdf72ee59ece00ff960b41314fd SHA512 e348fec6e85d6b017e3deb126ecd845f5d446ae3fc8e745f198526acaa2976b9d485c887d4c648c29f24fc2609891fb05722f8b4eef3750874429121f0359197 DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45 DIST dcmtk-3.6.8.tar.gz 9628364 BLAKE2B 367885c3fda65b7b2e42555ba648800f9585cbd4c4d94e01f737110fc726ce3396df50ccd6f2c9bacc59284fc1381683b72506a3c566f795c8157da39a95fb2a SHA512 1bb2aad1aa63e0a1b79d92d7c932a969deccde03fdb484dbd44198effb58d50de44a2b0cda150ce7df63e4e986af5bc1f694c8a7988b4c049c578d83ba81184a +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 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 new file mode 100644 index 000000000000..605e334411ec --- /dev/null +++ b/sci-libs/dcmtk/dcmtk-3.6.9.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic cmake + +DESCRIPTION="The DICOM Toolkit" +HOMEPAGE="https://dicom.offis.de/dcmtk.php.en" +SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz" + +LICENSE="OFFIS" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc png ssl tcpd tiff +threads xml zlib" + +RDEPEND=" + png? ( media-libs/libpng:* ) + ssl? ( dev-libs/openssl:= ) + tcpd? ( sys-apps/tcp-wrappers ) + tiff? ( media-libs/tiff:= ) + xml? ( dev-libs/libxml2:2 ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen + virtual/latex-base + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.9-docdir.patch +) + +src_prepare() { + cmake_src_prepare + + sed -i -e "s:COPYRIGHT::" CMakeLists.txt || die + # Temporary workaround: docs are not built with CMake + sed -i -e '/include/d' doxygen/Makefile.in || die +} + +src_configure() { + # ODR violations (bug #862699). They seem to have reappeared in 3.6.9. + # Not yet reported upstream. + filter-lto + + # bug 908398 + use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE + + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DDCMTK_WITH_TIFF=$(usex tiff) + -DDCMTK_WITH_PNG=$(usex png) + -DDCMTK_WITH_XML=$(usex xml) + -DDCMTK_WITH_ZLIB=$(usex zlib) + -DDCMTK_WITH_OPENSSL=$(usex ssl) + -DDCMTK_WITH_DOXYGEN=$(usex doc) + -DDCMTK_WITH_THREADS=$(usex threads) + ) + + cmake_src_configure + + if use doc; then + cd "${S}"/doxygen || die + econf + fi +} + +src_compile() { + cmake_src_compile + + if use doc; then + emake -C "${S}"/doxygen + fi +} + +src_install() { + doman doxygen/manpages/man1/* + + if use doc; then + local HTML_DOCS=( "${S}"/doxygen/htmldocs/. ) + fi + + cmake_src_install +} diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.9-docdir.patch b/sci-libs/dcmtk/files/dcmtk-3.6.9-docdir.patch new file mode 100644 index 000000000000..aa6faf0f5ef7 --- /dev/null +++ b/sci-libs/dcmtk/files/dcmtk-3.6.9-docdir.patch @@ -0,0 +1,15 @@ +--- a/CMake/GenerateDCMTKConfigure.cmake ++++ b/CMake/GenerateDCMTKConfigure.cmake +@@ -193,12 +193,6 @@ else() + set(PATH_SEPARATOR "/") + set(ENVIRONMENT_PATH_SEPARATOR ":") + +- # Modify the installation paths for configuration files, data files and documents +- # by adding a subdirectory with the DCMTK name and version number +- set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- + # These variables are defined as macros in osconfig.h and must end with a path separator + if(CMAKE_VERSION VERSION_LESS 3.20.0) + # CMake versions prior to 3.20 expect the third parameter to be passed in ${dir} diff --git a/sci-libs/dealii/Manifest b/sci-libs/dealii/Manifest index 3e36eb7c1f23..cba6406946ee 100644 --- a/sci-libs/dealii/Manifest +++ b/sci-libs/dealii/Manifest @@ -1,18 +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 -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-9999.ebuild 5169 BLAKE2B 593ee88766dbcba2df2c6f06795f27b24fce1948b9cf8611e257662b9300b505b15623d79d7fef47060029b1982688040b28ada5622bc13380879d61142ffa51 SHA512 43ea2366f56d21e25e3a5c323daf63023e3dedcdb45908765fe1f8c31535fc6dd99a48c17f3000170347950bb844e56b58495c55613336698479bf87b25670db +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.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.2-r1.ebuild index bdf2169689c0..9c4390f73f45 100644 --- a/sci-libs/dealii/dealii-9.6.0.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 d343b6b7ccf9..607844580ad6 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,9 +1,17 @@ -AUX flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch 3337 BLAKE2B c7d149672edd6a9870b614986ce33cf203f9954f9070c49d96d717467602cea0f07f0990b7961dda00612bc9e7f017ea5c4ce6f58d8fa7a11a37a04f509ff64a SHA512 34718d5bc357db532cdb41cbb0443ae90d53231a2b87adadbd66aafb9c456c2eb7765489f8af0362b04b2b0efadb8fb65da2c9581ee2133ad8eb7065bb47f587 -AUX flann-1.9.1-cmake-3.11-1.patch 663 BLAKE2B 7162cb27a4ba6e13ac6f65752224e53be4988b3bb2ab5b8a9afbbed69a262a36c394d445fbb006afe7edbc5c9e90c339a88040eb7bee4c5c6c3209e1ba21b4ef SHA512 6d5032c30c0509951aaa5afc3f24a423d275224f67e14e0c4defbbda92ec659cef86fcfa65d72265d000f8010f0117ca2b8905f2c6f496aeef74a98dee9ffa08 -AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87 -AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4 +AUX flann-1.9.1-boost-1.87.patch 1964 BLAKE2B 95d239f84a2091df5a33c2185af62dd6c16e0e9a44adb259ceb9fa9a1ef9d7dd5cf53f75c78c5c959b160c5ff1c5e814c0d060566fe4f86c02f4936fb5498545 SHA512 82244cb1ce3a344b6b9239d403529a02018593c0657dfebeffc6dc0018f53bd1b3f27b0bff00358d3b1b9a93445034c27825baca4252df92ed7e06a1bff4cc4b +AUX flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch 3123 BLAKE2B 9a65fdfe4af6a0b8fb968f03a450b8f243bf309fc28addfec33d234981363a0bfc4dd719aca2033f453c99ad3a7330bd526b71cfeca56410a6680a71d788c04f SHA512 d6d20e18f7f3c13025dee9880468242a7357426816acc00f1ac587ee6c27d5c7936c78b83cdc072f8cf0ddd910a5f8f932c9e7ba6f58d59a6d32c6406952de0e +AUX flann-1.9.1-cmake-3.11-1.patch 591 BLAKE2B ea4d6d2054819a1d03741a0f2be0abeec022a5ae576ce4c4ce173cd9823332ff788d7216583561f425e463ae4e9b5a41f05f217bfd776b66566c0ae5e7c69b4f SHA512 9c8d9626f83c9df30f2ec54a78c477376a5cc26bc74253b0c4116356c1e116ac6febf65d146660ac3d9e2eb8fbf20493fe6aa065c63d51d7c643c87c1e90f05f +AUX flann-1.9.1-cmake-3.11.patch 2656 BLAKE2B 6151c1322dd1c23edf02faad3d048ff646be4ac2464c69df96a6dbad097aa8fe21b582cb79b61303d0ef7fccb8e9983d378e7db17bebd024e9b4c5d3a1c8c317 SHA512 5074589369b2fe0fb89a5dffd6454bb4ee8130ae59b9496c82d4d3736feea62c75b0de0df2f3ec8e0447622c02c03fea694ee64cf042670dbe6e456c87a87124 +AUX flann-1.9.1-cuda-9.patch 612 BLAKE2B 3ea593903a5af6f7411d41a79dc3990499388a75ca998b6af5c6f77fe6aab6b7d18ae84d9a0c83f6d2578800d1cf38e573332755469af02ea14542f3b31a6f09 SHA512 98af97d96e174abaa125421ee0e70ac6d32919759814820387c03c92a8601322ce3211a88385c773a11d5592e9abb5dcc1cb98441f15d88cd9c8763ba0de6e18 AUX flann-1.9.1-system-lz4-pkgconfig.patch 1168 BLAKE2B 9fadff93a2d603aee3eadd72d28f5af4f41b63803aa7d878d9b23e30a9c2384d48f85d2c8be8cfcd47542b35e929b8f35afc70caf6dc6c676b6521ebc6f829d7 SHA512 ba1c6307f2504814adfc872f1cbcd4fdaab23c56d84427c11c20e3ff75263ac97be0813cf9c5e9acd1a945d0c5dbb2b7660ada3290ffc7332ea0c90b1bc26ffa -AUX flann-1.9.1-system-lz4.patch 4934 BLAKE2B eea32abae8b13d5d0e5149c58b2639c1b6f3bbbedfa8aa91f5fb83afca4726571eb4e01eb440eb913b54f8a03124bc0266c8b039b6448bcdc0bc5e87a9512c6f SHA512 acb67eb59b400b82722f064e529fc86f43c4e16ba097a3742b5717b33fcd35a619c73ec6ea6391b23f906d4bc40a5167b56cffd0267bc2c8259b7298ad414e65 +AUX flann-1.9.1-system-lz4.patch 4198 BLAKE2B d7c20e5649ed83af75dfe933f436c0c260111fcb280e67c2e3579bba35012c817acaf2b331cffc95e1d382940d204ebfca3818d4b9075d1a69e9f67eee4f47f6 SHA512 d35bf88ca222b2eeb46cb22f34a3d986277e30704f9e4b7b95266b28abbcc5f1beaaa533bb7f3ddc76c55c94e0eb3d3e55ac6ba3cd532763e7e1df66e52f458c +AUX flann-1.9.2-asio-boost187.patch 1739 BLAKE2B 500b7fbcd033a3aad927a62382f3a64d088220054737385a094addb43178c70f38cf4ea848303588882b8b8f5b42de601befa64fdfe60704b20024041c17c53c SHA512 346ebe99f547f7a08ff2ecc35c68e9ccd23dab37eb4323d4ad21f5a69035cbc463510195719e6e21c534ea342a8ed02caa3ee207bd191b0ff4413ede07b88072 +AUX flann-1.9.2-boost-config.patch 700 BLAKE2B f24e1eaace63bfe5533ecf0fc540e568172b2dfcac296714fdef9744e82e51689833cf5041f99d3d411c41396a0772e41484a55c21d2c253543ed1fa3fe4a7c6 SHA512 71f7d3aa73ec9eb15c695f8368672748d4d93664f0e6d7d171f862e54aaa47870b60282141aec0cd67889698bc1765688cd77348dc8f74669bc636cab98fa532 +AUX flann-1.9.2-system-gtest.patch 1000 BLAKE2B b4278ea65b36ba725b4061a4eaed159b39a4b8dec4661e88674436d132457cffed4eca8f85cf8028c61ca1e644ea0d989eab4260566483e0a3ec0c6072c2bb37 SHA512 d7985d92433b8f020852387376772b3353710bd196228857f689efdc68164f5c7d2331080b067802127771575614c96c3ff60b0c93a72455008a2ac20aaf8449 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 +DIST flann-1.9.2_p20221027-patches.tar.xz 10232 BLAKE2B 197dd8b81f4a7a43472e440de58a6eb7349e247514ac32a4de9d5c4ea9304da2ab6991f9561dd15fd005a4a55b14f40e4de05b324c55c50632fe9b8cd1f18371 SHA512 04bb6ff3d645ead761b37aa1e8873dc39cc8f910112fc64a55a941a4c0ab9d70a37caf018f1cc649debff04f0ac7cbbd0eb439a8a8d03b879bcddb73979e91c3 +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 -MISC metadata.xml 912 BLAKE2B e78b293fb235efa090e62fdee5a9f9646e9b46640b8ec64815834a7897504b37ab9c0a275c17c7bf1464384a460c562ff046cc445416e891b52639f0f2d54f38 SHA512 e493462f2d4e91b656ec0b18017b34533b362eced29025b582ac8191597841fc761ac0a84a3bcaf1a8ba7c1b33c097e9d7292d6403c1aa4fc035f7416a6dd45a +EBUILD flann-1.9.1-r7.ebuild 2331 BLAKE2B 3719c9a7e6c1eae072e94fca69ed06a036cc09f30a05a08943165ca484583ee60bc40a73b9ae00d376ed3ff75854811f08ce8dbe411e306997b7208d4c2ae05a SHA512 0e4b3d8c30d2a4de19fa16c5e45ed3ef8425d11c8c45242755aaefef4e0c0cf67c741344f6e5a58198418d5d711418622ecffc48f24ccb25c83c6106f781fcd6 +EBUILD flann-1.9.2_p20221027.ebuild 2794 BLAKE2B 2209493b04f3839be8b7a52418fa36dd3fc9d837451f67691b1007bcf0f50c9c4e1b48aabebf5c1caf7d54300d1637473750fbac4e8061610c6da66d633c8f4b SHA512 a5fe3acfaed3cde42a12dc160b3058f6f68a45e89b9a3f2c6305f54ca06bc3d4a441252eddde3a41275cee5b889dceb33408c94dd35280c5c3e53b16fbfc7223 +MISC metadata.xml 911 BLAKE2B 91ff495b936d1f5314be65367c332cab0ca78f618e6ed8197f2aa4762670feb61e6bb8155b11f5127224e4ee0c716b3e71e290030be5331db4f0722b63d151b4 SHA512 996d48a77a00584b4fe2f0c170ddbfbb92282a0a3fdde5bf0619ffc2f1f1168d50fae282e5e7758da8b94a8cb284d7744d52e8b0ac12eaaff67339942f3f667b diff --git a/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch new file mode 100644 index 000000000000..a19b8a3f4183 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-boost-1.87.patch @@ -0,0 +1,60 @@ +--- a/src/cpp/flann/mpi/client.h ++++ b/src/cpp/flann/mpi/client.h +@@ -45,17 +45,16 @@ class Client + public: + Client(const std::string& host, const std::string& service) + { +- tcp::resolver resolver(io_service_); +- tcp::resolver::query query(tcp::v4(), host, service); +- iterator_ = resolver.resolve(query); ++ tcp::resolver resolver(io_context_); ++ results_ = resolver.resolve(host, service); + } + + + template<typename ElementType, typename DistanceType> + void knnSearch(const flann::Matrix<ElementType>& queries, flann::Matrix<int>& indices, flann::Matrix<DistanceType>& dists, int knn, const SearchParams& params) + { +- tcp::socket sock(io_service_); +- sock.connect(*iterator_); ++ tcp::socket sock(io_context_); ++ boost::asio::connect(sock, results_); + + Request<ElementType> req; + req.nn = knn; +@@ -78,8 +77,8 @@ public: + + + private: +- boost::asio::io_service io_service_; +- tcp::resolver::iterator iterator_; ++ boost::asio::io_context io_context_; ++ tcp::resolver::results_type results_; + }; + + +--- a/src/cpp/flann/mpi/server.h ++++ b/src/cpp/flann/mpi/server.h +@@ -119,18 +119,18 @@ public: + void run() + { + boost::mpi::communicator world; +- boost::shared_ptr<boost::asio::io_service> io_service; ++ boost::shared_ptr<boost::asio::io_context> io_context; + boost::shared_ptr<tcp::acceptor> acceptor; + + if (world.rank()==0) { +- io_service.reset(new boost::asio::io_service()); +- acceptor.reset(new tcp::acceptor(*io_service, tcp::endpoint(tcp::v4(), port_))); ++ io_context.reset(new boost::asio::io_context()); ++ acceptor.reset(new tcp::acceptor(*io_context, tcp::endpoint(tcp::v4(), port_))); + std::cout << "Start listening for queries...\n"; + } + for (;;) { + socket_ptr sock; + if (world.rank()==0) { +- sock.reset(new tcp::socket(*io_service)); ++ sock.reset(new tcp::socket(*io_context)); + acceptor->accept(*sock); + std::cout << "Accepted connection\n"; + } diff --git a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch index f29aef41977c..d0e9ea04bf09 100644 --- a/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch +++ b/sci-libs/flann/files/flann-1.9.1-build-oct-rather-than-mex-files-for-octave.patch @@ -9,12 +9,6 @@ Subject: [PATCH] build *.oct rather than *.mex files for octave LOCATION Signed-off-by: Alexander Golubev <fatzer2@gmail.com> ---- - src/matlab/CMakeLists.txt | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/src/matlab/CMakeLists.txt b/src/matlab/CMakeLists.txt -index a89b6b8..ebacaea 100755 --- a/src/matlab/CMakeLists.txt +++ b/src/matlab/CMakeLists.txt @@ -16,9 +16,6 @@ endif() diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch index 4cf8f3a990fc..fccac407c1e6 100644 --- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch +++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11-1.patch @@ -1,5 +1,5 @@ ---- a/src/cpp/CMakeLists.txt 2019-02-14 21:58:41.567625108 +0100 -+++ b/src/cpp/CMakeLists.txt 2019-02-14 21:59:04.017920926 +0100 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt @@ -34,7 +34,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AN target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) diff --git a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch index b37bedcf6d50..e199a511a48e 100644 --- a/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch +++ b/sci-libs/flann/files/flann-1.9.1-cmake-3.11.patch @@ -40,14 +40,6 @@ http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7 [3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c Signed-off-by: Romain Naour <romain.naour@gmail.com> ---- - src/cpp/CMakeLists.txt | 4 ++-- - src/cpp/empty.cpp | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - create mode 100644 src/cpp/empty.cpp - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index b44a735..a816863 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB) @@ -68,9 +60,6 @@ index b44a735..a816863 100644 set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) else() -diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp -new file mode 100644 -index 0000000..40a8c17 --- /dev/null +++ b/src/cpp/empty.cpp @@ -0,0 +1 @@ diff --git a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch index 561c379af9ae..5f3483ea6756 100644 --- a/sci-libs/flann/files/flann-1.9.1-cuda-9.patch +++ b/sci-libs/flann/files/flann-1.9.1-cuda-9.patch @@ -4,12 +4,6 @@ Date: Fri, 4 May 2018 07:50:24 +0000 Subject: [PATCH] fix compilation via gcc and cuda 9.1 add missing #include <thrust/gather> to kdtree_cuda_3d_index.cu ---- - src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu -index e9b05080..8465322e 100644 --- a/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu +++ b/src/cpp/flann/algorithms/kdtree_cuda_3d_index.cu @@ -32,6 +32,7 @@ diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch index dcc9fedd4a97..04ef15939284 100644 --- a/sci-libs/flann/files/flann-1.9.1-system-lz4.patch +++ b/sci-libs/flann/files/flann-1.9.1-system-lz4.patch @@ -3,16 +3,6 @@ Date: Sun, 14 Oct 2018 00:25:05 +0200 Subject: Use system version of liblz4 Also make sure that flann_cpp is linked against LZ4. ---- - CMakeLists.txt | 3 +++ - cmake/flann.pc.in | 2 +- - examples/CMakeLists.txt | 3 +++ - src/cpp/CMakeLists.txt | 8 ++++++-- - src/cpp/flann/util/serialization.h | 4 ++-- - 5 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a01fb7a..995e54e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,6 +142,9 @@ if (BUILD_CUDA_LIB) @@ -25,8 +15,6 @@ index a01fb7a..995e54e 100644 #set the C/C++ include path to the "include" directory include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) -diff --git a/cmake/flann.pc.in b/cmake/flann.pc.in -index 82eee5e..07b8d64 100644 --- a/cmake/flann.pc.in +++ b/cmake/flann.pc.in @@ -8,6 +8,6 @@ Name: @PROJECT_NAME@ @@ -37,8 +25,6 @@ index 82eee5e..07b8d64 100644 +Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp Cflags: -I${includedir} -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index e9fef04..2b2bb9d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -3,6 +3,7 @@ add_custom_target(examples ALL) @@ -65,8 +51,6 @@ index e9fef04..2b2bb9d 100644 target_link_libraries(flann_example_mpi flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) add_dependencies(examples flann_example_mpi) -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index b453b27..5c4f693 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -4,11 +4,12 @@ add_definitions(-D_FLANN_VERSION=${FLANN_VERSION}) @@ -108,8 +92,6 @@ index b453b27..5c4f693 100644 if(MINGW AND OPENMP_FOUND) target_link_libraries(flann gomp) -diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h -index d731021..cdc2e5e 100644 --- a/src/cpp/flann/util/serialization.h +++ b/src/cpp/flann/util/serialization.h @@ -6,8 +6,8 @@ diff --git a/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch b/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch new file mode 100644 index 000000000000..be8961c6af68 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.2-asio-boost187.patch @@ -0,0 +1,55 @@ +From 8972fc0ebb7f26e8f1f985d3ada52f9cd4510207 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Mon, 16 Dec 2024 15:48:52 +0100 +Subject: [PATCH] Update asio for boost 1.87 + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/src/cpp/flann/mpi/client.h b/src/cpp/flann/mpi/client.h +index 19a410c..8b7fbed 100644 +--- a/src/cpp/flann/mpi/client.h ++++ b/src/cpp/flann/mpi/client.h +@@ -45,9 +45,8 @@ class Client + public: + Client(const std::string& host, const std::string& service) + { +- tcp::resolver resolver(io_service_); +- tcp::resolver::query query(tcp::v4(), host, service); +- iterator_ = resolver.resolve(query); ++ boost::asio::ip::basic_resolver<tcp> resolver(io_service_); ++ iterator_ = resolver.resolve(tcp::v4(), host, service).begin(); + } + + +@@ -78,8 +77,8 @@ public: + + + private: +- boost::asio::io_service io_service_; +- tcp::resolver::iterator iterator_; ++ boost::asio::io_context io_service_; ++ boost::asio::ip::basic_resolver_iterator<tcp> iterator_; + }; + + +diff --git a/src/cpp/flann/mpi/server.h b/src/cpp/flann/mpi/server.h +index 2caab43..9d10280 100644 +--- a/src/cpp/flann/mpi/server.h ++++ b/src/cpp/flann/mpi/server.h +@@ -119,11 +119,11 @@ public: + void run() + { + boost::mpi::communicator world; +- boost::shared_ptr<boost::asio::io_service> io_service; ++ boost::shared_ptr<boost::asio::io_context> io_service; + boost::shared_ptr<tcp::acceptor> acceptor; + + if (world.rank()==0) { +- io_service.reset(new boost::asio::io_service()); ++ io_service.reset(new boost::asio::io_context()); + acceptor.reset(new tcp::acceptor(*io_service, tcp::endpoint(tcp::v4(), port_))); + std::cout << "Start listening for queries...\n"; + } +-- +2.47.1 + diff --git a/sci-libs/flann/files/flann-1.9.2-boost-config.patch b/sci-libs/flann/files/flann-1.9.2-boost-config.patch new file mode 100644 index 000000000000..2e3f8598bd79 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.2-boost-config.patch @@ -0,0 +1,23 @@ +From 5127212278ef3675f36e962dc2f057583ab80f57 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Mon, 16 Dec 2024 16:02:03 +0100 +Subject: [PATCH] boost config + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 64ead01..0e0b4dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ endif(USE_MPI) + + + if (USE_MPI AND HDF5_IS_PARALLEL) +- find_package(Boost COMPONENTS mpi system serialization thread REQUIRED) ++ find_package(Boost COMPONENTS mpi system serialization thread REQUIRED CONFIG) + include_directories(${Boost_INCLUDE_DIRS}) + add_definitions("-DHAVE_MPI") + endif() +-- +2.47.1 + diff --git a/sci-libs/flann/files/flann-1.9.2-system-gtest.patch b/sci-libs/flann/files/flann-1.9.2-system-gtest.patch new file mode 100644 index 000000000000..f825cf3d529b --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.2-system-gtest.patch @@ -0,0 +1,36 @@ +From 4001b11f20ccfc291a355c52a090fa16e2f5a5f1 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Mon, 6 Jan 2025 16:13:09 +0100 +Subject: [PATCH] system gtest + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/cmake/flann_utils.cmake b/cmake/flann_utils.cmake +index e02a6ff..544f87a 100644 +--- a/cmake/flann_utils.cmake ++++ b/cmake/flann_utils.cmake +@@ -41,6 +41,13 @@ macro(find_hdf5) + endmacro(find_hdf5) + + ++if(BUILD_TESTS) ++enable_testing() ++find_package(GTest) ++if(GTest_FOUND) ++ set(googletest_LIBRARIES GTest::gtest) ++ add_library(googletest ALIAS GTest::gtest) ++else() + # Enable ExternalProject CMake module + include(ExternalProject) + +@@ -69,6 +76,8 @@ set(googletest_INCLUDE_DIRS ${source_dir}/googletest/include) + ExternalProject_Get_Property(googletest binary_dir) + set(googletest_LIBRARIES ${binary_dir}/lib/libgtest.a) + include_directories(${googletest_INCLUDE_DIRS}) ++endif() ++endif() + + + macro(flann_add_gtest exe src) +-- +2.47.1 diff --git a/sci-libs/flann/flann-1.9.1-r7.ebuild b/sci-libs/flann/flann-1.9.1-r7.ebuild new file mode 100644 index 000000000000..8bd2008b221d --- /dev/null +++ b/sci-libs/flann/flann-1.9.1-r7.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake cuda flag-o-matic toolchain-funcs + +DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" +HOMEPAGE="https://github.com/mariusmuja/flann" +SRC_URI="https://github.com/mariusmuja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="cuda doc examples mpi octave openmp" + +BDEPEND=" + app-arch/unzip + doc? ( dev-tex/latex2html ) + mpi? ( app-admin/chrpath ) +" +DEPEND=" + app-arch/lz4:= + cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) + mpi? ( + dev-libs/boost:=[mpi] + sci-libs/hdf5:=[mpi] + ) + !mpi? ( !sci-libs/hdf5[mpi] ) + octave? ( >=sci-mathematics/octave-3.6.4-r1:= ) +" +RDEPEND="${DEPEND}" +# TODO: +# readd dependencies for test suite, +# requires multiple ruby dependencies + +PATCHES=( + "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 + "${FILESDIR}"/${P}-cuda-9.patch + "${FILESDIR}"/${P}-system-lz4.patch # bug 681898 + "${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263 + "${FILESDIR}"/${P}-build-oct-rather-than-mex-files-for-octave.patch # bug 830424 + "${FILESDIR}"/${P}-boost-1.87.patch # bug 946465 +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + # bug #302621 + use mpi && export CXX=mpicxx + + use cuda && cuda_src_prepare + + cmake_src_prepare +} + +src_configure() { + append-cxxflags -std=c++11 + + # python bindings are split off into dev-python/pyflann + local mycmakeargs=( + -DBUILD_C_BINDINGS=ON + -DBUILD_PYTHON_BINDINGS=OFF + -DPYTHON_EXECUTABLE= + -DBUILD_CUDA_LIB=$(usex cuda) + -DBUILD_EXAMPLES=$(usex examples) + -DBUILD_DOC=$(usex doc) + -DBUILD_TESTS=OFF + -DBUILD_MATLAB_BINDINGS=$(usex octave) + -DUSE_MPI=$(usex mpi) + -DUSE_OPENMP=$(usex openmp) + ) + use cuda && mycmakeargs+=( + -DCUDA_NVCC_FLAGS="${NVCCFLAGS} --linker-options \"-arsch\"" + ) + use doc && mycmakeargs+=( -DDOCDIR=share/doc/${PF} ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${D}" -name 'lib*.a' -delete || die + + # bug 795828; mpicc volunterely adds some runpaths + if use mpi; then + chrpath -d "${ED}"/usr/bin/flann_mpi_{client,server} || die + fi +} diff --git a/sci-libs/flann/flann-1.9.2_p20221027.ebuild b/sci-libs/flann/flann-1.9.2_p20221027.ebuild new file mode 100644 index 000000000000..d628a4efa00f --- /dev/null +++ b/sci-libs/flann/flann-1.9.2_p20221027.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake cuda toolchain-funcs + +DESCRIPTION="Fast approximate nearest neighbor searches in high dimensional spaces" +HOMEPAGE="https://github.com/flann-lib/flann" +COMMIT="f9caaf609d8b8cb2b7104a85cf59eb92c275a25d" +SRC_URI=" + https://github.com/flann-lib/${PN}/archive/${COMMIT}.tar.gz + -> ${P}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz +" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="cuda doc examples mpi octave openmp test" +RESTRICT="!test? ( test )" + +BDEPEND=" + doc? ( + dev-tex/latex2html + ) + mpi? ( + app-admin/chrpath + ) +" +DEPEND=" + app-arch/lz4:= + cuda? ( + dev-util/nvidia-cuda-toolkit:= + ) + examples? ( + sci-libs/hdf5:=[mpi?] + ) + mpi? ( + dev-libs/boost:=[mpi] + sci-libs/hdf5[mpi] + ) + octave? ( + >=sci-mathematics/octave-3.6.4-r1:= + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.1-build-oct-rather-than-mex-files-for-octave.patch # bug 830424 + "${FILESDIR}"/${PN}-1.9.2-asio-boost187.patch + "${FILESDIR}"/${PN}-1.9.2-boost-config.patch + "${FILESDIR}"/${PN}-1.9.2-system-gtest.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + # bug #302621 + use mpi && export CXX=mpicxx + + cmake_src_prepare + for patch in "${WORKDIR}/${P}-patches"/*; do + eapply "${patch}" + done +} + +src_configure() { + + # python bindings are split off into dev-python/pyflann + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=17 + -DBUILD_C_BINDINGS="yes" + -DBUILD_PYTHON_BINDINGS="no" + -DBUILD_CUDA_LIB="$(usex cuda)" + -DBUILD_EXAMPLES="$(usex examples)" + -DBUILD_DOC="$(usex doc)" + -DBUILD_TESTS="$(usex test)" + -DBUILD_MATLAB_BINDINGS="$(usex octave)" + -DUSE_MPI="$(usex test "$(usex mpi)")" + -DUSE_OPENMP="$(usex openmp)" + -DCMAKE_BUILD_STATIC_LIBS="no" + ) + + if use cuda; then + cuda_add_sandbox -w + + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="-Xcudafe \"--diag_suppress=partial_override\"" + ) + export CUDAHOSTCXX="$(cuda_gccdir)" + export CUDAHOSTLD="$(tc-getCXX)" + fi + + use doc && mycmakeargs+=( -DDOCDIR="share/doc/${PF}" ) + + cmake_src_configure +} + +src_compile() { + local targets=( "all" ) + + use doc && targets+=( "doc" ) + + if use test; then + targets+=( "flann_gtests" ) + if use cuda; then + targets+=( "flann_cuda_test" ) + fi + fi + + cmake_src_compile "${targets[@]}" +} + +src_test() { + # some fail when run in parallel + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + # bug 795828; mpicc voluntarily adds some runpaths + if use mpi; then + chrpath -d "${ED}/usr/bin/flann_mpi_"{client,server} || die + fi +} diff --git a/sci-libs/flann/metadata.xml b/sci-libs/flann/metadata.xml index c33b2618d660..f54c9e238fb6 100644 --- a/sci-libs/flann/metadata.xml +++ b/sci-libs/flann/metadata.xml @@ -19,6 +19,6 @@ <pkg>sci-mathematics/octave</pkg></flag> </use> <upstream> - <remote-id type="github">mariusmuja/flann</remote-id> + <remote-id type="github">flann-lib/flann</remote-id> </upstream> </pkgmetadata> 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 d32a3dec5b96..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 616 BLAKE2B 6fde47375a3250ad70148b41aa62ef85f7a8a7eacd10ffe3397f70cbd3f399800128ae451f169067d72deca6cc20a41cdf229a4e84cc3bed6e2a526cbe2d103b SHA512 019c105d6d8570324c2f550f0b5519548ad1e582d5c5e73d1e5e9bde692388a33a642c00dd0c0eaf0e92e2083edbf3a1394d4c7b6bb88f37f0565fbb646b5653 +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/fplll/fplll-5.5.0.ebuild b/sci-libs/fplll/fplll-5.5.0.ebuild index fc8117803c94..eb7593559926 100644 --- a/sci-libs/fplll/fplll-5.5.0.ebuild +++ b/sci-libs/fplll/fplll-5.5.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 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0/8" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv ~x86" IUSE="qd" BDEPEND="virtual/pkgconfig" diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index e9c9039eb6da..1451eca4766f 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -1,20 +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 -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.1-poppler-24.12.patch 1020 BLAKE2B 34b60c612415fd4a8c1f001479ce4aee8282ab3364317fdc537808d52aa7a99c3aa1dcf142c3e7eba8f566fb61af5818d34a1d194961f1168cc2ba5c0e225ddf SHA512 fd8754288ba9844efb81410037c02aa64d6241f9bfb58d4547bded259773a51636cc30c37f223a5503a2adf0fb9beca249f593323ead2cc8eb9b52825438ad88 +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 7630 BLAKE2B 4bc755890e5a4767191b08bde1e657774055d059ce96e99bb7ad139206d2ccb91b9215e8e7c4ba2dfd1d6a2622382e2a654d60e8baf5ebec253c02e06b494d90 SHA512 e15e5008d8c0858b4e5a0df70239456fd8dc6b2565ba3c420d3a002bb70fe90d5a29cabb1f4a034048c66be26f49aaadb53ce55ce37463ca38e58f8207de05bb +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 7779 BLAKE2B 769dc3a7a8b2fb1b4875998823b693e38483b3fba4e9126663056f790dc7cfff8955c6f0864aa594180cd472b7aff344bacf252f6f7ee9e6a571757c12704ec9 SHA512 37e76d32ec23eedcc28156d1339a20c181fec3bef71368c68a158b347f6b1cc0761d9ba64ec9b359e2c918d32f7c32fc2f9bb1d95f3cc8bdd203aefa0bff623f 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.1-poppler-24.12.patch b/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch new file mode 100644 index 000000000000..9634de6e3941 --- /dev/null +++ b/sci-libs/gdal/files/gdal-3.9.1-poppler-24.12.patch @@ -0,0 +1,27 @@ +From ada4fa75910dab127ee4b79256a676da6d4636c0 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Mon, 9 Dec 2024 18:18:31 +0100 +Subject: [PATCH] PDF: fix build issue on CondaForge build infrastructure (gcc + 13.3) + +Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051 +--- + frmts/pdf/pdfsdk_headers.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h +index 00cc4067fe5b..d2a3a449d124 100644 +--- a/frmts/pdf/pdfsdk_headers.h ++++ b/frmts/pdf/pdfsdk_headers.h +@@ -19,6 +19,11 @@ + + #ifdef HAVE_POPPLER + ++// The "#define private public" hacks we do below do not play well with the ++// sstream header. ++// Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051 ++#include <sstream> ++ + /* Horrible hack because there's a conflict between struct FlateDecode of */ + /* include/poppler/Stream.h and the FlateDecode() function of */ + /* pdfium/core/include/fpdfapi/fpdf_parser.h. */ 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 ceed348d315a..d2542f591370 100644 --- a/sci-libs/gdal/gdal-3.9.1-r1.ebuild +++ b/sci-libs/gdal/gdal-3.9.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 @@ -102,6 +102,8 @@ QA_CONFIG_IMPL_DECL_SKIP=( PATCHES=( "${FILESDIR}"/${PN}-3.6.4-abseil-cpp-20230125.2-c++17.patch + "${FILESDIR}"/${PN}-3.9.1-poppler-24.12.patch + "${FILESDIR}"/${P}-poppler-25.02.patch ) pkg_setup() { @@ -113,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 25a1a39770a8..257aaab58cc7 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,9 +1,5 @@ -AUX geos-3.11.1-gcc-13.patch 3330 BLAKE2B 2da75c8f658dd4358089be745fffec8fa49e997c9ade7146e168e8c9cdf05dc532369240a0766b9ccc0aff9335d8155ca99299fb617e895a3b718138a36fb248 SHA512 fc568dc1c458e791c973fb72ecdd433784439a1c427f850cb99c7d5b69190c98e6731b9e5231c39e2a92552e3cd22f897691c3dd3c473f96c604f7935d2a7e9e -AUX geos-3.11.2-gcc-13.patch 1355 BLAKE2B 1ca9b94ee975bdfb265af74c1d5ebd88951aacaf615f1ab13bf9ac01a237b8f464cd61928de70b5c1273330bc5f1cd989b0faeb9ec4b7bfd39dbd8b157e74649 SHA512 a83a40c6c573e127d33c704685bf470831c91d915678cc2cf09207433e2dd8d3d5eff44974c29e1eb5346c984fefdfcad74ae9a82f2ea6594bdf2119e19b182f -DIST geos-3.11.2.tar.bz2 6774288 BLAKE2B 62ddcaf5b6716983d49a6931c97ebe8d4c457ce7d127531ff3ff985555e9dfc2f1ebd211d1fe7afe183a3858913b4c22ec4674f68fb28ee8c43c9e9ce61abd3b SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec 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.11.2.ebuild 1095 BLAKE2B eba70506c7b381df0dc9380a370f18e62944d17d5e3da914d4efc2c7a434f287503afecc900a449dda44199098759736328431c80be30d0a3087159124237222 SHA512 ce0d6589512c58a0a6265f507155ebb30e21060ff7c283a9d0349332db209416a5c8ce23981691405259d3b5fcd153f7ef8d61445bf8e96c65d1587e8e1ceeab EBUILD geos-3.12.1.ebuild 990 BLAKE2B 9f113c7063dd91d7e09992c2a9d38fcd53b43ce281306ea7110d7128b7544b9249e977ef66a196887d0205a041495fcd7c9b9192f2e2c46c9c0928e0e63efbd2 SHA512 20f351d8ce25e4a923fb9b62c4c18f966c434752b3df7e7be5457e4e5a6bc75a98c9fa58c4ff70d9d800072d68f9fa2e66ddba90ecb6563dff32dc1a440cace8 EBUILD geos-3.13.0.ebuild 995 BLAKE2B 5fc1f384b0c9d2b6cbeafd1d3f460aad12a635d026e7babeb0ad1286e1d88c87724d0133da4d85c3c4463dd4b99e808d6ff23e6af608e0e86fe694916f8a0697 SHA512 52563044f760f6894ec000c3ee8ba3860907c07783ffdbde8af931e65c81e20bdcebbf8262b5777aa30edd20bfd510167394db2a48739945b6ddde9de8462f3d MISC metadata.xml 1101 BLAKE2B 10f27c3a69ee1ebe859c4862d0e9f0b2bc46f544e64e7fa5124b0e2fadd4d64a372cd59ccb96f92cfabb98c93ff6222d5ba5e1772def9a1174f49dba195d13d8 SHA512 4d100b031aa128cb98ea46963319e13a4c71c3de51e85b6cc7efafcafcf69bd32a11b0d4ff3dbbb55d145146df0fb9f709cdb5a70c6b47c9d69542259a71205b diff --git a/sci-libs/geos/files/geos-3.11.1-gcc-13.patch b/sci-libs/geos/files/geos-3.11.1-gcc-13.patch deleted file mode 100644 index 45054e860082..000000000000 --- a/sci-libs/geos/files/geos-3.11.1-gcc-13.patch +++ /dev/null @@ -1,111 +0,0 @@ -https://github.com/libgeos/geos/commit/0e8d4368b8bd72a7d361286e8523ebce5cff6146 -https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1 - -From 0e8d4368b8bd72a7d361286e8523ebce5cff6146 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Tue, 29 Nov 2022 23:10:22 +0000 -Subject: [PATCH] Add missing <cstdint> includes for gcc-13 (#743) - -Without the change build on `gcc-13` fails as: - - geos/include/geos/geomgraph/TopologyLocation.h:143:52: error: 'uint32_t' has not been declared - 143 | bool isEqualOnSide(const TopologyLocation& le, uint32_t locIndex) const - | ^~~~~~~~ ---- a/include/geos/geomgraph/Depth.h -+++ b/include/geos/geomgraph/Depth.h -@@ -24,6 +24,7 @@ - #include <geos/geom/Location.h> - #include <geos/geom/Position.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { ---- a/include/geos/geomgraph/TopologyLocation.h -+++ b/include/geos/geomgraph/TopologyLocation.h -@@ -27,6 +27,7 @@ - #include <array> - #include <string> - #include <cassert> -+#include <cstdint> - - #ifdef _MSC_VER - #pragma warning(push) ---- a/include/geos/io/WKTWriter.h -+++ b/include/geos/io/WKTWriter.h -@@ -24,6 +24,7 @@ - - #include <string> - #include <cctype> -+#include <cstdint> - - #ifdef _MSC_VER - #pragma warning(push) ---- a/include/geos/operation/overlayng/OverlayLabel.h -+++ b/include/geos/operation/overlayng/OverlayLabel.h -@@ -14,6 +14,8 @@ - - #pragma once - -+#include <cstdint> -+ - #include <geos/geom/Location.h> - #include <geos/geom/Position.h> - #include <geos/export.h> ---- a/include/geos/shape/fractal/HilbertCode.h -+++ b/include/geos/shape/fractal/HilbertCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { ---- a/include/geos/shape/fractal/MortonCode.h -+++ b/include/geos/shape/fractal/MortonCode.h -@@ -17,6 +17,7 @@ - - #include <geos/export.h> - #include <string> -+#include <cstdint> - - // Forward declarations - namespace geos { - -From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <mail@heiko-becker.de> -Date: Mon, 23 Jan 2023 15:56:11 +0100 -Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#805) - -In addition to [1]. Otherwise geos fails to build with: -"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level' - 40 | HilbertEncoder(uint32_t p_level, geom::Envelope& extent); - | ~ ^~~~~~~~ - | ) -/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type - 41 | uint32_t encode(const geom::Envelope* env); - | ^~~~~~~~" - -[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146 ---- a/include/geos/shape/fractal/HilbertEncoder.h -+++ b/include/geos/shape/fractal/HilbertEncoder.h -@@ -19,6 +19,7 @@ - #include <geos/geom/Geometry.h> - #include <string> - #include <vector> -+#include <cstdint> - - // Forward declarations - namespace geos { ---- a/tests/unit/capi/GEOSMakeValidTest.cpp -+++ b/tests/unit/capi/GEOSMakeValidTest.cpp -@@ -9,6 +9,7 @@ - #include <cstdlib> - #include <cmath> - #include <cstring> -+#include <cstdint> - - #include "capi_test_utils.h" - - diff --git a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch b/sci-libs/geos/files/geos-3.11.2-gcc-13.patch deleted file mode 100644 index fa46cf8bf4d2..000000000000 --- a/sci-libs/geos/files/geos-3.11.2-gcc-13.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1 - -From bea3188be44075034fd349f5bb117c943bdb7fb1 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <mail@heiko-becker.de> -Date: Mon, 23 Jan 2023 15:56:11 +0100 -Subject: [PATCH] Fix build with gcc 13 by including <cstdint> (#805) - -In addition to [1]. Otherwise geos fails to build with: -"geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:40:28: error: expected ')' before 'p_level' - 40 | HilbertEncoder(uint32_t p_level, geom::Envelope& extent); - | ~ ^~~~~~~~ - | ) -/var/tmp/paludis/build/sci-libs-geos-3.11.1/work/geos-3.11.1/include/geos/shape/fractal/HilbertEncoder.h:41:5: error: 'uint32_t' does not name a type - 41 | uint32_t encode(const geom::Envelope* env); - | ^~~~~~~~" - -[1] 0e8d4368b8bd72a7d361286e8523ebce5cff6146 ---- a/include/geos/shape/fractal/HilbertEncoder.h -+++ b/include/geos/shape/fractal/HilbertEncoder.h -@@ -19,6 +19,7 @@ - #include <geos/geom/Geometry.h> - #include <string> - #include <vector> -+#include <cstdint> - - // Forward declarations - namespace geos { ---- a/tests/unit/capi/GEOSMakeValidTest.cpp -+++ b/tests/unit/capi/GEOSMakeValidTest.cpp -@@ -9,6 +9,7 @@ - #include <cstdlib> - #include <cmath> - #include <cstring> -+#include <cstdint> - - #include "capi_test_utils.h" - - diff --git a/sci-libs/geos/geos-3.11.2.ebuild b/sci-libs/geos/geos-3.11.2.ebuild deleted file mode 100644 index ab3842bbb0c3..000000000000 --- a/sci-libs/geos/geos-3.11.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="Geometry engine library for Geographic Information Systems" -HOMEPAGE="https://libgeos.org/" -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" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( app-text/doxygen )" - -PATCHES=( - "${FILESDIR}"/${P}-gcc-13.patch -) - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/862702 - # https://github.com/libgeos/geos/issues/1054 - filter-lto - - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc) - -DBUILD_TESTING=$(usex test) - -DUSE_CCACHE=OFF - - # bug #709368 - $(usev arm '-DDISABLE_GEOS_INLINE=ON') - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - use doc && cmake_src_compile docs -} - -src_install() { - cmake_src_install - - if use doc ; then - HTML_DOCS=( "${BUILD_DIR}"/doxygen/doxygen_docs/html/. ) - einstalldocs - fi -} diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest index f0c17e694a61..9c2539daebc9 100644 --- a/sci-libs/gmsh/Manifest +++ b/sci-libs/gmsh/Manifest @@ -4,7 +4,7 @@ AUX gmsh-4.9.5-opencascade.patch 1136 BLAKE2B 3613e9a19c76c107eec2090a0a12474d94 DIST gmsh-4.11.1-source.tgz 17985611 BLAKE2B 087664cfbfec758eaa3740a65920ccf673dbcc97a1ef8010222da64b8c586334ed1a77904e94061bdf34e714aae34311ee4f6fb38740473046f99ad6c1e0984c SHA512 8f2a71d6db80dd6bacde6dc1ccd120c7f83609dd69a84a910455a21a43b7392cd7e0e7b4d37aaa6a1b1cbfdb816646cd4828d2ac6d784edba072167280432e4c DIST gmsh-4.12.2-source.tgz 18150293 BLAKE2B 16f8048d8962d2a8e41d813713c147a691d24c7fabdcc7f3787bff804b1dfa477d4853b4b366a409c2ed9649e8c83710b4f73ac23a0c5885d0e65cd25bb88d6f SHA512 935148aff89b608f9d671d5fd4f12aed52b5c8ba4453e978d0febcc6934c045f2bba0078b13a64b2cbf4e852b413bbd05873335099ea7a967cc81ef58a7f8367 DIST gmsh-4.13.1-source.tgz 18383962 BLAKE2B bf0d002b7d0fa187b47440f167fc02ad41acc327745d0fcdfce8e78877c794696f5e84c5fa6d36664be00c92219d3a338a817832b22edf8baec2954ac39d2f82 SHA512 273067b0d20b4afaa84aa8729f670a3d0666a9ffebe6c802f3b5e6e58daac68300aff6be7973ad7c272e22c0db0473a8ee2ad1e3ddda2d37f2cc208f18fcbdc5 -EBUILD gmsh-4.11.1-r2.ebuild 3109 BLAKE2B aea275de2e1f110769f6f679b0cc1a0629b56f2c1f82a2ba24d88208ec2eb57057bfb8f6dd4a427efc11d04076c7aa79542f1881de6bbe4b93fcb49eceab883f SHA512 eacd5c5a6dc312b1d99ab65cea853ff0aedc712666dbfbe20e4a62ccd8384cb21fc64107c4f3469518c7279ca9ccf3e5973d28496f1636efd580d5d017a1f546 -EBUILD gmsh-4.12.2-r1.ebuild 3065 BLAKE2B 006d86e7a4afdb8c6e156274c7eb8a9edb71844fa4a1e8b004d2fdbaa89bc86acd4a25461e4ff83e20680520ae6aaf59b2f004ea8d5242ed3608c952e4b455ec SHA512 6c20e8548dd09ea8b049d13363fb9de1fbd9a24eacc0f84420c4776ee8bf3ccc84385b4ac253a2845428cfd83188539492d9f19d7b37666a4afe6977f8816ecf -EBUILD gmsh-4.13.1.ebuild 3065 BLAKE2B f5a273fcf14a3fe64b6a96851831d58633309d0c2e89ee88a08b18621ada23f487bda71dcdd1108c591daa68a557c794bc86807a02a61434c444294c1b9b8e9e SHA512 9f61ce00c6489c2812b34ccc8de880bdf25e8321a88465789a1cc7197c9d2d659373cbfbafb32aeab8ed0389d07f8a60416e83444da75f65735f9c9813afbab4 +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 MISC metadata.xml 1271 BLAKE2B 7ea0644b5ffb89478ba859f0bbd33fa5fcc8ebb57e64f2ca6ccba8123e23b4a7a44626d5fb1bd416d99071557652b247e90cc05b11d50bdded732f41f2acc524 SHA512 013798cf979fcb7fb954490970abdfc6ebbe23e8263a22cf8791af21f593aa46b7348e7673fa7fa318ce3cb8436c2d58435911984b40be3dafda40253ebcc71c diff --git a/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild index deffafdf47c5..8a1ae97616cf 100644 --- a/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild +++ b/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RDEPEND=" virtual/fortran - X? ( x11-libs/fltk:1[xft] ) + X? ( x11-libs/fltk:1=[xft(+)] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas diff --git a/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild b/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild index 60c811c184fd..e334c37e2aa2 100644 --- a/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild +++ b/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RDEPEND=" virtual/fortran - X? ( x11-libs/fltk:1[xft] ) + X? ( x11-libs/fltk:1=[xft(+)] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas diff --git a/sci-libs/gmsh/gmsh-4.13.1.ebuild b/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild index 5f67d86017b6..0b0e0ad7fea4 100644 --- a/sci-libs/gmsh/gmsh-4.13.1.ebuild +++ b/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RDEPEND=" virtual/fortran - X? ( x11-libs/fltk:1[xft] ) + X? ( x11-libs/fltk:1=[xft(+)] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas diff --git a/sci-libs/hipBLAS-common/Manifest b/sci-libs/hipBLAS-common/Manifest new file mode 100644 index 000000000000..69f9dc8071f2 --- /dev/null +++ b/sci-libs/hipBLAS-common/Manifest @@ -0,0 +1,5 @@ +DIST hipBLAS-common-6.3.0.tar.gz 7512 BLAKE2B d074cd925f06619028bf1a5b5ae69f10b8852ef321a9ec6f92b3fe1f63baadc90f8fa39872e433f81bbed072364dd63d0b37bfa49bdc0d9faef5027b52af6c1e SHA512 3812a277fbde7bee2f3ab6040e89b97dd60385797bdab942907d59d01d684cc4ec84476333e9e6efded90400d6f99daad669d027ceb46c9dfe3a0d5d24e584d3 +DIST hipBLAS-common-6.3.2.tar.gz 7507 BLAKE2B f8a59ba428d48f2999e4b6b16b11f392cb8b3f9c04603b212b721c8f87d0779343abc721a39910100f253d633f6a037f61cb6558a40899a3eabafe8bbef55dc5 SHA512 a6d8fabbaa9db8fe61e5788c1ee27ae2c36da75dbb2e7fa17437c610641fbd141aea1f5c20f30e19420c108343ba05452d7dedde0e88c6ecc1486d0085ab7c6c +EBUILD hipBLAS-common-6.3.0.ebuild 456 BLAKE2B 14976552e0872b0b2b6399668605f49b7f4c2dbcdbe582f4befa9d4cc82bdf3c1df0a9f9f6d9146ed71c9a9034f5e0aab373b4a2b38a33f53e5560db833bc7de SHA512 ac8ce8a7ba6e4b49080f302eb3aba96c3f99c15bd0c2cfbdfec400049a6c77087c2d8005e9fbbf6a36752052d0ebd5fba75ec08338a35722930483f0bb83fb6b +EBUILD hipBLAS-common-6.3.2.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.0.ebuild new file mode 100644 index 000000000000..8b3b0df3907e --- /dev/null +++ b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2024 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-common/hipBLAS-common-6.3.2.ebuild b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.2.ebuild new file mode 100644 index 000000000000..867f3cde4720 --- /dev/null +++ b/sci-libs/hipBLAS-common/hipBLAS-common-6.3.2.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-common/metadata.xml b/sci-libs/hipBLAS-common/metadata.xml new file mode 100644 index 000000000000..308181fa9026 --- /dev/null +++ b/sci-libs/hipBLAS-common/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>sci@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>lockalsash@gmail.com</email> + <name>Sv. Lockal</name> + </maintainer> + <upstream> + <remote-id type="github">ROCm/hipBLAS-common</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest index ffcc305f1a9c..7afeb25629cc 100644 --- a/sci-libs/hipBLAS/Manifest +++ b/sci-libs/hipBLAS/Manifest @@ -1,9 +1,10 @@ -DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707 -DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8 +AUX hipBLAS-6.3.0-no-git.patch 627 BLAKE2B 1fe3e6345aa97c904a928ab3bef93bcc7617822baab3448d79c4865571e6a54c8367743fabea670d1f82b30be1cea7daf7172fc5ef43ec16bfb1d8c79b878c80 SHA512 ea2d640bf5c530c2595595eadfacd0df5f56d812f688370eee8b946651bff85c607a6170d4ad08bf6b9e8844ffe603ad541a8eefacb950c4fb4f9a8ee637ae87 DIST hipBLAS-5.7.1.tar.gz 669163 BLAKE2B e065f77eba0bb99d347f71920e733d30b7693f9eaf0c1f2a87a169360ccff23b8294e367eebfd6489440308b9bb1ae662c39617c5bb94275bf9b0ed60d555f85 SHA512 24c074f07865e1a3dfb0aca0b1d494e340a584ecb408813bb5b053f8282437cfd3644d730163f4faf1b93da306626ba68904141f9c3730a29749537fb7fd1a63 DIST hipBLAS-6.1.1.tar.gz 835570 BLAKE2B dc8a54f3b6c780f63e57f208d67b15e965d3a7c98e20766ef22ecfd41e8780a6b9464e31efad8003b52562222ec7ad06801d93a502ff99f8456f415db09e5ace SHA512 390b9a9bf0238a5c72d51d034c0053ec8c6b007547b1ec9561064828c24335e099ddb0402ad76e60018ec96742d5acfbb29b9d218a613e1c6d54e4b8b05ceca7 -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.0.tar.gz 993145 BLAKE2B 6bd6108c90c511fb9e68f628714545569dac9afe9f022f9d59e365f44177ae574a4e3b94c9276b64aad3c72c94d5b3d87babe79edbb9cc2e6d5cbaebb82f3a83 SHA512 c5d40a6dcce467e44b091c610d35dc7abfe9e863b37438642e98568a3f8b084ffd94ee41e466a60f21151df765c0df377d553700e2df2b08375a58f40654f7dc +DIST hipBLAS-6.3.2.tar.gz 993139 BLAKE2B a053f8b54318a169518f084e0bca3c9272cb51fab564c8d874b19483232cfeacb92707ad5224f4d0c3848b52d82973c36f0d4fdb429c9f5d995b3c56b1194075 SHA512 8581905a923484662471da786b795d7f960b45cc5eed991b101a88a4e3d4ea5217582c813192dde8eb35eafba9867c3ac448aeb4d7ef470e6da544f09397d902 EBUILD hipBLAS-5.7.1.ebuild 919 BLAKE2B 35676f043ad9ab3f3dc3398915e285fd5d8f15fd7ada8b1f3dc9af667853e7c57f79a51a3868141f91b8804b31353794038c0dd8be4a206ad44843609e385fb3 SHA512 2d825e3e69473d0fb0c8b718b0bc2751363bf0cf6f77f7afef54a9a4d2616cc09d8910a8196e44eb31aac8a3d3db389d702d5f2fa70107eae2ff8b38b72c15e0 -EBUILD hipBLAS-6.1.1.ebuild 877 BLAKE2B ffbb8660064b81317ffef15907d5203d213117787efce6bff92ffece9f47eb923048952113efa74fa187d9516298997ff1a5d78ad1c2481e28d3f17d5b21388c SHA512 c68564244a262ed0f2fd779a7ace6eda8ad65e5e1b43473098a2be4e4818e2ca6f7660924b75b7ab6e6f1b24b23cf5cfbc3d7bccf8c4da7f81a0b1860cd627e5 +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 MISC metadata.xml 647 BLAKE2B b4e941583a6b55bfa45a58e3173c6cecfcadaffd5e782c052f9cc8a46b37e1a09d9fd48b93fd0bd2977a982ec6752aed254f341caad0035a5dd8d2a1dad98b18 SHA512 d3ca380b71547c0e28be4dfbcc0b568fc2e2d89ae2ed0eca3bd087650d352539e5921d89d28bfd255e1564ec6c79dff5df2cddd3c008f91990f8c6f37ae3f3a8 diff --git a/sci-libs/hipBLAS/files/hipBLAS-6.3.0-no-git.patch b/sci-libs/hipBLAS/files/hipBLAS-6.3.0-no-git.patch new file mode 100644 index 000000000000..63fd25240505 --- /dev/null +++ b/sci-libs/hipBLAS/files/hipBLAS-6.3.0-no-git.patch @@ -0,0 +1,18 @@ +Git is not required and rev-parse does nothing for tarballs. +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -44,14 +44,6 @@ if( BUILD_VERBOSE ) + message( STATUS "\t==>CMAKE_EXE_LINKER link flags: " ${CMAKE_EXE_LINKER_FLAGS} ) + endif( ) + +-# Get the git hash of the hipBLAS branch +-find_package(Git REQUIRED) +- +-execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD +- WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} +- OUTPUT_VARIABLE GIT_HASH_HIPBLAS +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- + set(hipblas_VERSION_COMMIT_ID "${GIT_HASH_HIPBLAS}") + + # log build commits 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.1.1.ebuild b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild index 439a778540e9..08e7ed59f34d 100644 --- a/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild +++ b/sci-libs/hipBLAS/hipBLAS-6.1.1.ebuild @@ -23,6 +23,10 @@ RDEPEND="dev-util/hip DEPEND="${RDEPEND}" 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 diff --git a/sci-libs/hipBLAS/hipBLAS-6.3.0.ebuild b/sci-libs/hipBLAS/hipBLAS-6.3.0.ebuild new file mode 100644 index 000000000000..1faf7edbf78c --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-6.3.0.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/hipBLAS/hipBLAS-6.3.2.ebuild b/sci-libs/hipBLAS/hipBLAS-6.3.2.ebuild new file mode 100644 index 000000000000..1faf7edbf78c --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-6.3.2.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 221dbbbf936c..72a7359cb2af 100644 --- a/sci-libs/hipBLASLt/Manifest +++ b/sci-libs/hipBLASLt/Manifest @@ -4,6 +4,12 @@ AUX hipBLASLt-6.1.1-fix-msgpack-dependency.patch 1094 BLAKE2B 9606ba01ead2aefd52 AUX hipBLASLt-6.1.1-gentoopath.patch 724 BLAKE2B ac3acc8c444de7a8072337cadb3c9976d94cd019a1ecf51a18a4ccd59500efd4de798f710738c818f495dd018d0c8885e8754fede2d308a50c355f2a39236370 SHA512 59358f5d0c22d9188cf4e70215c0e42415831b0e804709f1c97d42fce15049edb3e58320c252b413b016490ed72fc27ab59660880fe71e4226bace0808529b32 AUX hipBLASLt-6.1.1-no-arch.patch 2082 BLAKE2B c71e2c112c24f0c82170852f7fe5381e99e13501656e3519cd8438fe0ae369c95b16b9f4339d2ff0dc42eaf4f4a8cbdbac57c0b72856a9db6bd5344cf3fa8548 SHA512 a758ba61f52080ecae8be8e879a9e56a71b672b7fa1514573f4498520113d40fd1fb323baeeba28a4239e2a66dced478430a2c556510c4d70d8a0d4b2add2386 AUX hipBLASLt-6.1.1-no-git.patch 365 BLAKE2B 47b7f23a4ce0919cfd6d2d1a946d98822db912571d908c82d35d734ea2bfee15a1e537f50e8fb2ada474e819274654462b26f97fcb5dc010354df9f6ba30c377 SHA512 a44aa357bdc035ffcfe4d30fb81db205dfcfd28c00543a4c55f7f61f5a90ae228bcfce71be2f4290e842f60f534287b2f25a4cd2a27369ddbbaf1e0d1171a7d5 +AUX hipBLASLt-6.3.0-min-pip-install.patch 770 BLAKE2B a30eb865998ddd7bb3f1802dcbfd3ecfd3ab614bfb981a464b2981fa71e8e902e95b6b0739e8f71d74c6484c8dc56b44c1f9dba992f1083751ec0b5904216d32 SHA512 9d82f160688f6d0175d9bee84024ac80e6c02af9a371012583af4ab183ba5be3d44553f8794bdfa131f8395cbd6c48c7af08ce4ae2a54c127ece34282c099fd8 +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 -EBUILD hipBLASLt-6.1.1-r1.ebuild 3311 BLAKE2B b0c616370f2ecadf353a0bbee88a30b38c29e2d4748c3c04dd56afdf6038b7c567f3b36b97ceaa946440bf2f97ef53b4d7d80cb01a03342336c7f620a99fec3d SHA512 1755815958456998c378fa6295be845c5d737b23078f5f004b30ea36181f08aa80bd19c3f1c1dbb37c37b9cbdd233ce6bfdb921a1eea43f9ccb2c956566159da -MISC metadata.xml 416 BLAKE2B 72248e12cd10654326a6685df0e03c508d413d2728d8e687eb8ad3d8dc928e518e3ba21df1ee774282c45363f61eed98b47b862cab2354d743ca530047084281 SHA512 02acf2d17f2c56f09c599fcde965bd5ceb07c335d7c2b4fd57a06a6b1a591a250d22de7a002f299cc99cacd1fd72f183adf51fc1b9ebff1338c6d83450da9c3b +DIST hipBLASLt-6.3.1.tar.gz 89385330 BLAKE2B 4bcf083e41ad6f22f61321bd066d79a6a387ea677cdb05f96f474e1b409f0b1cc5dc0c61259d7d6456ced2b77191388e1bd4b260bd7d185875241f55246ed1a8 SHA512 7a6443ab7a66bae1d6273945ea91814b2d5f9846d8276040cda7f43ed7ea0c2cb6063009e7fe092742d396c8d87c2cf62ed4cf8249e936eed69c0cad6db02193 +DIST hipBLASLt-6.3.2.tar.gz 89385514 BLAKE2B 785ee2951b76100f29eed4891cdc3fc58abbee866a9eac7109bc49e56854007d57d15bc6d605a7527ecc685e59500567581d194ede67cff566fba3b582d7b3c4 SHA512 2f4f497a5228162f4fffda9f549f943d26c86d7160a50c0aadc403340cee4466e9f16bd5cfcd386535b7f05cc8d1839a4d146c52761b6eb29e2e53962437e781 +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 +MISC metadata.xml 500 BLAKE2B 1ff23ba7bd97b462ec9f17174ca25d072bb830651b7f9ebb2ad7b3a269d0ef51789a9f96538ed79981ccc7419bb246658db90df4d2bdea1d57819884602d40a9 SHA512 50c685230927192c701385841afff049c7e297c2b3fe7a4df67294e02186e9d429a41ad60a0fd0b0e3811b030917796b14baf786262e1b83293862a6249bfd1b diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-min-pip-install.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-min-pip-install.patch new file mode 100644 index 000000000000..d2d9d32020b6 --- /dev/null +++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-min-pip-install.patch @@ -0,0 +1,23 @@ +Remove unused libraries and updates from pypi.org +--- a/cmake/virtualenv.cmake ++++ b/cmake/virtualenv.cmake +@@ -24,10 +24,6 @@ endfunction() + + function(virtualenv_install) + virtualenv_create() +- execute_process( +- COMMAND ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install --upgrade pip +- COMMAND ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install --upgrade setuptools +- ) + message("${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} -m pip install ${ARGN}") + execute_process( + RESULT_VARIABLE rc +--- a/tensilelite/requirements.txt ++++ b/tensilelite/requirements.txt +@@ -3,6 +3,3 @@ pyyaml + msgpack + joblib>=1.4.0; python_version >= '3.8' + joblib>=1.1.1; python_version < '3.8' +-simplejson +-ujson +-orjson diff --git a/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-no-arch-extra.patch b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-no-arch-extra.patch new file mode 100644 index 000000000000..785ca9008007 --- /dev/null +++ b/sci-libs/hipBLASLt/files/hipBLASLt-6.3.0-no-arch-extra.patch @@ -0,0 +1,16 @@ +--- a/library/src/amd_detail/rocblaslt/src/kernels/CompileSourceKernel.cmake ++++ b/library/src/amd_detail/rocblaslt/src/kernels/CompileSourceKernel.cmake +@@ -25,6 +25,13 @@ function(CompileSourceKernel source archs buildIdKind outputFolder) + message("Setup source kernel targets") + string(REGEX MATCHALL "gfx[a-z0-9]+" archs "${archs}") + list(REMOVE_DUPLICATES archs) ++ ++ list(LENGTH archs archs_length) ++ if(archs_length EQUAL 0) ++ message("No architectures specified.") ++ return() ++ endif() ++ + list(JOIN archs "," archs) + message("archs for source kernel compilation: ${archs}") + add_custom_target(MatrixTransformKernels ALL diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild index 021ed71fd7cd..5fb50338cee8 100644 --- a/sci-libs/hipBLASLt/hipBLASLt-6.1.1-r1.ebuild +++ b/sci-libs/hipBLASLt/hipBLASLt-6.1.1-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 @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..13} ) # gfx941 and gfx942 assembly uses directives of LLVM >= 18.1.0 LLVM_COMPAT=( 18 ) -inherit cmake python-any-r1 llvm-r1 prefix rocm +inherit cmake python-any-r1 llvm-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" @@ -25,7 +25,7 @@ IUSE="${IUSE_TARGETS[@]/#/+} test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/hip + dev-util/hip:${SLOT} dev-cpp/msgpack-cxx sci-libs/hipBLAS:${SLOT} " @@ -75,7 +75,7 @@ pkg_pretend() { src_prepare() { sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix),g" \ "${FILESDIR}"/${PN}-6.1.1-gentoopath.patch > "${S}"/gentoopath.patch || die - eapply $(prefixify_ro "${S}"/gentoopath.patch) + eapply "${S}"/gentoopath.patch local shebangs=($(grep -rl "#!/usr/bin/env python3" tensilelite/Tensile || die)) python_fix_shebang -q ${shebangs[*]} diff --git a/sci-libs/hipBLASLt/hipBLASLt-6.3.1.ebuild b/sci-libs/hipBLASLt/hipBLASLt-6.3.1.ebuild new file mode 100644 index 000000000000..27266b0b717a --- /dev/null +++ b/sci-libs/hipBLASLt/hipBLASLt-6.3.1.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.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/metadata.xml b/sci-libs/hipBLASLt/metadata.xml index da84ad53885c..2be6f3bc6ac6 100644 --- a/sci-libs/hipBLASLt/metadata.xml +++ b/sci-libs/hipBLASLt/metadata.xml @@ -11,4 +11,7 @@ <upstream> <remote-id type="github">ROCm/hipBLASLt</remote-id> </upstream> + <use> + <flag name="benchmark">Build and install rocblas-bench.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest index fe84e09a757d..dfe7454f59b8 100644 --- a/sci-libs/hipCUB/Manifest +++ b/sci-libs/hipCUB/Manifest @@ -1,8 +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 -EBUILD hipCUB-5.1.3.ebuild 1930 BLAKE2B 9a686ada92902f9ee2fed32ac68e5599a38fd25ab639a22316293efe868701399d6d26c401d9c09b328139d94fe4fccbe8a33e6dd3eb675b7b9704c906af3ce9 SHA512 91a0e1284bb43502525120d031586b12238a71c28583135848b824e555c5ed84ab7d2258eb38945090a00def1ba060ae2ba8aefa7c2fe5cd35ae38808b4df94d +DIST hipCUB-6.3.0.tar.gz 387560 BLAKE2B cd5712267d9284a42364e0563503f1213b32bff69f17faea4fbcb7c85e5f95ac742f89a957b9924abd54beff8b010a03ceb095c669e27c870244731a5f05f7ee SHA512 2b3a8fbdae8a2146788d7a34956572bbf63188c7bd871b4eab78017b3144b6e4e0cd902d152f9624eb485b365cdca1d81681dcfeea44e1f57f112f1a12bfead1 +DIST hipCUB-6.3.2.tar.gz 387546 BLAKE2B b0d4d487fc1f799e10cd684255fe4bb31ed7329d0ea628c818df560d506aa2b4e5bdb08b007aab9ee95492a3fecf6f559c5c9724df15fe7da86d9aed84951c6b SHA512 735610735e4584ded05b30d99ae9042d3ccd4590689fc2c415eb45fb2fd0d7ab431704709bdd066341ec10284ca0f4c1ad108c188f95949ce962b6a75eb57e19 EBUILD hipCUB-5.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 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.0.ebuild new file mode 100644 index 000000000000..ae5c0e0c441f --- /dev/null +++ b/sci-libs/hipCUB/hipCUB-6.3.0.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/hipCUB/hipCUB-6.3.2.ebuild b/sci-libs/hipCUB/hipCUB-6.3.2.ebuild new file mode 100644 index 000000000000..ae5c0e0c441f --- /dev/null +++ b/sci-libs/hipCUB/hipCUB-6.3.2.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 84e65a05f5d8..c1feafd86c2c 100644 --- a/sci-libs/hipFFT/Manifest +++ b/sci-libs/hipFFT/Manifest @@ -1,12 +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 -EBUILD hipFFT-5.1.3-r1.ebuild 1055 BLAKE2B 421cdf532e119730b6d3115b40d304b24156b0724f80188dd6059e0bcc017b66744bb66c52e520349e5423d80edd6c9c7eec57476a7553cfbef3965777c51caa SHA512 fe8dfd3e06dcec747dd182bd9eba449f5947d72214d2865c2789cfa0ded17e9394762d8e4a4b307de45169461cbbc6facaaa188f5f0c8b68a9b48be77c297a2e +DIST hipFFT-rocm-6.3.0.tar.gz 267945 BLAKE2B 33d9013ddb20b37b17a05dc647e74eaccede7e952723a177cb0f1e54f2b25cd6a76b1a8b00f419cf197e495dd654b04f418d28ca1023ea4bc88f0ccf8191d6c0 SHA512 a210e044a87845a861c127529143ea8517f5eef30a07007f43bd29a85b5c2999bd6002d12cd2a06c1c8b469ea3d52c081bbcc5146c5fc585df8505ddfa6a3e06 +DIST hipFFT-rocm-6.3.2.tar.gz 267935 BLAKE2B cb2f2f616f70578d98b47eeb1c89e81b769c5e615ec3f5421fc1a4fd8deb2695a3e69f8f41da3aa93adbb61d0c85596d89301437ad2d092779355976ff8d7b9c SHA512 788c1a4313c4b863051d0f7ea1a4ccd1d7955469dfcc604644041a6936279211b58850589aac90fde76b96cbe6452e87feb8ab2c01186a924ae8de47ff792cb7 EBUILD hipFFT-5.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 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-5.1.3-r1.ebuild b/sci-libs/hipFFT/hipFFT-6.3.0.ebuild index 79eb8052324f..8cc68e63e149 100644 --- a/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild +++ b/sci-libs/hipFFT/hipFFT-6.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 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/hipFFT/hipFFT-6.3.2.ebuild b/sci-libs/hipFFT/hipFFT-6.3.2.ebuild new file mode 100644 index 000000000000..d1dcfdf8e9fe --- /dev/null +++ b/sci-libs/hipFFT/hipFFT-6.3.2.ebuild @@ -0,0 +1,40 @@ +# 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 hip FFT implementation" +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" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +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=( + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_RIDER=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + cmake_src_configure +} diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest index d521bf64ca13..af353b87c8e0 100644 --- a/sci-libs/hipRAND/Manifest +++ b/sci-libs/hipRAND/Manifest @@ -1,7 +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 -EBUILD hipRAND-5.6.0-r1.ebuild 815 BLAKE2B 568be23ee847e47d5aeee9cb63b318961057a6787140ef54ce5bce289703b0b611cb52f501bc6fc73c2365549af482ba7483a6edda9e91b5cbe419f5b9cfb07f SHA512 8e8eabb6d74cdaffb3e8c9c41fddb166e8b49317285c4f79574253854b70c8f7b43689df767a3b8117f0591a9ea9f2a0652c1b7696b8cbfb04481a41c61de37b +DIST hipRAND-rocm-6.3.0.tar.gz 125500 BLAKE2B 80b64692c5bc8dc1cb6861f98c927d14215c1115dfb69153cb2d69d17dbe7a8e53c9985d3457762740866f6f773999ed8fc91c70133e8996f50a1413b064bf8c SHA512 47a2b21618ee3f0c91df7a7b707473ef2f82ee75f4084e8acc07e90cf0d668c7903ab4fe44fbb105a476a4730782a9de30446f620e0ba0cfca62257e8ac0fffd +DIST hipRAND-rocm-6.3.2.tar.gz 125506 BLAKE2B 836eb474c4b88a4729e3e9176736b28c090cf2add0ef463bf594deede353b755a1a07ef5898ec51e3ae66c2972cbfe6a71815020dd5f3e3b1aca105d8d8ca8e2 SHA512 8f3893ec89f76b859847b75acf3ec20f751924cd16d3ea25dbb0e1f2a5b7d75832c214e6ce9e180e3f74fbcb0c4bf95b75bf3ad32e9ac34e5e0f7522554f38a6 EBUILD hipRAND-5.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 MISC metadata.xml 586 BLAKE2B 98f8745143ec4d1c89f1e12747e1f1abe97ec74bab97f2afeea257f3a900b87c76efccebb39abd500f36ff88eab2284ec73a89db90ff0c5e616dba912f084f11 SHA512 71778ca99fb19bf30fc2f301f188e4ded754eafd2eba8abe1143cbecbf143d7f3cc8ce908592dee9e7cdc242d4f05f4a2d10739893357abb0a30362ec4448b85 diff --git a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild b/sci-libs/hipRAND/hipRAND-6.3.0.ebuild index 1674ad72718f..1bbe4255434b 100644 --- a/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild +++ b/sci-libs/hipRAND/hipRAND-6.3.0.ebuild @@ -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/hipRAND/hipRAND-6.3.2.ebuild b/sci-libs/hipRAND/hipRAND-6.3.2.ebuild new file mode 100644 index 000000000000..10c1112facb7 --- /dev/null +++ b/sci-libs/hipRAND/hipRAND-6.3.2.ebuild @@ -0,0 +1,38 @@ +# 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 hip RAND implementation" +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" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -Wno-dev + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + cmake_src_configure +} diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest index 94f827df39fb..c980a190ee3c 100644 --- a/sci-libs/hipSOLVER/Manifest +++ b/sci-libs/hipSOLVER/Manifest @@ -1,6 +1,11 @@ AUX hipSOLVER-6.1.1-find-cholmod.patch 965 BLAKE2B 0d4f37dbae67bf2605a981f3a01c9c4fe681953d59c4b17c4abbe9953154dafd94a9e66b710f4384035521e6b2e0d98ebaa63d41a44ba263e53f71725ca7e2f0 SHA512 e22bb5470ed857faa7aed8522fcc67f92994260386f302af6112dc6a7bb8f9ca20b22fe1261f4f7dec87c0e04138a8a1f64894556db003e2fccf924dd5cd4c7b +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 EBUILD hipSOLVER-5.7.1.ebuild 820 BLAKE2B 2e172aea78616bb75696b6dcf81e7ebee8902ff15335a5d7d36e9728e74eb20c320124491bccfb6cef9b4804e14fd7c58accacce500d13c043f6a104407f0c77 SHA512 83d99abbb856cfe7ce029fd8c7529fdd07be56e60a4ce6f00b662c5a6c3c829e99e66081fa907e61ee673320991fcbccca26b493022cdcae5e6d12dac04b62ea -EBUILD hipSOLVER-6.1.1.ebuild 1009 BLAKE2B 3640afa3a791393c5fffe3ed8bfb3a4ca1217e1410929028d828f32d09eec158d23f6c670764b4861558f12f73e98696152a722fcef1dc1e67b11d0438f37240 SHA512 56a1115e0b9eaacb723054082a3272f23e001c77f43d191a699925a327d99c8e0503233f2b02ebbbb54a1d3873fc53649b904fdca63274a125e825bad005ed3c -MISC metadata.xml 727 BLAKE2B d10c0be13cf9f705b7c7c0b223b91da6f0d06faccaf5a7c5e8a6ed03e0c3d32e943a742f1a9feb9452f21f36de99f1b74b3ec91ad2d32a6c7c94088eee66ed22 SHA512 14521a8ef7d65220b9b5ee23c7600f11a8329adb23993bbbda70ccfeb3cc4de5eb25713cb523890f2868983a409ae2a735d4191457b1fd8647b01751193e2cde +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 +MISC metadata.xml 711 BLAKE2B 4b6209b802e7fe231e87d5fd020c864cbbc3511ae471648bfb0ba3afb294c17a3a279d243e5b5531626aa7e0b3324099a073738ec3656c6a918d6f7f299913ee SHA512 54b14188dfc59bbcf4fd21d44b41508b01ee939c7591fea77ae601c337c7812b679aba3201e97ff5760baedc144b9ce6ad98855e1fd8976c60fff366cd0c7f7c diff --git a/sci-libs/hipSOLVER/files/hipSOLVER-6.3.0-find-cholmod.patch b/sci-libs/hipSOLVER/files/hipSOLVER-6.3.0-find-cholmod.patch new file mode 100644 index 000000000000..32c049c5947f --- /dev/null +++ b/sci-libs/hipSOLVER/files/hipSOLVER-6.3.0-find-cholmod.patch @@ -0,0 +1,56 @@ +Builds with -DBUILD_WITH_SPARSE=ON are broken +Upstream bug: https://github.com/ROCm/hipSOLVER/issues/347 +--- a/library/src/amd_detail/dlopen/cholmod.hpp ++++ b/library/src/amd_detail/dlopen/cholmod.hpp +@@ -24,7 +24,7 @@ + #include "lib_macros.hpp" + + #ifdef HAVE_ROCSPARSE +-#include <suitesparse/cholmod.h> ++#include <cholmod.h> + #else + + // constants +--- a/library/src/CMakeLists.txt ++++ b/library/src/CMakeLists.txt +@@ -42,8 +42,6 @@ prepend_path(".." hipsolver_headers_public relative_hipsolver_headers_public) + + if(NOT USE_CUDA) + set(hipsolver_source +- "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/cholmod.cpp" +- "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/rocsparse.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver_conversions.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver_dense.cpp" +@@ -52,6 +50,12 @@ if(NOT USE_CUDA) + "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/hipsolver_sparse.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/common/hipsolver_dense_common.cpp" + ) ++ if (NOT BUILD_WITH_SPARSE) ++ list(APPEND hipsolver_source ++ "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/cholmod.cpp" ++ "${CMAKE_CURRENT_SOURCE_DIR}/amd_detail/dlopen/rocsparse.cpp" ++ ) ++ endif() + else() + set(hipsolver_source + "${CMAKE_CURRENT_SOURCE_DIR}/nvidia_detail/hipsolver_conversions.cpp" +@@ -149,14 +153,11 @@ if(NOT USE_CUDA) + list(APPEND static_depends PACKAGE rocsparse) + endif() + +- find_package(CHOLMOD QUIET) +- if(NOT TARGET SuiteSparse::CHOLMOD) +- # try again with the custom find modules for older versions of suitesparse +- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/suitesparse) +- find_package(CHOLMOD REQUIRED) +- endif() ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(CHOLMOD REQUIRED IMPORTED_TARGET cholmod) ++ ++ target_link_libraries(hipsolver PRIVATE roc::rocsparse PkgConfig::CHOLMOD) + +- target_link_libraries( hipsolver PRIVATE roc::rocsparse SuiteSparse::CHOLMOD) + set_source_files_properties(${hipsolver_source} + PROPERTIES + COMPILE_DEFINITIONS HAVE_ROCSPARSE diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild index 99c4a9c0ca41..1a010790ca8d 100644 --- a/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild +++ b/sci-libs/hipSOLVER/hipSOLVER-6.1.1.ebuild @@ -22,7 +22,7 @@ IUSE="sparse" RESTRICT="test" RDEPEND=" - dev-util/hip + dev-util/hip:${SLOT} sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}] sparse? ( sci-libs/suitesparseconfig diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild new file mode 100644 index 000000000000..ea8bafabf7c5 --- /dev/null +++ b/sci-libs/hipSOLVER/hipSOLVER-6.3.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic 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/hipSOLVER/hipSOLVER-6.3.2.ebuild b/sci-libs/hipSOLVER/hipSOLVER-6.3.2.ebuild new file mode 100644 index 000000000000..fcd2d71089d6 --- /dev/null +++ b/sci-libs/hipSOLVER/hipSOLVER-6.3.2.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/hipSOLVER/metadata.xml b/sci-libs/hipSOLVER/metadata.xml index 9aa1438b519c..426f234221d8 100644 --- a/sci-libs/hipSOLVER/metadata.xml +++ b/sci-libs/hipSOLVER/metadata.xml @@ -14,7 +14,7 @@ <name>Sv. Lockal</name> </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/hipSOLVER</remote-id> + <remote-id type="github">ROCm/hipSOLVER</remote-id> </upstream> <use> <flag name="sparse">Build hipSOLVER with sparse functionality (sci-libs/cholmod)</flag> diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest index e64950fc80e5..b8513db5daca 100644 --- a/sci-libs/hipSPARSE/Manifest +++ b/sci-libs/hipSPARSE/Manifest @@ -1,7 +1,8 @@ -AUX hipSPARSE-5.0.2-remove-matrices-unpacking.patch 3940 BLAKE2B e3815659b32856206bc3291d09f59514e59dc06c3c33454c24afb68955d6a55411c71535693325be06bdb097e7cedc558ec2b8fa6a2d3886d774d79e038557ad SHA512 39db7d6fe0a085ef5a92f6ec1613376ffd9152d8d31a78f0864c971e7b61d4dfbda2e170940c82dae286d024333621722b249d5bd601399e76e68e8029fc7e81 -DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64 +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.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 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 @@ -21,7 +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 3139 BLAKE2B b48b55e72238363894680ca57897379ddb77d12f441426912c85ae9596024781cba6d6049b0ecca257588286930aac65fd372791fcb6a53a034e70bae0dfadbc SHA512 cda9e8e6584c86fbc879fa8092d9ba933081527b52cac34c5f84a96252aa606e9170166b61e79748aef728f901434cdde4cfe7a30aedc75487ec66775f89e49d -MISC metadata.xml 716 BLAKE2B f070df7c312bbe29cf150da488b6f862eb4768ff01385b34c613864da3bc7d44c3adf506e7f92c7beef729c538f176194ec1cb828fe5c97203591873f0aa706a SHA512 cb2bf1a7e03444af8bb5ca08ea3544c974a577c3bab2a194fcaa45750e9cecbc68571adc288b457de01fa84615738130ef8e2a3d002219d2870963d7e53e0570 +EBUILD hipSPARSE-6.1.1.ebuild 3301 BLAKE2B f299978cb0999cfcace7af71164cbb4893260d194d2d331d60f2a0faaaf804f20f88f877956f58374f4c6d212f108ae5f5aa044de426f5ad55f7dd84a083a645 SHA512 e17a904c40af97e304adfc2abe42843494a18b6dfdf0e4d5de2e63e5549a081a7a456f08473535e729815044a6a1b1a7ca05dda21222b885912c9d686a48e534 +EBUILD hipSPARSE-6.3.0.ebuild 3816 BLAKE2B 028054220dfee983f29ee3d079e73614ee96e0b2e6aba71d9fc1d121e30fc950ca3bb1f617bf22c9eccea8b55afa28fa5a0f52b84a9c12ee1f6abe5024e89853 SHA512 9df1da0d5fe4e3c7e75ea1607530b7e1fa8bcca7c2c3b0d3981205612ef5d4a6d9e4f1572b9b566add08d6ecceda7f6ee6bfd114cf12f3fcf2b69faf6f462ad9 +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/files/hipSPARSE-6.3.0-fix-filesystem.patch b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-fix-filesystem.patch new file mode 100644 index 000000000000..c688f0c81c53 --- /dev/null +++ b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-fix-filesystem.patch @@ -0,0 +1,40 @@ +Incorrect usage of C++ filesystem for libc++ and libstdc++ +https://github.com/ROCm/hipSPARSE/issues/555 +--- a/clients/common/utility.cpp ++++ b/clients/common/utility.cpp +@@ -34,16 +34,22 @@ + #define strSUITEcmp(A, B) _stricmp(A, B) + #endif + ++#ifdef __has_include ++#if __has_include(<version>) ++#include <version> ++#endif ++#endif ++ + #ifdef __cpp_lib_filesystem + #include <filesystem> ++ ++namespace fs = std::filesystem; + #else + #include <experimental/filesystem> + +-namespace std +-{ +- namespace filesystem = experimental::filesystem; +-} ++namespace fs = std::experimental::filesystem; + #endif ++ + #if 0 + #ifdef WIN32 + #include <windows.h> +@@ -91,7 +97,7 @@ std::string hipsparse_exepath() + result.resize(result.size() * 2); + } + +- std::filesystem::path exepath(result.begin(), result.end()); ++ fs::path exepath(result.begin(), result.end()); + exepath = exepath.remove_filename(); + exepath += exepath.empty() ? "" : "/"; + return exepath.string(); diff --git a/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-no-gtest-in-benchmark.patch b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-no-gtest-in-benchmark.patch new file mode 100644 index 000000000000..4555b1000d38 --- /dev/null +++ b/sci-libs/hipSPARSE/files/hipSPARSE-6.3.0-no-gtest-in-benchmark.patch @@ -0,0 +1,22 @@ +GTest is linked/required for hipsparse-bench, but not used +https://github.com/ROCm/hipSPARSE/issues/557 +--- a/clients/benchmarks/CMakeLists.txt ++++ b/clients/benchmarks/CMakeLists.txt +@@ -21,8 +21,6 @@ + # + # ######################################################################## + +-find_package(GTest REQUIRED) +- + set(HIPSPARSE_BENCHMARK_SOURCES + client.cpp + hipsparse_arguments_config.cpp +@@ -48,7 +46,7 @@ target_compile_options(hipsparse-bench PRIVATE -Wno-deprecated -Wno-unused-comma + target_include_directories(hipsparse-bench PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>) + + # Target link libraries +-target_link_libraries(hipsparse-bench PRIVATE GTest::GTest roc::hipsparse) ++target_link_libraries(hipsparse-bench PRIVATE roc::hipsparse) + + # Add OpenMP if available + if(OPENMP_FOUND AND THREADS_FOUND) 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.1.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild index 2176f205682a..66e72a372ec5 100644 --- a/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild +++ b/sci-libs/hipSPARSE/hipSPARSE-6.1.1.ebuild @@ -43,7 +43,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}" RESTRICT="!test? ( test )" RDEPEND="dev-util/rocminfo - dev-util/hip + dev-util/hip:${SLOT} sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="dev-build/rocm-cmake @@ -68,6 +68,10 @@ src_prepare() { } 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=( -DHIP_RUNTIME="ROCclr" -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) diff --git a/sci-libs/hipSPARSE/hipSPARSE-6.3.0.ebuild b/sci-libs/hipSPARSE/hipSPARSE-6.3.0.ebuild new file mode 100644 index 000000000000..62a5615be846 --- /dev/null +++ b/sci-libs/hipSPARSE/hipSPARSE-6.3.0.ebuild @@ -0,0 +1,102 @@ +# 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/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 +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 +http://sparse-files.engr.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz +http://sparse-files.engr.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz +http://sparse-files.engr.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz +http://sparse-files.engr.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz +http://sparse-files.engr.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz +http://sparse-files.engr.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz +http://sparse-files.engr.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz +http://sparse-files.engr.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz +http://sparse-files.engr.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz +http://sparse-files.engr.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz +http://sparse-files.engr.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz +)" +S="${WORKDIR}/hipSPARSE-rocm-${PV}" + +LICENSE="MIT" +SLOT="0"/$(ver_cut 1-2) +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-util/rocminfo:${SLOT} + dev-util/hip:${SLOT} + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/rocm-cmake + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/${PN}-6.3.0-fix-filesystem.patch" + "${FILESDIR}/${PN}-6.3.0-no-gtest-in-benchmark.patch" +) + +src_prepare() { + # include <filesystem> issue - https://github.com/ROCm/hipSPARSE/issues/555 + sed -e "s/CMAKE_CXX_STANDARD 14/CMAKE_CXX_STANDARD 17/" -i CMakeLists.txt clients/CMakeLists.txt || die + + cmake_src_prepare + + 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() { + # 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=( + -DHIP_RUNTIME="ROCclr" + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_SAMPLES=OFF + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + edob ./${PN,,}-test +} diff --git a/sci-libs/hipSPARSE/metadata.xml b/sci-libs/hipSPARSE/metadata.xml index db85e1426e8f..57758b20d8ba 100644 --- a/sci-libs/hipSPARSE/metadata.xml +++ b/sci-libs/hipSPARSE/metadata.xml @@ -18,6 +18,9 @@ <name>Sv. Lockal</name> </maintainer> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/hipSPARSE</remote-id> + <remote-id type="github">ROCm/hipSPARSE</remote-id> </upstream> + <use> + <flag name="benchmark">Build and install hipsparse-bench.</flag> + </use> </pkgmetadata> diff --git a/sci-libs/hypre/Manifest b/sci-libs/hypre/Manifest index addb814b0991..0e014a5fdab4 100644 --- a/sci-libs/hypre/Manifest +++ b/sci-libs/hypre/Manifest @@ -1,7 +1,9 @@ DIST hypre-2.20.0.tar.gz 5971556 BLAKE2B 63cef33913f1f4c569c396dd18227ae4346807e659306521e9340789944e22dc70be3b9baec7fb1385f562b53045e5c87fcad604aa242a941199ff9fe0a0c21d SHA512 842868b494960506fa3df4e72abb42084d701ec14305f9b040b9dcb578b4bbdaa8afb079057a7e53ad721b440c72ee804775c3b8319f2d01a2f281920a9cd350 DIST hypre-2.21.0.tar.gz 6017038 BLAKE2B 500885cbd9f2b79c8740d1031a3dd9e5fd141dccfe2101ceed555cb7cbef77989b6af2c80f9b08e8efd6e2401269415532614d40512f93371397389e0fb15595 SHA512 20f860b0c25190608b50d577e03ab241d8caa1dbf7a7e56484e984710a586b1f4b63c72135488a756f42aa6a58d0a26b0c4e6e1680c3f7faabdf68e2559293b0 DIST hypre-2.24.0.tar.gz 6116863 BLAKE2B fade61df0dcef3a93c8f4ff32eb72adbef56d572b8ef18202d8cdbbbd4c53a46a21f3478cf10720c64b1eaf0731e5a6f2236736ec9631f8500ce966f55d03cfe SHA512 4f27e99ba2923c6394ccc3705930897430becef840415004d6fae2fa311fef5b2399265ec1211364f883b35d00933523e65888419890902bcd4e1e6942b66560 +DIST hypre-2.32.0.tar.gz 7512442 BLAKE2B da31dfaa3ccfb263c8d81932d34dc906e1821c1ec61d9c70109bd2a3dfeb79bc3561669fd438262c574db7e01039f7eee9afc8c45f2193903f142b42becb87e6 SHA512 c1b09a31781ce4e1a411c486424cf7a4df1275d53445ed83d0e4e210dcc87e9c09e17e26cc5ee736aebbd70618674cd3b7dba6736f8e725ba1c3d981869ada24 EBUILD hypre-2.20.0.ebuild 2601 BLAKE2B 8369a62a5984128a6c16241afd3e888634176bed2ca65e1bae0bbd98c32a09b42ddd8e01ac72a392d5fd693ec4105b9ee65b8c7ca83945f9a972ce964c357447 SHA512 b72eb3ad60e1f2640cbdff6ae85025794d49cba2d7813cef8719c9667bec9aa37e14230c495799de2728280d7bf2909458165694ff8a4908048d77b15288d207 EBUILD hypre-2.21.0.ebuild 2594 BLAKE2B 5f2114028d0b4e79be150d198f5e1dcb09c54384d4dd3e19da7d2886d3d3e101e1f8b3696fad65ae3c9bd4c0dd0a646aa9d3b0571bd605e36657aa10af67f046 SHA512 00f80fc4a1a3fe80fcfa0b3c37aa99721f29a3e7efcbb11d1c73d6807d8599d30eed5bc3d33fb1f28d1225a96debf0aab6fdbe07c19d0f06912e282a7e48c5b4 EBUILD hypre-2.24.0.ebuild 2593 BLAKE2B feee0cacabab27db678b7a4e92241b0635b685f623f5212ee085b1b1cc2f1305a12b4d98cc28d0c1ce83b3c8df4ecf12e30eb108752c3658755bc6a2212febd6 SHA512 139c6a863f289c9b72759758738c86a57cff5b653e5a9bfafe2ac2022619d7cbaf71a0804d1d70cc751ad42be5d2c090e1acdd920db58585f4bd86710a954727 +EBUILD hypre-2.32.0.ebuild 2593 BLAKE2B 949ae8d4f3d1373286b06c0660a579ca70933311a15a2bf9f6a452f5ddb2baefa1ef78af61fe7b33352db81a9c93af252927ca932e6c76d611126b4e30b7be31 SHA512 155f0fa1a7dd51b702886ab665370508b9f655902300d9ea1103cde63af89f92ada3f1b45ae81bc5d77a9de3243b50f732bced752cd8012839f1683d849c8cbe MISC metadata.xml 616 BLAKE2B e048d1098bac6c90fe41d2971044618675902957e8b2e1acbc6b4a0b1ad045d33d43f7fecea667848e533796ce05cd5735fecbea9b84bd8950f3bf38d84e11fc SHA512 c24906c2f269b820f3d926b805e5debac9d2fa864f15e800da698a93f517f6b6d2c14987d8edac0691627e892d3c2a2b8e58075feb8db2c701200861fdb05195 diff --git a/sci-libs/hypre/hypre-2.32.0.ebuild b/sci-libs/hypre/hypre-2.32.0.ebuild new file mode 100644 index 000000000000..c3bef9bc2d8b --- /dev/null +++ b/sci-libs/hypre/hypre-2.32.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +inherit fortran-2 toolchain-funcs flag-o-matic + +DESCRIPTION="Parallel matrix preconditioners library" +HOMEPAGE="https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods" +SRC_URI="https://github.com/hypre-space/hypre/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="debug examples fortran int64 openmp mpi" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + sci-libs/superlu:= + virtual/blas + virtual/lapack + mpi? ( virtual/mpi ) +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG COPYRIGHT README ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + default + + # link with system superlu and propagate LDFLAGS + sed -e "s:@LIBS@:@LIBS@ $($(tc-getPKG_CONFIG) --libs superlu):" \ + -e 's:_SHARED@:_SHARED@ $(LDFLAGS):g' \ + -i src/config/Makefile.config.in || die + + sed -e '/HYPRE_ARCH/s: = :=:g' \ + -i src/configure || die + + # link with system blas and lapack + sed -e '/^BLASFILES/d' \ + -e '/^LAPACKFILES/d' \ + -i src/lib/Makefile || die +} + +src_configure() { + tc-export CC CXX + append-flags -Dhypre_dgesvd=dgesvd_ + + if use openmp ; then + append-flags -fopenmp + append-ldflags -fopenmp + fi + + if use mpi ; then + CC=mpicc + FC=mpif77 + CXX=mpicxx + fi + + cd src || die + + # without-superlu: means do not use bundled one + econf \ + --enable-shared \ + --with-blas-libs="$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's/-l//g')" \ + --with-blas-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L blas | sed -e 's/-L//g')" \ + --with-lapack-libs="$($(tc-getPKG_CONFIG) --libs-only-l lapack | sed -e 's/-l//g')" \ + --with-lapack-lib-dirs="$($(tc-getPKG_CONFIG) --libs-only-L lapack | sed -e 's/-L//g')" \ + --with-timing \ + --without-superlu \ + $(use_enable debug) \ + $(use_enable openmp hopscotch) \ + $(use_enable int64 bigint) \ + $(use_enable fortran) \ + $(use_with openmp) \ + $(use_with mpi MPI) +} + +src_compile() { + emake -C src +} + +src_test() { + LD_LIBRARY_PATH="${S}/src/lib:${LD_LIBRARY_PATH}" \ + PATH="${S}/src/test:${PATH}" \ + emake -C src check +} + +src_install() { + emake -C src install \ + HYPRE_INSTALL_DIR="${ED}" \ + HYPRE_LIB_INSTALL="${ED}/usr/$(get_libdir)" \ + HYPRE_INC_INSTALL="${ED}/usr/include/hypre" + + if use examples; then + dodoc -r src/examples + fi +} 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 6a09197860a1..f64c43c142ab 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,5 +1,7 @@ -DIST indilib-2.1.0.tar.gz 2899251 BLAKE2B 3e9a52f295c543f703a8b17bda5219363481f432d3a4cc4c45e34331107484a2e42d77e6903b03379443fc82df74a5c3eaa9eb5ad55f63351eabd540e26cf3f8 SHA512 e70e8a15e7f23e9690ad2d15c2d1357271c664f2d7d3ce2b489b7af748d046b11a66e82cec64aa991c383cc1a8e529795ce8d5abd488654738b4b6ef292e64e7 DIST indilib-2.1.1.tar.gz 2929685 BLAKE2B 565199451a2ebbf6757bb854e0dad576397a6154c6043543243364b6072375afd775ed0b54ed116b2702bdea222b47e4f68673da617e68ebf626d1725e66d2a7 SHA512 3224afb13776462e906398be2b85802807e739042494b29701d106731423640a4dceaeb262cd62d3a87f032ba0655da7ceaa150e6912be20508e090ad93c3ba7 -EBUILD indilib-2.1.0.ebuild 1775 BLAKE2B 301589c8be496391d5dbe326f71246e275383bf1c3beef2cd663621364b256fbbae489dc9bae5286cf3fde301ed74b65e025a52ab98523f235d979fe8c96f297 SHA512 10e2de746c8a61ef3a7ddea8c0c0a03fb368bc12165eb0c1a37f635dc5737e198163f0c415298b8e1f065676ff58fc7ad475db0597293e6e3710db82fd59ae5b -EBUILD indilib-2.1.1.ebuild 1776 BLAKE2B 06fddaa942b71ff3e6aee230a5de2a8427461cbff115a23a5ec5e1fa42112106b9f2c95ceed7cc83b88d3a4b9cb34fe617096379590b85a98f11c7bbd71d7288 SHA512 99543b62d875a26ecfd01bdf8b725cea186be31eb73b847f417c5515ec828cf04aac8677522e82446736f3e403b379dbd3c0e7348fee9a886bfd8e22cde11a3d +DIST indilib-2.1.2.1.tar.gz 2941118 BLAKE2B 43928220243867a2c648855a38de3c3e49c754b135694215b24ddda6b71eb8a421a1d11dd199b5df9adcedb8c63de46288a8fe246f4ba27adfd6e98c38d825a2 SHA512 b59b23a26509922fae33d6080510a7fdce170baa59d86f5abbb955313e0a62d45f489b08021144a44cc0ca1d172825a6b524c778bb2bb24148b246e574fc0918 +DIST indilib-2.1.2.tar.gz 2940192 BLAKE2B 61a8f73cb5d7561852db0e63f7332eed7f0ea65279c05fe3c13e8891acaae81fe60c86da78ee0eeea1adc6a183065bd92af519493087c6959a29a3fae84107b5 SHA512 77838f7b64443f68a0aa6f0bc0232fbacaeed3d0759bc16496f11e434cf6d3eb2cb5ae07f49b1fa200c9dadc91e9418f6f5ea8f593e03543719a2d73ddb061d2 +EBUILD indilib-2.1.1.ebuild 1774 BLAKE2B 8ca6b34c559118a344321380145f824949cd7ecdd1ede2d07aa3a61ebd61e98c6e4ad585f91f1b65bb395d276e01e9cc8c94794ba1b31276625139347b173404 SHA512 8751a102de63c176e732a53257a6a0edc236ab69c73b602ada4842fe2ade8d2661b4346160f1b269ef120854841cba50b90f4abc911c15d06baee5b7c6dd2c29 +EBUILD indilib-2.1.2.1.ebuild 1776 BLAKE2B d1fed6d0aa012b7db3b3398f70c44193abec7e48e3dcf40d3648f70d0f3e38223f403e0933f367c23868eda3f9bbcd8286e1e74e79c6c75181ce7b875621ecbd SHA512 8af2a487c439c1935b202ee04141c77b1ed3736070f2cbcf747b71bfd337d2d68b02651bfa533f8dce1e04b0188281bb1168cd6c090fa9dbde51a637a54c4bd2 +EBUILD indilib-2.1.2.ebuild 1776 BLAKE2B d1fed6d0aa012b7db3b3398f70c44193abec7e48e3dcf40d3648f70d0f3e38223f403e0933f367c23868eda3f9bbcd8286e1e74e79c6c75181ce7b875621ecbd SHA512 8af2a487c439c1935b202ee04141c77b1ed3736070f2cbcf747b71bfd337d2d68b02651bfa533f8dce1e04b0188281bb1168cd6c090fa9dbde51a637a54c4bd2 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f diff --git a/sci-libs/indilib/indilib-2.1.1.ebuild b/sci-libs/indilib/indilib-2.1.1.ebuild index 5550e43e5885..2225fceea0be 100644 --- a/sci-libs/indilib/indilib-2.1.1.ebuild +++ b/sci-libs/indilib/indilib-2.1.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 @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" diff --git a/sci-libs/indilib/indilib-2.1.0.ebuild b/sci-libs/indilib/indilib-2.1.2.1.ebuild index 0cfc49a84aa4..ebd639ac9384 100644 --- a/sci-libs/indilib/indilib-2.1.0.ebuild +++ b/sci-libs/indilib/indilib-2.1.2.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 @@ -12,7 +12,7 @@ S="${WORKDIR}/${P/lib/}" LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" IUSE="ogg rtlsdr test websocket" RESTRICT="!test? ( test )" diff --git a/sci-libs/indilib/indilib-2.1.2.ebuild b/sci-libs/indilib/indilib-2.1.2.ebuild new file mode 100644 index 000000000000..ebd639ac9384 --- /dev/null +++ b/sci-libs/indilib/indilib-2.1.2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev + +DESCRIPTION="INDI Astronomical Control Protocol library" +HOMEPAGE="https://www.indilib.org/" +SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/lib/}" + +LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" +SLOT="0/1" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="ogg rtlsdr test websocket" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/cpp-httplib:= + dev-cpp/nlohmann_json + dev-libs/libev + media-libs/libjpeg-turbo:= + net-misc/curl + sci-libs/cfitsio:= + sci-libs/fftw:3.0= + sci-libs/gsl:= + sci-libs/libnova:= + sys-libs/zlib + virtual/libusb:1 + ogg? ( + media-libs/libogg + media-libs/libtheora + ) + rtlsdr? ( net-wireless/rtl-sdr ) + websocket? ( dev-libs/boost:= ) +" +DEPEND="${RDEPEND} + kernel_linux? ( sys-kernel/linux-headers ) + test? ( >=dev-cpp/gtest-1.8.0 ) + websocket? ( dev-cpp/websocketpp ) +" + +src_configure() { + local mycmakeargs=( + -DINDI_SYSTEM_HTTPLIB=ON + -DINDI_SYSTEM_JSONLIB=ON + -DINDI_BUILD_QT5_CLIENT=OFF + -DINDI_BUILD_SHARED=ON + -DINDI_BUILD_STATIC=OFF + -DINDI_BUILD_XISF=OFF # not packaged + -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d + $(cmake_use_find_package ogg OggTheora) + $(cmake_use_find_package rtlsdr RTLSDR) + -DINDI_BUILD_UNITTESTS=$(usex test) + -DINDI_BUILD_INTEGTESTS=$(usex test) + -DINDI_BUILD_WEBSOCKET=$(usex websocket) + ) + + cmake_src_configure +} + +src_test() { + # Unit tests + BUILD_DIR="${BUILD_DIR}"/test cmake_src_test + + # Integration tests + # They fail in parallel because they try to bind to the same port more + # than once. + BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1 +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest index 67d80a7e5da1..f43a1d3a20c1 100644 --- a/sci-libs/kineto/Manifest +++ b/sci-libs/kineto/Manifest @@ -1,8 +1,8 @@ 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/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/libbraiding/Manifest b/sci-libs/libbraiding/Manifest index d143684b32d5..911a28fdffeb 100644 --- a/sci-libs/libbraiding/Manifest +++ b/sci-libs/libbraiding/Manifest @@ -1,3 +1,5 @@ +DIST libbraiding-1.3.1.tar.gz 393142 BLAKE2B 6a012005549c6de513463f887202dd0c2774f10d2c72b9bae4b46e73d5592b01011760d034e2c8eb9abbe0f56db3932d96a062e19f767b9efb4f9b639a9f719f SHA512 358c53365f318e5fd77f2332e0f70374d720ebacb9426a2d24abc4e4eff179ff315bbd7447211797e097a0bbead7efc73b2c26f1e068bdb86766af1144a2e823 DIST libbraiding-1.3.tar.gz 389034 BLAKE2B edc4fbe0a06afec3ddb9c3fa2d63f388ec16bb355100ecf1bb104f72ebf1975d92abc973e8ba118f5cafe998ea4587dc9f456a7a45d076cdae429d607c335a9b SHA512 da8c24183eeaf21a79cd7f723b0082e29e3185594b7cf6695e58de9677a64838da361220b35dd140c920d64dbf5cbf1f1c6f4129709c57efc5d624b766ccd69f +EBUILD libbraiding-1.3.1.ebuild 567 BLAKE2B 60580d27f3c909fae1d4c765692dfe083c761ae2fb896d4bef9008321d75bba73b615c148d4f4088bbbecdc83400b82a262476f4abb0dbc4f23783f8ee60bbe3 SHA512 ef9bfdc86f3e942b755a0a697add380eea46cbf8952651ae935e36e18bec030491597b7b11e353b0c901937de84854823487243d9f0567bf3de0c36d52f0561c EBUILD libbraiding-1.3.ebuild 566 BLAKE2B 5a168e7c76cdbda6f1a9553128de1643b619757f693ae1aec88fad06ad7e4b05b1bdaabdb279caa09348b5c162ee071d47e8f75ff31c62f8131a4460660226f1 SHA512 dc8a4b9335728ad6b4e652e4ec39f55e9eb64262fcf02e2c089a92b153fa47bfe8cb40effd4f1c78da37880e2012a1266863ebf32264d4aba47dfe67325279a0 MISC metadata.xml 1040 BLAKE2B de527a0accea92adf75f22b086920888d621f9c3e24c1a136149af13f4eaa8fdf4127354d6805b5e50d1772c906ff1db7dfd906eb7156908e95b5058c1c490f7 SHA512 cf25e11fae981f51eb8b9a16db8495f49d27e2a1e038e29bdf41f836aa2d56e9204b8912b9725d333ea2e3ba75ab52303e784d6ac3bc82f83f5e44509d71ccba diff --git a/sci-libs/libbraiding/libbraiding-1.3.1.ebuild b/sci-libs/libbraiding/libbraiding-1.3.1.ebuild new file mode 100644 index 000000000000..0edd4d6824f3 --- /dev/null +++ b/sci-libs/libbraiding/libbraiding-1.3.1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Expose the functionality of cbraid as a shared library" +HOMEPAGE="https://github.com/miguelmarco/libbraiding" + +SRC_URI="https://github.com/miguelmarco/${PN}/releases/download/${PV}/${P}.tar.gz" + +# A few source headers still say GPLv2, but I believe that to be an +# oversight: https://github.com/jeanluct/cbraid/issues/4 +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~riscv" + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/libcifpp/Manifest b/sci-libs/libcifpp/Manifest index e884763438d7..83c31857ec34 100644 --- a/sci-libs/libcifpp/Manifest +++ b/sci-libs/libcifpp/Manifest @@ -1,10 +1,7 @@ -DIST libcifpp-7.0.6-components.cif.xz 65615784 BLAKE2B 680aa4e10e8297541f7c8f4eda5ed29bfbbbe0f91495b0cdb0f0796b3b800ab7a7ea97078f011d248e550c5fb5b3a5359dbddd70475a50e770f2aa1f1c8a4751 SHA512 4b992ae9f8a8acb5d15742899178e69b668380d67dfad1f320a2ca0c9e2f813d4877a9eb37729372265403b3b6c8d3a302b81b8a5d4087444a722b182495e432 -DIST libcifpp-7.0.6.tar.gz 2648194 BLAKE2B 569a0357b77a7b86686e49e5b117e926147ec93cf16671a3869d8d355e4fdbdc1144bbffb7be8ac29ac4299b9ca3860ca2bdbcf1cf5f6ed3f83eadf00beb5e3d SHA512 e0a599928d6126321a3b2af99943bb627369f10c97bf5eacfa314e245dcf3c195a46d34e7b30600e2d4ae94a87567e7d86fb8178eca75dad2a38d5fbd5b4dbc1 -DIST libcifpp-7.0.7-components.cif.xz 65615784 BLAKE2B 680aa4e10e8297541f7c8f4eda5ed29bfbbbe0f91495b0cdb0f0796b3b800ab7a7ea97078f011d248e550c5fb5b3a5359dbddd70475a50e770f2aa1f1c8a4751 SHA512 4b992ae9f8a8acb5d15742899178e69b668380d67dfad1f320a2ca0c9e2f813d4877a9eb37729372265403b3b6c8d3a302b81b8a5d4087444a722b182495e432 -DIST libcifpp-7.0.7.tar.gz 2648232 BLAKE2B 559c62110dd700262bc403a7fac2d4e65a29a86a84313823796cf1b99c5e37ccfd453c113db5509bf5c2cadc0bcfc0e1267a9ff4863d165e984beeb20fd927d5 SHA512 a3f4bb8218b8136b17a440a4e1ad3b8c2674bbb37084e60ad743b41b3d7d7f765c51495adb1789e63624d889cf43e3a001e1a2dd2c5d38d3268b680a77510120 DIST libcifpp-7.0.8-components.cif.xz 66099572 BLAKE2B ef50f385b3bb58d945bc0e5abf056c172dedf42dcea2169eae1da40408c7b286d76a80096deba103d224e7b6788ce37bbb667c6137b8bf695909cab1a3f91f51 SHA512 f4952d54691086691f80a7280394cb59511e43193156c6c24e3ab0c19040d13f9a564fe1e5195292911a77c2bc03f453f260cd147bf4d84526b5fc34b8d69358 DIST libcifpp-7.0.8.tar.gz 2648244 BLAKE2B fc591c80156038b9636538d6da2a031d3d2956ecad14f83e94cf8bb62d00f9e7cc8d2667baab98781fcb187c6b8256e055f011dfc38f91916fcff0875e5514db SHA512 ccf28ee8461e199914b91607708aea1946d7933a1c92a809e1ae8560120ec00c3981af3063322a0a59f85e77ec9c5d42ddf0e7ab87387511434226b965e6ced6 -EBUILD libcifpp-7.0.6.ebuild 916 BLAKE2B 70ab740e5a42b03a7d736d67aa0e72815cdf5adfde93bc3aa794cd73adeaf54cdf63d95797812a3b805c79c1b3a58670a2cb4c5b70b920ef54aa5d19745d6f63 SHA512 08fb4784be4887437753ea3debf5b999f69f147e40b89892bd6396be3680bfd5b04d9d44133a896802338e5a1bc4e3c95500f3ab4a5f5e629c87391c07e1a290 -EBUILD libcifpp-7.0.7.ebuild 916 BLAKE2B 70ab740e5a42b03a7d736d67aa0e72815cdf5adfde93bc3aa794cd73adeaf54cdf63d95797812a3b805c79c1b3a58670a2cb4c5b70b920ef54aa5d19745d6f63 SHA512 08fb4784be4887437753ea3debf5b999f69f147e40b89892bd6396be3680bfd5b04d9d44133a896802338e5a1bc4e3c95500f3ab4a5f5e629c87391c07e1a290 -EBUILD libcifpp-7.0.8.ebuild 916 BLAKE2B 70ab740e5a42b03a7d736d67aa0e72815cdf5adfde93bc3aa794cd73adeaf54cdf63d95797812a3b805c79c1b3a58670a2cb4c5b70b920ef54aa5d19745d6f63 SHA512 08fb4784be4887437753ea3debf5b999f69f147e40b89892bd6396be3680bfd5b04d9d44133a896802338e5a1bc4e3c95500f3ab4a5f5e629c87391c07e1a290 +DIST libcifpp-7.0.9-components.cif.xz 67258320 BLAKE2B de58656fde178797e52043142344000fc49128ea715f8e7c76b3478b0b57f05625689146a8f986dbe5691eddc9391547bd555b3c99d50a9b8a61f071a1db6e88 SHA512 9c9beef16f72231d72c802bd1d53f434829aa05d5885eb3c6260c94f45e9059e275f74f7f3f7f80e0013697523ebb0f5f2de7acffe5185548ec65feb43f3b438 +DIST libcifpp-7.0.9.tar.gz 2648279 BLAKE2B 9d3284c0dde3feab8bacce1836337bec4cfe564d5d47a1b7d72f8badda1b698fd75ad5c8766a2e60bbaf5e24417df22ca44cc4197f8c7e275f110e29ad0e09b7 SHA512 0326bf3df4c3050ca1b2fd7f545ea669715f76729b7a4d651362c47f1f878fe5a4d2cd038f6f793ddf8d3f43749889ab86a3411af31abc5c4c6bc2dde1792037 +EBUILD libcifpp-7.0.8.ebuild 915 BLAKE2B 1b23dcc84659f4d27564bd5ef329e8aca2478bb316bd1069d2e470eb5ef821dab6f95e56f06c86a3cec95e87c3a2fbfc3aeac9f248e24822e0c5faf4eb4b229b SHA512 3e9f85839b4a05e1dc3e31b5150b469f46fda9671140703d0f8d9dafcb28eb246b9c1f285ad155e78bc33ab6b5dafcf15e18dc7473af8f740c2c0a2d8b9bf1e9 +EBUILD libcifpp-7.0.9.ebuild 916 BLAKE2B 0520456c14fbffac9f04a626aca7b73abe4243103fbdd7a48c6c28d7ddc56240cd6cec4525cce29b02ce1076c2a1d3570feee3619e4d409f40108060398b7f70 SHA512 71ff24bf4b18981c6d9354294dd2b5ff0f3e1183f7105a731b24e7b38b59744f843dafdaab7080da264b8f20609b22bd2cae88ea28bbc7a5ef7014cb5eaf42b0 MISC metadata.xml 299 BLAKE2B 88091a7fbc350db0c22800bcd0de80ec406f7b8a0187b29d8660978384179f8194f7aa794bf0bd3b3f4ab68ac662ca62479319e218d2622e2a3e470653848251 SHA512 e6bc610ae1cf40584ba3067ece0c0c85d08ad0bbb99f5ecd8281c41b04ff932db838926a6ff238794ff46eb8035eb57c750e088bd3f164180952a9e597544e14 diff --git a/sci-libs/libcifpp/libcifpp-7.0.6.ebuild b/sci-libs/libcifpp/libcifpp-7.0.6.ebuild deleted file mode 100644 index 855615bcc0ce..000000000000 --- a/sci-libs/libcifpp/libcifpp-7.0.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -DESCRIPTION="Code to work with mmCIF and PDB files" -HOMEPAGE="https://github.com/PDB-REDO/libcifpp" -# Update components file on every bump -# https://files.wwpdb.org/pub/pdb/data/monomers/components.cif.gz -SRC_URI=" - https://github.com/PDB-REDO/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~pacho/${PN}/${P}-components.cif.xz -" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-cpp/eigen-3.4.0:3 - dev-libs/boost:= - sys-libs/zlib - test? ( dev-cpp/catch:0 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - cp "${WORKDIR}"/${P}-components.cif rsrc/components.cif || die - - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCIFPP_INSTALL_UPDATE_SCRIPT=OFF - -DBUILD_TESTING="$(usex test)" - ) - cmake_src_configure -} diff --git a/sci-libs/libcifpp/libcifpp-7.0.8.ebuild b/sci-libs/libcifpp/libcifpp-7.0.8.ebuild index 855615bcc0ce..f6fb372e3d07 100644 --- a/sci-libs/libcifpp/libcifpp-7.0.8.ebuild +++ b/sci-libs/libcifpp/libcifpp-7.0.8.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 @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sci-libs/libcifpp/libcifpp-7.0.7.ebuild b/sci-libs/libcifpp/libcifpp-7.0.9.ebuild index 855615bcc0ce..adcf81709685 100644 --- a/sci-libs/libcifpp/libcifpp-7.0.7.ebuild +++ b/sci-libs/libcifpp/libcifpp-7.0.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 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 6a29cff77809..369d882ea738 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,7 +1,5 @@ -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 -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 +DIST libqalculate-5.5.0.tar.gz 2209195 BLAKE2B 64781eeb1ad06bb25ac604fce10fb6a158e5f704ad311d52d0b3494ddf4f96d6240795b9f1d25aaf415b4e06f9916af12ca3db71d6b97c00f07fd0e31ebc6036 SHA512 c19dd210c03eb3a2966937dafade9f15e5289a04b5c498180b3bff37e202b6707e1942e02dd76fd4f461d5f80bd7ab7b99ba7802916b7ed6a25d1e59b16472e7 +DIST libqalculate-5.5.1.tar.gz 2212026 BLAKE2B dd10a0e2a5d6454c545465cafa21ab3d2d999b4671617ca98b95af4850f7275a9a53b59b923e0f34866cc6814298f82cdff714250df945ae3673a1e9e6d3c1b9 SHA512 97fca04ef8ccd9596a40f36095fd418ebcb9b98cd2c9f412b9bf8475454024b1d8942adc869b03f501656fa2d36a6dc2c8a2fc7e366325e8da382d6194346977 +EBUILD libqalculate-5.5.0.ebuild 2055 BLAKE2B 3e06de568764eb87ba1c6583e9488afc6c55363f97887f6e174e1dca34d98ab1941658652d6026da35a6fc0e1abec25123d09d05f94d273852e1d5fbd64c9512 SHA512 390a56f0437e02f8249316ec7e121705269fd594f08f01b0b5b73ac2d3d8c490396b6cde5c148ec47935f605203960e8582cf5305e452f3ac2ea8548799f4ea7 +EBUILD libqalculate-5.5.1.ebuild 2061 BLAKE2B 15cffc65c467b5e4d59dedc3edcba449772cc7b9c81e49e973929bd851dede7ddd6ec3cf81ac8702eec71627be86512401d2483ee02453ec5fe0104d3b6d2a81 SHA512 14d9d6980d19264b3451f488e25256b5206aaf703d69a01828e24bc69dc3c017b8decaaac0ff27d2922bf55d1e526615d3590f810efd037e3a7b3df63a216211 MISC metadata.xml 807 BLAKE2B 84adb8d9b92f233d93cc630d9dbf89630a9ca1ea839f0d7d5100763c9c6e4a7065753bfe55f013e6aa99370822b4d638e7e788c8cb7bd30cae4b7bed2d7befd9 SHA512 d96812e36a70e9c1a776fe5882e1ded9fe2e7a3d1406a619202af25fc0d20180ed3209ed6df79e147697e450edb42cfcc6f38ee99ecec4e1513949b92576b4fd diff --git a/sci-libs/libqalculate/libqalculate-5.4.0.ebuild b/sci-libs/libqalculate/libqalculate-5.4.0.ebuild deleted file mode 100644 index 341483a69648..000000000000 --- a/sci-libs/libqalculate/libqalculate-5.4.0.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.3.0-r1.ebuild b/sci-libs/libqalculate/libqalculate-5.5.0.ebuild index 97c095f1c488..b9213fc29c4d 100644 --- a/sci-libs/libqalculate/libqalculate-5.3.0-r1.ebuild +++ b/sci-libs/libqalculate/libqalculate-5.5.0.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/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/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 62912e4a1c49..1cab2586dc14 100644 --- a/sci-libs/linux-gpib-modules/Manifest +++ b/sci-libs/linux-gpib-modules/Manifest @@ -1,7 +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 -DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566 SHA512 018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76 +AUX linux-gpib-modules-9999-depmod.patch 684 BLAKE2B 7113fb2814a5a14deeda43a909a71904bd3dc8cf35e036f930c6aec2331f50066795e9d3cad17bef48a6128ab3e5f938606c594ae19d24523fcb5d1f29ef3b0a SHA512 8e4bdb3ac012d8fe79ab3cb4307c7efa7538db8f15e487b0c3c2cd49cfce36828d7013e8fa4ac258d2dcfd89f602681d61ea45e5ae34ba0b3bc0f93fbf4c2876 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/files/linux-gpib-modules-9999-depmod.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch new file mode 100644 index 000000000000..34ae11eea6c7 --- /dev/null +++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-9999-depmod.patch @@ -0,0 +1,22 @@ +Depmod fails here since we're still in DESTDIR and the actual target path may +not exist... + + +diff --git a/Makefile b/Makefile +index 356bba54..8f5b4b63 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,13 +27,9 @@ clean: + M="$(GPIB_SRCDIR)/drivers/gpib" \ + GPIB_TOP_DIR=$(GPIB_SRCDIR) + +-#We run depmod explicitly because the depmod.sh script run +-#by modules_install fails on Debian due to it failing to find +-#the System.map file. + install: + $(MAKE) -C $(LINUX_SRCDIR) V=$(VERBOSE) modules_install\ + M="$(GPIB_SRCDIR)/drivers/gpib" \ + GPIB_TOP_DIR=$(GPIB_SRCDIR) \ + INSTALL_MOD_DIR=gpib +- /sbin/depmod -A + 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-9999.ebuild index 4306cc4b7fe7..cf690543f994 100644 --- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild +++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-9999.ebuild @@ -1,39 +1,46 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit linux-mod-r1 +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/linux-gpib/git" + S="${WORKDIR}/${P}/linux-gpib-kernel" +else + SRC_URI="https://downloads.sourceforge.net/linux-gpib/linux-gpib-${PV}.tar.gz" + S="${WORKDIR}/linux-gpib-kernel-${PV}" + KEYWORDS="~amd64 ~arm ~x86" +fi + 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} +RDEPEND=" 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" + "${FILESDIR}/${PN}-9999-depmod.patch" ) MODULES_KERNEL_MIN=2.6.8 src_unpack() { - default - unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz" + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + default + unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz" + fi } src_configure() { @@ -57,6 +64,7 @@ src_install() { modules_post_process - dodoc ChangeLog AUTHORS README* NEWS + dodoc AUTHORS README* NEWS + [[ ${PV} != 9999 ]] && dodoc ChangeLog einstalldocs } diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index 24df964eb3dd..6cc8e7c3758e 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -2,4 +2,5 @@ AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1 DIST gpib_firmware-2008-08-10.tar.gz 173004 BLAKE2B 05fcde09de5246b86004c263c733d64316511bdb0b84dfbd9b94cb78e2909c0d191ff21ee0d77e7f0947e9231bd4cd62d6348e8f9beefd6d201b473732ff23d2 SHA512 f2a0ee3316b75ac36ed88568e45ca4c69935a6d10783c65582003ab39686f2a69d3002901866065f4f5efa9fdd4c779e038d1d7ce24bba266a619c164d5ac10d DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B 64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98 SHA512 a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35 EBUILD linux-gpib-4.3.6-r100.ebuild 5029 BLAKE2B 23cc0f14adb5db702da20076172422640b9e6f99115a27a0a17d8528fac14c69588e31202ca765ec8b237bbd27fa6110349f3bb3f2284459040f37c12988bf4e SHA512 e0eefdaeec929db676c26982bb884cd85e58b8a121f4f80c1ea202f65afeb9c173d71dbeadb86b4c5c4abd38ff680df4d4c79c3bca4088d501f6c538eab99769 +EBUILD linux-gpib-9999.ebuild 6001 BLAKE2B c0f6d7729d2b186941e61d9053ba4c8453702a6e1166cc12ffb42cc4411e716155bc40b18683f6964a06f3bf24106ab045da8005a67c8217b2e406cd7e640246 SHA512 7ed4b4355256432e40211bba430bc7e78aa65ff2e42fb05337dd8d96b020843f408c1bf431fdfa3e88e56d2eea4f9c11d74af0de2e3ca6d214ba96cc7a1f41ff MISC metadata.xml 548 BLAKE2B c976143b910efb6a8920f064f35fdac9cb325ff272aca8a7644511300f4dfe9232c280577a90eae225ca4f88bc2b4cd09d175d4190bc13513d89457f57c9bb52 SHA512 c611a420ab28d623b5b9167bd59c04c2fe27404a7fd85de72a555f99ef8bad4383702482ae808d4eb66014a9e63ca057aa7195748f9c230f0778fcbde07fb71f diff --git a/sci-libs/linux-gpib/linux-gpib-9999.ebuild b/sci-libs/linux-gpib/linux-gpib-9999.ebuild new file mode 100644 index 000000000000..25af503e2da7 --- /dev/null +++ b/sci-libs/linux-gpib/linux-gpib-9999.ebuild @@ -0,0 +1,242 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GUILE_COMPAT=( 2-2 3-0 ) +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517=setuptools + +inherit readme.gentoo-r1 autotools distutils-r1 guile-single perl-functions udev + +# Check for latest firmware version on bump +FW_PV="2008-08-10" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/linux-gpib/git" + S="${WORKDIR}/${P}/${PN}-user" +else + SRC_URI="https://downloads.sourceforge.net/linux-gpib/${P}.tar.gz" + S="${WORKDIR}/${PN}-user-${PV}" + KEYWORDS="~amd64 ~arm ~x86" +fi + +DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware" +HOMEPAGE="https://linux-gpib.sourceforge.io/" +SRC_URI+=" + firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz ) +" + +LICENSE="GPL-2" +SLOT="0" +IUSE="pcmcia static guile perl php python tcl doc firmware" +REQUIRED_USE=" + guile? ( ${GUILE_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +COMMONDEPEND=" + sys-libs/readline:= + tcl? ( dev-lang/tcl:0= ) + guile? ( ${GUILE_DEPS} ) + perl? ( dev-lang/perl:= ) + php? ( dev-lang/php:= ) + firmware? ( sys-apps/fxload ) +" +RDEPEND="${COMMONDEPEND} + acct-group/gpib + ~sci-libs/linux-gpib-modules-${PV} + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${COMMONDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/docbook-sgml-utils[jadetex] ) + python? ( ${DISTUTILS_DEPS} ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-perl.patch +) + +pkg_setup() { + use guile && guile-single_pkg_setup + use perl && perl_set_version + use python && python_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + else + default + unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz" + fi +} + +src_prepare() { + default + + use guile && guile_bump_sources + + # We have to use --root instead of --prefix for setup.py. + # Otherwise the python files are not installed properly into site-packages. + sed -i -e \ + 's/--prefix=$(DESTDIR)$(prefix)/--root=$(DESTDIR)/g' \ + language/python/Makefile.am || die + + eautoreconf + + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_prepare + popd >/dev/null || die + fi +} + +src_configure() { + myeconfargs=( + $(use_enable static) + $(use_enable guile guile-binding) + $(use_enable perl perl-binding) + $(use_enable php php-binding) + $(use_enable python python-binding) + $(use_enable tcl tcl-binding) + $(use_enable doc documentation) + --disable-python-binding + ) + + econf "${myeconfargs[@]}" + + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_configure + popd >/dev/null || die + fi +} + +src_compile() { + default + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi +} + +src_install() { + # PYTHONDONTWRITEBYTECODE=0 is required, otherwise + # installation of the python files is skipped + FIRM_DIR="${EPREFIX}"/usr/share/usb + emake \ + DESTDIR="${ED}" \ + INSTALL_MOD_PATH="${ED}" \ + HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \ + UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ + USB_FIRMWARE_DIR=${FIRM_DIR} \ + PYTHONDONTWRITEBYTECODE=0 \ + docdir="/usr/share/doc/${PF}/html" install + + use guile && guile_unstrip_ccache + + if use perl; then + einfo "Installing perl module" + cd "${S}"/language/perl || die + emake DESTDIR="${ED}" install + perl_fix_packlist + perl_delete_emptybsdir + cd "${S}" || die + fi + + if use python; then + pushd language/python >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules || die + udev_dorules 99-gpib.rules + + dodoc AUTHORS README* NEWS + if [[ ${PV} == 9999 ]]; then + dodoc ../ChangeLog + else + dodoc doc/linux-gpib.pdf ChangeLog + fi + + insinto /etc + newins util/templates/gpib.conf gpib.conf + newins util/templates/gpib.conf gpib.conf.example + + if use pcmcia; then + insinto /etc/pcmcia + doins "${S}"/etc/pcmcia/* + fi + + # remove .la files + find "${ED}" -name '*.la' -delete || die + + DOC_CONTENTS=" +As the udev rules were changed and refactored in this release it is +necessary to remove any manually installed pre-4.3.0 gpib udev rules files +in /etc/udev/rules.d/. The files to remove are: +\n + 99-agilent_82357a.rules\n + 99-gpib-generic.rules\n + 99-ni_usb_gpib.rules\n +\n +You need to run the 'gpib_config' utility to setup the driver before +you can use it. In order to do it automatically you can add to your +start script something like this (supposing the appropriate driver +is loaded on the startup): +\n + gpib_config --minor 0 +\n +To give a user access to the computer's gpib board you will have to add +them to the group 'gpib' or, you could change the permissions on the device +files /dev/gpib[0-15] to something you like better, using 'chmod' +\n +Edit /etc/gpib.conf to match your interface board, and any devices you wish +to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for +more information. +\n +" + + if use pcmcia; then + DOC_CONTENTS+=' +For PCMCIA cards:\n +All files needed for a PCMCIA board were copied to /etc/pcmcia. +You may wish to edit the options passed to the gpib_config call in the +/etc/pcmcia/linux-gpib-pcmcia script. +You may need to send a SIGHUP signal to the cardmgr daemon to force it +to reload the files in /etc/pcmcia \(alternatively you could use your +pcmcia init.d script to restart the cardmgr, or you could just reboot\). +The driver module will be loaded as needed by the cardmgr. + +' + fi + + if use firmware; then + DOC_CONTENTS+=' +For Agilent \(HP\) 82341C and 82341D cards: +The firmware for these boards is uploaded by passing the appropriate +firmware file from /usr/share/linux-gpib/hp_82341 directory to +gpib_config using the -I or --init-data command line option. Example:\n +gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin +' + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest index d7713c8a9edc..4709b5b9de8a 100644 --- a/sci-libs/m4ri/Manifest +++ b/sci-libs/m4ri/Manifest @@ -1,4 +1,7 @@ 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 MISC metadata.xml 1187 BLAKE2B b5428f60e018c6503ec91f9a13949c6e3571c94474d234317e416fa81e2370d473db9ecb5a1c73306e071673c27b02d57feae552b12f9ce791b426d7a8a488a4 SHA512 a984f783b8bb1971663a75ac655aba7e0a4ddbdb8db6d01105bb6a75711d8e83c9b598076207e1a9619198cca0ed901a5aef64a5443b6efe89a28c2571cdfa71 diff --git a/sci-libs/m4ri/files/m4ri-20240729-pkgconfig.patch b/sci-libs/m4ri/files/m4ri-20240729-pkgconfig.patch new file mode 100644 index 000000000000..469b08e6dadb --- /dev/null +++ b/sci-libs/m4ri/files/m4ri-20240729-pkgconfig.patch @@ -0,0 +1,33 @@ +From 132130a5e74dac9beeb42333a551d76714190f40 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Mon, 20 Jan 2025 23:11:30 -0500 +Subject: [PATCH] m4ri.pc.in: various compiler/linker flag improvements + + 1. libpng moved from Requires to Requires.private. Programs using m4ri + don't need to pass -lpng unless they are statically linking. + + 2. Move $OPENMP_CFLAGS to Libs.private. This belongs in Libs.private + (rather than Libs) for the same reason -lpng does, but it also does + NOT belong in Cflags, because we don't want to accidentally enable + OpenMP at compile time in every project that uses m4ri. +--- + m4ri.pc.in | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/m4ri.pc.in b/m4ri.pc.in +index 0257aa6..ff1b3ce 100644 +--- a/m4ri.pc.in ++++ b/m4ri.pc.in +@@ -6,6 +6,7 @@ includedir=@includedir@ + Name: M4RI + Description: Dense linear algebra over GF(2). + Version: @PACKAGE_VERSION@ +-Requires: @M4RI_USE_PNG_PC@ ++Requires.private: @M4RI_USE_PNG_PC@ + Libs: -L${libdir} -lm4ri @RAW_LIBPNG@ @LIBM@ @LIBPNG_LIBADD@ +-Cflags: -I${includedir} @SIMD_CFLAGS@ @OPENMP_CFLAGS@ @LIBPNG_CFLAGS@ ++Libs.private: @OPENMP_CFLAGS@ ++Cflags: -I${includedir} @LIBPNG_CFLAGS@ +-- +2.45.2 + diff --git a/sci-libs/m4ri/m4ri-20240729.ebuild b/sci-libs/m4ri/m4ri-20240729.ebuild new file mode 100644 index 000000000000..04e50795ca67 --- /dev/null +++ b/sci-libs/m4ri/m4ri-20240729.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Method of four russian for inversion (M4RI)" +HOMEPAGE="https://github.com/malb/m4ri" +SRC_URI="https://github.com/malb/${PN}/archive/refs/tags/release-${PV}.tar.gz" + +S="${WORKDIR}/${PN}-release-${PV}" + +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" + +BDEPEND="virtual/pkgconfig" +DEPEND="png? ( media-libs/libpng:= )" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-pkgconfig.patch" ) + +# NEWS and ChangeLog are empty as of 2025-01-20. +DOCS=( AUTHORS README.md ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + eautoreconf +} + +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) +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/m4rie/Manifest b/sci-libs/m4rie/Manifest index 512ebbbde6e1..2f4e0f04add5 100644 --- a/sci-libs/m4rie/Manifest +++ b/sci-libs/m4rie/Manifest @@ -1,4 +1,7 @@ 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 MISC metadata.xml 985 BLAKE2B 0b5601161f57de941bf8cff616bc4c92260587517200e0f44a1501d56a938eb2e0727d61659bc2eda2dc42bf376fc8a40db4c7edde32c65c5d2d2d3c7ca82828 SHA512 6e9b2e0467d85aa9a1d18b185ccb7798e4a0cd75c86d70ff6facb644d7bb8657d9e195b38577fd874fe08accd576f231bcdc4b988a9478ab27cd5893d6fb3c51 diff --git a/sci-libs/m4rie/files/m4rie-20250103-pkgconfig-r1.patch b/sci-libs/m4rie/files/m4rie-20250103-pkgconfig-r1.patch new file mode 100644 index 000000000000..191a90c982fc --- /dev/null +++ b/sci-libs/m4rie/files/m4rie-20250103-pkgconfig-r1.patch @@ -0,0 +1,40 @@ +From e399e88566a0a96ec8d0ee010052a987c5d83e0f Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Mon, 20 Jan 2025 22:55:08 -0500 +Subject: [PATCH] m4rie.pc.in: improve compiler/linker flag handling + + 1. List m4ri in Requires. This will automatically add -lm4ri during + linking. + + 2. Move $OPENMP_CFLAGS to Libs.private. Consumers of m4rie do not + need to enable OpenMP at compile time to avoid problems, only at + link time, and only when statically linking. In particular we want + to _avoid_ enabling OpenMP by "accident" in a larger project that + makes use of m4rie. + + 3. Drop $M4RI_CFLAGS. There's just... no reason to add these here. + In theory if M4RI had some important -D flags, they would go here, + but at the moment it's just adding a bunch of -msse and -fopenmp + stuff that we do not necessarily want to use when compiling + consumers of m4rie. +--- + m4rie.pc.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/m4rie.pc.in b/m4rie.pc.in +index e716441..57436ef 100644 +--- a/m4rie.pc.in ++++ b/m4rie.pc.in +@@ -6,5 +6,7 @@ includedir=@includedir@ + Name: M4RIE + Description: Dense linear algebra over GF(2^e). + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lm4rie -lm4ri -lm +-Cflags: -I${includedir} @M4RI_CFLAGS@ @OPENMP_CFLAGS@ ++Requires: m4ri >= 20240729 ++Libs: -L${libdir} -lm4rie -lm ++Libs.private: @OPENMP_CFLAGS@ ++Cflags: -I${includedir} +-- +2.45.2 + diff --git a/sci-libs/m4rie/m4rie-20250103-r1.ebuild b/sci-libs/m4rie/m4rie-20250103-r1.ebuild new file mode 100644 index 000000000000..2751bfeee7d5 --- /dev/null +++ b/sci-libs/m4rie/m4rie-20250103-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16" +HOMEPAGE="https://github.com/malb/m4rie" +SRC_URI="https://github.com/malb/${PN}/archive/refs/tags/release-${PV}.tar.gz" + +S="${WORKDIR}/${PN}-release-${PV}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="debug" + +DEPEND=">=sci-libs/m4ri-20240729" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-pkgconfig-r1.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) +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest index 1b62fc43dd09..d154c753687c 100644 --- a/sci-libs/mathgl/Manifest +++ b/sci-libs/mathgl/Manifest @@ -1,4 +1,4 @@ AUX mathgl-libharu2.4.patch 887 BLAKE2B c4d990e935ea44488a327dae110c5ed964d6c2aaea641a37db6d8b7a33d4d83df9084fd66e066f89b6719894066d456557a73c23b6e5a97e1ddc22659ce69d20 SHA512 ad7926aa127770e01e39cdd50e49cdc24a9f803c2b23680e2c2e30f9387d2208e59f23e03af8bd602d072be98acf957f876d5f009185360a8657d654c800d18d DIST mathgl-8.0.1.tar.gz 23979834 BLAKE2B 275301c945ea15a38d1c75fd509c126425080b811403d5a8c8e864c8a975b914b5f0909bdc2c0de2feb84638ef0655694cd4d0c2aec8fb537c937147d81608c9 SHA512 1ff3023f1bbd7bfd84202777a0166a8d4255a020a07f3650b9858929345bc8a2ceea4db155d2c93ba32b762d2304474276290a9edac99fda70fb4b5bc12982c2 -EBUILD mathgl-8.0.1-r1.ebuild 3282 BLAKE2B 2b5345ac2f238bab2cacec93f3177cee08bd40c3a9b5502fc8ffe79957b3a6018c7b7e25f2d6afc534811f99cc99f574badb9d42a2e98ada7aaebb796e898d17 SHA512 24fe7940698163ed70892b25c1d9a7af28f21de8f32372113c4889246a8d41a4e298fd12bd77511aceac0eecabb0d439cf7d57fae3e2ad61e63c4385523a35b9 +EBUILD mathgl-8.0.1-r2.ebuild 3283 BLAKE2B e88e932c9e3894cb35e510695719832b2b7f5c8f0167d264b7a47094c2d069312b68009ea79d739fa4a9965e789a4c4f903274b7f38c2fc2c33064dfa23b8c07 SHA512 ebee17d537ac6280f5c0bd799b0085351c2db5a1d0cca82c2de1c0c9873c5239e1625eb8910deee09d1cf6785ee1b57d814c43b43ff658650497f1adc02d7a23 MISC metadata.xml 803 BLAKE2B d7be6d97e0863b89b4552412524ac156afe31fd2f31ce578ca292c27142d815b45caede4f813eb47453d245f0a01822f373ae68c9a42a0a610c27ea9515c3c03 SHA512 368249558ef88b2fff699e35b6baa037981edba4b6d18fe2411a0858a157c6181feceae9a42ff1f192383a2a30a8e4bcbddd4a501a45d014aafd682858a507ea diff --git a/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild b/sci-libs/mathgl/mathgl-8.0.1-r2.ebuild index 96df3e08c15a..53318c93823a 100644 --- a/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild +++ b/sci-libs/mathgl/mathgl-8.0.1-r2.ebuild @@ -24,7 +24,7 @@ unset l RDEPEND=" virtual/opengl - fltk? ( x11-libs/fltk:1 ) + fltk? ( x11-libs/fltk:1= ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2:= ) 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 8ae14bfd34e8..585e3f4d296f 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 3252 BLAKE2B eff71ed92899dfdc8434e0dd9c0bab6cc1c8f41b54dfb7c735a53e3e6ce837a7c5029f74c187bd9b3bd007628b24e28482db451115eaf6fecf061b742ebe8b13 SHA512 a825b4327303a4132a21a2689b6c8ed69f67426a2b797a8134460114a8360d45018c2f7d383c0922b031970eb424efa72a4417c1a72c8258cfeb8a86d3807814 +EBUILD med-4.1.1-r4.ebuild 3294 BLAKE2B e83528ccf87e99a460b4901ad48bd52a55ef5b281e8323bfb713e52c5a63c95615673d3875e73e13343b306e6d39c05d634f5aaf89a26ec7b303ee14f12cc6b3 SHA512 343f4ab9c74a6b2193135a6d5db9f72e08d52584187abe566dafac119fd07b00794bd5abff81569aa22ca0badba157f8e4e3ff42058312938468f99e4d3e5b58 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 ce0d521ecfd1..2b8c3a7cf96c 100644 --- a/sci-libs/med/med-4.1.1-r4.ebuild +++ b/sci-libs/med/med-4.1.1-r4.ebuild @@ -63,6 +63,9 @@ src_prepare() { } src_configure() { + # bug #943874 + append-cflags -std=gnu17 + local mycmakeargs=( # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, # so let's avoid rebuilding it because it will be different diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest index 5f2d233001b2..67dbecd71ef5 100644 --- a/sci-libs/miopen/Manifest +++ b/sci-libs/miopen/Manifest @@ -2,19 +2,20 @@ 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 AUX miopen-6.1.1-build-all-tests.patch 548 BLAKE2B be700c5401e288a4da5423047303a316ea82fc928c88e46be3da9cd41ac473bf6e232b68d1791e2fea0534c8233e4c2431c9a7536a24125651ce2f55aea1e667 SHA512 c8df1b24d61c9b7a132b77bddacb3d614653257c61b8b5936ea666a3e130b76a183618d5384abe5b871ae144bf9b2f2cf622850a59e7d5c53cf89adbf9dfa32b -DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd +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.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a +DIST MIOpen-6.3.0.tar.gz 104152308 BLAKE2B 46c238314393599a1bd4d3c49b0c95386b36cbee1831bf442ab127082b4c740116e81cf643c773627125b59c3974a2344753939b4287aa4adbbc51e4c4833988 SHA512 14ca2967ed6545ad68c362128be93b8e6a9d4aa69e16e989b187463d15351eca2fc437d07e88c41f693138131a7449add607333c698e24efaf0207077e15ae55 +DIST MIOpen-6.3.2.tar.gz 104156821 BLAKE2B e7611ea2d37d3c72cde2e6be153271dacd7150083ec63ec2357e1c808dc9e79c1928f06fd4e70712989c5ab13a604a91d3fba1819723da12b49f6a447a561f3c SHA512 bf219459244c8f0962c54a8e94273aeeafe4b9b093c72ac962fa9d373526c9dc406c46d0464ec6b20d52b1e6c01e2cf2544267b573a0e774c7afd4ba9adc9fb9 DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a -EBUILD miopen-5.1.3-r1.ebuild 3182 BLAKE2B a6ae78e487ea88d31693fcf1b96a7ce6a1cb0505311c2f101be498bcafce5436cc678ca83e10dafc27549b3121c01cbf0c5d2a35e7f6117de086879002ecc138 SHA512 2165e4d250f125f699963bc7b6f1c22598467e962c9aac1bb7eeff24d6091fa3b72a696a11e1ab80ea18710525ef00f99889cc5b972068e23340c4eb14b621ef EBUILD miopen-5.7.1-r1.ebuild 3338 BLAKE2B bbd84a39a04c4ef9e1b2dc42ff1bbe7b7e4ceda90ca0c82f416a05a55b1324727418e1c2c1446fe7a82800d23380cfb9a3e30463289a18e9af20ab10239cbfc7 SHA512 5a8ddf01d2c088325fd377499f80b3c1f84881d52596b53450f2ce07714e53a552304bd8a24aecf394a57ee039fd6f364642f93e7920d8d9df63bb7dd312057e -EBUILD miopen-6.1.1.ebuild 2339 BLAKE2B ffc1c4e15f8762046b8cf5bad5f36c311132913b92d1da4f994ad4ce2e8010ae7c12614b09e1e5b1fb5701a3cd2ba11f95592137603a64ae245084fc04e76072 SHA512 3e22489631a1116e9ab02cd9cef39964ba5be9a1af71daef2d4b002a420f607ee6358552d830f12e4bfe3ce4b869157599bd907f5bfac5ed5bad04c4f0f1d841 -MISC metadata.xml 646 BLAKE2B 76ad8db32707d804dcee5a8ff3adb66444464aa2bef2e3415326b485b67f6b0c26a36e45b30cd632b0e41e96cbcfad9c785f5145ddbf89fcdabe66456b35d22a SHA512 d7b219b8800178385725fc92fe72fe65c291a451963263271731580548e3319f2bac83e73bba66d3a6442aa6f9dfc8ff8955cdbbfd7f057825dda992e8dfe772 +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 +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/files/miopen-6.1.1-fix-libcxx.patch b/sci-libs/miopen/files/miopen-6.1.1-fix-libcxx.patch new file mode 100644 index 000000000000..0ce842d1470a --- /dev/null +++ b/sci-libs/miopen/files/miopen-6.1.1-fix-libcxx.patch @@ -0,0 +1,246 @@ +--- a/cmake/EnableCompilerWarnings.cmake ++++ b/cmake/EnableCompilerWarnings.cmake +@@ -70,6 +70,7 @@ set(__clang_cxx_compile_options + -Wno-unused-command-line-argument + -Wno-weak-vtables + -Wno-covered-switch-default ++ -Wno-switch-default + -Wno-unused-result + -Wno-unsafe-buffer-usage + -Wno-deprecated-declarations +--- a/src/include/miopen/bfloat16.hpp ++++ b/src/include/miopen/bfloat16.hpp +@@ -28,6 +28,7 @@ + #include <boost/operators.hpp> + #include <iostream> + #include <miopen/config.h> ++#include <miopen/libcxx_compat.hpp> + + class bfloat16 : boost::totally_ordered<bfloat16, boost::arithmetic<bfloat16>> + { +@@ -152,7 +153,7 @@ private: + std::uint16_t data_; + }; + +-namespace std { ++NAMESPACE_STD_BEGIN + template <> + class numeric_limits<bfloat16> + { +@@ -173,5 +174,5 @@ public: + return bfloat16::generate(0x0001); // 0x0.02p-126 + } + }; +-} // namespace std ++NAMESPACE_STD_END + #endif +--- /dev/null ++++ b/src/include/miopen/libcxx_compat.hpp +@@ -0,0 +1,44 @@ ++/******************************************************************************* ++ * ++ * MIT License ++ * ++ * Copyright (c) 2024 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 ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in all ++ * copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ * SOFTWARE. ++ * ++ *******************************************************************************/ ++#ifndef LIBCXX_COMPAT_HPP_ ++#define LIBCXX_COMPAT_HPP_ ++ ++// Definitions for libc++ compatibility ++#ifdef __has_include ++#if __has_include (<__config>) ++#include <__config> ++#endif ++#endif ++ ++#ifdef _LIBCPP_VERSION ++#define NAMESPACE_STD_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD ++#define NAMESPACE_STD_END _LIBCPP_END_NAMESPACE_STD ++#else ++#define NAMESPACE_STD_BEGIN namespace std { ++#define NAMESPACE_STD_END } ++#endif ++ ++#endif +--- a/src/kernels/hip_float8.hpp ++++ b/src/kernels/hip_float8.hpp +@@ -26,6 +26,7 @@ + #pragma once + + #include "miopen_cstdint.hpp" ++#include "libcxx_compat.hpp" + + #ifndef MIOPEN_ENABLE_F8_DEVICE_CODE + #define MIOPEN_ENABLE_F8_DEVICE_CODE 0 +@@ -590,7 +591,7 @@ public: + // from the precompiled header. + #else + // NOLINTBEGIN(cert-dcl58-cpp) +-namespace std { ++NAMESPACE_STD_BEGIN + inline bool isfinite(miopen_f8::hip_f8<miopen_f8::hip_f8_type::fp8> x) // NOLINT + { + return !(x.is_inf() || x.is_nan()); +@@ -611,12 +612,12 @@ inline bool isnan(miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8> x) // NOLINT + return x.is_nan(); + } + +-} // namespace std ++NAMESPACE_STD_END + // NOLINTEND(cert-dcl58-cpp) + #endif + + // NOLINTBEGIN(cert-dcl58-cpp) +-namespace std { ++NAMESPACE_STD_BEGIN + + template <typename T> + class numeric_limits; +@@ -633,7 +634,7 @@ class numeric_limits<miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8>> + { + }; + +-} // namespace std ++NAMESPACE_STD_END + // NOLINTEND(cert-dcl58-cpp) + + template <miopen_f8::hip_f8_type T> +--- /dev/null ++++ b/src/kernels/libcxx_compat.hpp +@@ -0,0 +1,41 @@ ++/******************************************************************************* ++ * ++ * MIT License ++ * ++ * Copyright (c) 2024 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 ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in all ++ * copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ * SOFTWARE. ++ * ++ *******************************************************************************/ ++#pragma once ++ ++// Definitions for libc++ compatibility ++#ifdef __has_include ++#if __has_include (<__config>) ++#include <__config> ++#endif ++#endif ++ ++#ifdef _LIBCPP_VERSION ++#define NAMESPACE_STD_BEGIN _LIBCPP_BEGIN_NAMESPACE_STD ++#define NAMESPACE_STD_END _LIBCPP_END_NAMESPACE_STD ++#else ++#define NAMESPACE_STD_BEGIN namespace std { ++#define NAMESPACE_STD_END } ++#endif +--- a/src/kernels/miopen_limits.hpp ++++ b/src/kernels/miopen_limits.hpp +@@ -33,8 +33,9 @@ + + #define MIOPEN_ENABLE_F8_DEVICE_CODE 1 + #include "hip_float8.hpp" ++#include "libcxx_compat.hpp" + +-namespace std { ++NAMESPACE_STD_BEGIN + + template <typename T> + class numeric_limits; +@@ -91,7 +92,7 @@ public: + }; + #endif + +-} // namespace std ++NAMESPACE_STD_END + + #else + +--- a/src/kernels/miopen_type_traits.hpp ++++ b/src/kernels/miopen_type_traits.hpp +@@ -26,8 +26,9 @@ + #pragma once + + #ifdef MIOPEN_DONT_USE_HIP_RUNTIME_HEADERS ++#include "libcxx_compat.hpp" + +-namespace std { ++NAMESPACE_STD_BEGIN + + template <class T> + struct remove_reference +@@ -140,7 +141,7 @@ struct conditional<false, X, Y> + template <bool predicate, typename X, typename Y> + using conditional_t = typename conditional<predicate, X, Y>::type; + +-} // namespace std ++NAMESPACE_STD_END + #else + + #include <type_traits> // std::remove_reference, std::remove_cv, is_pointer +--- a/src/kernels/miopen_utility.hpp ++++ b/src/kernels/miopen_utility.hpp +@@ -28,8 +28,9 @@ + #ifdef MIOPEN_DONT_USE_HIP_RUNTIME_HEADERS + + #include "miopen_type_traits.hpp" // std::remove_reference ++#include "libcxx_compat.hpp" + +-namespace std { ++NAMESPACE_STD_BEGIN + + template <typename T> + constexpr T&& forward(typename remove_reference<T>::type& t_) noexcept +@@ -43,7 +44,7 @@ constexpr T&& forward(typename remove_reference<T>::type&& t_) noexcept + return static_cast<T&&>(t_); + } + +-} // namespace std ++NAMESPACE_STD_END + + #else + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -481,6 +481,7 @@ if( MIOPEN_BACKEND MATCHES "OpenCL" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN + kernels/gpr_alloc.inc + kernels/hip_atomic.hpp + kernels/hip_f8_impl.hpp ++ kernels/libcxx_compat.hpp + kernels/hip_float8.hpp + kernels/inst_wrappers.inc + kernels/miopen_cstdint.hpp diff --git a/sci-libs/miopen/files/miopen-6.3.0-conditional-ck-components.patch b/sci-libs/miopen/files/miopen-6.3.0-conditional-ck-components.patch new file mode 100644 index 000000000000..b4332d5a1ca6 --- /dev/null +++ b/sci-libs/miopen/files/miopen-6.3.0-conditional-ck-components.patch @@ -0,0 +1,46 @@ +composable_kernel does not build some functions/targets depending on GPU. +Upstream bug: https://github.com/ROCm/composable_kernel/issues/1646 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -847,10 +847,6 @@ target_include_directories(MIOpen PUBLIC + $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/include> + ) + +-if(MIOPEN_USE_COMPOSABLEKERNEL) +-set(MIOPEN_CK_LINK_FLAGS composable_kernel::device_other_operations composable_kernel::device_gemm_operations composable_kernel::device_conv_operations composable_kernel::device_reduction_operations composable_kernel::device_mha_operations hip::host) +-endif() +- + if(WIN32) + # Refer to https://en.cppreference.com/w/cpp/language/types for details. + target_compile_options(MIOpen PRIVATE $<BUILD_INTERFACE:$<$<CXX_COMPILER_ID:Clang>:-U__LP64__>>) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -327,7 +327,27 @@ add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:HIP_COMPILER_FLAGS=${HIP_COMPI + # HIP + if( MIOPEN_BACKEND STREQUAL "HIP" OR MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN_BACKEND STREQUAL "HIPNOGPU") + if(MIOPEN_USE_COMPOSABLEKERNEL) +- find_package(composable_kernel 1.0.0 COMPONENTS device_other_operations device_gemm_operations device_conv_operations device_reduction_operations device_mha_operations) ++ set(MIOPEN_CK_LINK_FLAGS hip::host) ++ set(COMPONENTS_LIST device_other_operations device_gemm_operations device_conv_operations device_reduction_operations device_mha_operations) ++ foreach(component IN LISTS COMPONENTS_LIST) ++ find_package(composable_kernel 1.0.0 COMPONENTS ${component} QUIET) ++ if(TARGET composable_kernel::${component}) ++ list(APPEND MIOPEN_CK_LINK_FLAGS "composable_kernel::${component}") ++ else() ++ message(WARNING "CK component '${component}' not found.") ++ endif() ++ endforeach() ++ if(AMDGPU_TARGETS MATCHES "gfx94" OR AMDGPU_TARGETS MATCHES "gfx90a") ++ add_definitions(-DMIOPEN_USE_CK_MHA_OPS=1) ++ else() ++ add_definitions(-DMIOPEN_USE_CK_MHA_OPS=0) ++ endif() ++ if(AMDGPU_TARGETS MATCHES "gfx9") ++ add_definitions(-DMIOPEN_USE_CK_XDL_OPS=1) ++ else() ++ add_definitions(-DMIOPEN_USE_CK_XDL_OPS=0) ++ endif() ++ + endif() + if( MIOPEN_BACKEND STREQUAL "HIPNOGPU") + set(MIOPEN_MODE_NOGPU 1) diff --git a/sci-libs/miopen/files/miopen-6.3.0-isnan-include.patch b/sci-libs/miopen/files/miopen-6.3.0-isnan-include.patch new file mode 100644 index 000000000000..c7672e96a117 --- /dev/null +++ b/sci-libs/miopen/files/miopen-6.3.0-isnan-include.patch @@ -0,0 +1,19 @@ +--- a/driver/reducecalculation_driver.hpp ++++ b/driver/reducecalculation_driver.hpp +@@ -34,6 +34,7 @@ + #include <algorithm> + #include <cfloat> + #include <cstdlib> ++#include <cmath> + #include <memory> + #include <miopen/miopen.h> + #include <miopen/tensor.hpp> +@@ -77,7 +78,7 @@ int32_t mloReduceCalculationForwardRunHost(miopenTensorDescriptor_t inputDesc, + for(size_t i = 0; i < reduce_size; ++i) + { + Tcheck val = static_cast<Tcheck>(input[input_idx]); +- if(nanPropagation && isnan(val)) ++ if(nanPropagation && std::isnan(val)) + { + val = 0.0f; + } diff --git a/sci-libs/miopen/metadata.xml b/sci-libs/miopen/metadata.xml index e08e7753394d..07d78ddb5aa1 100644 --- a/sci-libs/miopen/metadata.xml +++ b/sci-libs/miopen/metadata.xml @@ -19,4 +19,10 @@ <upstream> <remote-id type="github">ROCm/MIOpen</remote-id> </upstream> + <use> + <flag name="composable-kernel">Use composable-kernel for GEMM-like and reduction-like operators.</flag> + <flag name="hipblaslt">Use hipBLASLt for some non-batched and strided batched problems.</flag> + <flag name="rocblas">Build with rocBLAS support</flag> + <flag name="roctracer">Build with roctracer support</flag> + </use> </pkgmetadata> 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.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild index f272f435ece8..6cf70cea3434 100644 --- a/sci-libs/miopen/miopen-6.1.1.ebuild +++ b/sci-libs/miopen/miopen-6.1.1.ebuild @@ -21,7 +21,7 @@ IUSE="debug test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/hip + dev-util/hip:${SLOT} >=dev-db/sqlite-3.17 sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}] diff --git a/sci-libs/miopen/miopen-6.3.0.ebuild b/sci-libs/miopen/miopen-6.3.0.ebuild new file mode 100644 index 000000000000..45b1214c37cd --- /dev/null +++ b/sci-libs/miopen/miopen-6.3.0.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2024 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/miopen/miopen-6.3.2.ebuild b/sci-libs/miopen/miopen-6.3.2.ebuild new file mode 100644 index 000000000000..c8ade5eed8c2 --- /dev/null +++ b/sci-libs/miopen/miopen-6.3.2.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/mpfi/Manifest b/sci-libs/mpfi/Manifest index 1b45845077b9..3e5f2e7b199b 100644 --- a/sci-libs/mpfi/Manifest +++ b/sci-libs/mpfi/Manifest @@ -1,6 +1,6 @@ AUX mpfi-1.5.4-fix-tests.patch 11122 BLAKE2B 821c077eec814e0fcb98181c28702efeee00f7da11ca629047efa43e61e0cb4f45b9007ceadc1c3f328a5417aa98a51a9136f8df2eebb572614dce571ef8bd71 SHA512 0c520958d7e606f3090ea9332436d1727b5b7e9648b163a428952c8c4c50e7f84bdea6af7b1e22cdb72cba86dd36f43950718ccb9d119056af2288a45b824273 DIST mpfi-1.5.4.tgz 261696 BLAKE2B 264453870fbf18afc0876eef72a3fc9690e9eee1da5179831a24409159abe75b88dc373e2d20b8171c846e870ded876715b2c9034ab4f0d0f0ff10e34abd099d SHA512 72ba7d8c950f4d4e2c7a3da8570cdcec08f75b73580cdf64c4cc3b24f8add23c46ccf78a6de2158e81bd77e6efabceebbae418988d536e7484356b8102e10ce1 DIST mpfi-1.5.4_p20220401.tar.xz 370932 BLAKE2B 9ca070b7cb1ad50cd73869a209681a2272e9a1a2cb6458f9c5c339caec43bd6b11e73c49e261fbcfa4f1d1bf682a317253cb17a79d3b75fd1b8bb36c85fd97bb SHA512 a9bcbbb74946b305ab1470db3f32647fc984504ef1c31d4ba4f21d6c66e7193b88666c3cc3ac1382a02750e127cc71424496e8feab393e8cb282b54fc4aa48f6 -EBUILD mpfi-1.5.4.ebuild 744 BLAKE2B abd6c24bc837f79d77b9894350da28c7ddeccb52aa6aae11058e8dddbbebfacebe558480cf6d0f54ee9ba09b4f8ae47db6dfa5adcf12648a70efdbe250800506 SHA512 e105da2ae26626f44670e68e62b9911faa17f45b47cfd36340c25b33b178d9b977e75c36943073ba1b633ee022933b8156237d2d2eaf3e428f0f2539d3de5ab7 -EBUILD mpfi-1.5.4_p20220401.ebuild 826 BLAKE2B 57958ae807904dd1cca07e0c0fb756f780db479c04d3c0bd863e8b78611ad5df0b02fb9a9c06541b0c2cfe989e72cea81fe6055cb6e719fd5cac8e062ce987c3 SHA512 d5c2b93987f9a23ae298faf89d80a60ec2b894f8b76b3acb11afcbbf840883f2fb9bc7f7d42bb9e27efea82d1493b46ad40d350180faeb64c4ce4802b4c8e586 +EBUILD mpfi-1.5.4.ebuild 778 BLAKE2B ae30e4fd47f6413b7030cd26c235001177da7ea7f05cb378f67a487f16cf02a7f9f5c06a2cc191da1e832cf8318fb76535e5c8d8f1eddd74def882d61ad6e8ce SHA512 606b086c52b40f966d7bd153db0f9d45961465db4ce06bfad95306f20f7db47c64cacf3f4411be1f7e84e7529c062296f753bc7f6cb569a0925f35e3ad7e4ce0 +EBUILD mpfi-1.5.4_p20220401.ebuild 880 BLAKE2B 2d8daeb991721ea0227a30b74f0744326b875ce8b221eedae0ee58abde2a91bbb764c48ef0418b7e5e64792f20700b74fdbea74e2f0bb345fadcde7fbddb3af5 SHA512 61735abd9cec4a7fdf130e9b91ae63715f8b260de2c65e482df9c268ab4830a0e3917edc075792fe2ec15f0f8af580ac717acf9d21533988b7cbb1a066b7673b MISC metadata.xml 1032 BLAKE2B b5bb021e154acd0fa8bbb286e3229ac2b1e6ad19dccb8712f80e6d2507b27dc5ea2967dc286229fe146537140bfa5f4b2c75b1acbd707b63292632da42975a19 SHA512 75e9bca1c492cc7967e2fbd6c4e5f82f731c163777bb4a5639669b4511467b78f5d84224be11985e5e0286e038661b748aba70e55655bf434b5fd8f573b8751e diff --git a/sci-libs/mpfi/mpfi-1.5.4.ebuild b/sci-libs/mpfi/mpfi-1.5.4.ebuild index d61bc2f3343d..b8fd507c1a5e 100644 --- a/sci-libs/mpfi/mpfi-1.5.4.ebuild +++ b/sci-libs/mpfi/mpfi-1.5.4.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit autotools DESCRIPTION="Multiple precision interval arithmetic library based on MPFR" -HOMEPAGE="https://perso.ens-lyon.fr/nathalie.revol/software.html" +HOMEPAGE="https://perso.ens-lyon.fr/nathalie.revol/software.html https://gitlab.inria.fr/mpfi/mpfi" SRC_URI="https://gforge.inria.fr/frs/download.php/file/38111/${P}.tgz" # COPYING is GPL-3, COPYING.LESSER is LGPL-3, source file headers diff --git a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild b/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild index 41b815377ac4..bea69d29e332 100644 --- a/sci-libs/mpfi/mpfi-1.5.4_p20220401.ebuild +++ b/sci-libs/mpfi/mpfi-1.5.4_p20220401.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 DESCRIPTION="Multiple precision interval arithmetic library based on MPFR" -HOMEPAGE="https://perso.ens-lyon.fr/nathalie.revol/software.html" +HOMEPAGE="https://perso.ens-lyon.fr/nathalie.revol/software.html https://gitlab.inria.fr/mpfi/mpfi" SRC_URI=" https://perso.ens-lyon.fr/nathalie.revol/softwares/${PN}-1.5.4.tar.xz -> ${P}.tar.xz" S="${WORKDIR}/${PN}-1.5.4" # COPYING is GPL-3, COPYING.LESSER is LGPL-3, source file headers # are LGPL-2.1+ LICENSE="GPL-3 LGPL-3 LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" DEPEND=" dev-libs/gmp:0= 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/ondselsolver/Manifest b/sci-libs/ondselsolver/Manifest new file mode 100644 index 000000000000..15ada4061c23 --- /dev/null +++ b/sci-libs/ondselsolver/Manifest @@ -0,0 +1,8 @@ +AUX ondselsolver-1.0.1-include-cstdint-gcc15.patch 1841 BLAKE2B 03215002d913a23f64e051a44f97008ac1f4c633427608afc60d7dea878e3ad1addc64880c1b000b2525d58840f617fd7cfd7926cc8a854d6a94f5dca948f244 SHA512 26120839480f726c87a3bb6e5e5820bdcbc14aed8e1e559c06ef889fbc58fc68a54a69223cff28540415d6c89bb30ad854da88d554f536c33c23280bc699bc82 +AUX ondselsolver-1.0.1-properly-demangle-typenames.patch 5152 BLAKE2B cc12f930a005370a735a0dc9a9f5edf4ed3e75f7286d0c9762263ef2082e66e53d3d5091735dcf50e501ac446c31bec81b6a9d6e3277b535c422e8b82f75f74b SHA512 fbb4787b332eb5928c0b6e0c8068368b92f75984ce5bed35578f947b1861f0a652ff4e733a7f5f84d41585cd220eef94e447b62480f9f78bc869f359dbebf4cf +AUX ondselsolver-1.0.1_p20241024-system-gtest.patch 690 BLAKE2B 2f79542081f864365dc985372c2512615fc60d248e7249e6f66e75ece093c66a257a1fb96174cb827b7919a64d85868cff180d0c5028f15364356a77870c0700 SHA512 f8c72c000664cd896ced30f1e5278e05a37534a5f614a87c42c6337b6eac321ec43615893d976754bf8cabd178d95492a0cadb2c0dd151e627f64e65702e37ff +DIST ondselsolver-1.0.1_p20241024.tar.gz 4668075 BLAKE2B 82e13168b2f6d988e411613584d9bb943afd9df73716a467d2681658d530e71173abcb31e432075dce8ebc1f0276ecb2b7b837bf057fb68f654c972e2d77f5b5 SHA512 918542fca4bfcb952d6d9500a0f3721549810dd2cde9adfb352d9301e0e1bf0fe1100a301316f15a6dcd18e36d371c58ba4a41b8f8e0878a77db4cbf054a095a +DIST ondselsolver-1.0.1_p20241127.tar.gz 4669048 BLAKE2B 6f6c4f9468b2474890b05ca394947aa91bc1780e1ef922bba40144a30c247db32d7a5de469ed27e426209013b07a137522bad9c220d9e1862f7e946696974b0b SHA512 3504a6ab379f2d9d943a1a6da8f79abffebd7fe45fd3258f0bfeb0a789d73a2b68714c10e77e48987514c8acb23800412c10daa0046ed82dab4a2aab569851ff +EBUILD ondselsolver-1.0.1_p20241024.ebuild 983 BLAKE2B 77aefd0939f27eb0efe1ab503ff4f725304edfb71d4f32a146034c8495a6035f44964b40c9dcfe66075548a9e67a81e9fb7a01051cf9af80771a4b242a29369d SHA512 da2373621086de3c28cc0033bebab9a00dbb88353a53142776e1788afc34684c8021b0a859af8591ca9979aafe140a8b8141ec240f1a929094fc43bf79257e14 +EBUILD ondselsolver-1.0.1_p20241127-r1.ebuild 802 BLAKE2B 70432e556014b09432f2a10ce81ae6ecff5f533fb135a729e6e376258d4342dd093d50682d5184afd0b0b63ad03c361ebb823b345d232a245a0eb6e931c2dc68 SHA512 c3280277ce85bb05f7ac0544fe53fa07ca455d38e8c0c9aedc62914dfe3141a890bee5f7341cacde6f7b0885bdcb08255f65ccf212c89a5137af12787a0bdef3 +MISC metadata.xml 482 BLAKE2B fdc93965db23730a66b0c65b574f5aa4cf61ddf9b245a5d6a5860b09b2b1c6e3306004e54c0aa238fd9c301e2c6b8842d37eabb5de43dacc96c40afd723eeef8 SHA512 9a83ee5dd0ba8769904e5516b5968c48ee9f59bcbbf615b91451a8c0e59ccf8871f7921691b62d3505b4c7f96c10228c0f5bff41158ddc432f73476330ba386d diff --git a/sci-libs/ondselsolver/files/ondselsolver-1.0.1-include-cstdint-gcc15.patch b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-include-cstdint-gcc15.patch new file mode 100644 index 000000000000..9068c1cf2fad --- /dev/null +++ b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-include-cstdint-gcc15.patch @@ -0,0 +1,70 @@ +From 432aa45ca37ecc3e15a8fb4a62ebf85b0a189775 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Sat, 11 Jan 2025 00:14:18 +0100 +Subject: [PATCH] include cstdint [gcc15] + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/OndselSolver/Constraint.h b/OndselSolver/Constraint.h +index 119b627..a7409a8 100644 +--- a/OndselSolver/Constraint.h ++++ b/OndselSolver/Constraint.h +@@ -8,6 +8,7 @@ + + #pragma once + ++#include <cstdint> + #include <memory> + + #include "enum.h" +diff --git a/OndselSolver/DirectionCosineConstraintIqcJqc.h b/OndselSolver/DirectionCosineConstraintIqcJqc.h +index 5d68fcd..c81a41f 100644 +--- a/OndselSolver/DirectionCosineConstraintIqcJqc.h ++++ b/OndselSolver/DirectionCosineConstraintIqcJqc.h +@@ -9,6 +9,7 @@ + #pragma once + + #include "DirectionCosineConstraintIqcJc.h" ++#include <cstdint> + + namespace MbD { + class DirectionCosineConstraintIqcJqc : public DirectionCosineConstraintIqcJc +diff --git a/OndselSolver/DispCompIecJecO.h b/OndselSolver/DispCompIecJecO.h +index 74a1ca4..da3243a 100644 +--- a/OndselSolver/DispCompIecJecO.h ++++ b/OndselSolver/DispCompIecJecO.h +@@ -9,6 +9,7 @@ + #pragma once + + #include "KinematicIeJe.h" ++#include <cstdint> + + namespace MbD { + class DispCompIecJecO : public KinematicIeJe +diff --git a/OndselSolver/FullMatrix.h b/OndselSolver/FullMatrix.h +index 1013791..90e54aa 100644 +--- a/OndselSolver/FullMatrix.h ++++ b/OndselSolver/FullMatrix.h +@@ -9,6 +9,7 @@ + #pragma once + + #include <cmath> ++#include <cstdint> + #include <memory> + + #include "RowTypeMatrix.h" +diff --git a/OndselSolver/NewtonRaphson.h b/OndselSolver/NewtonRaphson.h +index 9d9fb19..bf0c517 100644 +--- a/OndselSolver/NewtonRaphson.h ++++ b/OndselSolver/NewtonRaphson.h +@@ -8,6 +8,7 @@ + + #pragma once + ++#include <cstdint> + #include <memory> + #include <vector> + +-- +2.47.1 + diff --git a/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch new file mode 100644 index 000000000000..7d536796d9f5 --- /dev/null +++ b/sci-libs/ondselsolver/files/ondselsolver-1.0.1-properly-demangle-typenames.patch @@ -0,0 +1,191 @@ +From 71c1f42d85ee1819741786255dc8876047398e8e Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx+gentoo@gmail.com> +Date: Sun, 12 Jan 2025 19:22:48 +0100 +Subject: [PATCH] properly demangle typenames + +C++ class names are mangled. How these are mangled is implementation specific. +Using string offsets is naive and caused at minimum testfailures. + +For gcc and clang you can use cxxabi.h to get demangled name. +This initial patch uses this for linux only, so the gentoo build suceeeds. + +Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> + +diff --git a/OndselSolver/ASMTItem.cpp b/OndselSolver/ASMTItem.cpp +index a18e7c9..9d5383a 100644 +--- a/OndselSolver/ASMTItem.cpp ++++ b/OndselSolver/ASMTItem.cpp +@@ -12,6 +12,7 @@ + #include "ASMTAssembly.h" + #include "Constant.h" + #include <algorithm> ++#include "Demangle.h" + + using namespace MbD; + +@@ -41,9 +42,7 @@ void MbD::ASMTItem::noop() + + std::string MbD::ASMTItem::classname() + { +- std::string str = typeid(*this).name(); +- auto answer = str.substr(11, str.size() - 11); +- return answer; ++ return demangle(typeid(*this).name()); + } + + void MbD::ASMTItem::setName(const std::string& str) +diff --git a/OndselSolver/ASMTJoint.cpp b/OndselSolver/ASMTJoint.cpp +index 40edd52..bb710e3 100644 +--- a/OndselSolver/ASMTJoint.cpp ++++ b/OndselSolver/ASMTJoint.cpp +@@ -9,6 +9,7 @@ + + #include "ASMTJoint.h" + #include "Joint.h" ++#include "Demangle.h" + + using namespace MbD; + +@@ -47,9 +48,7 @@ void MbD::ASMTJoint::storeOnLevel(std::ofstream& os, size_t level) + + void MbD::ASMTJoint::storeOnTimeSeries(std::ofstream& os) + { +- std::string label = typeid(*this).name(); +- label = label.substr(15, label.size() - 15); +- os << label << "Series\t" << fullName("") << std::endl; ++ os << demangle(typeid(*this).name()) << "Series\t" << fullName("") << std::endl; + ASMTItemIJ::storeOnTimeSeries(os); + } + +diff --git a/OndselSolver/Array.h b/OndselSolver/Array.h +index 636e9a5..e270795 100644 +--- a/OndselSolver/Array.h ++++ b/OndselSolver/Array.h +@@ -16,6 +16,7 @@ + #include "Numeric.h" + #include <limits> + ++#include "Demangle.h" + //#include "Symbolic.h" + + namespace MbD { +@@ -51,10 +52,7 @@ namespace MbD { + void atitimes(size_t i, double factor); + + virtual std::ostream& printOn(std::ostream& s) const { +- std::string str = typeid(*this).name(); +- auto classname = str.substr(11, str.size() - 11); +- s << classname << std::endl; +- return s; ++ return s << demangle(typeid(*this).name()) << std::endl; + } + friend std::ostream& operator<<(std::ostream& s, const Array& array) + { +diff --git a/OndselSolver/Demangle.h b/OndselSolver/Demangle.h +new file mode 100644 +index 0000000..810936d +--- /dev/null ++++ b/OndselSolver/Demangle.h +@@ -0,0 +1,39 @@ ++#ifndef DEMANGLE_H ++#define DEMANGLE_H 1 ++#include <string> ++ ++#ifdef _WIN32 ++#include <typeinfo> ++namespace { ++std::string demangle(const char* mangled_name) noexcept { ++ return mangled_name; ++} ++} ++#else // __linux__ ++#include <cxxabi.h> ++namespace { ++std::string demangle(const char* mangled_name) noexcept { ++ int error = 0; ++ char *demang_name = abi::__cxa_demangle(mangled_name, 0, 0, &error); ++ ++ switch (error) { ++ case 0: ++ break; ++ case -1: ++ return "memory allocation failed"; ++ case -2: ++ return "not a valid mangled name"; ++ case -3: ++ return "invalid arguments"; ++ default: ++ return "__cxa_demangle failed"; ++ } ++ ++ std::string name(demang_name); ++ free(demang_name); ++ ++ return name.substr(name.find_last_of("::") + 1); ++} ++} ++#endif // __linux__ ++#endif +diff --git a/OndselSolver/Item.cpp b/OndselSolver/Item.cpp +index 4435d5d..120cd3c 100644 +--- a/OndselSolver/Item.cpp ++++ b/OndselSolver/Item.cpp +@@ -15,6 +15,7 @@ + #include "Item.h" + #include "System.h" + #include "Symbolic.h" ++#include "Demangle.h" + + using namespace MbD; + +@@ -44,10 +45,7 @@ void Item::initialize() + + std::ostream& Item::printOn(std::ostream& s) const + { +- std::string str = typeid(*this).name(); +- auto classname = str.substr(11, str.size() - 11); +- s << classname << std::endl; +- return s; ++ return s << demangle(typeid(*this).name()) << std::endl; + } + + void Item::initializeLocally() +diff --git a/OndselSolver/Symbolic.cpp b/OndselSolver/Symbolic.cpp +index 75bcbb6..4961964 100644 +--- a/OndselSolver/Symbolic.cpp ++++ b/OndselSolver/Symbolic.cpp +@@ -15,6 +15,7 @@ + #include "Product.h" + #include "Sum.h" + #include "Power.h" ++#include "Demangle.h" + + using namespace MbD; + +@@ -160,10 +161,7 @@ bool Symbolic::isConstant() + + std::ostream& Symbolic::printOn(std::ostream& s) const + { +- std::string str = typeid(*this).name(); +- auto classname = str.substr(11, str.size() - 11); +- s << classname; +- return s; ++ return s << demangle(typeid(*this).name()); + } + + std::shared_ptr<std::vector<Symsptr>> Symbolic::getTerms() +diff --git a/OndselSolver/CMakeLists.txt b/OndselSolver/CMakeLists.txt +index 6836e72..30d5bf4 100644 +--- a/OndselSolver/CMakeLists.txt ++++ b/OndselSolver/CMakeLists.txt +@@ -426,6 +426,7 @@ set(ONDSELSOLVER_HEADERS + CREATE.h + CylindricalJoint.h + CylSphJoint.h ++ Demangle.h + DiagonalMatrix.h + DifferenceOperator.h + DifferentiatedGeneralSpline.h +-- +2.48.0 + diff --git a/sci-libs/ondselsolver/files/ondselsolver-1.0.1_p20241024-system-gtest.patch b/sci-libs/ondselsolver/files/ondselsolver-1.0.1_p20241024-system-gtest.patch new file mode 100644 index 000000000000..16258763011a --- /dev/null +++ b/sci-libs/ondselsolver/files/ondselsolver-1.0.1_p20241024-system-gtest.patch @@ -0,0 +1,26 @@ +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,11 +1,4 @@ +-include(FetchContent) +-FetchContent_Declare( +- googletest +- URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip +-) +-# For Windows: Prevent overriding the parent project's compiler/linker settings +-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +-FetchContent_MakeAvailable(googletest) ++find_package(GTest QUIET) + + if(MSVC) + add_compile_options(/wd4251) +@@ -54,8 +47,8 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/test.cpp + ) + target_link_libraries(test_run +- gtest_main +- gmock_main ++ GTest::gtest ++ GTest::gmock_main + ${Google_Tests_LIBS} + OndselSolver + ) diff --git a/sci-libs/ondselsolver/metadata.xml b/sci-libs/ondselsolver/metadata.xml new file mode 100644 index 000000000000..a6feb57a7762 --- /dev/null +++ b/sci-libs/ondselsolver/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>ydmorenoc@unal.edu.co</email> + <name>David Moreno</name> + </maintainer> + <maintainer type="person" proxied="proxy"> + <email>nowa@gentoo.org</email> + <name>Nowa Ammerlaan</name> + </maintainer> + <upstream> + <remote-id type="github">Ondsel-Development/OndselSolver</remote-id> + </upstream> +</pkgmetadata> diff --git a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild new file mode 100644 index 000000000000..b58103dbe5e8 --- /dev/null +++ b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241024.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +COMMIT=9e44ac50b84dbce0e04907999ff0f33e69f583bc + +DESCRIPTION="Assembly Constraints and Multibody Dynamics code" +HOMEPAGE="https://github.com/Ondsel-Development/OndselSolver/" +SRC_URI="https://github.com/Ondsel-Development/OndselSolver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OndselSolver-${COMMIT}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" + +# These tests result in "Subprocess aborted" +CMAKE_SKIP_TESTS=( + OndselSolver.Gears + OndselSolver.anglejoint + OndselSolver.constvel + OndselSolver.rackscrew + OndselSolver.planarbug + OndselSolver.piston +) + +PATCHES=( + "${FILESDIR}/${P}-system-gtest.patch" + "${FILESDIR}/${PN}-1.0.1-include-cstdint-gcc15.patch" +) + +src_configure() { + local mycmakeargs=( + -DONDSELSOLVER_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} diff --git a/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild new file mode 100644 index 000000000000..da2e1dccd90b --- /dev/null +++ b/sci-libs/ondselsolver/ondselsolver-1.0.1_p20241127-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +COMMIT=07785b7576a0655660badd845f06ed286208da1a + +DESCRIPTION="Assembly Constraints and Multibody Dynamics code" +HOMEPAGE="https://github.com/Ondsel-Development/OndselSolver/" +SRC_URI="https://github.com/Ondsel-Development/OndselSolver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/OndselSolver-${COMMIT}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-cpp/gtest )" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.1_p20241024-system-gtest.patch" + "${FILESDIR}/${PN}-1.0.1-properly-demangle-typenames.patch" +) + +src_configure() { + local mycmakeargs=( + -DONDSELSOLVER_BUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} 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.2.ebuild b/sci-libs/onnx/onnx-1.16.2-r1.ebuild index 9d71aeffe047..555c3bac3c40 100644 --- a/sci-libs/onnx/onnx-1.16.2.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.1-r1.ebuild b/sci-libs/onnx/onnx-1.17.0.ebuild index 9d71aeffe047..557c1014ad16 100644 --- a/sci-libs/onnx/onnx-1.16.1-r1.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..1001a30767c9 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 6059 BLAKE2B 1166996b0aff57998d916846172443656e2418b3b6d6aedda40224ba28041ed36be8ea26eb6b892cd45a02934b80e38c798548498d1105e507c9e3e0a8325e1f SHA512 4d0226ab6a674683cc494891746dc9d1dddb15c7491bc92e56da78c79cb3a39b4822a5c5fbc50361d652cd9158447396047692456656880dd871dc39f3c66c57 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..61819fb85337 --- /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 25262324db23..51a6ccf75e33 100644 --- a/sci-libs/openlibm/Manifest +++ b/sci-libs/openlibm/Manifest @@ -1,8 +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 1136 BLAKE2B f11458522fd4790d381066b8375ce3efb1f39197fa6a7cd5c0964dcf738d3fe1dd70f2fda01ba9dc7889c8922d8b9bc5f1888e68c246efe59b563a69137953d6 SHA512 6be54c7ddd02765d331b0b39526f07876895687f2bfc8c6d78a55228f1aa671a0fcf9dd21d4f46cd1d793bcaa6ee6802926173a754629d986be167c9d48649a9 +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/files/openlibm-0.8.3-fix-loong-riscv-fenv.patch b/sci-libs/openlibm/files/openlibm-0.8.3-fix-loong-riscv-fenv.patch new file mode 100644 index 000000000000..3e66dfaa46a9 --- /dev/null +++ b/sci-libs/openlibm/files/openlibm-0.8.3-fix-loong-riscv-fenv.patch @@ -0,0 +1,27 @@ +https://github.com/JuliaMath/openlibm/commit/c4667caea25ae3487adf6760b4a1dcf32477a4b8 +https://github.com/JuliaMath/openlibm/pull/308 +shipped in openlibm 0.8.4 +From: Li Bohai <lbhlbhlbh2002@icloud.com> +Date: Sat, 9 Nov 2024 21:40:26 +0800 +Subject: [PATCH] Fix fenv_t initializer (#308) + +--- a/loongarch64/fenv.c ++++ b/loongarch64/fenv.c +@@ -1,5 +1,5 @@ + #define __fenv_static +-#include <fenv.h> ++#include <openlibm_fenv.h> + + #ifdef __GNUC_GNU_INLINE__ + #error "This file must be compiled with C99 'inline' semantics" +--- a/riscv64/fenv.c ++++ b/riscv64/fenv.c +@@ -27,7 +27,7 @@ + */ + + #define __fenv_static +-#include "fenv.h" ++#include <openlibm_fenv.h> + + #ifdef __GNUC_GNU_INLINE__ + #error "This file must be compiled with C99 'inline' semantics" 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 1b03b5cf145c..2252f0e806cd 100644 --- a/sci-libs/openlibm/openlibm-0.8.3.ebuild +++ b/sci-libs/openlibm/openlibm-0.8.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 @@ -13,10 +13,11 @@ 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 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 + "${FILESDIR}"/${P}-fix-loong-riscv-fenv.patch ) src_prepare() { @@ -28,8 +29,12 @@ src_prepare() { } src_compile() { - # Build system uses the riscv64 arch variable - use riscv && export ARCH=riscv64 + # Build system uses different ARCH for the following arches + case "${ARCH}" in + loong) export ARCH=loongarch64 ;; + riscv) export ARCH=riscv64 ;; + x86) export ARCH=i387 ;; + esac emake \ CC="$(tc-getCC)" \ diff --git a/sci-libs/pcl/Manifest b/sci-libs/pcl/Manifest index ee32bae51ae1..800340fc92f7 100644 --- a/sci-libs/pcl/Manifest +++ b/sci-libs/pcl/Manifest @@ -1,9 +1,10 @@ AUX pcl-1.12.1-allow-configuration-of-install-dirs.patch 1188 BLAKE2B 5ffc3c22c10df8a14270ce1e6a3b0c2db0ed3c5e9154bfed366b87faf8a13546fbf78a88f0d52c4ca09e345ba9add384dad86a08963e0b496a2944293f38516b SHA512 ab4cb57d5d1e494501412d5fcd662f8d75f74a7cf768e948abc1270d11b7ec2bc90901630fa7ac6e96237507c9bfa4214594fc76c58f505bcf2f40e4e37487a8 AUX pcl-1.12.1-fix-hardcoded-relative-directory-of-the-installed-cmake-files.patch 832 BLAKE2B e7095163cba68ee7487251506e19434050c4c7d4bb5feb6d0946356a607dad5555c7327dc1ba68761086b3708ad653256337a110983d9d656fa863dbf9a75896 SHA512 5581df74c9f6f0bd9613b7f158d0d799a4fdea512101001aafdf8eaa91c31e4570f4ce04f1b828730c9fa8082d00000e78055da87427301f04807c1087f1b8b2 -AUX pcl-1.14.1-boost.patch 1155 BLAKE2B 09f41979ef2878bd062e14fc38e9525cea090729e9d49b3a55d95bfc375c42cee9b9d0af1578407d9bc467babcb11b15f4c600fe2b8e34e30e12fb50c83ab577 SHA512 88431830523552c45625b1931138e79b75eebe4be0432b263519fde24518942a92ef595b77e73fea393db6da8bfaba286f07644e3894fb8eb66ebaa8babe9588 +AUX pcl-1.14.1-boost-1.87.patch 6820 BLAKE2B d8c911a00016f6132d4281dd0748177cba1d313ed8b274e0473b79cda22d4aa9d8051374f8437e6fa2caaaadd9021200877dc3316f7795cf69d5f6053c88ff3d SHA512 aa7016b62c61799f88933dcc854b9b16d16678c64ab4b1d48861e2b0e7d64bbe012f199d83de5f8590519d4f28047f54f3f02a792a7fc743998489ab563463f9 +AUX pcl-1.14.1-boost.patch 925 BLAKE2B 99c340c9187432093b32e3f667e791e41ca298ba21224a87ec1b8b5d8fc942f63ba90830e28a98007929096c16bb28002a94b9d16c61ab91f85e26115e8c2276 SHA512 856b0d31a7ffc60e408fefd68bce9a1820e11ad3df3b3f4cfcc9aca60303c10ba604b84f1932838bf03d1812eb47ebeedbe32a1fbdbdda2572dc4b98337116fd AUX pcl-1.14.1-gcc15.patch 2070 BLAKE2B 9baa1eda8a751c832fe875d9f941214f854bf70e0feba4f2793aadd3421898c6ce580f488f0daa35d102b63bf0aba7015d3552d0f6c97e456b4dfb9c47203433 SHA512 a15b13aee5d1e727072066c549a131e58f81bc804c2d9bc67cbec6da11a881a19a5438051f3eea4ad7c63ca7b4d92bc3105cc8ff8d58621a46f61a364077e7c3 AUX pcl-1.14.1-tests.patch 785 BLAKE2B 3cd99c021f70dbf2239979772c642d60e1d4c0631b2c7dd7d732c0ed51ecfec2fa02e1c796115bd4242e0403524422f8a6a3fa0b1e47474d278770b5ea23a0b4 SHA512 0039aac3850b0fe29fb7ef416fc3f812462001c145406e196d60ab9ec4e4c325b3bd2e342bd423a89f9bc547c51ccd95184d8b548186b338b90f4b3262d5080c DIST pcl-1.14.1.tar.gz 68672885 BLAKE2B 207389d844ac2793f6f321504c05282ace2d8e51aaf0277c13fb11f5be22ac93f7e044f34fc2259aca7d7e34ae3b9b00287ee9df0d15f851f1f4b4bd651578c7 SHA512 8e2d2839fe73a955d49b9a72861de2becf2da9a0dc906bd10ab8a3518e270a2f1900d801922d02871d704f2ed380273d35c2d0e04d8da7e24a21eb351c43c00b -EBUILD pcl-1.14.1-r1.ebuild 2764 BLAKE2B a9ef3a6e6df3b972772695dbc3af27c9e097cca8de84c948402ed4f358b516a2926d7de66ba4272baf3ad31f3f72f3c8665c185370c2d2e82eedaa06a0607b6f SHA512 79bfe1955093bf2015281fd67311f16182712ce84353f56be74493f9795e51556f8ed2852836659710edd76b7fde48ac7a84c295bbc9d75bae6d5ac4e968198c +EBUILD pcl-1.14.1-r2.ebuild 2809 BLAKE2B 865c6b66403df872dfc7718e1439e3acc07c18b27a0f3badfc03628dd9653501b8b32db915eeaf06a598afae90a1bedcb580af229fceeda30cf9c8be3d427743 SHA512 ddd6b5485e84af55022df42c6f367fc29d24e7d8626004ceacf8b86e8036221874f53ac434b1c56c8cfca67ebf31e430f77edf6d2d61f384422eb53a595ad663 EBUILD pcl-9999.ebuild 2725 BLAKE2B 732a41647159d2615892ca9956f1bacdee47e005eb562018ad3071ae9ebf367b0da1ee401c6a9ce2a38a0d7403f3b8b73ab2ae29f490c386599559b9be5c8db9 SHA512 cf7fa80d405bd1594c5071b828e14ba7c3c6d940fe66dc91221e49abccd9c1903b6fe2cfe16ae485af1dac0e13c1217bc52ddf3724f1fdf68156e17c64a2a5e4 MISC metadata.xml 1069 BLAKE2B efb4dd7a8d1d65a7922da25e9f31e327b35cf88924be9dbc12ec2adc2e2d57017714ab931611d17b575daaa831934d9b90493be307ed668e24b7831bf4bd0106 SHA512 ac01ef352a9d6d66a02981585e8a19b01574a254639067520ab7422d89e5f095f84f7fc91a3e4f5b6dcb154ca0e487604aa1461bae6fa02a2037d7ca2668de3f diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch b/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch new file mode 100644 index 000000000000..f2b1f248fcbf --- /dev/null +++ b/sci-libs/pcl/files/pcl-1.14.1-boost-1.87.patch @@ -0,0 +1,171 @@ +From 6f64495840c4e5674d542ccf20df96ed12665687 Mon Sep 17 00:00:00 2001 +From: Markus Vieth <mvieth@techfak.uni-bielefeld.de> +Date: Tue, 5 Nov 2024 20:07:13 +0100 +Subject: [PATCH 1/2] Prepare for Boost 1.87 Some stuff from Boost's asio + library has been removed after Boost 1.86. The documentation says that it has + been deprecated, but no compiler warnings are shown. This page explains what + is considered "old" and what should be used instead: + https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/net_ts.html - + io_service was simply an alias (typedef) for io_context - make_address + replaces from_string - resolver.resolve and connect work a bit different now, + see also + https://www.boost.org/doc/libs/1_86_0/doc/html/boost_asio/tutorial/tutdaytime1/src.html + +--- a/apps/src/openni_mobile_server.cpp ++++ b/apps/src/openni_mobile_server.cpp +@@ -157,7 +157,7 @@ class PCLMobileServer { + + viewer_.showCloud(getLatestPointCloud()); + +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + tcp::endpoint endpoint(tcp::v4(), static_cast<unsigned short>(port_)); + tcp::acceptor acceptor(io_service, endpoint); + tcp::socket socket(io_service); +--- a/apps/src/openni_octree_compression.cpp ++++ b/apps/src/openni_octree_compression.cpp +@@ -415,7 +415,7 @@ main(int argc, char** argv) + if (bEnDecode) { + // ENCODING + try { +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + tcp::endpoint endpoint(tcp::v4(), 6666); + tcp::acceptor acceptor(io_service, endpoint); + +@@ -423,7 +423,7 @@ main(int argc, char** argv) + + std::cout << "Waiting for connection.." << std::endl; + +- acceptor.accept(*socketStream.rdbuf()); ++ acceptor.accept(socketStream.rdbuf()->socket()); + + std::cout << "Connected!" << std::endl; + +--- a/apps/src/openni_organized_compression.cpp ++++ b/apps/src/openni_organized_compression.cpp +@@ -438,7 +438,7 @@ main(int argc, char** argv) + if (bEnDecode) { + // ENCODING + try { +- boost::asio::io_service io_service; ++ boost::asio::io_context io_service; + tcp::endpoint endpoint(tcp::v4(), 6666); + tcp::acceptor acceptor(io_service, endpoint); + +@@ -446,7 +446,7 @@ main(int argc, char** argv) + + std::cout << "Waiting for connection.." << std::endl; + +- acceptor.accept(*socketStream.rdbuf()); ++ acceptor.accept(socketStream.rdbuf()->socket()); + + std::cout << "Connected!" << std::endl; + +--- a/io/include/pcl/io/hdl_grabber.h ++++ b/io/include/pcl/io/hdl_grabber.h +@@ -274,7 +274,7 @@ namespace pcl + boost::asio::ip::udp::endpoint udp_listener_endpoint_; + boost::asio::ip::address source_address_filter_; + std::uint16_t source_port_filter_; +- boost::asio::io_service hdl_read_socket_service_; ++ boost::asio::io_context hdl_read_socket_service_; + boost::asio::ip::udp::socket *hdl_read_socket_; + std::string pcap_file_name_; + std::thread *queue_consumer_thread_; +--- a/io/include/pcl/io/robot_eye_grabber.h ++++ b/io/include/pcl/io/robot_eye_grabber.h +@@ -131,7 +131,7 @@ namespace pcl + + boost::asio::ip::address sensor_address_; + boost::asio::ip::udp::endpoint sender_endpoint_; +- boost::asio::io_service io_service_; ++ boost::asio::io_context io_service_; + std::shared_ptr<boost::asio::ip::udp::socket> socket_; + std::shared_ptr<std::thread> socket_thread_; + std::shared_ptr<std::thread> consumer_thread_; +--- a/io/include/pcl/io/tim_grabber.h ++++ b/io/include/pcl/io/tim_grabber.h +@@ -128,7 +128,7 @@ class PCL_EXPORTS TimGrabber : public Grabber + std::vector<float> distances_; + + boost::asio::ip::tcp::endpoint tcp_endpoint_; +- boost::asio::io_service tim_io_service_; ++ boost::asio::io_context tim_io_service_; + boost::asio::ip::tcp::socket tim_socket_; + //// wait time for receiving data (on the order of milliseconds) + unsigned int wait_time_milliseconds_ = 0; +--- a/io/src/hdl_grabber.cpp ++++ b/io/src/hdl_grabber.cpp +@@ -287,7 +287,7 @@ pcl::HDLGrabber::loadHDL32Corrections () + boost::asio::ip::address + pcl::HDLGrabber::getDefaultNetworkAddress () + { +- return (boost::asio::ip::address::from_string ("192.168.3.255")); ++ return (boost::asio::ip::make_address ("192.168.3.255")); + } + + ///////////////////////////////////////////////////////////////////////////// +--- a/io/src/robot_eye_grabber.cpp ++++ b/io/src/robot_eye_grabber.cpp +@@ -269,7 +269,7 @@ void + pcl::RobotEyeGrabber::socketThreadLoop () + { + asyncSocketReceive(); +- io_service_.reset(); ++ io_service_.restart(); + io_service_.run(); + } + +--- a/io/src/tim_grabber.cpp ++++ b/io/src/tim_grabber.cpp +@@ -184,8 +184,8 @@ pcl::TimGrabber::start () + + try { + boost::asio::ip::tcp::resolver resolver (tim_io_service_); +- tcp_endpoint_ = *resolver.resolve (tcp_endpoint_); +- tim_socket_.connect (tcp_endpoint_); ++ boost::asio::ip::tcp::resolver::results_type endpoints = resolver.resolve (tcp_endpoint_); ++ boost::asio::connect(tim_socket_, endpoints); + } + catch (std::exception& e) + { +--- a/io/src/vlp_grabber.cpp ++++ b/io/src/vlp_grabber.cpp +@@ -92,7 +92,7 @@ pcl::VLPGrabber::loadVLP16Corrections () + boost::asio::ip::address + pcl::VLPGrabber::getDefaultNetworkAddress () + { +- return (boost::asio::ip::address::from_string ("255.255.255.255")); ++ return (boost::asio::ip::make_address ("255.255.255.255")); + } + + ///////////////////////////////////////////////////////////////////////////// + +From 25be27e20a017f0ea0a0884b9fe31a50b5cbb82d Mon Sep 17 00:00:00 2001 +From: Markus Vieth <mvieth@techfak.uni-bielefeld.de> +Date: Thu, 7 Nov 2024 20:43:15 +0100 +Subject: [PATCH 2/2] =?UTF-8?q?Silence=20ABI=20warnings=20with=20GCC=2014?= + =?UTF-8?q?=20With=20the=20previous=20flag,=20GCC=2014=20displays=20many?= + =?UTF-8?q?=20warnings=20like=20"warning:=20the=20mangled=20name=20of=20..?= + =?UTF-8?q?.=20changed=20between=20=E2=80=98-fabi-version=3D17=E2=80=99=20?= + =?UTF-8?q?and=20=E2=80=98-fabi-version=3D19=E2=80=99=20[-Wabi]"=20I=20thi?= + =?UTF-8?q?nk=20these=20warnings=20are=20not=20useful=20for=20us.=20Since?= + =?UTF-8?q?=20PCL=201.15.0=20will=20not=20be=20ABI-compatible=20to=20PCL?= + =?UTF-8?q?=201.14.1=20anyway,=20these=20name=20changes=20do=20not=20matte?= + =?UTF-8?q?r=20AFAIK.?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ endif() + if(CMAKE_COMPILER_IS_GNUCXX) + if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}") + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7) +- string(APPEND CMAKE_CXX_FLAGS " -Wabi=11") ++ string(APPEND CMAKE_CXX_FLAGS " -Wabi=18") + else() + string(APPEND CMAKE_CXX_FLAGS " -Wabi") + endif() diff --git a/sci-libs/pcl/files/pcl-1.14.1-boost.patch b/sci-libs/pcl/files/pcl-1.14.1-boost.patch index 8f99023f741a..0c56c3b18b9a 100644 --- a/sci-libs/pcl/files/pcl-1.14.1-boost.patch +++ b/sci-libs/pcl/files/pcl-1.14.1-boost.patch @@ -6,12 +6,6 @@ Subject: [PATCH] Fix boost hash data type (#6053) * Fix boost hash data type * Change file name generation. ---- - visualization/src/pcl_visualizer.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/visualization/src/pcl_visualizer.cpp b/visualization/src/pcl_visualizer.cpp -index 5f073646ac1..bc9b959c246 100644 --- a/visualization/src/pcl_visualizer.cpp +++ b/visualization/src/pcl_visualizer.cpp @@ -4591,10 +4591,12 @@ pcl::visualization::PCLVisualizer::getUniqueCameraFile (int argc, char **argv) diff --git a/sci-libs/pcl/pcl-1.14.1-r1.ebuild b/sci-libs/pcl/pcl-1.14.1-r2.ebuild index 42b8092fcda8..217d87752bc7 100644 --- a/sci-libs/pcl/pcl-1.14.1-r1.ebuild +++ b/sci-libs/pcl/pcl-1.14.1-r2.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 @@ -72,6 +72,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.14.1-gcc15.patch "${FILESDIR}"/${PN}-1.14.1-tests.patch "${FILESDIR}"/${PN}-1.14.1-boost.patch + "${FILESDIR}"/${PN}-1.14.1-boost-1.87.patch ) src_prepare() { diff --git a/sci-libs/pdal/Manifest b/sci-libs/pdal/Manifest index fb74013dbf5e..d856df48af33 100644 --- a/sci-libs/pdal/Manifest +++ b/sci-libs/pdal/Manifest @@ -1,7 +1,7 @@ DIST PDAL-2.8.0-src.tar.bz2 87483358 BLAKE2B 8d15187f2b6a7110d52e2621d65ee8eedce0dd21c415c18fbb1e48dbdb0b24307b42487f4631f227875079ba47031c27196399970458236c7139b8f1418aa3b8 SHA512 d3b02f13e56423c5086e72908f932db384cb0d64f3d3e5cec121c1e283268f8e38f6123ff852d77c07ea9777001a78595bdafed458dc06aa52402d92e76ce995 DIST PDAL-2.8.1-src.tar.bz2 87507277 BLAKE2B 634ba5f2c5548bfa1fbdcc257185dcd99d2c8bda73e3ac24cf092d378150285912d9c5b48c88e21df14d5502221865273fa6167b82886ef848fc7d445c8937dc SHA512 fb1d0e892ea38518526ce0086415fffd92f356d104d9982f8883d254a206a75b51ff796dbf5db266a4dc8345ae91b825e8a50ae78eb21552c86ab600905850ad DIST PDAL-2.8.2-src.tar.bz2 87504277 BLAKE2B b2037a4fe5ac369380d2b2d83a2210a3c17757f9e6f749e819854d7356ba07d85b83fe3221ab9024f40f8a9f0ec6ee86573092914ac633af56b361a2f128cb00 SHA512 82dc84192e0cda809f4b12233e009c0c92328bf78001fc6394f56b28514a4b20de17dd354904d44cebc40c28a78828c47a1324b749143cc5b41b6c322902a442 -EBUILD pdal-2.8.0.ebuild 1492 BLAKE2B a565c01aa1314c20ef23c75297761e32cb6f32e47b8d61be1d6b56b57106e90ee9a88497e4dda2095356fa8f948115e22e1e52c0b68b4cc80fe08b3dc24deabe SHA512 3b20783bf7356f0be18e3bd8c0c6aba1a9d481d84110dbf11b01819d0de6e35103460e595351dd00e342182e125fb8c3546c8ba8a14b65e0ba46c8f7da13867e -EBUILD pdal-2.8.1.ebuild 1492 BLAKE2B a565c01aa1314c20ef23c75297761e32cb6f32e47b8d61be1d6b56b57106e90ee9a88497e4dda2095356fa8f948115e22e1e52c0b68b4cc80fe08b3dc24deabe SHA512 3b20783bf7356f0be18e3bd8c0c6aba1a9d481d84110dbf11b01819d0de6e35103460e595351dd00e342182e125fb8c3546c8ba8a14b65e0ba46c8f7da13867e -EBUILD pdal-2.8.2.ebuild 1493 BLAKE2B 6fa9c92adbe8accbe19e2915c6b101df05b33d84b19bdb2d43df83ac40a7502308c89bc2fb42ceb445b855a7a531abbd404b75b2c813f6b821caac7e2705b507 SHA512 9510b2a378397849db4f726ed4fbe24b23d23bbddd4e5049c0b482ed6cc94a9ae74b4d984f19e0fe1cf65b7258ebc33cfa90e7b0a702817e5e4f514d3d640690 +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 MISC metadata.xml 799 BLAKE2B 44fff88edc36553687a49ecf5113b1f7f3c8d092e82ef4e45f0d96cf53cc619647f45b3d3439a5b98bf43a8965e1b80582e7b074489dcd69f6f3aad9e5c7f59a SHA512 da405bacd840b714fe274fa5ca658f7a51b0078054058dcce46f690b33e641579981739de9511f4a876ff0f88aec5c2dbaa59e4db035eb9a85bdd8e9725bc7c2 diff --git a/sci-libs/pdal/pdal-2.8.0.ebuild b/sci-libs/pdal/pdal-2.8.0.ebuild index 559c3beba909..134856512ec6 100644 --- a/sci-libs/pdal/pdal-2.8.0.ebuild +++ b/sci-libs/pdal/pdal-2.8.0.ebuild @@ -32,7 +32,7 @@ RDEPEND=" " DEPEND=" - test? ( sci-libs/gdal[geos,jpeg,png] ) + test? ( sci-libs/gdal[geos,jpeg,png,sqlite] ) ${RDEPEND} " diff --git a/sci-libs/pdal/pdal-2.8.1.ebuild b/sci-libs/pdal/pdal-2.8.1.ebuild index 559c3beba909..134856512ec6 100644 --- a/sci-libs/pdal/pdal-2.8.1.ebuild +++ b/sci-libs/pdal/pdal-2.8.1.ebuild @@ -32,7 +32,7 @@ RDEPEND=" " DEPEND=" - test? ( sci-libs/gdal[geos,jpeg,png] ) + test? ( sci-libs/gdal[geos,jpeg,png,sqlite] ) ${RDEPEND} " diff --git a/sci-libs/pdal/pdal-2.8.2.ebuild b/sci-libs/pdal/pdal-2.8.2.ebuild index f18bb365d8a9..d1a156dda0ca 100644 --- a/sci-libs/pdal/pdal-2.8.2.ebuild +++ b/sci-libs/pdal/pdal-2.8.2.ebuild @@ -32,7 +32,7 @@ RDEPEND=" " DEPEND=" - test? ( sci-libs/gdal[geos,jpeg,png] ) + test? ( sci-libs/gdal[geos,jpeg,png,sqlite] ) ${RDEPEND} " 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/proj/Manifest b/sci-libs/proj/Manifest index 9d22b06bc71a..76355d2dc85c 100644 --- a/sci-libs/proj/Manifest +++ b/sci-libs/proj/Manifest @@ -1,13 +1,6 @@ AUX proj-9.4.1-include-cstdint.patch 992 BLAKE2B a78dc0fb259a863e83fc1b4dc77591b1c1b110aeef055351324185b8af1aa2882cdfaf261f99a0e007497d7dcf53583dce8458aed75ed35d8fdf882bff851cd3 SHA512 4b9f44383e9fa6466df3bf81bfe34cd3f023961d5167d6467fe66eeafbf690463491c4eea70c7be6be0dc68fe1c84bfc0ba39728a97dfa2f83f2eebb1ac009ad -AUX proj-geotiff.patch 943 BLAKE2B e2d1df20f8b87239e2c1f748e92b4ab5a3fe567994e6ce0c136383d1d0fcd1efa99e6c5586924d675acc3539e006e401a8683e719ff8532790e727ef19af4b71 SHA512 8462ef4f231d41b1a947528afa36da9e4231fae1adfb9bba8465a3402be8e78ae95ed39424e3f6ed635b0e2a0d9f2cfb9bc36187303444d80abc41518817ed3a -DIST proj-9.2.1.tar.gz 5536575 BLAKE2B e08dc370cfac2c6358e1b28e44f3893c75e07fd64a4235041edf836885d31af33605673486edb122cec8aa13a2c564156c429a68e5045de52d8ea970d2e440f1 SHA512 5640e9bd4ea24a0e0b1521c90b8f709b64b9ee357190aaf08af0cff5df68ae93bdfb27211bde5c50340b067fc218b4f2aa8fb998ed2852ebeb2c2ad0ac4629ef -DIST proj-9.3.0.tar.gz 5559825 BLAKE2B 83916294411a35094a2dbc89b1f219eff9b9baa4df6322a51a1965979044a36b4f1b75a99ea96fed8f59937ac000337a3e2e8ad4d9e1ef2ae929ccb7e06654b0 SHA512 1a79a7eaab0859cf615141723b68d6dd7b88390c3e590df12ec0d4c58ba69574863e5892d8108818dbc7e8abbf0b6372496228c02411d506b7169f732ff5cd57 DIST proj-9.4.1.tar.gz 5665272 BLAKE2B 9751ca658e77650236e5d8888d4d3a5e3da4c5761494d1a544baa565bd0aea967c08d871d7b67de0b0f7ffb07fc16212edbbd3a91532c70677e1702e050a7f7e SHA512 e9e4a80125a9481709fa7a16c8ceed7c5480c1d9152fe0c16ff69cd976081b9f41e23783459ee2a50771ec7f6210f46167de5af9ee943ff274bd27a1de4b6305 -DIST proj-data-1.13.tar.gz 709788173 BLAKE2B 33a487f327d2b35acfd6c7c12286bcd6e338c3459540482f968ef7038d78cea9d1519d89ba979f493e007fa961e0eb955889bf2348a235705ec3b71abf1e31c1 SHA512 14eca1b47dad913de608babc73708a35da8bb614c5374e990564a32549998a16e90d4c548f2dac0cd555fc8a4a645eeaf649db929cc38906bee1050e378a662e -DIST proj-data-1.15.tar.gz 727387470 BLAKE2B 03d5b69214e23741ae214ff18f523542247fdca5c301891616be6b79c8a916bf762d0a7ee3983cee62236bc0d4d1b5fc93151164b134db220d4582b15a84e8d7 SHA512 4007c639d5c9f0422652315e8d69527eb39e3d045cef3537361e16c61c9aae76d69e3eb7efefead04793350b8502114eec740efe970f25fbbee2db449b2e3694 DIST proj-data-1.18.tar.gz 735652646 BLAKE2B 62ca77e6f0a58992a914ebc6a7558b5ddb4529a5bf20a96eedbc62ef7c1bcc5c05582663846e43e132a1b8eaf821bbbc0be792335bad03028db085422d3ed269 SHA512 805eadd29665697398f568f5e4f45df8eadea6fc2841ce901c703613fab13f6f064e6f187621e76017b9b67bb1ca0c6dc1dd2be9848c5169d7e6ebaa2aeea950 -EBUILD proj-9.2.1-r1.ebuild 1609 BLAKE2B f224539c99e3cdfb8e89604a039f1cd7e9deb00a5768ff2e51b9ede9a5b3b9a3c38550b20cefcc3fc767d9bb43376d769f48177e3ce6c190c38c75a58ff889c4 SHA512 02a2580153a887b0825964b9d348d6efe9a28d713012f9f72f620c4a5b5cbc9a4499c363462fdcbb36e21810aaf7dcced7b0029d738ecc4e236c5d95d6ce8892 -EBUILD proj-9.3.0-r1.ebuild 1613 BLAKE2B a7728aac83651dce31dd12cedd4a8de15a3528035c101a60eae165848c5ea39ad10fddbd56222fd9c509cc5c8befdc0a7165857802153fc86bd4310da06c6adb SHA512 34e74a3d558f66b96706a95d459d91e1b4b4a5a32234e03cb271d93a8aa162cdb18d98a2070880985dce90a7bf38defdfcac51a79cad79860dc945321442e22b EBUILD proj-9.4.1.ebuild 2210 BLAKE2B 6e29e7cc4c7da1e041bcdb06c147a4c902c3cf99602ecb803757cd3185e6c7446b794237389af026c2620339990f105baa0832129c67a447eba45830a9b85cde SHA512 ad865f3635bbdeeb00f26c660e5bd8c990c4940f44d7e6e1cd2a023a6315bb6b49e7fb4f606c7642ade9d73d4b5cdaabae193d8ce7bbf0c8abf007983d78e5f2 EBUILD proj-9999.ebuild 2165 BLAKE2B 308b36c8ca99f8e9d98bb2e321611e7ebab3b85f695aeaa36fd6139ead1cb8c6952649f08ca7169f95d17ed6ca2f5a7bcde9797375b2a1299a79175d60e4d073 SHA512 4996089e47032141ddddb2863dc8d9ef69825e3f2e70ab6d04e940522308d0c62cdeb8ba8985c5b78f806a6d17d93f7c8ddee889eaabbbd5bb7bec026e63bcec MISC metadata.xml 345 BLAKE2B 356bd57a232baa5119842e6741d735afe44bf2c48fe144286743dd64716b3777f190980074d9013640cabb57306057e0abd42ea9fed80a44ee53366ea2413b23 SHA512 ec91a8fd73c7c798cfb0f23fc138e79bc642181265e4ee1fd94b9535dc3ae97e717f9115300ba648314e177f1dd3d0e3077e5746fbbc4c8eacd9b4692c721453 diff --git a/sci-libs/proj/files/proj-geotiff.patch b/sci-libs/proj/files/proj-geotiff.patch deleted file mode 100644 index cef1faa4628f..000000000000 --- a/sci-libs/proj/files/proj-geotiff.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://bugs.gentoo.org/917393 -https://github.com/OSGeo/PROJ/pull/3970 - -From afccfb609db16524b602216d9dc2b55c154403bb Mon Sep 17 00:00:00 2001 -From: Marco Genasci <fedeliallalinea@gmail.com> -Date: Sun, 26 Nov 2023 08:40:45 +0100 -Subject: [PATCH] Database: added ability to install *.tif if present in data - ---- - data/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 4cb89e7849..85ed6ba8d4 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -38,6 +38,8 @@ set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES}) - - file(GLOB SCHEMA_FILES *.json) - -+file(GLOB GEOTIFF_FILES *.tif) -+ - set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in") - set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db") - include(sql_filelist.cmake) -@@ -107,6 +109,7 @@ set(ALL_DATA_FILE - ${GRIDSHIFT_FILES} - ${PROJ_DB} - ${SCHEMA_FILES} -+ ${GEOTIFF_FILES} - ) - install( - FILES ${ALL_DATA_FILE} diff --git a/sci-libs/proj/proj-9.2.1-r1.ebuild b/sci-libs/proj/proj-9.2.1-r1.ebuild deleted file mode 100644 index 3dacbba20c97..000000000000 --- a/sci-libs/proj/proj-9.2.1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -# Check https://proj.org/download.html for latest data tarball -PROJ_DATA="proj-data-1.13.tar.gz" -DESCRIPTION="PROJ coordinate transformation software" -HOMEPAGE="https://proj.org/" -SRC_URI=" - https://download.osgeo.org/proj/${P}.tar.gz - https://download.osgeo.org/proj/${PROJ_DATA} -" - -LICENSE="MIT" -# Changes on every major release -SLOT="0/$(ver_cut 1)" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="curl test +tiff" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-db/sqlite:3 - curl? ( net-misc/curl ) - tiff? ( media-libs/tiff:= ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-geotiff.patch -) - -src_unpack() { - unpack ${P}.tar.gz - - cd "${S}"/data || die - mv README README.DATA || die - - unpack ${PROJ_DATA} -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DBUILD_PROJSYNC=$(usex curl) - -DENABLE_CURL=$(usex curl) - -DENABLE_TIFF=$(usex tiff) - ) - - if use test ; then - mycmakeargs+=( - -DUSE_EXTERNAL_GTEST=ON - -DBUILD_BENCHMARKS=OFF - -DRUN_NETWORK_DEPENDENT_TESTS=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html - # testprojinfo: Also related to map data? - -E "(proj_test_cpp_api|testprojinfo)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - - cd data || die - dodoc README.DATA - - find "${ED}" -name '*.la' -type f -delete || die -} diff --git a/sci-libs/proj/proj-9.3.0-r1.ebuild b/sci-libs/proj/proj-9.3.0-r1.ebuild deleted file mode 100644 index 4e9fde52d322..000000000000 --- a/sci-libs/proj/proj-9.3.0-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -# Check https://proj.org/download.html for latest data tarball -PROJ_DATA="proj-data-1.15.tar.gz" -DESCRIPTION="PROJ coordinate transformation software" -HOMEPAGE="https://proj.org/" -SRC_URI=" - https://download.osgeo.org/proj/${P}.tar.gz - https://download.osgeo.org/proj/${PROJ_DATA} -" - -LICENSE="MIT" -# Changes on every major release -SLOT="0/$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="curl test +tiff" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-db/sqlite:3 - curl? ( net-misc/curl ) - tiff? ( media-libs/tiff:= ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-cpp/gtest ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-geotiff.patch -) - -src_unpack() { - unpack ${P}.tar.gz - - cd "${S}"/data || die - mv README README.DATA || die - - unpack ${PROJ_DATA} -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DBUILD_PROJSYNC=$(usex curl) - -DENABLE_CURL=$(usex curl) - -DENABLE_TIFF=$(usex tiff) - ) - - if use test ; then - mycmakeargs+=( - -DUSE_EXTERNAL_GTEST=ON - -DBUILD_BENCHMARKS=OFF - -DRUN_NETWORK_DEPENDENT_TESTS=OFF - ) - fi - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # proj_test_cpp_api: https://lists.osgeo.org/pipermail/proj/2019-September/008836.html - # testprojinfo: Also related to map data? - -E "(proj_test_cpp_api|testprojinfo)" - ) - - cmake_src_test -} - -src_install() { - cmake_src_install - - cd data || die - dodoc README.DATA - - find "${ED}" -name '*.la' -type f -delete || die -} 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..4eaa209374b6 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 +EBUILD pytorch-2.6.0.ebuild 1445 BLAKE2B 667667dbe58341c6378b0e4c2f1299dcbeed89bc0ac69a93f923468f7d7b3b9971ea4ddd88c93c8a670c551bf930fc911ecd367b9e9e01119ca607026e20e2ba SHA512 361281ee20731e7281ec4aa9a49597a5f84d6d4908dd1de622ca40e78945095bc9622a96fa83eebc76e9e9ec96cbf9ebbc3cba4bb4cc5b6b02667f3c13fc968e MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 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/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/qd/Manifest b/sci-libs/qd/Manifest index da7e8f794c53..d586afa11ad5 100644 --- a/sci-libs/qd/Manifest +++ b/sci-libs/qd/Manifest @@ -1,5 +1,3 @@ -DIST qd-2.3.23.tar.gz 781558 BLAKE2B bbda1ede1e93c100ca831b3eddc34ad6092007f9674c83803e5a5e140f80cc6b4b41fa71857beb9ef255d77265470537e43ef81886d6a013958a429b1c641c55 SHA512 ab311883db7708cee1c307eead5d02dac3b9809389b8d29e2fda5207decb752ca360a9aab234dd8a70228e0e004a6b6d6cdf92fd098536e96a2fa01c5b2ced2c DIST qd-2.3.24.tar.gz 812215 BLAKE2B f9520066d8004befc3c17dc9a79dc8f099e39c3eeb676c8909f2914fa2f7d8e4f52e7e906c928d6fecdf018cdf97ac465fa9aa3f9c57b02279d1cbb8b3952246 SHA512 7f233e9d0edcb442da160a49bc97df87acf258c3251828e2d473206022a36581295f38c685ac5f0c78b106605f12698f3d0cc0b4865be220a50b3536820ac1b7 -EBUILD qd-2.3.23.ebuild 916 BLAKE2B c9220a83d46916dda3d308d480b84078f8af02515c13db7ba4303a999cb8b9aa5837ac3b19271942646a46397d600c674cdad17b729834669a056535771efe75 SHA512 8ee98f3f5bceac44362d9f148084585a1996bc019774fe2b7daad55e9ead316415652ee0ee1ff4fcfbe474f3a8b86336a9d686fdf8bc86d40824b2ddea422bc4 EBUILD qd-2.3.24.ebuild 919 BLAKE2B e405ada19d0247aa04373fbe4e31d59dc9990e7c56bbbf07bc20e9c8d0fe770f2aaf62f7025cdf0e6502eba60bd06c78ec35f431574eedf3bc59d502eefcee58 SHA512 72bbac66eed114ea40945b715007ecb43670a0b38e57fba6e1a9ebc2225a3155369161d938cb39695d5477c556b8256729cbcbb1dfca79d5245674dbb1a481f3 MISC metadata.xml 260 BLAKE2B 14d3d7872b9a3cb341301daf85c6b037c567163317516100d5af08e7ae02970252f210e90118d5df9e0cf6e0b3560add3a7894d379609b864e60dfdda3036423 SHA512 973385fccdcb0ccc36e00a09dc85204cf15081b8b61bc20e02d7d1311cb05af4927f01aac36ec93275158f5b990874ca03ab7d381cf6ee6f5e30bc4926d2f045 diff --git a/sci-libs/qd/qd-2.3.23.ebuild b/sci-libs/qd/qd-2.3.23.ebuild deleted file mode 100644 index 2f8569afa28c..000000000000 --- a/sci-libs/qd/qd-2.3.23.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -FORTRAN_NEEDED=fortran - -inherit fortran-2 - -DESCRIPTION="Quad-double and double-double float arithmetics" -HOMEPAGE="https://www.davidhbailey.com/dhbsoftware/" -SRC_URI="https://www.davidhbailey.com/dhbsoftware/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran" - -src_configure() { - econf \ - --disable-static \ - --enable-ieee-add \ - --disable-sloppy-mul \ - --disable-sloppy-div \ - --enable-inline \ - $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \ - $(use_enable fortran) -} - -src_install() { - default - - dosym qd_real.h /usr/include/qd/qd.h - dosym dd_real.h /usr/include/qd/dd.h - - if ! use doc; then - rm "${ED}"/usr/share/doc/${PF}/*.pdf || die - fi - - find "${D}" -name '*.la' -delete || die -} diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index 693a70cf2f48..1acdb477e43c 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -1,21 +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 -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 +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 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 -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.0.tar.gz 57907324 BLAKE2B a3cce68e0cc06e8df56e1622889254c75744b0f85c9fe66cb94bbc158f7ce45e40a5798d30e6a10430092490c1e347f19f38b36db767ccb784c5757581b0bccb SHA512 45a524d680f1f0760fd37d49b9bd7c6257731ad5d840d832a8e40c121f7f1045a8d5b57ca8ef0943fdf333c55bccb341b529d2ca24664694203b906e510ecab5 +DIST rocm-rocBLAS-6.3.2.tar.gz 57909504 BLAKE2B 0ed000a10c9e71465f83fb9abdb9a745c82bf32552e3d86c61bf0c802f3728f7fd4c47fbf677d01aa35c457dc5281c916ca80fdc033b2752afd6733aefa4653f SHA512 ecfb6c68b0a44ddae0e4e6cf5c41c0c33a9685c590004ffe48fdb163bd059d534181d3faed2a23142078c5f621b1955c91725357c3e8e0f9307b139b19af46fd EBUILD rocBLAS-5.7.1-r2.ebuild 2728 BLAKE2B e8256cd30876c89d9d84180e4621884d87c873e9680980369b6ec1a377fac3ba441bfbe5ebd160dbe5a7c13f868a15afd14328f663ff05afae136670a1a7ce97 SHA512 390911c868c8cb4bdec520bcf0d189922e528200c2b43946542034a3bd72141a47730ce67a5d755c4469100165194c8bcdfd81f9e6d6394ee7e51e0f84cac13f -EBUILD rocBLAS-6.1.1-r1.ebuild 2810 BLAKE2B 053b7b9e8bde873158c920a2161c18317541c55dc5f3bb5bfe8d3372bae0f17f0c9efed1dc9878e864e3c587da63f26672815defbef9e1657435bb7bca505a35 SHA512 dc4a733e56a9c28486fc5304a9f03b42dccda88036e18f5a2e0be40663a21aefc623e83311e740b9048c45d7edb64b764ca5477d00b2546b51cbcfa6a47e3fda -MISC metadata.xml 852 BLAKE2B c358ef9128e50c5052fea39876550419dc037a8750c8dd12f10415a02dd2a64893ecd11c4c0ee4acc8db83999a4f709a98da53f6d12f71d0782f98af92a37a96 SHA512 18de129cceb076f84235ccb5706287ee16c5843dab654dc9494013b89b07bbb9f82d1e4980e1c1a8e0c8ce2b0e125633cefef069b0e97b3127e0240071d5a53a +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 +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/files/rocBLAS-6.3.0-find-cblas.patch b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-find-cblas.patch new file mode 100644 index 000000000000..4afb07789581 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-find-cblas.patch @@ -0,0 +1,19 @@ +diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt +index 4485fee..51eedc9 100644 +--- a/clients/CMakeLists.txt ++++ b/clients/CMakeLists.txt +@@ -140,10 +140,12 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS) + set( BLAS_LIBRARY /usr/local/lib/libblis.a ) + set( BLIS_INCLUDE_DIR /usr/local/include/blis ) + else() +- message( WARNING "Could not find libblis" ) ++ message( FATAL_ERROR "Could not find libblis" ) + endif() + else() +- set( BLAS_LIBRARY "blas -lcblas" ) ++ find_package( CBLAS CONFIG REQUIRED ) ++ set( BLAS_LIBRARY ${CBLAS_LIBRARIES} ) ++ set( BLAS_INCLUDE_DIR ${CBLAS_INCLUDE_DIRS} ) + endif() + else() # WIN32 + file(TO_CMAKE_PATH "C:/Program\ Files/AMD/AOCL-Windows/amd-blis/lib/ILP64/AOCL-LibBlis-Win-MT.lib" AOCL_BLAS_LIBRARY) diff --git a/sci-libs/rocBLAS/files/rocBLAS-6.3.0-no-git.patch b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-no-git.patch new file mode 100644 index 000000000000..39ce71a85eb1 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-6.3.0-no-git.patch @@ -0,0 +1,22 @@ +Git should not be a required dependency, as hash is not available for releases. +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -144,17 +144,8 @@ if( BUILD_VERBOSE ) + message( STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS_RELEASE: ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}" ) + endif( ) + +-find_package(Git REQUIRED) +- +-# Get the git hash of the rocBLAS branch +-execute_process( +- COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD +- WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} +- OUTPUT_VARIABLE GIT_HASH_ROCBLAS +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- + #set the rocBLAS commit hash +-set(rocblas_VERSION_COMMIT_ID "${GIT_HASH_ROCBLAS}") ++set(rocblas_VERSION_COMMIT_ID "") + + #set the Tensile commit hash + set(tensile_VERSION_COMMIT_ID "${tensile_tag}") diff --git a/sci-libs/rocBLAS/metadata.xml b/sci-libs/rocBLAS/metadata.xml index 0e8f76b2a76e..bd9344786002 100644 --- a/sci-libs/rocBLAS/metadata.xml +++ b/sci-libs/rocBLAS/metadata.xml @@ -19,8 +19,9 @@ <use> <flag name="test">Perform rocblas-test to compare the result between rocBLAS and system BLAS.</flag> <flag name="benchmark">Build and install rocblas-bench.</flag> + <flag name="hipblaslt">Build with hipBLASLt for some non-batched and strided batched problems on gfx12.</flag> </use> <upstream> - <remote-id type="github">ROCmSoftwarePlatform/rocBLAS</remote-id> + <remote-id type="github">ROCm/rocBLAS</remote-id> </upstream> </pkgmetadata> 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.1.1-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild index b101aed6dee7..9f2bb6782d44 100644 --- a/sci-libs/rocBLAS/rocBLAS-6.1.1-r1.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-6.1.1-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 @@ -33,7 +33,7 @@ BDEPEND=" DEPEND=" >=dev-cpp/msgpack-cxx-6.0.0 - =dev-util/hip-6* + dev-util/hip:${SLOT} test? ( virtual/blas dev-cpp/gtest @@ -57,6 +57,10 @@ PATCHES=( src_prepare() { cmake_src_prepare sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die + + # bug 944820: f16c instuctions cause SIGILL on pre-AVX512 CPUs + sed -i -e "s/-mf16c //" clients/benchmarks/CMakeLists.txt \ + clients/gtest/CMakeLists.txt clients/samples/CMakeLists.txt library/CMakeLists.txt || die } src_configure() { diff --git a/sci-libs/rocBLAS/rocBLAS-6.3.0.ebuild b/sci-libs/rocBLAS/rocBLAS-6.3.0.ebuild new file mode 100644 index 000000000000..f35ee735d2fb --- /dev/null +++ b/sci-libs/rocBLAS/rocBLAS-6.3.0.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/rocBLAS/rocBLAS-6.3.2.ebuild b/sci-libs/rocBLAS/rocBLAS-6.3.2.ebuild new file mode 100644 index 000000000000..f35ee735d2fb --- /dev/null +++ b/sci-libs/rocBLAS/rocBLAS-6.3.2.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 da6a587fc92f..744d4bc70bfc 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -1,12 +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 -DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43 +AUX rocFFT-6.1.1-find-hip-use-config.patch 1108 BLAKE2B 9ae46c2dc754d3a9d68863012c46b6642c71459facd75a4425f8942fad1df1df15d3030255e1b54c537152b521ca4becdc8426003e05aceedc92087aeffd14bf SHA512 02322003c1e6385fb4cff1049a9554baa91d2eca75bc0c9869b92e95c6c579d7f5e361b5b2ce98ca2ab5613891c24230833ae13f13a814f863510ef4340b9260 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9 -EBUILD rocFFT-5.1.3-r1.ebuild 3926 BLAKE2B ef9cf52ee86139887f87b96f02d28bcb80420af8d3538060596a51b3b8b7369eee5da63d90e8132935acf32cba06024840427cf2e5a2b7662388e75c1b1b4272 SHA512 3a34f05845f726fd6cb71d0315ee6338e1e381910a8dca2d6c655ae80e1ba3f1765a2313f2795be8eb737195fa23e2597bcda89a1e6db778cfddf35485462beb -EBUILD rocFFT-5.7.1-r2.ebuild 3950 BLAKE2B ecd5ec8e81290c4bc83dd413c7b0dc292712244bbc6a432f593ddb868dfe24a5486acd590315b12ec9e3a074746aa4d84b0c8376aa1db490e8ea96867b7a3fd1 SHA512 48cb8edd4005f616d4e6886dce3b48bcb972b05ba35dc67739bfdca193a19fccba464bd275ca07bd98dff70fe7a237d256e2a45e4c2910ebe8f26648a262a555 -EBUILD rocFFT-6.1.1.ebuild 3747 BLAKE2B 13cf175e01205c53fb7b2541eb00cf1d9326a0eae51e26b96273ca70dc2917294a52414ef1bc2faee3383790e1ce3ac4ca8fac86a7eaf8b052728f779f31fceb SHA512 500a4a7ac83004b143c6742cfc319d6fecda12dc3d56282e0ae940e7ef2be67b14dab3a68dfdc1a6d1ffa24e76cd12ee4621b43434dba8e9a87fc39292321460 +DIST rocFFT-6.3.0.tar.gz 1386056 BLAKE2B 1aab60818328cb3a6448f6d555faf2db3b3839e2b3abd7a37cc48054e67321e7c98c319b2f078dfd351f56263c35731608ae65fca427fc3eaaf06c8410b99d89 SHA512 4ac2dac24e77a9d767fa08a9d393cb2c94bc2a8ca32cb75ea53dd83011989bd344ae3c11c9bfc557e71c645ebea34c53a5e050ce6810259f84287e6baf829c08 +DIST rocFFT-6.3.2.tar.gz 1385667 BLAKE2B 3415cca976b31534498b87b1bc800d96aa00c9c8b2665350323f03c47eff922ff3d0b46374af7cee5958572487c51432ef55ffe8c19c8b19e093c7ca7ec05961 SHA512 e58d00810c661ef640d4e33894b41847e69de150fbdf4cd72c14d44b9298a514df7e47bd52902482beb6fb52de6e7cd01e298dec756fec150de967049a370d33 +EBUILD rocFFT-5.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 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/files/rocFFT-6.1.1-find-hip-use-config.patch b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch new file mode 100644 index 000000000000..27353eee35d1 --- /dev/null +++ b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch @@ -0,0 +1,31 @@ +Upstream PR: https://github.com/ROCm/rocFFT/pull/530 +From b29c984bfaaec9d372fb566f5136fe3c473ff22d Mon Sep 17 00:00:00 2001 +From: Yiyang Wu <xgreenlandforwyy@gmail.com> +Date: Sun, 20 Oct 2024 23:22:50 +0800 +Subject: [PATCH] Require rocFFT use hip-config.cmake to find HIP + +Sometimes rocFFT use FindHIP.cmake which is not desired -- it does not +have hip::device and hip::host target imported and result in cmake +generating error. + +Reference: https://bugs.gentoo.org/932155 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bcb9819c..da697834 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -186,7 +186,7 @@ set(AMDGPU_TARGETS "${DEFAULT_GPUS}" CACHE STRING "Target default GPUs if AMDGPU + rocm_check_target_ids(AMDGPU_TARGETS TARGETS "${AMDGPU_TARGETS}") + + # HIP is required - library and clients use HIP to access the device +-find_package( HIP REQUIRED ) ++find_package( HIP REQUIRED CONFIG ) + + # The nvidia backend can be used to compile for CUDA devices. + # Specify the CUDA prefix in the CUDA_PREFIX variable. +-- +2.45.2 + diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild index 0c383fa01164..35da60ceea6b 100644 --- a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.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 @@ -61,6 +61,7 @@ S="${WORKDIR}/rocFFT-rocm-${PV}" PATCHES=( "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch + "${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch ) required_mem() { diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild index d1289f597217..da1508311eb7 100644 --- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.1.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 @@ -59,6 +59,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch + "${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch ) required_mem() { diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild index 7b75953d510f..474f33952068 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.3.0.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/rocFFT/rocFFT-6.3.2.ebuild b/sci-libs/rocFFT/rocFFT-6.3.2.ebuild new file mode 100644 index 000000000000..474f33952068 --- /dev/null +++ b/sci-libs/rocFFT/rocFFT-6.3.2.ebuild @@ -0,0 +1,151 @@ +# 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 check-reqs edo multiprocessing python-r1 rocm + +DESCRIPTION="Next generation FFT implementation for ROCm" +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" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask +RDEPEND=" +perfscripts? ( + >=media-gfx/asymptote-2.61 + dev-texlive/texlive-latex + dev-tex/latexmk + sys-apps/texinfo + dev-python/sympy[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] ) +${PYTHON_DEPS}" + +DEPEND="=dev-util/hip-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=" + >=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 )" + +PATCHES=( + "${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 + # count how many archs user specified in ${AMDGPU_TARGETS} + local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) + else + # 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 +} + +pkg_pretend() { + return # leave the disk space check to pkg_setup phase +} + +pkg_setup() { + export CHECKREQS_MEMORY=$(required_mem) + check-reqs_pkg_setup + python_setup +} + +src_prepare() { + if use perfscripts; then + pushd scripts/perf || die + sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir + sed -e "/^top/,+1d" -i rocfft-perf suites.py || die + sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die + sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \ + -i perflib/pdf.py perflib/generators.py || die + popd + fi + + cmake_src_prepare +} + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -Wno-dev + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCH=$(usex benchmark ON OFF) + -DSQLITE_USE_SYSTEM_PACKAGE=ON + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + 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 ./rocfft-test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/clients/staging || die + 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 + cd "${S}"/scripts/perf || die + python_foreach_impl python_doexe rocfft-perf + python_moduleinto ${PN}_perflib + python_foreach_impl python_domodule perflib/*.py + insinto /usr/share/${PN}-perflib + doins *.asy suites.py + fi +} diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest index 705ca7510043..3b2072b904f2 100644 --- a/sci-libs/rocPRIM/Manifest +++ b/sci-libs/rocPRIM/Manifest @@ -1,8 +1,13 @@ AUX rocPRIM-5.7.1-expand-isa-compatibility.patch 1655 BLAKE2B 23392f6237ec706e0763c6165f854b0638757d70b5dc756125b6a5e861f2d5dc9e557362035a57dc2557241a1e32a631cb2e8660d1e8107c73a7aff734af76eb SHA512 f2ffc71c6322b66685de4c78737d546ea27779e36d952d06fd14017e2bf4efb905f2f6da8f56e3a3f5314aa594b624cd3cd9f749bf74c97a425982f264cf82ee -DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a +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.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879e5f82e539881d79bda57d23c25a9b114466042258e87862a88cd53d260155d7785c9a69a1800b0d05e931f56d SHA512 b2f0bc07dbc5cd111dd513f6c05dbc533908c52ea99caf77d6a4dd35db2b28f98c80006bd1f50a232873eab00b70e54231c38bfd1035c8845029d53690fd5e71 DIST rocPRIM-6.1.1.tar.gz 611372 BLAKE2B 984df214179a6d2c90b31bd30ec9472a0b985d9d488ea195968f25df4cac97ce48bfa4c322f2d578771ac63caeafc2c69c9dae911bc3a9d920ab9558ba7d6e15 SHA512 298eebc8a5d3fd7da71ab98a22fd39183436b3d9e14945e450f0fb35e38ea8fb99c5f2b342f1f77f21899a14d506ce96a965fbdb24f106ec9638dcd6afe6ae98 -EBUILD rocPRIM-5.1.3.ebuild 2012 BLAKE2B db384e213038bbe8dc5e925905b9637bf5dc14de1b59f1f574abcc0f46aebe876484c0b9704acd0bf447a01727e1a94b388de9989669f64569043bf46cfb6e5e SHA512 3cf65a5a20fcb5b90cc871e266df7d96e791c70f82c33f088349a5cf03a39f0b114972a7fbf25ce8df4d80fc47af379f8cc0bd0466d261a1acee79e4ca7b3dbe +DIST rocPRIM-6.3.0.tar.gz 745936 BLAKE2B 1cdcf886c823959bbb03f53cb6e17abdb009fa48f8e00e96f8d962dd28ef9fb8b6ed796be079b0a3948adc832de8e3449d6439711db821b8a26c5cdc7122ce61 SHA512 c38f3cebfb32c0c9d4f9c1ad261c1dbe793dec1ebc92cf024ef32606f99c91e178526d77a24ad18792099e6f3aafcea43f7bc9282bbc144672684cd5fe296a8b +DIST rocPRIM-6.3.2.tar.gz 745935 BLAKE2B 21ffbd746e51aa7ed7028be9eea1009757d7d92403999b35310f5c249d76e2dc793d754d2eeaf44e3d0da8aa00c5ca93dfa45ed2a654fd26f88510f422a7ea11 SHA512 e5c57d95cb25a498f9ef8c555dbf89f6be2d0088a04c8fdc470dd98f851ac15dde7ce0493719d544e7f911f3438e780b12aadc42f5d47e25723828149f6279e0 EBUILD rocPRIM-5.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 MISC metadata.xml 672 BLAKE2B 93644f07bd8f34b43e335ec631b69abdfee76bfe55fcccc9c33b772945e72870f4307803a121226d2d87aa55a07f31274f376a6d8a44a9f5996a861d21dc5c38 SHA512 e8f5caa76c96a1ef5affce0a29f07e12fc4a10057c77bbc9f53288fd886488fddde59a713be80fd72dbaa9656abb6d4851995a000e160398c09ed28000a53712 diff --git a/sci-libs/rocPRIM/files/rocPRIM-6.3.0-expand-isa-compatibility.patch b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-expand-isa-compatibility.patch new file mode 100644 index 000000000000..8a13924c1056 --- /dev/null +++ b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-expand-isa-compatibility.patch @@ -0,0 +1,33 @@ +diff --git a/rocprim/include/rocprim/device/config_types.hpp b/rocprim/include/rocprim/device/config_types.hpp +index 58729b1..7e356da 100644 +--- a/rocprim/include/rocprim/device/config_types.hpp ++++ b/rocprim/include/rocprim/device/config_types.hpp +@@ -204,16 +204,23 @@ constexpr bool prefix_equals(const char* lhs, const char* rhs, std::size_t n) + constexpr target_arch get_target_arch_from_name(const char* const arch_name, const std::size_t n) + { + constexpr const char* target_names[] +- = {"gfx803", "gfx900", "gfx906", "gfx908", "gfx90a", "gfx1030", "gfx1100", "gfx1102"}; ++ = {"gfx803", ++ "gfx900", "gfx902", "gfx909", "gfx912", ++ "gfx906", ++ "gfx908", ++ "gfx90a", ++ "gfx1030", "gfx1031", "gfx1032", "gfx1033", "gfx1034", "gfx1035", "gfx1036", ++ "gfx1100", "gfx1101", ++ "gfx1102", "gfx1103", "gfx1150", "gfx1151", "gfx1152", "gfx1153"}; + constexpr target_arch target_architectures[] = { + target_arch::gfx803, +- target_arch::gfx900, ++ target_arch::gfx900, target_arch::gfx900, target_arch::gfx900, target_arch::gfx900, + target_arch::gfx906, + target_arch::gfx908, + target_arch::gfx90a, +- target_arch::gfx1030, +- target_arch::gfx1100, +- target_arch::gfx1102, ++ target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, ++ target_arch::gfx1100, target_arch::gfx1100, ++ target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, + }; + static_assert(sizeof(target_names) / sizeof(target_names[0]) + == sizeof(target_architectures) / sizeof(target_architectures[0]), diff --git a/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-clang-template.patch b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-clang-template.patch new file mode 100644 index 000000000000..089ce6187979 --- /dev/null +++ b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-clang-template.patch @@ -0,0 +1,29 @@ +Fix compilation with clang-19 +Backports https://github.com/ROCm/rocPRIM/commit/c57b04baea872078bfb5b4af1165c7584fd3a95b +--- a/rocprim/include/rocprim/device/detail/device_radix_sort.hpp ++++ b/rocprim/include/rocprim/device/detail/device_radix_sort.hpp +@@ -526,15 +526,15 @@ ROCPRIM_DEVICE ROCPRIM_FORCE_INLINE void sort_single(KeysInputIterator keys_i + + ROCPRIM_SHARED_MEMORY typename sort_single_helper::storage_type storage; + +- sort_single_helper().template sort_single(keys_input, +- keys_output, +- values_input, +- values_output, +- size, +- decomposer, +- bit, +- current_radix_bits, +- storage); ++ sort_single_helper().template sort_single<>(keys_input, ++ keys_output, ++ values_input, ++ values_output, ++ size, ++ decomposer, ++ bit, ++ current_radix_bits, ++ storage); + } + + template<class T> diff --git a/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-libcxx.patch b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-libcxx.patch new file mode 100644 index 000000000000..3827829483fb --- /dev/null +++ b/sci-libs/rocPRIM/files/rocPRIM-6.3.0-fix-libcxx.patch @@ -0,0 +1,71 @@ +Fix ambiguous declarations for libc++, which treats __int128_t as integral. +The issue was fixed in develop branch, but not in release. +Upstream commit: https://github.com/ROCm/rocPRIM/commit/81f6073790dee8d310e5b68cf46aae4b797cc059 +--- a/rocprim/include/rocprim/thread/radix_key_codec.hpp ++++ b/rocprim/include/rocprim/thread/radix_key_codec.hpp +@@ -78,6 +78,7 @@ struct radix_key_codec_integral<Key, + } + }; + ++#ifndef _LIBCPP_VERSION + template<class Key, class BitKey> + struct radix_key_codec_integral< + Key, +@@ -104,6 +105,7 @@ struct radix_key_codec_integral< + return static_cast<unsigned int>(bit_key >> start) & mask; + } + }; ++#endif + + template<class Key, class BitKey> + struct radix_key_codec_integral<Key, +@@ -135,6 +137,7 @@ struct radix_key_codec_integral<Key, + } + }; + ++#ifndef _LIBCPP_VERSION + template<class Key, class BitKey> + struct radix_key_codec_integral<Key, + BitKey, +@@ -164,6 +167,7 @@ struct radix_key_codec_integral<Key, + return static_cast<unsigned int>(bit_key >> start) & mask; + } + }; ++#endif + + template<class Key, class BitKey> + struct radix_key_codec_floating +@@ -225,6 +229,7 @@ struct radix_key_codec_base<Key, typename std::enable_if<::rocprim::is_integral< + : radix_key_codec_integral<Key, typename std::make_unsigned<Key>::type> + {}; + ++#ifndef _LIBCPP_VERSION + template<class Key> + struct radix_key_codec_base<Key, + typename std::enable_if<std::is_same<Key, __int128_t>::value>::type> +@@ -236,6 +241,7 @@ struct radix_key_codec_base<Key, + typename std::enable_if<std::is_same<Key, __uint128_t>::value>::type> + : radix_key_codec_integral<Key, __uint128_t> + {}; ++#endif + + template<> + struct radix_key_codec_base<bool> +--- a/test/rocprim/test_utils_data_generation.hpp ++++ b/test/rocprim/test_utils_data_generation.hpp +@@ -268,6 +268,7 @@ inline OutputIter segmented_generate_n(OutputIter it, size_t size, Generator&& g + return it + size; + } + ++#ifndef _LIBCPP_VERSION + template<class OutputIter, class U, class V, class Generator> + inline auto generate_random_data_n(OutputIter it, size_t size, U min, V max, Generator&& gen) + -> std::enable_if_t<std::is_same<it_value_t<OutputIter>, __int128_t>::value, OutputIter> +@@ -299,6 +300,7 @@ inline auto generate_random_data_n(OutputIter it, size_t size, U min, V max, Gen + + return segmented_generate_n(it, size, [&]() { return static_cast<T>(distribution(gen)); }); + } ++#endif + + template<class OutputIter, class U, class V, class Generator> + inline auto generate_random_data_n(OutputIter it, size_t size, U min, V max, Generator&& gen) diff --git a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild b/sci-libs/rocPRIM/rocPRIM-6.3.0.ebuild index b95730533189..cd561fb6b22d 100644 --- a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild +++ b/sci-libs/rocPRIM/rocPRIM-6.3.0.ebuild @@ -4,17 +4,21 @@ EAPI=8 ROCM_VERSION=${PV} -inherit cmake rocm +inherit cmake flag-o-matic 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" +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" -KEYWORDS="~amd64" SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" +REQUIRED_USE=" + benchmark? ( ${ROCM_REQUIRED_USE} ) + test? ( ${ROCM_REQUIRED_USE} ) +" RDEPEND="dev-util/hip benchmark? ( dev-cpp/benchmark ) @@ -23,52 +27,44 @@ 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 +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 - eapply_user cmake_src_prepare } src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ + rocm_use_hipcc + + # too many warnings in tests + append-cxxflags -Wno-explicit-specialization-storage-class -Wno-deprecated-declarations local mycmakeargs=( - -DSKIP_RPATH=On + -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 ) - CXX=hipcc cmake_src_configure + cmake_src_configure } src_test() { check_amdgpu - MAKEOPTS="-j1" cmake_src_test + # uses HMM to fit tests to default <512M iGPU VRAM + ROCPRIM_USE_HMM="1" cmake_src_test -j1 } diff --git a/sci-libs/rocPRIM/rocPRIM-6.3.2.ebuild b/sci-libs/rocPRIM/rocPRIM-6.3.2.ebuild new file mode 100644 index 000000000000..5610ed3b3605 --- /dev/null +++ b/sci-libs/rocPRIM/rocPRIM-6.3.2.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 d62116184ab6..768db1ff2cb8 100644 --- a/sci-libs/rocRAND/Manifest +++ b/sci-libs/rocRAND/Manifest @@ -1,14 +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 -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 +AUX rocRAND-6.3.0-benchmark-1.8.patch 1216 BLAKE2B 437e940107eef2cd5be67f1488ed6c55fff9f149d4613515983757de4574cf6c043b44a52f88330c657c12fbe00e18ea34e0a6206c374153ef3439b9f1c641c4 SHA512 9dfbf23e444e343baf277f4617659e793f2b57c80f3636aa6da5b0950b451413fe37a7a66b085ace8448d94917cd82c6cbf279ddeee765ddbaab598921950300 DIST rocRAND-5.7.1.tar.gz 23189653 BLAKE2B c70ab6f3b718c2430394f63b93bee15fa72daae704883fdb203b98b0dc4763b46bc27886af64c48bf4ebe8da9b919158b8cd346f70f9b76bf0492ce3b2c1e20e SHA512 4d74bce9fbd3cb45e3f057d38df747270c6986fea7ad524f7a88109b6a53a4ea5dcd60d4bbf2364888501e9444245fb6898bb79fccad0e37b61e819e8c4ed863 DIST rocRAND-6.1.1.tar.gz 26683143 BLAKE2B 4108584c6372adbf2f9ef887cf1aa08f5afdfa489ba0739d247e693628f3e23978fe023c2896e7bff666b8822b0011fd3f635338b013898f8d76b3f31ec21f6c SHA512 d8df0e6bf843719e59434c952ef56b112ada23d0c226bec9f2974ed762500202ac809f495de61a4086289e35c2f4b670f4ed7dcd7092a158c0a731c368950a44 -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.0.tar.gz 44906536 BLAKE2B 204ba943ba840d78dfc7a69f762dca270f7cb9633dcb9f47df0832958b0c6bf279b0154539c01d0a6037aed9c8ec38edbd566fc102410687d188ff7299d23515 SHA512 aa8f6abc798ac1b24908ec5ef45b38bc63ee79ccf7c333b42f16cb0155f22d1fea34753e61de93a4eaf485457124f23626dd79d35021e3e896bff915a2722455 +DIST rocRAND-6.3.2.tar.gz 44906513 BLAKE2B fba5f0dcc1a6fb5636ffb1c9a13f0d03d908d99c277c783ec53ffbb0b2ff4798c65c9bbf27c591690a5f17db43eb8309ee1648da39c631eba32d183560b645d8 SHA512 6eac3c27f970e75e57a864b26070e1327235a42367e9d137ebeaed8d4a20a85638edfb3d81b142171c260c71403021159c1e3b9bcb0f97c08251c33ca9e62641 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 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/files/rocRAND-6.3.0-benchmark-1.8.patch b/sci-libs/rocRAND/files/rocRAND-6.3.0-benchmark-1.8.patch new file mode 100644 index 000000000000..a8afeb1e2f8e --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-6.3.0-benchmark-1.8.patch @@ -0,0 +1,30 @@ +Backported from https://github.com/ROCm/rocRAND/commit/ad8cdd8dd0dee6ef4166b0b560fe63127c06e08b +Index: rocRAND-rocm-6.3.0/benchmark/custom_csv_formater.hpp +=================================================================== +--- rocRAND-rocm-6.3.0.orig/benchmark/custom_csv_formater.hpp ++++ rocRAND-rocm-6.3.0/benchmark/custom_csv_formater.hpp +@@ -152,10 +152,8 @@ void customCSVReporter::ReportRuns(const + void customCSVReporter::PrintRunData(const Run& run) + { + std::ostream& Out = GetOutputStream(); +- std::ostream& Err = GetErrorStream(); + + //get the name of the engine and distribution: +- + std::string temp = run.benchmark_name(); + + std::string deviceName = std::string(temp.begin(), temp.begin() + temp.find("<")); +@@ -186,13 +184,6 @@ void customCSVReporter::PrintRunData(con + + Out << engineName << "," << disName << "," << mode << ","; + Out << CsvEscape(run.benchmark_name()) << ","; +- if(run.error_occurred) +- { +- Err << std::string(elements.size() - 3, ','); +- Err << "true,"; +- Err << CsvEscape(run.error_message) << "\n"; +- return; +- } + + // Do not print iteration on bigO and RMS report + if(!run.report_big_o && !run.report_rms) diff --git a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild deleted file mode 100644 index bb518842e253..000000000000 --- a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake rocm - -DESCRIPTION="Generate pseudo-random and quasi-random numbers" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND" -HIPRAND_COMMIT_HASH=de941a7eb9ede2a862d719cd3ca23234a3692d07 -SRC_URI="https://github.com/ROCmSoftwarePlatform/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz -https://github.com/ROCmSoftwarePlatform/hipRAND/archive/${HIPRAND_COMMIT_HASH}.tar.gz -> hipRAND-${HIPRAND_COMMIT_HASH}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" -IUSE="benchmark test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -PATCHES=( "${FILESDIR}"/${PN}-5.1.3_stdint-gcc13.patch - "${FILESDIR}"/${PN}-5.1.3_no-symlink.patch ) - -RDEPEND="dev-util/hip" -DEPEND="${RDEPEND} -dev-build/rocm-cmake -test? ( dev-cpp/gtest )" -BDEPEND="dev-build/rocm-cmake ->=dev-build/cmake-3.22" - -S="${WORKDIR}/rocRAND-rocm-${PV}" - -src_prepare() { - rmdir hipRAND || die - mv -v ../hipRAND-${HIPRAND_COMMIT_HASH} hipRAND || die - # change installed include and lib dir, and avoid symlink overwrite the installed headers - # avoid setting RPATH - sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \ - -e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die - - # remove GIT dependency - sed -e "/find_package(Git/,+4d" -i cmake/Dependencies.cmake || die - - eapply_user - cmake_src_prepare -} - -src_configure() { - addpredict /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=On - -DAMDGPU_TARGETS="$(get_amdgpu_flags)" - -DBUILD_HIPRAND=ON - -DROCM_SYMLINK_LIBS=OFF - -DBUILD_TEST=$(usex test ON OFF) - -DBUILD_BENCHMARK=$(usex benchmark ON OFF) - ) - - CXX=hipcc cmake_src_configure -} - -src_test() { - check_amdgpu - export LD_LIBRARY_PATH="${BUILD_DIR}/library" - MAKEOPTS="-j1" cmake_src_test -} - -src_install() { - cmake_src_install - - if use benchmark; then - cd "${BUILD_DIR}"/benchmark - dobin benchmark_rocrand_* - fi -} diff --git a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild b/sci-libs/rocRAND/rocRAND-6.3.0.ebuild index cadf2c863445..d5b38455f3d0 100644 --- a/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild +++ b/sci-libs/rocRAND/rocRAND-6.3.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 @@ -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/rocRAND/rocRAND-6.3.2.ebuild b/sci-libs/rocRAND/rocRAND-6.3.2.ebuild new file mode 100644 index 000000000000..d5b38455f3d0 --- /dev/null +++ b/sci-libs/rocRAND/rocRAND-6.3.2.ebuild @@ -0,0 +1,65 @@ +# 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="Generate pseudo-random and quasi-random numbers" +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" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +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} + dev-build/rocm-cmake + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" +BDEPEND="dev-build/rocm-cmake + >=dev-build/cmake-3.22" + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + export LD_LIBRARY_PATH="${BUILD_DIR}/library" + # uses HMM to fit tests to default <512M iGPU VRAM + ROCRAND_USE_HMM="1" cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}"/benchmark + dobin benchmark_rocrand_* + fi +} diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index ee28a681e3df..19583ba614f4 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1,12 +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 -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.0.tar.gz 3077185 BLAKE2B 2ac2260aa631756d32a92b9386bda16a46a1b16922072d6962497b2f009c237a0386cc0006ffdd56e6396322fc2408d49fc18e2ccd7120492a2270fce3eba3d9 SHA512 a2655cce8c2eb287893988e8b69e77e2dbcad0f627fac74916be2789cd3357cf29f3e3090a9c88a86ef9a0e80dd0aa949ddfb145a6a0d1c128eac0a8fe708d94 +DIST rocSOLVER-6.3.2.tar.gz 3077213 BLAKE2B ab05f0388f4845e7cbd6279aaa7c6a0774b99153ca0739837186792a8e5c271498d5c18a3305602d979aad65e5bc399305e0c6447bce118694ebbdcb1f26b5a3 SHA512 7a9b705783dde897a8b343e832a7775d131cc0c5caca14ee9abe4349aeff896bb1b073ea077ed1bcced6a358e4b61d9a0155c499c73fccba1d50b0ebc535dd6c 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 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-5.4.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.3.0.ebuild index 10fb52f40af2..0cb4a4616a06 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-6.3.0.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/rocSOLVER/rocSOLVER-6.3.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-6.3.2.ebuild new file mode 100644 index 000000000000..0cb4a4616a06 --- /dev/null +++ b/sci-libs/rocSOLVER/rocSOLVER-6.3.2.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 edo flag-o-matic rocm + +DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform" +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" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +IUSE="test benchmark" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}] + dev-libs/libfmt + benchmark? ( virtual/blas )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest + >=dev-build/cmake-3.22 + virtual/blas )" + +RESTRICT="!test? ( test )" + +src_configure() { + rocm_use_hipcc + + # too many warnings + append-cxxflags -Wno-explicit-specialization-storage-class + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -Wno-dev + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_SAMPLES=NO + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ) + + cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + # 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() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dobin clients/staging/rocsolver-bench + fi +} diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest index 5d1f55c658cd..b420f80f8031 100644 --- a/sci-libs/rocSPARSE/Manifest +++ b/sci-libs/rocSPARSE/Manifest @@ -1,9 +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_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 @@ -28,7 +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 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.0.ebuild new file mode 100644 index 000000000000..87320ae0e017 --- /dev/null +++ b/sci-libs/rocSPARSE/rocSPARSE-6.3.0.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 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/rocSPARSE/rocSPARSE-6.3.2.ebuild b/sci-libs/rocSPARSE/rocSPARSE-6.3.2.ebuild new file mode 100644 index 000000000000..b3db8b403676 --- /dev/null +++ b/sci-libs/rocSPARSE/rocSPARSE-6.3.2.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 7365f9ccfb6b..bb7d77d53f8d 100644 --- a/sci-libs/rocThrust/Manifest +++ b/sci-libs/rocThrust/Manifest @@ -1,8 +1,12 @@ AUX rocThrust-4.0-operator_new.patch 1699 BLAKE2B 1f8e4eb035768acd424cc2bae173c2c107b15b7f670c430ff5db5bb3657fdcafcea7933890176537c6147c1bee3cb675464d6d948724ba186868ff277eaa71f2 SHA512 5d9d48561e7feabc9341f13877d7e6bd49b59b140fe249956e87e785ed8afd1222aa1e7d77759af6ad8843e87d21362ba85ac9204bfcf160f30a4bcfb3d2e88b -DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74 +AUX rocThrust-6.3.0-fix-libcxx.patch 479 BLAKE2B 89c97bd8dccad195a3486a3e6741734e8dab9523ddb1c766372aef83406ff41293aef78b4c727198be44b91e1faa6d40e396f1286b6b1123afd6ecd1241314da SHA512 f7934cc0b38bc1e35335978b30dde69c47ba211f5c6798f6fbf4981fd0d9da7ba090f3f3e96050b4f6ed3a90ed8d4c1d90ed5447e1f3ea47b18ca99d6b5151d9 DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc26eee8a2f388897eb9b9f9fad3cdad81e2a79932c5b9a6d88b4e1596bf64e59e01337943a036ddb792f7b352ecd31 SHA512 52a9640808f0ed78ae2d6f25e741af59ae4e977535a0431f16c0fa1ee9a395e6f389cf29e61c02ac274cf16fcd193e5df6fb2edc340059ab282ed7cd877fc8b4 DIST rocThrust-6.1.1.tar.gz 1147635 BLAKE2B e71288a4666ba1f23cf85d2d269f61f9085efaeb2921b7f3142c5ce0808380b27a8c07945a44b6a651747046020b412838a667232b1ba65308fd7fd336b840b4 SHA512 30eeb6df73ee0dc2361879337faae09cf19cd151510c6e22d774c22b4be19272f9980cc6ba2b2e42f43738a1e475f49fcb4384d66b24639746a05685a90e37d4 -EBUILD rocThrust-5.1.3.ebuild 1929 BLAKE2B 04ef6dbe75793a05c9d2f994eb82d7816ec99abed0415e0a3a555aeda4e09267adac4db686d76c409a942c636f035433d33d0727e9c793cf3afdf8bfeaedc371 SHA512 e3867e21e481ccfb13318cb2ba02596e81be6e86b5026083b7091916adc850fe74a926cb98c129a3dbe6ee0ea9c12665849979d63628e081fe56465f746098c4 +DIST rocThrust-6.3.0.tar.gz 1205810 BLAKE2B bdf617ffac39deb345a2738a7d61ccf282af1ba2d49210aa15e5d3181f64f38bcb609d52d41db892579d9d03013b0ddcad6bc88cd58a3a90fa8e7989e01edfcc SHA512 e73e0fd743dcb5625099aad226b578145e350666eb52ce9682e53a40f4cb17a34f812a94321397acad8dfcf6c573eab86565a220bb42e501296b78450e42647e +DIST rocThrust-6.3.2.tar.gz 1205797 BLAKE2B 355da53bbc69a6b79909fe48bfa326fc9bc8eabf4b80d3870bd4ef73ff87ebaba5ec06ce2096efd9d4655d1f19970ca60069c14e91b6bf953263145f8ff3a178 SHA512 5f699957ef79346e38d7d8d462b25f67248e5d7b1c2ea71a153fe7f87279d442e181a721b95a2878d52ae08ff3b53797a320f51f707b852ec67d5dfaa50a1bc7 +DIST sqlite-amalgamation-3430200.zip 2676699 BLAKE2B b09c59772c920ddef7ba0b15b1721645541678bad9ecb23fb8ecfbb1733177cad836d1d75db8e0722ea7ab4701cfaca187b72c127e9959f7e4f116f1ec7fe41c SHA512 5ef0e65ee92a088187376fa82ccb182dffa35391dd4dbcb3fafeb0a6f1602ced1e212753837079a9cad007d73d3f5b8a67ca1a6596eba6cf0c695052fa307392 EBUILD rocThrust-5.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 MISC metadata.xml 631 BLAKE2B 99edd995566ee67d4e2fb4fdc67eca30299e81bd657d57c24932b0bc0545c805abce9d2542dfcb9d61d7aa5639ac02dc5385a5d90bfa5fcb757b5fab9f1f11d6 SHA512 bc0f9411724711f1806f1681c6c55877b828807e9deb22123a92b1b1cfc19c2f423ddd111978bf04a3993555cdc984f654c049617e5919e18d09a093c4559136 diff --git a/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch new file mode 100644 index 000000000000..2db69a71bd20 --- /dev/null +++ b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch @@ -0,0 +1,13 @@ +_VSTD macro was removed from libcxx +Upstream commit: https://github.com/ROCm/rocThrust/commit/bc24ef2613e282d57d96dcf4263e2fa2cab171e4 +--- a/thrust/type_traits/is_contiguous_iterator.h ++++ b/thrust/type_traits/is_contiguous_iterator.h +@@ -139,7 +139,7 @@ struct is_libcxx_wrap_iter : false_type {}; + #if defined(_LIBCPP_VERSION) + template <typename Iterator> + struct is_libcxx_wrap_iter< +- _VSTD::__wrap_iter<Iterator> ++ std::__wrap_iter<Iterator> + > : true_type {}; + #endif + 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.0.ebuild new file mode 100644 index 000000000000..9588f9f0fc74 --- /dev/null +++ b/sci-libs/rocThrust/rocThrust-6.3.0.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/rocThrust/rocThrust-6.3.2.ebuild b/sci-libs/rocThrust/rocThrust-6.3.2.ebuild new file mode 100644 index 000000000000..9588f9f0fc74 --- /dev/null +++ b/sci-libs/rocThrust/rocThrust-6.3.2.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 99fdb97f5768..e9820a65303d 100644 --- a/sci-libs/rocWMMA/Manifest +++ b/sci-libs/rocWMMA/Manifest @@ -3,6 +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 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 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.0.ebuild new file mode 100644 index 000000000000..5a803b20ae90 --- /dev/null +++ b/sci-libs/rocWMMA/rocWMMA-6.3.0.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/rocWMMA/rocWMMA-6.3.2.ebuild b/sci-libs/rocWMMA/rocWMMA-6.3.2.ebuild new file mode 100644 index 000000000000..5a803b20ae90 --- /dev/null +++ b/sci-libs/rocWMMA/rocWMMA-6.3.2.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 a2677e21b155..2e5953d991f8 100644 --- a/sci-libs/rpp/Manifest +++ b/sci-libs/rpp/Manifest @@ -1,4 +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 EBUILD rpp-6.1.1.ebuild 2127 BLAKE2B ee7e07eab9440959df1123a23d1112905e7af4763d9a2ca636424d9a4d60492f509016e4004808a90680410cc2d42bafd968117fb355e0759f4cdc306682e1d2 SHA512 90191804e681c39aa9c7059976436fabb7efab91f947cc04930fdd9d444429b222fc8c01fafd9ac5b53b78caaba6738b24bbdc379834b7d8b83e8dd76f4fc5a1 +EBUILD rpp-6.3.0.ebuild 2187 BLAKE2B 67b2c085b61082b8ebe9c3d796af7e055d3196e7a8860e46295ccfcd60b729eedd400047e273fe0bece3e53b020aeb2819278fdd6c6e5b6b97e6874089afe572 SHA512 0e1e0a104db0f3152ba0bccc28de071eb1b5419b6e4f0f766853df0ca0d9ac00a41ec51ecc03a323a322655ab3fe306d858736d65f490715666b410f206792b4 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.0.ebuild new file mode 100644 index 000000000000..e1bd48117964 --- /dev/null +++ b/sci-libs/rpp/rpp-6.3.0.ebuild @@ -0,0 +1,102 @@ +# 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 rocm + +DESCRIPTION="AMD ROCm Performance Primitives (RPP) high-performance computer vision library" +HOMEPAGE="https://github.com/ROCm/rpp" +SRC_URI="https://github.com/ROCm/rpp/archive/refs/tags/rocm-${PV}.tar.gz -> rpp-${PV}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +# pkgcheck warning: RequiredUseDefaults +REQUIRED_USE=" + cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c + ${ROCM_REQUIRED_USE} +" + +RDEPEND=" + dev-util/hip:${SLOT} +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-build/cmake-3.22 + >=dev-libs/half-1.12.0-r1 + test? ( + dev-cpp/gtest + media-libs/opencv:= + ) +" + +IUSE="cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_f16c test" +RESTRICT="!test? ( test )" + +DOCS=( CHANGELOG.md LICENSE README.md ) + +rcc_test_wrapper() { + local S="${WORKDIR}/${PN}-rocm-${PV}/utilities/rpp-unittests/HIP_NEW" + local CMAKE_USE_DIR="${S}" + local BUILD_DIR="${BUILD_DIR}/utilities/rpp-unittests/HIP_NEW" + cd "${S}" || die + $@ +} + +src_prepare() { + sed -e "s:\${ROCM_PATH}/llvm/bin/clang++:hipcc:" \ + -i CMakeLists.txt || die + + cmake_src_prepare + if use test; then + local PATCHES=() + rcc_test_wrapper cmake_src_prepare + fi +} + +src_configure() { + rocm_use_hipcc + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DROCM_PATH=/usr + -DBACKEND=HIP + -DBUILD_WITH_AMD_ADVANCE=OFF + ) + + cmake_src_configure + + if use test; then + append-cxxflags -I"${S}/include" + append-ldflags -L"${BUILD_DIR}/lib64" + local mycmakeargs=(-DROCM_PATH=/usr) + use test && rcc_test_wrapper cmake_src_configure + fi +} + +src_compile() { + cmake_src_compile + use test && rcc_test_wrapper cmake_src_compile +} + +src_install() { + cmake_src_install + + # remove unneeded copy + rm -r "${ED}/usr/share/doc/${PF}-asan" || die +} + +src_test() { + check_amdgpu + + cd "${BUILD_DIR}"/utilities/rpp-unittests/HIP_NEW || die + for params in "0 0" "0 1" "1 1" "2 1" "5 1" "0 2" "0 3" "0 4" "0 5" "0 8"; do + LD_LIBRARY_PATH="${BUILD_DIR}"/lib64 ./uniqueFunctionalities_hip $params || die + done +} diff --git a/sci-libs/stellarsolver/Manifest b/sci-libs/stellarsolver/Manifest index fe5d020f765b..a2fbc35e6f7d 100644 --- a/sci-libs/stellarsolver/Manifest +++ b/sci-libs/stellarsolver/Manifest @@ -1,3 +1,4 @@ DIST stellarsolver-2.6.tar.gz 26565848 BLAKE2B 35cceedca14b6fc062d963a47954b1c06ef908f4f8572776ca4de6a4b618eb72445cf05aefc5c62fa7a0a55e3719e6201f5734a827fc2fe752b919a30bd9c0cc SHA512 28c15e1cbc4e5d9b852001b80e8183ea98557ef0bdf0c9b3a238485d9594058bbd7003abc77cb41caf6717c809c7a3d1babd236adbeac6bb0e383f5a73815e95 +EBUILD stellarsolver-2.6-r10.ebuild 731 BLAKE2B f591135e5d2731b326b360dda91ce5a1ddf3b1ae6e47685742dedb3aef1ff72d9e9d20b8b702405c9d8b98ad0aa022e097532dd6668de9da0a1385e052c2fa6c SHA512 9552399d1bee54c3db36b1177e61f37ea3cbd0687035b3fc3fd6dec7b635df1a691dc2c7b5da67bf8cbc88ac0c43866ad7589538bf8c03fd580d389c8701b5db EBUILD stellarsolver-2.6.ebuild 826 BLAKE2B 69bd96be3e06197b9627c7171b28f28e8c651cd0ee47884900f3e0c7c664629c19654c5b344ed6d048e934fab92317e749b49b6515d2afb9a1481d4857cf81cb SHA512 c56dccef4c82627efde33fe8dbdcb07e03bcedfe7cfed31e546baed8c6e88393a1c27d39e78ab4faa7732abdc37829cef4145e91ea1ce2e89d011053bec4de86 MISC metadata.xml 464 BLAKE2B 4d73483b37f92bd6a6a112d27c17ce7c8c0165cb3400f10c3a5ed5a65bcaa6e2e0d892d305834fc813655258173552cdef75431d9798491d0b124de1dbb6f035 SHA512 3cc978f381b4435b05712e69733336ec7e89963d4b236059c21b4bf7f08b899e617243ef5df0e27c2ef21e59197b97fcf414c1964b86b215d0c355c4f88cac77 diff --git a/sci-libs/stellarsolver/stellarsolver-2.6-r10.ebuild b/sci-libs/stellarsolver/stellarsolver-2.6-r10.ebuild new file mode 100644 index 000000000000..8df7b5ad70f8 --- /dev/null +++ b/sci-libs/stellarsolver/stellarsolver-2.6-r10.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="Cross-platform Sextractor and Astrometry.net-Based internal astrometric solver" +HOMEPAGE="https://github.com/rlancaste/stellarsolver" +SRC_URI="https://github.com/rlancaste/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtbase:6[concurrent,gui,network,widgets] + sci-libs/cfitsio:= + sci-libs/gsl:= + sci-astronomy/wcslib:= +" +DEPEND="${RDEPEND}" + +src_configure() { + # bug #862930 + filter-lto + + local mycmakeargs=( + -DUSE_QT5=OFF + -DBUILD_CLI=OFF # nothing is installed (yet?) + ) + + cmake_src_configure +} 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 6df42e06027d..93c21583e8fa 100644 --- a/sci-libs/symengine/Manifest +++ b/sci-libs/symengine/Manifest @@ -3,6 +3,10 @@ AUX symengine-0.7.0-cmake-build-type.patch 1234 BLAKE2B b416e9b83db5eb6689bb9e18 AUX symengine-0.8.1-fix_llvm.patch 2674 BLAKE2B f7d493318389f63a8b61f47ee2ba6429d205e91fec3f94a5c45a062622fa7b6c29ab410fb04a260d98f983402e4e74103ca591ea3aa035c68bd4e431dfde371f SHA512 683e9acac3f6304e2ac1d2c67304d1e6a2fc6915115a201a870e29253c804e378b39d8d00298a70ac5a4e1456a153febe69d63cfbab821b31cda46fc94782131 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 -MISC metadata.xml 1270 BLAKE2B e52ff12980457252a05195ef47bd90e52816794948169473a597e263d744d163cbe42d35e995243daf6b8664f1ed7d41879b63927606187277cdf503fc7bf846 SHA512 4fd6f340d1d4952774eb0fcd47d9ed6e9f145bd83ba7bd04fe428faa96ec63b6cd62173b6ead116a649471fe9b6466be7bbb48c8e534b3203f232f9a7bae12b9 +EBUILD symengine-0.13.0.ebuild 2512 BLAKE2B 28be0dea1ff6013aa8a76ebac934036ee146491261b6bcca25d0f6ac34ee97f5bc68149bff48a54929f4b7bcafa68d6862a5bc28d832612f3b5fe127e1629eb4 SHA512 113c1e78b833352c21ba362d24cfc9971aedf1e50996d3df41d065c4c8d88c3a82c2bc513a28a62a38c77cd23aad6e12666fdd76ef8d0728c29d2ce6dbe93b19 +EBUILD symengine-0.14.0.ebuild 2348 BLAKE2B bda6c7573d28a408d1a34b4d01554317532f008b9f3865f7842f07b3f67e310d23084d3712440982b082add182b015235c3e22abc7eb365b6bbb8f04b42175cb SHA512 d157452d6f84407bb27bef812a4d4bb1ee40377e1d04da6eef1b173e2c90dbfff0b9960e968de775761c20abcab4e30c9e4cc3bb43a44bfb96d446de5cd99a7e +MISC metadata.xml 1351 BLAKE2B 04ace153dd5a24c402e1a0759dd285e1e22b7813c59fba81058fc1503c8b0f80affaa9dea3158ee0dc0e9cb6215db237201af37f7ffcac2060a439d65d04c986 SHA512 c24ff488ac5a5ed54a7cf3b0ceefa55e069eaec4125e91f9e77f8490e64e82f1fd3f6feeacd0427671c493df748c810071b6360b41bfe5aa21bfc7d70c6c0b47 diff --git a/sci-libs/symengine/metadata.xml b/sci-libs/symengine/metadata.xml index 92a951a95411..fd0371e31c3d 100644 --- a/sci-libs/symengine/metadata.xml +++ b/sci-libs/symengine/metadata.xml @@ -1,26 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>sci-mathematics@gentoo.org</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> - SymEngine is a standalone fast C++ symbolic manipulation - library. Optional thin wrappers allow usage of the library from R, - Python, Julia, Ruby, Haskell. - </longdescription> - <upstream> - <remote-id type="github">symengine/symengine</remote-id> - </upstream> - <use> - <flag name="arb">Add support for arb (<pkg>sci-mathematics/arb</pkg>)</flag> - <flag name="benchmarks">Build benchmarks</flag> - <flag name="boost">Add support for boost integers(<pkg>dev-libs/boost</pkg>)</flag> - <flag name="ecm">Add support for ECM integer factorization library (<pkg>sci-mathematics/gmp-ecm</pkg>)</flag> - <flag name="flint">Add support for (<pkg>sci-mathematics/flint</pkg>)</flag> - <flag name="llvm">Build with LLVM</flag> - <flag name="mpc">Add support for multiprecision complex arithmetic(<pkg>dev-libs/mpc</pkg>)</flag> - <flag name="mpfr">Add support for multiprecision floating point rouding(<pkg>dev-libs/mpfr</pkg>)</flag> - </use> + <maintainer type="person"> + <email>mgorny@gentoo.org</email> + <name>Michał Górny</name> + </maintainer> + <longdescription> + SymEngine is a standalone fast C++ symbolic manipulation + library. Optional thin wrappers allow usage of the library from R, + Python, Julia, Ruby, Haskell. + </longdescription> + <upstream> + <remote-id type="github">symengine/symengine</remote-id> + </upstream> + <use> + <flag name="arb"> + Add support for arb (<pkg>sci-mathematics/arb</pkg>) + </flag> + <flag name="benchmarks">Build benchmarks</flag> + <flag name="boost"> + Add support for boost integers (<pkg>dev-libs/boost</pkg>) + </flag> + <flag name="ecm"> + Add support for ECM integer factorization library + (<pkg>sci-mathematics/gmp-ecm</pkg>) + </flag> + <flag name="flint"> + Add support for <pkg>sci-mathematics/flint</pkg> + </flag> + <flag name="llvm">Build with LLVM</flag> + <flag name="mpc"> + Add support for multiprecision complex arithmetic + (<pkg>dev-libs/mpc</pkg>) + </flag> + <flag name="mpfr"> + Add support for multiprecision floating point rounding + (<pkg>dev-libs/mpfr</pkg>) + </flag> + <flag name="primesieve"> + Add support for <pkg>sci-mathematics/primesieve</pkg> + </flag> + </use> </pkgmetadata> diff --git a/sci-libs/symengine/symengine-0.13.0.ebuild b/sci-libs/symengine/symengine-0.13.0.ebuild new file mode 100644 index 000000000000..589a31fdb9af --- /dev/null +++ b/sci-libs/symengine/symengine-0.13.0.ebuild @@ -0,0 +1,111 @@ +# 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 +" + +PATCHES=( + # TODO: upstream + "${FILESDIR}"/${PN}-0.7.0-cmake-build-type.patch + # TODO: make a proper patch for upstream + "${FILESDIR}"/${PN}-0.8.1-fix_llvm.patch +) + +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/symengine/symengine-0.14.0.ebuild b/sci-libs/symengine/symengine-0.14.0.ebuild new file mode 100644 index 000000000000..a2416c83476b --- /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/symmetrica/Manifest b/sci-libs/symmetrica/Manifest index d9b39e70630a..769f97bb8889 100644 --- a/sci-libs/symmetrica/Manifest +++ b/sci-libs/symmetrica/Manifest @@ -1,3 +1,5 @@ DIST symmetrica-3.0.1.tar.xz 789336 BLAKE2B 88521356bdc006413e0922b49b23f345da96bbe8cb2a4a6ae12bf53fe46150078f086e6d1f6e514817453f2a868b6eb578b716c05f5459397ed8d766d321ec24 SHA512 1e4c42e1ae9fcdf246dff1c1f01522d6cd416c12302363f82356018847df2f64d2f5ea6256459832d195e8e333ae14743794d5a53346e92d8ba1bb1c0949c271 +DIST symmetrica-3.1.0.tar.xz 765568 BLAKE2B 9b4f81ef4e135af5552417b66829ca3a99f3ad039cdc936108dc587d5971364db6fe822679fa110ac0f3e8cc30b0856e27efff4ba9ab3f79ee9a706047bba5c7 SHA512 7bc45802907b4eb82b89e440d628143fc4bbebadbb221711dcdcb4daf6587f1042f0fb701c369434151e5c1a83eeda2eb7d0c8f96ee00afcdc79a6600ff96983 EBUILD symmetrica-3.0.1-r1.ebuild 537 BLAKE2B b96ba155a139ec65752070afdb5702d6bd3b160e87dc10ebcc897f30b178e4a39a629a626ce766c4d1faad91043c84e7be162f79757a5205f8d9fe2d503f1df7 SHA512 b61fc5ccb14276521c3fc27d2c66620296e7551d9a241ed8b4e94d20db30c2b20281e2c6b1250ee6e205dcd7ba3fe89ec1b61f285c90090ce99f34c0dac038cb +EBUILD symmetrica-3.1.0.ebuild 537 BLAKE2B d682f57a786818a664fb045e47be087b3c39aca540b7c453ab37956b3d9658e626fe76990b5f48c261061f0287924691c81a44eb4e62691a2a9e726b06f3dec1 SHA512 c607bfc42e1e8d6f81cde3365fdbff2d7ceba84a072609e811dd53acfa73637423aa1c8abd3ae5a108cf0be1bb39b8a1a6ce7ddd67e4c4f60ff44d5ec1ee78b3 MISC metadata.xml 770 BLAKE2B 6a6035b830992a2d990f2bc0de458622f15c2d423f270ee542d6af9af128032f41108a9b9c3d40360e6847c0fe4c5bb10ca68564246a2c8ee2f2a96b3bb79d4e SHA512 aa5e5ea606826363afe447924f02f7800197dce9ef928558ff9a3b6f95bb3229747e42c4e004bcb76fd0faea34f9d807c6b720ffdd16b9b35e394f1330386f09 diff --git a/sci-libs/symmetrica/symmetrica-3.1.0.ebuild b/sci-libs/symmetrica/symmetrica-3.1.0.ebuild new file mode 100644 index 000000000000..eea38fdc5830 --- /dev/null +++ b/sci-libs/symmetrica/symmetrica-3.1.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="C library for representation theory, combinatorics, and more" +HOMEPAGE="https://gitlab.com/sagemath/symmetrica" +SRC_URI="https://gitlab.com/-/project/16178617/uploads/b24da56820651687cafb611809a4b1b0/${P}.tar.xz" + +LICENSE="ISC" +SLOT="0/3" +KEYWORDS="~amd64 ~riscv" +IUSE="doc" + +DOCS=( README.md ) + +src_configure() { + econf $(use_enable doc) +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/szip/Manifest b/sci-libs/szip/Manifest index 4a4069c8f1bf..28d36c45c697 100644 --- a/sci-libs/szip/Manifest +++ b/sci-libs/szip/Manifest @@ -1,3 +1,3 @@ DIST szip-2.1.1.tar.gz 415774 BLAKE2B e0f8d1f6528801c422a4db0f0cad43dd2c17f913dfff85962f4b4d448176903bcb385f631d32c5328cfb114527220baa9fb7d560364f700a61d4930ce799a7a4 SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd -EBUILD szip-2.1.1.ebuild 723 BLAKE2B 0c79bafff18afb581d8b7d1afb7e78a4b2f24a5e935837a0141a2caa06137d1a1dfded7dd7c244465565a4aebdee39c6a13bc9f6a7273b6b28186ae7784e4315 SHA512 d80995178913c5177efaaecb5ad1b3888161aaec34b2307c31ae969d937f223a041e51d9f27f2feecdf566a8061a004a888467d2d4c2571e220039c58678d9dc +EBUILD szip-2.1.1.ebuild 730 BLAKE2B 8599c702b88f716410168ce7d8f89cc8f1ca981f04fce141d5695174479f7ccf433beefd2b031de8a51c7f1dbd4e703f2fe70bc39f435ffc01dbb7d2e7f30349 SHA512 2034f2ca51ba76e0de3a76fc28e7362e7854ee301c9c02f1c70e2567a5894c85e1d55ca01c3fe4cb22a318a2473dde89259cfb1b906cbcb1d572fdd8577e6c94 MISC metadata.xml 766 BLAKE2B bd0e35e752baadb4deefad410c7e1d554cd412744af4a91acbeae68c04491b248d51f8169b81e529dfcc76b33ff8c2534f4b2dfadbda747309d3537de6ce5df2 SHA512 69ffab49952e563f8697a906f810ef7f8ae96bff70287b0f0a1f4c2b01212e6a3ba4fd89068948648979e53fd6efe1cc3c80e18584c54fdb6a8dc61cee21e14e diff --git a/sci-libs/szip/szip-2.1.1.ebuild b/sci-libs/szip/szip-2.1.1.ebuild index c6bda0f8f2f1..db8b52f2086f 100644 --- a/sci-libs/szip/szip-2.1.1.ebuild +++ b/sci-libs/szip/szip-2.1.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 @@ -9,7 +9,7 @@ SRC_URI="https://support.hdfgroup.org/ftp/lib-external/${PN}/${PV}/src/${P}.tar. LICENSE="szip" SLOT="0/2" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~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="static-libs" RDEPEND="!sci-libs/libaec[szip]" 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/tokenizers/Manifest b/sci-libs/tokenizers/Manifest index 9715c6c05c23..8374e2e76e60 100644 --- a/sci-libs/tokenizers/Manifest +++ b/sci-libs/tokenizers/Manifest @@ -3,10 +3,15 @@ DIST adler2-2.0.0.crate 13529 BLAKE2B ec575b0bf12e321399ac3a1d59fce4ddbeabcc60cb DIST aho-corasick-1.1.3.crate 183311 BLAKE2B 8dfcbba0b9d94e55eae739b16f5c6474baa43ee7854c5ca792f426a9f46fb0eece79cd493b804e51449181bcad338b96819fe977c02c9907654d713e26b9f830 SHA512 ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61 SHA512 f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29 DIST anstream-0.6.15.crate 29231 BLAKE2B cc4cf0f381c210fecc20b5796fe872b533419e5f957021b0c3be3cdc23fb84ce029fbef6f9b6f174a76ad713c07f0811145a70572de7c24cfab060fdd990f49a SHA512 1cb01a0293b4c9bcc010909707e71c464416d3ec6fc9789060b7aa9fe4cc04424fefa8013cc8765ccdae6dfd9a1c50a11f7b30b39a32c4aeaf525f28167ddb92 +DIST anstream-0.6.18.crate 29681 BLAKE2B b6f72cda084b38f1e1cfe60de2562e8d62ebbc352176bdf668a2d6be09349bec46d291cd475e8af814ce66def44d95cb98c325761150130752284a82d8a84f21 SHA512 5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963 +DIST anstyle-1.0.10.crate 15725 BLAKE2B 36e656bd8f9c584f11fda5cfe0c2e24e8426b9e1b602aad34ed118ae6950a55440e292d2e0ff7615f5e4f466fd06f07536be198a59506a587d40cb0c4ede4f80 SHA512 621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea DIST anstyle-1.0.8.crate 15771 BLAKE2B c039613e7de27cc990e5764810f9351754b160928a8954dc19041354cf9fef1422ed964237a5d39d16e4e9f8592ed52c523ccf36b0b5506f464d4f818f3332ff SHA512 3b867f73df0b2f69a0c7d5d6e62c7515045e053656afaa303e5aade8012e838cdf5d15d2c3d7c297db9e297d08ea69a9c8eed04b97922a83f56c58962c1c0b69 DIST anstyle-parse-0.2.5.crate 22680 BLAKE2B 7473651b1eee08857a6ed1419d3d62ba4b9a9aa0d6657965ad9c67bddd793d825737d3804961716a89bdebed9879ac43b42c897cd229c6e7bd780859e1e3c247 SHA512 cd94ad0e88ad4547a660da1473bf4e6dfed805a066782124204143c7f754c12db719bd3a1774c299f1a035740bfc4830919da191bd14e0acede410f6dbd1e2ef +DIST anstyle-parse-0.2.6.crate 22343 BLAKE2B 85eba405dc5cf806283cf442984e86583dfe6c681f849eb7a347b7b67bd2b6f692e84fc9b5bd86486633cb2f05960ec16e8778300df114ae6676da43442db9bb SHA512 e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396 DIST anstyle-query-1.1.1.crate 9891 BLAKE2B c298114c1864a5233fb39c365e079a7f1f4ef23499dc330e5deb06f83f27bc727015befef79075c7e39952547f799b4135d7db287cf72dfc914191df784a4989 SHA512 1b2e888f025142a0d9b01314cf083831a2a45d8da737c1be3a6a9aa177e73e0d2ae7999fe7610dd450b7096115e8cf38c5da23723cebf1deaa7d3501d3dbd5ce +DIST anstyle-query-1.1.2.crate 9969 BLAKE2B 179b8dd6dd709c2ca67f4eb5c9a502b2867cb6744a39f824c4fdebedc67c6c3e07d107c7d817e2ffb589d13b7ed4900cf9653ddc0a43663217042ee92ce8c9da SHA512 26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837 DIST anstyle-wincon-3.0.4.crate 12234 BLAKE2B 23294d6ed7715c55c8f796eb7b860450c57b22b57e32a5c75847f2e2bd68a52b33c24797db662aa5fd7e799b9644075c8c939d93b0cf8598b16ee80fc817b77f SHA512 24b3a9a44382609ad449425a657d4b42a792d4703c36e0953f09a03817759c266a2f0ff4ecc9e8b93ea8403df2badef1f1af6a6e50af56205176c41b13501ae6 +DIST anstyle-wincon-3.0.6.crate 12271 BLAKE2B d9f4d9d46fa93a1168ca340562681718be852ffa94e30c9ea208af53af9d6697ca84921837a325ddc36681caab2b866b7f574901c80b5c0d862dcb765b81b68b SHA512 59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5 DIST assert_approx_eq-1.1.0.crate 7512 BLAKE2B 6efc259426c5f61ce971a86dd434bad2dadc6613ee182df90d818a7f5ab1e4a8e1bd4b210a76d80f2c1fe93bfb91cf8a65776c419d39746e9f3d4aa78669b426 SHA512 701ed76e413f32d873fa670e307646924344bc40d56961887554bfd155ddbfc7606b76c341f66d64a75c882d40f99d803fd839f0ebedd35293ae47aeaf57782e DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635 DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103081b6f7353c4b5897813cedf870b3fb1fa25d320a75326b334b44d8287e8603de34fc560d0b567143915cc6 SHA512 3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c @@ -16,18 +21,26 @@ DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf7181 DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST bitflags-2.6.0.crate 45357 BLAKE2B 3a368bd2eb58c095b7b4a46680cc2d90a28e24b2e37c854bbf8647c861c4b8fb37eca827599673c5c7df763048149dd82123d1ede1f8a0e58a6bc23c8250f7e6 SHA512 f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf +DIST bitflags-2.7.0.crate 45924 BLAKE2B d4266b77e4ee15d7083c8e8eebe1b050029e3f3d21029606d4e9d3c4fe03820b6d5ba2e1309f47cd6ca2a043b5d7e1b19dd991f3fbe97c4bb018aadb54c60818 SHA512 c97246c09551bf1b333850135d82c40650be4aa8df1ab55dc190d80ea8e950ebd122635fa7d82c43d477150e207acfc4e830b9fde41aaca1edbbe7c0a800c174 DIST bumpalo-3.16.0.crate 85677 BLAKE2B 08da17b757931d2910e0299df53eb62731aa8c4ebd8915859b81d1982b331e7455dfac977c754e500a35ee07ba8eff00a61d2f62be99744e2ddbba06c1268f49 SHA512 a51b75c36f6794db444cab20eeb24f42a319080ecb486a56d254d6f873f3d188b5ccba11db30c068bd0c52c4322d4a3f5f5195c81c94b0bc04387030418835b1 DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396 DIST cc-1.1.22.crate 83509 BLAKE2B 37bcb91fcfe5d816ee9a29aca0c9c34cf7c429ee31084a47110f0b882270f7402c5e7bb59f66e8872d0f63253e2d06fc01be63e439cf01b118f33ceb4a64b2ae SHA512 c58571daed5e52033b2ab0966b3e5a167f48ce739123a4f6789fed79e9e30a3d89e289b8ea6069699eaa7c4e9efda38e03ba331119d32c75a8871a0d84aa6cb1 +DIST cc-1.2.1.crate 92731 BLAKE2B c9cb100964834692781ecc3f47972f83adaf27e019ca212f896b19a853521cf2084da213f2c2fc5c8a1bc794cc83fe9f81faf7751e1b065a3a2a08137cda0b61 SHA512 54bc5d85d48d678d33dc795aa6cc823a59ae6d17b4ec5708a1dd515e3495eabccdd949e9467e9bb3a29e44847a2d3ccd75055dfda241d8abbb16bfad650f2819 +DIST cc-1.2.8.crate 100790 BLAKE2B 15f707b72adc1a6598d5a88df4346223e0efa863d4798c648daff3606adafcae9cc51109eaee197ebd33e8583167c00d18564c50159e0b393e7b7938b928b0aa SHA512 2566ae63afe078e4ed598cfe81d6a37af958c3f96c9689c8c94f873e42115c1cc0b02bf52437905fcfe8ee058a789b864b9959cd105348b7fa907e21db93f068 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff DIST ciborium-0.2.2.crate 35611 BLAKE2B 7bb34ed2b16f55af2d762bbc83263bba901a0f05bc7677a370460549297839c4d6e913622e8a6cb3a5c2447b94b0bd17b7d5007228ea8881193d08e5b8deb072 SHA512 8d1af6a09f116e42f0098d7d0e34dd906dc3e718b257ff1a1fde655a235d40619f61f18917c0cf35c55de9160c255a9795d5e7525989037e3512807cc6a900b1 DIST ciborium-io-0.2.2.crate 6697 BLAKE2B 07636da78f59859515af0075cb36d9ca969113ac327ff727953c73b64b60ddae22e5b1b65d8be5aa401f8b13d34074cbc8b47f23abd7a13d551f0b1c78f23575 SHA512 641b8592f9699d5e6c607815c8e6dfc82b2bd01897015e04ef8853420a7d90c2ec5c1140e39eb7623ce05587bea52ef63659eae76baee5b6592d2ac5298ce106 DIST ciborium-ll-0.2.2.crate 14695 BLAKE2B 3c9ab0b338070359f9565706a504e4f6c65560072380af6e0a57068ae6716773d40e75dee84ded5e1d32f93445a07a0965759bedace58291b68b94479fb16488 SHA512 2f7ef6ad8bf5a862e8b9daa64bc6d8184c87a22c264b10dbb35c00c9effcd5712f354b4ca6c2eb8e6795d4b99d7cb88fa2acf01f3ad6fb28caf81708a500549a DIST clap-4.5.19.crate 56377 BLAKE2B 23b6ec8ad85063177a79e6a910640e3cff4ff069925b6e608022c50df7c72718a5a05ef9ae1562f869667c21bf6c93afe13f0f15b4b9dc4f91e14e7a108202bc SHA512 55d8cb53951c2a6ecec93ace3881ba20482aefe41dd87705c15e295462d7487b24b15c1caeee5e8ca5917ca28a381cae1c0d72781d6a440c26a41f3c64dd8be4 +DIST clap-4.5.26.crate 56474 BLAKE2B 986e620055ea5c8546162793958ac147f309df76058b49862e15517b1f060f986e631da5816fc7cd22563f1699a57b5d377622974606c96c454d74d8ba72a07c SHA512 ff41bbc3432504eb80dcd95091aa21f00716337a4e271822d9d0e8f244e01583fdcfb890f6eef908ad3cebe7e2597802d09ba26f9cb7b8c325f616ec4ff6d1f9 DIST clap_builder-4.5.19.crate 163596 BLAKE2B f709ef92a6d8a23051648ac1b2f88e9854d1123d1a21c6aed06ec4175b606b7f97ff05139c9b0d7b18492bd272580659bc0e2a0ee572d6bd4d3eb250bd0726fc SHA512 a0422134a231a9693582016a2acd74c944c4c1f12b93a40abb731a0433cae47bc97c9685c39a37d9c335ed7bf4de08a1a1536e291164600625eacb871293abf9 +DIST clap_builder-4.5.26.crate 167961 BLAKE2B 4cdb5b3d356a2631e86c9130389e6773d061d0842997233ab470c4c0853a966eb8c40e36574fa9708f7d052901bfc267579a26175e6e2da2c74552bb377ccde9 SHA512 474cb2e9b9732c353ba0b1a5fda60332903296fc50019481ccc881680b30602ca545cf36116374a6b15f6e40574b8631aa682becf6a1707ccd42d18e34a68a29 DIST clap_lex-0.7.2.crate 12805 BLAKE2B 952bf3f3885ae7bedd0e8add236590da5fce72a7ccd88ebda063410aef337ce7ccdb5e5e929cb870bc993891610edc0197150a3aa82a62fadc4bbfd96324fcdf SHA512 a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380 +DIST clap_lex-0.7.4.crate 12858 BLAKE2B a5ecd50cc503157dd69746f3b6e9c288e0fe4f6d5d82271499f657134fd401fbe076255e2be6a23ed0b69daf3941c6429dad8b288223b0ad390a2c435575cdd1 SHA512 a2566868f4619679d3b74b70592ffa6a04b13e38e3196c56bb1dae8bea0c711bddbccd778d2aba3cc0ee074c9b1cc0335222818f0d47fb3cc8109cbc35bb992e DIST colorchoice-1.0.2.crate 7924 BLAKE2B a4027d5f870b4d9a718ac3f9d89ce04e2ed38406658c4a55ffaf39ed0cb1ce7e1c691eb56c66596b519ca82309e8ec7eebac65e69394cdd277f44f9b6280d560 SHA512 f34d5f66f84e90f473b6b9a62a61a59575e712d3e9b140324683f80af42d40c1d079701aa2ed651d0dd95a5ac8838e1f6f6c034e2adef79509d32357b8093117 +DIST colorchoice-1.0.3.crate 7923 BLAKE2B 7055fe61677143f0d4445ed5f6be2cbc284c155aa6ceac04df6f3fa2563a225e440ba708bf40e298ad09775ab7c7e1842b5f6dd78422b06dbd1250908e3227ee SHA512 fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14 +DIST console-0.15.10.crate 36449 BLAKE2B d0d2f161ea045854f0f53af39490c37af170888241b2f63bb47749b288ac387e24e52f936651763a5584a20bcca3512b28d50cfc4435d97ff06cb5de20768e29 SHA512 2d4b99912215a1e7083ac4cdd594f6ef7914152c683f007babecde2be7f3d6c2a861a198c9b4306242d84722d44965185ba846041e2ef13ee9ee9a5d43c370d5 DIST console-0.15.8.crate 36364 BLAKE2B 467de2c2fbfe31688cea20b338558ae9671e50ba1fd07983d21f32d7eacb73e565ebdd6ec5e78b2ae04446f09615c70983c0ee534e25ca5a28fd1b408acfdf34 SHA512 b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 DIST core-foundation-0.9.4.crate 27743 BLAKE2B 5b695e671cc833170bc6bad436b2d0d8d386ffb8181bfcf2e92a1d93cee67c3ba1768cf57064fb91b0897c6aec1be7db40b5bd256a052c1bdaf872ec19f6e15e SHA512 82d0878a1b9e3d56b3666fb5a78f92c6f7806d01665c242c06a640bd6b1fd36260211e92dc05e1a16d1430622bfdd650aabb0b5bd8e5592f74abdcf412448e33 DIST core-foundation-sys-0.8.7.crate 37712 BLAKE2B 0e1dd99a5bbb0fe92f55181a37426f6e86445cb20e355f553b3162c88ccc075644461731a0cdcd93dcca65b6cef1de62b409afbd73ba3070a199ab8e7422dcfa SHA512 17492d5314db03abdb3b1998bf0c396ec8ed0f83bc978ae22d6026afdc86c50b58cbac073b3a0d97b92da7e98be11302faf1249d24313494bc058add4f4cb63a @@ -35,30 +48,42 @@ DIST crc32fast-1.4.2.crate 38491 BLAKE2B aaa3acca66e5814a45f12a90ae09f6ff5fc14ca DIST criterion-0.5.1.crate 110088 BLAKE2B b99018b6a6f97fe47d90a2135e3d483ee624d43088d7881bafb2c35ba385629f1a4353110bf190c04903abc4ee99ad1735bc9c5afc6c2854a1aa9221fd714617 SHA512 6a1a32437bdb95f8472bafb5b04bb5999a6ff6fee4ca5965028ec53b4867d01b529241d01809a003722ec7d5710c323274b6f3b50ca0935919a9dee693f4d3b0 DIST criterion-plot-0.5.0.crate 22706 BLAKE2B 28a50375f2871ce6f168aafabff46f4368bf55cac379c67a2b4396403259372759dba3355786e695b566b1cddee9091a469755a04c06ee949f00aee8e9a28699 SHA512 971e96dcc64a5afa7488f1a99475f0f5639c0ef63f9eeebcada351868697cbff397e99827cc07c0a52e7d7d1a87856fe1fc48c22075776b3bc9c94af62d79f14 DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864 +DIST crossbeam-deque-0.8.6.crate 22471 BLAKE2B 02b854df171b0430ca8a40349674ff251698d0c322c317055da8678da6661730c945d86737fa4947c3bd824ffe402271ee2f77fd6a505d2d46b4a41454c510c8 SHA512 9368c0c224c4b84356f1d422d8869a5ab4bfb36b0ff69244a9e7a7304ed51f034001cd9b2bc35849df874d36ed34285c66574943573522ea32bbdc5a05df6989 DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 DIST crossbeam-utils-0.8.20.crate 42487 BLAKE2B b50da06721cfbfff07825574feada8a28d3814edb218434288683eec31bddabe2ffbf7e5ef1281ee14a8a77c56db3b66f3c5ceabaea9c72317c1bd2cecda0c26 SHA512 7175eadf9fa7c526fa11ff87e40ff203f0e7a4bcec15cb972f924f3c7ff7cc20b6e2e8dbbc1ede142a0207cd2baa4f446deb25d825d28a54cbd25c263701bfaa +DIST crossbeam-utils-0.8.21.crate 42691 BLAKE2B cd9015c41f532eb3c90101603f32d383f01e6880718b727d6d1fe46872ae276cda685e1b548cf77dd22bb1a05f0d4c4982332c2bde90e1743dbd7f51919022a7 SHA512 6f4aa7ca10c20da291c4714b56ceb1fab1c06b03b2f4e28e474e9aeb95ab6615a25462dc7819713652c3b5f6a06fa0f24ebc92c533fcf35dfcf2655857d975f8 DIST crunchy-0.2.2.crate 2995 BLAKE2B 74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb SHA512 36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025 DIST darling-0.20.10.crate 32031 BLAKE2B 038c2a4d919a8e9ff6eff5f83911b40cf4e918ac27c90f313b6b9131c41770f83cc3901973fea1c6fea2886a8360f3c5cf73b807d14e579b8b8e87f15e3bc6dc SHA512 7a14eebc20e48fd39ddf7b8376dc937a04f561d723aba864432cabd5ab46eb189706b43e5121a7f4fb0d68dbfd044353875bb479d4bd5cd96b76e3571733ce55 DIST darling_core-0.20.10.crate 65015 BLAKE2B a94adcc6092a7a69728725ec4bf4cb7c163bc3fe0890f272bba9963c256697bbe1ad964d58a975c80742019c59d4e1b3e56e624f938576996e216d2f99e21f2d SHA512 2b971156b8c1433dd0ddb2213ee522e2fe9968a62889285d1457b5e733daa70a09c21bca9b8573d9c742026b4c06f4dd2025a6a196ec0b08b25a78d8737dff6d DIST darling_macro-0.20.10.crate 1874 BLAKE2B 29cbdc6bd63e4eb0731c8f8f0a50cfcae9a88f116f8cfc0068e5d3cddc20b42b7f0f20f128ffa0f7bcb8d72f0188b04b3838b8327fa6f3ab45de4cf5c3bbf317 SHA512 565b8d535248d9d88b49a58e2a210ecc70f1cd39bfaf029ac6576a9b2eac70a6b18b4930aeca746d76d53b745c6aa82172bb341c4844b3757fc7978732fc2f52 DIST derive_builder-0.20.0.crate 36563 BLAKE2B 753f2a7b1ad37e4b0cd94fc032109179f559352d5d754c0258a597c0b5f819e3383a30ed5c9414b24a4b12e917f41c23bc01554727d06f130f4bfceb3a952c51 SHA512 3fb085259b8219d07c88a233c1aa0e586f6c6ec31c302896c3d2900a062a2e27b4211023f544bf139df3f4f6157773f192a96d9f1e980bf1bb7bd2125d5a7605 DIST derive_builder-0.20.1.crate 36977 BLAKE2B 30a7d6c8dc8fb484a08bedc3d06d56a5b5e7d94f2f5310b3a9d43b5a81661ef59a7cb94a164e9a0e27c1d4be5eff7d5607def1464711f27355043c2894908561 SHA512 1464d6a3e941b6dbaa77b4b7cc45260a05567491fe9567511f5561ce4a94c6cb7a7e3a4b9802ebbf7b1b3ffa39253814d3171e350058c17038e1f0e4dfc28efb +DIST derive_builder-0.20.2.crate 36661 BLAKE2B 27679d1837dc87ad4103459df3be6ab42d4d8b70aa01a1552aceab82042dfee81d90134c9f940f0c1c62bf359c5a70128bb4bf7a62bc4844066f198c771fabe9 SHA512 75d08f4c106ee5df795ebc8be3dcf34dada037c7566b20bfb52243e16f288b440c723fd17343a654d2f170c056a4197704b9c6b69c8e0d1b250039bee43fd872 DIST derive_builder_core-0.20.0.crate 32579 BLAKE2B 409890428e291f60a22ee0138cdc1a80498c26607e576a93d1d23c9def454c723b2e7a21faf3261dd106d62dff83123ebd76c3de8b2a7e7ff0aa9e700720acb9 SHA512 b4564364bea1c98563c7ec8b0bd99f260cc2b382a3a8f1156d401c57383b815a4a54e3e5f2446ccb2665eae600d6528faddf31d0f65678a3e5274073c2334073 DIST derive_builder_core-0.20.1.crate 32295 BLAKE2B 6ed1d78089795d41c6c486813f525199088b62ccb27270e81b7ecaad2f1f2cda31838e6eba464c762ac8850c8a598d4b0392d13acf119279e7b6804fad751637 SHA512 f1c80ca9b772530c960f48aed9c8974cd64ba6eda41576fec548c780e9a8a2a1b2951ac0ea7be7edc932fcba72eb88f098c6713af1f3ff37c5d0b016d9db20a8 +DIST derive_builder_core-0.20.2.crate 31397 BLAKE2B bc8c8da24a0b7871c7574330230544c3fffddd3a00c403f076997def95ae882be99d5f3a29c4e08fe536af9de87751ad63a5ad77e6cd9587764d19dda174fb0d SHA512 ab154b7f116a21984cf8c9cea538e8d33be1680663f4578af37f7d74696547431e9ded07bd8ab0265fd2c4aba5937b948f57d4f9b60b96c840f5150e8c10ce86 DIST derive_builder_macro-0.20.0.crate 6308 BLAKE2B daeaf30f4548ce0796df99920515a1e6291faad80ee9aabe6849354a942650b5903c744daad5cbddb4bf8dd87542b773eaa1989783f5e19c69b4db61786edb16 SHA512 1239bccd3f752c641782aa99d14de0ee92431f46be8b98861cc416e304b03dd18ec875f592d94093189b571592d9fb10b322f7dd205f90b84574e37d38869a1c DIST derive_builder_macro-0.20.1.crate 6363 BLAKE2B 6b614f3d27140eab4496719fe2f46878fbba5b05153e61e7e406853a910873a811601a8937c9c5785cadc64eb3dfa758b098ab9328009c7bd8a455df63a95c31 SHA512 5550557f6a9e58e0292bb5ef68a0cce81a8b19fbf50cc511cd5c6519e5187420e20ea98cdcceb870595bd1383688df2c2dd8f6f3cde42df6e52f962bf67bd3fc +DIST derive_builder_macro-0.20.2.crate 6360 BLAKE2B 6c64582fa68d6cb8d2c865a32af74ebdfb463d449bbe5a60cd2139033aa3a74a6c2de1e3e5c18b4dc785e9f272971e893a3789ce3d0c1c3b7735f6082e5e76ff SHA512 1a5cdd75bbd6326147f6ed726fdc21b2a4e44db9abe49576d4b1ed067b0e56871cae148ea982b647016240392194efa4eca157d615ab42248d798396612b3d9f DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1 DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a +DIST displaydoc-0.2.5.crate 24219 BLAKE2B ba3396c93d27a99a92ff4a0f01a8d192b419bad25e48d9427b76260ebf2f9982291d77f2eb24d239c0b1fbb097e866a20bc46dc1879fdfc6637ea49928444a92 SHA512 5ca35fa59f263162389c1180331e9df607d9374bcb056cb04bc46c98e4d87277162ddb2335ffa8a8c5f69218abc3eabccdcaa71c21b8dd9081cc4146f266b948 DIST either-1.13.0.crate 19169 BLAKE2B d6223c76421babf163a694aa513fe07adcf4cea329872c02f5af5956e89b2c353a899f5708e5a2924e5a92d871ba748490350ba30c17dcd78dd4379e229f6e11 SHA512 72e803079bae621d282136ab1e423ba71415bf12038b6f386f294cae68a67ad9ff16e4fdf4344eb3fee4418e853f9cac344c248f6befa3006d1c954668b36322 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 +DIST encode_unicode-1.0.0.crate 56986 BLAKE2B 76e8915408c26bdc909e9ff2d59a1655344dcb4ca0e6accaf038434b7518f1b86554954fda8c7874285924c7d16cc81f62e68afcb8b0efc639407b558df1470b SHA512 c9a21d48ba9d50750789cb6fbe32afd903c583c9ef05a9741007dcdf64b1344735f71dd882ad71ab9e5f96f8839578ca53bca14d13d57b9e27b8cce2cd507359 DIST env_filter-0.1.2.crate 13327 BLAKE2B 96f888b30ec8b40032e588f8ac73e9fe23340af71d5ec69cd8b4dc2bcc272ecd64d1d3ab54bc57e7a71a44cbac497ee7ad3df52930dfe3c7ba7dd129df290b73 SHA512 b1f21a5d4aadfd940bde3e53935c04da48e48cd4f825cedaa83968a08244722aa4e92afb9fd2fdd228412754f040f7bb68f24e05c0bf9bf57783aec042808606 DIST env_logger-0.11.5.crate 30683 BLAKE2B 9dd2b461be5c5cb3411ebba8bcdb53a78fff28c54fafd21a0f8c3fe578ebc3882ed5df63a5ef9adf62bce00fb6360de895457baf75fd2ed1a6730429478c32cc SHA512 e2ab1f117227ebf8840daaff971c2533830c0e481797cdcaa055a4506ffef78fc0830bfa13295275c604273d494278d43440b987132f97ed6bc1cf705e05cd8a +DIST erased-serde-0.4.5.crate 25459 BLAKE2B 0745866c0780b8635861ac9c6bc545742d5b1abbc7a42e299ee5fc7092803e709892987b2a82b293eea5a610b410602c5f4f27be3503b7467ea71eac01bcb028 SHA512 56ecd1be8f756a852102eea15d6e79b6c1c5d39c87cac0a5595d050fd3a62fda6b2bd81b9370dbde806b3b1b1c664a994f968b418212d0453b47a458313968c8 +DIST errno-0.3.10.crate 11824 BLAKE2B f9976b538868daba3cd2d47ff2fdcda16b4a436ca767f865f23d1139e7f232aba263dd4aa38d573442c762999c8a8beab8a4a8c10649d21b49090fa65ced1ec7 SHA512 fa4b9a368f254cd90c6f69f6883af4c579829a6da6f31481a1b527ac9602c8ffcb5e9518cdc32c39b5589c151a20e75a7300c8a907d178346185ecc6e8749f3f DIST errno-0.3.9.crate 10690 BLAKE2B 8deb19cf0c830ff2adebb733ab961558cb4463f256604f9c76d5c5952f34a79b70dce47e28f68f459977ef34d4821ab5d0f7e79a7a110693700f80b49ba56651 SHA512 777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a DIST esaxx-rs-0.1.10.crate 175210 BLAKE2B 40cedcf5b281ee32e7d146763c727936af7825304e72bc3f7d39a483dab0faacbc81f3b2a303757f292ab119d7681da2622b94ad7c3f85c4e30215e92828e290 SHA512 87129723dab9588da3b0a873e47fcd1906c6089aa714701401c59d5d61fd47eca0bdad9778ac068dcc072b093688e2e5ea0cdce77f265406cb7339605be901a1 DIST fancy-regex-0.13.0.crate 85930 BLAKE2B dee797093765f8f1ea6b8896cd832983fdbeafb23828b896811f2657e135b71e374a713fc37f68ff128068d04ae140bb2864415db1edfa2e300aea04ef597474 SHA512 0e7ad0ea46ecaf9eefbeb696bc99aa725022d92f0f11b9f3efb8e81a80a058fed08816d3f9efb4c5fa0176aa1b649e13f5ea18d3352f75a7d2be772fd531f744 DIST fastrand-2.1.0.crate 14907 BLAKE2B f96c74c1da31bae35e5ae0a557b3cdf120099cd7f31475ff6ce0eddfd8d30baeb025cd17b661f452cc4d3fedde763621301545e28efa030b3be21d1d9ba8d0d9 SHA512 ce776a3d0fbc108017c93ce9bff7c9e7e65590acb149dcd55c2f349d2077ffdf5ac6427753732f60cd7acf141ef6f89359b2e7d9368016be53b24e8703e71104 DIST fastrand-2.1.1.crate 14983 BLAKE2B a4535b1612b103376fe64d71a393f7bfc37668c574d9122ca90a631aeb91cf0895bb030e597b79a80a4a37ea4d514c4c0836332030bb10a60bd971573a6d6ee0 SHA512 9a51185132c1c89fc31af463c664e996f431e607ce96676b8301f28ff11a99661d18025dd460e3332e373af68d20017d96481719746fc3c5de742d08d63aba3e +DIST fastrand-2.2.0.crate 15031 BLAKE2B f3fe05ed1acfda1fbca7ebe3da2b26d05a35ab782db693ca58737dad537c53d16142422a04d2d55a6f9fa9a76abe4454923d85f6948601394f39cea5c90e835d SHA512 de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4 +DIST fastrand-2.3.0.crate 15076 BLAKE2B 15c9a1c4f64d94c4bfd38ae139c6fe19b6b621a495c1b57209edd6d76d978eaf018ba77f356b5086c3f462a6de044fb5e3b172fc288309569911a17ec39951bc SHA512 267fecbb7459c8840f03425733d278dd6c4e7637b85b99552877117ed5e8015e094d86aa95841f77064136b7f382276c3cb2c2bef7b2881d272f4aa57c5cf947 DIST flate2-1.0.34.crate 109174 BLAKE2B 70fb087904e1e29243facbb9a01f05770581d91d49935290943797cf84c3d2b416a8f78b2c4f9277d86053f1bb79e858ab1d5bac427bacea9771fe1998ea498b SHA512 0526f2c7c061d57f5a39fec9726c547848f6bb36dfc977497c15fd42da6c300bcd332278c31e3acc0a72e897a7161f03deef61e95e072bf3cfe5b0302b5f98f9 +DIST flate2-1.0.35.crate 109188 BLAKE2B 8bd6e51c3bcc06044e5b8d7ead950c3beab6c6337052fd48e86175f0fc98c8d12804274308ee515dc6156bbedb2277dfa2706cdcd7baaf2a789122473248486e SHA512 aa2c4f0ad46cfbc7d2bfbdffd226eaa37f5223a34d132d8fb2dfd04c20d15a96c4882cc377fd72afbc7d13e512f5e9934386b0390a0ab2b171d081335c58fad4 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a @@ -66,12 +91,26 @@ DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d7705 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb DIST half-2.4.1.crate 50892 BLAKE2B c275a9ec70d2fc0c50cb63421399202d31252b0dbf463798ed0a12a17493817c66b8933811d483b348f8f945cb05aab7cc2a4d952bd16009c3da4860202e28dc SHA512 0bce235583ca128723186e1fb50f636b519bf826c942f02c5b969db4117baa87c644665c541991c16d1f1dd97c7233c017a513d45075fc72c5d99ccc7c1ac193 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76 DIST hermit-abi-0.4.0.crate 16310 BLAKE2B efcd1dee7bcd6d185cbe0051c7bc7e2776857ffcfd2adc3fb101febd7c1bd75994b7e4a4a0a59c5b4628cc2521b4c1f043e98a0c44935d0180e7499667690ab8 SHA512 b1a21f6d54598185a8e8c29565ffc2e1bc5da57cf1c9d87ba643d23d7c23d53e8ad36ee2f5c1ec8a504334b6f98b0f17a832ff37877c7b7f9238b196f4034e6f DIST hf-hub-0.3.2.crate 24295 BLAKE2B 0f7b8ebe62f4d210b61a6e2bc0b1d4da178e0a07ee47bf5fdd21047f0465588613606bba5e03b46cdf6c415ee2a88fc2a5b4f47a2566a1683c043603688a2cc3 SHA512 a6178ae68a5c9f65f0ac4f2054042d7cee85ad5b4ec97dd7e94057bf0b9eca6d1232b790355a4cda0edf91d1bb13d6de1846c4a249e7b9ecd62a431d7b9d45c2 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c +DIST icu_collections-1.5.0.crate 82762 BLAKE2B ab89336790ceafe62dd72f0aaef16a6eb47fa5e41424ed990e6c059ad431cdb3dcea943436aed0bf9c6eabd7aba12d255a2233fbbcf9cf5f666ef1dfd5b79a16 SHA512 127f1c91101ba69405b10a2590579606df766166fcf1fe6aa9a74c4900296425cba5c47a391a53a01b02026af5581f068fce4a7a400179809f7ed9922b94c0db +DIST icu_locid-1.5.0.crate 55131 BLAKE2B cde2b988f0af200b8e7851a66b8ae08881670ad6ff79c5caf5135a04c200e5ecd0acf27d8856fb0fce46d502527d506095f469c28f325b9b9d21d2a3657149be SHA512 4b85f0e7cc73166a542b2e502b3ffae1f30d2a9609ab83acf98e90b0edb37fa8ae4592f61ecf48a0ae0779fdd376abeff59e1d5cb97475012eda99ce2a97da57 +DIST icu_locid_transform-1.5.0.crate 29094 BLAKE2B c7bb5c5ed273a6a97279d4599f612dccdd796f3ae717411aa5b21949721989986d8b766041b9c7e49a91cdd42a48fc965effb8d7fb6d33554926d203a6535953 SHA512 1779078e2ef9859bee2bfd5414ad7e4b0f0a40e6813f4ccf8de2bbe8c764fac7f99ef001cce22332a8b3840af22e9c7fb7cc0341cf8ba61303794ebe87071e63 +DIST icu_locid_transform_data-1.5.0.crate 44727 BLAKE2B 7fc5408510886bd7b7d796850a542f2c1d759d2c67492b695245d46b34930e3918513cae2699963f603d2bd02484960b05afd58cefb6c3152ec201880366d44a SHA512 1c00fb962eb4b8c759b1120313bb890f4388d579890d7450b798d6266a7d6adcbbebc8a8dad2f267668ca6f1c059d0bd2209eafbe2a72f4558c85258eba57405 +DIST icu_normalizer-1.5.0.crate 53113 BLAKE2B ccd58f24469da1f237ed9a349f0b3bdbb49b8f5b1995d6254c6e3eab53a71208ff4a0b09bdc68082cdbd288df66499efb19555f41d12a19205d724af22fb504c SHA512 22612b86a24e3ea222469392763ae9d40dcbb37191dd8b9fa1c64332463a4299a53275a1cd3deb7e0f057d137f4312d990762f9925d0ceafbc8839d67c425a13 +DIST icu_normalizer_data-1.5.0.crate 50561 BLAKE2B c7b8c5751c6d6df03b23d63855335ef67b34a0b13b15f1f8a8986943b5131874f5205155889e12253692b39918256fe2cfed70dfe2087011683ab9165a5fd786 SHA512 222fbb819791fb4ec7889e45ed3032ac8d4753e2e9cdce9d0b3f79128baca5ce64157a8a58ecdf39cfddb6c2395001e3cc8828ed51803e85cae133c247cb338f +DIST icu_properties-1.5.1.crate 64479 BLAKE2B be7d3a1663664095f4af654723ebc74f385a6423fbd3acad325ba0d6188dce9d9321eb323c1b1d8e6d75fc9aaef3d873b609d7049525d2402456c6331bcbf486 SHA512 7e347c0a02a41a3add950290bee90a339091a713546d4369c2995022e64f127f54204b0d46cbb88f396b3bccbd4cf12720a93d8551b73926f78fd5ec01829cac +DIST icu_properties_data-1.5.0.crate 227993 BLAKE2B 3b3141507077dfdeb4f89316e63e1a651fc5570cda58c6c2d566130858ff67f900c3b151113e6303962fedf1d6b6d617601b21a08c4c0c98e6bf135aace6f299 SHA512 c651d0a50c229acafa648ce234a73bc1d0a85a8bf2369fdadaa62badc741c35e8a7d5392fb1bdb7b720fe2e0f883d1309c78de4ba913691969e5367a4e8bafac +DIST icu_provider-1.5.0.crate 52722 BLAKE2B b1e53ac677e2db5870df0a91de405ebbc635c3f7931960f3bd744b57350c7536116f3861d4177faed2145b79c1c957d79815fadc2dc85faa656a1f0bb338a16d SHA512 6c11d89c7d2b788a44757f02b0e298b558ebe174fe917664401d91109cdc7bd1aba5526b3cdcee1f066018de1b775bc9dfc294bdfb40476c53d552bd6f29d6a1 +DIST icu_provider_macros-1.5.0.crate 6436 BLAKE2B 7405924dca41db72ce422437434a4affece69f888e5c18d2a92f761a8d83b180f40c8de9a34ec15d0e107b63b2fe0502cebd0a0ae6f98d9d6ee37d197e754703 SHA512 a0dd58d731556a010428fe4aebbc9dbcd626b46d380cf28ba5236ec8824045a20f6f2ec986e0c1e791bc8bc2b692a10306f448279f079b4c37237e4a3c3cef63 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST idna-1.0.3.crate 142515 BLAKE2B 6835a64772e5d301c2456a94f8f5f40ebe6828aaeb1d48e3fbe015917dc3ef95ac7cfd0e1f1763e23950482f4b46ef7987928c8dfddebab63947d5a29fb490ac SHA512 e75ab18297878df11d82bf3623b005a3dbf7a6fa38c8f78830c219adc7d6f4ac07dce24a5f1186de69035ec316421319e487396cfacb053674137342d72a4126 +DIST idna_adapter-1.2.0.crate 8206 BLAKE2B 5e8d7dbfea699584542cde53039df9d8c3dd408efa2534f11fce7086f679872c45d9905d6b2cfe523148eda3bb0cd4820a7b14317f91725f3d9cdb475aafbd57 SHA512 1d8b54c19878645749a1bae768dacf353b07d266f2cb3bfa1071a7afb56ca68f534dc1d54cae277b777bc97e5986f297cbe2051a82e14f553ea73cd723d9da7e DIST indicatif-0.17.8.crate 64869 BLAKE2B c534020b2c7b25bb07cdd0fd4414fc817506647cf5b8e2081c22be58857d5adb170082a3756004c69187619fc5625f8b9a1904566dc51c621838e09ecda5b43e SHA512 487e73445c5c7d3c16d6f93a3d9767f41b37d2832e56851154f8b69e678ab7d9ab04eba225a6bcf8b48842ae0db0249b060e998e29a252dedf8afacdc88b1aaf +DIST indicatif-0.17.9.crate 65246 BLAKE2B 9ce758e7dbafb3394d632a6fca910ea3d1237309ac9bad0ca1236cca9563abfc442509ca96fda1cc7be6916875416cf2b85390c53266f59bc18c6589addbeef1 SHA512 a0d798fa86cc4b75d080bd233e274d6554d82e1532b3590d27b9fcdfdfde4da2717afa16ef42b180ca0ad43ad151db8b0963890de106e36b6bdf07f87a519bdf DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f DIST instant-0.1.13.crate 6305 BLAKE2B 83a2c479e21e789ca9795f66116ebc55481a42afb21f4c0ec0551edf07781901a28978667e92b01355b43e0e1a7ffcd3cc37b5501a7521da78f4f352e586c9fd SHA512 b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9 DIST is-terminal-0.4.13.crate 7665 BLAKE2B 47a024e135ca4931a04a8dc8151f999f816ab50c924f17321af4295dd84fd51bf98ff057de967e646a461c1cc9ffbfd7ae245a9021b3a77f3812f43707b44aa2 SHA512 ea5b18dbfc965b96a27086eabc070747fdc557a6a9acd06203164e846c2f390c4bebedb29211ec008e060dc80b10f53de6d6cdc822d4f51a543057736fe33448 @@ -80,14 +119,22 @@ DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a4 DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8 DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 +DIST itoa-1.0.14.crate 11210 BLAKE2B b2d33dc384757963eab3ae7d80bb672d828a549967986e3af8c70fe71a0ad46c4a278da2db4dfccef99e804e6cd4934067e97c0697a33ac3302cafbc46eeb416 SHA512 ea2d38df373652ddacccd11e610dfdad4e3ae7f0d476514e6ac58092733c817bd834e8cd88c3bc4178dd5a646ba628ae626195e0aa407e8534ae3c2a7b049987 DIST js-sys-0.3.70.crate 53863 BLAKE2B 15e75a94a2b7c77ff18847f98f76a1442b6e5f66960f3375534440c382a255e6b16ba3cb8c5345365d2195f7598564bf856755988f1288eb1b0b964e26446e21 SHA512 5dff8e790447a475b3c0a7068f0bdf1cced5fb8be2d66c92cb6f6c799f9d807f9d3c498e4f42c67e16d83dd4bb3be70472ece20fc42c3a8c8d57615ac8d398d7 +DIST js-sys-0.3.72.crate 54096 BLAKE2B 76c1044b7684ccfbc06c6d43541fc39552c058fda5ccdcb7154c930d03f5260706ed42b36b305e56c5a0eb0dcee27180d3df3fbde92f3b7ba5104b0709f5714e SHA512 5a83d711a02bead2d9c05aaf8a7e3f351307b3219f4f6697bf190d9a9b36bcc10fd33ce0a334e4f3e251d52fc7411020a3631d0874097e9b519e839b713e1c42 +DIST js-sys-0.3.76.crate 54420 BLAKE2B 8d211aee6d8af87c339250e06e321bf02d2ff313b80505f696f66c43298e2aee8286076f2b291aa853730f8e1b9940f09c56535d3534fc7990aeb16653844250 SHA512 54e9a6be3f5a19021351d22d655a3aa55579c80f1453a99aba5989fafc7429078dea57ffebada4240b9185d3260d02f30da250fa539ac12c4bdda975adfe0dad DIST lazy_static-1.5.0.crate 14025 BLAKE2B df29e0e3d1c061815bdd608b41074436024dc407d454f32517705ab04b2fe06075e310086c5e4961df0b4885e91021589d0bca2c1cbe6f0aeffa3ff1b3fd4637 SHA512 6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807 DIST libc-0.2.159.crate 755366 BLAKE2B 70f46eb6228b4a8958dfbee00cdfa3c7d218f30d66c8591f4ccc9c5d8eda411d83ce9450552384ac4bc29deb2869561a2111dd157c9f228f617baf8f6b537bc4 SHA512 c803939ceea5ad9bdfdd122726c7a5f12ffd8b0cb66cf0bc62c9670e1e5904a504def388c1e043c520f4ece484addf6dac465aebd58578aa6b79995077bbdf9f +DIST libc-0.2.166.crate 760418 BLAKE2B e4a81e82d139d03b85eb061439f045f1965f6260dc4d4a769f1db19e5d682a923497ba2cf041ebebd46b90c627b91cd97f86250d8b1854945b4f2e826a04d14f SHA512 55a484456ca4d0fc90e488c5b793a6100f160c9333f0b4173f21a49e33e2ce3ae28d74eadd4f2e72e51040667f0a2a93d7edcdc727fe266ff35b8b37608cce2d +DIST libc-0.2.169.crate 757901 BLAKE2B 1012cf93d8975aa20fc3f2332e253426ff66be6aed63ace5292cc8568ee419b0f1a4b5b39ddbb78d9c2dfd8d72eb0d068c98faa229ab55556da5e674429f0e97 SHA512 c4566330a7967efc211edf31a23647d1a33aa51fc25aa4e9337716748c8fd4be0ae63679220ff2cf6e892f37d03bc5264c55e8f082eb82574a6ec1fa8e5e45ce DIST libredox-0.1.3.crate 6068 BLAKE2B cf09f261d3a945d290ecaaa724903e0042d66eca46dde8a40c261ccb1e82c0d6b9926898eadafc6313fdb9f19cde56377b8a9179935482559c4b9707e327511a SHA512 c62142fdca92388664eef83fc89b8607e2df318cbadff6edf9e3d927837853d5cfeb54445299a82054a0ca81853b0a33536966ab26f1f2e0fa43b39aaaf67c49 DIST linux-raw-sys-0.4.14.crate 1826665 BLAKE2B 804af73daf396bb20da14f831f26ce06325181de14f0c277350bd22d21789f2bdd663a964cc0e7c5cbd2e084285d02a401a6bfbb3e8a8f079c120f9488b56f99 SHA512 28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7 +DIST linux-raw-sys-0.4.15.crate 2150898 BLAKE2B d1936eb74377d9bfddccef3830b56eb716c38ea3cb7e13b73325dfd00f9fc0df74bae49e4214dd7f27c257403b8b12cd1ef332d53336279d13f7e9497caf4135 SHA512 b5c39181fb6b901abddd8b2e7b449142e2e5691cddadb8e6b74ddc3b53076b1d410522cfa45af68dd18befd24ff12313c2494cf2cb0cf142e2228bfe42014309 +DIST litemap-0.7.4.crate 28257 BLAKE2B 52989ad353a782e9592357530dca3504e3ef5475bd2f1b2c795b60825d971ee6d3e6da51fbb6bbc26cb3c3303f6a751a3e15d1caa78c0cb888288a965666279c SHA512 5009c486a87b2f52237e15e2e772365424e4780c146776656d8e1551e52bc8e06e5c1cee8db1c59ef20d0463962fc07ba5221a46020a82df17a2f623a175f58f DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7 DIST log-0.4.22.crate 44027 BLAKE2B 831dc5092db05123bf2e909eafa708339983edece9bc8cb802f0ab418d47ddc5045a72c1b58bc7c46ffa68080eebd0fd55d6e4f5b3d5ad3b0bc6b2ea0dcaace1 SHA512 bd7baa9c8a5523fd0864a53bcde955d484cacd782412b5b02c890b89dbf62137624da3a27337a310dd8f62bcc6606925a42bbd4ca161a3b7936ea4ff96bc0d71 +DIST log-0.4.24.crate 44882 BLAKE2B 24dfce781a5a53fb214a6fd7795d5c593fecc7b1c20bd2b001f135101c520296b4dfbbb9677bd3e82b3655a9b25867a068eabbf22c77c2e67077f7938c51c1ad SHA512 1117fb0b868d48f26681c7fc2a4508eeb6dca0c37deb25dd065a4b9ccb6a014c4d43d75b817d58c98caa9db8ed17d66c714b67b16d04802bad9c357fed4720e4 DIST macro_rules_attribute-0.2.0.crate 15408 BLAKE2B 3a568de49448ec1aaf2abb8c361fd84d2b257a05579b8345cc66a45ecf111e0964e46d1510b458204c95169a67d0c8a3d41b604afefb8db9f642ed60587ac05d SHA512 53dd3b4d271f5aadee7877829660bdf9a6b89f1173494d102a5360866721fc6c02b9bb1c7fb14f50e214bc16a59752e69eedad5dd1d64411a1fdda76f7d62afc DIST macro_rules_attribute-proc_macro-0.2.0.crate 8264 BLAKE2B c885432d9334a3aa2c1ac66bd3c1f1e186aa259a449aa851a0663b422c9861365216e4dad10e31e7608fd970391508c9ad8a232272057dd9268e0e0299109b66 SHA512 6ce9cd867b5f6fb8459e3103688aa149275718a5bb2290994a02cbd7ae49aa23eaea41aa7247a6f9b15e2572bc95fc2f94c26b401e28a76e229a0907da6021e3 DIST matrixmultiply-0.3.9.crate 57819 BLAKE2B c13f0edd4e33f9be4e562a8ad79eb4b0f42384ea6652b9e8b8b8435cc42f6ac8ff7e425a3b690b87b94ceae8d7f8ecd2d9acedac9591134a24b36cf479c14e4f SHA512 0b0a3433e81ccf7f62469bf478c430abb8b18cf499bae389dff0e25945b569810197eb110a7deb69cb8545d668350d1ac79414c82b3b9efe5e3cae4dc4c602fd @@ -95,10 +142,12 @@ DIST memchr-2.7.4.crate 96670 BLAKE2B da38114beca670467c3e1fbf4e415af6f22d52e322 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c DIST miniz_oxide-0.8.0.crate 56343 BLAKE2B e4abcacab4c8698d0489faca8556faa7bff53d272ea0c80e2e7843dc0f6f9229b7d5b0a17ae210344722a379853e7f14212505ee05da4e60549081cf77717c1b SHA512 044b641ce6d98d1968c1ee0906f91963f9f524d6f3fdf3059708177a759e1d498c63e595d3a3f0f9f3210c45c828b9b70274134ba078b899d7fefc2bbddbeee6 +DIST miniz_oxide-0.8.2.crate 59068 BLAKE2B 22808b2137b4afae29cc5cf25d9f643d24824293524542e2cbac3ed0fb0341417c052310602a6f0a003843abdbe7715a95a6068c807cc0c843ed867958650215 SHA512 e58802e332a72123954ba1751cdb59509789bf930ad74da3d06e2c1c3737547fc0b9848be816a66b6585830786b7a0fce7c9fb574789e15f3b540709563cf854 DIST monostate-0.1.13.crate 14073 BLAKE2B ef0644850bf1d7cd2bf967f60358a231d15bf5037e8a196e804ef41437b1543af36835312296ee8022124fc20415f44ec93b6c3b998db4bcee7232210368c4bc SHA512 be6406f2dd85c8398332b1cb273816e7c765b4f8195e93c5ef2573e7445460b0368ea1d2cb6a6ba7949a8ace9eec29adf567d8f83f3fb368e11e007f2686d331 DIST monostate-impl-0.1.13.crate 7302 BLAKE2B bebb66e9c56341104db80a6ff1dd503b5573413be97cfcd23a6ec6e1194c6567b82f68466f2f7335591f71d0b090e031ed39b0db25e84d9329f905c53f4d5be6 SHA512 0907810517277e03e776262c5345df512e45b27066dc11355589060a98ae068e8d769c7dcfedcdc122daec089aac49e27912fd6f5eb2778f0aad423cfa4fd0ce DIST native-tls-0.2.12.crate 29517 BLAKE2B 76f4bb2aa8fefc306a04ff50a62d6617f71c3c34aa83ed35f11714ef2306fd82f76c7e26ab7ce50f8eabed40602ba02589dde2d98b55ea6113b45cc539c84bb6 SHA512 15fbc9d02134d3d55334d2f02fe4f64be50db991d75720b38d802088f06cf5f844cba6b25dfd7beb92f2cd367ba477ec2098e3c7336c4e5a5a7fd39c753fc723 DIST ndarray-0.15.6.crate 275225 BLAKE2B f17e028e7d57670f136d777dc2bb720dd52bc3d9fdbc0e2de5f5c2fcd9f6310f0bc39299fadbb53e0d1588e1e64d9f2b5daf20e30dd95517bbfa597b9572581f SHA512 19037ba1de0ea5f8e0cba5d8735d6192c1674007529289a357e9c5e036a1af88b48ba8a26b4929663403159f6700bd00d04becd9b1fdd4c07990bbeddfc20ead +DIST ndarray-0.16.1.crate 291026 BLAKE2B 18ca2512cb55388fb4164caea89dc2ce4569d03142ffefeb868381d256513319e4a0a671a6cd95d01597d0a02c3225cba9f674551e92594bdb9a3b1cdb5f090c SHA512 59fa8944b79933d205e70d6163f136e9c58f33c786c6052ba5f3e6ddad4d67ed79b2f08a07e405bbdda49a94d2c17dfcea2010cc49bd114173248ca285c4238c DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043 DIST num-complex-0.4.6.crate 30352 BLAKE2B b9f0465d53e8e16edc44187f8efa40681377e75fc4bbaec2c9fd8b8f5384044c3a989106ed3cdb740cb86e19659b34e4b38e7cfd7bb01904e137ddeda3d0b6b5 SHA512 11ca2c28ffbd15aacb7e184b7f3e09cbec9c955738568c1e0760c256c72b230cae7152403d834c8ed9358e42b724269e99313dde9a23027a6963ca176ca45615 @@ -106,14 +155,18 @@ DIST num-integer-0.1.46.crate 22331 BLAKE2B d88c9f84e5d803a3aa8f44dfc1bd6d9b5e33 DIST num-traits-0.2.19.crate 51631 BLAKE2B 78637360cbf32d172510a62bd9442708af9730c0296a2bb4ebd200c08facd49bc31bf8ddd58967e0df7273a938832b620265d9f8f4d26ad16049bf6dac1cb4e5 SHA512 180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5a526042963d52cd582ff23c2f8c9f32b4c445ef0397fc402b6d047e031d8e2c67ac97e191bde22e17662eec3a554 SHA512 a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df DIST numpy-0.21.0.crate 76859 BLAKE2B 6900342fe71f557635b94a941c9dd317024047b41ee55d9fd7a3eca2401bc2734b2902999ecd2e6b3b5783ea6398674cb00e0a6173ab15fe5a4157c9de1d4987 SHA512 27cd512692d7f9188844b9a351224ca1a87f0f8d90a5d288fb1e1f62fbe66807e1cfd6529226ea1d5dc27725d1abcce6202ffbdcf25c130d3437b0cd9bc4f7e5 +DIST numpy-0.22.1.crate 82267 BLAKE2B 64410f6e39e76e5902aa2c9b47374ea2271e8f0b2ec12539eea912cd1d8a26ec550a312d88b4aa41a685a49b9a2e20c2c76010e6cb1b534fd9586fdcc9fb611e SHA512 68e0b08d2ed4256e87dc4acd81c42290e0db6e47f54e85e90bc001509aafcb99bc28984d02e8ed09aded009377eb882e8d07aac0ac228e78f97f77352ae18dcd DIST once_cell-1.20.1.crate 33345 BLAKE2B 7e56d7dd48120ebe15ede12456197ce82bb2794df5aef1ec7319b2e11ef8f601d8d99c8f5b22aa906c7af23b0119ad17b3a8b4bcbdc3e38a4d78504aaefd5a77 SHA512 6fc961fb053777c584fa7895e20d260803059d67fe172e75355376ce1ab2f8ad3be5158ad58ba1a31b9a33ebc180e00f07f7c24ae319830e101059c5d2377925 +DIST once_cell-1.20.2.crate 33394 BLAKE2B 79dd394fcf1637adfef28b4159ec653c8b71d2bda0e0e36a940c04e3d87698f039dc30c97f26648ecf0d9742962f1f0a117568f7c705a8a3fc167085b0ca3e80 SHA512 bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 DIST onig-6.4.0.crate 32616 BLAKE2B eca949c47870f260310c69302c6a0a60b9329f7324281433170b0f6fde80f91d49267307825652830217cf44b6a77a741f526a3bca63a12fd8f28791c14a0d5c SHA512 5d388d35eaeb4ba4876b5a683010e4e38c7c54abaf15c900681a7c9ed199b6b7ff414aa1d6246153546680eab28505cfda359c3d5df5b9fd3a5cdbfba35953bf DIST onig_sys-69.8.1.crate 638216 BLAKE2B 08d5f61f4047cfc841ee9e1881deeee49478bdead87483595e9c81c722e475d137b8cf5e1caad2965ea411d3211738a6848896128b5fa1f727a0a175ac217d05 SHA512 26a7dec69abe1535d575e7db63448abd898d363ef42352605e7b7d046b5abac5733e3cc05b7d442ce67db9366dc96d4a7a82a7f486d3b9af6d298b49b0baa864 DIST oorandom-11.1.4.crate 10201 BLAKE2B fc77678ec202bc5ef7314ed876f670575983612db9cc94ddec4ad7e9f04e2e2742d12b746803b33f1dada4a10c8afe19210fbc337803ca59a0df74998fa6de92 SHA512 8d5acd7b344b1eb9635ae597b38d65f0da519366664f02bfd083d37b5e9c88f21403066a8e93d8a61e843e06ad9323cca9796058aabd901d0adf7e7235c17562 DIST openssl-0.10.66.crate 273705 BLAKE2B 7892e96dac3b24ad5622833b4061bd82028210f9f26ec9772cebb65905ff6e45da8b21ad1aabfb87bb5610f534018da6bd20c10eaee8c189dd08a7ebfbf12b4b SHA512 2f4dd6e40dd8aff8c04563517fabeecd5ac0d986764649cc9af9bf4ce25757a67f75655eee207703b46fe57661a216ff00144358ffcbc70525447a063fa086c1 +DIST openssl-0.10.68.crate 276578 BLAKE2B da7c42f8a87150c76cde12316fe1c170593e76a4bd55176ca5ab7a43c57d5457246bfa91bf7bbf73ca47c87a066789226529fb7ad57c5e93c551baa67f6a9eba SHA512 2b0c7f5a888b0e398ebee9c0fffb6fdb8408c36f96eb99182ebb9e162106c012334554304ddaaa6689d3ae41cdf638ba08187a40088efb95a5e9f6aca032a22f DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c DIST openssl-sys-0.9.103.crate 71552 BLAKE2B 4cc1ab93f5a444b4b985c84f6ae90f345da4639e4ff7c5502dc1ae59f842d46e3855057a7c05855f7cd739b5311f330dff361480ef2a0102fe46471506956148 SHA512 61b802f6baf918ec055be90ee47c69fe0184f6d9a1d29c748386192a11d4df115758961ec9b636126a6b42d7d8f7509248c59f7c035905558c4cc35b804a8eaf +DIST openssl-sys-0.9.104.crate 72287 BLAKE2B d9af8f2ae8a8dfd53b3bb68433a4dd2a4b30038858ac58aa98d7a23b2d23e0b7c7d8fc36c1733d0330bcb9f51284667b2c32fc5a5bd4d9e1a5df7b98d610a997 SHA512 e812d5323bc0ec7376f176a980dd9856dad6d36513e854d333b93ce8a14c20a9ca61be88db82ba2a8ae4e086df5c3fe6965ed10ac155eb7b502e0225c0124278 DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703 @@ -121,22 +174,33 @@ DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac002 DIST paste-1.0.15.crate 18374 BLAKE2B 69ee7def55e658a9aa72405bad62325e8d6021a4989fbf11c88d1bf05fbac520f7b04d467bc3c6eb45043a41119f65aceecc4a6a1418a9192d73f33134545062 SHA512 5026d3ec7141ec4e2517a0b1283912d0801e9356f77b703d954b379439b8d85e3886d42fb28f7835edaeeac465582da14233564fb010c71425a59c9e1cbd46b4 DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 DIST pin-project-lite-0.2.14.crate 28817 BLAKE2B 8e9875967059faff399fbffff82cf8835982c46ea8df942acf50b038e3f500e04d3d8cde39da5a71ebcc38b869553f8c49830e484d1109b353247a4cfdeda89e SHA512 f90a6b9f5ab8701718f72677a4f3597c1b9f32e5fa53198b47a94696227ea37815997599abaa6058b217c5b32a94602582c6b13fdb66e2d683bc98921de95293 +DIST pin-project-lite-0.2.16.crate 30504 BLAKE2B efd0b426fcc6ea8852bce499fac61f9755a11c6a2999cbec514f093ba7b3f94b1f2d437ee9abb243e31f3838ac1c74491a212851d7798eb249e209b35e015332 SHA512 971adfe54cfed304647fd944c1c915e78b37eaf0de3a582fb984a5e91f1b7d4db2cf0f53a9a64b64427062d4b41c0a36baddef782411a76ae3be0f8ca45f0718 DIST pkg-config-0.3.30.crate 20613 BLAKE2B e14dd544612f74b038bc7d279d629034237946c261e3e97621d6ac910a12f4fa4e75932dbd5d3339e62325d0ccf33002b07f04b0523f93d2bd3b1a919841ba66 SHA512 e4bce232e1e1cbb17d1c08c3de4dd12613f5a5238f831c2a765b6ede9b494e647d2416a7d9a0c926104e24066dd1b38df8df98a6c55d62f25060f80eb33d064d DIST pkg-config-0.3.31.crate 20880 BLAKE2B ab7676e810751f89639b60ae70bdebe1d57edc76319f83077c3680049a701a26e72e8cc485fe77cdc4346fe3571d32c59e7384c8c86fef17e00d7d81df5daf43 SHA512 ac3e8062ee8831a4e4fc717b5247dc7f113da7bf6d64ec95cbca7875959a2afa1497bf81d9dfc27206b5fb10027a2509d51dd9ca1c10139d7b4c78128864fdf4 DIST plotters-0.3.7.crate 149031 BLAKE2B a53b3aa85eda3ac2278cf49c4d701642b37a5f52a3a013594101388d9d104b96e35f542ff6b8ee33bf711fb64c8c25a48c8f10b3c12e70e6e57c90fd30cb9b5f SHA512 526fa20153b445176efcd1314c2e36963561e267c566223ddbbcdaf74340aa821e9c0174c15849c55f3cb3177fd5e34aa9bdd872888476b7ff0a20ec3c1a04e1 DIST plotters-backend-0.3.7.crate 13709 BLAKE2B 7ba96de1435beaffe0171dd4fd010f84d0bb6bf0856adb05da87dd324a5834aee3a71545a019ac899e141cec32cd15e395c56d281f498430e54b6715eaa46761 SHA512 5b53e5d369f39748d45269c82c87a0731cf23666b88d7e407162602c715a01807ebc50f8a90805f417c0e7e74dc511d1d7861052835beb8a9d548e2f33c062e3 DIST plotters-svg-0.3.7.crate 6715 BLAKE2B 1437ad7e1c1b3e82ab1f58660ff6931e510f6ea5ea6cae6eb48582d4652bc65c5dad518d3312e25303651c03d90bf56d9abac4c2e3979f8290b4cb35c0b6ba5c SHA512 9a60e19026edfad359a7d042630b60825d7723855fc0c17881ac880c29160a81449ca672a3ae5cea4405293947ae0556f31cb37f519dad4cef56353248350cd6 +DIST portable-atomic-1.10.0.crate 174760 BLAKE2B 9a05d6162c95f5140709cbd005c1997449fb6373700e8ed3966e3379898e95f3cbdb90b387f1c7deb3f1eb33125378852a7168d0d22b433813f6c082112b0365 SHA512 fb47ab53fe240d5b0824dd068c6dda473d3e71ae6f5dfccaa17262a8b6de0e1dde05d83975e53bbfcf43f10ef5c634fc024f94613937927ae93f1adad1dadb19 DIST portable-atomic-1.7.0.crate 145385 BLAKE2B 7d9622d636677e3adae0f909405090318a9d6189fc18683ed21074e9360f213b44c5213f3561e3dd1f642547c2c2e6682b9e1efa63243c1f12636bb11bd15dbe SHA512 0849edaa7a1f9ea66182443e31691e7839c857240916521bbd6009b5e692b13f5b315df36e656134651386bc50d895ecf6155a906750009514cad8bfc7e57fe2 DIST portable-atomic-1.9.0.crate 166365 BLAKE2B 9abc31364770923847dac16f532452bc8783a5068c0f757f79122bc5b68863b58c0acfa12d28836188413c2f0b61d494cb53fa07a57e199ecd4910a2534c5bb3 SHA512 1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb +DIST portable-atomic-util-0.2.4.crate 47043 BLAKE2B 6a8e122bb2b9eb8262e9eb790f336dbb602f6c086f8ac025740c043170360d5474af578b3842b06ec51535535de3f4d1b6753ec54a6871dd0396f5c1012b0bd4 SHA512 f2266e78576181123aaf68e7b5d3523a368fa8136d447bac68a08d65c7051dea677cea84491a1a03b9decb4704b2f9392574d68dda9427092a2ac92cfa0affe8 DIST ppv-lite86-0.2.20.crate 22478 BLAKE2B 9d68dc36d8148047d571c0147ed29f586f3c6ac9394b56bd955c8ae5bb18f5a8da5369809f7b8c3199074e23660325158c32c62e1bf69a16cb1f5da2a01f5df0 SHA512 6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1 DIST proc-macro2-1.0.86.crate 48958 BLAKE2B 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3 SHA512 1cdb7e22a35ae231d880c9420784c9acf97bda2db258b3d34aae5061dc1858449defe19a49e12c6a4173906aa72a4115059ac2db0fc760205fd2ab8b5b414434 +DIST proc-macro2-1.0.92.crate 52353 BLAKE2B 9aa29fa6f1c56c0392a94a81b4c61953f4d185012cdca37e356817845535da79d7094bf43472ce63109ce479a2fd0cbef4d802afd61daf92c4db303bcac60e7e SHA512 e614f08acc0a7e97ef580479cf5b682378df1ca16f09bfb2296ebb3490a435229dea9d682c621c54ce57e8e1d3b7803eb8ff83c88bd02e07228dba6d02f14aee +DIST proc-macro2-1.0.93.crate 52388 BLAKE2B dae4493215b88f68cc485bc0ae80f0a48ebad68e0260839b1c367832d1ab778197bf040647b3fe36cfe9d5f7a496e05cd71b5914f531eb129c2d458d5f0be896 SHA512 1ae650e390e4f1b18d05f42d2ffcd025cabf72568a326cd85496c722600108b0aa0ab0161b39fcc931b8b302427f678650e703f4db57aa1a60f1751db881dc6c DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53 +DIST pyo3-0.22.6.crate 546746 BLAKE2B 2a6f8c5ce2ee96e1812177a11c5fad7e15f3a73d9e30850edf0855b13db6cc95427e186883b4aae25a2d2466d3fe82f56180a39f3e6e0a54bb0a3ef78d495400 SHA512 d746007eae22f5b7bbf173759c61cbd2aa893898d88b8be5680a0237deec4d113246edf5f62fbbec3579ad4bd7307499b94b887ec306112ffe3df5190fe70e44 DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795 +DIST pyo3-build-config-0.22.6.crate 31369 BLAKE2B a1a72de120c4ac4f23a3faaf9b2e340231d7a778a29083ef25fd863fa213afb2a9b720333e3d46a6e1d32105f63073276a23b9bcd999a97fe71eaff3afc7db99 SHA512 9ab44c830e56ddb9ee537ce438fc690664d2c5416f01cdf72498ce062e4c1e7192eac8b7dc2de86c9f2212890b133b69a66209b1615c4eabdf4eaa6882a980fe DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d +DIST pyo3-ffi-0.22.6.crate 69352 BLAKE2B 99eea6ed87001b23fdeb263937bc14be0fadadc1ad77d4fa8834045ba2fc6ba5c0b89f4051916a058b7640be655afe22785b1da42aac8a32d10209b7b37bf810 SHA512 616e51a0eae1207830fe95251d5b62f126daf446bec68ac98cb1b8538aaa59761dbde62d446a9ee205c23453dbd32bd8ecb15e26265ed1fa1e5e2056efd96369 DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4 +DIST pyo3-macros-0.22.6.crate 8182 BLAKE2B 81998e4f4cb325763e4d3477af05b332e184cabf6391761f850d23508cebcf8d496ce12f747ea241523bb3899886eb20494b076a0651151744bb81d52901a1b4 SHA512 63f7a7b42e099742518c8a3bbc7647e98debb5500d08c39e11e8140fc146e790ab06e005d8d14c89aba79ebc5bf04fe1c92c0e9c5b13421307d3a4682d044179 DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833 +DIST pyo3-macros-backend-0.22.6.crate 66312 BLAKE2B ec0b11bee1ad2192e8d95cebab0075d6ec5bf628e3344b86fb8e20a6d0bc1f891b56ccfa4622840a609480581f32bd211b9a3d1dd989716cf255efe3fdc89331 SHA512 87463939b5a5674e30e8ca05ae747f652f8679f0c5c85d20967e9910ad853768a769a914580e82e409188fe4add80a3117ccb9da24c250406bc6f76fe4453799 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685 DIST quote-1.0.37.crate 28558 BLAKE2B a7d007a69e619f853af94333e1066bb767013312bd99f147b1b153611242bcfa9c76768b1ba47278589db309a9acd61a772c8ec3b567e48439bb9d831f9326d4 SHA512 c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05 +DIST quote-1.0.38.crate 31252 BLAKE2B a3836efbe5c21dec70c684002b47b8fc7cef643c82ee903b537a48bc0707a28106c4b33d98e60ff81e04c7520f7404b1dc4d49446e8d91dded517e476c36e1c2 SHA512 530c47c5e6372b508bf5b2b88a138408a7afa5ef52c47280ed20eccf39f8e97dfc1e0a18c1bd5472efcdc49a7a1e69566333a0a1b4c0b4f0e11e6a7a85bfe8af DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 @@ -148,81 +212,141 @@ DIST redox_syscall-0.5.7.crate 26249 BLAKE2B 97f848b130403686404dc193415e5060c32 DIST redox_users-0.4.6.crate 15585 BLAKE2B 1d60d0b7781395ff271d79264910d24fb021cd8ef612714265abae25b26ac158d48f542f1e73701bf5b99bd67546a7b878e4a14e40cdbd478b35bcc8b4778f5f SHA512 719d63fec42bad3cbed39deb9242ce1daf3f391bccafa8121f63198120371f112d78b0da8d66458519e946581511004983f04b0a697071f22294ac7c831120c9 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964 DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d +DIST regex-1.11.1.crate 254170 BLAKE2B 5cf41012fc2ba8a006c0eb4a922cbbf1614bf300be361c9e2d98956a9a5e9b140e37bea09132fab7bfb633d4439158723624bcf45e8c619c4061b399253c1b82 SHA512 d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3 DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f +DIST regex-automata-0.4.9.crate 618525 BLAKE2B ee3fc41c8c445be4c1aa3e5b19a3e61efd641b1a24e7a1ed55f837c1fba9c816272cb4645c13232b66b170bc7c413802928beb22e3891500141ad4ede65b60b0 SHA512 40bde0ec91cc27bc0c3fa237a37ecee5a1f023dbe006a999c5888f8f578ee2c4c64d9edfe1827546cea8e92ca3c10f8b4d494d81f3d0422b40d90bca9cf598d2 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 DIST ring-0.17.8.crate 4188554 BLAKE2B f531b15cc5cf88f2ef00b1708473a7e98a42dbbd026027ef2c42f2d8bdba0eb1665621fc98db618252f6a131bd54b1493987a0285bf2b9a22eba4c9409ee1cab SHA512 e4966409a4078ee43bfc9cc659d08ad28419effe2a729c8c275361a7fe0620a3c727009bcfb1d0bab265af2bc107b50c19d868a4e80da7a8bb55f97e8b214358 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 DIST rustix-0.38.34.crate 365160 BLAKE2B 02513c2513ac45897b659f0d332a0dc32401d238b8fb64ad4a90ecc4d8952fb042c0bde4bf13d52630cef34e73e96dd32cf772a8601b4f6eb5e2961f0a394add SHA512 717cf26e2ec792b41819ff964888adb265a215d2b6c6e2b7a8ca1f7f793b713b853bba9cf03c2cc88b0f9a5eb1a0478faedbc05526f39bd81583e7b1f764756f DIST rustix-0.38.37.crate 371243 BLAKE2B bceaa4861747208f1f2b68f8924c7247648d88deb200e97d8ed17c5cbf9c934488065f0ee7e4406bc96e8709b292ee1fe15beb346bff57b5f05af36174420a0c SHA512 6c0ad1be1fcf1b74f670b2c7599ba68c2ce834c760ff7486674d190ae0d552165b0c2abdc35b13eee8c0333a904c67f5dd1efa742c20fd3735c7ccdf2a439619 +DIST rustix-0.38.41.crate 378463 BLAKE2B 8af17ffb57da36df6407e112d78e8748fd9931a5cc451530bf46c4c2a57685a9ff5de3591e3d7d01d033060f24f55cd1444541e2899dcc622869f077116ef847 SHA512 faefcebbc668605640d156800781f7c8726271e15ca4cbde4057fed22f94032bd083c873f5595ec39d5cb00c203fcdf7cb863bc3cb3ae79c20c2aed4423f0ec1 +DIST rustix-0.38.43.crate 379134 BLAKE2B 7e527b0a98485c029b89f2946f07226d772d9ddcce2f21d7fc7b74c2f2377f780d7fb0529f9af1be6a750a0d1a00393534708dff48f4bbd0678cc75ac1a9a6df SHA512 0122fc3ef3b1199105f63e3d06df0992b7fbf4a3f0bf54cf68ff8035ed96329c90c2ec30b365f02a7a9ae1f0018897489f5be77787b4048c2bfe49b30d7839df DIST rustls-0.23.14.crate 335389 BLAKE2B b6e82a9318464a775d9c2f7eff0a677b29ea8bb42b6338dbb15a4c734bd046cf8e59cc583fe494952f7bc9ea92a4d1021cbaee644ca478322804a00fb06d6392 SHA512 0a21978d53da5f5cbfc73f78553e6b8ce198259759c847f1af9b9f417085abeffe1ec2035186568e2b6460723b67c842b5cb400147fd201c9009c7c24450cdf1 +DIST rustls-0.23.21.crate 337106 BLAKE2B 3b7c100e1fd257c3b71b3bdedc6461c507ef5dc8183d460ff6e7ccc9ddfbdc3fae908830a98577d5fdf6b418fa980f31e248488304bb9dc198f94dfae4e31d07 SHA512 0cc7c924c0a72be5de3d49ad67f41e1d6b42bb77905a0923d39852d3a88a5e22f63ff38419c9c6e96a3fa760a9635343fd43960c7b6a9d9586d5aa7ac85eb4e7 +DIST rustls-pki-types-1.10.1.crate 58944 BLAKE2B 1bf83e046802a5eef5dc597bcbe045a7aef146c489ef5fca442bc20a9a80dcb2d15cc8e07ffff45890df069b99698bca2a9463d1c2925a8f1a5eaa673ebf621c SHA512 ec63005b54bb9676fb6ab3f7a399aa816881c34670577e8c8de7f86a46a834e71c2363049ef152475d784f12b6cc9301b4fa20e9d478e95a8f1b9ad75f6ba2d8 DIST rustls-pki-types-1.9.0.crate 55000 BLAKE2B f503e7f7180bb5463639d55b944741083b3bb5e84dea81b521fa6888fcec030e8c7759cdd50eec74c5424648a9336339c3e7746f15b4cd875be2fdefc5b7ed30 SHA512 288e48b04da0de17625b1c53c89a7e50a735f16107de64e37a3c515bcba64337e08a7bdc023b2ecfcd52a838d298f138beb77beffeb42043a21082ddf588573e DIST rustls-webpki-0.102.8.crate 204327 BLAKE2B 8db832f181b46bdecc419e1433dd5550bc181cbffa1961aa90b2533f92696ebe15d71d742225bf806e2dc3a4ebb110d48bf62b0677089df1eede6d5a072c0a28 SHA512 8cdd5d07bb8d6c3f0d1d6663babc3b7ccbe8c9b1463870a3dd095c67f46addf4097a715da796c70f1891ebc1d045ae7d7c3a352400e8bfd6687e6cddfd33b1ba DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c DIST schannel-0.1.24.crate 41728 BLAKE2B 37c702a78572c845602e2481946b166b8a9f0bb08c0426f491f02ba98d358539a0039168c2a97a68fc5da2f870057b4ede3ada895b9483f687750319e139c8e9 SHA512 4e8085e9320befa3841981de5b58b214e053933fb5ac507156b1f22fd8e88142aabd42d40f52c3bf7d3864245672dadc4da3d9976ac07c75dcc8172cd9de1335 +DIST schannel-0.1.27.crate 42772 BLAKE2B 55b3cdf596d6d490fdbc10298eed7cb1b1bb8d6349ac8700ac2e7db66e1d75f0a5bea5b1b322bf30cc0f982262e96aa421998151a8ee1e620b5a09d25ad4263f SHA512 f469d03c2be014c248e7b6408f541584f250a9d58bc8dd8ff4d1e63f5720cadba1c0579b1e5d97b58844fadaeff10e9cfae6d5cd33c5de0fa4ebe699a8ead4a8 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb DIST security-framework-2.11.1.crate 80188 BLAKE2B 844d36d2b2216cc7055687110d54ea783a7ed9bfe6375fd4dcbea267ec85531e666fe002648110315f42c3364ff5ff5aeba711cf8d1f5358ba65c8393e96f55c SHA512 02786d62fd9dded80bae3942896bc8fea2a90763427f582bf5d9f127ca5682097b59b5dbff2cde373198ba659316ab5906a68d3141ba00c7408b73ebe353fac1 DIST security-framework-sys-2.12.0.crate 20103 BLAKE2B 4277ccd8d983c2c1a60666dc443637a22b242811a71191b86e177adfe37783e15090d74b7070d6ad49ce13e127c0b12347ddb107eae26bb13b2766463a777cd9 SHA512 676a587b716894339fd65d1e558acca3c5fa1c23bb556fbeeb2b92721d54671b1014420c8893776fc1d21e544b3acf8298f07953ea30c2c118535b0dcb31240b +DIST security-framework-sys-2.14.0.crate 20537 BLAKE2B 50a04eda370788fb769600b0df2f984155d9ff67c753a8b138568c648fc23f90f076092c9a8f984aa3b6590c547171e53b968ecc4f80f6b7edb8cbbf23bce31c SHA512 a6b5a391450ad91118aff3b9d8420e1099fc9f96926043f5c4061a1fd615a00bb1f86f5a06b9a549f45b27a43b5f9ceb5a015d8589d7df258a77dd4b4dfdd7e4 DIST serde-1.0.205.crate 78248 BLAKE2B c50ae85cc9fc922ea868cc6137e18885cdecdb58fe7ed6980cbed30209180dce17173254ec1bf238150720389c0ba6ef8bbb309a371455fa6ddfcdbb07664e70 SHA512 1ce1b680f573e0d9d15c7ee243f36cff3d425560d62c0ba50201e0e76aeb5390a17122bbd95440d9ed60d83a056a2c08d49c046fb989af063e754fd501500bf3 DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae +DIST serde-1.0.215.crate 78527 BLAKE2B ca8e1175839ca45a4d78a155f5943396211408a85e0840b065c52948188010653d68fc4fc7b63bf2c39a11a6988abb7f6f3c6d878ca1373596e0a5d62186e109 SHA512 3da13f1a74393f1fcb6d659b5e060a11ecae358f55cdf4a2fd05bfc863fea6f75d3140d3bc74902f8feba8cddf7dae71a3f4e4e78e78e1b08ed46b3e4900281f +DIST serde-1.0.217.crate 79019 BLAKE2B a0aacff795d34583365ddd469fa14c58a6cccf8afbb248210aaff3134c7ce6e34b3d03f437326d7c01b3e78f82a5d19c37ed9fa4372970d8b2793f2889288e1c SHA512 f97b3b54b9e99c9a027390405cc054c3072f49c92803a4ed5f5f69e76a179deda9d77993b645b3581437085912d881da88d0451b9e0da423c64033a23fdd8054 DIST serde_derive-1.0.205.crate 55886 BLAKE2B 3744050608d782ac8250ad94f3b16bbf7b44690a691a062caad1943823c9af1207c83e09a3848b6c4f492a0fae4b031b68bc2a5b93931a265a2c4e6bff274401 SHA512 4b5999eaf8990c98c273cbd9b283eba45eb9a1b1a0dffa7e51608ba6328ac623af4cfefdca8b7154dbd754d6b56163ee79b1e8d93c14f4d33fd21c1df4738d74 DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5 +DIST serde_derive-1.0.215.crate 57092 BLAKE2B f28bb66017599afdcd8d45c514b8e07854eb944c1dcf931e052a01ce421e0de6c20c13b3867da5922e2153e25ce88bf9fa27e2e68ddc9d212977f71fa0bd6352 SHA512 cae686bdf10c683149956ffe1c64fcf3e9b9bf0cd6e33b4ce7429d0ca35b9fdb55443693866c1202fa79348c6ea0f49ab3be3d5f857de4ae0818d2b4c8c67d9b +DIST serde_derive-1.0.217.crate 57749 BLAKE2B 63b4930122d80d64492ba2718630513012202e42bbaa74510729ee66a0e72b8a1ad123784b479697ba562db43868f4bddfdf5e94bb3d744cd68a547471ba40aa SHA512 31020f4533d04b31ae125580a3c5093fad36438d324e2d9b063923aa8c125c654102ae7fbc3b3df892bb41db6b321962a23e0a37950e080055d715d15b18af76 +DIST serde_fmt-1.0.3.crate 8677 BLAKE2B db89ed0207d5336b3c135d41763979f878300381ca9a3ed19a8e9e509a57a747903f8c2e919c9f8b5fe446deaf1d6f22a9414ac42a5d9b946180441c2e209853 SHA512 d0f1a35b0a3c910bc6393597cd0564101179e17f9be7c332f35e8de56257a4ee1b87cf23b45791056c7546282af79044750a14b0dab2b0bc00d493c28dc7576f DIST serde_json-1.0.122.crate 147200 BLAKE2B e678f61791da51bfc9df8e0184ee3d43c7eeef51c10ea5ea7b14f887ba22d6eb8ccd80a3080a35fc35279b36e635fa00ca3f102c4f6f2366a831d48014692407 SHA512 140830b38ca4e79eb66bb9d2b55c69434dde9208be926e7aaf7eb561af3c19148f9abd93d1526a7f77e249ac44d9226e4d6ae63eacfb6214544913480f668160 DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d +DIST serde_json-1.0.133.crate 150739 BLAKE2B 7891eb5b8edcc7fd09ab1e15d3881ffdcb629aa39f2bd758c0505700a5f2dfabd85b1b66c3b094268bc1627b346e204c792f4ca61efa76c54ab9cd5744fb0ee2 SHA512 20e65ec87bff319897a141960d13deb5cadcf821209c1ee8799f1dc7f458ce432bc62c16df5bdada1c8d3cc01ff23b8125e8fa0a03545d4614f32efd687dc69f +DIST serde_json-1.0.135.crate 154499 BLAKE2B deeb22932145715d6a443b36b9b984b6ace1e254199db9586c48dcfdd270a3208ef127584431e19a826947df705de78f07e58d9126ee1c5ccd2bc73d1e779bd8 SHA512 e19c583aa4a55f1c3b9a4e49b8b5c6b66e91c893db06e52f33e87608be1ff0aa27996065157f45dd4d2c59b752259ae747b2d353fe7cd1d466f56cd8a97fe71d DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997235df0bf8483a3906aacabc81308cb239887d46ba2f457cc6f8acd5aca78316707eea5098cd5666aea67d SHA512 5c8cedbe666a14b8a0874defb9208146ce64579cde52ed483e4a794cac5dde6a24bf8d684404edff582f842e1fd4fa3fbeddbe074f191e4ec4aa517aa456fe8a DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 DIST spin-0.9.8.crate 38958 BLAKE2B 8648bf2e48fc618758e3de67f0a493bf3cd22a8d18666164b0d850ed7c0d73650f7b0af783019dd361116bd60c61d24895cdd2c579383cd2700de0e32a23cdae SHA512 b15ad66ba9b308937f34ea166b799676fa45c67224e10cb57530fe33d2a8317ff3e3db3223a3249fa2862cc141c964d2130d3f39910a86ac5ef8aaf8ff4bc6ee DIST spm_precompiled-0.1.4.crate 557527 BLAKE2B 18a5955f1f7581acb1988b9d30dedd0ab1742f508cb7de95f7e47202aff6ab69bfbdcef33fa8297c4c3d9c68876b47d8990792ef1f5231b65a8d7faa4854975c SHA512 164f37f20a6cf9bb3dd0bb63704b74f8810c79a2bf4ac229fb50ec4e80d0a3892fb37f5c0fc838ab18e47079da952bfc5e6eeae71bce6b43fa630d128f597623 +DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03 DIST strsim-0.11.1.crate 14266 BLAKE2B 252a9ede4241b165525486aa8855dece37af77f5b28e0e1858c4a5d2047db9fa958328db10989234aad69463ab51b2303785ec056c63ea8c95bf95e111ddabf2 SHA512 0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c DIST subtle-2.6.1.crate 14562 BLAKE2B 3cf4940b7a01f04715da1057f6a92b1043a6b86ab2ee7f9fee0337b680ff781201d330409460f6f90b3f81bb5fd4b563e17c762c6e824ba3b0af99e4ae7d66bd SHA512 f5946ebd9bcb8776ee3446abcbf4afb3cca5d8bd847cadda87e864333ac7ded537a3efa773e9648adf20ce4add2c1da85172cff88c1e1a3a6cb051401b00c6bd +DIST sval-2.13.2.crate 26212 BLAKE2B 78129b9445f2298d3f3c721a90852e424c97edd4bd38d19c197b8d722b9bd4e45c300fa8d49cfa9833abfe175baa020d7aa26ddb8328bd5f0f4a0e896d5aec9d SHA512 6bcfaab3d7331d6309355c55acb41f9075e54e19ac3460721137641b01c8f8d81925691e721cc76334fa8356c32bad0a47d6adf7df65bd1e2643600899f08554 +DIST sval_buffer-2.13.2.crate 18107 BLAKE2B 01c7c9b2414a80c135eea3f5b82e87160b8cc6c0b273271f6569330cb091ccb9bfd3b16909521d8316b1838faef251172551947978e924d076775833373ddffc SHA512 bdb4f28283b490ba5cddce3b93d8e1e4ceab537d7bd5cdc3c4564e8c7659e6bbf02baa5c99accf5afdb3582cd0bf54d405533ed87b95223b8feeaf0e9d87f4ae +DIST sval_dynamic-2.13.2.crate 8229 BLAKE2B 62536c9bd7b8f8b9fbac37c99ff64e01060e7ea2c2cb91789b0b2f800d066d4da2e9ea0d997c0d5a3bc0e3526367e89877838c2ebda901cf5cc8f52e606509f9 SHA512 3dc64a5928dfd95558175c1a0fca7ff2d92e48ac26d287026f3b0badeb3a1beb110793a74fb39b7bffa72a4fae1e8e4abd2672caedcd10295005471c21bae8d5 +DIST sval_fmt-2.13.2.crate 10551 BLAKE2B b8d08f0202999e7531b8f2abeeb6294786916f6c21d47ae10d25b22f2280a95b3bed5cc8aa32b23009ecd138041d3464fa26ed3c4ede656b224d4050aaea9a39 SHA512 4281d4a3938133b0dc4ad9fb515a68209fad75ff47d20dcb6bcf2eefba74eea9cd79a01586f30d92d41f610b21020190e1a59b8f494ea0ea66c6e5a10cab626c +DIST sval_json-2.13.2.crate 11088 BLAKE2B 4864c2cda114bce7e080bd6ba00235dfc34180e6521a4487a7815ed41afd979508772a5af5c6d92b944e66302598866ad49a0db57e0e1245561ba5a515b1e57c SHA512 428cc0722630d5a010a57b35448b1af35680a9ab00b2d86cca71f86ee006d4a3a0ea0dec6f746cdffd668f3de2e896e1766d2d004a96215d387d058d43597f66 +DIST sval_nested-2.13.2.crate 16728 BLAKE2B a7ffb2fabcaa82682d169c64d25009753f169a0c11cb6d1c756a1bb209efb9c4f2c3575c4190be1d289eb20c6aa5c35e88113a8e66992f8e9682e9ae7b3145e9 SHA512 fadb99489941268050de4e6d10e53c9fa57debe8c07500f339b4983d1651055b5e7d23e1b99a0846fbba7a78f99aff3568688771f4e77b05d1395b9cff2fa690 +DIST sval_ref-2.13.2.crate 7935 BLAKE2B 2f62e0294d4e4be012933aa5b503d0a67d1cba3e30ee5234b355ebe5a11b449c73f8a8dc8f86a8e7918e66242f178cab1bbf1f3b7cc166394e4e43845b07b892 SHA512 274e2ae69ac4b0bbad87f7294b4b86adab553c8def2e689e8231b8b5c36647c7b980e87cb819a7b28720212a7937ac6af1f766c4ea40af2e7e815b1f8cbac1cb +DIST sval_serde-2.13.2.crate 10187 BLAKE2B 88ffd29264943a0e91a8791ec7f79ee8e6e94d83d6524f381d52324ba0190f041e0235137774c566e0722b7d6f40943ff18b664c5c7dfdfe8e9934573d5fe573 SHA512 66d6ef5a53685e6cfa3bb661acd6abbc125602d8878cc0fb374dde542a0cd08a80258d9d7c2a26ee00a351f41c7b2732ae365e092ec91f45f39c0a6653f870bf DIST syn-2.0.72.crate 267069 BLAKE2B b0b979f78937a10a6db45f96d5d93c595427a4e158d658a2186419d89b219a4a405ade488d88d9ebdbd605ce4b706aba7088ab39a77294f3cf9847bf032d8f91 SHA512 c3d26bf9787555bc6fd8bd789855d252e80ad28a413593e13bad174adf86087ff195a6b4227bdeb6d1a1c87b0af8e965d6f2d04b8d45e7383b6de49990b92e89 DIST syn-2.0.79.crate 268981 BLAKE2B 2bf4bde1890ce4ee91fbacca81bd298d15f0111fedb27b9cf8d675dc2489f46026c1804f9e4e24afbd0718539820096cd5c4ed2c2da02e598370dbfd2b18c293 SHA512 1ee073fa3428c031e53bff8ff305bcd6b37ac142bee3955dcdb44fec1c77c733eb78760c8bfb30b83fc3dacdad8a384e2b6f9f31a89c4cc300359e33457fd433 +DIST syn-2.0.89.crate 289852 BLAKE2B 4e2b06d2a0ea9b8970338ab61f8c5569cb7c10466dcf139576d0618c3690cfd23c98b66f0714c34839364dee72df6a6d8571f73dbf03ecc347fb1effb118fc2f SHA512 d172936f04a383b7b5e79dad328e70ea3c4faba4a88d0b6d186645413e8698434d30f53012cc9d3813f617c8bef75e95a2d064fdabae7867678abbed22bcd910 +DIST syn-2.0.96.crate 297497 BLAKE2B 68b62de28ad670572096a1d92ff8ed6fb55fee441f2d429edfeffcc48fa1d4f1cd39327540a4216d94a9763b84831956cb7e5c8ce89b81f1dc5767ea5734620d SHA512 ec2e352a5b0b2aa619774c01d7a7767674a44ffe91dea45d3379bf172d13039c3d37f264e98e26b20fe1d86db6d5190f220831c842f3316469d4ae73c2bfddec +DIST synstructure-0.13.1.crate 18327 BLAKE2B b29ee88c559a2d58fa46b7af155b448f001649ea79a1898f0ac87e69108b87c65cbd287d8f9001f360df7fef06ff39c937b48d33e487a30c8eec6a46c639c0c2 SHA512 09024193b44fc9a8901bda845b9f86c57dad65d0f53e309b2e7e968538fab6f67db1c86e5e52a2eb8fd116dc073e3ad10983bd60764662ec6ba94fee22a958aa DIST target-lexicon-0.12.16.crate 26488 BLAKE2B e7950e4a302059a1bfc9bc15618a3c1b971a17cffae117a6e8f5f63a0d82fd2bd02680301d15338612d5426d349dd24cfee30ee787a15a7d3187f2a6825e69ce SHA512 092639957c4a0391560b6442b31c47159c04d12e971010f730a6ec9cb5389e4be903ef3d7daa06db95e64dc78b6970731fb647179ebaad2b12e9ed5e9b24da27 DIST tempfile-3.12.0.crate 34423 BLAKE2B a8b84f54a54be636f5b69791ca567e8b692d6a8485ef37e5a8340d26b32b1b0f9f8e9fcd9a2da90ec2fbd39c281d364dfc5723d06892832edb79ea5cf45d069c SHA512 1a27513548060984be894e6f8fc215831e4b2054b2244c6188bee76c477c001f294c762f2f4a14488c58c04e5d1473806d589c7bba1eaa2cc02d97656709be66 DIST tempfile-3.13.0.crate 34910 BLAKE2B 736378935088ccd8b540997c0554444c3752a74c9a4bd82cfcb700a9b22f572d0f2b3e61252064d4a631b57783199cfb42309e518826346a83fb5adb44843c49 SHA512 68701bee80309cd8dfa96c237b2344f26bd03702d2fc2e1a253820c98654c85d802aee1e0fc856f6372159a92ecbf624f78c8146f34a0cf924f5b56284915f85 +DIST tempfile-3.14.0.crate 35065 BLAKE2B d155a39f6ed6e846bfd572ffdc73f306d30942642e07f2b497963ae150b8ef774dd046bfb3ce410fa326c8e1df27b0cada804100215e01d02272d6059d5294e3 SHA512 98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15 +DIST tempfile-3.15.0.crate 35693 BLAKE2B 1b4d6b17ed4263ff89ef6967650b0c18671b2b80cbfe388cbfd77ca597473e91c1c7aebfc715d0fe4360c20d0f235df31147b1f029b471aea8c57d188f7c2be0 SHA512 82636d50a29e1ea8cc61e80dc1fa28ea4cfaeb6175e5bf0558d6cd6f8da823f50a808a555ec17fc8601acfd0f504e15688fe95f64e8792feeb216bf27678807d DIST thiserror-1.0.63.crate 21537 BLAKE2B eacab5745d948416bde165d768f55c10c132572052db405ae3dd3e6e3b5ce41f36d574192ae68fecf6002ae5b14fd0aa135fe15e1614f3b51a294d5edc67c9ac SHA512 d5c2360075947cc0fff3253b5532f03f3102d6c9ef52dfeb3b400771116937e466a62ce67ccdf91532bf096f4882322522349a727588fd87b932326c8e758753 DIST thiserror-1.0.64.crate 21574 BLAKE2B d2c7cd7c1a8850dcd3f188aa1af61d4727c4bfc27a069f0e743adf86b7934e6db85d9ee9af14e78c7391e99f4ac828c00277a1354bfe1a47ddf5964211bb2037 SHA512 cff21ebd9d5d37e548c35dd1dc0e6e885a47363cbd8ce3cc8508e8e9b5f844c168b9f3d9ab12ca8d5910a53a9e09b4ddc75a0c32f983e27727fc104e4ff77618 +DIST thiserror-1.0.69.crate 22198 BLAKE2B fdd8ca8c8ca78702377d0bf7b253440519018275b105db980d63229d0d44aa5c39a703e14aa6fe453c779b3c864d8044009dfef893d2a5294950f067656d7a80 SHA512 ef50d2867d965da1dfb29d26faf6de273b5fadf78f95313f6caf44d68bfc610b9bd4b7544200b05bb0861231cfc84e961007f8db83c7905244c492037fd31899 DIST thiserror-impl-1.0.63.crate 16047 BLAKE2B 290b56ece5c592fdab4d20e9ebcc8dfe3f76b00aa48ed6c216ed0ebcab86b1ab4b4d676d0f52329abaccefae12bd47b4a81966901fdcf4ca5d0632d5021adbb8 SHA512 f93b7f89784d72d8b6e36050c22b88b7fd8de38e9a90fa6fe3f45973ea1566ce8bf82e959951377e3bf584a32afc97812188be25983a028be138b1700bb8c102 DIST thiserror-impl-1.0.64.crate 16073 BLAKE2B 8b0eee3d70f926c2719d084676cd14674dc5cf7c474c72e3e628a3cdda7afadd67a78f76224d2a05f1fe04ac59a178b879e467bac1981fc56c5904073153c88e SHA512 75e55f204a290eb38b2215fcdfa91f9f1cb002b121ffdf56bd5f6d75476614e3ce06360da7d74b870c45f6b107fa9e61f85ce39c0e65e713f8c191d79f96f443 +DIST thiserror-impl-1.0.69.crate 18365 BLAKE2B 51663251ea6ec99c59aec35fe73c5f9760809d6b6b7eaa8ecbc8f6939acdc4d0ebc11f9034d9204dde7bd689d5e8303ae0be86e298745e9ef96825bf73453a08 SHA512 579eb796c8885feb01d27638862823acd96c79440655bb444c3445ac00121852603396ce7439aed617c0a0ac69f62102167fde5845411c906997574a46d6d9e3 DIST thread_local-1.1.8.crate 13962 BLAKE2B fce2feddaaebde42bdb83d814929868f06387a4fa25d5becc73ff0b983395aabe076268569c6a89e2d90ce6e68d2ebca7c3e0ba1c9159c61b32631ce39289a9f SHA512 6d7e3941f43c43ac091db5d1cf2a8a3892b54b0634d9200426eadeb82015566532f04b6040085dbdcb10580ac724b6ded8416931d764d795a5f923aced66c492 +DIST tinystr-0.7.6.crate 16971 BLAKE2B 33a248261c4cded41a81f0d6e6c8df55437f042b37f235c39787986ec562f0dbff50b282ad0f1483daaf49c4b33e6618e139a6677d1238c21f4e12082562b4ae SHA512 a33051848de248cac0a2d151760a78cb3aa62c787d84ff7aac38b11c0660e9188e4d43d43a77fb8676e49ac6102015e9c3db057848d809e71981851875d0fb25 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9 DIST tinyvec-1.8.0.crate 46796 BLAKE2B 720d0e6d881855a36779e12f5ffa708d3a8b96e6d0de9056cb33c9b8ce0d408f99b22f5b2bb9d64bee72a011fef846dbebbea2ccd238d7b951eb5ef0c4866e05 SHA512 b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e DIST tokenizers-0.20.1.gh.tar.gz 1538802 BLAKE2B a15e93c09c17181845b99c4b38f394446951edd39948ca385c4eee0a558bd751d3ce1c5ca01b1b9760edb9a60989428c9229a0b5736c5dd9dcc8e2e54fff0eab SHA512 3465c29540b0f0ec23106258b98459202440b8450667e2210efe7ee39e5e44d7d542d61198c85e1c50c3fa056656e494c099322eab7fb5feecacdd01ab5cc3e7 +DIST tokenizers-0.21.0.gh.tar.gz 1544853 BLAKE2B dca3462bc76c77203b47eb556401a9be713fc469b6c461ab4aff380f4c901aa958a10c44b46ca472cae2fb949c59aa197f4f72aa9c6bfd5ca06fac2af9f07a0d SHA512 df2c290cdbd3b610d07ff511ad46ce927cb272b78bd119aeff2e5d79067cb688a74d351ab5894f0f2db3227e55c33fa2a8b7e873950c59fdfdae4e65f48e31cf DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 +DIST tracing-0.1.41.crate 82448 BLAKE2B c056d938e001654e03efaec7a11eb8ecfbdfe9af2099271fcefa43f4f4683b40c59f7111fdf7f27df4da38bcbe94f1b2ac0abb6ec3d6e6a0d165b9fbb14da3a3 SHA512 dffb8d3a1375f1b9d5418550a46cb7b1d92b2cc8ffbccb430a38f7731547960775bb42798074186711847d256eee30fb3e74078b69cb36f28c07d9f231dbf96c DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0 +DIST tracing-attributes-0.1.28.crate 33280 BLAKE2B 4f4bfab16ad8a296c9399125edfd4314d55ef58977d8a1f3e867618617feed898cd14766527c9b788d5fe3d3f8ee5bcca0e26dae79a2e6cf05366991ac23dc10 SHA512 4a3d5fd76efc414c86af0721aab9e9aa70fcd6b08eed4acee8c2af5af56fd665197aea612187c7f6022d1acf5567d5b9e72a7dcdcf25cc401135d875d95a99ed DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 +DIST tracing-core-0.1.33.crate 63434 BLAKE2B bc36332ffe5f4c95ae2d12df43944bcf589746cdb923a39098e5f4007fd1f19d7c3bb115011ddc40c13e3ae0e5cfc9a59c49861824e99fed7430fd29479abacf SHA512 1c6f0cf3b7bd6c8f6316ed9ea0b315a619308de6cbf7e50e665a193cf8c3399b5227d4f145d83b10c7e01a2f9fbc83d16e108cf09b7fd6cef413aa5c1acf89ef DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1 +DIST tracing-subscriber-0.3.19.crate 198345 BLAKE2B c7083168e62619c856b872570b85b44475edd687fb6d5c3334246622900fcbf4e4a8484c23362fbfb358d6d9f8088f7dbad2e2ed30954aebf76d1b57324b712b SHA512 840e35103f1152e94ef9138d0f03f157b296def538bab6c7464fa7d363aef7734feed196091782dd3aa9bf06c7dc181a2c37149a23f5be036f00c00b5200686c +DIST typeid-1.0.2.crate 8844 BLAKE2B ec74d365b11f17f63f938bfd8819a29d94eee8a3d938d8e5f6c797c0fc4696c1016e5c900f5874e3df05f6d5650f1b05da9446e240afea6185d16ec958beaa37 SHA512 a056d99db3bc648ea260157335045dba1df96e70cefe65dbeac80d517cf630cf398f86da692180592e99f27ae14eec1d3f658c0d2d039ae353ce56463f7cee40 DIST unicode-bidi-0.3.17.crate 58120 BLAKE2B 9d7759554e265136ab9d95dda90bab84763189d3613522a5cb966ad6417ac0ee726d79e296c8821ccca589ef09a999701149c88a9189cabe0ed7d32902040832 SHA512 cf523ff9a2e1face42da035f81bba2476e80d1154f73f3e34cbaf5ce322504e93a520114a54e0a4b2e5d6b930e508ce31b5d8b4f4ed4d39159a8c9a9c7b94d91 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 DIST unicode-ident-1.0.13.crate 43279 BLAKE2B b5e935020d1c9f3aa24f7d382f6b73d6510d654a61ce1c9c024e2e365bb817182e076139f370e822573531356fb78ff7499049b1f29aa1e2f4a2cc74a955b47b SHA512 5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51 +DIST unicode-ident-1.0.14.crate 47547 BLAKE2B 30e0b6d7f3a967aaf5b9d91237008a60c3a8ded53bda901696e23cea3931dd71b01ddab866dca9e31e17c395d5f5a68f2a938655b693e894962568c2cff5ca15 SHA512 7c6dcd1724e8cfedc37546d1abd49088b633dad228097acc73d7b6cab255b223e830c541144e05a00388fd8ca8066f27c18792419cfa58ee9da4460a38d0bc0a DIST unicode-normalization-0.1.24.crate 126536 BLAKE2B 1d6d535a1236562918d2625172d38c261854cd8c45cccc81c5d5aefb052db5d0e33981d95f5c87e8760cf77b3651c60b7ec1762421a7a9caa72fe7eac3f562a0 SHA512 f7af59688773319b9d1523955ce9b82e6735bd72358715ba5c056f41956ca050b6a612cae1b39199cc089674b3c71e4016d85d48167277c794c5cef3df881754 DIST unicode-normalization-alignments-0.1.12.crate 91546 BLAKE2B 18aa85b935f2bbd4eab91cd160fbfc75a7f919090dd5874162d1ca76851c53bfbaf1b0e3aa23cdcb2b7a9f15e576736521be1fe45c9ff7de6db23cbc6c59e78f SHA512 b51d9096088c14a84b5c179402b1618f26b0e9bf5250ee86c9d5e26e318149829e3e57802a4c9e437c3ec29ee31ee311491e683abe50ecac5432c0a593478e6f DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef DIST unicode-segmentation-1.12.0.crate 106323 BLAKE2B 268b60aff6694434f05afb7e2b8187eeccdceb77460f8ce2ac0f84d470f8a4e03182ce3f7906177cd2f00f989273a7e69061a763006245f0876bf21b15076804 SHA512 55eebfe5e9972b39d7c0011d80eb5f517d636de37870999119a3d8f064f21f67b66a5ba9761d562738b05f220e21d56b5be7bbd9cc51662994e40dd67c38f946 DIST unicode-width-0.1.13.crate 457228 BLAKE2B 757c4da5fa090369a26130b08440c2348f1cd1c0dfbb6770dd75b65eba797eaa65f5d683f0c2862cced06124d46a89b4825af0d990f6adc2df8709b8ef291665 SHA512 9781d6dab2c6343e8c28ec66b50cb4293261bb2114e122fa80ad2facdb23020f5b621c38030193b918669e58adf143808e5ab4c507c18beb6dc61e97b2e296f4 DIST unicode-width-0.1.14.crate 271615 BLAKE2B dd2e1504caedecb5d37c397ba05446d3d762b8b6833a8032ebbc213e324d53d89db5e96ed2f7223096e5754d800b39a54105906effc88d9437d7acb9e7beb81e SHA512 3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb +DIST unicode-width-0.2.0.crate 271509 BLAKE2B 53015f24c57ba65d7ffc6e15e947f5ab96fa272996fe5a4d2f9203051972238ea7591c99f1d8ae5d2610c7b83c215b6912eff7aaae034237aec8d79620bfb843 SHA512 38149ad512a44fc79b2c991c6b5667da2e8f8b442ab6bb7e4f404e7fbb034f7540c7e0e8b9e72a1ff6117b899d6034862239f43b6423fa89d55dcf489caff37d DIST unicode_categories-0.1.1.crate 87298 BLAKE2B f52b83d204b90ce0ec26e0500bc80b0547610f3417616603c4e837fbec0a41a6a715de19f88432f4c15ddb6b2ba55ee75a472fb7e2c888accfc77e1ef1d85fee SHA512 2d15499ee9318ee54910d657339820acfa88183e4f9aa146ac655129d2c4d76d3fd0550b601702ad2ccac4c8647dd2f26528d8003f39181e09b8ef480351a3cb DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505 DIST untrusted-0.9.0.crate 14447 BLAKE2B 8e9c3ae09435af0885bc4a6e3c8943805b48cfc00bdae228c7c43093254e1be15d7005d1026561ff369ec37865d8458203f421a9c89ae3db077f655449621aed SHA512 5929e4079c1c2ff933ae8d8f59a2ecc7a424e71a20d1b8821f75925af68bdf82604b024c008e5464b02e25ff093e561a352b685e755b3d0b27e4c30254689416 DIST ureq-2.10.1.crate 113163 BLAKE2B aece4293775ee9bed49dfd7c1761fdee20c92322dedf70431b6214e8a40fd9f63e43d2846c1929135005c5260ffba4a388d779a2cb2808eb892b6b869f65fa08 SHA512 9944f0790b9c342a3584bb9217d0546dc4272b011bdaa47d22b42684dd7f655aad22750d395875c63e7c92d8d44ddf1ef610061b485f9600dfd79b4db5743656 +DIST ureq-2.12.1.crate 115366 BLAKE2B 8e349c5dbd4c1c6180fa018523db67dd694c0f7ef0ae4323592c1051fef473bfd6a8bf80d91fa4047547fa5e908ec5f362cf0697168385e2968ce67f8474c59b SHA512 30fb75e097b9cfb34ebd056c0936d1b5ce16f4a613e963c5179046eb48a0165da6cb2e4a5d612b03d6b0daf736f5353159a92ab69e68b643b923fd551f0c3e7c DIST url-2.5.2.crate 79704 BLAKE2B be3526298a8816fbd88385caf49c2d58aacc7dcbe2d9183478cf501c26fb5f22d7704ef1313ba6d355e849cbf8ab7980310c1aae85e253a2b28d59099e23af29 SHA512 2515903e41c0659cb226f9bb049ef80f2a49d1b609b6ac480e570a84e899088ffe3be4fb58f41a1fa7f5288eb5f97ab513f331aeb6d56979df783d48e2ace28a +DIST url-2.5.4.crate 81097 BLAKE2B 74943c63809ca41a526a146bedae66f91f390fbd2ccbd90f9397d8074ee7ec26535f0f67170eb1d7232e139d8d795fde99be37f53f1bc32c6a6a4d46aad1369f SHA512 8f1d62bfdd45f52fa12ad657a521a3478d0ab54d187346a29dd59cc66a0f140ca96d850948e09f6316f08b44b3fc68526c58bd620fed5d065b7e8528df3cd46d +DIST utf16_iter-1.0.5.crate 9736 BLAKE2B edcd9776113d4d2b267a9cbd58cab11c5497ff1a8252c4e695de619fc8e5eee1595343c857651774b3670d13392144e9d7df579f2e226842aa7e4e023a76fb65 SHA512 44dcbc5a7db149392fdaa31862be240f78fc5d7616f54be32cfc8f3adbee310e8681ae1bbe6edaad8a7fe6e7759dbac8ae4f69d0dbdbe5350c21dccdbbe975fa +DIST utf8_iter-1.0.4.crate 10437 BLAKE2B 1e7a8b9241ebbb62cb497542b970473780f735010a0af900771a43abceae4e7f362d21d4f79f7c00630e4549400875ea17574b2cbe4f5ea19e8ed428e3b5577d SHA512 a72671995b3eb295581c60dc632e4a25ba257227fb5d58a8bec322428b6d69529bba79a6f02b8e7ee6698b7779d9d6695f5badad73e07c254b00c9d6256c9090 DIST utf8parse-0.2.2.crate 13499 BLAKE2B 095b5d219ab8ff04c06fd6303e03d913ae36a57845f0b2ca3217a40e31a54cb0fb5ecedbde165d28f5f60f1553d8252986d7098fa83befc84a7cb20bf3b76144 SHA512 f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387 +DIST value-bag-1.10.0.crate 40371 BLAKE2B 8d201444eb30bb6820dd9c0132b6e475df3f358762f2dd3ef0a7172bc0241ebe108ff8a8f1b053cd1c27de17f994cb14af13ba8f70fa00618288f0a7c035e973 SHA512 30b7d7e181c7ffdfff2b2f669dced2dd75508678a9f40f01b45249ba95ee685910a069e089867084ff1e3c2092663c3b11544869e3323f4ae77c6adf6fa020ce +DIST value-bag-serde1-1.10.0.crate 5564 BLAKE2B 87c5f7c3ca5f87bb8f60707b07ba130149422a1dac333e34f675a2dc12023bd5acca2da76b35791f9233d24c0a7354f806ec4a6324e35dbc83be38daaf4a1aee SHA512 2d0043a21e23ad415641e98832e1255193aead12fc38ffdcbbb9256429b0a47ec98a527b1b1aeb4e91d7abca218d9e49ce15c28bb455dd9cad2f125337b7a962 +DIST value-bag-sval2-1.10.0.crate 5624 BLAKE2B 0c3458966ae130888122f60507fd7dfa4f92ee0e83ca37acf52ba1835bfcc6aab15bb5130c6cfab86cb97279944876f3e1787e7b2a1d370908999c8e87d7a2b5 SHA512 f416a0abd5df77db28d2c3dae2d11ee6afbeabf6d851e234fabcef2479a755223c78e5ff8a2542f34e21d5b43a082d97fc2f564f0f667ca9c3db6285a96d2c31 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 DIST walkdir-2.5.0.crate 23951 BLAKE2B a2d3a973f206e94699adec0263dd5e211347722cf3ab82536295019268b3125084da5dbcad818070bfdcb6a5de08da4eb483475bc225a829f58a1e3e040b5fba SHA512 da36a121dc6656942dc9cd9887fcf4f6eea7750354ef3f59c7c25d836e7afe06f33260b4d55d0d99421104ed4ce56ef2a1f0f4c3b713766fff90548c21793fad DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f DIST wasm-bindgen-0.2.93.crate 43769 BLAKE2B e1abf981a042ebbc5c506975d5c2258942278fc000ac62aafe4221725fc52003c4032dc04a396e8fc8ec6712155e056ea9381a72070ee7c45b348ce470f52c7c SHA512 0c0a63b04b02b57fca78d2c0b885ea752ef1e8e4317c27dc84fd35843c9c396ae20557a1321c03a405b050f21895e6f25e95ddb56f3a3e8cec13928858ae8422 +DIST wasm-bindgen-0.2.95.crate 43894 BLAKE2B f14fa63110c62d3bd51c947f31ee96b11812fa60d6adb9cf1907f99c011bd43ab8e14b437fe8b6357cde37124769080b3bd20a2a947fafe3bfd6cccdb875b5a2 SHA512 5a303a6e9bc71030371d6a60a04064b148423d89b6d5de4232b24ff5205175c5236812209eccfc60d8f82a876d3b745ae76ebcb30811eaa6f39701c9a84e1251 +DIST wasm-bindgen-0.2.99.crate 46136 BLAKE2B 04e69294da3dc4feff9001185bcc5b864d1f14a1ead6b9a31c830b2043dde191f9f7c65755d607365a3b8885bd340bbd266e26cfa74c48464933c8d7a1164f94 SHA512 184aec11998b99a730ea5b63d6141260cd0b7cdc29b02696f533b3e75ec79f7c17c6aac892e7a7b24036c6e73592d01df638ca31b54bda11d3bdbf857b1489c2 DIST wasm-bindgen-backend-0.2.93.crate 30344 BLAKE2B d0b9f0cd0e6191dc3f57869023450952f2d73c0432fd4516522df5f63090de021f44f11ce7676fd2f87b31f6b236eb155b22b36eb80c3ccf3880f55ca23d4b0b SHA512 c67dad5fa26f78b233612cb6ebd44f48edd84253e46a2f5094e95da935185cf2a7be14d49247e8b8cd1d916721ed82ea44046080a40b2fe37ad88175a5f96597 +DIST wasm-bindgen-backend-0.2.95.crate 30487 BLAKE2B f199e3392e964c4b0e6a7b2e3ccbbdc458973b4aae4193ce36ee0ac18d595230be9ea6708caa439d70aa92a7b924f51928059984f560e5dad20d41eaf06616dd SHA512 1bea648ca248cf13383b297917a5c315da9e4830a8c49cd3ba23392566725cceae818b4e7e60ad85360c9073c2e557fa36452a2cbc8e05b60318feda7404026e +DIST wasm-bindgen-backend-0.2.99.crate 30928 BLAKE2B ecfa94a461df79a33fd2bb9807374a2a0c7ac370b443e5a1103ba73a29c9d337ed3feb427c80571ccc15599f81135987742e698199528a9c1bb570baef3e9d09 SHA512 8369a5e618223f09fff7cdc35662a930b3eb11024af51bf5fb9e70c45dfa22452a518d723f3d912c0c970fc4bf748ef2d83d48756483174993f7d04c92d9621f DIST wasm-bindgen-macro-0.2.93.crate 6822 BLAKE2B 3704c01b90ae900032e455a265b614d1057a7ed7b7eef1ebfdce75a7b0f0b97083211db562d1602160cf9e70843a1949be836465398787315d66ccf85fbe0801 SHA512 8b1a690bf4fc344728bae21a11c8ce4641d81b02e215d88a489f8155433d8e579ed367c96bc19a345b561f2ddb42afa44056b71e15dc935a4fe38fd7f937a632 +DIST wasm-bindgen-macro-0.2.95.crate 6938 BLAKE2B 672509ff595fae86492dad98a4480f28d74a51fc8156ce7f96928b148f3af7f0f45ca9560b72148c6ad2d45ddfbbf3dbe39e2c94603ef92a925ac5503d939d2f SHA512 1f52188932e20145cb23d527a733fb5fe211813826c6b5ec04277e376127b700aea181efa5f60e34d120f10652066fbdf001952024017cccc7af728a3c8e41d9 +DIST wasm-bindgen-macro-0.2.99.crate 7011 BLAKE2B 07182a9fb98f519d1e5c934e609d7a42cf2409319f59dd901e2a5bec77972b4d16fc6f67cf40ade58af874b05faa981c894443d3950616e2aad117ac7355ac6f SHA512 344bf5192e43582246efad257c600003c41b589234c1900f6ed201f96b6f7665eb55226da15d612060042f89c6214e452489cf3aabc61645843be9c27f9cca0b DIST wasm-bindgen-macro-support-0.2.93.crate 20642 BLAKE2B 3fef9d35c09e97317e8531f11c3cfcafc5cb58126ab7a96374cd5e2e3f8736ef016b4c0b3b16bcdc0bef686e9f07439f263c54dc980649e9963b12d0a6814ddc SHA512 9fe590636e229184a944acbb8472c03db0a48a9094cd9ee204c09cee6c5241194a9757f06b09e7c30ba9db1a2feca616cd1e7dc0e52c7f1c1560c50c9d3adbb8 +DIST wasm-bindgen-macro-support-0.2.95.crate 21331 BLAKE2B a1f71b727736b7166af5a9ad739da33f07ac3d7a190a27621f8a9821530f9bed78a6c437d194f9609bef91ebea0ed9ce1738eea0a9800344b8af9ce7df868da0 SHA512 f45d78831c37401a417c837281d1705b84eae5db430630a9caf544ce5d92f1ddd945baa3bccf26f4c58170e3cbea035174d8b60f906d2757b152e1d090baea58 +DIST wasm-bindgen-macro-support-0.2.99.crate 22800 BLAKE2B 9772cc94a64f768eecae12072e6d700bf95fded306297b84e235f3450f7c5630cb1985def3eaef05aee193c693f92c6fa61d7a6ca18e84a2b73aa38f070d47e7 SHA512 936ab8211a13fbe8b8f21a870a78c03e24219d0872731561353cfcae245e9f632246f179b67f2b13e106c799e68c5c39f9e388370a8ad3f93f299c4804f5907e DIST wasm-bindgen-shared-0.2.93.crate 7527 BLAKE2B a2df995ba72d83beb3f347909c004d9693ee06cec62de248a1f96b0244c05dd8b62d46356f1b7eb0a29122517bc23270eb4eaf045e6cdbb7122089dc84829d9f SHA512 4e9271a746d3b3ea44bae472b7d9722edbcf262fdec2e03c18788d95b923c71c26f309e316ad3c621d5773311d6b1d5ad468cd7bdff015d162193b6effaf8420 +DIST wasm-bindgen-shared-0.2.95.crate 7649 BLAKE2B c18f531c6094b49af3b2beea93914d16b0054a707011890f9054f4cb313ed6b433e3f73c7b42accbd1fa59d1f14c2db5ab0f0a82cde107b9cf437fad8b4cd7bd SHA512 3ce689a4c845765bd6e1f84b94948df3ef84560d98d830a15c1932a2ab1942ec91465db65cbf14a045526cf003218aa5c3209dd06e8ee8a39815757f56356099 +DIST wasm-bindgen-shared-0.2.99.crate 7773 BLAKE2B 73489af59d16f4d0a1ea51b535cd02d2759b5b7b07873d8a71fa6bd6b6ce1cfc6e8139e6a79346abec13665ed9aeadd0b5b6aed28ae008f9dcb3d5da9fce665a SHA512 8da0f107be99b6666cf1859d68ac0a7295fc03e7b494fce1df9dbe57d21807de8e2bc95f5b974562303923ca4646f38c5297588ad7c97bd59ef236218b2a64f9 DIST web-sys-0.3.70.crate 615438 BLAKE2B cbc8b7ec572a3df1b42d603efb3af1914621957a79f0217e75b6eaa192db6dcf2de9782e130ebc364f704e624913a13cf9dbbe816087db340bcff4a4021b7526 SHA512 337a12d7eaf2a643a7a49a026bccebde73fbef44f729daa6feb71c228d7d8ef72155f9f501b7ef9ea5c22a619b8a8591487841a67a1e12a6d1105d92f3cc708b +DIST web-sys-0.3.76.crate 635842 BLAKE2B ecd166e739e4ae4ebccc51fe0d429723ed7e4209bc9bd4658b5447486d7d58d8f2d2a6186e433e8ff11e7b52fe159d842a28de6251d61cd5f5876a92a7d945fe SHA512 370fb49edffd9ce125f77a9451389dd23ab5b70fd49263248d5794310ed757c28839a29436111df2fe6369ae8d6af56a64ac59af5258743cccfd9d18cd07dbd1 +DIST web-time-1.1.0.crate 18026 BLAKE2B cd72e384aca90c79e587448160587531c417f31a32e9ded23e6b78d492d0e517520170fd03177f28870c313b9302b28c32069a2408acccc076a1e4939a2c8f8d SHA512 73e4ef9851de089fde9381a595cb9e37a434f563f1fd350e345f2617b701caf57a9aef739b922b5b10cda131cdf2fd0af42c55603f8973a623a8b6ae70f6cc9f DIST webpki-roots-0.26.6.crate 255384 BLAKE2B 8a5d94e2ac66343fb8833f0b2ae67a5292707ca5d34386502f7514380f62bf86b812967e6b10f51015d63744c7e20a0f4cf6ad9142256c981c31a9bcc7ef8f90 SHA512 a2e3a406caf6ff8261bfd2d52699bea10214e8c0d6ae69631918566bdf156be2e6fe7e0d91120ad4cb10d20862215b25c8ad454e908bffbebf1c046e1787b11f +DIST webpki-roots-0.26.7.crate 249392 BLAKE2B 6e3eccc530fbe66d22cd122b28e743e1052eabfa686c212b0f5056aa18be2ac1ed3672973e1e2deacdd9c3c9761a19e862efee8e4bb66ee61481234635898a0a SHA512 7eb3e7972864518acdacd7b716a223956ffa4454a39b8d4fd44f8fc25f39d113f8583d340f738ccbe4cd8e497906247865bc87ca9b9d8cfc1f1b0984c41a9397 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-util-0.1.9.crate 12464 BLAKE2B 7fb9dd803fc2608c4e5bc75674472992d82da364f24c22072d5624d6ae6abc44abd3e3ea3c45a7558e045331f3d87572b306b4ab5de52c07ff3706e7f13c2a38 SHA512 c46b893f67ec6e36499b00736bb6b9421e0e2611e76784afa6da01d7ebd033df82f1be7cf8d871d541125d290983f98f26f759488ba9aface49efce8edd682e9 @@ -247,8 +371,17 @@ DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e DIST windows_x86_64_gnullvm-0.52.6.crate 435707 BLAKE2B ab77dccd06328cdb00175f41cdbc120594050a9678b7f9820444391fb50aada3911a91ea00f3a6db2b4fa1820fd23bc9a007dfbe65ad41417c26ee1137ef9b96 SHA512 67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 DIST windows_x86_64_msvc-0.52.6.crate 832564 BLAKE2B 8e9a3044654c6de99a9153e7cacd575474e7a8a3d883c67b02132af5d3fc99d03cd5f7a4dd666a3947451d11218e6acc6eb5e2526f012481106cc13453839719 SHA512 21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 +DIST write16-1.0.0.crate 7218 BLAKE2B 548796314339463e4b71f8af3d344e45dc89480e103180b6d56c90fcb816ad1a37ab2ba20766c4b9754f2cc686752eb1f3a5a12ec1ed4369a9cef749ad4f3e97 SHA512 655a207b8082bb88e462f992ecb4833cef9d590da06d6356b41d109df2862b49ee5705189c78a607b549e7343035119d158020d58fcad49608e51659357a83c1 +DIST writeable-0.5.5.crate 22354 BLAKE2B e4ff9862c070b413568ce0c75d1eccafcf1db8578eee4795ea9046dadd643f8a77258b437be288b93af247199d63455298ac2cff909226bc432f91c0aa863921 SHA512 818b2546c8ec25816aeaf5e31a1ded927d197bf7256e7c5073738c2709bc58a95d382a0256eb38a99235ae83729b578701261866d42ea3357a26024906e196c1 +DIST yoke-0.7.5.crate 29673 BLAKE2B cd2e42103140e080a29bf579fe5176b36a192f9b1309c1f2fd7557fe93b2f6eadbf6fca4a6a3b1a7b6288403d2f643841dfc7a5b6a4476776943950abe5c1613 SHA512 6bbd99671d1a5a5217890eaa267113d193b3636b265393afb6e72a313f01704d462fe017264f061405e8e84c188b590094c29e3fcf19a63c375ae165d1a0bbef +DIST yoke-derive-0.7.5.crate 7525 BLAKE2B 9b6b97eaf3c50f0f5ce8cebf685a1a17d4c21eb9b26d38eac99e0a4c0f9d592e95a7843b7a0b897945a14c4eb78ffdf2c0972b448d31d7bc7b077f27aad81d9a SHA512 e30b06b020aa283080905004295fb643c539b130d0d53bda51927b95e79ba562336aad30d8a6202d9a0c62d5b64559a01218c6f02f3faada6003d4b03c205cd6 DIST zerocopy-0.7.35.crate 152645 BLAKE2B 8f13123c9d9257ac5a5c6954d38c3510fa658624442f7e03cdcc6db5a0977d9f26bb4e277be172b7872ec365cf6e58ac742e5578636f7698f9f37093e9249d9a SHA512 17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c DIST zerocopy-derive-0.7.35.crate 37829 BLAKE2B badeb7fa5e0bfe93a6788d93fd297604ed31de526b121549300ead3c49d450f49265f499e2e7ce606dcce2b59dd01f7fa817b8fbb3f237475185c5b42f5299c4 SHA512 dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb +DIST zerofrom-0.1.5.crate 5091 BLAKE2B a2b938197957755c4a8ccfb258f60f90931a0a342d9d4bd098c7a25e1c9069148a51ddfffd2b72a6a9856d8c6e66fe1482ab2081a5f3478b4b318062caffff42 SHA512 11f16a1003967b3f30d7b32ffc8541ec05fb335690b08cf4f7554c624ad4312ee0961c83390a997e2a73aee06d8bb09a0ff4e6a5e489f8fb925141e732006544 +DIST zerofrom-derive-0.1.5.crate 8285 BLAKE2B d19bf1b74be89f4d27eda36ba6407d598358d3d69bed64f02903ab7dc509faa006cde9c13e19f5f3cde09cf9049120575263996c922b20da366a11e18baa42dc SHA512 75098e0f1c690bd8476f819f4ea2a7645b88237042a8876259bf4e025b070a4b105caf16ca7a824c5dd6c4690b693fcc74bed9ac0b5e6fdab05a5bed1b5cb298 DIST zeroize-1.8.1.crate 20029 BLAKE2B 092eba034cd35ec47290020e0c2b213177ff5dbe14ab9e7f0b4ef3cb1ecbc42fbec2b951414e26ab00bc65aaddc2c93eddd5a1963b27c6cd613ac71c65d5cc24 SHA512 dd40ebe98b98fd742608d4066b5ab66caba94b2e679428fcaff9fe547d8cd6ff2360dc85d671ee9183e32fb79cb554d00d6aef9eb8f3d8ad0ec92d0435aa4ebe +DIST zerovec-0.10.4.crate 126398 BLAKE2B b078784d6f178bbb9de1c3c1b6c7ef996f00bdd7dfd2924bda921e62f3e09e953fbf50f8d0da99ac6ff6d134f146253846f5663549dcf8df08eaf34b9d4016b3 SHA512 db12bba1d7476ddead92e6dfcdcc30e2e0defff4f263a740244eabee265a2cab265473a663d3dc3210f48e113b66d951da496dfab7965ce1bc792e5f2db422a0 +DIST zerovec-derive-0.10.3.crate 19438 BLAKE2B 9f7df8a4e4a0b62ab25aed967b26509db4bcc5d5b10b3bd73305099a4c49a60be8921484ced1a34d9b7ae30ffa5abe789686f432416a8f1cfc07de1db1dff594 SHA512 caefbffeb35265db9f74933bf07109d57f0da48156cafd4f330af78a5c7eb9ab0831a80789ad4fb119875ebc6cfd7e3de68c9984b77dca5151f9be41f1ae6e09 EBUILD tokenizers-0.20.1-r1.ebuild 9747 BLAKE2B 914b8d63467387c992bc1bac43531ca71fb41fd64de188c0f578796a34e3f9277b6a962d45186ad71c85206416d3af7ad8dbcb2d13ff80536c047bfda4114e9e SHA512 ef6043275e6282faf970061ac1afeca7cac1ed31dffa6ce62ddfa73c385d4a9c3cfc5b72b480b6e878bde3994781fa84b8daa6bf3201a451d787b99a84b08d20 +EBUILD tokenizers-0.21.0.ebuild 10451 BLAKE2B b7ebaa0f608d05052fbac145d9f6207bdc879c3825905d9bd57da07e3ac6cd86df81dcdad8682a596f9c3be8b99c9f4fc913313eb6be9fb823e8f42ac7b79179 SHA512 248dd7c42ed61ca5cbdb7889c416205148abe5053d72b37c840947bb99024e49187b50a4880930bb82942e8b63fed501039e742553343e167f474fbe017a5bf0 MISC metadata.xml 335 BLAKE2B 55e4d7b301e4315210bf24a4056741cc923c6a72ae323158c5715fade20db86de8a03464bf8f12fe7116689b41aa0519a0070eebff5f63801e23a9c4a9698a92 SHA512 77f537f495b90ad031842f704c5a629cc995fcd848f11defeb597cc16d2d7bab07d262f05a50b07788d2f58fb60eacbefdfa8328215b89b0c661a05b18c4555d diff --git a/sci-libs/tokenizers/tokenizers-0.21.0.ebuild b/sci-libs/tokenizers/tokenizers-0.21.0.ebuild new file mode 100644 index 000000000000..560e81795d3e --- /dev/null +++ b/sci-libs/tokenizers/tokenizers-0.21.0.ebuild @@ -0,0 +1,417 @@ +# Copyright 2023-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.13.3 + +EAPI=8 + +DISTUTILS_USE_PEP517=maturin +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_EXT=1 +DISTUTILS_SINGLE_IMPL=1 + +CRATES=" + adler2@2.0.0 + aho-corasick@1.1.3 + anes@0.1.6 + anstream@0.6.18 + anstyle@1.0.10 + anstyle-parse@0.2.6 + anstyle-query@1.1.2 + anstyle-wincon@3.0.6 + assert_approx_eq@1.1.0 + autocfg@1.4.0 + base64@0.13.1 + base64@0.22.1 + bit-set@0.5.3 + bit-vec@0.6.3 + bitflags@1.3.2 + bitflags@2.6.0 + bitflags@2.7.0 + bumpalo@3.16.0 + byteorder@1.5.0 + cast@0.3.0 + cc@1.2.1 + cc@1.2.8 + cfg-if@1.0.0 + ciborium-io@0.2.2 + ciborium-ll@0.2.2 + ciborium@0.2.2 + clap@4.5.26 + clap_builder@4.5.26 + clap_lex@0.7.4 + colorchoice@1.0.3 + console@0.15.8 + console@0.15.10 + core-foundation-sys@0.8.7 + core-foundation@0.9.4 + crc32fast@1.4.2 + criterion-plot@0.5.0 + criterion@0.5.1 + crossbeam-deque@0.8.5 + crossbeam-deque@0.8.6 + crossbeam-epoch@0.9.18 + crossbeam-utils@0.8.20 + crossbeam-utils@0.8.21 + crunchy@0.2.2 + darling@0.20.10 + darling_core@0.20.10 + darling_macro@0.20.10 + derive_builder@0.20.2 + derive_builder_core@0.20.2 + derive_builder_macro@0.20.2 + dirs-sys@0.4.1 + dirs@5.0.1 + displaydoc@0.2.5 + either@1.13.0 + encode_unicode@0.3.6 + encode_unicode@1.0.0 + env_filter@0.1.2 + env_logger@0.11.5 + erased-serde@0.4.5 + errno@0.3.9 + errno@0.3.10 + esaxx-rs@0.1.10 + fancy-regex@0.13.0 + fastrand@2.2.0 + fastrand@2.3.0 + flate2@1.0.35 + fnv@1.0.7 + foreign-types-shared@0.1.1 + foreign-types@0.3.2 + form_urlencoded@1.2.1 + getrandom@0.2.15 + half@2.4.1 + heck@0.5.0 + hermit-abi@0.4.0 + hf-hub@0.3.2 + humantime@2.1.0 + icu_collections@1.5.0 + icu_locid@1.5.0 + icu_locid_transform@1.5.0 + icu_locid_transform_data@1.5.0 + icu_normalizer@1.5.0 + icu_normalizer_data@1.5.0 + icu_properties@1.5.1 + icu_properties_data@1.5.0 + icu_provider@1.5.0 + icu_provider_macros@1.5.0 + ident_case@1.0.1 + idna@1.0.3 + idna_adapter@1.2.0 + indicatif@0.17.9 + indoc@2.0.5 + is-terminal@0.4.13 + itertools@0.10.5 + itertools@0.11.0 + itertools@0.12.1 + itoa@1.0.14 + js-sys@0.3.72 + js-sys@0.3.76 + is_terminal_polyfill@1.70.1 + lazy_static@1.5.0 + libc@0.2.166 + libc@0.2.169 + libredox@0.1.3 + linux-raw-sys@0.4.14 + linux-raw-sys@0.4.15 + litemap@0.7.4 + log@0.4.22 + log@0.4.24 + macro_rules_attribute-proc_macro@0.2.0 + macro_rules_attribute@0.2.0 + matrixmultiply@0.3.9 + memchr@2.7.4 + memoffset@0.9.1 + minimal-lexical@0.2.1 + miniz_oxide@0.8.2 + monostate-impl@0.1.13 + monostate@0.1.13 + native-tls@0.2.12 + ndarray@0.15.6 + ndarray@0.16.1 + nom@7.1.3 + nu-ansi-term@0.46.0 + numpy@0.22.1 + num-complex@0.4.6 + num-integer@0.1.46 + num-traits@0.2.19 + number_prefix@0.4.0 + once_cell@1.20.2 + onig@6.4.0 + onig_sys@69.8.1 + oorandom@11.1.4 + openssl-macros@0.1.1 + openssl-probe@0.1.5 + openssl-sys@0.9.104 + openssl@0.10.68 + option-ext@0.2.0 + overload@0.1.1 + paste@1.0.15 + percent-encoding@2.3.1 + pin-project-lite@0.2.16 + pkg-config@0.3.31 + plotters-backend@0.3.7 + plotters-svg@0.3.7 + plotters@0.3.7 + portable-atomic-util@0.2.4 + portable-atomic@1.10.0 + ppv-lite86@0.2.20 + proc-macro2@1.0.92 + proc-macro2@1.0.93 + pyo3-build-config@0.22.6 + pyo3-ffi@0.22.6 + pyo3-macros-backend@0.22.6 + pyo3-macros@0.22.6 + pyo3@0.22.6 + quote@1.0.37 + quote@1.0.38 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + rawpointer@0.2.1 + rayon-cond@0.3.0 + rayon-core@1.12.1 + rayon@1.10.0 + redox_users@0.4.6 + regex-automata@0.4.9 + regex-syntax@0.8.5 + regex@1.11.1 + ring@0.17.8 + rustc-hash@1.1.0 + rustix@0.38.41 + rustix@0.38.43 + rustls-pki-types@1.10.1 + rustls-webpki@0.102.8 + rustls@0.23.21 + ryu@1.0.18 + same-file@1.0.6 + schannel@0.1.27 + security-framework-sys@2.14.0 + security-framework@2.11.1 + serde@1.0.215 + serde@1.0.217 + serde_derive@1.0.215 + serde_derive@1.0.217 + serde_fmt@1.0.3 + serde_json@1.0.133 + serde_json@1.0.135 + sharded-slab@0.1.7 + shlex@1.3.0 + smallvec@1.13.2 + spin@0.9.8 + spm_precompiled@0.1.4 + stable_deref_trait@1.2.0 + strsim@0.11.1 + subtle@2.6.1 + sval@2.13.2 + sval_buffer@2.13.2 + sval_dynamic@2.13.2 + sval_fmt@2.13.2 + sval_json@2.13.2 + sval_nested@2.13.2 + sval_ref@2.13.2 + sval_serde@2.13.2 + syn@2.0.89 + syn@2.0.96 + synstructure@0.13.1 + target-lexicon@0.12.16 + tempfile@3.14.0 + tempfile@3.15.0 + thiserror-impl@1.0.69 + thiserror@1.0.69 + thread_local@1.1.8 + tinystr@0.7.6 + tinytemplate@1.2.1 + tracing-attributes@0.1.28 + tracing-core@0.1.33 + tracing-log@0.2.0 + tracing-subscriber@0.3.19 + tracing@0.1.41 + typeid@1.0.2 + unicode-ident@1.0.14 + unicode-normalization-alignments@0.1.12 + unicode-segmentation@1.12.0 + unicode-width@0.1.14 + unicode-width@0.2.0 + unicode_categories@0.1.1 + unindent@0.2.3 + untrusted@0.9.0 + ureq@2.12.1 + url@2.5.4 + utf16_iter@1.0.5 + utf8parse@0.2.2 + utf8_iter@1.0.4 + valuable@0.1.0 + value-bag-serde1@1.10.0 + value-bag-sval2@1.10.0 + value-bag@1.10.0 + vcpkg@0.2.15 + walkdir@2.5.0 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.95 + wasm-bindgen-backend@0.2.99 + wasm-bindgen-macro-support@0.2.95 + wasm-bindgen-macro-support@0.2.99 + wasm-bindgen-macro@0.2.95 + wasm-bindgen-macro@0.2.99 + wasm-bindgen-shared@0.2.95 + wasm-bindgen-shared@0.2.99 + wasm-bindgen@0.2.95 + wasm-bindgen@0.2.99 + web-sys@0.3.76 + web-time@1.1.0 + webpki-roots@0.26.7 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.9 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-sys@0.59.0 + windows-targets@0.48.5 + windows-targets@0.52.6 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.6 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.6 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.6 + windows_i686_gnullvm@0.52.6 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.6 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.6 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.6 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.6 + write16@1.0.0 + writeable@0.5.5 + yoke-derive@0.7.5 + yoke@0.7.5 + zerocopy-derive@0.7.35 + zerocopy@0.7.35 + zerofrom-derive@0.1.5 + zerofrom@0.1.5 + zeroize@1.8.1 + zerovec-derive@0.10.3 + zerovec@0.10.4 +" + +inherit cargo distutils-r1 + +DESCRIPTION="Implementation of today's most used tokenizers" +HOMEPAGE="https://github.com/huggingface/tokenizers" +SRC_URI=" + https://github.com/huggingface/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.gh.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="Apache-2.0" +# Dependent crate licenses +LICENSE+=" + Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 + Unicode-DFS-2016 +" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND=" + test? ( sci-libs/datasets[${PYTHON_SINGLE_USEDEP}] ) + $(python_gen_cond_dep ' + dev-python/setuptools-rust[${PYTHON_USEDEP}] + ') +" + +distutils_enable_tests pytest + +QA_FLAGS_IGNORED=".*/site-packages/tokenizers/.*so" + +src_unpack() { + cargo_src_unpack +} + +pkg_setup() { + python-single-r1_pkg_setup + rust_pkg_setup +} + +src_prepare() { + default + cd bindings/python + eapply "${FILESDIR}"/${PN}-0.15.2-test.patch + distutils-r1_src_prepare +} + +src_configure() { + cd tokenizers + cargo_src_configure + cd ../bindings/python + distutils-r1_src_configure +} + +src_compile() { + cd tokenizers + cargo_src_compile + cd ../bindings/python + distutils-r1_src_compile +} + +src_test() { + cd tokenizers + # Tests do not work + #cargo_src_test + cd ../bindings/python + local EPYTEST_DESELECT=( + "tests/bindings/test_tokenizer.py::TestTokenizer::test_encode_formats" + "tests/bindings/test_encoding.py::TestEncoding::test_sequence_ids" + "tests/bindings/test_encoding.py::TestEncoding::test_n_sequences" + "tests/bindings/test_encoding.py::TestEncoding::test_word_to_tokens" + "tests/bindings/test_encoding.py::TestEncoding::test_word_to_chars" + "tests/bindings/test_encoding.py::TestEncoding::test_token_to_sequence" + "tests/bindings/test_encoding.py::TestEncoding::test_token_to_chars" + "tests/bindings/test_encoding.py::TestEncoding::test_token_to_word" + "tests/bindings/test_encoding.py::TestEncoding::test_char_to_token" + "tests/bindings/test_encoding.py::TestEncoding::test_char_to_word" + "tests/bindings/test_encoding.py::TestEncoding::test_truncation" + "tests/bindings/test_encoding.py::TestEncoding::test_invalid_truncate_direction" + "tests/bindings/test_models.py::TestBPE::test_instantiate" + "tests/bindings/test_models.py::TestWordLevel::test_instantiate" + "tests/bindings/test_models.py::TestWordPiece::test_instantiate" + "tests/bindings/test_processors.py::TestByteLevelProcessing::test_processing" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_encode_add_special_tokens" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_from_pretrained" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_from_pretrained_revision" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_encode_special_tokens" + "tests/bindings/test_tokenizer.py::TestTokenizer::test_splitting" + "tests/bindings/test_trainers.py::TestUnigram::test_continuing_prefix_trainer_mistmatch" + "tests/bindings/test_trainers.py::TestUnigram::test_train" + "tests/documentation/test_pipeline.py::TestPipeline::test_pipeline" + "tests/documentation/test_pipeline.py::TestPipeline::test_bert_example" + "tests/documentation/test_quicktour.py::TestQuicktour::test_quicktour" + "tests/documentation/test_tutorial_train_from_iterators.py::TestTrainFromIterators::test_datasets" + "tests/documentation/test_tutorial_train_from_iterators.py::TestTrainFromIterators::test_gzip" + "tests/implementations/test_bert_wordpiece.py::TestBertWordPieceTokenizer::test_basic_encode" + "tests/implementations/test_bert_wordpiece.py::TestBertWordPieceTokenizer::test_multiprocessing_with_parallelism" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_basic_encode" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_add_prefix_space" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_lowerspace" + "tests/implementations/test_byte_level_bpe.py::TestByteLevelBPE::test_multiprocessing_with_parallelism" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_basic_encode" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_lowercase" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_decoding" + "tests/implementations/test_char_bpe.py::TestCharBPETokenizer::test_multiprocessing_with_parallelism" + "tests/test_serialization.py::TestSerialization::test_full_serialization_albert" + "tests/test_serialization.py::TestSerialization::test_str_big" + ) + local -x EPYTEST_IGNORE=(benches/) + distutils-r1_src_test +} + +src_install() { + cd tokenizers + cd ../bindings/python + distutils-r1_src_install +} 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..e07838213948 100644 --- a/sci-libs/transformers/Manifest +++ b/sci-libs/transformers/Manifest @@ -1,3 +1,5 @@ -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.46.3.gh.tar.gz 19535462 BLAKE2B 3687d6a621c7823c35c3de3e0db31bc64d9c39c065936637042be5c4d7ca617083d5143484a24690f8460765e19a14b758c42321235ad09915a23302d3eaea0f SHA512 f07c80c2301b504edbe8cfa8894a420ef9628218a8a3c5a4f6bdab32df4ef020354810a762eee556e7b92c39bf106b65dfc89af53111a3ad06a5a4aabffc8029 +DIST transformers-4.47.1.gh.tar.gz 19755552 BLAKE2B 7fbfde2f4b84ffcf411ead2b1c7d43ce0cd9615795dee6bf7271c5c17a125537d87506a4c663e454e10938f7482cf4acc14972cbaa50ef8884ecbc091c346b8d SHA512 105f60899aa05fb9e1e79b8e2e7c60ec5463c73707f8b77f744ad0ac0e83c6e8cd38d1838f74e93377891617b9f0e0d58533cf083db2550999f33a34c159b1c8 +EBUILD transformers-4.46.3.ebuild 4793 BLAKE2B 32cb54098a8243fd62d45cd4291a4b25f9e43c1b7bf289a9058b2b48bc020a31cab359b547f8ec9d16124c40618457d7228b66cae8e461d5477cdcc859aefe1d SHA512 277b1a2ea1579eae59320ea3f6359c6092c1de8bfd08ff9422063935d697404756eade02c7050c89e328bab320472af5cfb9edf2dd9e26c59d843e60f77d1f0a +EBUILD transformers-4.47.1.ebuild 4560 BLAKE2B 3c2d5b9ff0ca162b1dd312e235ff1a2f0be255d1ed58a8aaba018a6d057cc5a28e66962022d1477491e119a4fa4c4a2418855c09226556a00a8f6cfe32a4491e SHA512 e8de46fa297eb4b2c055866fb94b23d5a8d7540f0d316515ddc0bb44725cdf1584cedd65273cd5e94c3fc22ae055695a790ee86a454fb98d09e45dd0c07c82fa 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.46.3.ebuild b/sci-libs/transformers/transformers-4.46.3.ebuild new file mode 100644 index 000000000000..ab0f1c5c3c48 --- /dev/null +++ b/sci-libs/transformers/transformers-4.46.3.ebuild @@ -0,0 +1,116 @@ +# 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 + +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}] + ') +" +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/bartpho/test_tokenization_bartpho.py + tests/models/big_bird/test_modeling_big_bird.py + tests/models/cpm/test_tokenization_cpm.py + tests/models/layoutxlm/test_processor_layoutxlm.py + tests/models/layoutxlm/test_tokenization_layoutxlm.py + tests/models/mluke/test_tokenization_mluke.py + tests/models/nllb/test_tokenization_nllb.py + tests/models/qwen2_audio/test_modeling_qwen2_audio.py + tests/models/seamless_m4t/test_processor_seamless_m4t.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_processor_speecht5.py + tests/models/speecht5/test_tokenization_speecht5.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/utils/test_file_utils.py + tests/models/audio_spectrogram_transformer/test_feature_extraction_audio_spectrogram_transformer.py + tests/models/beit/test_image_processing_beit.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/dac/test_feature_extraction_dac.py + tests/models/deformable_detr/test_image_processing_deformable_detr.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/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/musicgen_melody/test_feature_extraction_musicgen_melody.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/pixtral/test_image_processing_pixtral.py + tests/models/pop2piano/test_feature_extraction_pop2piano.py + tests/models/qwen2_vl/test_image_processing_qwen2_vl.py + tests/models/seamless_m4t/test_feature_extraction_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/speecht5/test_feature_extraction_speecht5.py + tests/models/superpoint/test_image_processing_superpoint.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 + ) + + local EPYTEST_DESELECT=( + tests/repo_utils/test_check_copies.py::CopyCheckTester::test_is_copy_consistent + tests/repo_utils/test_check_copies.py::CopyCheckTester::test_is_copy_consistent_with_ignored_match + tests/repo_utils/test_check_copies.py::CopyCheckTester::test_is_copy_consistent_with_ignored_no_match + ) + + EPYTEST_FLAGS="--dist=loadfile -s ./tests/" + + distutils-r1_src_test +} 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/vtk/Manifest b/sci-libs/vtk/Manifest index d74d98084e3f..e1e84e99e93c 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -2,28 +2,16 @@ AUX vtk-9.2.5-pegtl-3.x.patch 4679 BLAKE2B 0c0be426ac07c2dcab275fb84ef68f6fe3e91 AUX vtk-9.3.0-ThirdParty-gcc15.patch 2444 BLAKE2B cc3e209a1c9df09a03dd365cd6999b9666bdcbfc9e7b922394e420e0d8089b120040c1b44260918908e133e2e283fd2ddd1d9e35506737831bab1d08ccd22beb SHA512 e45b8b1f08d9a9a1a7b0c220cc5ee96647394a1bbd079f5900e76e51438ac9795dcbeee7fcf8201bf13e17cc1e8908d35146320331e6e02ccfa76b8e6f1ae731 AUX vtk-9.3.0-ThrustPatches.patch 2026 BLAKE2B e51c72b9d2bfb0e7e968f1c9f0896a70d6215f60d21dd234c26feb7a47653c46c8d75b24b1ab0286e51d228b6c4ff7fefd34c01f5b8e885dc1cab6190fc9c6f7 SHA512 b326839c82682e7c1fc1e19d836fb55837417bbf0c23ccb28edc84dd519f085cce0a07221bf6c9e794d1b8a73ecd77c154f82cb602feef9e8d8962b2e8fabd92 AUX vtk-9.3.0-core-octree_node.txx.patch 670 BLAKE2B 6f53735716d6c75bfcf41dbc27331a4ac495f474c540b06c7a1b62e71b84af88304c2364e88060aae9cd015866138240f40ba28e0db8470e7a841cfb06ef827e SHA512 36d9b12f29e60bb773745263996eaf9fed2f6dee4e3be7f593f5a72e25909d30cde90828c54e1981290640b9f4cae85b20292ae054b6b5f2ee4420f27d23c07f -AUX vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch 2356 BLAKE2B 45e2569239b5dcd4e26a007746179cb1743cc4269f82d2fff2cdb2d5188f47cf84315ddb850f2dcc602595d928569c41f986ed6677fabf52e91a0b15b8ed3225 SHA512 dff1bb8d4480ef7d8f6672015c11c29bc7ac2ee396f473c388b236b30326978b80b0a557cc8910fce34f9c54db9ef31b7a1440c930faf83c5b4acca9ecbee99c AUX vtk-9.3.0-java.patch 372 BLAKE2B ec11a69bf2e7b467b00648b0bc725f838f9931bce2f2cd1cbabe6d4c8fdcd4ef807dd14eedf06d524eecc3c9bc77850cc8de5e55ceaf8a238efa501c8bb36cf9 SHA512 6d326f95b05fd86d87a0566e45efb484d92d482a916895d3aaca1e019ceac65ecbcdab2957a8686545898551a3382aa718a57ad0d9e9cd16937166bf3f0729d8 AUX vtk-9.3.0-opencascade-7.8.0.patch 819 BLAKE2B 51f4af785af5f44b21b641a631fe63c5e308558d573c03d02646691fd3762dce89670be80da2284769fe30129861982a062aea8574c90ea7472d7875ba8b2fbb SHA512 6d3bec28921d7e3b61fa10cbe68a529190248519f67d52365b0d73f2ce265aae028b7db4601b60c13fdd309db8b4164f2134961acf27e8f0778ec649674442a0 AUX vtk-9.3.0-opencascade.patch 624 BLAKE2B 8188da64b12213074a4093ee0dd047fcf91a777742492dfe0cb1e93b597c23e78406e4783b3cdff23ffcac81655efa370bb3746a69d166edd138ec45beeb5c09 SHA512 1a0da4ffb822a038a13201d83f1cf6b42d4438073ea35fe3654d9e907e20c12306b47a511b72cb843097327a186b36560e2590ded47ce73aa8eb5a7655664236 -AUX vtk-9.3.0-pdal-2.6.0.patch 1748 BLAKE2B 9210b5ceceb95a5d74bd7ed4815faf809206bf3f66bc1606cf17124abfab6252a87285561fd9a3e0b1e542d981e714b3e5d1ae2137672beb9bc3c25d3f5afced SHA512 59cd68181857ffb3e428f6ae46b807fda6b3e1c1d4985e31f13b7d7ff177368e1ea65fa7e4bb5ce0d004ba7a9d1aef54e4e231111f05f638ddce8b360213f2f0 -AUX vtk-9.3.0-r1-expat-2.6.0.patch 2527 BLAKE2B 30006963525dcd4c06414c03e5504376853c2114c1b6f9a8eee862d15a21188ff0432fc32174bd9b4bc62bc9d3624c9107bff8772fb3610dfe54fca47f025a0e SHA512 16196fac6bee600ccc0da04d496cf56ffaf6a1a8d1146e3f7dbd87f12bd77eae7bd3716d6d7373a1e97b91c60c8e33591029b4cac9e7c2f2e5b875dc4d90c690 -AUX vtk-9.3.0-too-many-initializer-values.patch 1132 BLAKE2B 06513e3b0c32686b5665378d745fef3c21669cfe5e87bd804fd69122a49c6133794ae74dfb0a62d3e756fde3da0e92e44d86839885c3da827659bafd3e9e6ecd SHA512 a6e6c85b51bf564650da5a0266c85a9327db0d20c5ee1ead904924f171398771e737e7f66e2b9f1579190c9f395e4032740d643003d4ac3e04ba7fe958863a6f AUX vtk-9.3.0-update-for-cuda-12.6.patch 779 BLAKE2B 406dc4e2f57009351819d6536eb82ca9566c0544fe664e8a7867f5a36e67e084dbcb3dc60e151db4ef53c881465cd49d604b9b039ff69dfd3e4e8fe420ef0240 SHA512 d293b2a741a6042c30e835d7aa1071344d7813d07099f913d4ca5e4e728f31df233a50bed6a787d712a5eea8fb2396d9bfb4192f71fe7cff927ea1a0332b260a -AUX vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch 917 BLAKE2B 01d9a8b06a9ace6ca679bac9dcac96c9ec1842d97e85e3271cd76f424d8c07ea8624b9b2de759f07e1d5b2c2acdc2bf54a4272c205c7b99d04bf34c1f5d01d95 SHA512 df41793594f52b12b20ddc42dc701e6d2ae7404f13f7826bae48c9e5d83a5b55455617de75aaa7678eac5562b02c5c5458f0f767b3aa34f66b468f39990c2623 AUX vtk-9.3.1-fix-fmt-11.patch 2450 BLAKE2B 91ce3cb941b7a1bf4c1098f582db146bb39b8260c285578c1e0473a652d563d42664592c47f20cd9f67c4dd7f2f2db4d17ff2dd7430441459664569a19cbf601 SHA512 f1567d4320ea591c7ad0015b0922c1b4a97d628242ee33ca573edb68bbafb8a32a783e955e0bc2ac5a23fe3606239510a956f67ae0b89c914570d8a0c0276f88 -DIST VTK-9.3.0.tar.gz 99932810 BLAKE2B 59c2cdfe1c2525ac0f89df77a668783d928b55d2e72b42df45ea9b789da1bb150d52ce4108f2bc39cb8840cdd1998f57d3aedf96c72e402f6115d9efeebf4486 SHA512 2722dc8186779df1af5c534f26b20186ea33cb3bca2cef8cb333542b12e738382616e26e8d4d0341cb98c30403f8a896d77ddb04adb07e26d0d548c4a34b7d2f DIST VTK-9.3.1.tar.gz 99964158 BLAKE2B b85aae0aef1a22bd0496e0f5d2c7d3a5c20bbd7db8951ab1f9fe29a48c01ce960e90dc85f36cb6858c2b7dfd7f12cd1cf2e7d0fbb115fc9fd709dd7b481c598e SHA512 5dcd6764b2d9fe476bcc7bd195fab8230b7628579d94656ab037dcaecd07c7d40d0fc4afba446942ca15cd881df17f4c84581047e75a6e11d2e2d339d97c7fa3 -DIST VTKData-9.3.0.tar.gz 612388942 BLAKE2B 66d73ddaf5f2ddf52cf5c6dda5a918a86ae630df207983534478c92a66c39e38b1f4abfb93900b36899a93ad0e26260763573e925bd128c1646a1bc3bef8c54d SHA512 385d609c2adc1746c073690b58a3fc25e496946c03f08e6c9e0a69ee406cee447e66d267986c3e5ba9006dd1cb0015b68134bb3c375ae41aef8f3b1e0d923d51 DIST VTKData-9.3.1.tar.gz 612744946 BLAKE2B 6b3a09f6cc98630e817aaeca8094c6a6625372269abfa9003212cd1cdbc101b198f5eeb3474ca675be7f03046c58a5d11b4092ab19ed230422c4100011abfee4 SHA512 befc6b68e33d2c2fb6928006d4fe6feda7e0bbaf31df4488911ab8e3865e3fc1cf3834301301aa2b6de94c4489eebf5e2e8521e8830315d2a1f0e65cb73a6fd3 -DIST VTKDataFiles-9.3.0.tar.gz 628646039 BLAKE2B c2a4e875536c0b06f1edc8a8df17defbe1038067d7a04fc07e71ea49cad46139ef25f64d4b434a095ced16a7ff39d5346d34c528c099ea2e126c9f29afe92482 SHA512 c6788acfa790ce6b02aa5545fa4e411d00896b7542416c18b5e5955909f26a8fab9267e44db1c2a86f95f7a7f093695453f3fd0ec4e2c9a73449f9caf3fc09d5 DIST VTKDataFiles-9.3.1.tar.gz 628903288 BLAKE2B cf5919a627ee49809f79d29577d65a48c3332255551c3c229875b25fce911c75c3edeca8d0dfdf9926f93543963ab0e2c992c7469e2c9eed041c39cfd995647d SHA512 360fadd31ab304a27b208745c674eb31759552e98f587569f481c1bda62c7f8ae72598cd40b2c628bb211aace8f62df2ea7ca66f192f8d2e71bca7a4deaa9e89 -DIST VTKLargeData-9.3.0.tar.gz 247520869 BLAKE2B e01f3d0997d0b328d6c5909d6b891443c1246bdbc36aa978004a1d4bb2770f7923afed2c0d78f7844aae95e067425b9dd25a1c47601c8137ba0a8a958b708cab SHA512 d87eb0fb4ce27ae9f4363c54bb711e66c5d2dbcdf508cb5fae9fcc1574407df2816f29d20037297b834440cd8a54fcf8e1d6db14700054f057bff2fe48404d33 DIST VTKLargeData-9.3.1.tar.gz 247523669 BLAKE2B 88ec5046f502db14dd6a26ef81e386babaf560619e16d769834e96046eab46cf762d8c80f9b51c434b77e4e145d8f60e32efbdb4f57d8305494177abec0806ef SHA512 edf5610edfae90f8465d68e0e06e82018978ba27f5b2ae9701939aeb72019acaabeda435c15787f1c4828b44e34c79e2837565a81d6a3accd368a92c6eacebd1 -DIST VTKLargeDataFiles-9.3.0.tar.gz 247503839 BLAKE2B 68007af36148eaae43fc0fd75b9f8d3b165c977b7bc44efa4ce7077dc4977514f49a4d7d5e4a9e43fc9dec6562d741bdee5df87efa285b3361f865023da14f55 SHA512 f7def947ff492acbfdaa3d360064c42fdd3fedab27fd5d7bed1dbf8054b814cc8843ba0fed7078926648d1e8949235b877de97747be079ea478b79558975e6ea DIST VTKLargeDataFiles-9.3.1.tar.gz 247505524 BLAKE2B 5de069309c59a8a73365fb9faba9904189d723fb72976f372e40db3eb100342a19fecd582bd0aa42fc1012675b442a8e42611632004d6b6d6708468c27a4265e SHA512 bbbf0c193432cb5d8a5618c41e66609c7e6f3e4f24f588124c46b537ecec28b5670420b7f77185da534e4098f8b95d8ec4e392fc017df934a84bfc9dc833f634 -DIST vtkDocHtml-9.3.0.tar.gz 165538725 BLAKE2B 27874998679090d5442ecb3a394b53db05a0215cfee9f912bd01af1d5567efc51b4f56dacb960401195da4f3d385b335bbefc922a45d0199c99d619df0941f08 SHA512 8bf9cc87c4653a65ccc39d88d70b421a7b4353986d380cbf558cbf6e8a96435695a5d54aa7ce5bb1240cb46ca0fd9225a51183a39d1af1101d3f2876a2afc10b DIST vtkDocHtml-9.3.1.tar.gz 165542400 BLAKE2B da8084137b2848f82bf091535950738bd718e65cac8f461fdfb8e9c63ef6db68acfa02655531c8fe22e35f89395d2d066aa5b051abac0e774883552c898de6d9 SHA512 de0d2153c97864b49a8b99e6fbfc8bab78c1522d25bf40ed1f271a8bb4f1f205b008d6bd39f835816972c8439d01f78b68f34d1f88f87755174f0d559841ba29 -EBUILD vtk-9.3.0-r3.ebuild 36282 BLAKE2B bdc9308f7477a56f6b5e391942d829bb72e7446a058f8b61b2d931a6300ecf289486903a24a3c997057e135760d06a042bf1189147bb561fb3b91aa2969b34e4 SHA512 b6262a241a493c12d74e0c919f34d6d7d3a8544bbf4a0dc9b28fb1a2019f0ca6a046b476ad3064b870f5ab154adac3e717dc81e5dde4971d9feb52223d7af6d7 -EBUILD vtk-9.3.1.ebuild 34528 BLAKE2B 3c9be925f33053b5088fbd384a162512f3a3419ad5fa61807275399162f5d71ee6e693f104ec9621a9f54e9e49eb7120166a6c647662835d5cc49d8b016a07b8 SHA512 7a4a79e96e60d3c7c7fe01486be10ab270ed6eb9f2be87a15f107de316265e8b9fb546ca68161cf1743152f885e03ea8f3ce3daaf5b32af6f66b0eaf2fd172f9 -MISC metadata.xml 1765 BLAKE2B f17c8864280100ef5e6993cc9d529336b9b226e1110fe24bcde3ea8b045fa1aa89bdb36de0e7b76e8ed0b4e6ee0915c8700520a81811983541d4c89b3bcb8acd SHA512 7e5039d28711a39b96ad3d23812a744bd33db38ef9c2f58b5725dfff701b03543fb630f4014ccae117855d09229c36665d815b03591c3d38806be15a08d2a272 +EBUILD vtk-9.3.1.ebuild 34551 BLAKE2B 56923a070a4e5f3a0a9f5963333f09da14eff2c8df7d8641ec6df3c6131af1345c99be31a90ec2e4b5b5a60b1c552b7f4cd237417de245ca397fc726f006aaa7 SHA512 6b2372cc02a771e637d519f49e3e0dea38a3a717a44ec3a7305658e1ad6944713d2331be0a3ebdee5da0b5e6e1f80e5d79bc9c59e0a34253913c9a3981506345 +MISC metadata.xml 1699 BLAKE2B befce4e1f61b6cb0d772a2826ed9349cf36832ebc0507edc2dff658441b44be351c1fe97c74ac9b21eed8310a254dd2a3b408bc93a15c4b2db8cd55a5e3f703a SHA512 d9921a30c66ef3a3d2a27da1add22a29352cd3fd71c49e834523931b8edf21ca0d785290cddabbe29b068ce00fa05a898c331a1ad80ffaa190e9f92b1a1ab64d diff --git a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch b/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch deleted file mode 100644 index 7dd005ff4191..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-fix-Java-error-with-integer-enum-overloads.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: dd7acfb4548dc76f1191aa96778f35c0cda80d35 Mon Sep 17 00:00:00 2001 -From: David Gobbi <david.gobbi@gmail.com> -From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10712 -Date: Sat, 18 Nov 2023 15:57:18 -0700 -Subject: [PATCH] Fix Java error with integer, enum overloads - -The Java wrappers simply cast enum types to 'jint', and do not -distinguish them as individual types that are distinct from 'int' -or 'unsigned int'. So when a method is overloaded with both 'int' -and an enum type, only one of the overloads can be wrapped. The -'int' (or 'unsigned int') is the one that is chosen. ---- a/Wrapping/Tools/vtkParseJava.c -+++ b/Wrapping/Tools/vtkParseJava.c -@@ -248,9 +248,10 @@ void return_result_native(FILE* fp) - * return 0 if the types do not map to the same type */ - static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2) - { -+ /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */ - static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 }; - static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 }; -- static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; -+ static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; - static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG, - VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 }; - ---- a/Wrapping/Tools/vtkWrapJava.c -+++ b/Wrapping/Tools/vtkWrapJava.c -@@ -639,9 +639,10 @@ void OutputFunctionResult(FILE* fp) - * return 0 if the types do not map to the same type */ - static int CheckMatch(unsigned int type1, unsigned int type2, const char* c1, const char* c2) - { -+ /* VTK_PARSE_UNKNOWN is used for enum types, which are mapped to java's int type */ - static unsigned int byteTypes[] = { VTK_PARSE_UNSIGNED_CHAR, VTK_PARSE_SIGNED_CHAR, 0 }; - static unsigned int shortTypes[] = { VTK_PARSE_UNSIGNED_SHORT, VTK_PARSE_SHORT, 0 }; -- static unsigned int intTypes[] = { VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; -+ static unsigned int intTypes[] = { VTK_PARSE_UNKNOWN, VTK_PARSE_UNSIGNED_INT, VTK_PARSE_INT, 0 }; - static unsigned int longTypes[] = { VTK_PARSE_UNSIGNED_LONG, VTK_PARSE_UNSIGNED_LONG_LONG, - VTK_PARSE_LONG, VTK_PARSE_LONG_LONG, 0 }; - --- -GitLab - diff --git a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch deleted file mode 100644 index 261f3736eb3d..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-pdal-2.6.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: ccee5db79d6037c4d752b5f29dc30fb0dfd039bf Mon Sep 17 00:00:00 2001 -From: Timothée Couble <timothee.couble@kitware.com> -From: https://gitlab.kitware.com/vtk/vtk/-/merge_requests/10692 -Date: Fri, 10 Nov 2023 10:03:07 +0100 -Subject: [PATCH 1/2] IOPDAL: Always links with pdalcpp - -pdal_base and pdal_utils libraries are removed in PDAL 2.6.0 -link with pdalcpp instead starting from this version. ---- a/IO/PDAL/CMakeLists.txt -+++ b/IO/PDAL/CMakeLists.txt -@@ -3,14 +3,20 @@ vtk_module_find_package(PACKAGE PDAL VERSION 2.1) - set(classes - vtkPDALReader) - --set(pdal_libraries pdal_util) --if (APPLE OR WIN32) -+set(pdal_libraries) -+if (PDAL_VERSION VERSION_LESS "2.6") -+ set(pdal_libraries pdal_util) -+ if (APPLE OR WIN32) -+ list(APPEND pdal_libraries -+ pdalcpp) -+ else() -+ list(APPEND pdal_libraries -+ pdal_base) -+ endif() -+else () - list(APPEND pdal_libraries - pdalcpp) --else() -- list(APPEND pdal_libraries -- pdal_base) --endif() -+endif () - - vtk_module_add_module(VTK::IOPDAL - CLASSES ${classes}) --- -GitLab - - -From 5bf45b44760bac09b0079827346e78af38d981af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timoth=C3=A9e=20Couble?= <timothee.couble@kitware.com> -Date: Fri, 10 Nov 2023 10:12:32 +0100 -Subject: [PATCH 2/2] Add support for PDAL 2.0 version - ---- a/IO/PDAL/CMakeLists.txt -+++ b/IO/PDAL/CMakeLists.txt -@@ -23,4 +23,13 @@ vtk_module_add_module(VTK::IOPDAL - vtk_module_link(VTK::IOPDAL - PRIVATE - ${pdal_libraries}) -+ -+# PDAL 2.0 didn't include interfaces to its exported targets. -+# Resolved in https://github.com/PDAL/PDAL/issues/2262. -+if (PDAL_VERSION VERSION_LESS "2.1") -+ vtk_module_include(VTK::IOPDAL -+ PRIVATE -+ ${PDAL_INCLUDE_DIRS}) -+endif () -+ - vtk_add_test_mangling(VTK::IOPDAL) --- -GitLab - diff --git a/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch b/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch deleted file mode 100644 index ac519f98aa63..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-r1-expat-2.6.0.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3efa07ad277efe5c1d11a2ef2b907c095f68bbef Mon Sep 17 00:00:00 2001 -From: Ben Boeckel <ben.boeckel@kitware.com> -Date: Mon, 15 Apr 2024 22:22:22 -0400 -Subject: [PATCH] vtkXMLDataParser: track `AppendedData` state explicitly - -Newer `libexpat` doesn't like being given the appended data after the -artificially ended document anymore. Avoid pushing it through to its -parser. - -(cherry picked from commit db8f9efca220c9d16a30958e179abae3379d0011) - -Fixes: #19258 ---- - IO/XMLParser/vtkXMLDataParser.cxx | 6 +++++- - IO/XMLParser/vtkXMLDataParser.h | 3 +++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/IO/XMLParser/vtkXMLDataParser.cxx b/IO/XMLParser/vtkXMLDataParser.cxx -index 1f6006d37c2..7d38092fdd7 100644 ---- a/IO/XMLParser/vtkXMLDataParser.cxx -+++ b/IO/XMLParser/vtkXMLDataParser.cxx -@@ -36,6 +36,7 @@ vtkXMLDataParser::vtkXMLDataParser() - this->RootElement = nullptr; - this->AppendedDataPosition = 0; - this->AppendedDataMatched = 0; -+ this->AppendedDataFound = false; - this->DataStream = nullptr; - this->InlineDataStream = vtkBase64InputStream::New(); - this->AppendedDataStream = vtkBase64InputStream::New(); -@@ -88,6 +89,7 @@ void vtkXMLDataParser::PrintSelf(ostream& os, vtkIndent indent) - { - this->Superclass::PrintSelf(os, indent); - os << indent << "AppendedDataPosition: " << this->AppendedDataPosition << "\n"; -+ os << indent << "AppendedDataFound: " << this->AppendedDataFound << "\n"; - if (this->RootElement) - { - this->RootElement->PrintXML(os, indent); -@@ -214,7 +216,7 @@ int vtkXMLDataParser::ParsingComplete() - // If we have reached the appended data section, we stop parsing. - // This prevents the XML parser from having to walk over the entire - // appended data section. -- if (this->AppendedDataPosition) -+ if (this->AppendedDataPosition || this->AppendedDataFound) - { - return 1; - } -@@ -433,6 +435,8 @@ int vtkXMLDataParser::ParseBuffer(const char* buffer, unsigned int count) - { - return 0; - } -+ -+ this->AppendedDataFound = true; - } - - return 1; -diff --git a/IO/XMLParser/vtkXMLDataParser.h b/IO/XMLParser/vtkXMLDataParser.h -index 1504a4d400b..142bf28327d 100644 ---- a/IO/XMLParser/vtkXMLDataParser.h -+++ b/IO/XMLParser/vtkXMLDataParser.h -@@ -204,6 +204,9 @@ protected: - // How much of the string "<AppendedData" has been matched in input. - int AppendedDataMatched; - -+ // Whether AppendedData has been dealt with or not. -+ bool AppendedDataFound; -+ - // The byte order of the binary input. - int ByteOrder; - --- -GitLab - diff --git a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch b/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch deleted file mode 100644 index 4be0e88b769c..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-too-many-initializer-values.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Paul Zander <negril.nx+gentoo@gmail.com> -Subject: [PATCH] vtkm: too many initializer values - -Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> - ---- a/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx -+++ b/Accelerators/Vtkm/Core/vtkmlib/vtkmDataArray.hxx -@@ -334,7 +334,7 @@ - auto TransformForScalarRange(const ArrayHandleType& src, - const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) - { -- DecoratorForScalarRanage decorator{ ghostValueToSkip, finitesOnly }; -+ DecoratorForScalarRanage decorator{ { ghostValueToSkip, finitesOnly } }; - return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost); - } - -@@ -342,7 +342,7 @@ - auto TransformForVectorRange(const ArrayHandleType& src, - const vtkm::cont::ArrayHandle<vtkm::UInt8>& ghost, vtkm::UInt8 ghostValueToSkip, bool finitesOnly) - { -- DecoratorForVectorRanage decorator{ ghostValueToSkip, finitesOnly }; -+ DecoratorForVectorRanage decorator{ { ghostValueToSkip, finitesOnly } }; - return vtkm::cont::make_ArrayHandleDecorator(src.GetNumberOfValues(), decorator, src, ghost); - } - diff --git a/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch b/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch deleted file mode 100644 index ddca73f492a6..000000000000 --- a/sci-libs/vtk/files/vtk-9.3.0-vtkm-drop-template-id-from-cdtor.patch +++ /dev/null @@ -1,20 +0,0 @@ -From e9977b71f31525aea5084b3fef9c2bd4c9ad93f1 Mon Sep 17 00:00:00 2001 -From: Paul Zander <negril.nx+gentoo@gmail.com> -Date: Sat, 7 Sep 2024 13:29:24 +0200 -Subject: [PATCH] vtkm: drop template-id from cdtor - -warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor] - -Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> - ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/openmp/internal/RuntimeDeviceConfigurationOpenMP.h -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/cont/openmp/internal/RuntimeDeviceConfigurationOpenMP.h -@@ -31,7 +31,7 @@ class RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagOpenMP> - : public vtkm::cont::internal::RuntimeDeviceConfigurationBase - { - public: -- RuntimeDeviceConfiguration<vtkm::cont::DeviceAdapterTagOpenMP>() -+ RuntimeDeviceConfiguration() - : HardwareMaxThreads(InitializeHardwareMaxThreads()) - , CurrentNumThreads(this->HardwareMaxThreads) - { diff --git a/sci-libs/vtk/metadata.xml b/sci-libs/vtk/metadata.xml index ce67b30442e4..8012d390eb78 100644 --- a/sci-libs/vtk/metadata.xml +++ b/sci-libs/vtk/metadata.xml @@ -17,7 +17,6 @@ <flag name="all-modules">Build all modules</flag> <flag name="boost">Add support for boost</flag> <flag name="cgns">Build support to handle CGNS data files</flag> - <flag name="freetype">Build support for font rendering</flag> <flag name="gdal">Support for gdal formated data</flag> <flag name="imaging">Building Imaging modules</flag> <flag name="las">Build support for LiDAR files</flag> diff --git a/sci-libs/vtk/vtk-9.3.0-r3.ebuild b/sci-libs/vtk/vtk-9.3.0-r3.ebuild deleted file mode 100644 index 3a522724f066..000000000000 --- a/sci-libs/vtk/vtk-9.3.0-r3.ebuild +++ /dev/null @@ -1,918 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: -# - add USE flag for remote modules? Those modules can be downloaded -# properly before building. -# - replace usex by usev where applicable - -PYTHON_COMPAT=( python3_{10..12} ) -WEBAPP_OPTIONAL=yes -WEBAPP_MANUAL_SLOT=yes - -inherit check-reqs cmake cuda java-pkg-opt-2 multiprocessing python-single-r1 toolchain-funcs virtualx webapp - -# Short package version -MY_PV="$(ver_cut 1-2)" -MY_PV2="${PV/_rc/.rc}" - -DESCRIPTION="The Visualization Toolkit" -HOMEPAGE="https://www.vtk.org/" -SRC_URI=" - https://www.vtk.org/files/release/${MY_PV}/VTK-${MY_PV2}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKData-${MY_PV2}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKDataFiles-${MY_PV2}.tar.gz - doc? ( https://www.vtk.org/files/release/${MY_PV}/vtkDocHtml-${MY_PV2}.tar.gz ) - examples? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz - ) - test? ( - https://www.vtk.org/files/release/${MY_PV}/VTKLargeData-${MY_PV2}.tar.gz - https://www.vtk.org/files/release/${MY_PV}/VTKLargeDataFiles-${MY_PV2}.tar.gz - ) -" -S="${WORKDIR}/VTK-${MY_PV2}" - -LICENSE="BSD LGPL-2" -SLOT="0/${MY_PV}" -KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" - -# TODO: Like to simplifiy these. Mostly the flags related to Groups. -IUSE="all-modules boost cuda debug doc examples ffmpeg +freetype gdal gles2-only imaging - java las +logging mpi mysql odbc opencascade openmp openvdb pdal postgres python qt5 - qt6 +rendering sdl tbb test +threads tk video_cards_nvidia +views vtkm web" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - all-modules? ( - boost ffmpeg freetype gdal imaging las mysql odbc opencascade openvdb pdal - postgres rendering views - ) - cuda? ( video_cards_nvidia vtkm !tbb ) - java? ( rendering ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( rendering ) - qt6? ( rendering ) - sdl? ( rendering ) - tk? ( python rendering ) - web? ( python ) - rendering? ( freetype views ) -" - -# eigen, nlohmann_json, pegtl and utfcpp are referenced in the cmake files -# and need to be available when VTK consumers configure the dependencies. -RDEPEND=" - app-arch/lz4:= - app-arch/xz-utils - dev-db/sqlite:3 - dev-libs/double-conversion:= - dev-libs/expat - dev-libs/icu:= - dev-libs/jsoncpp:= - >=dev-libs/libfmt-8.1.1:= - dev-libs/libxml2:2 - dev-libs/libzip:= - dev-libs/pugixml - media-libs/freetype - media-libs/libjpeg-turbo - >=media-libs/libharu-2.4.0:= - media-libs/libogg - media-libs/libpng:= - media-libs/libtheora - media-libs/tiff:= - >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] - sci-libs/hdf5:=[mpi=] - sci-libs/proj:= - sci-libs/netcdf:=[mpi=] - sys-libs/zlib - boost? ( dev-libs/boost:=[mpi?] ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:= ) - freetype? ( media-libs/fontconfig ) - gdal? ( sci-libs/gdal:= ) - java? ( >=virtual/jdk-11:= ) - las? ( sci-geosciences/liblas ) - mpi? ( virtual/mpi[cxx,romio] ) - mysql? ( dev-db/mariadb-connector-c ) - odbc? ( dev-db/unixODBC ) - openvdb? ( media-gfx/openvdb:= ) - opencascade? ( sci-libs/opencascade:= ) - pdal? ( sci-libs/pdal:= ) - postgres? ( dev-db/postgresql:= ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )') - $(python_gen_cond_dep 'rendering? ( dev-python/matplotlib[${PYTHON_USEDEP}] )') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtopengl:5 - dev-qt/qtquickcontrols2:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - ) - qt6? ( - !qt5? ( - dev-qt/qtbase:6[gui,opengl,sql,widgets] - dev-qt/qtdeclarative:6[opengl] - dev-qt/qtshadertools:6 - x11-libs/libxkbcommon - ) - ) - sdl? ( media-libs/libsdl2 ) - rendering? ( - media-libs/glew:= - virtual/opengl - x11-libs/gl2ps - x11-libs/libICE - x11-libs/libXcursor - x11-libs/libXext - ) - tbb? ( dev-cpp/tbb:= ) - tk? ( dev-lang/tk:= ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) - views? ( - x11-libs/libICE - x11-libs/libXext - ) - web? ( ${WEBAPP_DEPEND} ) -" - -DEPEND=" - ${RDEPEND} - dev-cpp/cli11 - dev-cpp/eigen - dev-cpp/nlohmann_json - >=dev-libs/pegtl-3 - dev-libs/utfcpp - test? ( - media-libs/glew - x11-libs/libXcursor - rendering? ( media-libs/freeglut ) - ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-9.2.5-pegtl-3.x.patch" - "${FILESDIR}/${PN}-9.3.0-pdal-2.6.0.patch" - "${FILESDIR}/${PN}-9.3.0-too-many-initializer-values.patch" - "${FILESDIR}/${PN}-9.3.0-java.patch" - "${FILESDIR}/${PN}-9.3.0-opencascade.patch" - "${FILESDIR}/${PN}-9.3.0-fix-Java-error-with-integer-enum-overloads.patch" - "${FILESDIR}/${PN}-9.3.0-ThrustPatches.patch" - "${FILESDIR}/${PN}-9.3.0-core-octree_node.txx.patch" - "${FILESDIR}/${PN}-9.3.0-ThirdParty-gcc15.patch" - "${FILESDIR}/${PN}-9.3.0-r1-expat-2.6.0.patch" -) - -DOCS=( CONTRIBUTING.md README.md ) - -vtk_check_reqs() { - local dsk=4096 - - dsk=$(( $(usex doc 3072 0) + dsk )) - dsk=$(( $(usex examples 3072 0) + dsk )) - dsk=$(( $(usex cuda 8192 0) + dsk )) - export CHECKREQS_DISK_BUILD=${dsk}M - - # In case users are not aware of the extra NINJAOPTS, check - # for the more common MAKEOPTS, in case NINJAOPTS is empty - local jobs=1 - if [[ -n "${NINJAOPTS}" ]]; then - jobs=$(makeopts_jobs "${NINJAOPTS}" "$(get_nproc)") - elif [[ -n "${MAKEOPTS}" ]]; then - jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - fi - - if use cuda; then - local mem=$(( $(usex cuda 7168 0) )) - mem=$(( mem * $(( jobs > 4 ? 4 : jobs )) )) - export CHECKREQS_MEMORY=${mem}M - fi - - "check-reqs_pkg_${EBUILD_PHASE}" -} - -vtk_check_compiler() { - [[ -z "$1" ]] && die "no compiler specified" - local compiler="$1" - local package="sys-devel/${compiler}" - local version="${package}" - local CUDAHOSTCXX_test - while - CUDAHOSTCXX="${CUDAHOSTCXX_test}" - version=$(best_version "${version}") - if [[ -z "${version}" ]]; then - if [[ -z "${CUDAHOSTCXX}" ]]; then - die "could not find supported version of ${package}" - fi - break - fi - CUDAHOSTCXX_test="$( - dirname "$( - realpath "$( - which "${compiler}-$(echo "${version}" | grep -oP "(?<=${package}-)[0-9]*")" - )" - )" - )" - version="<${version}" - do ! echo "int main(){}" | nvcc "-ccbin=${CUDAHOSTCXX_test}" - -x cu &>/dev/null; done -} - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp - - if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then - # FIXME: better use eerror? - ewarn "GCC 11 is know to fail building with CUDA support in some cases." - ewarn "See bug #820593" - fi - - use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - - vtk_check_reqs -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && has openmp && tc-check-openmp - - if [[ $(tc-is-gcc) && $(gcc-majorversion) = 11 ]] && use cuda ; then - # FIXME: better use eerror? - ewarn "GCC 11 is know to fail building with CUDA support in some cases." - ewarn "See bug #820593" - fi - - use qt6 && use qt5 && ewarn "Both qt5 and qt6 USE flags have been selected. Using qt5!" - - vtk_check_reqs - - use java && java-pkg-opt-2_pkg_setup - use python && python-single-r1_pkg_setup - use web && webapp_pkg_setup -} - -# Note: The following libraries are marked as internal by kitware -# and can currently not unbundled: -# diy2, exodusII, fides, h5part, kissfft, loguru, verdict, vpic, -# vtkm, xdmf{2,3}, zfp -# TODO: exprtk, ioss -# Note: As of v9.2.2 we no longer drop bundled libraries, when using system -# libraries. This just saves a little space. CMake logic of VTK on ThirdParty -# libraries avoids automagic builds, so deletion is not needed to catch these. -src_prepare() { - if use doc; then - einfo "Removing .md5 files from documents." - rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes" - sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \ - -i Utilities/Doxygen/CMakeLists.txt || die - fi - - if use opencascade && has_version ">=sci-libs/opencascade-7.8.0"; then - eapply "${FILESDIR}/vtk-9.3.0-opencascade-7.8.0.patch" - fi - - cmake_src_prepare - - if use test; then - ebegin "Copying data files to ${BUILD_DIR}" - mkdir -p "${BUILD_DIR}/ExternalData" || die - pushd "${BUILD_DIR}/ExternalData" >/dev/null || die - ln -sf "../../VTK-${MY_PV2}/.ExternalData/README.rst" . || die - ln -sf "../../VTK-${MY_PV2}/.ExternalData/SHA512" . || die - popd >/dev/null || die - eend "$?" - fi -} - -# TODO: check these and consider to use them -# VTK_BUILD_SCALED_SOA_ARRAYS -# VTK_DISPATCH_{AOS,SOA,TYPED}_ARRAYS -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_LICENSEDIR="share/${PN}/licenses" - -DVTK_DEBUG_MODULE=ON - -DVTK_DEBUG_MODULE_ALL=ON - -DVTK_IGNORE_CMAKE_CXX11_CHECKS=yes - - -DVTK_ANDROID_BUILD=OFF - -DVTK_IOS_BUILD=OFF - - -DVTK_BUILD_ALL_MODULES="$(usex all-modules)" - # we use the pre-built documentation and install these with USE=doc - -DVTK_BUILD_DOCUMENTATION=OFF - -DVTK_BUILD_EXAMPLES="$(usex examples)" - - # no package in the tree: https://github.com/LLNL/conduit - -DVTK_ENABLE_CATALYST=OFF - -DVTK_ENABLE_KITS=OFF - -DVTK_ENABLE_LOGGING="$(usex logging)" - # defaults to ON: USE flag for this? - -DVTK_ENABLE_REMOTE_MODULES=OFF - - # disable fetching files during build - -DVTK_FORBID_DOWNLOADS=OFF - - -DVTK_GROUP_ENABLE_Imaging="$(usex imaging "YES" "NO")" - -DVTK_GROUP_ENABLE_Rendering="$(usex rendering "YES" "NO")" - -DVTK_GROUP_ENABLE_StandAlone="YES" - -DVTK_GROUP_ENABLE_Views="$(usex views "YES" "NO")" - -DVTK_GROUP_ENABLE_Web="$(usex web "YES" "NO")" - - -DVTK_INSTALL_SDK=ON - - -DVTK_MODULE_ENABLE_VTK_IOCGNSReader="YES" - -DVTK_MODULE_ENABLE_VTK_IOExportPDF="YES" - -DVTK_MODULE_ENABLE_VTK_IOLAS="$(usex las "YES" "NO")" - -DVTK_MODULE_ENABLE_VTK_IONetCDF="YES" - -DVTK_MODULE_ENABLE_VTK_IOOCCT="$(usex opencascade "YES" "NO")" - -DVTK_MODULE_ENABLE_VTK_IOOggTheora="YES" - -DVTK_MODULE_ENABLE_VTK_IOOpenVDB="$(usex openvdb "YES" "NO")" - -DVTK_MODULE_ENABLE_VTK_IOSQL="YES" # sqlite - -DVTK_MODULE_ENABLE_VTK_IOPDAL="$(usex pdal "YES" "NO")" - -DVTK_MODULE_ENABLE_VTK_IOXML="YES" - -DVTK_MODULE_ENABLE_VTK_IOXMLParser="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingFreeType="$(usex freetype "YES" "NO")" - -DVTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig="$(usex freetype "YES" "NO")" - -DVTK_MODULE_ENABLE_VTK_cgns="YES" - -DVTK_MODULE_ENABLE_VTK_doubleconversion="YES" - -DVTK_MODULE_ENABLE_VTK_eigen="YES" - -DVTK_MODULE_ENABLE_VTK_expat="YES" - -DVTK_MODULE_ENABLE_VTK_fmt="YES" - -DVTK_MODULE_ENABLE_VTK_freetype="YES" - -DVTK_MODULE_ENABLE_VTK_hdf5="YES" - -DVTK_MODULE_ENABLE_VTK_jpeg="YES" - -DVTK_MODULE_ENABLE_VTK_jsoncpp="YES" - -DVTK_MODULE_ENABLE_VTK_libharu="YES" - -DVTK_MODULE_ENABLE_VTK_libproj="YES" - -DVTK_MODULE_ENABLE_VTK_libxml2="YES" - -DVTK_MODULE_ENABLE_VTK_lz4="YES" - -DVTK_MODULE_ENABLE_VTK_lzma="YES" - -DVTK_MODULE_ENABLE_VTK_netcdf="YES" - -DVTK_MODULE_ENABLE_VTK_nlohmannjson="YES" - -DVTK_MODULE_ENABLE_VTK_ogg="YES" - -DVTK_MODULE_ENABLE_VTK_pegtl="YES" - -DVTK_MODULE_ENABLE_VTK_png="YES" - -DVTK_MODULE_ENABLE_VTK_pugixml="YES" - -DVTK_MODULE_ENABLE_VTK_sqlite="YES" - -DVTK_MODULE_ENABLE_VTK_theora="YES" - -DVTK_MODULE_ENABLE_VTK_tiff="YES" - -DVTK_MODULE_ENABLE_VTK_utf8="YES" - -DVTK_MODULE_ENABLE_VTK_vtkvtkm="$(usex vtkm "YES" "NO")" - -DVTK_MODULE_ENABLE_VTK_zlib="YES" - - # not packaged in Gentoo - -DVTK_MODULE_USE_EXTERNAL_VTK_fast_float=OFF - -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF - -DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - - -DVTK_RELOCATABLE_INSTALL=ON - - -DVTK_SMP_ENABLE_OPENMP="$(usex openmp)" - -DVTK_SMP_ENABLE_STDTHREAD="$(usex threads)" - -DVTK_SMP_ENABLE_TBB="$(usex tbb)" - - -DVTK_UNIFIED_INSTALL_TREE=ON - - -DVTK_USE_CUDA="$(usex cuda)" - # use system libraries where possible - -DVTK_USE_EXTERNAL=ON - # avoid finding package from either ::guru or ::sci - -DVTK_USE_MEMKIND=OFF - -DVTK_USE_MPI="$(usex mpi)" - -DVTK_USE_TK="$(usex tk)" - -DVTK_USE_X=ON - - -DVTK_WHEEL_BUILD=OFF - - -DVTK_WRAP_JAVA="$(usex java)" - -DVTK_WRAP_PYTHON="$(usex python)" - ) - - if use all-modules; then - mycmakeargs+=( - # no package in ::gentoo - -DVTK_ENABLE_OSPRAY=OFF - # TODO: some of these are tied to the VTK_ENABLE_REMOTE_MODULES - # option. Check whether we can download them clean and enable - # them. - -DVTK_MODULE_ENABLE_VTK_DomainsMicroscopy="NO" - -DVTK_MODULE_ENABLE_VTK_fides="NO" - -DVTK_MODULE_ENABLE_VTK_FiltersOpenTURNS="NO" - -DVTK_MODULE_ENABLE_VTK_IOADIOS2="NO" - -DVTK_MODULE_ENABLE_VTK_IOFides="NO" - - -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR="NO" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR="NO" - - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES" - ) - fi - - if use boost; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_InfovisBoost="YES" - -DVTK_MODULE_ENABLE_VTK_InfovisBoostGraphAlgorithms="YES" - ) - fi - - if use cuda; then - cuda_add_sandbox -w - tc-is-gcc && vtk_check_compiler "gcc" - tc-is-clang && vtk_check_compiler "clang" - [[ -z "${CUDAARCHS}" ]] && einfo "trying to determine host CUDAARCHS" - : "${CUDAARCHS:=$(__nvcc_device_query)}" - einfo "building for CUDAARCHS = ${CUDAARCHS}" - - export CUDAARCHS - export CUDAHOSTCXX - unset NVCCFLAGS - fi - - if use debug; then - mycmakeargs+=( - -DVTK_DEBUG_LEAKS=ON - -DVTK_DEBUG_MODULE=ON - -DVTK_DEBUG_MODULE_ALL=ON - -DVTK_ENABLE_SANITIZER=ON - -DVTK_EXTRA_COMPILER_WARNINGS=ON - -DVTK_WARN_ON_DISPATCH_FAILURE=ON - ) - if use rendering; then - mycmakeargs+=( -DVTK_OPENGL_ENABLE_STREAM_ANNOTATIONS=ON ) - fi - fi - - if use examples || use test; then - mycmakeargs+=( -DVTK_USE_LARGE_DATA=ON ) - fi - - if use ffmpeg; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOFFMPEG="YES" ) - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2="YES" ) - fi - fi - - if use gdal; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_GeovisGDAL="YES" - -DVTK_MODULE_ENABLE_VTK_IOGDAL="YES" - -DVTK_MODULE_ENABLE_VTK_IOGeoJSON="YES" - ) - fi - - if use imaging; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ImagingColor="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingCore="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingFourier="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingGeneral="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingHybrid="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingMath="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingMorphological="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingSources="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingStatistics="YES" - -DVTK_MODULE_ENABLE_VTK_ImagingStencil="YES" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingImage="YES" ) - fi - - if ! use java && ! use python; then - # defaults to ON - mycmakeargs+=( -DVTK_ENABLE_WRAPPING=OFF ) - fi - - if use java; then - export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm" - mycmakeargs+=( - -DCMAKE_INSTALL_JARDIR="share/${PN}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Java="YES" - -DVTK_JAVA_SOURCE_VERSION="$(java-config -g PROVIDES_VERSION)" - -DVTK_JAVA_TARGET_VERSION="$(java-config -g PROVIDES_VERSION)" - ) - fi - - if use mpi; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_MPI="YES" - -DVTK_MODULE_ENABLE_VTK_IOH5part="YES" - -DVTK_MODULE_ENABLE_VTK_IOMPIParallel="YES" - -DVTK_MODULE_ENABLE_VTK_IOParallel="YES" - -DVTK_MODULE_ENABLE_VTK_IOParallelNetCDF="YES" - -DVTK_MODULE_ENABLE_VTK_IOParallelXML="YES" - -DVTK_MODULE_ENABLE_VTK_ParallelMPI="YES" - -DVTK_MODULE_ENABLE_VTK_h5part="YES" - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF - ) - use imaging && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMPIImage="YES" ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ParallelMPI4Py="YES" ) - if use rendering; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_RenderingParallel="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingParallelLIC="YES" - ) - fi - use vtkm && mycmakeargs+=( -DVTKm_ENABLE_MPI=ON ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_MPI="NO" ) - fi - - use mysql && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOMySQL="YES" ) - use odbc && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOODBC="YES" ) - use openvdb && mycmakeargs+=( -DOpenVDB_CMAKE_PATH="${ESYSROOT}/usr/$(get_libdir)/cmake/OpenVDB" ) - use postgres && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_IOPostgreSQL="YES" ) - - if use python; then - mycmakeargs+=( - -DPython3_EXECUTABLE="${PYTHON}" - -DVTK_ENABLE_WRAPPING=ON - -DVTK_MODULE_ENABLE_VTK_Python="YES" - -DVTK_MODULE_ENABLE_VTK_PythonInterpreter="YES" - -DVTK_MODULE_ENABLE_VTK_WrappingPythonCore="YES" - -DVTK_PYTHON_OPTIONAL_LINK="OFF" - -DVTK_PYTHON_SITE_PACKAGES_SUFFIX="lib/${EPYTHON}/site-packages" - ) - use rendering && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_PythonContext2D="YES" ) - fi - - if use qt5; then - # prefer Qt5: https://wiki.gentoo.org/wiki/Project:qt/Policies - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml" - -DVTK_QT_VERSION="5" - ) - has_version "dev-qt/qtopengl:5[gles2-only]" || use gles2-only && mycmakeargs+=( - # Force using EGL & GLES - -DVTK_OPENGL_HAS_EGL=ON - -DVTK_OPENGL_USE_GLES=ON - ) - elif use qt6; then - mycmakeargs+=( - -DCMAKE_INSTALL_QMLDIR="${EPFREIX}/usr/$(get_libdir)/qt6/qml" - -DVTK_QT_VERSION="6" - ) - has_version "dev-qt/qtbase:6[gles2-only]" || use gles2-only && mycmakeargs+=( - # Force using EGL & GLES - -DVTK_OPENGL_HAS_EGL=ON - -DVTK_OPENGL_USE_GLES=ON - ) - else - mycmakeargs+=( -DVTK_GROUP_ENABLE_Qt="NO" ) - fi - - if use qt5 || use qt6; then - mycmakeargs+=( - -DVTK_GROUP_ENABLE_Qt:STRING="YES" - -DVTK_MODULE_ENABLE_VTK_GUISupportQt="YES" - -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick="YES" - ) - if use mysql || use postgres; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL="YES" ) - fi - if use rendering; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingQt="YES" ) - fi - if use views; then - mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsQt="YES" ) - fi - fi - - if use rendering; then - mycmakeargs+=( - -DVTK_ENABLE_OSPRAY=OFF - - -DVTK_MODULE_ENABLE_VTK_IOExportGL2PS="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingContext2D="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingCore="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingExternal="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingHyperTreeGrid="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingLOD="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingLabel="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingRayTracing="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingSceneGraph="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingUI="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingVolume="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2="YES" - -DVTK_MODULE_ENABLE_VTK_RenderingZSpace="NO" - -DVTK_MODULE_ENABLE_VTK_gl2ps="YES" - -DVTK_MODULE_ENABLE_VTK_glew="YES" - -DVTK_MODULE_ENABLE_VTK_opengl="YES" - - -DVTK_USE_SDL2="$(usex sdl "YES" "NO")" - ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib="YES" ) - use tk && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingTk="YES" ) - use views && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_ViewsContext2D="YES" ) - use web && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_RenderingVtkJS="YES" ) - fi - - # Testing has been changed in 9.2.5: it is now allowed without - # requiring to download, if the data files are available locally! - if use test; then - mycmakeargs+=( - -DVTK_BUILD_TESTING=ON - # disable fetching data files for the default 'all' target - -DVTK_DATA_EXCLUDE_FROM_ALL=OFF - - # requested even if all use flags are off - -DVTK_MODULE_ENABLE_VTK_octree="YES" - -DVTK_MODULE_ENABLE_VTK_ViewsCore="YES" - - -DVTK_MODULE_USE_EXTERNAL_VTK_cli11="YES" - ) - else - mycmakeargs+=( -DVTK_BUILD_TESTING=OFF ) - fi - - # FIXME: upstream provides 4 threading models, as of 9.1.0. These are - # sequential, stdthread, openmp and tbb. AFAICS all of them can be - # enabled at the same time. Sequential and STDThread are enabled by - # default. The default selected type for the build is sequential. - # Assuming sequential < STDThread < openmp < tbb wrt speed, although - # this is dependent on the actual scenario where threading is used. - if use tbb; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" ) - elif use openmp; then # FIXME doesn't work with clang - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="OpenMP" ) - elif use threads; then - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="STDThread" ) - else - mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" ) - fi - - use tk && mycmakeargs+=( -DVTK_GROUP_ENABLE_Tk="YES" ) - - if use views; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_ViewsCore="YES" - -DVTK_MODULE_ENABLE_VTK_ViewsInfovis="YES" - ) - fi - - if use vtkm; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore="YES" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel="YES" - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters="YES" - - -DVTKm_NO_INSTALL_README_LICENSE=ON # bug #793221 - -DVTKm_Vectorization=native - ) - fi - - if use web; then - mycmakeargs+=( - -DVTK_MODULE_ENABLE_VTK_WebCore="YES" - -DVTK_MODULE_ENABLE_VTK_WebGLExporter="YES" - ) - use python && mycmakeargs+=( -DVTK_MODULE_ENABLE_VTK_WebPython="YES" ) - fi - - cmake_src_configure -} - -src_compile() { - use test && cmake_build VTKData - cmake_src_compile -} - -src_test() { - if use cuda; then - cuda_add_sandbox -w - fi - - # don't work at all - REALLY_BAD_TESTS=( - "VTK::RenderingRayTracing-HeaderTest$" # (Failed) # 82 - "VTK::RenderingFreeTypeFontConfigCxx-TestSystemFontRendering$" # (Failed) # 309 - "VTK::IOMPIParallelPython-MPI-Plot3DMPIIO$" # (Failed) # 376 - "VTK::IOExportPDFCxx-TestPDFTransformedText-VerifyRasterizedPDFPNG$" # (Failed) # 483 - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed) # 494 - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed) # 518 - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed) # 519 - "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItem$" # (Failed) # 732 - "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderItemWidget$" # (Failed) # 733 - "VTK::GUISupportQtQuickCxx-TestQQuickVTKRenderWindow$" # (Failed) # 734 - "VTK::FiltersSelectionCxx-TestLinearSelector3D$" # (Failed) # 1102 - "VTK::FiltersParallelDIY2Cxx-MPI-TestProbeLineFilter$" # (Failed) # 1180 - "VTK::FiltersFlowPathsCxx-TestEvenlySpacedStreamlines2D$" # (Failed) # 1215 - "VTK::ChartsCoreCxx-TestChartDoubleColors$" # (Failed) # 1555 - "VTK::ChartsCoreCxx-TestChartDoubleColorsOpaque$" # (Failed) # 1556 - "VTK::ChartsCoreCxx-TestParallelCoordinatesDouble$" # (Failed) # 1599 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExternalFaces$" # (Failed) # 2142 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMHistogram$" # (Failed) # 2146 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes$" # (Failed) # 2148 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMMarchingCubes2$" # (Failed) # 2149 - "VTK::FiltersGeneralCxx-TestContourTriangulatorHoles$" # (Failed) # 2305 - "VTK::FiltersCoreCxx-TestDecimatePolylineFilter$" # (Failed) # 2497 - "VTK::FiltersCorePython-TestSphereTreeFilter$" # (Failed) # 2617 - "VTK::CommonDataModelCxx-TestTriangle$" # (Failed) # 2770 - "VTK::CommonDataModelCxx-UnitTestCells$" # (Failed) # 2793 - "VTK::CommonDataModelCxx-TestHyperTreeGridGeometricLocator$" # (Failed) # 2799 - ) - - # don't work in src_test but when on their own - BAD_TESTS=( - "VTK::IOMotionFXCxx-TestMotionFXCFGReaderPositionFile$" # (Subprocess aborted) # 374 - - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run) # 517 - - "VTK::FiltersParallelDIY2Cxx-MPI-TestGhostCellsGenerator$" # (Timeout) # 1173 - "VTK::FiltersParallelDIY2Cxx-MPI-TestRedistributeDataSetFilterOnIOSS$" # (Timeout) # 1185 - "VTK::FiltersParallelDIY2Cxx-TestOverlappingCellsDetector$" # (Timeout) # 1193 - "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilter$" # (Timeout) # 1196 - "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterOnIOSS$" # (Timeout) # 1197 - "VTK::FiltersParallelDIY2Cxx-TestRedistributeDataSetFilterWithPolyData$" # (Timeout) # 1198 - "VTK::CommonCoreCxx-TestSMP$" # 2945 - - # "VTK::IOMovieCxx-TestAVIWriter$" # (Skipped) # 470 - # "VTK::IOMovieCxx-TestMP4Writer$" # (Skipped) # 471 - - "VTK::RenderingMatplotlibCxx-TestContextMathTextImage$" # (NUMERICAL) # 243 - "VTK::RenderingMatplotlibCxx-TestMathTextActor$" # (NUMERICAL) # 244 - "VTK::RenderingMatplotlibCxx-TestMathTextActor3D$" # (NUMERICAL) # 245 - "VTK::RenderingMatplotlibCxx-TestRenderString$" # (NUMERICAL) # 246 - "VTK::RenderingMatplotlibCxx-TestStringToPath$" # (NUMERICAL) # 247 - "VTK::RenderingMatplotlibCxx-TestIndexedLookupScalarBar$" # (NUMERICAL) # 248 - "VTK::RenderingMatplotlibCxx-TestScalarBarCombinatorics$" # (NUMERICAL) # 249 - "VTK::RenderingLICOpenGL2Cxx-TestImageDataLIC2D$" # (NUMERICAL) # 266 - "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DXSlice$" # (NUMERICAL) # 267 - "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DYSlice$" # (NUMERICAL) # 268 - "VTK::RenderingLICOpenGL2Cxx-TestStructuredGridLIC2DZSlice$" # (NUMERICAL) # 269 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaults$" # (NUMERICAL) # 270 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended$" # (NUMERICAL) # 271 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped$" # (NUMERICAL) # 272 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff$" # (NUMERICAL) # 273 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain$" # (NUMERICAL) # 274 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain$" # (NUMERICAL) # 275 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff$" # (NUMERICAL) # 276 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor$" # (NUMERICAL) # 277 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain$" # (NUMERICAL) # 278 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain$" # (NUMERICAL) # 279 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask$" # (NUMERICAL) # 280 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask$" # (NUMERICAL) # 281 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask$" # (NUMERICAL) # 282 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults$" # (NUMERICAL) # 283 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced$" # (NUMERICAL) # 284 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff$" # (NUMERICAL) # 285 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform$" # (NUMERICAL) # 286 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin$" # (NUMERICAL) # 287 - "VTK::RenderingLICOpenGL2Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin$" # (NUMERICAL) # 288 - "VTK::RenderingExternalCxx-TestGLUTRenderWindow$" # (Failed) # 311 - "VTK::ImagingOpenGL2Cxx-TestOpenGLImageGradient$" # (NUMERICAL) # 722 - # "VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout) # 838 - "VTK::InteractionWidgetsCxx-TestResliceCursorWidget2$" # (Failed) # 847 - "VTK::InteractionWidgetsCxx-TestResliceCursorWidget3$" # (Failed) # 848 - "VTK::InteractionWidgetsPython-TestTensorWidget2$" # (Failed) # 919 - # "VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout) # 1319 - "VTK::RenderingOpenGL2Cxx-TestGlyph3DMapperPickability$" # (Failed) # 1404 - "VTK::RenderingCoreCxx-TestTextureRGBADepthPeeling$" # (Failed) # 2020 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMCleanGrid$" # (NUMERICAL) # 2138 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClip$" # (NUMERICAL) # 2140 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMClipWithImplicitFunction$" # (NUMERICAL) # 2141 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMExtractVOI$" # (NUMERICAL) # 2143 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMLevelOfDetail$" # (NUMERICAL) # 2147 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointElevation$" # (NUMERICAL) # 2152 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPointTransform$" # (NUMERICAL) # 2153 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMPolyDataNormals$" # (NUMERICAL) # 2155 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold$" # (NUMERICAL) # 2157 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMThreshold2$" # (NUMERICAL) # 2158 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMTriangleMeshPointNormals$" # (NUMERICAL) # 2159 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpScalar$" # (NUMERICAL) # 2160 - "VTK::AcceleratorsVTKmFiltersCxx-TestVTKMWarpVector$" # (NUMERICAL) # 2161 - "VTK::AcceleratorsVTKmCoreCxx-TestVTKMImplicitDataArray$" # (NUMERICAL) # 2897 - ) - - SEQUENTIAL_TESTS=( - # TODO requires die -n - # "VTK::IOExportGL2PSCxx-.*$" - "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D$" - "VTK::IOExportGL2PSCxx-TestGL2PSContext$" - "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper$" - "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextActor$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper$" - "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster$" - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster$" # (Failed) # 494 - "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSBillboardTextActor3D-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSContext-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSContext-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSLabeledDataMapper-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSScalarBar-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextActor3D-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextActor-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextActor-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSTextMapper-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestStackedPlotGL2PS-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterMultipleRenderers-VerifyRasterizedPDFPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-RasterizePNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPNG$" - "VTK::IOExportGL2PSCxx-TestGL2PSExporterRaster-VerifyRasterizedPDFPNG$" - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-RasterizePNG$" # (Not Run) # 517 - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPNG$" # (Failed) # 518 - # "VTK::IOExportGL2PSCxx-TestGL2PSExporterVolumeRaster-VerifyRasterizedPDFPNG$" # (Failed) # 519 - "VTK::InteractionWidgetsCxx-TestPickingManagerSeedWidget$" # (Timeout) # 838 - "VTK::FiltersModelingPython-TestCookieCutter4$" # (Timeout) # 1319 - ) - - CMAKE_SKIP_TESTS=( - "${BAD_TESTS[@]}" - "${REALLY_BAD_TESTS[@]}" - "${SEQUENTIAL_TESTS[@]}" - ) - - virtx cmake_src_test - unset CMAKE_SKIP_TESTS - - myctestargs=( - -R "($( IFS='|'; echo "${SEQUENTIAL_TESTS[*]}"))" - -j1 - ) - # TODO requires die -n - # nonfatal \ - virtx cmake_src_test || einfo "These tests are known to fail" - - # TODO requires die -n - # myctestargs=( - # -R "($( IFS='|'; echo "${REALLY_BAD_TESTS[*]}"))" - # --timeout 600 - # ) - # nonfatal \ - # virtx cmake_src_test || einfo "These tests are known to fail" - - # TODO requires die -n - # myctestargs=( - # -R "($( IFS='|'; echo "${BAD_TESTS[*]}"))" - # --timeout 600 - # ) - # nonfatal \ - # virtx cmake_src_test || einfo "These tests are known to only fail inside src_test" -} - -src_install() { - use web && webapp_src_preinst - - # Stop web page images from being compressed - if use doc; then - HTML_DOCS=( "${WORKDIR}/html/." ) - fi - - cmake_src_install - - use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PN}.jar" - - # install examples - if use examples; then - einfo "Installing examples" - mv -v {E,e}xamples || die - dodoc -r examples - docompress -x "/usr/share/doc/${PF}/examples" - - einfo "Installing datafiles" - insinto "/usr/share/${PN}/data" - doins -r "${S}/.ExternalData" - fi - - use python && python_optimize - - use web && webapp_src_install -} - -# webapp.eclass exports these but we want it optional #534036 -pkg_postinst() { - use web && webapp_pkg_postinst - - if use examples; then - einfo "You can get more and updated examples at" - einfo "https://kitware.github.io/vtk-examples/site/" - fi -} - -pkg_prerm() { - use web && webapp_pkg_prerm -} diff --git a/sci-libs/vtk/vtk-9.3.1.ebuild b/sci-libs/vtk/vtk-9.3.1.ebuild index 62f33476fe4f..da39cbc90cfc 100644 --- a/sci-libs/vtk/vtk-9.3.1.ebuild +++ b/sci-libs/vtk/vtk-9.3.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 @@ -37,7 +37,7 @@ S="${WORKDIR}/VTK-${PV}" LICENSE="BSD LGPL-2" SLOT="0/${MY_PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" # TODO: Like to simplify these. Mostly the flags related to Groups. IUSE="all-modules boost +cgns cuda debug doc examples ffmpeg gdal gles2-only imaging @@ -86,7 +86,10 @@ RDEPEND=" sci-libs/proj:= sys-libs/zlib boost? ( dev-libs/boost:=[mpi?] ) - cgns? ( >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] ) + cgns? ( + >=sci-libs/cgnslib-4.1.1:=[hdf5,mpi=] + sci-libs/hdf5[cxx] + ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:= ) gdal? ( sci-libs/gdal:= ) |