From 334d6c8706ba33ac5ff270253bb92638e2b423e6 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 08:30:55 +0000 Subject: [PATCH 01/11] Fix Intel test runner Pin runner to ubuntu-18.04 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a91e53e..4ef0742 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,7 +60,7 @@ jobs: ./bin/nbody Intel: - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - name: Checkout code uses: actions/checkout@v1 From 7c02cf52c0e03e21fb44533bb614c137312b3c6d Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:04:38 +0000 Subject: [PATCH 02/11] Check OpenCL link library location --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4ef0742..b27dbb4 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 7ccdc8f76062190db8966351b7ea0a8fd8a5fef7 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:14:00 +0000 Subject: [PATCH 03/11] Try: fix with LD_LIBRARY_PATH --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b27dbb4..8035375 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,16 +107,19 @@ jobs: - name: Run tests (debug) run: | + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/libOpenCL.so.1 make -j test BUILD=debug FC=ifort make clean - name: Run tests (release) run: | + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/libOpenCL.so.1 make -j test BUILD=release FC=ifort make clean - name: Run example programs run: | + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/libOpenCL.so.1 pushd examples make FC=ifort popd From ca1ee3b68d84aa626a34513e347efeba982a9164 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:17:30 +0000 Subject: [PATCH 04/11] Update test.yml --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8035375..3d4129d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,19 +107,19 @@ jobs: - name: Run tests (debug) run: | - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/libOpenCL.so.1 + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/ make -j test BUILD=debug FC=ifort make clean - name: Run tests (release) run: | - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/libOpenCL.so.1 + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/ make -j test BUILD=release FC=ifort make clean - name: Run example programs run: | - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/libOpenCL.so.1 + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/ pushd examples make FC=ifort popd From a54e7d1ccd1868cb62b0ebb8b39088346f794d2d Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:21:18 +0000 Subject: [PATCH 05/11] Update test.yml --- .github/workflows/test.yml | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d4129d..c1ec735 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 http://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/16284/intel_sdk_for_opencl_applications_2020.0.270.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.0.270/silent.cfg - sudo /tmp/intel_sdk_for_opencl_applications_2020.0.270/install.sh -s /tmp/intel_sdk_for_opencl_applications_2020.0.270/silent.cfg - + - name: Install ifort with apt if: steps.cache-intel.outputs.cache-hit != 'true' run: | @@ -98,28 +87,36 @@ 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 - + - name: Setup ifort env run: | source /opt/intel/oneapi/setvars.sh printenv >> $GITHUB_ENV ifort --version + + - name: Download Intel OpenCL SDK + if: steps.cache-intel.outputs.cache-hit != 'true' + run: | + wget -q http://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/16284/intel_sdk_for_opencl_applications_2020.0.270.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.0.270/silent.cfg + sudo /tmp/intel_sdk_for_opencl_applications_2020.0.270/install.sh -s /tmp/intel_sdk_for_opencl_applications_2020.0.270/silent.cfg - name: Run tests (debug) run: | - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/ make -j test BUILD=debug FC=ifort make clean - name: Run tests (release) run: | - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/ make -j test BUILD=release FC=ifort make clean - name: Run example programs run: | - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/ pushd examples make FC=ifort popd From 74419a5ecb8b8226dc6e0cb74de45238bcaaf6ec Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:25:45 +0000 Subject: [PATCH 06/11] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c1ec735..1bdba5c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -118,6 +118,7 @@ jobs: - name: Run example programs run: | pushd examples + export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH make FC=ifort popd ldd bin/platform_query From 1fb01f2e42d1829252c62995b2ed55f181a1d7f1 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:37:29 +0000 Subject: [PATCH 07/11] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1bdba5c..4bc2b94 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -118,6 +118,7 @@ jobs: - name: Run example programs run: | pushd examples + ls -al /lib/x86_64-linux-gnu/ export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH make FC=ifort popd From 313fcc449fe9de4adb3054726977ba1f5c4c559b Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:44:48 +0000 Subject: [PATCH 08/11] Update test.yml --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4bc2b94..a0d08c3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -97,13 +97,13 @@ jobs: - name: Download Intel OpenCL SDK if: steps.cache-intel.outputs.cache-hit != 'true' run: | - wget -q http://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/16284/intel_sdk_for_opencl_applications_2020.0.270.tar.gz -O /tmp/opencl_runtime.tgz + wget -q https://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/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.0.270/silent.cfg - sudo /tmp/intel_sdk_for_opencl_applications_2020.0.270/install.sh -s /tmp/intel_sdk_for_opencl_applications_2020.0.270/silent.cfg + 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: Run tests (debug) run: | From 791dfbe11b7b47519a070de89f64bdcd7c920465 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:49:17 +0000 Subject: [PATCH 09/11] Update test.yml --- .github/workflows/test.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a0d08c3..d7804a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,7 +61,7 @@ jobs: ./bin/nbody Intel: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v1 @@ -93,17 +93,6 @@ jobs: source /opt/intel/oneapi/setvars.sh printenv >> $GITHUB_ENV ifort --version - - - name: Download Intel OpenCL SDK - if: steps.cache-intel.outputs.cache-hit != 'true' - run: | - wget -q https://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/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: Run tests (debug) run: | From 48411948b2b2b26def21ea54195d214def01b7e0 Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 15:58:38 +0000 Subject: [PATCH 10/11] Update test.yml --- .github/workflows/test.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7804a1..30ef591 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -94,6 +94,17 @@ jobs: printenv >> $GITHUB_ENV ifort --version + - name: Download Intel OpenCL SDK + if: steps.cache-intel.outputs.cache-hit != 'true' + run: | + wget -q https://registrationcenter-download.intel.com/akdlm/irc_nas/vcp/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: Run tests (debug) run: | make -j test BUILD=debug FC=ifort From c699618006cbcacd1cc4cc1241d01f915d40129a Mon Sep 17 00:00:00 2001 From: Laurence Kedward Date: Mon, 1 Nov 2021 16:10:06 +0000 Subject: [PATCH 11/11] Update test.yml --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 30ef591..b107f3b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -87,6 +87,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 -rf /opt/intel/oneapi/compiler/2021.4.0/linux/lib/libOpenCL.so.1 - name: Setup ifort env run: | @@ -118,8 +119,6 @@ jobs: - name: Run example programs run: | pushd examples - ls -al /lib/x86_64-linux-gnu/ - export LD_LIBRARY_PATH=/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH make FC=ifort popd ldd bin/platform_query