From 46227d4bea72a4d588141f40667699df3aeef2b0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 Dec 2023 20:44:04 +0000 Subject: gentoo auto-resync : 14:12:2023 - 20:44:04 --- dev-libs/rocm-opencl-runtime/Manifest | 2 +- .../rocm-opencl-runtime-5.7.1-r1.ebuild | 100 ++++++++++++++++++ .../rocm-opencl-runtime-5.7.1.ebuild | 115 --------------------- 3 files changed, 101 insertions(+), 116 deletions(-) create mode 100644 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1-r1.ebuild delete mode 100644 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild (limited to 'dev-libs/rocm-opencl-runtime') diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest index c08649375688..f82f8c48e169 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -17,6 +17,6 @@ EBUILD rocm-opencl-runtime-5.1.3.ebuild 3896 BLAKE2B e2b91686450b4dfc41876cf487c EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3473 BLAKE2B e5e93f5ebd36c2862f006d9797c0b33336e3276479c58b712323fa3db41aaa2ac88f87af898c0dc27c1b9c5a1ca73d5027d760f7519f088fc302586ad4a10779 SHA512 a994ada4b117b147e17bbe7e1f53b7584b9a5a5e1cf9fa91a8c783cb33fca24d65653f22fdeea8d484ac0b70f3c407fbb3bf1b8bc29e6d4758e16f2b75021ce3 EBUILD rocm-opencl-runtime-5.4.3-r1.ebuild 3874 BLAKE2B 64b9aa7a8fe716490f2e126893e7e3689fd6ae7d36aa1df5a25353916241b3c7c577411c77e6d7b1ad3888956a20deb7ca8f612bc16bd2f1f215e8d97693de87 SHA512 e6adff36676d08f02b5d76326f0c7ec23242f809daeddcdb510c05f86bae1c0ddf86bfcac7b5aac9b2fbe68647948c7b27441c0070c5aee1902904c5c0c06f89 EBUILD rocm-opencl-runtime-5.5.1.ebuild 3845 BLAKE2B 3ed685719e66a355ffeb344ed3ff7e9d89ad55f8b54f0fc55de1b27292e936209f6c5724856b91c517ae2ade564e22b83f49a374850d709990a0195a39282ff0 SHA512 39c8ed6972f6f5dcbcc4a4a32610cbd600c4c7f5f3c6a38bcb45fa9a79aaccf9edff4b3527beb840281d455a1111e29122ffa9dc2b75fddf5f007a422a5dba64 -EBUILD rocm-opencl-runtime-5.7.1.ebuild 3361 BLAKE2B 2179028bef7a1a026109389f28f44535a564339bea31fe8a4b588b14f2c61fdca54eee96f9a3c4b025a6ad514e71b7fedc3a8226692c8dc261fa611c31df85db SHA512 9755025eae6603935f7d44ed1d9e1c14ccea8bdaa2d6fd4a9a0c5f243efad8cf630903abf92342672e5e47b5cbec9204526d8d7e351e8f9e75b6f59f402da80f +EBUILD rocm-opencl-runtime-5.7.1-r1.ebuild 2775 BLAKE2B 721acdf0f0c483e62927a592fbadc5ed447ed422b8a4557e97f742be1cf510e841c66ccfa6f5100061b80573d76e95d4cc74fd75d8e6bd352ea948a02d1a2edf SHA512 277e315d197f79d714be8e93ca456bd876bcbc7afc2ba9df9bb56905509b97e04df66237d59011cea277f0cf79674520f1003c90c2816047a6563cffc04f32f2 EBUILD rocm-opencl-runtime-9999.ebuild 3754 BLAKE2B 388ac782a2ec0f2705bac0263ace586350a295bb68e45c7e52f8ce79ea2dcc16e0f1adf72328b6940a6b7e4d3d6add329a6ffc4ac04a439fb95aa8129f843d40 SHA512 1adbf2d29a0ca0a0a4d436b7128a9cf49dd47f95d7c75b1d74ce8de3a81b62f1073482d5cb6b9ca6f0919f8860df1b9890f5a7b86624149354c954c71520f7e2 MISC metadata.xml 525 BLAKE2B 9af34c6be2bb5ff304e4d01810b810eb8a0639d1972325fad3b81c93aa4d060cbebddc9c06da702dd80f9aa98549720cf2bc674d5b11ef6f99ed30efe50d2110 SHA512 c50670dde49ec0d9d3acca19d37842ecf567429f455e1b37c5181e5d4361d829eff0980ba35096ef42c0789f8904d52425faf4a2aabf641142722957b626378d diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1-r1.ebuild new file mode 100644 index 000000000000..47adc38490e0 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_SKIP_GLOBALS=1 +inherit cmake edo flag-o-matic rocm + +DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr" + +#if [[ ${PV} == *9999 ]] ; then +# EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" +# EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr" +# inherit git-r3 +# S="${WORKDIR}/${P}" +#else + KEYWORDS="~amd64" + SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz" + S="${WORKDIR}/clr-rocm-${PV}/" +#fi + +LICENSE="Apache-2.0 MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-libs/rocr-runtime-5.7 + >=dev-libs/rocm-comgr-5.7 + >=dev-libs/rocm-device-libs-5.7 + >=virtual/opencl-3 + media-libs/mesa[-opencl]" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/rocm-cmake-5.3 + media-libs/glew + test? ( >=x11-apps/mesa-progs-8.5.0[X] ) + " + +src_unpack () { +if [[ ${PV} == "9999" ]]; then + git-r3_fetch +OB git-r3_checkout + git-r3_fetch "${EGIT_CLR_REPO_URI}" + git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}" + else + default + fi +} + +src_configure() { + # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120 + append-cflags -fcommon + + local mycmakeargs=( + -Wno-dev + -DROCM_PATH="${EPREFIX}/usr" + -DBUILD_TESTS=$(usex test ON OFF) + -DEMU_ENV=ON + -DBUILD_ICD=ON + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DCLR_BUILD_OCL=on + ) + cmake_src_configure +} + +src_install() { + insinto /etc/OpenCL/vendors + doins opencl/config/amdocl64.icd + + cd "${BUILD_DIR}"/opencl || die + insinto /usr/lib64 + doins amdocl/libamdocl64.so + doins tools/cltrace/libcltrace.so +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/tests/ocltst || die + export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so + local instruction1="Please start an X server using amdgpu driver (not Xvfb!)," + local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test." + if [[ -n ${OCLGL_DISPLAY+x} ]]; then + export DISPLAY=${OCLGL_DISPLAY} + export XAUTHORITY=${OCLGL_XAUTHORITY} + ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}" + if ! glxinfo | grep "OpenGL vendor string: AMD"; then + ewarn "${instruction1}" + ewarn "${instruction2}" + die "This display does not have AMD OpenGL vendor!" + fi + ./ocltst -m $(realpath liboclgl.so) -A ogl.exclude + eend $? || die "oclgl test failed" + else + ewarn "${instruction1}" + ewarn "${instruction2}" + die "\${OCLGL_DISPLAY} not set." + fi + edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude + edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude +} diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild deleted file mode 100644 index 95b46bd4cf1b..000000000000 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake edo flag-o-matic - -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr" - -#if [[ ${PV} == *9999 ]] ; then -# EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" -# EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr" -# inherit git-r3 -# S="${WORKDIR}/${P}" -#else - KEYWORDS="~amd64" - SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz" - S="${WORKDIR}/clr-rocm-${PV}/" -#fi - -LICENSE="Apache-2.0 MIT" -SLOT="0/$(ver_cut 1-2)" -IUSE="debug test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-libs/rocr-runtime-5.7 - >=dev-libs/rocm-comgr-5.7 - >=dev-libs/rocm-device-libs-5.7 - >=virtual/opencl-3 - media-libs/mesa[-opencl]" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/rocm-cmake-5.3 - media-libs/glew - test? ( >=x11-apps/mesa-progs-8.5.0[X] ) - " - -src_unpack () { -if [[ ${PV} == "9999" ]]; then - git-r3_fetch -OB git-r3_checkout - git-r3_fetch "${EGIT_CLR_REPO_URI}" - git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}" - else - default - fi -} - -src_configure() { - # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120 - append-cflags -fcommon - - local mycmakeargs=( - -Wno-dev - -DROCM_PATH="${EPREFIX}/usr" - -DBUILD_TESTS=$(usex test ON OFF) - -DEMU_ENV=ON - -DBUILD_ICD=ON - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DCLR_BUILD_OCL=on - ) - cmake_src_configure -} - -src_install() { - insinto /etc/OpenCL/vendors - doins opencl/config/amdocl64.icd - - cd "${BUILD_DIR}"/opencl || die - insinto /usr/lib64 - doins amdocl/libamdocl64.so - doins tools/cltrace/libcltrace.so -} - -# Copied from rocm.eclass. This ebuild does not need amdgpu_targets -# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the -# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid -# pkgcheck warning. -check-amdgpu() { - for device in /dev/kfd /dev/dri/render*; do - addwrite ${device} - if [[ ! -r ${device} || ! -w ${device} ]]; then - eerror "Cannot read or write ${device}!" - eerror "Make sure it is present and check the permission." - ewarn "By default render group have access to it. Check if portage user is in render group." - die "${device} inaccessible" - fi - done -} - -src_test() { - check-amdgpu - cd "${BUILD_DIR}"/tests/ocltst || die - export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so - local instruction1="Please start an X server using amdgpu driver (not Xvfb!)," - local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test." - if [[ -n ${OCLGL_DISPLAY+x} ]]; then - export DISPLAY=${OCLGL_DISPLAY} - export XAUTHORITY=${OCLGL_XAUTHORITY} - ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}" - if ! glxinfo | grep "OpenGL vendor string: AMD"; then - ewarn "${instruction1}" - ewarn "${instruction2}" - die "This display does not have AMD OpenGL vendor!" - fi - ./ocltst -m $(realpath liboclgl.so) -A ogl.exclude - eend $? || die "oclgl test failed" - else - ewarn "${instruction1}" - ewarn "${instruction2}" - die "\${OCLGL_DISPLAY} not set." - fi - edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude - edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude -} -- cgit v1.2.3