gentoo resync : 25.03.2022

3 files changed, 3 insertions, 26 deletions

diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index ff8f0fa12732..c197bb27d979 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -4,9 +4,9 @@ AUX rocBLAS-4.3.0-change-default-Tensile-library-dir.patch 1533 BLAKE2B d6b48397
 AUX rocBLAS-4.3.0-fix-glibc-2.32-and-above.patch 1254 BLAKE2B d3bcf526f374065ed0615c89ab74cbc203d2d6b6d0a1c49072f3328aaa40aa52f0fa155b23a936a865d353db32f48f348a64f05f157eb6bb2d55c93f9da364d1 SHA512 e899b26e3dc4717cb7854c16d104b9e070067f49e308fe6a38f1be5735a83a814da46ab41752cf4431b4c378d29f31c6082e1fe63e1bf5ae72a55b54a9017c15
 AUX rocBLAS-4.3.0-link-system-blas.patch 1106 BLAKE2B 83f525072dc34edec01c56353d8c87f0f967c9cf07d054da8c1f4af632e095cd2af9562dea8eab8a2ddc7a71a9570e654b4a6b0f68c95508e92cc743350c8129 SHA512 94efab3d507fc90bd0d0b2cd0096e68b7669d1de2faf73fe0bfbc8c26c83db88596664bd61f394863194ad3108985b6206c4408c6d2ec93cd30ccec13b3b37f1
 AUX rocBLAS-4.3.0-remove-problematic-test-suites.patch 2240 BLAKE2B bdaf0111083e62f15d907b3faa536b1418a7273b3733386c14625ffed4c505b7d6a2318ae24a0dda286d57d4dac6befefa8005ef58452a9eb3928b78d337e214 SHA512 565d29c193ed04d45dc179ce06bbbdb0d472d66fe989286f4ccf29ccce39c118d79225ca80d2dbcb022833347b87e7573a78dc573dfde73d368e62256526eb93
-AUX rocBLAS-4.3.0-unbundle-Tensile.patch 1934 BLAKE2B 72622949ce96381b7e0b24dd7eff28eff492bb46d800f7d47e12d092662dc258a1e758d7a20fd27753b0e50ec2348abe0c0b4bb1a7e644d9522049e2a1df19b7 SHA512 36ca6740439a4eed672df7e8c52be87ca165d0095efa147480290e0c3db117ba2d524cf2ef759074b757bbba30e470660bcbbdf1d98fb97448101eda86cd6f67
+AUX rocBLAS-4.3.0-unbundle-Tensile.patch 863 BLAKE2B 223d7b54d61111443c9f90d66a2d53bc85414094a2b9c571d2e6fafc0d1260befb0783d6c761d4df0b22c31a4e85a029f5eed5d9d455488207791fdaa1c69952 SHA512 40e7cc604139b419b9a77ad1005a8bbfd1134909f2e0be67579dcc958d49c8239b1b7f573741c9ff04e310977fafbd2edce5b58f4bc4bffb2cd003e7fbab7437
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
 DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e18c38e088a8b7db58156d478dd6718befbb82bb7fd43a38fe64a5427124c5ad5241fa37977f094e6efd195d168d3e5f65 SHA512 490ab1c1e98a8b311ad5630515c448d9bb0a2bf588a08bcbebee345e2954d616b4ffe7c2e03dadca82c590438c42afccb98fe8ba00856aece101b5ffe62ef1e0
-EBUILD rocBLAS-4.3.0-r1.ebuild 3809 BLAKE2B 9054edbfe1b285efd53932a33e8df1de168ab8f64481e596b7d891efd838c87c64cd75093e3d738e9bc0c3499fa645c15fa3959b0492bb2eb648da1c4d2b92dd SHA512 44fa7416f2b9582f2cf7d1a5965942579350956c4a5408ef11dac725a8e248758ab1b974be768c4bcb486cc4179aa167ca17dded4d1c1b754f6efce1605d9dd0
+EBUILD rocBLAS-4.3.0-r1.ebuild 3897 BLAKE2B 3100406bc65c2292c5b444760bb73bff4804181405d1a174397191ea31f41e8ecebe050bb2bee060a5be344ea5e514c0acde028f8fc483879dbff8b504a69454 SHA512 aab616bb0662c7983c0edd25fb12d79687c9c5f9b6552ac758156b756e8d4db764c50dd6534c92f02be0ba7ff45904586976d0918626b3ebb0d791d38445ec70
 EBUILD rocBLAS-4.3.0.ebuild 4226 BLAKE2B 0e4814b92bf97e230dee8ff54565ca718d2482d12e3f31d194e6321a55b064f3653059dfef623d665ac5d25fadad20a8bca81ace83980c3ee8f5e62cb5c4cd24 SHA512 06528ef0cf5767ed0b9bc58794cddebfc7e247091ff78c4e0e8eeb8f75ed3cdfd5443044671837f9573cf0e576d8006ef6a7c1a96786f5d4a8f06657c5b6308c
 MISC metadata.xml 654 BLAKE2B b8a1d40e2ccc2aadccb9a1200e9c78fccb37544fa01c353645372a4ed01a6d153c04ff5d0d96cd7661e80b09eb6c69e8cbc59e466fef117ea1ad5ef54b1334ae SHA512 b880f8f495aee8c337b7cac4054a30f877a1204d0cda03fa90aaa25e4ae163d435c113141f2afef62967f603dea372419b228655e1b26fff53c010c8efdcebf1
diff --git a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-unbundle-Tensile.patch b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-unbundle-Tensile.patch
index f2bcff9a58db..c8d99c851b00 100644
--- a/sci-libs/rocBLAS/files/rocBLAS-4.3.0-unbundle-Tensile.patch
+++ b/sci-libs/rocBLAS/files/rocBLAS-4.3.0-unbundle-Tensile.patch
@@ -20,25 +20,3 @@ index 4c29c94..f9838c2 100644
      )
      if(rc)
          message(FATAL_ERROR ${rc})
-diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt
-index a34ee87..bf94988 100755
---- a/library/src/CMakeLists.txt
-+++ b/library/src/CMakeLists.txt
-@@ -99,9 +99,6 @@ if( BUILD_WITH_TENSILE )
-     # Create a unique name for TensileHost compiled for rocBLAS
-     set_target_properties( TensileHost PROPERTIES OUTPUT_NAME rocblas-tensile CXX_EXTENSIONS NO )
-     target_compile_definitions( TensileHost PUBLIC USE_TENSILE_HOST )
--
--    # Tensile host depends on libs build target
--    add_dependencies( TensileHost TENSILE_LIBRARY_TARGET )
-   else()
-     # Create a unique name for Tensile compiled for rocBLAS
-     set_target_properties( Tensile PROPERTIES OUTPUT_NAME rocblas-tensile CXX_EXTENSIONS NO )
-@@ -520,7 +517,6 @@ rocm_install_targets(
- if( BUILD_WITH_TENSILE )
-   if( BUILD_WITH_TENSILE_HOST )
-     set( ROCBLAS_TENSILE_LIBRARY_DIR "\${CPACK_PACKAGING_INSTALL_PREFIX}rocblas/lib" CACHE PATH "path to tensile library" )
--    install(DIRECTORY ${CMAKE_BINARY_DIR}/Tensile/library DESTINATION ${ROCBLAS_TENSILE_LIBRARY_DIR})
-   endif()
- endif()
- 
diff --git a/sci-libs/rocBLAS/rocBLAS-4.3.0-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-4.3.0-r1.ebuild
index 13cf41fdd900..7c2a4366ee26 100644
--- a/sci-libs/rocBLAS/rocBLAS-4.3.0-r1.ebuild
+++ b/sci-libs/rocBLAS/rocBLAS-4.3.0-r1.ebuild
@@ -76,7 +76,6 @@ src_configure() {
 	addpredict /dev/random
 
 	export PATH="${EPREFIX}/usr/lib/llvm/roc/bin:${PATH}"
-	export TENSILE_SKIP_LIBRARY=1
 
 	local mycmakeargs=(
 		-DTensile_LOGIC="asm_full"
@@ -130,7 +129,7 @@ src_test() {
 	addwrite /dev/kfd
 	addwrite /dev/dri/
 	cd "${BUILD_DIR}/clients/staging" || die
-	./rocblas-test || die "Tests failed"
+	LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src" ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library" ./rocblas-test || die "Tests failed"
 }
 
 src_install() {