From ae3beb43171abf5dad4f7e7662bf60a0509885a8 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Tue, 11 Jul 2023 11:23:56 +0100 Subject: [PATCH 1/4] Use Ubuntu 20.04 in CI for Intel OpenCL SDK --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a4dd1ca..6851811 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ on: jobs: gfortran-nix: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout code @@ -60,7 +60,7 @@ jobs: ./bin/nbody Intel: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout code uses: actions/checkout@v1 From b0919ec14b990259291da4b2362d80a73b4c151e Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Tue, 11 Jul 2023 11:35:06 +0100 Subject: [PATCH 2/4] Update test.yml --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6851811..9c01c67 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,6 +55,7 @@ jobs: - name: Run example programs run: | make examples + ldd bin/platform_query ./bin/platform_query ./bin/sum ./bin/nbody @@ -119,6 +120,7 @@ jobs: pushd examples make FC=ifort popd + ldd bin/platform_query ./bin/platform_query ./bin/sum ./bin/nbody From 6ee2205e1d31a05e3524e1d140b7b2e03b78d698 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Tue, 11 Jul 2023 11:41:35 +0100 Subject: [PATCH 3/4] Don't link to oneAPI OpenCL --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c01c67..7ecc62c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,6 +98,7 @@ jobs: sudo apt-get install intel-oneapi-ifort sudo rm -rf /opt/intel/oneapi/compiler/latest/linux/lib/emu sudo rm -rf /opt/intel/oneapi/compiler/latest/linux/lib/oclfpga + sudo rm /opt/intel/oneapi/compiler/2023.1.0/linux/lib/libOpenCL.so.1 - name: Setup ifort env run: | From eb40461a0ef589188c7d07dad1fe154d50f41705 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Tue, 11 Jul 2023 11:46:21 +0100 Subject: [PATCH 4/4] Update test.yml --- .github/workflows/test.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7ecc62c..74d1b96 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -75,18 +75,7 @@ jobs: /opt/intel/oneapi/setvars.sh /tmp/opencl_runtime.tgz key: intel-cache-v2 - - - name: Download Intel OpenCL SDK - if: steps.cache-intel.outputs.cache-hit != 'true' - run: | - wget -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/17206/intel_sdk_for_opencl_applications_2020.3.494.tar.gz -O /tmp/opencl_runtime.tgz - - - name: Install Intel OpenCL SDK - run: | - tar -xzf /tmp/opencl_runtime.tgz -C /tmp - sed 's/decline/accept/g' -i /tmp/intel_sdk_for_opencl_applications_2020.3.494/silent.cfg - sudo /tmp/intel_sdk_for_opencl_applications_2020.3.494/install.sh -s /tmp/intel_sdk_for_opencl_applications_2020.3.494/silent.cfg - + - name: Install ifort with apt if: steps.cache-intel.outputs.cache-hit != 'true' run: | @@ -99,6 +88,18 @@ jobs: sudo rm -rf /opt/intel/oneapi/compiler/latest/linux/lib/emu sudo rm -rf /opt/intel/oneapi/compiler/latest/linux/lib/oclfpga sudo rm /opt/intel/oneapi/compiler/2023.1.0/linux/lib/libOpenCL.so.1 + sudo rm -f /etc/OpenCL/vendors/intel-oneapi-compiler-shared-opencl-cpu.icd + + - name: Download Intel OpenCL SDK + if: steps.cache-intel.outputs.cache-hit != 'true' + run: | + wget -q https://registrationcenter-download.intel.com/akdlm/IRC_NAS/17206/intel_sdk_for_opencl_applications_2020.3.494.tar.gz -O /tmp/opencl_runtime.tgz + + - name: Install Intel OpenCL SDK + run: | + tar -xzf /tmp/opencl_runtime.tgz -C /tmp + sed 's/decline/accept/g' -i /tmp/intel_sdk_for_opencl_applications_2020.3.494/silent.cfg + sudo /tmp/intel_sdk_for_opencl_applications_2020.3.494/install.sh -s /tmp/intel_sdk_for_opencl_applications_2020.3.494/silent.cfg - name: Setup ifort env run: |