From f827ced0163cc11d6d35e2d4e2c8a7ab3fd6482a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Oct 2023 15:53:17 +0100 Subject: gentoo auto-resync : 19:10:2023 - 15:53:17 --- dev-libs/rocm-opencl-runtime/Manifest | 4 +- .../rocm-opencl-runtime-5.7.0.ebuild | 115 --------------------- .../rocm-opencl-runtime-5.7.1.ebuild | 115 +++++++++++++++++++++ 3 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.0.ebuild create 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 bfa03eb70bf1..c08649375688 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -8,7 +8,7 @@ DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f -DIST rocm-clr-5.7.0.tar.gz 2008521 BLAKE2B 2edc6955a8b8bfd419f3e77e553081816fc3d8b8147d485f47006eb1aa2480dcc1aefa6641ca2ee610d855970946d194db13aa529830d09e74e411636b845bf2 SHA512 2c36e44ce488c01deaae4a73daad2b18d34c0a23a8ad1b72cee0936e6e3651f47275a84190f4f92eadd1dceb153cd4dd3746dd40066055bda65902aec40b8071 +DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d @@ -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.0.ebuild 3360 BLAKE2B 8b43c176a7a9defb8edef05afec57a5407671afdb8e32259de67bcebc5e0bfe672c7757a0c450045094bd3d67b0d44a36106463d18725c45a8e455512ae555b9 SHA512 4b5cbd4128f611299ef2f42d4b5705a1d805af7502c425e25511708af47dd2de6114101161fbd09ed1d26a283a51515a51364902c9b1f50bd5b3ad11a175c1dd +EBUILD rocm-opencl-runtime-5.7.1.ebuild 3361 BLAKE2B 2179028bef7a1a026109389f28f44535a564339bea31fe8a4b588b14f2c61fdca54eee96f9a3c4b025a6ad514e71b7fedc3a8226692c8dc261fa611c31df85db SHA512 9755025eae6603935f7d44ed1d9e1c14ccea8bdaa2d6fd4a9a0c5f243efad8cf630903abf92342672e5e47b5cbec9204526d8d7e351e8f9e75b6f59f402da80f 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.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.0.ebuild deleted file mode 100644 index f781db2a9098..000000000000 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.0.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 - 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=OFF - -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 -} 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 new file mode 100644 index 000000000000..95b46bd4cf1b --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild @@ -0,0 +1,115 @@ +# 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