public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2021-01-24  7:49 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2021-01-24  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     bbdc938b68c82208fccc7b95ee31e5247b16b1ba
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 13:13:59 2021 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 07:44:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdc938b

sci-libs/rocFFT: FFT implementation for ROCm.

Closes: https://github.com/gentoo/gentoo/pull/19146
Bug: https://bugs.gentoo.org/650804
Bug: https://github.com/gentoo/gentoo/pull/10724
Suggested-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Suggested-by: Wilfried Holzke <gentoo <AT> holzke.net>
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/Manifest               |  1 +
 sci-libs/rocFFT/metadata.xml           | 19 +++++++++++++
 sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild | 51 ++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
new file mode 100644
index 00000000000..61085466662
--- /dev/null
+++ b/sci-libs/rocFFT/Manifest
@@ -0,0 +1 @@
+DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017a38f72ee45b3b224fc3e46abd40b976aef645f4432601265b38cff8939456981c686360eba135349b5d28fb5 SHA512 db9a6b49162dfb7924aa5f5dc8d42c92a5a741e03c3c0b4ece2cfb72de7506a345f3d28d31a3d7755cfe78078c448c9f952ca671e472335a4301de8702916176

diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
new file mode 100644
index 00000000000..6a00ab0d27c
--- /dev/null
+++ b/sci-libs/rocFFT/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCmSoftwarePlatform/rocFFT</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild
new file mode 100644
index 00000000000..eee74cd57dc
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic check-reqs
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}"
+
+CHECKREQS_MEMORY="28G"
+
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s/PREFIX rocfft//" \
+		-e "/rocm_install_symlink_subdir/d" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \
+		-i library/src/CMakeLists.txt || die
+
+	sed -e "/rocm_install_symlink_subdir/d" \
+		-e "$!N;s:PREFIX\n  rocfft:# PREFIX rocfft\n:;P;D" \
+		-i library/src/device/CMakeLists.txt || 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=(
+		-Wno-dev
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/"
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2022-03-20  8:57 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2022-03-20  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     756f565826e38263a085aba91b4d0d27954f26c3
Author:     YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Tue Dec 21 03:03:51 2021 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 08:57:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756f5658

sci-libs/rocFFT: remove unused cmake variable

__skip_rocmclang is used to avoid configuration error for
cmake-3.21.(1|2), which don't exist among ebuilds anymore, so this flag
is not recognized.

Closes: https://github.com/gentoo/gentoo/pull/23446
Closes: https://bugs.gentoo.org/829326
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/{rocFFT-4.3.0.ebuild => rocFFT-4.3.0-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/rocFFT/rocFFT-4.3.0.ebuild b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
similarity index 92%
rename from sci-libs/rocFFT/rocFFT-4.3.0.ebuild
rename to sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
index 3666f751adf2..5ebefcf5435f 100644
--- a/sci-libs/rocFFT/rocFFT-4.3.0.ebuild
+++ b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit cmake check-reqs flag-o-matic multiprocessing python-any-r1
+inherit cmake check-reqs multiprocessing python-any-r1
 
 DESCRIPTION="Next generation FFT implementation for ROCm"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
 	>=sci-libs/fftw-3
+	>=dev-util/cmake-3.22
 )"
 
 CHECKREQS_DISK_BUILD="7G"
@@ -87,7 +88,6 @@ src_configure() {
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
 		-DBUILD_CLIENTS_SELFTEST=OFF  # rocFFT-4.3.0 self test fails. See https://github.com/ROCmSoftwarePlatform/rocFFT/issues/324. Enable it for rocFFT-4.4
 		${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


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2022-07-09  6:10 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2022-07-09  6:10 UTC (permalink / raw
  To: gentoo-commits

commit:     45f1275a0496cba2cc41572c050829e9a8b8c41a
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 15:19:18 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 06:09:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f1275a

sci-libs/rocFFT: rocm-cmake-5.0.2-r1 which fix doc install

Closes: https://github.com/gentoo/gentoo/pull/26286
Closes: https://bugs.gentoo.org/836274
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/rocFFT-5.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
index 3a9ef0df3c4f..bd101fb2e922 100644
--- a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
 	>=sci-libs/fftw-3 sys-libs/libomp )
 	>=dev-util/cmake-3.22
-	dev-util/rocm-cmake:${SLOT}
+	>=dev-util/rocm-cmake-${PV}-r1:${SLOT}
 "
 
 CHECKREQS_DISK_BUILD="7G"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2022-07-09  6:10 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2022-07-09  6:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b1c006b62dadab22d2e0944a68e664a7210e0ac1
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 15:17:11 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 06:09:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c006b6

sci-libs/rocFFT: add libomp to BDEPEND when using test

One src file of test need omp.h header provided by sys-libs/libomp

Closes: https://bugs.gentoo.org/836248
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild | 2 +-
 sci-libs/rocFFT/rocFFT-5.0.2.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
index dc43f84bc615..b9dcb25f7acd 100644
--- a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 
 BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
-	>=sci-libs/fftw-3 )
+	>=sci-libs/fftw-3 sys-libs/libomp )
 	>=dev-util/cmake-3.22
 "
 

diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
index 57db0e5bf85f..3a9ef0df3c4f 100644
--- a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
@@ -33,7 +33,7 @@ DEPEND="dev-util/hip:${SLOT}
 
 BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
-	>=sci-libs/fftw-3 )
+	>=sci-libs/fftw-3 sys-libs/libomp )
 	>=dev-util/cmake-3.22
 	dev-util/rocm-cmake:${SLOT}
 "


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2022-07-09  6:10 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2022-07-09  6:10 UTC (permalink / raw
  To: gentoo-commits

commit:     667ba2194399e0d35c23b5f8051f6816359f6307
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Fri Jul  8 13:52:13 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 06:09:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667ba219

sci-libs/rocFFT: Correct BDEPEND

Building rocFFT always needs rocm-cmake. If it's not present, cmake will
try to download, causing bug #850937

Closes: https://bugs.gentoo.org/850937
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild | 4 ++--
 sci-libs/rocFFT/rocFFT-5.0.2.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
index 5ebefcf5435f..dc43f84bc615 100644
--- a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
@@ -22,9 +22,9 @@ DEPEND="${RDEPEND}
 
 BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
-	>=sci-libs/fftw-3
+	>=sci-libs/fftw-3 )
 	>=dev-util/cmake-3.22
-)"
+"
 
 CHECKREQS_DISK_BUILD="7G"
 

diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
index 8d0cb72d3ed8..57db0e5bf85f 100644
--- a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
@@ -33,10 +33,10 @@ DEPEND="dev-util/hip:${SLOT}
 
 BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
-	>=sci-libs/fftw-3
+	>=sci-libs/fftw-3 )
 	>=dev-util/cmake-3.22
 	dev-util/rocm-cmake:${SLOT}
-)"
+"
 
 CHECKREQS_DISK_BUILD="7G"
 


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2022-08-06 14:23 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2022-08-06 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     1dfa608f1f5db0a577e90464f63534b60edefc71
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 09:37:21 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 14:20:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfa608f

sci-libs/rocFFT: relax SLOT dependency.

This unlocks the exact SLOT dependency of the lower and higher level
ROCm tools to make version bumps easier.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/{rocFFT-5.0.2.ebuild => rocFFT-5.0.2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2-r1.ebuild
similarity index 99%
rename from sci-libs/rocFFT/rocFFT-5.0.2.ebuild
rename to sci-libs/rocFFT/rocFFT-5.0.2-r1.ebuild
index bd101fb2e922..63f8d053f59c 100644
--- a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.0.2-r1.ebuild
@@ -28,7 +28,7 @@ perfscripts? (
 	dev-python/pandas[${PYTHON_USEDEP}] )
 ${PYTHON_DEPS}"
 
-DEPEND="dev-util/hip:${SLOT}
+DEPEND="dev-util/hip:=
 	${PYTHON_DEPS}"
 
 BDEPEND="


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2022-12-19 14:00 Andreas Sturmlechner
  0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2022-12-19 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e24d0a6fbd255ff802fd6e2c030097a86890319f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:36:54 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:00:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24d0a6f

sci-libs/rocFFT: drop 4.0.0-r1, 4.3.0-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/rocFFT/Manifest               |   2 -
 sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild |  51 ----------------
 sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild | 106 ---------------------------------
 3 files changed, 159 deletions(-)

diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index 62c113ca488d..1eadc3e838dc 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1,4 +1,2 @@
-DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017a38f72ee45b3b224fc3e46abd40b976aef645f4432601265b38cff8939456981c686360eba135349b5d28fb5 SHA512 db9a6b49162dfb7924aa5f5dc8d42c92a5a741e03c3c0b4ece2cfb72de7506a345f3d28d31a3d7755cfe78078c448c9f952ca671e472335a4301de8702916176
-DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
 DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43

diff --git a/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild
deleted file mode 100644
index eee74cd57dc0..000000000000
--- a/sci-libs/rocFFT/rocFFT-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic check-reqs
-
-DESCRIPTION="Next generation FFT implementation for ROCm"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}"
-
-CHECKREQS_MEMORY="28G"
-
-S="${WORKDIR}/rocFFT-rocm-${PV}"
-
-src_prepare() {
-	sed -e "s/PREFIX rocfft//" \
-		-e "/rocm_install_symlink_subdir/d" \
-		-e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \
-		-i library/src/CMakeLists.txt || die
-
-	sed -e "/rocm_install_symlink_subdir/d" \
-		-e "$!N;s:PREFIX\n  rocfft:# PREFIX rocfft\n:;P;D" \
-		-i library/src/device/CMakeLists.txt || 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=(
-		-Wno-dev
-		-DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/"
-	)
-
-	cmake_src_configure
-}

