gentoo resync : 06.04.2022

5 files changed, 223 insertions, 1 deletions

diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index cf8d24cfc967..b12cbff2f402 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1,6 +1,10 @@
 AUX rocFFT-4.2.0-add-functional-header.patch 426 BLAKE2B 82c289bb6663690163c11950d05c21acf73ac3c759b9c081f30bd2f86e8416a1d9e064d6879e3e5624b44488a6caf3d6d215e8a3c37647e5bfb0d58b85985081 SHA512 09bcfe421f20a6e5ba66a0efc4beecbdb591b2422eecc851c99c6cde12da904ab2bb86c5985bbc68fe9a859fdc986b21f6ae855cb631eb5e15819b6f39e3ef00
+AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325dc3f0c8869b109cdeb46892d597346532dcae2bd51739b85b97ecb6982935ec38f1332a4857d719b1c7c9e3a1e83f60623d1 SHA512 f714ba071838ebba8c6ab32b92eab52430622ef5f7eeea04f7a8c71b8a2a547688faf0f8d93a9be90183aebb976ec51722bcee81d960545046c82fd3df9b6f01
+AUX rocFFT-5.0.2-unbundle-sqlite.patch 1997 BLAKE2B aee0737f52870d8b154b18b8961f0e8059d50d134afe014edf25439084f112b1f4d91a8123d5133fcde129305050447355df341898563ed950b80af3589d1153 SHA512 8dc74594c698e45a41a4632c2211a7c23c9f9ff4c2c3716b99c74888529414684d52e8e146853e69370d1c80893da35fcd1076a55cf9e7eddc9d2e6fb71296f7
 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
 EBUILD rocFFT-4.0.0-r1.ebuild 1131 BLAKE2B 71aa2f8a3318d92ac9ec0739b0e921b10b54bd8d3b1416d23a9ac3e41b23401626c382cba34b1d9e1249e42951d8b7fdba9604cda01cb9e12cb0980850f1c997 SHA512 dbbc8c2cd0c79b16c90fbb41bdd0f901e61195b373d0ebcce5df0e9cb4eebb116af142c8f10a85ce68cc1cf9aeb1f7578eee3d360d80ecf0512ae7821db15aa2
 EBUILD rocFFT-4.3.0-r1.ebuild 2798 BLAKE2B c4e243674c4eded667cce3d3e2e4a9f1a612e0e62e699e23a3afc3482e6b1b82038a9de253748220da8c0a01bde66bada55b9a5514a2cc9688e015dcd4d91915 SHA512 fb9f81f734cb7919f63640c04e399608a84dc2864dc51f415f886b684b27d68ac6b9b504961f7bf3ae9e1533cbca7e7a4182a3def9d0f85e78ba13b13a94d306
