From 5984279a2384e498d5879d508d560158724c7cab Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Thu, 31 Oct 2024 07:58:32 +0100 Subject: [PATCH 1/4] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 28366be7c30..2463c497535 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -81,7 +81,8 @@ jobs: - name: Install DPC++ shell: cmd run: | - call .\.ci\scripts\install_basekit.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ + for /F "delims=" %a in ('findstr /r WINDOWS_BASEKIT_URL: .ci/pipeline/ci.yml') do set "temp=%a" + call .\.ci\scripts\install_basekit.bat %temp:WINDOWS_BASEKIT_URL: =% ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ - name: Prepare Intel OpenCL CPU runtime run: | # Store the unpacked runtime to centralize and reduce external downloads From 094f31713982100295b0854def593f8974923d2b Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Thu, 31 Oct 2024 07:59:32 +0100 Subject: [PATCH 2/4] Update ci.yml --- .ci/pipeline/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index 2e9da929e93..227bc890af7 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -28,8 +28,7 @@ variables: TBB_VERSION : 'v2021.10.0' VM_IMAGE : 'ubuntu-22.04' SYSROOT_OS: 'jammy' - WIN_BASEKIT_VERSION: '2024.2.1.101' - WINDOWS_BASEKIT_URL: 'https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_$(WIN_BASEKIT_VERSION)_offline.exe' + WINDOWS_BASEKIT_URL: 'https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b380d914-366b-4b77-a74a-05e3c38b3514/intel-oneapi-base-toolkit-2025.0.0.882_offline.exe' WINDOWS_DPCPP_COMPONENTS: 'intel.oneapi.win.mkl.devel:intel.oneapi.win.tbb.devel' jobs: From 7158ac7c0edd6a2a7a484e444385343a42c9156e Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Thu, 31 Oct 2024 12:13:51 +0100 Subject: [PATCH 3/4] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 2463c497535..3c5f31d6bd4 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -81,8 +81,9 @@ jobs: - name: Install DPC++ shell: cmd run: | - for /F "delims=" %a in ('findstr /r WINDOWS_BASEKIT_URL: .ci/pipeline/ci.yml') do set "temp=%a" - call .\.ci\scripts\install_basekit.bat %temp:WINDOWS_BASEKIT_URL: =% ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ + set PATH=C:\msys64\usr\bin;%PATH% + for /f "delims=" %%i in ('grep -oP -m 1 "(?<=WINDOWS_BASEKIT_URL: ).*" .ci\pipeline\ci.yml') do set "baseurl=%%i" + call .ci\scripts\install_basekit.bat %baseurl:'="% ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ - name: Prepare Intel OpenCL CPU runtime run: | # Store the unpacked runtime to centralize and reduce external downloads From 61c7b2000712b3b8392dc6caf30788d93b75f4c8 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Thu, 31 Oct 2024 12:14:18 +0100 Subject: [PATCH 4/4] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 3c5f31d6bd4..0b136649faa 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -25,7 +25,6 @@ permissions: contents: read env: - WINDOWS_BASEKIT_URL: 'https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d91caaa0-7306-46ea-a519-79a0423e1903/w_BaseKit_p_2024.2.1.101_offline.exe' WINDOWS_ALL_COMPONENTS: 'intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel:intel.oneapi.win.tbb.devel' jobs: