Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/files/, dev-util/Tensile/
Date: Sun, 27 Mar 2022 03:13:02
Message-Id: 1648350772.14d25dadca383910e28865144a2316fe302dbf96.heroxbd@gentoo
1 commit: 14d25dadca383910e28865144a2316fe302dbf96
2 Author: YiyangWu <xgreenlandforwyy <AT> gmail <DOT> com>
3 AuthorDate: Thu Mar 24 13:00:38 2022 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 03:12:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d25dad
7
8 dev-util/Tensile: fix hardcoded EPREFIX in gentoopath.patch
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
12 Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
13
14 dev-util/Tensile/Tensile-4.3.0-r1.ebuild | 4 ++--
15 dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch | 4 ++--
16 2 files changed, 4 insertions(+), 4 deletions(-)
17
18 diff --git a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild b/dev-util/Tensile/Tensile-4.3.0-r1.ebuild
19 index 143867819d04..91bbbda89785 100644
20 --- a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild
21 +++ b/dev-util/Tensile/Tensile-4.3.0-r1.ebuild
22 @@ -5,7 +5,7 @@ EAPI=8
23
24 PYTHON_COMPAT=( python3_{8..10} )
25 DISTUTILS_USE_PEP517=setuptools
26 -inherit distutils-r1
27 +inherit distutils-r1 prefix
28
29 DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
30 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile"
31 @@ -33,11 +33,11 @@ PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
32 "${FILESDIR}"/${PN}-4.3.0-gfx1031.patch
33 "${FILESDIR}"/${PN}-4.3.0-fix-arch-parse.patch
34 "${FILESDIR}"/${PN}-4.3.0-use-ninja.patch
35 - "${FILESDIR}"/${PN}-4.3.0-gentoopath.patch
36 )
37
38 src_prepare() {
39 distutils-r1_src_prepare
40 + eapply $(prefixify_ro "${FILESDIR}"/${PN}-4.3.0-gentoopath.patch)
41
42 pushd ${PN} || die
43
44
45 diff --git a/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch b/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch
46 index 6fda0ddc6a8d..da135e3b38ee 100644
47 --- a/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch
48 +++ b/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch
49 @@ -17,7 +17,7 @@ Index: Tensile-rocm-4.3.0/Tensile/Source/lib/CMakeLists.txt
50
51 if(TENSILE_USE_LLVM)
52 - find_package(LLVM 13.0 QUIET CONFIG)
53 -+ find_package(LLVM PATHS /opt/gentoo/usr/lib/llvm/roc QUIET CONFIG)
54 ++ find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG)
55 if(NOT LLVM_FOUND)
56 find_package(LLVM 12.0 QUIET CONFIG)
57 if(NOT LLVM_FOUND)
58 @@ -30,7 +30,7 @@ Index: Tensile-rocm-4.3.0/Tensile/Common.py
59 print2(" %24s: %8s (unspecified)" % (key, defaultValue))
60
61 - globalParameters["ROCmPath"] = "/opt/rocm"
62 -+ globalParameters["ROCmPath"] = "/opt/gentoo/usr"
63 ++ globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr"
64 if "ROCM_PATH" in os.environ:
65 globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH")
66 if "TENSILE_ROCM_PATH" in os.environ: