gentoo auto-resync : 27:06:2024 - 07:59:39

6 files changed, 130 insertions, 4 deletions

diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 671f703e1bc3..dc22e32055e2 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -9,9 +9,12 @@ AUX miopen-5.1.3-gfx1031.patch 19268 BLAKE2B b3d10c57601fd5f39ae431d101687863de3
 AUX miopen-5.1.3-include-array.patch 343 BLAKE2B 993a8f3e301f4c16088ca216b2d820b17ceb42eeda4550b4291a70e00592281f992bf184407d024a0f8b2207a26fef2d56c26ef95e7a452d3b97090e1335a404 SHA512 887ac13f25c1bfd524bb2a3be701bf688f002a95ef8218cb798e41feaeb0678dbbd2ffaf905c59070a125001093bf5ede1bb6a77fdfe6f7a4ff19cbccfdc6624
 AUX miopen-5.1.3-no-strip.patch 608 BLAKE2B 3173d95219542a48c6dcd2b87e7157dcf483ff714c3d1c1c47aab8fc8af7b1fd4f6ac52b9d8e892cc25bff973597f4a05426fa4714b0764733b810867af59cfe SHA512 201357718203ee9a4062362541c483e069321b825708c6aa0e8892cc7722bcd520808797307e320df34c4fbf0003198f7a46717d5ff3819b1e2c3a5a3a045725
 AUX miopen-5.7.1-fix-miopendriver-gemm.patch 2818 BLAKE2B fd839ec500b297272f70cc1ee2fa87e74b8a70197cc72291c99c1372c9eeb7f2af33de8067fa1dc42d873bd96f93615074521c00f00b0676835c912ec0e2b73b SHA512 22c852082e0de5115acfa208c325cdb7870823dfe3b5984887c848b702a2fc5072c1d1944b218e27776f0e116d391c6039c3f8485ca65282e9699f3fc1885985
+AUX miopen-6.1.1-build-all-tests.patch 548 BLAKE2B be700c5401e288a4da5423047303a316ea82fc928c88e46be3da9cd41ac473bf6e232b68d1791e2fea0534c8233e4c2431c9a7536a24125651ce2f55aea1e667 SHA512 c8df1b24d61c9b7a132b77bddacb3d614653257c61b8b5936ea666a3e130b76a183618d5384abe5b871ae144bf9b2f2cf622850a59e7d5c53cf89adbf9dfa32b
 DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
 DIST MIOpen-5.7.1.tar.gz 100751593 BLAKE2B c5f847fe4374ab22737c281a65401125012328412d584fc09244b431ea6265d6d5028429115ee15fa8b04cbe0edd020e4e7ac8deb22561183ed76cb8c3d4d9d4 SHA512 3354b3b154f29a6337403abc5a71ec47c0b2558320c5a1b0cbfbbdb370c4fada2db12d4a19a312b5e30ca2e2302ee50ece3390603e84d132b2212a168e9523fa
+DIST MIOpen-6.1.1.tar.gz 101935496 BLAKE2B 5aadaa5eefa1b22dedfe87deb36f8acdbe57962cac8b7b6b20bc76f136ef29f0441e48112010280c2e674a1ae9fd202ca3e07be47cf4a4bc797234d6dc618be5 SHA512 b8860583919bf2f3e0da7ace30fdb0595ab45b85a367be3737e0b15a22a5565b8d6660c652ee070f21c36ac7d17ef3ba8e2eda7ed89bd6a0c65a4df799626d1a
 DIST gtest-1.11.0_p20210611.tar.gz 887296 BLAKE2B 8f29b7028a6dd8190a113cd93398705b23b61d88bee38beaf9dcc0dfc8a463aed7fcd3719f6f1b131d4363aa57231629aaeffa108f6558efb58416cfface6d6e SHA512 cf9e7f3fd3e31ce6677eac355fb8bfe19c5b56a8ec3af8b9417d0904cdf5da92f99f7411a08131cc9fa4fc7d38e6a71fcfac993648e47b269a74a27de7607f7a
-EBUILD miopen-5.1.3-r1.ebuild 3131 BLAKE2B 70a9e8325d5611aaad84ebba69873c1177bad75b5a7c90ccee74dc26a3283ee555c0826203851b2ea1234837cd0ec26103c8891b5ba6fdca27a18659bcb59e4d SHA512 a61ebfdbe769d5f7d463c293df8b0f17f5a8c5e732c67d6c3be492fe0ffe433a5c9a30d5c735fb6661cdf1ea96a2edce76d7429936ff295b197522017717a36a
-EBUILD miopen-5.7.1-r1.ebuild 3287 BLAKE2B 926b187675d85525e3679a5a95f8c9451bd6e5758ca91d6e65b3341aa624d3c5dbfd2682960ca3d05dc241bde69a447eae8d8d582bb676dd45d7e8b9afc2c47f SHA512 823bfc7f122c9ed91ef3fca2af6ea027b163f1564a87f0d60603348888465770d0c300f97fa46194658dc14002cf78dbb55567c4b4880350f70336788bc1e886
-MISC metadata.xml 549 BLAKE2B 6bf2f670de2b8f61584d0a930dd65c4c36c251a68a232d0de5bdf3a732b242c7cbddff642ee37909fe54506c7f231c86adf53d71816f46469320e90925076fc1 SHA512 f5d23eacb988af92506012ccaa2d32a0b7e3d2c93b10bfce1eee6ac51ae113bc572a39e2386fd4816fe62ed563b0cb384d5480bd2bd44184cf77f5e53d8ded61
+EBUILD miopen-5.1.3-r1.ebuild 3182 BLAKE2B a6ae78e487ea88d31693fcf1b96a7ce6a1cb0505311c2f101be498bcafce5436cc678ca83e10dafc27549b3121c01cbf0c5d2a35e7f6117de086879002ecc138 SHA512 2165e4d250f125f699963bc7b6f1c22598467e962c9aac1bb7eeff24d6091fa3b72a696a11e1ab80ea18710525ef00f99889cc5b972068e23340c4eb14b621ef
+EBUILD miopen-5.7.1-r1.ebuild 3338 BLAKE2B bbd84a39a04c4ef9e1b2dc42ff1bbe7b7e4ceda90ca0c82f416a05a55b1324727418e1c2c1446fe7a82800d23380cfb9a3e30463289a18e9af20ab10239cbfc7 SHA512 5a8ddf01d2c088325fd377499f80b3c1f84881d52596b53450f2ce07714e53a552304bd8a24aecf394a57ee039fd6f364642f93e7920d8d9df63bb7dd312057e
+EBUILD miopen-6.1.1.ebuild 2332 BLAKE2B 04154b1c66d6e91dca12201e4e61dfaed46b60e10d31809906ca6f43a75b34d8334944da3f2223a14684f9a1ff0ed2a58b3e5878c25a54721ab4ec25f017ec70 SHA512 2e90d3a0d51e3206b6e90fb0e435d4ec2ac5ddaa94b155e27750902942f5e0c2dca139acfcf1bbf45183fb9f8ecb68461650688be0e929eb60b978f7e87fe6a2
+MISC metadata.xml 646 BLAKE2B 76ad8db32707d804dcee5a8ff3adb66444464aa2bef2e3415326b485b67f6b0c26a36e45b30cd632b0e41e96cbcfad9c785f5145ddbf89fcdabe66456b35d22a SHA512 d7b219b8800178385725fc92fe72fe65c291a451963263271731580548e3319f2bac83e73bba66d3a6442aa6f9dfc8ff8955cdbbfd7f057825dda992e8dfe772
diff --git a/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch
new file mode 100644
index 000000000000..49ec1ccbff3b
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-6.1.1-build-all-tests.patch
@@ -0,0 +1,13 @@
+Normally, MIOpen compiles tests during test phase instead of "compile".
+This patch allows to build testing executables during compile phase.
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -330,7 +330,7 @@ endfunction()
+ separate_arguments(MIOPEN_TEST_FLAGS_ARGS NATIVE_COMMAND ${MIOPEN_TEST_FLAGS})
+ 
+ function(add_test_executable TEST_NAME)
+-    add_executable (${TEST_NAME} EXCLUDE_FROM_ALL ${ARGN})
++    add_executable (${TEST_NAME} ${ARGN})
+     if(WIN32)
+         target_compile_definitions(${TEST_NAME} PRIVATE NOMINMAX)
+     endif()
diff --git a/sci-libs/miopen/metadata.xml b/sci-libs/miopen/metadata.xml
index 08c299887077..e08e7753394d 100644
--- a/sci-libs/miopen/metadata.xml
+++ b/sci-libs/miopen/metadata.xml
@@ -12,7 +12,11 @@
     <email>xgreenlandforwyy@gmail.com</email>
     <name>Yiyang Wu</name>
   </maintainer>
+  <maintainer type="person">
+    <email>lockalsash@gmail.com</email>
+    <name>Sv. Lockal</name>
+  </maintainer>
   <upstream>
