commit: 6f6a7d3c411add47c688116db59c53ba17f5b220
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Thu Jan 30 14:42:20 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 13 08:35:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6a7d3c
sci-libs/hipFFT: 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/hipFFT/Manifest | 1 -
.../hipFFT-5.1.3-gentoo-install-locations.patch | 29 -------
.../hipFFT/files/hipFFT-5.1.3_hip-config.patch | 90 ----------------------
sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild | 44 -----------
4 files changed, 164 deletions(-)
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index ac673321a23f..2095b039b036 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -1,4 +1,3 @@
-DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B
3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68
SHA512
8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B
ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6
SHA512
4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465
DIST hipFFT-rocm-6.1.1.tar.gz 170796 BLAKE2B
8c957db8e7e2548918539c94262d912c2f33b70d8482b727c78c13323bdb6822c3e95439854b8ab4fed970d21ed0c6fd2ab8c2805db59d3a3606d73e7eb47468
SHA512
531be32b12ed5f0f2352e3e0a893ca988a4c8492e66fc9347b6754ae4e769549d6f638a760de35cb15ef2d301ab4200a76c832d769ecb0cd55e9e42f839a1876
DIST hipFFT-rocm-6.3.0.tar.gz 267945 BLAKE2B
33d9013ddb20b37b17a05dc647e74eaccede7e952723a177cb0f1e54f2b25cd6a76b1a8b00f419cf197e495dd654b04f418d28ca1023ea4bc88f0ccf8191d6c0
SHA512
a210e044a87845a861c127529143ea8517f5eef30a07007f43bd29a85b5c2999bd6002d12cd2a06c1c8b469ea3d52c081bbcc5146c5fc585df8505ddfa6a3e06
diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch
b/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch
deleted file mode 100644
index fe395de42f86..000000000000
--- a/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix install location to meet FHS, and remove useless symlink
-===================================================================
---- hipFFT-rocm-5.1.3.orig/library/CMakeLists.txt
-+++ hipFFT-rocm-5.1.3/library/CMakeLists.txt
-@@ -81,7 +81,7 @@ target_include_directories( hipfft
- PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include>
- $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
- $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}>
-- $<INSTALL_INTERFACE:include>
-+ $<INSTALL_INTERFACE:include/hipfft>
- ${HIP_INCLUDE_DIRS}
- )
-
-@@ -142,13 +142,11 @@ if( ROCM_FOUND )
- rocm_install_targets( TARGETS hipfft
- INCLUDE
- ${CMAKE_SOURCE_DIR}/library/include
-- ${CMAKE_BINARY_DIR}/include
-- PREFIX hipfft )
-+ ${CMAKE_BINARY_DIR}/include )
- rocm_export_targets( TARGETS hip::hipfft
-- PREFIX hipfft
-+ PREFIX .
- DEPENDS PACKAGE hip
- NAMESPACE hip:: )
-- rocm_install_symlink_subdir( hipfft )
-
- # Package specific CPACK vars
- if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch
b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch
deleted file mode 100644
index 2f63a0f8e6f7..000000000000
--- a/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-reverts the following commit.
-
-Upstream: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/67
-
-commit 41491c9a70f808ed74690a538ca7bd25ff1ae1ca
-Author: Steve Leung <steve.le...@amd.com>
-Date: Wed Sep 1 11:25:26 2021 -0600
-
- cmake: use HIP CONFIG on Windows
-
-diff --git a/clients/rider/CMakeLists.txt b/clients/rider/CMakeLists.txt
-index de1fc7d..8b88103 100644
---- b/clients/rider/CMakeLists.txt
-+++ a/clients/rider/CMakeLists.txt
-@@ -43,11 +43,7 @@
-
- if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
- if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
-- if( WIN32 )
-- find_package( HIP CONFIG REQUIRED )
-- else()
-- find_package( HIP MODULE REQUIRED )
-- endif()
-+ find_package( HIP REQUIRED )
- target_link_libraries( hipfft-rider PRIVATE hip::host )
- else()
-
-diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt
-index 5a882c6..37162ab 100644
---- b/clients/samples/CMakeLists.txt
-+++ a/clients/samples/CMakeLists.txt
-@@ -48,11 +48,7 @@
- target_link_libraries( ${sample} PRIVATE hip::hipfft )
-
- if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
-- if( WIN32 )
-- find_package( HIP CONFIG REQUIRED )
-- else()
-- find_package( HIP MODULE REQUIRED )
-- endif()
-+ find_package( HIP REQUIRED )
- if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
- target_link_libraries( ${sample} PRIVATE hip::host )
- else()
-diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt
-index 2b965e2..0442a79 100644
---- b/clients/tests/CMakeLists.txt
-+++ a/clients/tests/CMakeLists.txt
-@@ -81,11 +81,7 @@
-
- if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
- if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
-- if( WIN32 )
-- find_package( HIP CONFIG REQUIRED )
-- else()
-- find_package( HIP MODULE REQUIRED )
-- endif()
-+ find_package( HIP REQUIRED )
- target_link_libraries( hipfft-test PRIVATE hip::host )
- else()
- target_compile_definitions( hipfft-test PRIVATE __HIP_PLATFORM_NVIDIA__)
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index 022e3e4..0c8b3f8 100644
---- b/cmake/dependencies.cmake
-+++ a/cmake/dependencies.cmake
-@@ -27,22 +27,14 @@
- # HIP
- if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
- if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
-- if( WIN32 )
-- find_package( HIP CONFIG REQUIRED )
-- else()
-- find_package( HIP MODULE REQUIRED )
-- endif()
-+ find_package( HIP REQUIRED )
- list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" )
- endif()
- else()
- if( BUILD_WITH_LIB STREQUAL "CUDA" )
- set(HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include")
- else()
-- if( WIN32 )
-- find_package( HIP CONFIG REQUIRED )
-- else()
-- find_package( HIP MODULE REQUIRED )
-- endif()
-+ find_package( HIP REQUIRED )
- endif()
- endif()
-
diff --git a/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild
b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild
deleted file mode 100644
index 79eb8052324f..000000000000
--- a/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION=${PV}
-
-inherit cmake rocm
-
-DESCRIPTION="CU / ROCM agnostic hip FFT implementation"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT";
-SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz
-> hipFFT-rocm-${PV}.tar.gz"
-REQUIRED_USE="${ROCM_REQUIRED_USE}"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-
-RESTRICT="test"
-
-RDEPEND="dev-util/hip
- sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/hipFFT-rocm-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.1.3_hip-config.patch"
- "${FILESDIR}/${PN}-5.1.3-gentoo-install-locations.patch"
- "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch"
- "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft"
- -DROCM_SYMLINK_LIBS=OFF
- -DBUILD_CLIENTS_TESTS=OFF
- -DBUILD_CLIENTS_RIDER=OFF
- )
-
- CXX=hipcc cmake_src_configure
-}
