Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hipFFT/files/, sci-libs/hipFFT/
Date: Wed, 01 Feb 2023 09:53:37
Message-Id: 1675245171.40a02dac874b5b7f20f9af80ffe39ac67cd5623c.asturm@gentoo
1 commit: 40a02dac874b5b7f20f9af80ffe39ac67cd5623c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 24 22:21:37 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 09:52:51 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a02dac
7
8 sci-libs/hipFFT: drop 5.0.2
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 sci-libs/hipFFT/Manifest | 2 -
13 .../hipFFT-5.0.2-gentoo-install-locations.patch | 28 --------
14 sci-libs/hipFFT/hipFFT-5.0.2.ebuild | 77 ----------------------
15 sci-libs/hipFFT/metadata.xml | 3 -
16 4 files changed, 110 deletions(-)
17
18 diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
19 index d45a08dd417a..7ef5713343b5 100644
20 --- a/sci-libs/hipFFT/Manifest
21 +++ b/sci-libs/hipFFT/Manifest
22 @@ -1,3 +1 @@
23 -DIST hipFFT-rocm-5.0.2.tar.gz 88405 BLAKE2B c3a2e5e029d7d91c7cdc1c4e2ddec71c17df0cf2d863c81ef263eea3734488fcc31795ea681b27dffd04c0833c99df252256c3ffacfbf29305fa1ba5b8bd4efa SHA512 4fdc080479f1094e9ce92acc0eceb630a6a6ce711ffdc5ffef58d61baf23e8ea9ec45a922d798fb17a7724425d5785451f5f114bc7db40ebbfb50359b56456a6
24 DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
25 -DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9
26
27 diff --git a/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch b/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch
28 deleted file mode 100644
29 index eefdb2aaaaf5..000000000000
30 --- a/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch
31 +++ /dev/null
32 @@ -1,28 +0,0 @@
33 -Index: hipFFT-rocm-5.0.2/library/CMakeLists.txt
34 -===================================================================
35 ---- hipFFT-rocm-5.0.2.orig/library/CMakeLists.txt
36 -+++ hipFFT-rocm-5.0.2/library/CMakeLists.txt
37 -@@ -81,7 +81,7 @@ target_include_directories( hipfft
38 - PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include>
39 - $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
40 - $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}>
41 -- $<INSTALL_INTERFACE:include>
42 -+ $<INSTALL_INTERFACE:include/hipfft>
43 - ${HIP_INCLUDE_DIRS}
44 - )
45 -
46 -@@ -142,13 +142,11 @@ if( ROCM_FOUND )
47 - rocm_install_targets( TARGETS hipfft
48 - INCLUDE
49 - ${CMAKE_SOURCE_DIR}/library/include
50 -- ${CMAKE_BINARY_DIR}/include
51 -- PREFIX hipfft )
52 -+ ${CMAKE_BINARY_DIR}/include )
53 - rocm_export_targets( TARGETS hip::hipfft
54 - PREFIX hipfft
55 - DEPENDS PACKAGE hip
56 - NAMESPACE hip:: )
57 -- rocm_install_symlink_subdir( hipfft )
58 -
59 - # Package specific CPACK vars
60 - if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
61
62 diff --git a/sci-libs/hipFFT/hipFFT-5.0.2.ebuild b/sci-libs/hipFFT/hipFFT-5.0.2.ebuild
63 deleted file mode 100644
64 index bf7e339f002a..000000000000
65 --- a/sci-libs/hipFFT/hipFFT-5.0.2.ebuild
66 +++ /dev/null
67 @@ -1,77 +0,0 @@
68 -# Copyright 1999-2022 Gentoo Authors
69 -# Distributed under the terms of the GNU General Public License v2
70 -
71 -EAPI=8
72 -
73 -inherit cmake
74 -
75 -DESCRIPTION="CU / ROCM agnostic hip FFT implementation"
76 -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT"
77 -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz
78 - test? ( https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz )"
79 -
80 -LICENSE="MIT"
81 -KEYWORDS="~amd64"
82 -IUSE="benchmark test"
83 -SLOT="0/$(ver_cut 1-2)"
84 -
85 -RESTRICT="!test? ( test )"
86 -
87 -RDEPEND="dev-util/hip:${SLOT}
88 - sci-libs/rocFFT:${SLOT}"
89 -DEPEND="${RDEPEND}"
90 -BDEPEND="
91 - test? (
92 - dev-cpp/gtest
93 - dev-libs/boost
94 -)"
95 -
96 -S="${WORKDIR}/hipFFT-rocm-${PV}"
97 -
98 -PATCHES=(
99 - "${FILESDIR}/${PN}-5.0.2-gentoo-install-locations.patch"
100 - "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch"
101 - "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
102 -)
103 -
104 -src_prepare() {
105 - use test && rmdir rocFFT && ln -s ../rocFFT-rocm-${PV} rocFFT
106 - sed -e "/CMAKE_INSTALL_LIBDIR/d" -i CMakeLists.txt || die
107 - CXX=hipcc cmake_src_prepare
108 -}
109 -
110 -src_configure() {
111 - # Grant access to the device
112 - addwrite /dev/kfd
113 - addpredict /dev/dri/
114 -
115 - local mycmakeargs=(
116 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
117 - -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft"
118 - -DCMAKE_SKIP_RPATH=ON
119 - -DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake"
120 - -DHIP_ROOT_DIR="${EPREFIX}/usr"
121 - -DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
122 - -DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF)
123 - ${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
124 - )
125 -
126 - export CXX=hipcc
127 - cmake_src_configure
128 -}
129 -
130 -src_test () {
131 - addwrite /dev/kfd
132 - addpredict /dev/dri
133 - cd "${BUILD_DIR}/clients/staging" || die
134 - einfo "Running hipfft-test"
135 - LD_LIBRARY_PATH=${BUILD_DIR}/library ./hipfft-test || die
136 -}
137 -
138 -src_install() {
139 - cmake_src_install
140 - if use benchmark; then
141 - cd "${BUILD_DIR}/clients/staging" || die
142 - dobin hipfft-rider
143 - fi
144 -}
145
146 diff --git a/sci-libs/hipFFT/metadata.xml b/sci-libs/hipFFT/metadata.xml
147 index 0ae466927cad..54e78eb20141 100644
148 --- a/sci-libs/hipFFT/metadata.xml
149 +++ b/sci-libs/hipFFT/metadata.xml
150 @@ -16,7 +16,4 @@
151 <upstream>
152 <remote-id type="github">ROCmSoftwarePlatform/hipFFT</remote-id>
153 </upstream>
154 - <use>
155 - <flag name="benchmark">Build and install benchmark programs hipfft-rider.</flag>
156 - </use>
157 </pkgmetadata>