-    <remote-id type="github">ROCmSoftwarePlatform/MIOpen</remote-id>
+    <remote-id type="github">ROCm/MIOpen</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/miopen/miopen-5.1.3-r1.ebuild b/sci-libs/miopen/miopen-5.1.3-r1.ebuild
index 2ef5b8fb50b8..7d02435948f7 100644
--- a/sci-libs/miopen/miopen-5.1.3-r1.ebuild
+++ b/sci-libs/miopen/miopen-5.1.3-r1.ebuild
@@ -87,6 +87,7 @@ src_configure() {
 		-DMIOPEN_USE_MLIR=OFF
 		-DBUILD_TESTS=$(usex test ON OFF)
 		-DMIOPEN_TEST_ALL=$(usex test ON OFF)
+		-DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half"
 	)
 
 	if use test; then
diff --git a/sci-libs/miopen/miopen-5.7.1-r1.ebuild b/sci-libs/miopen/miopen-5.7.1-r1.ebuild
index 93bcde8190ae..b13e6354554f 100644
--- a/sci-libs/miopen/miopen-5.7.1-r1.ebuild
+++ b/sci-libs/miopen/miopen-5.7.1-r1.ebuild
@@ -91,6 +91,7 @@ src_configure() {
 		-DBUILD_TESTS=$(usex test ON OFF)
 		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
 		-DROCM_SYMLINK_LIBS=OFF
+		-DHALF_INCLUDE_DIR="${EPREFIX}/usr/include/half"
 	)
 
 	if use test; then
diff --git a/sci-libs/miopen/miopen-6.1.1.ebuild b/sci-libs/miopen/miopen-6.1.1.ebuild
new file mode 100644
index 000000000000..7cf62bdcb790
--- /dev/null
+++ b/sci-libs/miopen/miopen-6.1.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+LLVM_COMPAT=( 18 )
+
+inherit cmake flag-o-matic llvm-r1 rocm
+
+DESCRIPTION="AMD's Machine Intelligence Library"
+HOMEPAGE="https://github.com/ROCm/MIOpen"
+SRC_URI="https://github.com/ROCm/MIOpen/archive/rocm-${PV}.tar.gz -> MIOpen-${PV}.tar.gz"
+S="${WORKDIR}/MIOpen-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-util/hip
+	>=dev-db/sqlite-3.17
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/composable-kernel:${SLOT}[${ROCM_USEDEP}]
+	dev-util/roctracer:${SLOT}[${ROCM_USEDEP}]
+	>=dev-libs/boost-1.72
+	dev-cpp/nlohmann_json
+	dev-cpp/frugally-deep
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-libs/half-1.12.0-r1
+	dev-build/rocm-cmake
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-build-all-tests.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/MIOPEN_TIDY_ERRORS ALL/d' \
+		-e 's/FLAGS_RELEASE} -s/FLAGS_RELEASE}/g' \
+		-i CMakeLists.txt || die
+
+	sed -e "/add_test/s:--build \${CMAKE_CURRENT_BINARY_DIR}:--build ${BUILD_DIR}:" \
+		-i test/CMakeLists.txt || die
+
+	sed -e "s:\${PROJECT_BINARY_DIR}/miopen/include:\${PROJECT_BINARY_DIR}/include:" \
+		-i src/CMakeLists.txt || die
+}
+
+src_configure() {
+	if ! use debug; then
+		append-cflags "-DNDEBUG"
+		append-cxxflags "-DNDEBUG"
+		CMAKE_BUILD_TYPE="Release"
+	else
+		CMAKE_BUILD_TYPE="Debug"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DMIOPEN_BACKEND=HIP
+		-DBoost_USE_STATIC_LIBS=OFF
+		-DMIOPEN_USE_MLIR=OFF
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
+		-DROCM_SYMLINK_LIBS=OFF
+		-DMIOPEN_HIP_COMPILER="${ESYSROOT}/usr/bin/hipcc"
+		-DMIOPEN_AMDGCN_ASSEMBLER="$(get_llvm_prefix)/bin/clang"
+		-DHIP_OC_COMPILER="$(get_llvm_prefix)/bin/clang"
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DMIOPEN_TEST_ALL=ON
+			-DMIOPEN_TEST_GDB=OFF
+		)
+		# needed by rocminfo
+		addpredict /dev/random
+		check_amdgpu
+	fi
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}"/lib MIOPEN_SYSTEM_DB_PATH="${BUILD_DIR}"/share/miopen/db/ cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+}