From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B07D158094 for ; Sat, 6 Aug 2022 14:23:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EE99E10C5; Sat, 6 Aug 2022 14:23:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17B8CE10C5 for ; Sat, 6 Aug 2022 14:23:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD8F03411F9 for ; Sat, 6 Aug 2022 14:23:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08AED578 for ; Sat, 6 Aug 2022 14:23:14 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1659795744.c1198ee528b9f90cca1f63baecf16c8dbd0741e6.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-smi/files/, dev-util/rocm-smi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/rocm-smi/Manifest dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch dev-util/rocm-smi/rocm-smi-5.1.3.ebuild X-VCS-Directories: dev-util/rocm-smi/files/ dev-util/rocm-smi/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: c1198ee528b9f90cca1f63baecf16c8dbd0741e6 X-VCS-Branch: master Date: Sat, 6 Aug 2022 14:23:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95a4ff70-168d-4f96-a37a-57e2003351f2 X-Archives-Hash: 617c6be43ae841b259087230c5bef107 commit: c1198ee528b9f90cca1f63baecf16c8dbd0741e6 Author: Yiyang Wu gmail com> AuthorDate: Mon Jul 11 09:04:21 2022 +0000 Commit: Benda XU gentoo org> CommitDate: Sat Aug 6 14:22:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1198ee5 dev-util/rocm-smi: add 5.1.3 Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/rocm-smi/Manifest | 1 + .../rocm-smi-5.1.3-detect-builtin-amdgpu.patch | 26 +++++++++ dev-util/rocm-smi/rocm-smi-5.1.3.ebuild | 62 ++++++++++++++++++++++ 3 files changed, 89 insertions(+) diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest index d45d584c8345..a5d1a8903631 100644 --- a/dev-util/rocm-smi/Manifest +++ b/dev-util/rocm-smi/Manifest @@ -2,3 +2,4 @@ DIST rocm-smi-4.0.0.tar.gz 45065 BLAKE2B 90a28c162099deaa67c98701b79328c760973d8 DIST rocm-smi-4.3.0.tar.gz 1672482 BLAKE2B 21b35daa565ce368ac10110ba73f723c5d2125e401f5c8fa2d8e3300f450f39dd0c1de74681249868a842b568af0f2cf0d1f7bf0d40d338a7d1ee7c9e25b67dd SHA512 2bf5d3f1be50636c7c848cfa982fcdb6fbf25d648bcbe2a195e1153c7f4c8b11b2b3650aaa110eec780a218a1503afe84637c7d6e7e868e7065f8c51d8d3b8dd DIST rocm-smi-4.5.2.tar.gz 1674835 BLAKE2B 7cf69170a4a8dedfdc467e3b8dc64bd829136062487814e169cca0deabcd05d8adaf4fc440173e10cd8117ae63119f10a09c3042b0915b865e0620322c940e91 SHA512 640645d07dbc93a85d4e498bcc88fa0caab36b5af0f9feabf8a2383786ccb2b588be625f46e90d1b71803c011891a62a3642098fd0eb83530d5d8e0a49d204dc DIST rocm-smi-5.0.2.tar.gz 1677784 BLAKE2B 28e136a8b3c630ed7d5b514ad5bf985ff540df8e1fc2378b855032a6ebd2bcbcd4aab5e8a5a9e6462eacd2ac9ada0b8940aed582ce118d1066bded115af42e22 SHA512 bbad2bbebb81de42a15d8aa48e4751dbf9b8f9ee74633d16828f6977fadff35e9db0b7c9ee465a61c40a3e8f2f0f99b79cd5c5b142785cf61958d432f13d7f05 +DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e diff --git a/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch b/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch new file mode 100644 index 000000000000..3f322aef3582 --- /dev/null +++ b/dev-util/rocm-smi/files/rocm-smi-5.1.3-detect-builtin-amdgpu.patch @@ -0,0 +1,26 @@ +Detect amdgpu module for amdgpu-builtin kernel +From dc2a4b5b256692e1a6ecef45210682c316b961e0 Mon Sep 17 00:00:00 2001 +From: YiyangWu +Date: Sat, 2 Apr 2022 16:40:11 +0800 +Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod + +Closes: #102 + +Signed-off-by: YiyangWu +--- + python_smi_tools/rocm_smi.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python_smi_tools/rocm_smi.py b/python_smi_tools/rocm_smi.py +index 57606ee..35be495 100755 +--- a/python_smi_tools/rocm_smi.py ++++ b/python_smi_tools/rocm_smi.py +@@ -66,7 +66,7 @@ def driverInitialized(): + """ + driverInitialized = '' + try: +- driverInitialized = str(subprocess.check_output("cat /proc/modules|grep amdgpu", shell=True)) ++ driverInitialized = str(subprocess.check_output("test -d /sys/module/amdgpu", shell=True)) + except subprocess.CalledProcessError: + pass + if len(driverInitialized) > 0: diff --git a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild b/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild new file mode 100644 index 000000000000..7947568516a5 --- /dev/null +++ b/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-r1 + +DESCRIPTION="ROCm System Management Interface Library" +HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib" + EGIT_BRANCH="master" +else + SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" +fi + +LICENSE="MIT NCSA-AMD" +SLOT="0/$(ver_cut 1-2)" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="" +RDEPEND="${PYTHON_DEPS}" +BDEPEND="" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch + "${FILESDIR}"/${PN}-5.1.3-detect-builtin-amdgpu.patch +) + +src_prepare() { + sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \ + -e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die + sed -e "/link DESTINATION/,+1d" \ + -e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \ + -e "/bindings_link/,+3d" \ + -e "/rsmiBindings.py/,+1d" \ + -e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die + sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -i CMakeLists.txt || die + sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" -i python_smi_tools/rsmiBindings.py || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi + python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py +}