commit: e04f5229b8135d967ddb2b417a8f57c3bbe6ef2d
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Thu Jan 30 14:17:54 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 08:35:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04f5229
sci-libs/rocSPARSE: 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/rocSPARSE/Manifest | 1 -
.../files/rocSPARSE-5.0.2-enable-gfx1031.patch | 13 --
.../rocSPARSE-5.0.2-remove-incorrect-assert.patch | 34 ------
...rocSPARSE-5.0.2-remove-matrices-unpacking.patch | 42 -------
sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild | 136 ---------------------
5 files changed, 226 deletions(-)
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index 0d0da5a8bba3..0edbaba79ec1 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -1,4 +1,3 @@
-DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B
f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3
SHA512
735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3
DIST rocSPARSE-5.7.1.tar.gz 1167162 BLAKE2B
20ed88c87afbb041a31aa8bf867dca7ee670af093347c9c6a68b0750e70c796e7cfd599f84a58de2b8038f7681524bcb5909230fc340d1575dae3b72089ec650
SHA512
cd48884c51fcddcb26c42920cf477999160b3f06da4ab182f746a18d1fe54f697d89b1e470c550bd2330b26fb596d4a5baadf64366145e0d07f3fd8891f9af59
DIST rocSPARSE-6.1.1.tar.gz 1367035 BLAKE2B
fc981df5913ea527bb4a7d3eba69373ebc7b74319f387e9f42a94feb1ec029ecca15618ea2d5ff7a91cb6e8959f164ab4be57755ee17db5f155f3b0e373cc487
SHA512
f87bd724b92fdb35e1c70cafcf09d95ab65f514bacfe1c59c5f0a2a75a8bae7a7dca2ee093ecd2e05adf542cc00165c0f8bf0a67e98013e2c4c72145ba951db2
DIST rocSPARSE-6.3.0.tar.gz 1490336 BLAKE2B
05260170c757247a93c4169603dd8f0c0ce8e1e83ca83775783bee243ed9d174af7762a39f252b1434fb6af8a86fdcc11a7994af79e8a8b9ea9f199670ab3a74
SHA512
c8ddd942ba5765f01457391d028599e8daecd107771a2ff7948f537756c323be516d40fc52f7443472db76f5d7411dcd266f8dbc7f0ae9d9cee8270ec8dcb1f7
diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch
b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch
deleted file mode 100644
index fd44bb938406..000000000000
--- a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-enable-gfx1031.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rocSPARSE-rocm-5.0.2/library/src/include/common.h
-===================================================================
---- rocSPARSE-rocm-5.0.2.orig/library/src/include/common.h
-+++ rocSPARSE-rocm-5.0.2/library/src/include/common.h
-@@ -167,7 +167,7 @@ __device__ __forceinline__ void rocspars
- if(BLOCKSIZE > 1) { if(i < 1 && i + 1 < BLOCKSIZE) { data[i] =
min(data[i], data[i + 1]); } __syncthreads(); }
- }
-
--#ifndef __gfx1030__
-+#if !defined(__gfx1030__) && !defined(__gfx1031__)
- // DPP-based wavefront reduction maximum
- template <unsigned int WFSIZE>
- __device__ __forceinline__ void rocsparse_wfreduce_max(int* maximum)
diff --git
a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch
b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch
deleted file mode 100644
index 9baa962c05f5..000000000000
--- a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-incorrect-assert.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 48b763f01b658dece7f71784fe4362e56167db2f Mon Sep 17 00:00:00 2001
-From: James Sandham <[email protected]>
-Date: Fri, 28 Jan 2022 10:24:08 -0800
-Subject: [PATCH] remove incorrect assert from spmm_bell (#302)
-
-Co-authored-by: jsandham <[email protected]>
----
- library/src/level3/rocsparse_bellmm_template_general.cpp | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/library/src/level3/rocsparse_bellmm_template_general.cpp
b/library/src/level3/rocsparse_bellmm_template_general.cpp
-index 81f36a32..bbce9a17 100644
---- a/library/src/level3/rocsparse_bellmm_template_general.cpp
-+++ b/library/src/level3/rocsparse_bellmm_template_general.cpp
-@@ -1,6 +1,6 @@
- /*! \file */
- /* ************************************************************************
-- * Copyright (c) 2021 Advanced Micro Devices, Inc.
-+ * Copyright (c) 2021-2022 Advanced Micro Devices, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
copy
- * of this software and associated documentation files (the "Software"), to
deal
-@@ -101,9 +101,8 @@ rocsparse_status
rocsparse_bellmm_template_general(rocsparse_handle han
- I
ldc)
- {
- hipStream_t stream = handle->stream;
-- assert(block_dim > 32);
-- dim3 bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1);
-- dim3 bellmm_threads(32, 32, 1);
-+ dim3 bellmm_blocks((mb - 1) / 1 + 1, (n - 1) / 32 + 1);
-+ dim3 bellmm_threads(32, 32, 1);
- assert(trans_A == rocsparse_operation_none);
- //
- // What happends if A needs to be transposed?
diff --git
a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch
b/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch
deleted file mode 100644
index 81d2b4ab1458..000000000000
--- a/sci-libs/rocSPARSE/files/rocSPARSE-5.0.2-remove-matrices-unpacking.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Don't let cmake handle test data download, unpack and convert
-
-Index: rocSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt
-===================================================================
---- rocSPARSE-rocm-5.0.2.orig/clients/tests/CMakeLists.txt
-+++ rocSPARSE-rocm-5.0.2/clients/tests/CMakeLists.txt
-@@ -23,35 +23,6 @@
-
- find_package(GTest 1.10.0 REQUIRED)
-
--#
--# Client matrices.
--#
--
--if(NOT EXISTS "${CMAKE_MATRICES_DIR}")
-- #
-- # Download.
-- #
-- set(CMAKE_MATRICES_DIR ${PROJECT_BINARY_DIR}/matrices CACHE STRING
"Matrices directory.")
--
-- if(NOT TARGET rocsparse)
-- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/../deps/convert.cpp CACHE STRING
"Convert tool mtx2csr.")
-- include(${CMAKE_SOURCE_DIR}/../cmake/ClientMatrices.cmake)
-- else()
-- set(CONVERT_SOURCE ${CMAKE_SOURCE_DIR}/deps/convert.cpp CACHE STRING
"Convert tool mtx2csr.")
-- include(${CMAKE_SOURCE_DIR}/cmake/ClientMatrices.cmake)
-- endif()
--
--else()
--
-- #
-- # Copy.
-- #
-- if(NOT CMAKE_MATRICES_DIR STREQUAL "${PROJECT_BINARY_DIR}/matrices")
-- execute_process(COMMAND cp -r ${CMAKE_MATRICES_DIR}
${PROJECT_BINARY_DIR}/matrices)
-- endif()
--
--endif()
--
- set(ROCSPARSE_TEST_SOURCES
- test_axpby.cpp
- test_axpyi.cpp
diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
b/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
deleted file mode 100644
index c18eeff84c43..000000000000
--- a/sci-libs/rocSPARSE/rocSPARSE-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-ROCM_VERSION=${PV}
-
-inherit cmake edo python-any-r1 toolchain-funcs rocm
-
-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"
-REQUIRED_USE="${ROCM_REQUIRED_USE}"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="dev-util/hip
- sci-libs/rocPRIM:${SLOT}"
-DEPEND="${RDEPEND}"
-BDEPEND="test? (
- dev-cpp/gtest
- >=dev-build/cmake-3.22
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-)
-benchmark? ( app-admin/chrpath )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/rocSPARSE-rocm-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch"
- "${FILESDIR}/${PN}-5.0.2-enable-gfx1031.patch"
- "${FILESDIR}/${PN}-5.0.2-remove-incorrect-assert.patch" )
-
-python_check_deps() {
- if use test; then
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
- fi
-}
-
-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
-
- # Fix install path
- sed -i -e "s.set(CMAKE_INSTALL_LIBDIR.#set(CMAKE_INSTALL_LIBDIR."
CMakeLists.txt || die
-
- # use python interpreter specifyied by python-any-r1
- sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND
${EPYTHON} ," -i clients/tests/CMakeLists.txt || die
-
- cmake_src_prepare
-
- # 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}"/clients/matrices
- # compile and use the mtx2csr converter. Do not use any
optimization flags, because it causes error!
- 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}).csr
- ebegin "Converting ${mtxfile} to ${destination}"
- deps/convert ${mtxfile} ${destination}
- eend $?
- done
- fi
-}
-
-src_configure() {
- addpredict /dev/kfd
- addpredict /dev/dri/
-
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=On
- -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
- -DBUILD_CLIENTS_SAMPLES=OFF
- -DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
- -DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
- -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
- )
-
- CXX=hipcc cmake_src_configure
-}
-
-src_test() {
- check_amdgpu
- cd "${BUILD_DIR}/clients/staging" || die
- LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./${PN,,}-test
-}
-
-src_install() {
- cmake_src_install
-
- if use benchmark; then
- cd "${BUILD_DIR}" || die
- dobin clients/staging/rocsparse-bench
- fi
-}
