gentoo resync : 12.05.2022

4 files changed, 242 insertions, 8 deletions

diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index d35663b75e2b..7270530756e5 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,6 +1,8 @@
 AUX hipSPARSE-4.3.0-remove-matrices-unpacking.patch 3479 BLAKE2B 35974954ad3f2f9c41153f616d870fac18b92034af4993e53c10138db9d8262846e5cb25fabc3fb963a2db4d788ae37ed68719c8b95ab2254c75f43aa3a17f4e SHA512 b495cd0fb1d147ed2d80f2621650a562923737b9409b598ac6aaefa679b2f9aa5285991caee9919e35b3ebdd75b1cfcb583f2c8baa2c018eae334e8522562a33
+AUX hipSPARSE-5.0.2-remove-matrices-unpacking.patch 3940 BLAKE2B e3815659b32856206bc3291d09f59514e59dc06c3c33454c24afb68955d6a55411c71535693325be06bdb097e7cedc558ec2b8fa6a2d3886d774d79e038557ad SHA512 39db7d6fe0a085ef5a92f6ec1613376ffd9152d8d31a78f0864c971e7b61d4dfbda2e170940c82dae286d024333621722b249d5bd601399e76e68e8029fc7e81
 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
@@ -21,5 +23,6 @@ DIST rocSPARSE_shipsec1.tar.gz 22175245 BLAKE2B f1d34482b8c3d3ee48033097d7d6f9b6
 DIST rocSPARSE_sme3Dc.tar.gz 42483568 BLAKE2B f0d16b58f6ea28e67727637697a812a0b10d524c73aeb82f702411b9ebaea3670780e762ed0701aae80c6829e950233f74555523ef2d6c5740b007c7a65c03d4 SHA512 c5a0be2db919a45310a73ea1dd96d0d30168135f887a8c5c3d7ca11e2c3d12ea7d1331be20968d0135bd18da4ef2b043db68eeb7567b6f0f8daf782b87083c3a
 DIST rocSPARSE_webbase-1M.tar.gz 11360460 BLAKE2B 01b1d06adb5fb32fa402ed888d25a7e52a34779b078fc2e21c60e688d03579bb4ca8694f5ee4a824f7859952d55590a1fd9449dc80d6fe894d7b662b918882d4 SHA512 6401a965b8f6dd5392879956fde3c94f77fe1801a4a43428c03b6d639031575c647eab47b1babe53f4ecc2c3b8fc183e8339536b78dcd0d94ce62bfedd87c161
 EBUILD hipSPARSE-4.0.0-r2.ebuild 1140 BLAKE2B 9344f8e3678a855fca42b5c14fae5d0973ed3f8922836182d9327d1724e92feca6072933df181228ef95cc4993fc8a7797ebf31fac8a5a95eabe8f3de9165ac5 SHA512 e682f1acb67c282c638fd7594b0268a3dc7a33b71fe667f8bd38fc90449660367f94d1964037c0fbe3dd162e5c8a5a4aa941ec72a7353c2f629ed9f07ca06d6b
-EBUILD hipSPARSE-4.3.0.ebuild 3808 BLAKE2B f16ae26042c485af49a0ceac85ee86a53e8fbfd9cb23b0727212121b2a66fe4fc3f8366aa1ac4b9c2a69fe56ccf2e6b9413ce43e607a607e3a0c960beca7c3f3 SHA512 2da3cb53dce48dc95191704f0ed265d130cd3b16f5c7513718149afbfabba57b32b8eec5a390ffe71fe5c49d680955ed7bb792b21533611fbbb680b6b17c19e5
+EBUILD hipSPARSE-4.3.0-r2.ebuild 3707 BLAKE2B f62868a9d57aa7add43e8717c7478cfce82f7562794f0fd8aeffdd7dc1f740402f502d0c349dd7906eb42e5a479503ad020f7fb46b81afdd71c2949a58c04203 SHA512 10ea8f3b765150c72f3bf9d327db6e5c1c1adbadbf3ad9e0c7b7f4ef12a6013a7a040aa5352e11166d2544cec5cba44a5b4d9b3f919f33d0979541512342bc1d
+EBUILD hipSPARSE-5.0.2.ebuild 3707 BLAKE2B d888276f197b9e27d4d0ac5f7952382100fdeb089659c7e0312cfd604ab4e801b31096df762403b15dadc1838f3ea1107269351edb03e8cff709c36760f10b86 SHA512 633d5273e0854067db2b1892c0355630ff7d7d14b0f005989182362f1086612b30b1262ad5233ec2c5713c878044c14ccbd7ccd08ebbfabfb8b08b01367b598f
 MISC metadata.xml 603 BLAKE2B 21c5f53de40b5582b8541e1cef239a4a2eff2eaaaa966a4168439417cd6f80ea00dbd48636bea73aedbaaf580950803768f02ab5f0cca0f76d433d80a80026e1 SHA512 4ff1ebefa7203326a5c2feed7c0deffa10f17383bb4a05fdf3057d8ab1d6f8427a45126ec17aa88e02a93e9114e79f6d89cd4564e72faebf970b7f63814d701a
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-4.3.0.ebuild b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
index 99acf36c8593..9498143b5003 100644
--- a/sci-libs/hipSPARSE/hipSPARSE-4.3.0.ebuild
+++ b/sci-libs/hipSPARSE/hipSPARSE-4.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake
+inherit cmake toolchain-funcs
 
 DESCRIPTION="ROCm SPARSE marshalling library"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
@@ -38,11 +38,12 @@ IUSE="test"
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-util/rocminfo:${SLOT}
-		dev-util/hip:${SLOT}
+RDEPEND="dev-util/rocminfo
+		dev-util/hip
 		sci-libs/rocSPARSE:${SLOT}"
 DEPEND="${RDEPEND}"
-BDEPEND="dev-util/rocm-cmake:${SLOT}
+BDEPEND="dev-util/rocm-cmake
+	>=dev-util/cmake-3.22
 	test? ( dev-cpp/gtest )"
 
 S="${WORKDIR}/hipSPARSE-rocm-${PV}"
@@ -69,7 +70,7 @@ src_prepare() {
 				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin
 				ebegin "Converting ${mtxfile} to ${destination}"
 				deps/convert ${mtxfile} ${destination}
-				eend
+				eend $?
 			done
 	fi
 	eapply_user
@@ -91,7 +92,6 @@ src_configure() {
 		-DCMAKE_SKIP_RPATH="ON"
 		-DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse
 		${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/hipSPARSE/hipSPARSE-5.0.2.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.0.2.ebuild
new file mode 100644
index 000000000000..7ce5fdc224c8
--- /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
+}