-MISC metadata.xml 600 BLAKE2B e5670764a33e77b02bcec492c068a8ec969f0b17888ae74fa09cf13fbac40012cf2ae7590e130012addbbcf2210f66391786395896a5c34f2d74ff977300507a SHA512 50e92e755a0b3b86eaceabc2884aebe14659913e104fc9fa915603b975b03350d66deef3c5455ed48f5ca67033050817f953a3d649161cf31a3088a77780cd38
+EBUILD rocFFT-5.0.2.ebuild 3990 BLAKE2B 6d7109e8378a68de6a95d56f61baf2b8322ce512ee3d24bec92228b17b9e42e399e3f4ebff26f079025d95d5debb43450526670810c6a91fea821bf07e166928 SHA512 54f3a877fa12d3d3cf1716135447fa48b3cfcd17c54f93433d2b940b58380f1b57c7252e3c541d8d969df688ec0f965381fbe20d0a300c9d14f1b5085a46e148
+MISC metadata.xml 791 BLAKE2B d61b1f8788dd0d531aebd0b3273072a1ef2cd2e13423dd3b040cb077a6f12b2790a22159c339f98ce4ee93ee674db83390066a05d93d23e6de9dd47283a59ac7 SHA512 a33e10d3fcb784a75bf2b1d3ecddd53cf80328c37a6829202c7b74001338a2a10bdb122ce7aea65c68315e3985a890889b833cd65f4d1fb14bbf6d9bd59752e8
diff --git a/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch b/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch
new file mode 100644
index 000000000000..1a35126f1d8c
--- /dev/null
+++ b/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch
@@ -0,0 +1,12 @@
+fix compilation issue: error: use of undeclared identifier 'ceil' 'floor'
+===================================================================
+--- rocFFT-rocm-5.0.2.orig/library/src/device/generator/stockham_gen_base.h
++++ rocFFT-rocm-5.0.2/library/src/device/generator/stockham_gen_base.h
+@@ -20,6 +20,7 @@
+ 
+ #pragma once
+ #include "stockham_gen.h"
++#include <math.h>
+ 
+ // Base class for stockham kernels.  Subclasses are responsible for
+ // different tiling types.
diff --git a/sci-libs/rocFFT/files/rocFFT-5.0.2-unbundle-sqlite.patch b/sci-libs/rocFFT/files/rocFFT-5.0.2-unbundle-sqlite.patch
new file mode 100644
index 000000000000..4da2b2092906
--- /dev/null
+++ b/sci-libs/rocFFT/files/rocFFT-5.0.2-unbundle-sqlite.patch
@@ -0,0 +1,54 @@
+Disable rocFFT fetching SQLite3 and link to system libsqlite.so
+--- rocFFT-rocm-5.0.2/library/src/CMakeLists.txt
++++ rocFFT-rocm-5.0.2/library/src/CMakeLists.txt
+@@ -134,31 +134,7 @@ set( rocfft_source
+   rtcsubprocess.cpp
+   )
+ 
+-# SQLite 3.36.0 enabled the backup API by default, which we need
+-# for cache serialization.  We also want to use a static SQLite,
+-# and distro static libraries aren't typically built
+-# position-independent.
+-include( FetchContent )
+-
+-# embed SQLite
+-FetchContent_Declare(sqlite_local
+-  URL https://sqlite.org/2021/sqlite-amalgamation-3360000.zip
+-  URL_HASH SHA256=999826fe4c871f18919fdb8ed7ec9dd8217180854dd1fe21eea96aed36186729
+-)
+-FetchContent_MakeAvailable(sqlite_local)
+-add_library( sqlite3 STATIC ${sqlite_local_SOURCE_DIR}/sqlite3.c )
+-set_target_properties( sqlite3 PROPERTIES
+-  C_VISIBILITY_PRESET "hidden"
+-  VISIBILITY_INLINES_HIDDEN ON
+-  POSITION_INDEPENDENT_CODE ON
+-  )
+-
+-# we don't need extensions, and omitting them from SQLite removes the
+-# need for dlopen/dlclose from within rocFFT
+-target_compile_options(
+-  sqlite3
+-  PRIVATE -DSQLITE_OMIT_LOAD_EXTENSION
+-)
++find_package( SQLite3 REQUIRED )
+ 
+ set_property(
+   SOURCE rtc.cpp
+@@ -170,7 +146,7 @@ prepend_path( ".." rocfft_headers_public
+ add_library( rocfft ${rocfft_source} ${relative_rocfft_headers_public} )
+ add_library( roc::rocfft ALIAS rocfft )
+ 
+-target_link_libraries( rocfft PRIVATE stockham_gen sqlite3 )
++target_link_libraries( rocfft PRIVATE stockham_gen ${SQLite3_LIBRARIES} )
+ if( NOT WIN32 )
+   target_link_libraries( rocfft PRIVATE -lstdc++fs )
+ endif()
+@@ -203,7 +179,7 @@ endif()
+ target_include_directories( rocfft
+   PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/include>
+   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/library/src/device>
+-  ${sqlite_local_SOURCE_DIR}
++  ${SQLite3_LIBRARIES}
+   PUBLIC  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/include>
+   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+   $<INSTALL_INTERFACE:include/rocFFT>
diff --git a/sci-libs/rocFFT/metadata.xml b/sci-libs/rocFFT/metadata.xml
index 3274277df8c4..825327b204eb 100644
--- a/sci-libs/rocFFT/metadata.xml
+++ b/sci-libs/rocFFT/metadata.xml
@@ -16,4 +16,8 @@
   <upstream>
     <remote-id type="github">ROCmSoftwarePlatform/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>
 </pkgmetadata>
diff --git a/sci-libs/rocFFT/rocFFT-5.0.2.ebuild b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
new file mode 100644
index 000000000000..8d0cb72d3ed8
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-5.0.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake check-reqs multiprocessing python-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: 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:${SLOT}
+	${PYTHON_DEPS}"
+
+BDEPEND="
+	test? ( dev-cpp/gtest dev-libs/boost
+	>=sci-libs/fftw-3
+	>=dev-util/cmake-3.22
+	dev-util/rocm-cmake:${SLOT}
+)"
+
+CHECKREQS_DISK_BUILD="7G"
+
+IUSE="benchmark perfscripts test"
+REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-add-functional-header.patch"
+	"${FILESDIR}/${PN}-5.0.2-unbundle-sqlite.patch"
+	"${FILESDIR}/${PN}-5.0.2-add-math-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
+
+	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() {
+	# 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=$(usex test ON OFF)
+		-DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF)
+		${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
+
+	einfo "Running rocfft-selftest"
+	LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device ./rocfft-selftest || die
+}
+
+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
+}