commit: cf07867772891238e3f4f3e69199718ebadd5514
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 22:21:30 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 09:52:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf078677
dev-util/Tensile: drop 5.0.2-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/Tensile/Manifest | 1 -
dev-util/Tensile/Tensile-5.0.2-r2.ebuild | 84 ----------------------
.../files/Tensile-5.0.2-adjust-parallel.patch | 65 -----------------
.../Tensile/files/Tensile-5.0.2-gentoopath.patch | 75 -------------------
4 files changed, 225 deletions(-)
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index dd1df20ec814..643f4fe5816c 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-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.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 <[email protected]>
-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)
