diff options
Diffstat (limited to 'dev-util/Tensile')
-rw-r--r-- | dev-util/Tensile/Manifest | 4 | ||||
-rw-r--r-- | dev-util/Tensile/Tensile-5.0.2-r2.ebuild | 84 | ||||
-rw-r--r-- | dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch | 65 | ||||
-rw-r--r-- | dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch | 75 |
4 files changed, 0 insertions, 228 deletions
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest index 1685d1757061..d031785c2877 100644 --- a/dev-util/Tensile/Manifest +++ b/dev-util/Tensile/Manifest @@ -1,7 +1,5 @@ AUX Tensile-4.3.0-output-commands.patch 1629 BLAKE2B c43395d8e8aeb956d5eb84c8a34ad4b995ed32499ceababeb22d5ca3ac5ee6e8ef353a1467a77943a441f0840b9a6ad1f53202ec8673ef3753aa2bec1395fec4 SHA512 45bdae1d87f6e31d337b22f146b9dee25f4f87357c6ac52bd843556dd742431db10efb55fb8ef815cc9941b5b9f05970d43a6fec0f2d9195c30c633e33d138bf -AUX Tensile-5.0.2-adjust-parallel.patch 2936 BLAKE2B faca0234d615e4451b83b53a23147eb441e7929a3ef7542bef3ac5d0a383a6d1aa966373a012cc40bcbd1137a16a80a9c88b4d5459552b6b04c4819cb325e8d9 SHA512 d32f358133e0727b9ea66300f680451222190c0b7c9d91a9e0364fb2589b0ae12d69facb5872a81bd36a770ad649a22120649e6d3550b02bc6365706392caf57 AUX Tensile-5.0.2-fix-arch-parse.patch 424 BLAKE2B 43e716ccc9256c2f98cc1d2807e776599b384875161233d4a010a53f11a5764fd7a5b4c50ded1762737e9fbe7923b64e9353ee4590fd1b6b9b03ac621af35c9b SHA512 5913e7fc42bc5b43e1dcca531e4ef88b524325b497601171a9844013906c2ffc87469a4c55037c721ace5757c6aaf4d8bf8ca683f659f9d8988555c90425802a -AUX Tensile-5.0.2-gentoopath.patch 3410 BLAKE2B bbf2c406bbcf2c34efd04667788719f6f10aebda3f9d9096e6798c1a8924768df4fed30223e2f4675af88c41841d148e43e3cd63edc7523dab4618ae245b0339 SHA512 c7b99eab1f0c979f54fcac3b2dcb4a2094b9a536bb392fcf4fb62050b1dc6e61f5280d3d1c7e3ed21617ebe693a17eb2bb7535a93f700123fe6aa6f28f256514 AUX Tensile-5.0.2-gfx1031.patch 5561 BLAKE2B 244bb644a90ba34f500f4d0cc634acf041cce42f9a5a9f10ee7bd1feff3b78b626b56f3b8cfa4005cc422ef643cd60a7da954618ff9f8f460568ff4b011136bc SHA512 1cd1dd95e481a76fde21dd09aac1ac02f1372e552eeb45eb100dc970639e28f52a709735aca6480d2286b8c747a75435aa7f2e2a288ffe2a596d6f75e4bd17ec AUX Tensile-5.0.2-use-ninja.patch 897 BLAKE2B f06a3831a43a4b6c00e7eb231cc13901f7b4a3a924a50d85ba81f9def535951c450a01504506476c1ee88317cbdf0c0c00a57cb5cd198ab44e8e0b94aefda25d SHA512 15404d3cd5dbc7b74e81092d86f9c49cd45fe4df645602849ff515baafa3890fd68ca808cbebd6ae37e951b382ff4446a31089306c950f8549431dfbe75c3b53 AUX Tensile-5.1.3-gentoopath.patch 3350 BLAKE2B 890ab24fbd99aede187bde67c8d6f586f625c30cff34da39e12b199b022170de8df3087c3581f9e635d5d12f31db0aa944a2628733417322621ab51b0292b01b SHA512 d17a948146e7ef2447ae92b2822f53cd77b0992297fd2a43598434db4f7c2095d269138ce5c0eedda73a34e193fc56401f22471f9eca68ec6026577f07a7fca1 @@ -10,10 +8,8 @@ AUX Tensile-5.4.2-gentoopath.patch 3147 BLAKE2B 4834c0f9b1241b79704fbda954cffcf7 AUX Tensile-5.4.2-gfx1031.patch 5051 BLAKE2B d043b94403069f9b4b4c379cf7c361b30f3c0c145f740d37e5cf787636fa3f5c00ca1b7c375f311c9f067e8e6c7d383fbc34157e4b9d4f65a93ed53e9e14b814 SHA512 53cae079788f0478ba7a0af48ddb279a39496a3238263352ff17f555f588ebc1e9463d5b466f1e819ba29a4857c65a644d7a93fe0c2dca3403f994ade4f2bc0f AUX Tensile-5.4.2-use-ninja.patch 1164 BLAKE2B 41d6dbb68fa41b53d230afd06af95acb014163d14b7f0e61d5a2945ef02c7a3d376f327a3f82fa86085c8eb95820d95883bdc05024e87b69dad61caf39c3b124 SHA512 b73271b637b4b3c045813638b1cebf6c3b4ac50350a62a76351e6fdf3e74b20104bbb135085c96c9c0e99f20f971af316d9686c8347a894361ee90abb66175fa 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 -EBUILD Tensile-5.0.2-r2.ebuild 2634 BLAKE2B f3828862d1d5986ee3b561f4a652856f8887c70ebccdf43eadc69a62c2434fa129eae16e6891345c1664de1c4f12d20f3f406f0741afd3a4fda520f0d58175fe SHA512 fc81aba4df641f76331750af7237e9f8b15bb5806984ed60c9b39f82e3293c22b676dfda864351b9d32c687522b4052b99ba8f1528436aae7997e5b35c799d4d EBUILD Tensile-5.1.3-r1.ebuild 2723 BLAKE2B 9d894b023b6d6aeef26422e770bf4195ce3b40f6086f6e121f635c2fb351fb9f4a22d5dcea58c5bcc51067b7c8c8a2d63bd8b68d2db2a00a72d2ded2332663ec SHA512 82c586818ceeba2eb55406d309e743ae90f7cddb0ed129773b51edb694c54ec016860aae82df2e1d8bb5111a896c3d7a33a0a2a3f3b7ebf2f49614b82651959c EBUILD Tensile-5.4.2.ebuild 2623 BLAKE2B 011221e2f0f2c5b3f52cb6a1266caa15744ad0c5ddf7d3683a730bd53e82c8d480527225888947395bf6ed57a1fc9fe17a6b669b425451ae3c5156c8ff6c642a SHA512 aec47b07571b7360bd9c0736ac9fb07e9b459bb575d0465c974ba084cf04d513f0cf93fd3db6cc120fbf6bd32097747777cee2745de7f986c0e5f96549a0dd83 MISC metadata.xml 350 BLAKE2B f621bb03aafc000672f022db9cad9a1fed65b912129d26ed7e717ba8e5cfb11f0d6b309905b6e12b07993a7aa0cbebf18aeaf92d643eff5419d765e31b3c52a7 SHA512 99b497edddaaf6d84159df959fb8b0a5d18ea0ecc879d600a2a1fc004554612e1422b258a2f7c5f73148caca93f9283481b53669f7247d62782401fdb112f69e diff --git a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild b/dev-util/Tensile/Tensile-5.0.2-r2.ebuild deleted file mode 100644 index 52b12f4f07d3..000000000000 --- a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -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 - https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/${P}-PR1419.patch.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:= -" - -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}"/${PN}-5.0.2-adjust-parallel.patch - "${WORKDIR}"/${PN}-5.0.2-PR1419.patch - ) - -CMAKE_USE_DIR="${WORKDIR}/Source" - -src_prepare() { - distutils-r1_src_prepare - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0.2-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)/" -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 || die - python_domodule Components - python_newexe Utilities/merge.py ${PN}-merge -} - -src_install() { - distutils-r1_src_install - - pushd ${PN} || die - insinto /usr/share/${PN} - doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source CustomKernels - insinto /usr/$(get_libdir)/cmake/${PN} - doins cmake/*.cmake -} diff --git a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch b/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch deleted file mode 100644 index b96429232c78..000000000000 --- a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 25b1621549f9b120462988913e657684645be79d Mon Sep 17 00:00:00 2001 -From: Lee Ringham <lringham@amd.com> -Date: Tue, 2 Nov 2021 14:43:07 -0600 -Subject: [PATCH] Added better control of parallelism to control memory usage - ---- - Tensile/Source/TensileCreateLibrary.cmake | 7 +++++-- - Tensile/cmake/TensileConfig.cmake | 5 +++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/Tensile/Source/TensileCreateLibrary.cmake b/Tensile/Source/TensileCreateLibrary.cmake -index 1dbacf41df..996f365bcf 100644 ---- a/Tensile/Source/TensileCreateLibrary.cmake -+++ b/Tensile/Source/TensileCreateLibrary.cmake -@@ -33,7 +33,8 @@ function(TensileCreateLibraryCmake - Tensile_LIBRARY_FORMAT - Tensile_MERGE_FILES - Tensile_SHORT_FILE_NAMES -- Tensile_LIBRARY_PRINT_DEBUG ) -+ Tensile_LIBRARY_PRINT_DEBUG -+ Tensile_CPU_THREADS ) - - # make Tensile_PACKAGE_LIBRARY and optional parameter - # to avoid breaking applications which us this -@@ -51,6 +52,7 @@ function(TensileCreateLibraryCmake - message(STATUS "Tensile_COMPILER from TensileCreateLibraryCmake : ${Tensile_COMPILER}") - message(STATUS "Tensile_ARCHITECTURE from TensileCreateLibraryCmake : ${Tensile_ARCHITECTURE}") - message(STATUS "Tensile_LIBRARY_FORMAT from TensileCreateLibraryCmake : ${Tensile_LIBRARY_FORMAT}") -+ message(STATUS "Tensile_CPU_THREADS from TensileCreateLibraryCmake : ${Tensile_CPU_THREADS}") - - #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/TensileCreateLibrary) - #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/Tensile) -@@ -89,7 +91,8 @@ function(TensileCreateLibraryCmake - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--code-object-version=${Tensile_CODE_OBJECT_VERSION}") - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--cxx-compiler=${Tensile_COMPILER}") - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--library-format=${Tensile_LIBRARY_FORMAT}") -- -+ set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--jobs=${Tensile_CPU_THREADS}") -+ - # TensileLibraryWriter positional arguments - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} - ${Tensile_LOGIC_PATH} -diff --git a/Tensile/cmake/TensileConfig.cmake b/Tensile/cmake/TensileConfig.cmake -index 0ac8517c2c..fa8cb96305 100644 ---- a/Tensile/cmake/TensileConfig.cmake -+++ b/Tensile/cmake/TensileConfig.cmake -@@ -112,6 +112,7 @@ function(TensileCreateLibraryFiles - LIBRARY_FORMAT - TENSILE_ROOT - VAR_PREFIX -+ CPU_THREADS - ) - - # Multi value settings -@@ -184,6 +185,10 @@ function(TensileCreateLibraryFiles - set(Options ${Options} "--cmake-cxx-compiler=${Tensile_COMPILER_PATH}") - endif() - -+ if(Tensile_CPU_THREADS) -+ set(Options ${Options} "--jobs=${Tensile_CPU_THREADS}") -+ endif() -+ - if(Tensile_LIBRARY_FORMAT) - set(Options ${Options} "--library-format=${Tensile_LIBRARY_FORMAT}") - if(Tensile_LIBRARY_FORMAT MATCHES "yaml") diff --git a/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch deleted file mode 100644 index b8b59af5184e..000000000000 --- a/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix incorrect path in scripts and CMakeLists, in order to build tensile_client -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Source/client/CMakeLists.txt -+++ Tensile-rocm-5.0.2/Tensile/Source/client/CMakeLists.txt -@@ -56,3 +56,5 @@ endif() - foreach(arch IN LISTS TENSILE_GPU_ARCHS) - target_link_libraries(tensile_client PRIVATE "--amdgpu-target=${arch}") - endforeach(arch) -+ -+target_link_libraries(tensile_client PRIVATE LLVMSupport) -Index: Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Source/lib/CMakeLists.txt -+++ Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt -@@ -47,7 +47,7 @@ set(tensile_sources ${tensile_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) -Index: Tensile-rocm-5.0.2/Tensile/Common.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Common.py -+++ Tensile-rocm-5.0.2/Tensile/Common.py -@@ -1873,7 +1873,7 @@ def assignGlobalParameters( config ): - else: - print2(" %24s: %8s (unspecified)" % (key, defaultValue)) - -- globalParameters["ROCmPath"] = "/opt/rocm" -+ globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr" - if "ROCM_PATH" in os.environ: - globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH") - if "TENSILE_ROCM_PATH" in os.environ: -Index: Tensile-rocm-5.0.2/Tensile/ClientWriter.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/ClientWriter.py -+++ Tensile-rocm-5.0.2/Tensile/ClientWriter.py -@@ -205,7 +205,7 @@ def getBuildClientLibraryScript(buildPat - import io - runScriptFile = io.StringIO() - -- callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary" -+ callCreateLibraryCmd = "TensileCreateLibrary" - - - if globalParameters["MergeFiles"]: -Index: Tensile-rocm-5.0.2/Tensile/GenerateSummations.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/GenerateSummations.py -+++ Tensile-rocm-5.0.2/Tensile/GenerateSummations.py -@@ -57,7 +57,7 @@ def createLibraryForBenchmark(logicPath, - Selection. - """ - -- pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary") -+ pythonExePath = "TensileCreateLibrary" - args = [pythonExePath, \ - "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \ - "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \ -Index: Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.0.2.orig/HostLibraryTests/CMakeLists.txt -+++ Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt -@@ -135,7 +135,7 @@ set(test_sources ${test_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) |