commit: 168aa80233b8f1e1f09bf3ce60bf8ed90a846488
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 05:37:23 2022 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue May 3 05:41:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168aa802
sci-libs/hipSPARSE: bump to 5.0.2.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
sci-libs/hipSPARSE/Manifest | 1 +
...hipSPARSE-5.0.2-remove-matrices-unpacking.patch | 126 +++++++++++++++++++++
sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild | 105 +++++++++++++++++
3 files changed, 232 insertions(+)
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index 7571fae5989d..be5066e946d0 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,5 +1,6 @@
DIST hipSPARSE-4.0.tar.gz 271756 BLAKE2B
d774632c145a842c5dd97df6e0c1c3b3fc6986a5d3e000564b3b9b4f8a9c72bc01b360baf93a82f8a70a85b8ee1833f4e767a48021d3869391000551ed00e614
SHA512
78c9501e6f9f8b0727d2f2207814048f8c784b2b06797559d6f639244cb1439e9218a46c582a6b337b15791519f0bcb9e0f42c17bff00c096c797c96cc7660ae
DIST hipSPARSE-4.3.tar.gz 349357 BLAKE2B
e0da23ba8f39af276842eb9bc45232a0dbe7f40197215397bf2d6ae454061626aedb698701703a03a60487dff2b427d54fa3e0fd36db69fcccf9868d0e5a5097
SHA512
b7302ae4205d5c0e8fd8017e345f7677e55a6ea82741a85f77b2af3f669d63013e12435201f9e0ca4b31d3c4af2cb1630775bf101a69338be2df621d68504d60
+DIST hipSPARSE-5.0.tar.gz 440916 BLAKE2B
4011dda3d22b373848735bab0570421fed786bd4d9cff992d3eaaf70b84c00334cec6a8fe3bdd2b9cd5241d837522b778b3462064426195db68930af89c21984
SHA512
567c6b05844143834efbb6f5b7a97ec93f349b97ec6bea55e780cb2480cf80aafbbf15b06f83af3d73ff8ab44c51cbe26ada27b4b398b67dc428c1959c3e7222
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
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
new file mode 100644
index 000000000000..021e10b7ab2c
--- /dev/null
+++ b/sci-libs/hipSPARSE/files/hipSPARSE-5.0.2-remove-matrices-unpacking.patch
@@ -0,0 +1,126 @@
+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.0.2.ebuild
b/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
new file mode 100644
index 000000000000..2997acdf27cb
--- /dev/null
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/rocminfo
+ dev-util/hip
+ sci-libs/rocSPARSE:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/rocm-cmake
+ >=dev-util/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
+
+ # remove GIT dependency
+ sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
+
+ if use test; then
+ mkdir -p "${BUILD_DIR}"/clients/matrices
+ # compile and use the mtx2bin converter. Do not use any
optimization flags!
+ ebegin "$(tc-getCXX) deps/convert.cpp -o deps/convert"
+ $(tc-getCXX) deps/convert.cpp -o deps/convert
+ eend $?
+ 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
+ eapply_user
+ cmake_src_prepare
+}
+
+src_configure() {
+ # Grant access to the device
+ addwrite /dev/kfd
+ addpredict /dev/dri/
+
+ # Compiler to use
+ export CXX=hipcc
+
+ local mycmakeargs=(
+ -DHIP_RUNTIME="ROCclr"
+ -DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+ -DBUILD_CLIENTS_SAMPLES=OFF
+ -DCMAKE_SKIP_RPATH="ON"
+ -DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse
+ ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ addwrite /dev/kfd
+ addwrite /dev/dri/
+ cd "${BUILD_DIR}/clients/staging" || die
+ ./hipsparse-test || die
+}
