* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocThrust/files/, sci-libs/rocThrust/
@ 2022-12-19 14:00 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 1df248184eeae4fa1c8b3557176b540069e91e97
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:24:16 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:00:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df24818
sci-libs/rocThrust: drop 4.0.0-r1, 4.3.0-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/rocThrust/Manifest | 2 -
.../rocThrust-4.3.0-deprecate-hcc_detail.patch | 13 ----
sci-libs/rocThrust/rocThrust-4.0.0-r1.ebuild | 49 --------------
sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild | 77 ----------------------
4 files changed, 141 deletions(-)
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 13445c171f29..db950e870078 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -1,4 +1,2 @@
-DIST rocThrust-4.0.0.tar.gz 1166346 BLAKE2B 02c89e0c4ab2c888a20b7c956a73012157f2735e6ec76369a1f75fbc17bb3f995d1914106ec58562f28243fbe5f019ac230ac3313b6aacb4d8b868f3ac1f091e SHA512 476aa5706487c5801cc91908806a1a1fcb550171f63e0b2debd9b59b18c7435c484578ec456ccfabc140dd7bca7d9bb432a7ba223946b1fca22e72e7d053af2d
-DIST rocThrust-4.3.0.tar.gz 1156832 BLAKE2B a462cfaa31883253fabba584ca77622cc5a7234bd9979472a84ec77b91c60f48f1064149b86d624aaedd70262fb65fb6aadb03cc6e00939d4eed6cd11bfc0090 SHA512 8c6aa3aefd59c87cc8278930bf90021867f519c356c86a3c3ebfcdf90887b8631250b6a9a8156f77c0cbf7ddbad7881e5e1b802f1cd1305cc3a2e7d95ef4e6f3
DIST rocThrust-5.0.2.tar.gz 1183550 BLAKE2B 88021266dc9ffcb8f5e803acfe767c52aaa04b2348d0dcb204eb74bdf44ed26eb6d98f8d85324b90fe73228b52a0ad22686b87274c868ef19ec8ded825b58ea9 SHA512 3599b9498db392d480c08873d9e84ff1c05e5417e14e43e56f190fe4490873fec37c944a3c252942d6275a4fa4af85c82d39b62b0fdb5daa82023a2df8a3228f
DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74
diff --git a/sci-libs/rocThrust/files/rocThrust-4.3.0-deprecate-hcc_detail.patch b/sci-libs/rocThrust/files/rocThrust-4.3.0-deprecate-hcc_detail.patch
deleted file mode 100644
index a923a016f96c..000000000000
--- a/sci-libs/rocThrust/files/rocThrust-4.3.0-deprecate-hcc_detail.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/ROCmSoftwarePlatform/rocThrust/issues/180
-
---- orig/thrust/system/hip/detail/guarded_driver_types.h
-+++ rocThrust-rocm-4.3.0/thrust/system/hip/detail/guarded_driver_types.h
-@@ -47,7 +47,7 @@
- # endif // __DRIVER_TYPES_H__
- #endif // __GNUC__
-
--#include <hip/hcc_detail/host_defines.h>
-+#include <hip/amd_detail/host_defines.h>
-
- #if !defined(__GNUC__) || ((10000 * __GNUC__ + 100 * __GNUC_MINOR__ + __GNUC_PATCHLEVEL__) >= 40500)
- # ifdef THRUST_HOST_NEEDS_RESTORATION
diff --git a/sci-libs/rocThrust/rocThrust-4.0.0-r1.ebuild b/sci-libs/rocThrust/rocThrust-4.0.0-r1.ebuild
deleted file mode 100644
index 4ca8a58bad69..000000000000
--- a/sci-libs/rocThrust/rocThrust-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Thrust dependent software on AMD GPUs"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND=">=dev-util/hip-${PV}
- =sci-libs/rocPRIM-${PV}*"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/rocThrust-rocm-${PV}"
-
-PATCHES="${FILESDIR}/rocThrust-4.0-operator_new.patch"
-
-src_prepare() {
- sed -e "/PREFIX rocthrust/d" \
- -e "/DESTINATION/s:rocthrust/include/thrust:include/rocthrust/thrust:" \
- -e "/rocm_install_symlink_subdir(rocthrust)/d" \
- -e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/rocthrust/:" -i thrust/CMakeLists.txt || die
- sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \
- -e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
-
- 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=(
- -DBUILD_TEST=OFF
- )
-
- cmake_src_configure
-}
diff --git a/sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild b/sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild
deleted file mode 100644
index ff4a85ba172d..000000000000
--- a/sci-libs/rocThrust/rocThrust-4.3.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="HIP back-end for the parallel algorithm library Thrust"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="benchmark test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/hip
- sci-libs/rocPRIM:${SLOT}"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
-BDEPEND=">=dev-util/cmake-3.22"
-
-S="${WORKDIR}/rocThrust-rocm-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch"
- "${FILESDIR}/${P}-deprecate-hcc_detail.patch" )
-
-src_prepare() {
- sed -e "/PREFIX rocthrust/d" \
- -e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \
- -e "/rocm_install_symlink_subdir(rocthrust)/d" \
- -e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/:" -i thrust/CMakeLists.txt || die
-
- sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \
- -e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
-
- # disable downloading googletest and googlebenchmark
- sed -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
-
- # remove GIT dependency
- sed -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
-
- 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=(
- -DBUILD_TEST=$(usex test ON OFF)
- -DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
- ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # Grant access to the device
- addwrite /dev/kfd
- addwrite /dev/dri/
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocThrust/files/, sci-libs/rocThrust/
@ 2025-01-10 0:31 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-01-10 0:31 UTC (permalink / raw
To: gentoo-commits
commit: 86f35948f693e7f8a819f875dedeec6f38fa7e3d
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Thu Jan 9 18:22:30 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 00:29:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86f35948
sci-libs/rocThrust: fix compilation with libc++
_VSTD macro was removed from libcxx.
Backport one line from commit: https://github.com/ROCm/rocThrust/commit/bc24ef2613e282d57d96dcf4263e2fa2cab171e4
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40075
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch | 13 +++++++++++++
sci-libs/rocThrust/rocThrust-6.3.0.ebuild | 7 +++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch
new file mode 100644
index 000000000000..2db69a71bd20
--- /dev/null
+++ b/sci-libs/rocThrust/files/rocThrust-6.3.0-fix-libcxx.patch
@@ -0,0 +1,13 @@
+_VSTD macro was removed from libcxx
+Upstream commit: https://github.com/ROCm/rocThrust/commit/bc24ef2613e282d57d96dcf4263e2fa2cab171e4
+--- a/thrust/type_traits/is_contiguous_iterator.h
++++ b/thrust/type_traits/is_contiguous_iterator.h
+@@ -139,7 +139,7 @@ struct is_libcxx_wrap_iter : false_type {};
+ #if defined(_LIBCPP_VERSION)
+ template <typename Iterator>
+ struct is_libcxx_wrap_iter<
+- _VSTD::__wrap_iter<Iterator>
++ std::__wrap_iter<Iterator>
+ > : true_type {};
+ #endif
+
diff --git a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
index 08376716982d..7850be793886 100644
--- a/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
+++ b/sci-libs/rocThrust/rocThrust-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -40,7 +40,10 @@ BDEPEND="
test? ( app-arch/unzip )
"
-PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0-operator_new.patch"
+ "${FILESDIR}/${PN}-6.3.0-fix-libcxx.patch"
+)
src_configure() {
rocm_use_hipcc
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-10 0:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-10 0:31 [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocThrust/files/, sci-libs/rocThrust/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 14:00 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox