ensure the PoCL ICD loader gets installed

Author: jameslamb

.ci/ci-images/manylinux_2_28_aarch64/Dockerfile

@@ -72,5 +72,8 @@ cmake \
 
 cmake --build pocl/build -j4
 
-cmake --install pocl/build
+cmake \
+   --install pocl/build \
+   --component dev \
+   --component icd
 EOF

.ci/ci-images/manylinux_2_28_x86_64/Dockerfile

@@ -15,7 +15,6 @@ yum install --nodocs -y \
 
 yum install --nodocs -y \
    clang-devel \
-   gcc-c++ \
    hwloc-devel \
    llvm-devel \
    llvm-static \
@@ -32,7 +31,7 @@ EOF
 
 RUN <<EOF
 # install a newer CMake than what the package manager has
-curl -sL https://cmake.org/files/v3.23/cmake-3.23.1-linux-$(arch).sh -o cmake.sh
+curl -sL https://cmake.org/files/v4.2/cmake-4.2.1-linux-$(arch).sh -o cmake.sh
 chmod +x cmake.sh
 ./cmake.sh --prefix=/usr/local --exclude-subdir
 rm -f ./cmake.sh
@@ -52,16 +51,16 @@ cmake \
    -B pocl/build \
    -S pocl \
    -DCMAKE_BUILD_TYPE=release \
-   -DCMAKE_C_COMPILER="${DEVTOOLSET_ROOTPATH}/usr/bin/gcc" \
-   -DCMAKE_CXX_COMPILER="${DEVTOOLSET_ROOTPATH}/usr/bin/g++" \
+   -DCMAKE_C_COMPILER="clang" \
+   -DCMAKE_CXX_COMPILER="clang++" \
    -DENABLE_DOXYGEN=OFF \
+   -DENABLE_ICD=ON \
+   -DENABLE_LLVM=ON \
    -DENABLE_EXAMPLES=OFF \
    -DENABLE_HOST_CPU_DEVICES=ON \
-   -DENABLE_ICD=ON \
    -DENABLE_HWLOC=ON \
    -DENABLE_POCLCC=ON \
    -DENABLE_SPIRV=ON \
-   -DSTATIC_LLVM=ON \
    -DENABLE_TESTS=OFF \
    -DENABLE_VALGRIND=OFF \
    -DINSTALL_OPENCL_HEADERS=OFF \
@@ -71,7 +70,10 @@ cmake \
 
 cmake --build pocl/build -j4
 
-cmake --install pocl/build
+cmake \
+   --install pocl/build \
+   --component dev \
+   --component icd
 EOF
 
 # Install Java

.ci/install-opencl.ps1 .ci/install-opencl-amd-driver.ps1.ci/install-opencl.ps1 renamed to .ci/install-opencl-amd-driver.ps1

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e -u -o pipefail
+
+# install Intel OpenCL support
+# https://www.intel.com/content/www/us/en/developer/articles/tool/opencl-drivers.html#philinux
+# https://www.intel.com/content/www/us/en/docs/oneapi/installation-guide-linux/2023-0/yum-dnf-zypper.html#GUID-B5018FF2-B9F3-4ADC-9EB6-F99F6BFC7948
+# https://www.intel.com/content/www/us/en/developer/articles/technical/intel-cpu-runtime-for-opencl-applications-with-sycl-support.html
+
+sudo cat > /etc/yum.repos.d/oneAPI.repo <<EOF
+[oneAPI]
+name=Intel® oneAPI repository
+baseurl=https://yum.repos.intel.com/oneapi
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
+EOF
+
+yum update -y
+yum install -y \
+    intel-oneapi-runtime-opencl

.ci/install-opencl-intel-driver.sh

@@ -126,33 +126,17 @@ else  # Linux
             sudo apt-get install --no-install-recommends -y \
                 pocl-opencl-icd
         else # in manylinux image
-
-# install Intel OpenCL support
-# https://www.intel.com/content/www/us/en/developer/articles/tool/opencl-drivers.html#philinux
-# https://www.intel.com/content/www/us/en/docs/oneapi/installation-guide-linux/2023-0/yum-dnf-zypper.html#GUID-B5018FF2-B9F3-4ADC-9EB6-F99F6BFC7948
-# https://www.intel.com/content/www/us/en/developer/articles/technical/intel-cpu-runtime-for-opencl-applications-with-sycl-support.html
-tee > /tmp/oneAPI.repo << EOF
-[oneAPI]
-name=Intel® oneAPI repository
-baseurl=https://yum.repos.intel.com/oneapi
-enabled=1
-gpgcheck=1
-repo_gpgcheck=1
-gpgkey=https://yum.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-EOF
-
-sudo mv /tmp/oneAPI.repo /etc/yum.repos.d
-yum update -y
-
-yum install -y \
-    intel-oneapi-runtime-opencl
-
             sudo yum update -y
             sudo yum install -y \
                 clinfo \
                 ocl-icd-devel \
                 opencl-headers \
             || exit 1
+
+            # install drives allowing the OpenCL version to target host GPUs
+            if [[ "${ARCH}" == "x86_64" ]]; then
+                .ci/install-opencl-intel-driver.sh
+            fi
         fi
         echo "--- clinfo: ---"
         clinfo || true

.ci/setup.sh

@@ -335,7 +335,7 @@ jobs:
         if: startsWith(matrix.os, 'windows') && (matrix.task == 'bdist')
         shell: pwsh -command ". {0}"
         run: |
-          & "$env:GITHUB_WORKSPACE/.ci/install-opencl.ps1"
+          & "$env:GITHUB_WORKSPACE/.ci/install-opencl-amd-driver.ps1"
       # 'conda init powershell' needs to be run in a separate process
       # ref: https://docs.conda.io/projects/conda/en/stable/dev-guide/deep-dives/activation.html
       - name: Initialize conda on Windows