[gentoo-dev] [PATCH] Migrate (non-Nvidia) OpenCL providers to virtual/opencl-3

[gentoo-dev] [PATCH] Migrate (non-Nvidia) OpenCL providers to virtual/opencl-3

[Marek Szuba]

Now that we have got two OpenCL ICD loaders in the tree, that
starting with version 3, virtual/opencl will only pull an ICD loader
rather than any specific implementation, and that we are in the process
of following the footsteps of OpenGL in migrating away from using
eselect to switch between OpenCL implementations in favour of always
going through a loader, update implementations accordingly.
Specifically: depend on >=virtual/opencl-3 rather than on any specific
ICD loader, and make sure even implementations which previously ran
standalone use one.

Note that while the same should be done for x11-drivers/nvidia-drivers,
all the ebuilds there are marked stable so they will have to be handled
with more care.

Maintainers whose sign-off is needed: candrews for ROCm, zerochaos for
intel-ocl-sdk, the X11 project for Mesa.

[gentoo-dev] [PATCH 1/3] dev-libs/rocm-opencl-runtime: do not force use of specific ICD loader

[Marek Szuba]

Pending maintainer's approval.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild | 2 +-
 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild | 2 +-
 dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
index d965949c197..390f4de5e07 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
@@ -25,7 +25,7 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=dev-libs/rocm-comgr-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
-	dev-libs/ocl-icd[khronos-headers]
+	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
 	dev-lang/ocaml
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
index ec654ae4857..45a3fcd5324 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
@@ -25,7 +25,7 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=dev-libs/rocm-comgr-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
-	dev-libs/ocl-icd[khronos-headers]
+	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
 	dev-lang/ocaml
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
index ec654ae4857..45a3fcd5324 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
@@ -25,7 +25,7 @@ SLOT="0/$(ver_cut 1-2)"
 RDEPEND=">=dev-libs/rocr-runtime-${PV}
 	>=dev-libs/rocm-comgr-${PV}
 	>=dev-libs/rocm-device-libs-${PV}
-	dev-libs/ocl-icd[khronos-headers]
+	>=virtual/opencl-3
 	media-libs/mesa"
 DEPEND="${RDEPEND}
 	dev-lang/ocaml
-- 
2.24.1

[gentoo-dev] [PATCH 2/3] media-libs/mesa: do not force use of specific ICD loader

[Marek Szuba]

Pending maintainer approval, and letting the stable ebuild be.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 media-libs/mesa/mesa-20.0.4.ebuild | 2 +-
 media-libs/mesa/mesa-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-20.0.4.ebuild b/media-libs/mesa/mesa-20.0.4.ebuild
index 2e2725b40c9..18accf194ed 100644
--- a/media-libs/mesa/mesa-20.0.4.ebuild
+++ b/media-libs/mesa/mesa-20.0.4.ebuild
@@ -98,7 +98,7 @@ RDEPEND="
 		)
 		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 91f99eee5b6..1b76d10ee80 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -98,7 +98,7 @@ RDEPEND="
 		)
 		lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
 		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+					>=virtual/opencl-3[${MULTILIB_USEDEP}]
 					dev-libs/libclc
 					virtual/libelf:0=[${MULTILIB_USEDEP}]
 				)
-- 
2.24.1

[gentoo-dev] [PATCH 3/3] dev-util/intel-ocl-sdk: require an ICD loader instead of running standalone

[Marek Szuba]

At least version 4.4.0.117 works fine with a loader, and in any case
using an OpenCL implementation which exclusively targets CPUs is of
limited use.

Pending maintainer approval, and letting the stable ebuild be.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
index df63eebf81f..afdbe2891d5 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="android +system-tbb system-clang +system-boost"
 KEYWORDS="-* ~amd64"
 RESTRICT="bindist mirror"
 
-RDEPEND="app-eselect/eselect-opencl
+RDEPEND=">=virtual/opencl-3
 	sys-process/numactl
 	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
 	system-clang? ( =sys-devel/clang-3.4* )
@@ -76,7 +76,3 @@ src_install() {
 	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
 	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2"
 }
-
-pkg_postinst() {
-	eselect opencl set --use-old intel
-}
-- 
2.24.1

Re: [gentoo-dev] [PATCH 1/3] dev-libs/rocm-opencl-runtime: do not force use of specific ICD loader

[Craig Andrews]

[-- Attachment #1: Type: text/plain, Size: 2292 bytes --]

On 2020-04-08 11:28, Marek Szuba wrote:
> Pending maintainer's approval.
> 
> Signed-off-by: Marek Szuba <marecki@gentoo.org>
> ---
>  dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild | 2 +-
>  dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild | 2 +-
>  dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git
> a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
> b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
> index d965949c197..390f4de5e07 100644
> --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
> +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
> @@ -25,7 +25,7 @@ SLOT="0/$(ver_cut 1-2)"
>  RDEPEND=">=dev-libs/rocr-runtime-${PV}
>  	>=dev-libs/rocm-comgr-${PV}
>  	>=dev-libs/rocm-device-libs-${PV}
> -	dev-libs/ocl-icd[khronos-headers]
> +	>=virtual/opencl-3
>  	media-libs/mesa"
>  DEPEND="${RDEPEND}
>  	dev-lang/ocaml
> diff --git
> a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
> b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
> index ec654ae4857..45a3fcd5324 100644
> --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
> +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.1.0.ebuild
> @@ -25,7 +25,7 @@ SLOT="0/$(ver_cut 1-2)"
>  RDEPEND=">=dev-libs/rocr-runtime-${PV}
>  	>=dev-libs/rocm-comgr-${PV}
>  	>=dev-libs/rocm-device-libs-${PV}
> -	dev-libs/ocl-icd[khronos-headers]
> +	>=virtual/opencl-3
>  	media-libs/mesa"
>  DEPEND="${RDEPEND}
>  	dev-lang/ocaml
> diff --git
> a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
> b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
> index ec654ae4857..45a3fcd5324 100644
> --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
> +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.3.0.ebuild
> @@ -25,7 +25,7 @@ SLOT="0/$(ver_cut 1-2)"
>  RDEPEND=">=dev-libs/rocr-runtime-${PV}
>  	>=dev-libs/rocm-comgr-${PV}
>  	>=dev-libs/rocm-device-libs-${PV}
> -	dev-libs/ocl-icd[khronos-headers]
> +	>=virtual/opencl-3
>  	media-libs/mesa"
>  DEPEND="${RDEPEND}
>  	dev-lang/ocaml

Assuming that you've compile-tested this change, I approve.

Thanks,
~Craig

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[gentoo-dev] Re: [PATCH 2/3] media-libs/mesa: do not force use of specific ICD loader

[Matt Turner]

Looks good to me. Thanks!

Re: [gentoo-dev] [PATCH 3/3] dev-util/intel-ocl-sdk: require an ICD loader instead of running standalone

[Marek Szuba]

[-- Attachment #1.1: Type: text/plain, Size: 680 bytes --]

On 2020-04-08 16:28, Marek Szuba wrote:

> using an OpenCL implementation which exclusively targets CPUs is of
> limited use.

Clarification on the above: I meant using an implementation of this sort
*in standalone mode* i.e. set as THE OpenCL implementation by
eselect-opencl. It has never been my intention to criticise the package
itself, if anything I have found it quite useful while benchmarking
first Beignet and then NEO - but *it* is rather more handy to use it via
an ICD loader, e.g. in order to have OpenCL support for both Intel CPUs
and Intel GPUs active at the same time.

I have already updated the commit message on my end accordingly.

-- 
MS


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]