diff --git a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild b/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
deleted file mode 100644
index b9dcb25f7acd..000000000000
--- a/sci-libs/rocFFT/rocFFT-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake check-reqs multiprocessing python-any-r1
-
-DESCRIPTION="Next generation FFT implementation for ROCm"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="dev-util/hip:${SLOT}"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-BDEPEND="
-	test? ( dev-cpp/gtest dev-libs/boost
-	>=sci-libs/fftw-3 sys-libs/libomp )
-	>=dev-util/cmake-3.22
-"
-
-CHECKREQS_DISK_BUILD="7G"
-
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/rocFFT-rocm-${PV}"
-
-PATCHES=("${FILESDIR}/${PN}-4.2.0-add-functional-header.patch")
-
-required_mem() {
-	if use test; then
-		echo "52G"
-	else
-		if [[ -n "${AMDGPU_TARGETS}" ]]; then
-			local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) # count how many archs user specified in ${AMDGPU_TARGETS}
-		else
-			local NARCH=7 # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future.
-		fi
-		echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required
-	fi
-}
-
-pkg_pretend() {
-	return # leave the disk space check to pkg_setup phase
-}
-
-pkg_setup() {
-	export CHECKREQS_MEMORY=$(required_mem)
-	check-reqs_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	sed -e "s/PREFIX rocfft//" \
-		-e "/rocm_install_symlink_subdir/d" \
-		-e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \
-		-i library/src/CMakeLists.txt || die
-
-	sed -e "/rocm_install_symlink_subdir/d" \
-		-e "$!N;s:PREFIX\n[ ]*rocfft:# PREFIX rocfft\n:;P;D" \
-		-i library/src/device/CMakeLists.txt || 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=(
-		-Wno-dev
-		-DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
-		-DBUILD_CLIENTS_SELFTEST=OFF  # rocFFT-4.3.0 self test fails. See https://github.com/ROCmSoftwarePlatform/rocFFT/issues/324. Enable it for rocFFT-4.4
-		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	addwrite /dev/kfd
-	addpredict /dev/dri
-	cd "${BUILD_DIR}/clients/staging" || die
-	einfo "Running rocfft-test"
-	LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device ./rocfft-test || die
-
-	# rocFFT-4.3.0 self test fails. See https://github.com/ROCmSoftwarePlatform/rocFFT/issues/324. Enable it for rocFFT-4.4
-	# einfo "Running rocfft-selftest"
-	# LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device ./rocfft-selftest || die
-}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2023-07-05 18:15 Craig Andrews
  0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2023-07-05 18:15 UTC (permalink / raw
  To: gentoo-commits

commit:     26206f6e430231cbeb516ba6252080d70c31ef8f
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 18:12:35 2023 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 18:15:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26206f6e

sci-libs/rocFFT: drop myself as a maintainer

Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 sci-libs/rocFFT/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
index 825327b204eb..5774b6a548d7 100644
--- a/sci-libs/rocFFT/metadata.xml
+++ b/sci-libs/rocFFT/metadata.xml
@@ -5,10 +5,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <maintainer type="person">
-    <email>candrews@gentoo.org</email>
-    <name>Craig Andrews</name>
-  </maintainer>
   <maintainer type="person" proxied="yes">
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2023-07-30  4:39 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2023-07-30  4:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4949344c990b09713c1f8a3895c902916170fed0
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 07:27:48 2023 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 04:35:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4949344c

sci-libs/rocFFT: normalize the header directory.

Closes: https://bugs.gentoo.org/900727
Suggested-by: Jan-Matthias Braun <jan_braun <AT> gmx.net>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
index 811f27fa261b..00c17e869d2e 100644
--- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
@@ -80,7 +80,7 @@ pkg_setup() {
 src_prepare() {
 	sed -e "s/PREFIX rocfft//" \
 		-e "/rocm_install_symlink_subdir/d" \
-		-e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocfft," \
 		-i library/src/CMakeLists.txt || die
 
 	sed -e "/rocm_install_symlink_subdir/d" \
@@ -107,7 +107,7 @@ src_configure() {
 		-DCMAKE_SKIP_RPATH=On
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-Wno-dev
-		-DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocfft/"
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
 		-DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF)
 		-DPYTHON3_EXE=${EPYTHON}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2023-07-30  4:39 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2023-07-30  4:39 UTC (permalink / raw
  To: gentoo-commits

commit:     347288d94323b0bfe2d9eab31b3143556dd5ebec
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 07:13:00 2023 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 04:35:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347288d9

sci-libs/rocFFT: remove versioned dependence on rocm-cmake.

enable py3.11

Closes: https://bugs.gentoo.org/897226
Suggested-by: e-mmh <emma25000 <AT> caramail.fr>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/{rocFFT-5.1.3.ebuild => rocFFT-5.1.3-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
similarity index 98%
rename from sci-libs/rocFFT/rocFFT-5.1.3.ebuild
rename to sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
index af9d3e7fad22..811f27fa261b 100644
--- a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 ROCM_VERSION=${PV}
 
 inherit cmake check-reqs edo multiprocessing python-r1 rocm
@@ -36,7 +36,7 @@ BDEPEND="
 	test? ( dev-cpp/gtest dev-libs/boost
 	>=sci-libs/fftw-3 sys-libs/libomp )
 	>=dev-util/cmake-3.22
-	dev-util/rocm-cmake:${SLOT}
+	dev-util/rocm-cmake
 "
 
 CHECKREQS_DISK_BUILD="7G"


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2023-11-19 16:32 Benda XU
  0 siblings, 0 replies; 15+ messages in thread
From: Benda XU @ 2023-11-19 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     dfec413c0bdb97875fe7e0c66109c7718698a551
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Wed Oct 18 18:59:22 2023 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 16:32:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfec413c

sci-libs/rocFFT: add 5.7.1 and fix test dependencies.

Cannonicalize the include path as no directory hacks are needed for
5.7.1.

Bug: https://github.com/gentoo/gentoo/pull/33400
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/rocFFT/Manifest               |   1 +
 sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild | 150 +++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+)

diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index f93c38954772..b850aef411dd 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1 +1,2 @@
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
+DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f

diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..dc007e4729f1
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+ROCM_VERSION=${PV}
+
+inherit cmake check-reqs edo multiprocessing python-r1 rocm
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask
+RDEPEND="
+perfscripts? (
+	>=media-gfx/asymptote-2.61
+	dev-texlive/texlive-latex
+	dev-tex/latexmk
+	sys-apps/texinfo
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}] )
+${PYTHON_DEPS}"
+
+DEPEND="dev-util/hip
+	${PYTHON_DEPS}"
+
+BDEPEND="
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+		>=sci-libs/fftw-3
+		sys-libs/libomp
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+	>=dev-util/cmake-3.22
+	dev-util/rocm-cmake
+	dev-db/sqlite
+"
+
+CHECKREQS_DISK_BUILD="7G"
+
+IUSE="benchmark perfscripts test"
+REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+PATCHES=()
+
+required_mem() {
+	if use test; then
+		echo "52G"
+	else
+		if [[ -n "${AMDGPU_TARGETS}" ]]; then
+			# count how many archs user specified in ${AMDGPU_TARGETS}
+			local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1))
+		else
+			# The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future.
+			local NARCH=7
+		fi
+		echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required
+	fi
+}
+
+pkg_pretend() {
+	return # leave the disk space check to pkg_setup phase
+}
+
+pkg_setup() {
+	export CHECKREQS_MEMORY=$(required_mem)
+	check-reqs_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	sed -e "s/PREFIX rocfft//" \
+		-e "/rocm_install_symlink_subdir/d" \
+		-i library/src/CMakeLists.txt || die
+
+	sed -e "/rocm_install_symlink_subdir/d" \
+		-e "$!N;s:PREFIX\n[ ]*rocfft:# PREFIX rocfft\n:;P;D" \
+		-i library/src/device/CMakeLists.txt || die
+
+	if use perfscripts; then
+		pushd scripts/perf || die
+		sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir
+		sed -e "/^top/,+1d" -i rocfft-perf suites.py || die
+		sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die
+		sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \
+			-i perflib/pdf.py perflib/generators.py || die
+		popd
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF)
+		-DPYTHON3_EXE=${EPYTHON}
+		-DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF)
+		-DSQLITE_USE_SYSTEM_PACKAGE=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device
+	edob ./${PN,,}-test
+	edob ./${PN,,}-selftest
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/clients/staging || die
+		dobin *rider
+	fi
+
+	if use perfscripts; then
+		cd "${S}"/scripts/perf || die
+		python_foreach_impl python_doexe rocfft-perf
+		python_moduleinto ${PN}_perflib
+		python_foreach_impl python_domodule perflib/*.py
+		insinto /usr/share/${PN}-perflib
+		doins *.asy suites.py
+	fi
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2024-03-08 19:22 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-03-08 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     d2c1e1404904f9ca7daeaa1cc828708a81188b90
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 16:02:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 19:22:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c1e140

sci-libs/rocFFT: fix benchmark dependencies and collision with dev-util/perf

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{rocFFT-5.7.1-r1.ebuild => rocFFT-5.7.1-r2.ebuild} | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
similarity index 93%
rename from sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
rename to sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
index 4a924bd502a7..f4ddb494bf35 100644
--- a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 ROCM_VERSION=${PV}
 
 inherit cmake check-reqs edo multiprocessing python-r1 rocm
@@ -30,9 +30,11 @@ perfscripts? (
 ${PYTHON_DEPS}"
 
 DEPEND="=dev-util/hip-5*
-	${PYTHON_DEPS}"
-
-BDEPEND="
+	${PYTHON_DEPS}
+	benchmark? (
+		dev-libs/boost
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
 	test? (
 		dev-cpp/gtest
 		dev-libs/boost
@@ -40,6 +42,9 @@ BDEPEND="
 		sys-libs/libomp
 		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
 	)
+"
+
+BDEPEND="
 	>=dev-build/cmake-3.22
 	dev-build/rocm-cmake
 	dev-db/sqlite
@@ -137,6 +142,11 @@ src_install() {
 	if use benchmark; then
 		cd "${BUILD_DIR}"/clients/staging || die
 		dobin *rider
+
+		if ! use perfscripts; then
+			# prevent collision with dev-util/perf
+			rm -rf "${ED}"/usr/bin/perf || die
+		fi
 	fi
 
 	if use perfscripts; then


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2024-03-08 19:22 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-03-08 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     58d02b04f88546a40e809b0911e87de092f9ad69
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Fri Jan  5 15:33:01 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 19:22:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d02b04

sci-libs/rocFFT: lock dev-util/hip version, as with hip-6.0 build fails with "no member named 'gcnArch'"

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
index 0fba2a7508a3..5da8c917f384 100644
--- a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
@@ -29,7 +29,7 @@ perfscripts? (
 	dev-python/pandas[${PYTHON_USEDEP}] )
 ${PYTHON_DEPS}"
 
-DEPEND="dev-util/hip
+DEPEND="=dev-util/hip-5*
 	${PYTHON_DEPS}"
 
 BDEPEND="


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2024-06-26  9:21 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-06-26  9:21 UTC (permalink / raw
  To: gentoo-commits

commit:     aed15dd4eadeb2f556630401fc9b29186e6540ba
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 18:55:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 09:19:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed15dd4

sci-libs/rocFFT: add 6.1.1

Changes:
* Benchmark tools were renamed from *-rider to *-bench
* Add myself to maintainers
* Drop sed fixes for install path

Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/rocFFT/Manifest            |   1 +
 sci-libs/rocFFT/metadata.xml        |  14 ++--
 sci-libs/rocFFT/rocFFT-6.1.1.ebuild | 149 ++++++++++++++++++++++++++++++++++++
 3 files changed, 159 insertions(+), 5 deletions(-)

diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index b850aef411dd..206e1b4ad564 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1,2 +1,3 @@
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f
+DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9

diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
index 5774b6a548d7..ab2a20524390 100644
--- a/sci-libs/rocFFT/metadata.xml
+++ b/sci-libs/rocFFT/metadata.xml
@@ -9,11 +9,15 @@
     <email>gentoo@holzke.net</email>
     <name>Wilfried Holzke</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/rocFFT</remote-id>
+    <remote-id type="github">ROCm/rocFFT</remote-id>
   </upstream>
-    <use>
-        <flag name="benchmark">Build and install [dyna-]rocfft-rider.</flag>
-        <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag>
-    </use>
+  <use>
+    <flag name="benchmark">Build and install rocfft benchmark tools.</flag>
+    <flag name="perfscripts">Install rocfft-perf performance visualization suite.</flag>
+  </use>
 </pkgmetadata>

diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
new file mode 100644
index 000000000000..4eef4ea268dc
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+ROCM_VERSION=${PV}
+
+inherit cmake check-reqs edo multiprocessing python-r1 rocm
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCm/rocFFT"
+SRC_URI="https://github.com/ROCm/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask
+RDEPEND="
+perfscripts? (
+	>=media-gfx/asymptote-2.61
+	dev-texlive/texlive-latex
+	dev-tex/latexmk
+	sys-apps/texinfo
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}] )
+${PYTHON_DEPS}"
+
+DEPEND="=dev-util/hip-6*
+	${PYTHON_DEPS}
+	benchmark? (
+		dev-libs/boost
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+	test? (
+		dev-cpp/gtest
+		dev-libs/boost
+		>=sci-libs/fftw-3
+		sys-libs/libomp
+		sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+	)
+"
+
+BDEPEND="
+	>=dev-build/cmake-3.22
+	dev-build/rocm-cmake
+	dev-db/sqlite
+"
+
+CHECKREQS_DISK_BUILD="7G"
+
+IUSE="benchmark perfscripts test"
+REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+)
+
+required_mem() {
+	if use test; then
+		echo "52G"
+	else
+		if [[ -n "${AMDGPU_TARGETS}" ]]; then
+			# count how many archs user specified in ${AMDGPU_TARGETS}
+			local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1))
+		else
+			# The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future.
+			local NARCH=7
+		fi
+		echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required
+	fi
+}
+
+pkg_pretend() {
+	return # leave the disk space check to pkg_setup phase
+}
+
+pkg_setup() {
+	export CHECKREQS_MEMORY=$(required_mem)
+	check-reqs_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	if use perfscripts; then
+		pushd scripts/perf || die
+		sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir
+		sed -e "/^top/,+1d" -i rocfft-perf suites.py || die
+		sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die
+		sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," \
+			-i perflib/pdf.py perflib/generators.py || die
+		popd
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DROCM_SYMLINK_LIBS=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCH=$(usex benchmark ON OFF)
+		-DSQLITE_USE_SYSTEM_PACKAGE=ON
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device
+	edob ./${PN,,}-test
+	edob ./${PN,,}-selftest
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/clients/staging || die
+		dobin dyna-rocfft-bench rocfft-bench
+		dosym dyna-rocfft-bench /usr/bin/dyna-rocfft-rider
+		dosym rocfft-bench /usr/bin/dyna-rocfft-rider
+
+		if ! use perfscripts; then
+			# prevent collision with dev-util/perf
+			rm -rf "${ED}"/usr/bin/perf || die
+		fi
+	fi
+
+	if use perfscripts; then
+		cd "${S}"/scripts/perf || die
+		python_foreach_impl python_doexe rocfft-perf
+		python_moduleinto ${PN}_perflib
+		python_foreach_impl python_domodule perflib/*.py
+		insinto /usr/share/${PN}-perflib
+		doins *.asy suites.py
+	fi
+}


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
@ 2024-09-09 18:20 Sam James
  0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-09-09 18:20 UTC (permalink / raw
  To: gentoo-commits

commit:     49badac556ce194ade8e48f893f205b967c67fcd
Author:     Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Sat Jul 20 17:33:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep  9 18:15:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49badac5

sci-libs/rocFFT: strip unsupported flags for potentially switched compiler

Bug: https://bugs.gentoo.org/936099
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-libs/rocFFT/rocFFT-6.1.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
index 4eef4ea268dc..99709902c496 100644
--- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -101,6 +101,8 @@ src_prepare() {
 }
 
 src_configure() {
+	rocm_use_hipcc
+
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
 		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
@@ -112,7 +114,7 @@ src_configure() {
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 
-	CXX=hipcc cmake_src_configure
+	cmake_src_configure
 }
 
 src_test() {


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-09-09 18:20 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-08 19:22 [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2024-09-09 18:20 Sam James
2024-06-26  9:21 Sam James
2024-03-08 19:22 Sam James
2023-11-19 16:32 Benda XU
2023-07-30  4:39 Benda XU
2023-07-30  4:39 Benda XU
2023-07-05 18:15 Craig Andrews
2022-12-19 14:00 Andreas Sturmlechner
2022-08-06 14:23 Benda XU
2022-07-09  6:10 Benda XU
2022-07-09  6:10 Benda XU
2022-07-09  6:10 Benda XU
2022-03-20  8:57 Benda XU
2021-01-24  7:49 Benda XU

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox