commit: 0f20b2298c510411f895cecc89880fec88529500 Author: YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Tue Dec 21 03:11:59 2021 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 08:57:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f20b229
sci-libs/rocSPARSE: remove unused cmake variable __skip_rocmclang is used to avoid configuration error for cmake-3.21.(1|2), which don't exist among ebuilds anymore, so this flag is not recognized. Closes: https://github.com/gentoo/gentoo/pull/23448 Closes: https://bugs.gentoo.org/829076 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> ...E-4.3.0-r1.ebuild => rocSPARSE-4.3.0-r2.ebuild} | 4 +- sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild | 122 --------------------- 2 files changed, 2 insertions(+), 124 deletions(-) diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild similarity index 96% rename from sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild rename to sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild index 7c554093db97..208d02f6cc3d 100644 --- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r1.ebuild +++ b/sci-libs/rocSPARSE/rocSPARSE-4.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,6 +48,7 @@ RDEPEND="dev-util/hip:${SLOT} DEPEND="${RDEPEND}" BDEPEND="test? ( dev-cpp/gtest + >=dev-util/cmake-3.22 $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') ) benchmark? ( app-admin/chrpath ) @@ -114,7 +115,6 @@ src_configure() { -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} - -D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP" ) cmake_src_configure diff --git a/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild b/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild deleted file mode 100644 index 6683c6a0517d..000000000000 --- a/sci-libs/rocSPARSE/rocSPARSE-4.3.0.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs - -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" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND="dev-util/hip:${SLOT} - sci-libs/rocPRIM:${SLOT}" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-cpp/gtest ) -benchmark? ( app-admin/chrpath )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/rocSPARSE-rocm-${PV}" - -PATCHES=( "${FILESDIR}/${PN}-4.3.0-remove-matrices-unpacking.patch" ) - -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 - - # 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}"/matrices - # compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error! - ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert" - $(tc-getCXX) deps/convert.cpp -o deps/convert - eend $? - find "${WORKDIR}" -maxdepth 2 -name "*.mtx" -print0 | - while IFS= read -r -d '' mtxfile; do - destination=${BUILD_DIR}/matrices/$(basename -s '.mtx' ${mtxfile}).csr - ebegin "Converting ${mtxfile} to ${destination}" - deps/convert ${mtxfile} ${destination} - eend $? - done - fi - - cmake_src_prepare -} - -src_configure() { - # Grant access to the device to omit a sandbox violation - addwrite /dev/kfd - addpredict /dev/dri/ - - # Compiler to use - export CXX=hipcc - - local mycmakeargs=( - -DBUILD_CLIENTS_SAMPLES=OFF - -DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse" - -DCMAKE_SKIP_RPATH="ON" - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) - ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"} - -D__skip_rocmclang="ON" ## fix cmake-3.21 configuration issue caused by officialy support programming language "HIP" - ) - - cmake_src_configure -} - -src_test() { - addwrite /dev/kfd - addwrite /dev/dri/ - cd "${BUILD_DIR}/clients/staging" || die - ./rocsparse-test -} - -src_install() { - cmake_src_install - - if use benchmark; then - local rocsparse_bench="${BUILD_DIR}/clients/staging/rocsparse-bench" - chrpath -d "${rocsparse_bench}" - dobin "${rocsparse_bench}" - fi -}
