gentoo resync : 09.07.2022

3 files changed, 79 insertions, 3 deletions

diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index 6fcc4a1563c9..6c83b4c96feb 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -7,6 +7,7 @@ AUX rocBLAS-4.3.0-remove-problematic-test-suites.patch 2240 BLAKE2B bdaf0111083e
 AUX rocBLAS-4.3.0-unbundle-Tensile.patch 863 BLAKE2B 223d7b54d61111443c9f90d66a2d53bc85414094a2b9c571d2e6fafc0d1260befb0783d6c761d4df0b22c31a4e85a029f5eed5d9d455488207791fdaa1c69952 SHA512 40e7cc604139b419b9a77ad1005a8bbfd1134909f2e0be67579dcc958d49c8239b1b7f573741c9ff04e310977fafbd2edce5b58f4bc4bffb2cd003e7fbab7437
 AUX rocBLAS-5.0.2-change-default-Tensile-library-dir.patch 2070 BLAKE2B b90c31653c68583432f54c3a17067a92e7fd91e66f902f37e96a7a413b885de57820b93c5a98458b1d6f4b4283138dac274ece1ec97f3fc0dd3ea00ce6002542 SHA512 946f9d66ac703628829ff585890ea9eae71f441e10bb1ff21f8dfad9a5d73279ed4880c4b96ac662be76af10ebe63ccbe0ef9f2c55fb2ebfc5c9087f32119b2a
 AUX rocBLAS-5.0.2-cpp_lib_filesystem.patch 1546 BLAKE2B e9a794a87b76a41d059c755565ae5da9a361b0c4648a92dd5ce35f9b5bd8c743827fcf79752c393a786c30083cd7db59bc334599d414920ce72c24216d014124 SHA512 e80ac744ce44bc9023de2600290c37577bda6161bfe750ac2b746d8fea7b45334a96461baa74131d0e31db497f8dd123ccd5dc181a40b265c2e2c72e1e479e88
+AUX rocBLAS-5.0.2-respect-makeopts.patch 3409 BLAKE2B dc97390feba6ab3900ec18fd7b86d4bb25baff4565ccddf0dae025ab5fa8330f16a2dddb1055c32be7132581e9aa1a83ff1e3c77cc69f5f6c641c1e40447fffc SHA512 63ffde4f98f3f3e2d72e11f3877640b2b525c25e8730b3497be97d71dae4b2f9b08c351f548356c9011c1767d5a451badd790963d773a45946994a48e5810b29
 AUX rocBLAS-5.0.2-unbundle-Tensile.patch 1352 BLAKE2B 48300030abee9898397919cbbea187fd16d770e20cdcfddd7665c160f47e362ad63acf9f443f86d824a999398d0c6f5aee8295a963dce2653bc94518c8ac9674 SHA512 39c4aff4fc60692e0450aa844ce979afe031c3ba3adb0cdf0866d0766714bf28a4c5664c18de7520b63d3fc2864de51939a596e864e97d0b8935681cabd7a84d
 DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fccf1f8829ad41baf15ad31bbbb313b48825841834c7ec1b9f8ece794aebdf9fda42b54a38f642beb1bc1e374f2f3b4e43d8ba9dfd1eb6e3ece5 SHA512 8f6946cf9d68afd195640ae7e0da8dc33341c67f28813813b5361a56531fa2af4453d075703ea52c66d93a1936cf74688b86aa2fa62b52a7ed5f03272290c232
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
@@ -14,5 +15,5 @@ DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e1
 DIST rocm-rocBLAS-5.0.2.tar.gz 13295178 BLAKE2B e1abfa06b9ac1545732465857839dae3f3708af49439a306a2b5b1b1b392101c38c95815f2c05a0d9ed29d41b154bc2e16a4f9203a37f5e2f68ee12cc4b44a06 SHA512 2f4a74f49350ede0debcf32229a6b6b95505615723c3f2bee16e4c169a3bb966dfb1971819028f47c525f571bea5662b892e63f655b0d1d2b8f20746bc5fe770
 EBUILD rocBLAS-4.3.0-r1.ebuild 3897 BLAKE2B 3100406bc65c2292c5b444760bb73bff4804181405d1a174397191ea31f41e8ecebe050bb2bee060a5be344ea5e514c0acde028f8fc483879dbff8b504a69454 SHA512 aab616bb0662c7983c0edd25fb12d79687c9c5f9b6552ac758156b756e8d4db764c50dd6534c92f02be0ba7ff45904586976d0918626b3ebb0d791d38445ec70
 EBUILD rocBLAS-4.3.0.ebuild 4226 BLAKE2B 0e4814b92bf97e230dee8ff54565ca718d2482d12e3f31d194e6321a55b064f3653059dfef623d665ac5d25fadad20a8bca81ace83980c3ee8f5e62cb5c4cd24 SHA512 06528ef0cf5767ed0b9bc58794cddebfc7e247091ff78c4e0e8eeb8f75ed3cdfd5443044671837f9573cf0e576d8006ef6a7c1a96786f5d4a8f06657c5b6308c
-EBUILD rocBLAS-5.0.2.ebuild 3732 BLAKE2B 75d6f4aad5aef0d4db271782f6b80a95c9a99404370e92a681e676810d00f904446fa161b0d101dd9823346b00307e1c50fb43d8d1c17f0a9a6a373fefd0fe0d SHA512 87210ab8f9eb45bcdacf4be4864e2b4dc3f55327f97190a08355250f1e21ffa23303f462d2428ce473b2a646c9595566f14bf3c0474b90b975ffdce9bcb2eecd
+EBUILD rocBLAS-5.0.2-r1.ebuild 3850 BLAKE2B 22a97a83a809a2e927296c75f93b194e4b1cfd15330b70d200434f5464a7ecace665b1c172f480356c34cb856e3f55ff69fe754903bec60543d0600c5d700413 SHA512 6b2fe80de74ad6ac021cd006ecc4ede7a4bfe40f2ce1e3486607de20281efa785c519c855d45abfd131ab8ca3b69538e4a2a4e46c1d7ea4d0a0bf30552d12385
 MISC metadata.xml 654 BLAKE2B b8a1d40e2ccc2aadccb9a1200e9c78fccb37544fa01c353645372a4ed01a6d153c04ff5d0d96cd7661e80b09eb6c69e8cbc59e466fef117ea1ad5ef54b1334ae SHA512 b880f8f495aee8c337b7cac4054a30f877a1204d0cda03fa90aaa25e4ae163d435c113141f2afef62967f603dea372419b228655e1b26fff53c010c8efdcebf1
diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch
new file mode 100644
index 000000000000..649a98106646
--- /dev/null
+++ b/sci-libs/rocBLAS/files/rocBLAS-5.0.2-respect-makeopts.patch
@@ -0,0 +1,73 @@
+Only retain CMakeLists patch. We don't need install.sh, rmake.py
+Suggested-By: Alessandro Barbieri <lssndrbarbieri@gmail.com>
+================================================================
+From 0ffee0626bf987bae6b81183a5c61569a489537a Mon Sep 17 00:00:00 2001
+From: Torre Zuk <42548444+TorreZuk@users.noreply.github.com>
+Date: Thu, 4 Nov 2021 09:21:37 -0600
+Subject: [PATCH] Swdev 309014 add jobs arg (#953)
+
+* adds -j --jobs argment passing of cpu_threads for build
+---
+ CMakeLists.txt             |  1 +
+ install.sh                 | 16 ++++++++++++----
+ library/src/CMakeLists.txt | 34 +++++++++++++++++++++++++---------
+ rmake.py                   | 29 ++++++++++++++++++-----------
+ 4 files changed, 56 insertions(+), 24 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69cf8d586..40d88ea0a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,6 +244,7 @@ if(NOT SKIP_LIBRARY)
+     set( Tensile_CODE_OBJECT_VERSION "V2" CACHE STRING "Tensile code_object_version")
+     set( Tensile_COMPILER "hipcc" CACHE STRING "Tensile compiler")
+     set( Tensile_LIBRARY_FORMAT "msgpack" CACHE STRING "Tensile library format")
++    set( Tensile_CPU_THREADS "" CACHE STRING "Number of threads for Tensile parallel build")
+ 
+     option( Tensile_MERGE_FILES "Tensile to merge kernels and solutions files?" ON )
+     option( Tensile_SHORT_FILENAMES "Tensile to use short file names? Use if compiler complains they're too long." OFF )
+diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
+index 4f5e4572d..dedfe9794 100755
+--- a/library/src/CMakeLists.txt
++++ b/library/src/CMakeLists.txt
+@@ -58,15 +58,31 @@ if( BUILD_WITH_TENSILE )
+ 
+   # Add a build target for Tensile kernel library
+   # Runtime language is HIP by default
+-  TensileCreateLibraryFiles(
+-    "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}"
+-    "${PROJECT_BINARY_DIR}/Tensile"
+-    ARCHITECTURE        ${Tensile_ARCHITECTURE}
+-    CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION}
+-    COMPILER            ${Tensile_COMPILER}
+-    LIBRARY_FORMAT      ${Tensile_LIBRARY_FORMAT}
+-    ${Tensile_Options}
+-  )
++  # warning our Tensile_ variables may shadow variable in TensileCreateLibraryFiles
++  # thus bypassing the function argument parameter system (mainly the options list) and CPU_THREADS
++  if(Tensile_CPU_THREADS MATCHES "^[0-9]+$")
++    # only including threads argument if number
++    TensileCreateLibraryFiles(
++      "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}"
++      "${PROJECT_BINARY_DIR}/Tensile"
++      ARCHITECTURE        ${Tensile_ARCHITECTURE}
++      CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION}
++      COMPILER            ${Tensile_COMPILER}
++      LIBRARY_FORMAT      ${Tensile_LIBRARY_FORMAT}
++      CPU_THREADS         ${Tensile_CPU_THREADS}
++      ${Tensile_Options}
++    )
++  else()
++    TensileCreateLibraryFiles(
++      "${CMAKE_CURRENT_SOURCE_DIR}/blas3/Tensile/Logic/${Tensile_LOGIC}"
++      "${PROJECT_BINARY_DIR}/Tensile"
++      ARCHITECTURE        ${Tensile_ARCHITECTURE}
++      CODE_OBJECT_VERSION ${Tensile_CODE_OBJECT_VERSION}
++      COMPILER            ${Tensile_COMPILER}
++      LIBRARY_FORMAT      ${Tensile_LIBRARY_FORMAT}
++      ${Tensile_Options}
++    )
++  endif()
+ 
+   # Create a unique name for TensileHost compiled for rocBLAS
+   set_target_properties( TensileHost PROPERTIES OUTPUT_NAME rocblas-tensile CXX_EXTENSIONS NO )
diff --git a/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild b/sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild
index 0600f90bac37..42637150e674 100644
--- a/sci-libs/rocBLAS/rocBLAS-5.0.2.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-5.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DOCS_BUILDER="doxygen"
 DOCS_DIR="docs"
 DOCS_DEPEND="media-gfx/graphviz"
-inherit cmake docs prefix
+inherit cmake docs multiprocessing prefix
 
 DESCRIPTION="AMD's library for BLAS on ROCm"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
@@ -22,7 +22,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/rocm-cmake:${SLOT}
-	dev-util/Tensile:${SLOT}
+	>=dev-util/Tensile-${PV}-r1:${SLOT}
 "
 
 DEPEND="
@@ -44,6 +44,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/${PN}-5.0.2-respect-makeopts.patch
 	)
 
 src_prepare() {
@@ -85,6 +86,7 @@ src_configure() {
 		-DBUILD_CLIENTS_SAMPLES=OFF
 		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
 		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		-DTensile_CPU_THREADS=$(makeopts_jobs)
 		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
 	)