From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/files/, sci-libs/rocFFT/
Date: Thu, 13 Feb 2025 08:38:44 +0000 (UTC) [thread overview]
Message-ID: <1739435722.4364cd3668c6b72c6c834a2d3b8ad49793987cc9.sam@gentoo> (raw)
commit: 4364cd3668c6b72c6c834a2d3b8ad49793987cc9
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Thu Jan 30 14:32:12 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 08:35:22 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4364cd36
sci-libs/rocFFT: 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/rocFFT/Manifest | 1 -
| 12 --
| 12 --
| 11 --
.../files/rocFFT-5.1.3-unbundle-sqlite.patch | 67 ----------
sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild | 145 ---------------------
6 files changed, 248 deletions(-)
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index 0649df5beb1b..4b1be69dbd05 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1,4 +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
DIST rocFFT-6.3.0.tar.gz 1386056 BLAKE2B 1aab60818328cb3a6448f6d555faf2db3b3839e2b3abd7a37cc48054e67321e7c98c319b2f078dfd351f56263c35731608ae65fca427fc3eaaf06c8410b99d89 SHA512 4ac2dac24e77a9d767fa08a9d393cb2c94bc2a8ca32cb75ea53dd83011989bd344ae3c11c9bfc557e71c645ebea34c53a5e050ce6810259f84287e6baf829c08
diff --git a/sci-libs/rocFFT/files/rocFFT-4.2.0-add-functional-header.patch b/sci-libs/rocFFT/files/rocFFT-4.2.0-add-functional-header.patch
deleted file mode 100644
index 75dee06362b6..000000000000
--- a/sci-libs/rocFFT/files/rocFFT-4.2.0-add-functional-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-resolves compilation error: no member named 'multiplies' in namespace 'std' for library/src/twiddles.cpp
-
---- a/library/src/include/twiddles.h 2021-04-15 10:24:46.000000000 -0700
-+++ b/library/src/include/twiddles.h 2021-07-21 22:27:10.760604147 -0700
-@@ -9,6 +9,7 @@
- #include "../../../shared/gpubuf.h"
- #include "rocfft.h"
- #include <cassert>
-+#include <functional>
- #include <math.h>
- #include <numeric>
- #include <tuple>
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
deleted file mode 100644
index 1a35126f1d8c..000000000000
--- a/sci-libs/rocFFT/files/rocFFT-5.0.2-add-math-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.1.3-add-stdexcept-header.patch b/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch
deleted file mode 100644
index edfd89ea4b70..000000000000
--- a/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Contributed-by: perestoronin https://bugs.gentoo.org/693200#c25
---- a/library/src/include/twiddles.h
-+++ b/library/src/include/twiddles.h
-@@ -14,6 +14,7 @@
- #include <numeric>
- #include <tuple>
- #include <vector>
-+#include <stdexcept>
-
- static const size_t LTWD_BASE_DEFAULT = 8;
- static const size_t LARGE_TWIDDLE_THRESHOLD = 4096;
diff --git a/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch b/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch
deleted file mode 100644
index b18b55eb8048..000000000000
--- a/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Disable rocFFT fetching SQLite3 and link to system libsqlite.so
-Index: rocFFT-rocm-5.1.3/library/src/CMakeLists.txt
-===================================================================
---- rocFFT-rocm-5.1.3.orig/library/src/CMakeLists.txt
-+++ rocFFT-rocm-5.1.3/library/src/CMakeLists.txt
-@@ -134,49 +134,22 @@ 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 )
--
--set(SQLITE_SRC_URL https://sqlite.org/2021/sqlite-amalgamation-3360000.zip CACHE STRING "Location of SQLite source code")
--set(SQLITE_SRC_SHA256 999826fe4c871f18919fdb8ed7ec9dd8217180854dd1fe21eea96aed36186729 CACHE STRING "SHA256 hash of SQLite source code")
--
--# embed SQLite
--FetchContent_Declare(sqlite_local
-- URL ${SQLITE_SRC_URL}
-- URL_HASH SHA256=${SQLITE_SRC_SHA256}
--)
--FetchContent_MakeAvailable(sqlite_local)
--add_library( sqlite3 OBJECT ${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
--)
--
- set_property(
- SOURCE rtc.cpp
- PROPERTY OBJECT_DEPENDS ${kgen_embed_h}
- )
-
-+find_package( SQLite3 REQUIRED )
-+
- prepend_path( ".." rocfft_headers_public relative_rocfft_headers_public )
-
- add_library( rocfft
- ${rocfft_source}
- ${relative_rocfft_headers_public}
-- $<TARGET_OBJECTS:sqlite3>
- )
- add_library( roc::rocfft ALIAS rocfft )
-
-+target_link_libraries( rocfft PRIVATE ${SQLite3_LIBRARIES} )
- if( NOT WIN32 )
- target_link_libraries( rocfft PRIVATE -lstdc++fs )
- endif()
-@@ -209,7 +182,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>
diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
deleted file mode 100644
index 7b75953d510f..000000000000
--- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,145 +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 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 llvm-runtimes/openmp )
- >=dev-build/cmake-3.22
- dev-build/rocm-cmake
-"
-
-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=(
- "${FILESDIR}/${PN}-4.2.0-add-functional-header.patch"
- "${FILESDIR}/${PN}-5.1.3-unbundle-sqlite.patch"
- "${FILESDIR}/${PN}-5.0.2-add-math-header.patch"
- "${FILESDIR}/${PN}-5.1.3-add-stdexcept-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() {
- addpredict /dev/kfd
- addpredict /dev/dri/
-
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=On
- -DAMDGPU_TARGETS="$(get_amdgpu_flags)"
- -Wno-dev
- -DCMAKE_INSTALL_INCLUDEDIR="include/rocfft/"
- -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)
- )
-
- 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
-}
next reply other threads:[~2025-02-13 8:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-13 8:38 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-26 14:00 [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/files/, sci-libs/rocFFT/ Sam James
2023-02-01 9:53 Andreas Sturmlechner
2022-03-27 3:12 Benda XU
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1739435722.4364cd3668c6b72c6c834a2d3b8ad49793987cc9.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox