[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipFFT/files/, sci-libs/hipFFT/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     890380b6bae77c162805896f097b98ce54bfd0b9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 10:45:17 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 14:00:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=890380b6

sci-libs/hipFFT: drop 4.3.0

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

 sci-libs/hipFFT/Manifest                           |  2 -
 .../hipFFT-4.3.0-gentoo-install-locations.patch    | 42 ------------
 .../files/hipFFT-4.3.0-remove-git-dependency.patch | 33 ----------
 sci-libs/hipFFT/hipFFT-4.3.0.ebuild                | 75 ----------------------
 4 files changed, 152 deletions(-)

diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index 12b43d91d6cd..d45a08dd417a 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -1,5 +1,3 @@
-DIST hipFFT-rocm-4.3.0.tar.gz 83355 BLAKE2B ee99b4cb685cbb846084d8a7c77982d75cf0d1597f9270260284bb26ae00702a31dd4d5ad9ae1885ab631c390f65c0f584f302be189701ba4f0dd9061b1bba5a SHA512 0d3100b054ff485eae06b13b8c568626b8e3a3286f36012c5a5f9bb4918e03c30c687a2714049bd797f6c3973f1730ad0936f02ad044cde1663c9c5750bbcf40
 DIST hipFFT-rocm-5.0.2.tar.gz 88405 BLAKE2B c3a2e5e029d7d91c7cdc1c4e2ddec71c17df0cf2d863c81ef263eea3734488fcc31795ea681b27dffd04c0833c99df252256c3ffacfbf29305fa1ba5b8bd4efa SHA512 4fdc080479f1094e9ce92acc0eceb630a6a6ce711ffdc5ffef58d61baf23e8ea9ec45a922d798fb17a7724425d5785451f5f114bc7db40ebbfb50359b56456a6
 DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
-DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
 DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9

diff --git a/sci-libs/hipFFT/files/hipFFT-4.3.0-gentoo-install-locations.patch b/sci-libs/hipFFT/files/hipFFT-4.3.0-gentoo-install-locations.patch
deleted file mode 100644
index 891774eb5a47..000000000000
--- a/sci-libs/hipFFT/files/hipFFT-4.3.0-gentoo-install-locations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --color -uprN orig/CMakeLists.txt hipFFT-rocm-4.3.0/CMakeLists.txt
---- orig/CMakeLists.txt	2021-08-26 14:38:31.051268348 +0800
-+++ hipFFT-rocm-4.3.0/CMakeLists.txt	2021-08-26 14:38:42.655268425 +0800
-@@ -143,7 +143,7 @@ endif( )
- add_subdirectory( library )
- 
- # force library install path to lib (CentOS 7 defaults to lib64)
--set(CMAKE_INSTALL_LIBDIR "lib" CACHE INTERNAL "Installation directory for libraries" FORCE)
-+set(CMAKE_INSTALL_LIBDIR "lib64" CACHE INTERNAL "Installation directory for libraries" FORCE)
- 
- # Build clients of the library
- if( BUILD_CLIENTS )
-diff --color -uprN orig/library/CMakeLists.txt hipFFT-rocm-4.3.0/library/CMakeLists.txt
---- orig/library/CMakeLists.txt	2021-08-26 14:38:31.051268348 +0800
-+++ hipFFT-rocm-4.3.0/library/CMakeLists.txt	2021-08-26 14:39:21.919268686 +0800
-@@ -77,7 +77,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>
- )
- 
- if(BUILD_WITH_LIB STREQUAL "CUDA")
-@@ -112,13 +112,13 @@ if( ROCM_FOUND )
-   rocm_install_targets( TARGETS hipfft
-                         INCLUDE
-                           ${CMAKE_SOURCE_DIR}/library/include
--                          ${CMAKE_BINARY_DIR}/include
--                        PREFIX hipfft )
-+                          ${CMAKE_BINARY_DIR}/include )
-+	  #PREFIX hipfft )
-   rocm_export_targets( TARGETS hip::hipfft
--                       PREFIX hipfft
-+	  #PREFIX hipfft
-                        DEPENDS PACKAGE hip
-                        NAMESPACE hip:: )
--  rocm_install_symlink_subdir( hipfft )
-+	       #rocm_install_symlink_subdir( hipfft )
- 
- 
-   # During transition to standalone hipFFT repository, don't install

