commit: 201225e58c42e6b715712c1ff66c0468dac64297 Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com> AuthorDate: Thu Jan 30 14:38:51 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Feb 13 08:35:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=201225e5
sci-libs/hipSPARSE: drop 5.1.3-r1 Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/hipSPARSE/Manifest | 1 - ...hipSPARSE-5.0.2-remove-matrices-unpacking.patch | 126 --------------------- sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild | 99 ---------------- 3 files changed, 226 deletions(-) diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest index f41749291572..7fe750de681d 100644 --- a/sci-libs/hipSPARSE/Manifest +++ b/sci-libs/hipSPARSE/Manifest @@ -1,4 +1,3 @@ -DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64 DIST hipSPARSE-5.7.tar.gz 458521 BLAKE2B 94695ef3cf4294f571723e31ab5d4295b5aaa24528e90838375ee8477cf0957b297663d80e5fe3406762b475b6ef4741f9ccfb4dfb1448ce71ea4014da14b46e SHA512 bb28cd81b7ec298eb2e6462a8588ed93eee7b4892923b11087a91d1c32341f29f488fd4e6797debe51a989f463db31030eae02d07be6512d6b755367ba221aac DIST hipSPARSE-6.1.tar.gz 471148 BLAKE2B 18119ac355e180adb5ce38561f44e39119226d209a970ae8cac6b85575bad1ab2a690a3bb72de1c179c1190aa2c29d691e6ce02855f3df89a58f634d42e54103 SHA512 09f9e94c5f976e6f17c07f9be2fde31c2e740871215a6b77b49675644b883bd9994fcaacb19864ace3883bb5aea7a7dc589ddbaf9b6aaf3d9f411c7e452a0b78 DIST hipSPARSE-6.3.tar.gz 537764 BLAKE2B 2989c81ac1f024246fdcf8081fa6969f1efd81d680f39b45edac290b4db7d453154d5d432e0ad3d0bc1e08948e03886a89ff4ec051b30cb7eca6bfe4f433d4a7 SHA512 c011b7d7a2121a20ceb2eee8d7217717ff06196f085f0996b0952b5afdbf2350e7288c4cfd2cfe9214b84c2add203788a1860d9a89bb426df2bc376b348a7f55 diff --git a/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch b/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch deleted file mode 100644 index 021e10b7ab2c..000000000000 --- a/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch +++ /dev/null @@ -1,126 +0,0 @@ -Adopted from 4.3.0 patch to remove downloads during test. - -Ultimately the to be downloaded matrices should be in DISTFILES. - -Index: hipSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt -=================================================================== ---- hipSPARSE-rocm-5.0.2.orig/clients/tests/CMakeLists.txt -+++ hipSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt -@@ -23,117 +23,6 @@ - - find_package(GTest REQUIRED) - --# Download some test matrices --set(TEST_MATRICES -- SNAP/amazon0312 -- Muite/Chebyshev4 -- FEMLAB/sme3Dc -- Williams/webbase-1M -- Bova/rma10 -- JGD_BIBD/bibd_22_8 -- Williams/mac_econ_fwd500 -- Williams/mc2depi -- Hamm/scircuit -- Sandia/ASIC_320k -- GHS_psdef/bmwcra_1 -- HB/nos1 -- HB/nos2 -- HB/nos3 -- HB/nos4 -- HB/nos5 -- HB/nos6 -- HB/nos7 -- DNVS/shipsec1 --) -- --set(TEST_MD5HASH -- f567e5f5029d052e3004bc69bb3f13f5 -- e39879103dafab21f4cf942e0fe42a85 -- a95eee14d980a9cfbbaf5df4a3c64713 -- 2d4c239daad6f12d66a1e6a2af44cbdb -- a899a0c48b9a58d081c52ffd88a84955 -- 455d5b699ea10232bbab5bc002219ae6 -- f1b0e56fbb75d1d6862874e3d7d33060 -- 8c8633eada6455c1784269b213c85ea6 -- 3e62f7ea83914f7e20019aefb2a5176f -- fcfaf8a25c8f49b8d29f138f3c65c08f -- 8a3cf5448a4fe73dcbdb5a16b326715f -- b203f7605cb1f20f83280061068f7ec7 -- b0f812ffcc9469f0bf9be701205522c4 -- f185514062a0eeabe86d2909275fe1dc -- 04b781415202db404733ca0c159acbef -- c98e35f1cfd1ee8177f37bdae155a6e7 -- c39375226aa5c495293003a5f637598f -- 9a6481268847e6cf0d70671f2ff1ddcd -- 73372e7d6a0848f8b19d64a924fab73e --) -- --if(NOT TARGET hipsparse) -- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/../deps/convert.cpp) --else() -- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/deps/convert.cpp) --endif() -- --if(BUILD_ADDRESS_SANITIZER) -- execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CONVERT_SOURCE} -O3 -fsanitize=address -shared-libasan -o ${PROJECT_BINARY_DIR}/mtx2csr.exe) --else() -- execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${CONVERT_SOURCE} -O3 -o ${PROJECT_BINARY_DIR}/mtx2csr.exe) --endif() -- --list(LENGTH TEST_MATRICES len) --math(EXPR len1 "${len} - 1") -- --foreach(i RANGE 0 ${len1}) -- list(GET TEST_MATRICES ${i} m) -- list(GET TEST_MD5HASH ${i} md5) -- -- string(REPLACE "/" ";" sep_m ${m}) -- list(GET sep_m 0 dir) -- list(GET sep_m 1 mat) -- -- # Download test matrices if not already downloaded -- set(CMAKE_MATRICES_DIR ${PROJECT_BINARY_DIR}/matrices) -- if(NOT EXISTS "${CMAKE_MATRICES_DIR}/${mat}.bin") -- message("-- Downloading and extracting test matrix ${m}.tar.gz") -- file(DOWNLOAD https://sparse.tamu.edu/MM/${m}.tar.gz ${CMAKE_MATRICES_DIR}/${mat}.tar.gz -- INACTIVITY_TIMEOUT 3 -- STATUS DL) -- -- list(GET DL 0 stat) -- list(GET DL 1 msg) -- -- if(NOT stat EQUAL 0) -- message("-- Timeout has been reached, trying mirror ...") -- # Try again using ufl links -- file(DOWNLOAD https://www.cise.ufl.edu/research/sparse/MM/${m}.tar.gz ${CMAKE_MATRICES_DIR}/${mat}.tar.gz -- INACTIVITY_TIMEOUT 3 -- STATUS DL) -- -- list(GET DL 0 stat) -- list(GET DL 1 msg) -- -- if(NOT stat EQUAL 0) -- message(FATAL_ERROR "${msg}") -- endif() -- endif() -- -- # Check MD5 hash before continuing -- file(MD5 ${CMAKE_MATRICES_DIR}/${mat}.tar.gz hash) -- -- # Compare hash -- if(NOT hash STREQUAL md5) -- message(FATAL_ERROR "${mat}.tar.gz is corrupted") -- endif() -- execute_process(COMMAND tar xf ${mat}.tar.gz WORKING_DIRECTORY ${CMAKE_MATRICES_DIR}) -- -- file(RENAME ${CMAKE_MATRICES_DIR}/${mat}/${mat}.mtx ${CMAKE_MATRICES_DIR}/${mat}.mtx) -- execute_process(COMMAND ${PROJECT_BINARY_DIR}/mtx2csr.exe ${mat}.mtx ${mat}.bin WORKING_DIRECTORY ${CMAKE_MATRICES_DIR}) -- # TODO: add 'COMMAND_ERROR_IS_FATAL ANY' once cmake supported version is 3.19 -- file(REMOVE_RECURSE ${CMAKE_MATRICES_DIR}/${mat}.tar.gz ${CMAKE_MATRICES_DIR}/${mat} ${CMAKE_MATRICES_DIR}/${mat}.mtx) -- -- endif() --endforeach() -- - set(HIPSPARSE_TEST_SOURCES - hipsparse_gtest_main.cpp - test_axpyi.cpp diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild deleted file mode 100644 index 3a05960c2cc7..000000000000 --- a/sci-libs/hipSPARSE/hipSPARSE-5.1.3-r1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ROCM_VERSION=${PV} - -inherit cmake edo rocm toolchain-funcs - -DESCRIPTION="ROCm SPARSE marshalling library" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE" -# share some test datasets with rocSPARSE -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz -test? ( -https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz -https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz -https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz -https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz -https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz -https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz -https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz -https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz -https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz -https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz -https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz -https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz -https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz -https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz -https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz -https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz -https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz -https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz -https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz -)" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0"/$(ver_cut 1-2) -IUSE="test" -REQUIRED_USE="${ROCM_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND="dev-util/rocminfo - dev-util/hip - sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND="dev-build/rocm-cmake - >=dev-build/cmake-3.22 - test? ( dev-cpp/gtest )" - -S="${WORKDIR}/hipSPARSE-rocm-${PV}" - -PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch" ) - -src_prepare() { - sed -e "s/PREFIX hipsparse//" \ - -e "/<INSTALL_INTERFACE/s,include,include/hipsparse," \ - -e "s:rocm_install_symlink_subdir(hipsparse):#rocm_install_symlink_subdir(hipsparse):" \ - -i library/CMakeLists.txt || die - - cmake_src_prepare - - # remove GIT dependency - sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die - - # Fix install path - sed -i -e "s.set(CMAKE_INSTALL_LIBDIR.#set(CMAKE_INSTALL_LIBDIR." CMakeLists.txt || die - - if use test; then - mkdir -p "${BUILD_DIR}"/clients/matrices - # compile and use the mtx2bin converter. Do not use any optimization flags! - edo $(tc-getCXX) deps/convert.cpp -o deps/convert - find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 | - while IFS= read -r -d '' mtxfile; do - destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin - ebegin "Converting ${mtxfile} to ${destination}" - deps/convert ${mtxfile} ${destination} - eend $? - done - fi -} - -src_configure() { - local mycmakeargs=( - -DHIP_RUNTIME="ROCclr" - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_SAMPLES=OFF - -DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse - ) - - cmake_src_configure -} - -src_test() { - check_amdgpu - cd "${BUILD_DIR}"/clients/staging || die - edob ./${PN,,}-test -}