From d8d972ba35aaae7eec609c9138d4fefc735f8ed4 Mon Sep 17 00:00:00 2001
From: Yiyang Wu <xgreenlandforwyy@gmail.com>
Date: Sat, 11 Feb 2023 22:10:53 +0800
Subject: sci-libs/rocBLAS: replace msgpack dep with msgpack-cxx

Bug: https://bugs.gentoo.org/893544
Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild | 114 -------------------------------
 sci-libs/rocBLAS/rocBLAS-5.1.3-r2.ebuild | 114 +++++++++++++++++++++++++++++++
 sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild | 107 -----------------------------
 sci-libs/rocBLAS/rocBLAS-5.4.2-r2.ebuild | 107 +++++++++++++++++++++++++++++
 4 files changed, 221 insertions(+), 221 deletions(-)
 delete mode 100644 sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild
 create mode 100644 sci-libs/rocBLAS/rocBLAS-5.1.3-r2.ebuild
 delete mode 100644 sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild
 create mode 100644 sci-libs/rocBLAS/rocBLAS-5.4.2-r2.ebuild

(limited to 'sci-libs/rocBLAS')

diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild
deleted file mode 100644
index 0723e8244bf6..000000000000
--- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="docs"
-DOCS_DEPEND="media-gfx/graphviz"
-ROCM_VERSION=${PV}
-inherit cmake docs edo multiprocessing prefix rocm
-
-DESCRIPTION="AMD's library for BLAS on ROCm"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz
-	https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${PN}-5.0.2-Tensile-asm_full-navi22.tar.gz"
-S="${WORKDIR}/${PN}-rocm-${PV}"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="benchmark test"
-REQUIRED_USE="${ROCM_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/rocm-cmake:${SLOT}
-	dev-util/Tensile:${SLOT}
-"
-
-DEPEND="
-	dev-util/hip
-	<dev-libs/msgpack-5.0.0
-	test? (
-		virtual/blas
-		dev-cpp/gtest
-		sys-libs/libomp
-	)
-	benchmark? (
-		virtual/blas
-		sys-libs/libomp
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-fix-glibc-2.32-and-above.patch
-	"${FILESDIR}"/${PN}-5.0.2-change-default-Tensile-library-dir.patch
-	"${FILESDIR}"/${PN}-5.0.2-cpp_lib_filesystem.patch
-	"${FILESDIR}"/${PN}-5.0.2-unbundle-Tensile.patch
-	)
-
-src_prepare() {
-	cmake_src_prepare
-	cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die
-	# Fit for Gentoo FHS rule
-	sed -e "/PREFIX rocblas/d" \
-		-e "/<INSTALL_INTERFACE/s:include:include/rocblas:" \
-		-e "s:rocblas/include:include/rocblas:" \
-		-e "s:\\\\\${CPACK_PACKAGING_INSTALL_PREFIX}rocblas/lib:${EPREFIX}/usr/$(get_libdir)/rocblas:" \
-		-e "s:share/doc/rocBLAS:share/doc/${P}:" \
-		-e "/rocm_install_symlink_subdir( rocblas )/d" -i library/src/CMakeLists.txt || die
-
-	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
-
-	eprefixify library/src/tensile_host.cpp
-}
-
-src_configure() {
-	addpredict /dev/random
-	addpredict /dev/kfd
-	addpredict /dev/dri/
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=On
-		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
-		-DTensile_LOGIC="asm_full"
-		-DTensile_COMPILER="hipcc"
-		-DTensile_LIBRARY_FORMAT="msgpack"
-		-DTensile_CODE_OBJECT_VERSION="V3"
-		-DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile"
-		-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
-		-DBUILD_WITH_TENSILE=ON
-		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
-		-DBUILD_TESTING=OFF
-		-DBUILD_CLIENTS_SAMPLES=OFF
-		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
-		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
-		-DTensile_CPU_THREADS=$(makeopts_jobs)
-	)
-
-	CXX=hipcc cmake_src_configure
-}
-
-src_compile() {
-	docs_compile
-	cmake_src_compile
-}
-
-src_test() {
-	check_amdgpu
-	cd "${BUILD_DIR}"/clients/staging || die
-	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
-	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
-	edob ./${PN,,}-test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use benchmark; then
-		cd "${BUILD_DIR}" || die
-		dolib.so clients/librocblas_fortran_client.so
-		dobin clients/staging/rocblas-bench
-	fi
-}
diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r2.ebuild
new file mode 100644
index 000000000000..051609e9d1a3
--- /dev/null
+++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="docs"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_VERSION=${PV}
+inherit cmake docs edo multiprocessing prefix rocm
+
+DESCRIPTION="AMD's library for BLAS on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz
+	https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${PN}-5.0.2-Tensile-asm_full-navi22.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/rocm-cmake:${SLOT}
+	dev-util/Tensile:${SLOT}
+"
+
+DEPEND="
+	dev-cpp/msgpack-cxx
+	dev-util/hip
+	test? (
+		virtual/blas
+		dev-cpp/gtest
+		sys-libs/libomp
+	)
+	benchmark? (
+		virtual/blas
+		sys-libs/libomp
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-fix-glibc-2.32-and-above.patch
+	"${FILESDIR}"/${PN}-5.0.2-change-default-Tensile-library-dir.patch
+	"${FILESDIR}"/${PN}-5.0.2-cpp_lib_filesystem.patch
+	"${FILESDIR}"/${PN}-5.0.2-unbundle-Tensile.patch
+	)
+
+src_prepare() {
+	cmake_src_prepare
+	cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die
+	# Fit for Gentoo FHS rule
+	sed -e "/PREFIX rocblas/d" \
+		-e "/<INSTALL_INTERFACE/s:include:include/rocblas:" \
+		-e "s:rocblas/include:include/rocblas:" \
+		-e "s:\\\\\${CPACK_PACKAGING_INSTALL_PREFIX}rocblas/lib:${EPREFIX}/usr/$(get_libdir)/rocblas:" \
+		-e "s:share/doc/rocBLAS:share/doc/${P}:" \
+		-e "/rocm_install_symlink_subdir( rocblas )/d" -i library/src/CMakeLists.txt || die
+
+	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
+
+	eprefixify library/src/tensile_host.cpp
+}
+
+src_configure() {
+	addpredict /dev/random
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DTensile_LOGIC="asm_full"
+		-DTensile_COMPILER="hipcc"
+		-DTensile_LIBRARY_FORMAT="msgpack"
+		-DTensile_CODE_OBJECT_VERSION="V3"
+		-DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile"
+		-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
+		-DBUILD_WITH_TENSILE=ON
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
+		-DBUILD_TESTING=OFF
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		-DTensile_CPU_THREADS=$(makeopts_jobs)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_compile() {
+	docs_compile
+	cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
+	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
+	edob ./${PN,,}-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dolib.so clients/librocblas_fortran_client.so
+		dobin clients/staging/rocblas-bench
+	fi
+}
diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild
deleted file mode 100644
index 826e17c0e64b..000000000000
--- a/sci-libs/rocBLAS/rocBLAS-5.4.2-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="docs"
-DOCS_DEPEND="media-gfx/graphviz"
-ROCM_VERSION=${PV}
-inherit cmake docs edo multiprocessing rocm
-
-DESCRIPTION="AMD's library for BLAS on ROCm"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz
-	https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${PN}-5.4.2-Tensile-asm_full-navi22.tar.gz"
-S="${WORKDIR}/${PN}-rocm-${PV}"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="benchmark test"
-REQUIRED_USE="${ROCM_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/rocm-cmake-5.3
-	dev-util/Tensile:${SLOT}
-"
-
-DEPEND="
-	dev-util/hip
-	<dev-libs/msgpack-5.0.0
-	test? (
-		virtual/blas
-		dev-cpp/gtest
-		sys-libs/libomp
-	)
-	benchmark? (
-		virtual/blas
-		sys-libs/libomp
-	)
-"
-
-QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.2-cpp_lib_filesystem.patch
-	"${FILESDIR}"/${PN}-5.4.2-unbundle-Tensile.patch
-	"${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch
-	"${FILESDIR}"/${PN}-5.4.2-link-cblas.patch
-	)
-
-src_prepare() {
-	cmake_src_prepare
-	cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die
-	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
-}
-
-src_configure() {
-	addpredict /dev/random
-	addpredict /dev/kfd
-	addpredict /dev/dri/
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=On
-		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
-		-DROCM_SYMLINK_LIBS=OFF
-		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
-		-DTensile_LOGIC="asm_full"
-		-DTensile_COMPILER="hipcc"
-		-DTensile_LIBRARY_FORMAT="msgpack"
-		-DTensile_CODE_OBJECT_VERSION="V3"
-		-DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile"
-		-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
-		-DBUILD_WITH_TENSILE=ON
-		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
-		-DBUILD_CLIENTS_SAMPLES=OFF
-		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
-		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
-		-DTensile_CPU_THREADS=$(makeopts_jobs)
-	)
-
-	CXX=hipcc cmake_src_configure
-}
-
-src_compile() {
-	docs_compile
-	cmake_src_compile
-}
-
-src_test() {
-	check_amdgpu
-	cd "${BUILD_DIR}"/clients/staging || die
-	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
-	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
-	edob ./${PN,,}-test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use benchmark; then
-		cd "${BUILD_DIR}" || die
-		dolib.a clients/librocblas_fortran_client.a
-		dobin clients/staging/rocblas-bench
-	fi
-}
diff --git a/sci-libs/rocBLAS/rocBLAS-5.4.2-r2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.4.2-r2.ebuild
new file mode 100644
index 000000000000..9e141e24ef49
--- /dev/null
+++ b/sci-libs/rocBLAS/rocBLAS-5.4.2-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="docs"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_VERSION=${PV}
+inherit cmake docs edo multiprocessing rocm
+
+DESCRIPTION="AMD's library for BLAS on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz
+	https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${PN}-5.4.2-Tensile-asm_full-navi22.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/rocm-cmake-5.3
+	dev-util/Tensile:${SLOT}
+"
+
+DEPEND="
+	dev-cpp/msgpack-cxx
+	dev-util/hip
+	test? (
+		virtual/blas
+		dev-cpp/gtest
+		sys-libs/libomp
+	)
+	benchmark? (
+		virtual/blas
+		sys-libs/libomp
+	)
+"
+
+QA_FLAGS_IGNORED="/usr/lib64/rocblas/library/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.2-cpp_lib_filesystem.patch
+	"${FILESDIR}"/${PN}-5.4.2-unbundle-Tensile.patch
+	"${FILESDIR}"/${PN}-5.4.2-add-missing-header.patch
+	"${FILESDIR}"/${PN}-5.4.2-link-cblas.patch
+	)
+
+src_prepare() {
+	cmake_src_prepare
+	cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die
+	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
+}
+
+src_configure() {
+	addpredict /dev/random
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DTensile_LOGIC="asm_full"
+		-DTensile_COMPILER="hipcc"
+		-DTensile_LIBRARY_FORMAT="msgpack"
+		-DTensile_CODE_OBJECT_VERSION="V3"
+		-DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile"
+		-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
+		-DBUILD_WITH_TENSILE=ON
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		-DTensile_CPU_THREADS=$(makeopts_jobs)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_compile() {
+	docs_compile
+	cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
+	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
+	edob ./${PN,,}-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dolib.a clients/librocblas_fortran_client.a
+		dobin clients/staging/rocblas-bench
+	fi
+}
-- 
cgit v1.2.3-65-gdbad