commit:     0be66c62f89018dc307e55af5b8a4655870a8442
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Wed Jun 11 03:28:24 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 22:37:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be66c62

sci-libs/hipSOLVER: add 6.4.1

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42554
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/hipSOLVER/Manifest                        |  1 +
 .../files/hipSOLVER-6.4.1-find-cholmod.patch       | 32 ++++++++++++++
 sci-libs/hipSOLVER/hipSOLVER-6.4.1.ebuild          | 49 ++++++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/sci-libs/hipSOLVER/Manifest b/sci-libs/hipSOLVER/Manifest
index 4aee5b508931..3a35fd3be188 100644
--- a/sci-libs/hipSOLVER/Manifest
+++ b/sci-libs/hipSOLVER/Manifest
@@ -2,3 +2,4 @@ DIST hipSOLVER-rocm-5.7.1.tar.gz 1516012 BLAKE2B 
8d0966d34877978784b987215028371
 DIST hipSOLVER-rocm-6.1.1.tar.gz 2553462 BLAKE2B 
77731b876a7fe5f80f79e5af5128a84d8a5d4dee6d511f3e1cf4964845b636380f7f1e19f07e84ed24b98e99c3bdfbba623b97b48cf4ea1bc09a4c1bd3dccaed
 SHA512 
4f28ecd807717013318f293df8c48d7674f64fd3a538c2b827f4188a00a36165f48277d5ac50e806461d52a8a3b6d626cab91ff7c6687b17fea2580461e08de9
 DIST hipSOLVER-rocm-6.3.2.tar.gz 2575541 BLAKE2B 
b61e50de293ef5b37e5296a194ce3ecef3fafa624345d1d0be1ef987db5bc15b9d8d8a5399faa5ab6745d2af9326c8d19b002411d143aa4f0b0bd4b47bae8070
 SHA512 
fb7de8eccd8691723b1ff86f1e9a7fe5f3ceccb77eb4fe6f2098987904cd874bb442d9b4728f980ed2c41f145e0f46fe6beae9a001305792ff50c81b5baffc7a
 DIST hipSOLVER-rocm-6.3.3.tar.gz 2573877 BLAKE2B 
54d9736b63bfd314a155968737bf59c26685237e63e41a1500aa22841bb3c92a126645629dee8e9a87e0ee7a62035738dd85347a7dd0e4f05c7044755ef5e71e
 SHA512 
d6213c1000e640bf29d96917df6f51f8f5fc30ec808d6473b7dd159f9ce160535170cec0f769c3749934e1896b9d3fcc1df21d5cda27b4d233e6a8c50e23c114
+DIST hipSOLVER-rocm-6.4.1.tar.gz 2577495 BLAKE2B 
1a7f86aba2eff38166bfd274649243b42400649cf0020a5e2fe543bc7cd41450212b51b6fe3e10a986d1cb62e0f9c70cfdfbe281ab9399eae2777c7b4ce0c378
 SHA512 
e913f512d644f9a9f15c3534962ac3ca473a81b0fc2a62d0b18aea13dea5c01fda2a3d60d79974082c498c6066ae539bb8a6b878f1e014d9988817461d8b6a38

diff --git a/sci-libs/hipSOLVER/files/hipSOLVER-6.4.1-find-cholmod.patch 
b/sci-libs/hipSOLVER/files/hipSOLVER-6.4.1-find-cholmod.patch
new file mode 100644
index 000000000000..e90d234531a8
--- /dev/null
+++ b/sci-libs/hipSOLVER/files/hipSOLVER-6.4.1-find-cholmod.patch
@@ -0,0 +1,32 @@
+Gentoo install cholmod.h into /usr/include directly and uses PkgConfig
+--- a/library/src/CMakeLists.txt
++++ b/library/src/CMakeLists.txt
+@@ -153,14 +153,10 @@ if(NOT USE_CUDA)
+       list(APPEND static_depends PACKAGE rocsparse)
+     endif()
+ 
+-    find_package(CHOLMOD QUIET)
+-    if(NOT TARGET SuiteSparse::CHOLMOD)
+-      # try again with the custom find modules for older versions of 
suitesparse
+-      list(APPEND CMAKE_MODULE_PATH 
${CMAKE_CURRENT_SOURCE_DIR}/cmake/suitesparse)
+-      find_package(CHOLMOD REQUIRED)
+-    endif()
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(CHOLMOD REQUIRED IMPORTED_TARGET cholmod)
+ 
+-    target_link_libraries( hipsolver PRIVATE roc::rocsparse 
SuiteSparse::CHOLMOD)
++    target_link_libraries( hipsolver PRIVATE roc::rocsparse 
PkgConfig::CHOLMOD)
+     set_source_files_properties(${hipsolver_source}
+       PROPERTIES
+         COMPILE_DEFINITIONS HAVE_ROCSPARSE
+--- a/library/src/amd_detail/dlopen/cholmod.hpp
++++ b/library/src/amd_detail/dlopen/cholmod.hpp
+@@ -24,7 +24,7 @@
+ #include "lib_macros.hpp"
+ 
+ #ifdef HAVE_ROCSPARSE
+-#include <suitesparse/cholmod.h>
++#include <cholmod.h>
+ #else
+ 
+ // constants

diff --git a/sci-libs/hipSOLVER/hipSOLVER-6.4.1.ebuild 
b/sci-libs/hipSOLVER/hipSOLVER-6.4.1.ebuild
new file mode 100644
index 000000000000..13bd41f152bb
--- /dev/null
+++ b/sci-libs/hipSOLVER/hipSOLVER-6.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic marshalling library for LAPACK routines on the 
GPU"
+HOMEPAGE="https://github.com/ROCm/hipSOLVER";
+SRC_URI="https://github.com/ROCm/hipSOLVER/archive/refs/tags/rocm-${PV}.tar.gz 
-> hipSOLVER-rocm-${PV}.tar.gz"
+S="${WORKDIR}/hipSOLVER-rocm-${PV}"
+
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="sparse"
+
+RESTRICT="test"
+
+RDEPEND="
+       dev-util/hip:${SLOT}
+       sci-libs/rocSOLVER:${SLOT}
+       sparse? (
+               sci-libs/suitesparseconfig
+               sci-libs/cholmod
+       )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-6.4.1-find-cholmod.patch
+)
+
+src_configure() {
+       rocm_use_hipcc
+
+       local mycmakeargs=(
+               -DGPU_TARGETS="$(get_amdgpu_flags)"
+               -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+               -DROCM_SYMLINK_LIBS=OFF
+               -DBUILD_WITH_SPARSE=$(usex sparse ON OFF)
+       )
+
+       cmake_src_configure
+}

Reply via email to