[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, dev-util/Tensile/files/
commit: 02cb2430fcb5dbc70df96be5380228a8e47c8d80 Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 18:42:05 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cb2430 dev-util/Tensile: add 5.7.1 increase LLVM_MAX_SLOT to 17 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/Tensile/Manifest | 1 + dev-util/Tensile/Tensile-5.7.1-r1.ebuild | 132 + .../Tensile-5.7.1-expand-isa-compatibility.patch | 49 .../Tensile/files/Tensile-5.7.1-gentoopath.patch | 57 + 4 files changed, 239 insertions(+) diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest index 643f4fe5816c..4d93ffa204a1 100644 --- a/dev-util/Tensile/Manifest +++ b/dev-util/Tensile/Manifest @@ -1,3 +1,4 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734 DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80 +DIST rocm-Tensile-5.7.1.tar.gz 12396002 BLAKE2B ec2c2bc3f07fe22abd800b642c998ea80b9e4e2d0d28c4763d574dbd2fcb14c735223ddc7571d4ab3a48f0bd819cc835c16df9882049c5bf56f25ef729e6d654 SHA512 8f356f36cfec74ee9b000d1180cf52077dc5c595e5c5a40792fc3eb13f3139980c7440f9bc912218f946cf8137e2481d23fe39f110511c1bb55fe85a933ffd36 diff --git a/dev-util/Tensile/Tensile-5.7.1-r1.ebuild b/dev-util/Tensile/Tensile-5.7.1-r1.ebuild new file mode 100644 index ..709189734d4a --- /dev/null +++ b/dev-util/Tensile/Tensile-5.7.1-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +ROCM_VERSION=${PV} +inherit cmake distutils-r1 llvm prefix rocm + +LLVM_MAX_SLOT=17 + +DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile; +SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="client test" +REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + >=dev-cpp/msgpack-cxx-6.0.0 + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] + dev-util/hip + >=dev-util/rocm-smi-4.3.0 + sys-devel/clang:${LLVM_MAX_SLOT} +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-python/pytest-forked[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch + "${FILESDIR}"/${PN}-4.3.0-output-commands.patch + "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch + "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch + "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch +) + +CMAKE_USE_DIR="${S}/${PN}/Source" + +src_prepare() { + distutils-r1_src_prepare + sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" \ + "${FILESDIR}"/${PN}-5.7.1-gentoopath.patch > "${S}"/gentoopath.patch || die + eapply $(prefixify_ro "${S}"/gentoopath.patch) + + pushd ${PN} || die + + sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ + -i Source/cmake/FindROCmSMI.cmake || die + sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ + -i Source/CMakeLists.txt || die + + # ${Tensile_ROOT}/bin does not exists; call command directly + sed -e "s,\${Tensile_ROOT}/bin/,,g" -i cmake/TensileConfig.cmake || die + + local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\"" + sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die + + sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \ + -i ReplacementKernels.py Common.py ${PN}.py || die + + sed -e
[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, dev-util/Tensile/files/
commit: a0035c9a825799ec5df594b8b7e3184fbf8cdd4f Author: Marek Szuba gentoo org> AuthorDate: Thu Mar 30 22:37:21 2023 + Commit: Marek Szuba gentoo org> CommitDate: Thu Mar 30 22:41:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0035c9a dev-util/Tensile: adapt for msgpack-cxx-6.0.0 The name of the cmake module has changed again. Signed-off-by: Marek Szuba gentoo.org> ...ile-5.1.3-r2.ebuild => Tensile-5.1.3-r3.ebuild} | 15 +++-- ...ile-5.4.2-r1.ebuild => Tensile-5.4.2-r2.ebuild} | 15 +++-- ...1-Change-cmake-name-for-msgpack-5-release.patch | 25 -- ...ange-cmake-name-for-msgpack-cxx-6-release.patch | 13 +++ 4 files changed, 29 insertions(+), 39 deletions(-) diff --git a/dev-util/Tensile/Tensile-5.1.3-r2.ebuild b/dev-util/Tensile/Tensile-5.1.3-r3.ebuild similarity index 89% rename from dev-util/Tensile/Tensile-5.1.3-r2.ebuild rename to dev-util/Tensile/Tensile-5.1.3-r3.ebuild index 2f487059341f..da1adcab4f7b 100644 --- a/dev-util/Tensile/Tensile-5.1.3-r2.ebuild +++ b/dev-util/Tensile/Tensile-5.1.3-r3.ebuild @@ -23,7 +23,7 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" RDEPEND="${PYTHON_DEPS} - dev-cpp/msgpack-cxx + >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/msgpack[${PYTHON_USEDEP}] dev-util/hip @@ -32,12 +32,13 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch - "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch - "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch - "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch - ) +PATCHES=( + "${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch + "${FILESDIR}"/${PN}-4.3.0-output-commands.patch + "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch + "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch + "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch +) CMAKE_USE_DIR="${WORKDIR}/Source" diff --git a/dev-util/Tensile/Tensile-5.4.2-r1.ebuild b/dev-util/Tensile/Tensile-5.4.2-r2.ebuild similarity index 91% rename from dev-util/Tensile/Tensile-5.4.2-r1.ebuild rename to dev-util/Tensile/Tensile-5.4.2-r2.ebuild index 8c23e68fdb21..c846dce60997 100644 --- a/dev-util/Tensile/Tensile-5.4.2-r1.ebuild +++ b/dev-util/Tensile/Tensile-5.4.2-r2.ebuild @@ -25,7 +25,7 @@ REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )" RESTRICT="test" RDEPEND="${PYTHON_DEPS} - dev-cpp/msgpack-cxx + >=dev-cpp/msgpack-cxx-6.0.0 dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/msgpack[${PYTHON_USEDEP}] dev-util/hip @@ -34,12 +34,13 @@ RDEPEND="${PYTHON_DEPS} " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch - "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch - "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch - "${FILESDIR}"/0001-Change-cmake-name-for-msgpack-5-release.patch - ) +PATCHES=( + "${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch + "${FILESDIR}"/${PN}-4.3.0-output-commands.patch + "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch + "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch + "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch +) CMAKE_USE_DIR="${S}/${PN}/Source" diff --git a/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch b/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch deleted file mode 100644 index 7f8fb95123ee.. --- a/dev-util/Tensile/files/0001-Change-cmake-name-for-msgpack-5-release.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 66f5f943bbd0fd3b41b02ce7a563bed9f59f9c38 Mon Sep 17 00:00:00 2001 -From: Yiyang Wu -Date: Sat, 11 Feb 2023 15:37:11 +0800 -Subject: [PATCH] Change cmake name for msgpack-5 release - - Tensile/Source/lib/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Tensile/Source/lib/CMakeLists.txt b/Tensile/Source/lib/CMakeLists.txt -index 47a5d15d..f1a6118b 100644 a/Tensile/Source/lib/CMakeLists.txt -+++ b/Tensile/Source/lib/CMakeLists.txt -@@ -97,7 +97,7 @@ if(TENSILE_USE_LLVM OR TENSILE_USE_MSGPACK) - endif() - - if(TENSILE_USE_MSGPACK) --find_package(msgpack REQUIRED) -+find_package(msgpackc-cxx REQUIRED) - target_compile_definitions(TensileHost PUBLIC -DTENSILE_MSGPACK=1) - - if(TARGET msgpackc-cxx) --- -2.39.1 - diff --git a/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch b/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch new file mode 100644 index ..d8ac203781da --- /dev/null +++ b/dev-util/Tensile/files/Tensile-change-cmake-name-for-msgpack-cxx-6-release.patch @@ -0,0
[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, dev-util/Tensile/files/
commit: 2b7c870b48d225a9ade51eac426310de68f41069 Author: Yiyang Wu gmail com> AuthorDate: Tue Jan 31 14:57:06 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Feb 1 01:51:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b7c870b dev-util/Tensile: add missing patches Closes: https://bugs.gentoo.org/892736 Closes: https://github.com/gentoo/gentoo/pull/29356 Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/Tensile/Tensile-5.4.2.ebuild | 4 +- .../files/Tensile-5.4.2-fix-arch-parse.patch | 12 +++ dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch | 88 ++ 3 files changed, 102 insertions(+), 2 deletions(-) diff --git a/dev-util/Tensile/Tensile-5.4.2.ebuild b/dev-util/Tensile/Tensile-5.4.2.ebuild index 09bccd0ab2dd..1e347fdcee56 100644 --- a/dev-util/Tensile/Tensile-5.4.2.ebuild +++ b/dev-util/Tensile/Tensile-5.4.2.ebuild @@ -32,8 +32,8 @@ DEPEND="${RDEPEND} " PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-5.3.3-gfx1031.patch - "${FILESDIR}"/${PN}-5.3.3-fix-arch-parse.patch + "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch + "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch ) diff --git a/dev-util/Tensile/files/Tensile-5.4.2-fix-arch-parse.patch b/dev-util/Tensile/files/Tensile-5.4.2-fix-arch-parse.patch new file mode 100644 index ..14263e89ef84 --- /dev/null +++ b/dev-util/Tensile/files/Tensile-5.4.2-fix-arch-parse.patch @@ -0,0 +1,12 @@ +Index: Tensile-rocm-5.3.3/Tensile/Tensile.py +=== +--- Tensile-rocm-5.3.3.orig/Tensile/Tensile.py Tensile-rocm-5.3.3/Tensile/Tensile.py +@@ -101,7 +101,6 @@ def addCommonArguments(argParser): + Allows the --global-parameters option to specify any parameters from the command line. + """ + (key, value) = par.split("=") +-value = eval(value) + return (key, value) + + argParser.add_argument("-d", "--device", dest="device", type=int, \ diff --git a/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch b/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch new file mode 100644 index ..1f703c07c3ec --- /dev/null +++ b/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch @@ -0,0 +1,88 @@ +Index: Tensile-rocm-5.3.3/pytest.ini +=== +--- Tensile-rocm-5.3.3.orig/pytest.ini Tensile-rocm-5.3.3/pytest.ini +@@ -88,6 +88,7 @@ markers = + xfail-gfx1011: architecture + xfail-gfx1012: architecture + xfail-gfx1030: architecture ++ xfail-gfx1031: architecture + xfail-gfx1100: architecture + xfail-gfx1101: architecture + xfail-gfx1102: architecture +@@ -100,6 +101,7 @@ markers = + skip-gfx1011: architecture + skip-gfx1012: architecture + skip-gfx1030: architecture ++ skip-gfx1031: architecture + skip-gfx1100: architecture + skip-gfx1101: architecture + skip-gfx1102: architecture +Index: Tensile-rocm-5.3.3/Tensile/Common.py +=== +--- Tensile-rocm-5.3.3.orig/Tensile/Common.py Tensile-rocm-5.3.3/Tensile/Common.py +@@ -201,7 +201,7 @@ globalParameters["MergeFiles"] = True + globalParameters["NumMergedFiles"] = 1# The number of files that kernels should be split between when merging + + globalParameters["MaxFileName"] = 64 # If a file name would be longer than this, shorten it with a hash. +-globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0), (11,0,0), (11,0,1), (11,0,2)] # assembly kernels writer supports these architectures ++globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0), (10,3,1), (11,0,0), (11,0,1), (11,0,2)] # assembly kernels writer supports these architectures + + globalParameters["GenerateManifestAndExit"] = False # Output manifest file with list of expected library objects and exit + globalParameters["NewClient"] = 2 # Old client deprecated: NewClient must be set to 2. +@@ -271,7 +271,7 @@ architectureMap = { + 'gfx906':'vega20', 'gfx906:xnack+':'vega20', 'gfx906:xnack-':'vega20', + 'gfx908':'arcturus','gfx908:xnack+':'arcturus', 'gfx908:xnack-':'arcturus', + 'gfx90a':'aldebaran', 'gfx90a:xnack+':'aldebaran', 'gfx90a:xnack-':'aldebaran', +- 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', ++ 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', 'gfx1031':'navi22', + 'gfx1100':'navi31', 'gfx1101':'navi32', 'gfx1102':'navi33' + } + +Index: Tensile-rocm-5.3.3/Tensile/Source/CMakeLists.txt
[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, dev-util/Tensile/files/
commit: 3b32497070812f973e5064f9ada07ab5d404b402 Author: Yiyang Wu gmail com> AuthorDate: Fri Jan 20 09:58:17 2023 + Commit: Benda XU gentoo org> CommitDate: Tue Jan 31 14:26:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b324970 dev-util/Tensile: add 5.4.2 Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/Tensile/Manifest | 1 + dev-util/Tensile/Tensile-5.4.2.ebuild | 89 ++ .../Tensile/files/Tensile-5.4.2-gentoopath.patch | 67 .../Tensile/files/Tensile-5.4.2-use-ninja.patch| 21 + 4 files changed, 178 insertions(+) diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest index c3f43afdabe4..dd1df20ec814 100644 --- a/dev-util/Tensile/Manifest +++ b/dev-util/Tensile/Manifest @@ -1,3 +1,4 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3 DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734 +DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80 diff --git a/dev-util/Tensile/Tensile-5.4.2.ebuild b/dev-util/Tensile/Tensile-5.4.2.ebuild new file mode 100644 index ..09bccd0ab2dd --- /dev/null +++ b/dev-util/Tensile/Tensile-5.4.2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 llvm prefix + +LLVM_MAX_SLOT=15 + +DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile; +SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +# Not compatible with recent versions of pytest +RESTRICT="test" + +RDEPEND="${PYTHON_DEPS} + sys-devel/clang:${LLVM_MAX_SLOT} + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] + >=dev-util/rocm-smi-4.3.0 +" +DEPEND="${RDEPEND} + dev-util/hip +" + +PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch + "${FILESDIR}"/${PN}-5.3.3-gfx1031.patch + "${FILESDIR}"/${PN}-5.3.3-fix-arch-parse.patch + "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch + ) + +CMAKE_USE_DIR="${WORKDIR}/Source" + +src_prepare() { + distutils-r1_src_prepare + sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" \ + "${FILESDIR}"/${PN}-5.4.2-gentoopath.patch > "${S}"/gentoopath.patch || die + eapply $(prefixify_ro "${S}"/gentoopath.patch) + + pushd ${PN} || die + + sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ + -i Source/cmake/FindROCmSMI.cmake || die + sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ + -i Source/CMakeLists.txt || die + sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on + + # ${Tensile_ROOT}/bin does not exists; call command directly + sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die + + local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\"" + sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die + + sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \ + -i ReplacementKernels.py Common.py ${PN}.py || die + + sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die + + popd || die + + sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die +} + +python_install() { + distutils-r1_python_install + + python_moduleinto Tensile + pushd Tensile ||
[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, dev-util/Tensile/files/
commit: 3a572264e28322d9b09f6f9475cca0eede4d5f3f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 18 13:09:21 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 19 14:00:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a572264 dev-util/Tensile: drop 4.3.0-r1 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-util/Tensile/Manifest | 1 - dev-util/Tensile/Tensile-4.3.0-r1.ebuild | 86 --- .../files/Tensile-4.3.0-fix-arch-parse.patch | 12 --- .../Tensile/files/Tensile-4.3.0-gentoopath.patch | 62 --- dev-util/Tensile/files/Tensile-4.3.0-gfx1031.patch | 119 - ...ensile-4.3.0-hsaco-compile-specified-arch.patch | 96 - .../Tensile/files/Tensile-4.3.0-use-ninja.patch| 21 7 files changed, 397 deletions(-) diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest index 3b51748fa904..c3f43afdabe4 100644 --- a/dev-util/Tensile/Manifest +++ b/dev-util/Tensile/Manifest @@ -1,4 +1,3 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c -DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47 DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3 DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734 diff --git a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild b/dev-util/Tensile/Tensile-4.3.0-r1.ebuild deleted file mode 100644 index 7cb7e94cd256.. --- a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 prefix - -DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile; -SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" -S="${WORKDIR}/${PN}-rocm-${PV}" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -# Not compatible with recent versions of pytest -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - >=dev-util/rocm-smi-4.3.0 -" -DEPEND="${RDEPEND} - dev-util/hip:${SLOT} -" - -PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-4.3.0-hsaco-compile-specified-arch.patch - "${FILESDIR}"/${PN}-4.3.0-gfx1031.patch - "${FILESDIR}"/${PN}-4.3.0-fix-arch-parse.patch - "${FILESDIR}"/${PN}-4.3.0-use-ninja.patch - ) - -src_prepare() { - distutils-r1_src_prepare - eapply $(prefixify_ro "${FILESDIR}"/${PN}-4.3.0-gentoopath.patch) - - pushd ${PN} || die - - sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ - -i Source/cmake/FindROCmSMI.cmake || die - sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ - -i Source/CMakeLists.txt || die - sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on - sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die # ${Tensile_ROOT}/bin does not exists; call command directly - - local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\"" - sed -e "/HipClangVersion/s/0,0,0/$(hipconfig -v)/" \ - -e "/SourcePath/s,globalParameters\[\"ScriptPath\"\],${Tensile_share_dir}," \ - -i Common.py || die - - sed -e "/CMAKE_CXX_COMPILER/s,globalParameters\[\"ROCmBinPath\"\],\"${EPREFIX}/usr/lib/hip/bin\"," -i ClientExecutable.py || die - - sed -e "/scriptDir/s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir}," -i ReplacementKernels.py || die - - sed -e
[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, dev-util/Tensile/files/
commit: db81ee2a9a65c0aaebb4df461f8be388c66cdd16 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sat Mar 5 20:49:57 2022 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Mar 5 20:51:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db81ee2a dev-util/Tensile: add new dependency of rocBLAS Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> dev-util/Tensile/Manifest | 1 + dev-util/Tensile/Tensile-4.3.0.ebuild | 74 + ...ensile-4.3.0-hsaco-compile-specified-arch.patch | 96 ++ .../files/Tensile-4.3.0-output-commands.patch | 23 ++ dev-util/Tensile/metadata.xml | 11 +++ 5 files changed, 205 insertions(+) diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest new file mode 100644 index ..fd4cac044af8 --- /dev/null +++ b/dev-util/Tensile/Manifest @@ -0,0 +1 @@ +DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47 diff --git a/dev-util/Tensile/Tensile-4.3.0.ebuild b/dev-util/Tensile/Tensile-4.3.0.ebuild new file mode 100644 index ..cf33fb19cf10 --- /dev/null +++ b/dev-util/Tensile/Tensile-4.3.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile; +SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +# Not compatible with recent versions of pytest +RESTRICT="test" + +RDEPEND="${PYTHON_DEPS} + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-util/hip:${SLOT} +" +BDEPEND="test? ( + dev-util/rocminfo:${SLOT} +)" + +PATCHES=( + "${FILESDIR}/Tensile-${PV}-hsaco-compile-specified-arch.patch" # backported from upstream, should remove after 4.3.0 + "${FILESDIR}/Tensile-4.3.0-output-commands.patch" +) + +CMAKE_USE_DIR="${WORKDIR}/Source" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare + + mv ${PN}/Source "${WORKDIR}"/ || die + sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ + -i "${WORKDIR}"/Source/cmake/FindROCmSMI.cmake || die + sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ + -i "${WORKDIR}"/Source/CMakeLists.txt || die + + sed -e "/HipClangVersion/s/0,0,0/$(ver_rs 1-3 ,)/" \ + -e "/SourcePath/s,os\.path\.join.*$,\"${EPREFIX}/usr/share/${PN}\"," \ + -i ${PN}/Common.py || die + + sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile\", end='')|" \ + -i ${PN}/__init__.py || die +} + +src_test() { + ROCM_PATH="${EPREFIX}/usr/" distutils-r1_src_test +} + +src_install() { + distutils-r1_src_install + + # Move the cmake files to the correct directory + mkdir -p "${ED}/usr/$(get_libdir)/cmake/${PN}" || die + mv "${ED}/usr/cmake/"* "${ED}/usr/$(get_libdir)/cmake/${PN}" || die + rm -r "${ED}/usr/cmake" || die + + insinto /usr/share/${PN} + doins -r "${WORKDIR}"/Source/* + dosym . /usr/share/${PN}/Source +} diff --git a/dev-util/Tensile/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch b/dev-util/Tensile/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch new file mode 100644 index ..8e6753781a2a --- /dev/null +++ b/dev-util/Tensile/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch @@ -0,0 +1,96 @@ +https://github.com/ROCmSoftwarePlatform/Tensile/issues/1395 +https://github.com/ROCmSoftwarePlatform/Tensile/pull/1398 + +--- a/Tensile/TensileCreateLibrary.py b/Tensile/TensileCreateLibrary.py +@@ -136,6 +136,35 @@ def which(p): + return candidate + return None + ++def splitArchs(): ++ # Helper for architecture ++ def isSupported(arch): ++return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ ++ globalParameters["AsmCaps"][arch]["SupportedSource"] ++ ++ if ";" in globalParameters["Architecture"]: ++wantedArchs = globalParameters["Architecture"].split(";") ++ else: ++wantedArchs = globalParameters["Architecture"].split("_") ++ archs = [] ++ cmdlineArchs = [] ++ if "all" in wantedArchs: ++for arch in globalParameters['SupportedISA']: ++ if isSupported(arch): ++if (arch == (9,0,6)