From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- dev-libs/rocm-opencl-runtime/Manifest | 3 +- .../rocm-opencl-runtime-5.0.2-enable-gfx800.patch | 16 ++++ .../rocm-opencl-runtime-5.0.2-r1.ebuild | 91 ++++++++++++++++++++++ .../rocm-opencl-runtime-5.0.2.ebuild | 90 --------------------- 4 files changed, 109 insertions(+), 91 deletions(-) create mode 100644 dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.0.2-enable-gfx800.patch create mode 100644 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2-r1.ebuild delete mode 100644 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.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 b07a6a3c42ad..3be3b803f7b8 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -6,6 +6,7 @@ AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13 AUX rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch 576 BLAKE2B adf9f72b83b57ca9a0205d520b8ffefd44b9b6ea13bae37ba3289ed39ad8bf7a93a1ca4c640c15dd79297fdaee34ca8b8c0f2f95c670d1a26873a73b7b2d02a7 SHA512 e3c673c649ed9a1e4c90c1d51e3f05431f61ea07287056f80879ae24b917474ebb9665ad83c361bbf2c3ca5a01b0ecc1d3d51b845a1c6e5c755fa40f7d92aaaf AUX rocm-opencl-runtime-4.2.0-opencl3-header.patch 3227 BLAKE2B f9a23194e9531da59839e3b6636a523a1e50a20bc57af9615f49ad390912af1032131d67ea3c157c76c35529d4776f26fd3c1806342e2b67a71737cc9bd108ae SHA512 4364cad8e0f20dd2df1c3e23d6099be6e96ff585d95fe665e63d926b37e5d03aa4e5729af53e1575066e501230c1c766cebb86da47052d0d9f4dc23da7069b83 AUX rocm-opencl-runtime-4.5.2-remove-clinfo.patch 577 BLAKE2B e8d57ae30b3ad97721f3afc254d780262c6f73259731d226445a320d7fc620c00398c781c5309bd4b43327ce45a747b5add3421c3abab0600d9e07c46cc20549 SHA512 83b7e1ef6d14f0cfefc2498fe5df191f2442b0265139cc3f2661346b55ff3621cf590a40476e156e729604fffb1285243df705010191b343596cbe3d67ee8c64 +AUX rocm-opencl-runtime-5.0.2-enable-gfx800.patch 970 BLAKE2B 4080ab450457c21de1c81c7e9eebc75578d7326430732f2dab5688150347de2b7977d8804573fd79bb1d14a2e5b87ede0de41cd7c7920f90fe8762686198f931 SHA512 b4f653fbe1b51e789a8213e37c5e6c43d7035e7971c483a3e24903e1d46bdbf206575b16ac6c78b5c32ba4e32dfa428339723b58f672716c05e51c785543c535 DIST rocclr-4.5.2.tar.gz 846950 BLAKE2B beefc6a98d9a8a1a6c00b03cbfd960215888201002f7d4a0ee079db1fc29f2faa9f53326d49c1ad00f2c3a507d5047aae8175a3abb50ae0a74ba36fdc7df9e22 SHA512 121cfb711172596d9e4d429a38fb333bbb10e427ad49cf337324dc187a04adcd99e94521cda65ba21b6ac3bfd7837f607e4c0fe38c6ebca3d58bb090128d0a43 DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f @@ -25,5 +26,5 @@ EBUILD rocm-opencl-runtime-4.1.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8 EBUILD rocm-opencl-runtime-4.2.0.ebuild 1764 BLAKE2B 05fa06033a0ee255ebda6bc17c9341b7b08a8b3f086c29f3104c07a8d78db105ce8d28c83b21ed259569b4d0c5bd00851e0553d84bc2650bd2c9b0f77aec7461 SHA512 88f7343cc137f039b5b374092a5f81cfb1e1223c36b9da9ee3b471e05fd770d9cde6b7d68f9c4288d421d4aa9350e2fa16b02e976411efc790ab4fa86e6e5dbf EBUILD rocm-opencl-runtime-4.3.0.ebuild 1771 BLAKE2B 6f89d392b1fa396abbff5bf4c72c874d759128eebd8ecdf9460750b654447f0f2b0e09f9d7bf1c7a468754e055b533f05f679439c0f1fd10c08f8dfbec1aca29 SHA512 a1132d242d3c5fe6718bb207a4a5430b036e77958267dbfe2485dce7d29ff1714bd7984f92c428b5e47cdf246bed1ced6fea1d01d9c1ff2f0b411dd5851b2bde EBUILD rocm-opencl-runtime-4.5.2.ebuild 2098 BLAKE2B 927e8c40f12b2dc9648b54af826e0ffa38f28a47dbbf33f3dc5f6504a1201d3a11abf8620486f7df5984dd7388a1160029be2e0d1c9a4f1bc2663d3fed852b34 SHA512 6bb18a36e3a77d83035306273685e3ab6397b91e2d311276e4f3bf469039e6c0b3ab70a73c29f30318fe2dd959244c449334e138e64ec3327c4b9870d5bafe5c -EBUILD rocm-opencl-runtime-5.0.2.ebuild 2098 BLAKE2B 927e8c40f12b2dc9648b54af826e0ffa38f28a47dbbf33f3dc5f6504a1201d3a11abf8620486f7df5984dd7388a1160029be2e0d1c9a4f1bc2663d3fed852b34 SHA512 6bb18a36e3a77d83035306273685e3ab6397b91e2d311276e4f3bf469039e6c0b3ab70a73c29f30318fe2dd959244c449334e138e64ec3327c4b9870d5bafe5c +EBUILD rocm-opencl-runtime-5.0.2-r1.ebuild 2200 BLAKE2B 0482018be30fed0b82efb9bb104e60ed47c8c53ba1acbf444188ca1af62b9a48c9aed68d45727bedb59374bd000d041adde698acfc475738739a108cb0d514e7 SHA512 fff8a6d3c7263aefc87cf17f2e22d9636ef228925747fbca002a5241a2fb676da488f567db83989a18b62f105e39895ebe40e8fdf228662246c5b094410606ff MISC metadata.xml 381 BLAKE2B fbd9237f4928b42544799482f55fc0e72e872a554bf96c3066ea59213e7d840d432c320f834cc333a09498d6deabb0fc751657ad0e861be7997fba6f1788ffac SHA512 8d05a33637e38b0596a98f5dfee096a91bba41ca16c4eba5f5e93f05f800290c480a0393bf4d5a7ce70cbff0a541b95e52d3c95b02cc7a079343c8f740b8e479 diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.0.2-enable-gfx800.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.0.2-enable-gfx800.patch new file mode 100644 index 000000000000..29482340295e --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.0.2-enable-gfx800.patch @@ -0,0 +1,16 @@ +#From xuhuisheng +#at https://github.com/RadeonOpenCompute/ROCm/issues/1659#issuecomment-1041026624 + +diff --git a/utils/flags.hpp b/utils/flags.hpp +index 8f0228cc..2eaa47c5 100644 +--- a/utils/flags.hpp ++++ b/utils/flags.hpp +@@ -245,7 +245,7 @@ release(bool, ROC_SYSTEM_SCOPE_SIGNAL, true, \ + "Enable system scope for signals (uses interrupts).") \ + release(bool, ROC_SKIP_COPY_SYNC, false, \ + "Skips copy syncs if runtime can predict the same engine.") \ +-release(bool, ROC_ENABLE_PRE_VEGA, false, \ ++release(bool, ROC_ENABLE_PRE_VEGA, true, \ + "Enable support of pre-vega ASICs in ROCm path") \ + release(bool, HIP_FORCE_QUEUE_PROFILING, false, \ + "Force command queue profiling by default") \ diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2-r1.ebuild new file mode 100644 index 000000000000..9c74aa789f97 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake flag-o-matic prefix + +DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" +SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz + https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" + +LICENSE="Apache-2.0 MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND=">=dev-libs/rocr-runtime-${PV} + >=dev-libs/rocm-comgr-${PV} + >=dev-libs/rocm-device-libs-${PV} + >=virtual/opencl-3 + media-libs/mesa" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/rocm-cmake-${PV} + media-libs/glew + " + +PATCHES=( + "${FILESDIR}/${PN}-4.5.2-remove-clinfo.patch" + "${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch" +) + +S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" +S1="${WORKDIR}/ROCclr-rocm-${PV}" + +CMAKE_BUILD_TYPE=Release + +src_prepare() { + # Remove "clinfo" - use "dev-util/clinfo" instead + [ -d tools/clinfo ] && rm -rf tools/clinfo || die + + cmake_src_prepare + + hprefixify amdocl/CMakeLists.txt + + local S="${S1}" + local CMAKE_USE_DIR="${S1}" + # Bug #753377 + # patch re-enables accidentally disabled gfx8000 family + local PATCHES=("${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch") + BUILD_DIR="${S1}_build" cmake_src_prepare +} + +src_configure() { + # configure ROCclr + CMAKE_USE_DIR="${S1}" + local mycmakeargs=( + -Wno-dev + -DAMD_OPENCL_PATH="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" + ) + BUILD_DIR="${S1}_build" cmake_src_configure + + # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120 + append-cflags -fcommon + + CMAKE_USE_DIR="${S}" + local mycmakeargs=( + -Wno-dev + -DROCCLR_PATH="${S1}" + -DAMD_OPENCL_PATH="${S}" + -DROCM_PATH="${EPREFIX}/usr" + ) + cmake_src_configure +} + +src_compile() { + local S="${S1}" + BUILD_DIR="${S1}_build" cmake_src_compile + + local S="${S}" + cmake_src_compile +} + +src_install() { + insinto /etc/OpenCL/vendors + doins config/amdocl64.icd + + cd "${BUILD_DIR}" || die + insinto /usr/lib64 + doins amdocl/libamdocl64.so + doins tools/cltrace/libcltrace.so +} diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.ebuild deleted file mode 100644 index a90a016047af..000000000000 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic prefix - -DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" -SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -LICENSE="Apache-2.0 MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -RDEPEND=">=dev-libs/rocr-runtime-${PV} - >=dev-libs/rocm-comgr-${PV} - >=dev-libs/rocm-device-libs-${PV} - >=virtual/opencl-3 - media-libs/mesa" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/rocm-cmake-${PV} - media-libs/glew - " - -PATCHES=( - "${FILESDIR}/${PN}-4.5.2-remove-clinfo.patch" - "${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch" -) - -S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" -S1="${WORKDIR}/ROCclr-rocm-${PV}" - -CMAKE_BUILD_TYPE=Release - -src_prepare() { - # Remove "clinfo" - use "dev-util/clinfo" instead - [ -d tools/clinfo ] && rm -rf tools/clinfo || die - - cmake_src_prepare - - hprefixify amdocl/CMakeLists.txt - - local S="${S1}" - local CMAKE_USE_DIR="${S1}" - # Bug #753377 - local PATCHES=() - BUILD_DIR="${S1}_build" cmake_src_prepare -} - -src_configure() { - # configure ROCclr - CMAKE_USE_DIR="${S1}" - local mycmakeargs=( - -Wno-dev - -DAMD_OPENCL_PATH="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" - ) - BUILD_DIR="${S1}_build" cmake_src_configure - - # Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120 - append-cflags -fcommon - - CMAKE_USE_DIR="${S}" - local mycmakeargs=( - -Wno-dev - -DROCCLR_PATH="${S1}" - -DAMD_OPENCL_PATH="${S}" - -DROCM_PATH="${EPREFIX}/usr" - ) - cmake_src_configure -} - -src_compile() { - local S="${S1}" - BUILD_DIR="${S1}_build" cmake_src_compile - - local S="${S}" - cmake_src_compile -} - -src_install() { - insinto /etc/OpenCL/vendors - doins config/amdocl64.icd - - cd "${BUILD_DIR}" || die - insinto /usr/lib64 - doins amdocl/libamdocl64.so - doins tools/cltrace/libcltrace.so -} -- cgit v1.2.3