From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- sci-libs/rocSOLVER/Manifest | 5 +- .../rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch | 173 +++++++++++++++++++++ sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild | 75 +++++++++ sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild | 75 --------- sci-libs/rocSOLVER/rocSOLVER-5.0.2.ebuild | 77 +++++++++ 5 files changed, 329 insertions(+), 76 deletions(-) create mode 100644 sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch create mode 100644 sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild delete mode 100644 sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild create mode 100644 sci-libs/rocSOLVER/rocSOLVER-5.0.2.ebuild (limited to 'sci-libs/rocSOLVER') diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index d73f88e8e7ad..e4cf7c7b6974 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1,5 +1,8 @@ AUX rocSOLVER-4.2.0-add-stdint-header.patch 475 BLAKE2B 268a1813d4e26dbaaa2360d0a187ce2a1448da075ae5f98a4a829c979411ab7e0c06f150ddcb445c9b295268a1e9f1770adbe7e68a1c3f84edde3c3477a57610 SHA512 ede56f9579e655ddd098ca9006612537f8ed61dc585274afe6b2b0bdee875431b62e0c6da6bc01e2cabeeb5244a91bb1e00b442bb549c075a286eefd8d9edc09 AUX rocSOLVER-4.3.0-link-blas.patch 604 BLAKE2B 863c1807d281e219b429a58c9e9e582a346e72be6004fb3f5a818479ae02b4efd896873f7c689084eefc50c331d8734c5dbf2dcb9e9756a54ce092e5ace22da5 SHA512 413692c2a7e40cb3bb169eef078fc4caa0ebaba760f535fb27afafcc49713fae26c9ca5c82793c54d4e07ccafe43a0d7d65b7e76d0207bdd20a5581bd71216d9 +AUX rocSOLVER-5.0.2-libfmt8.patch 7493 BLAKE2B 0327f78dd94f0102a5c4aabf13cab2ec6adaec3efee82acdb24d223b56a58bece34b505b9fdb2964ffa6f3f574730c2e74110e12e198fe26bc682ea294038749 SHA512 124dd445e188475777e3dee017f7380675594717b1e58458397780dc5c32ee8221935234954554510bd169af10a3bdb4fef0674bf93030081c5c12c1f3061a13 DIST rocSOLVER-4.3.0.tar.gz 454249 BLAKE2B 727ae416d85c5a19983257d2a0b01836013c1d69cddf3334b2c1b808b96b401db938b46b7ecf1e7faf26ff555374d1d3abed74abbe7be47110a36b44019469ee SHA512 2910e1cfad4d17a2877e2ae572d80179b84903c632652571c01bd12856c92c22e073ea1005ed9aac04244b4c502a7e0c18d96445e57658ae8eb5b320bada549b -EBUILD rocSOLVER-4.3.0.ebuild 1932 BLAKE2B fd43a3ab1cfb130e3c0374c84a73bf3ebfa5cc15a9c71e7bc9bdd4d1d8bc637e73441a33d14a9116177c44750a92e4edb9242434194cc7a4532cd05d498f8891 SHA512 11aa4a4584cf1eb16951b8b2ffb645db7f12bf0bced58a0ce80543fb094a7a5e0feb2c486125f6b9e835e50c5318802c9cde3e2e3ee84a8ee60ead315543f181 +DIST rocSOLVER-5.0.2.tar.gz 530085 BLAKE2B f3c3594b5ee2703424da289cc0c520a589da28f9d3f4c04d81cace35a4f77f3ca79ff9a1e7139d83d7a2ae1907083aded99b5d9fbe216d81b225dc1b9fc4105b SHA512 ab349044aba0c1b6b7d0019d15f2bdf068805d2da73790f424ae90835f2d7dd4137d0a641d8edbf98fcb190989f0d0fa57dfc448a376a19e21fd62940046b3a1 +EBUILD rocSOLVER-4.3.0-r1.ebuild 1924 BLAKE2B 4d9f6af3842357336ef725b2185d329352a6f2a27bf6743b4389d21f7fc3271e41bd2f557a511004352218b2976731198ee28724a236277a64026bd44070d29a SHA512 e3ed8a7da1454a3f0f2822bbd921521a37401c84adf337f8b1379bf0fa7dc75a3947410c040ac0fcbe16684aec67bf9a5c4e3edd059e85e6e431cf99fb6e66b8 +EBUILD rocSOLVER-5.0.2.ebuild 1951 BLAKE2B 5411b70631cdfbf0415697c9731dd3756f92bbbb0d9dcd8e59d833825cf5a5ea7b7754eb5de5751b9be6012aaafb9cd01d2ebaac12bf4de4a51b8b1e17dcef18 SHA512 2448e3df2d168f569229031699217507bc6f040d285af6ddf0c88b518c134f76ee5f2799baf73ba1646c3d104d915dafca4e045b48359de3ea2bcbe3b968d5a5 MISC metadata.xml 662 BLAKE2B 6dc116ac630fbd30c5f6c18d716bcd12bc994bfa0b2aea4eacf65e31507c24bb1eeed55942ee8e0b5bed8e361d28950d433c13136771673308dbf96906e270c9 SHA512 cc5cc6401303169dd423234615b748b38a58191b058befe0f40e8b8996fe50b3554b99a14f2f63c3596227aab43558f23c64ddce88172157366cc78d4aeefb56 diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch new file mode 100644 index 000000000000..3f2c0553689b --- /dev/null +++ b/sci-libs/rocSOLVER/files/rocSOLVER-5.0.2-libfmt8.patch @@ -0,0 +1,173 @@ +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 +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 + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(wrapper.value, ctx); + } +@@ -49,7 +57,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(wrapper.value ? '1' : '0', ctx); + } +@@ -58,7 +66,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_operation(wrapper.value), ctx); + } +@@ -67,7 +75,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_fill(wrapper.value), ctx); + } +@@ -76,7 +84,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_diagonal(wrapper.value), ctx); + } +@@ -85,7 +93,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_side(wrapper.value), ctx); + } +@@ -94,7 +102,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_direct(wrapper.value), ctx); + } +@@ -104,7 +112,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_storev(wrapper.value), ctx); + } +@@ -113,7 +121,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_workmode(wrapper.value), ctx); + } +@@ -122,7 +130,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_svect(wrapper.value), ctx); + } +@@ -131,7 +139,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_evect(wrapper.value), ctx); + } +@@ -140,7 +148,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2char_eform(wrapper.value), ctx); + } +@@ -149,7 +157,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2string_datatype(wrapper.value), ctx); + } +@@ -158,7 +166,7 @@ template <> + struct formatter> : formatter + { + template +- auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ++ auto format(rocsolver_logvalue wrapper, FormatCtx& ctx) ROCSOLVER_FMT_CONST + { + return formatter::format(rocblas2string_initialization(wrapper.value), ctx); + } diff --git a/sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild new file mode 100644 index 000000000000..6287d7b096d5 --- /dev/null +++ b/sci-libs/rocSOLVER/rocSOLVER-4.3.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +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" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT} + benchmark? ( virtual/blas )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest + virtual/blas )" + +PATCHES=( + "${FILESDIR}/rocSOLVER-4.2.0-add-stdint-header.patch" + "${FILESDIR}/rocSOLVER-4.3.0-link-blas.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:\$:\$:" -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() { + # Grant access to the device + addwrite /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -Wno-dev + -DCMAKE_SKIP_RPATH=ON + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/" + -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) + ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} + ) + + CXX="hipcc" cmake_src_configure +} + +src_test() { + addwrite /dev/kfd + addwrite /dev/dri/ + cd "${BUILD_DIR}/clients/staging" || die + LD_LIBRARY_PATH="${BUILD_DIR}/library/src" ./rocsolver-test || die +} + +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-4.3.0.ebuild b/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild deleted file mode 100644 index c017b7ad31a0..000000000000 --- a/sci-libs/rocSOLVER/rocSOLVER-4.3.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -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" - -RDEPEND="dev-util/hip:${SLOT} - sci-libs/rocBLAS:${SLOT} - benchmark? ( virtual/blas )" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-cpp/gtest - virtual/blas )" - -PATCHES=( - "${FILESDIR}/rocSOLVER-4.2.0-add-stdint-header.patch" - "${FILESDIR}/rocSOLVER-4.3.0-link-blas.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:\$:\$:" -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() { - # Grant access to the device - addwrite /dev/kfd - addpredict /dev/dri/ - - local mycmakeargs=( - -Wno-dev - -DCMAKE_SKIP_RPATH=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/" - -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) - ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} - ) - - CXX="hipcc" cmake_src_configure -} - -src_test() { - addwrite /dev/kfd - addwrite /dev/dri/ - cd "${BUILD_DIR}/clients/staging" || die - LD_LIBRARY_PATH="${BUILD_DIR}/library/src" ./rocsolver-test || die -} - -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.0.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.0.2.ebuild new file mode 100644 index 000000000000..3a09969c0867 --- /dev/null +++ b/sci-libs/rocSOLVER/rocSOLVER-5.0.2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +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" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT} + >=dev-libs/libfmt-8 + benchmark? ( virtual/blas )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest + >=dev-util/cmake-3.22 + virtual/blas )" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.0-add-stdint-header.patch" + "${FILESDIR}/${P}-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:\$:\$:" -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() { + # Grant access to the device + addwrite /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -Wno-dev + -DCMAKE_SKIP_RPATH=ON + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/" + -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) + ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} + ) + + CXX="hipcc" cmake_src_configure +} + +src_test() { + addwrite /dev/kfd + addwrite /dev/dri/ + cd "${BUILD_DIR}/clients/staging" || die + LD_LIBRARY_PATH="${BUILD_DIR}/library/src" ./rocsolver-test || die +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dobin clients/staging/rocsolver-bench + fi +} -- cgit v1.2.3