diff --git a/sci-libs/hipFFT/files/hipFFT-4.3.0-remove-git-dependency.patch b/sci-libs/hipFFT/files/hipFFT-4.3.0-remove-git-dependency.patch
deleted file mode 100644
index 563da3085ab9..000000000000
--- a/sci-libs/hipFFT/files/hipFFT-4.3.0-remove-git-dependency.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --color -uprN orig/cmake/dependencies.cmake hipFFT-rocm-4.3.0/cmake/dependencies.cmake
---- orig/cmake/dependencies.cmake	2021-08-26 14:48:57.867272506 +0800
-+++ hipFFT-rocm-4.3.0/cmake/dependencies.cmake	2021-08-26 14:51:02.571273334 +0800
-@@ -21,9 +21,6 @@
- #
- # #############################################################################
- 
--# Git
--find_package(Git REQUIRED)
--
- # HIP
- if(NOT BUILD_WITH_LIB STREQUAL "CUDA")
-   find_package(hip REQUIRED)
-diff --color -uprN orig/CMakeLists.txt hipFFT-rocm-4.3.0/CMakeLists.txt
---- orig/CMakeLists.txt	2021-08-26 14:48:57.867272506 +0800
-+++ hipFFT-rocm-4.3.0/CMakeLists.txt	2021-08-26 14:49:15.247272622 +0800
-@@ -117,16 +117,6 @@ message(STATUS "BUILD_WITH_COMPILER = "
- include(cmake/dependencies.cmake)
- 
- if( BUILD_CLIENTS_TESTS )
--  if( GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git" )
--    message(STATUS "rocFFT submodule update")
--    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
--                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
--                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
--    if( NOT GIT_SUBMOD_RESULT EQUAL "0" )
--      message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules manually.")
--    endif( )
--  endif( )
--
-   if( NOT EXISTS "${PROJECT_SOURCE_DIR}/rocFFT/CMakeLists.txt" )
-     message(FATAL_ERROR "The rocFFT submodule is not present!  Please update git submodules and try again.")
-   endif( )

diff --git a/sci-libs/hipFFT/hipFFT-4.3.0.ebuild b/sci-libs/hipFFT/hipFFT-4.3.0.ebuild
deleted file mode 100644
index 5f7d3a95f58a..000000000000
--- a/sci-libs/hipFFT/hipFFT-4.3.0.ebuild
+++ /dev/null
@@ -1,75 +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
-
-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
-	test? ( https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz )"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE="benchmark test"
-SLOT="0/$(ver_cut 1-2)"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-util/hip:${SLOT}
-	sci-libs/rocFFT:${SLOT}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-cpp/gtest
-		dev-libs/boost
-)"
-
-S="${WORKDIR}/hipFFT-rocm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0-gentoo-install-locations.patch"
-	"${FILESDIR}/${PN}-4.3.0-remove-git-dependency.patch"
-	"${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
-)
-
-src_prepare() {
-	use test && rmdir rocFFT && ln -s ../rocFFT-rocm-${PV} rocFFT
-	eapply_user
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Grant access to the device
-	addwrite /dev/kfd
-	addpredict /dev/dri/
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="include/hipfft"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
-		-DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF)
-		${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
-}
-
-src_test () {
-	addwrite /dev/kfd
-	addpredict /dev/dri
-	cd "${BUILD_DIR}/clients/staging" || die
-	einfo "Running hipfft-test"
-	LD_LIBRARY_PATH=${BUILD_DIR}/library ./hipfft-test || die
-}
-
-src_install() {
-	cmake_src_install
-	if use benchmark; then
-		cd "${BUILD_DIR}/clients/staging" || die
-		dobin hipfft-rider
-	fi
-}