From 62cc2f59d461e8ab64db1dd90d90cfc031a4bbc6 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 09:28:46 +0200 Subject: [PATCH 01/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 6f802d3b405..66da546041c 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -73,6 +73,10 @@ jobs: uses: actions/checkout@v4 with: repository: oneapi-src/oneDAL + - name: Set MKL_FPK_GPU_VERSION_LINE + shell: bash + run: | + echo "MKL_FPK_GPU_VERSION_LINE=2024.0.0" >> "$GITHUB_ENV" - name: Install DPC++ shell: cmd run: | @@ -88,19 +92,16 @@ jobs: shell: cmd run: | call C:\temp\oneapi\setvars.bat - set MKL_FPK_GPU_VERSION_LINE=2024.0.0 call .\.ci\scripts\build.bat daal vc avx2 - name: Make onedal shell: cmd run: | call C:\temp\oneapi\setvars.bat - set MKL_FPK_GPU_VERSION_LINE=2024.0.0 call .\.ci\scripts\build.bat onedal_c vc avx2 - name: Make oneapi_dpc shell: cmd run: | call C:\temp\oneapi\setvars.bat - set MKL_FPK_GPU_VERSION_LINE=2024.0.0 call C:\temp\oneapi\compiler\latest\bin\sycl-ls.exe call .\.ci\scripts\build.bat onedal_dpc vc avx2 - name: Archive build From f97f71951cec21a5ff321aeb4a9e7f76e01ba669 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 09:56:31 +0200 Subject: [PATCH 02/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index 0da86a94960..80456c89824 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -15,17 +15,18 @@ rem See the License for the specific language governing permissions and rem limitations under the License. rem ============================================================================ +rem %1 - url to download +rem %2 - components to download (following oneapi standards, default: default) +rem %3 - install directory (default: C:\temp\oneapi\) + set URL=%1 -set COMPONENTS=%2 +set "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2) +if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3) curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log del %TEMP%\webimage.exe -if "%COMPONENTS%"=="" ( - webimage_extracted\bootstrapper.exe -s --action install --eula=accept --install-dir=C:\temp\oneapi\ -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. -) else ( - webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --install-dir=C:\temp\oneapi\ -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. -) +webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --install-dir=DIRECTORY -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. set installer_exit_code=%ERRORLEVEL% rd /s/q "webimage_extracted" exit /b %installer_exit_code% From 3d060c632fb8c8addd82fed335965dd821ab5988 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 09:58:06 +0200 Subject: [PATCH 03/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 66da546041c..13e9c20ea02 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -80,29 +80,29 @@ jobs: - name: Install DPC++ shell: cmd run: | - call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }} + call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ - name: System Info shell: cmd run: | set PATH=C:\msys64\usr\bin;%PATH% pip install cpufeature - call C:\temp\oneapi\setvars.bat + call .\setvars.bat bash .ci/scripts/describe_system.sh - name: Make daal shell: cmd run: | - call C:\temp\oneapi\setvars.bat + call .\oneapi\setvars.bat call .\.ci\scripts\build.bat daal vc avx2 - name: Make onedal shell: cmd run: | - call C:\temp\oneapi\setvars.bat + call .\oneapi\setvars.bat call .\.ci\scripts\build.bat onedal_c vc avx2 - name: Make oneapi_dpc shell: cmd run: | - call C:\temp\oneapi\setvars.bat - call C:\temp\oneapi\compiler\latest\bin\sycl-ls.exe + call .\oneapi\setvars.bat + call .\oneapi\compiler\latest\bin\sycl-ls.exe call .\.ci\scripts\build.bat onedal_dpc vc avx2 - name: Archive build uses: actions/upload-artifact@v4 @@ -112,7 +112,7 @@ jobs: - name: Compress DPC++ shell: cmd run: | - tar -cvzf icx.zip C:\temp\oneapi + tar -cvzf icx.zip .\oneapi - name: Archive DPC++ uses: actions/upload-artifact@v4 with: From b2a91bd0c08f98b13da1b7e6abbf5eac8cc1740f Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:00:19 +0200 Subject: [PATCH 04/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 13e9c20ea02..1ada78e9b9b 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -81,6 +81,10 @@ jobs: shell: cmd run: | call .\.ci\scripts\install_windows.bat ${{ env.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 + & .ci/scripts/collect_opencl_rt.ps1 - name: System Info shell: cmd run: | @@ -118,3 +122,8 @@ jobs: with: name: icx_compiler path: .\icx.zip + - name: Archive Intel OpenCL CPU runtime + uses: actions/upload-artifact@v4 + with: + name: opencl_rt_installer + path: .\opencl_rt.msi From efe1efb8043bc2b7cda2bb93e3faea3c690578ea Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:02:52 +0200 Subject: [PATCH 05/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index 80456c89824..21de445f02b 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -20,7 +20,7 @@ rem %2 - components to download (following oneapi standards, default: default) rem %3 - install directory (default: C:\temp\oneapi\) set URL=%1 -set "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2) +if "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2) if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3) curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 From 1713c970c4472852f0d25ac8169118c5b4e7a04b Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:03:27 +0200 Subject: [PATCH 06/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index 21de445f02b..4d3ad1916b7 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -26,7 +26,7 @@ if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3) curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log del %TEMP%\webimage.exe -webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --install-dir=DIRECTORY -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. +webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --install-dir=%DIRECTORY% -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. set installer_exit_code=%ERRORLEVEL% rd /s/q "webimage_extracted" exit /b %installer_exit_code% From 09e9e1d501f0d5f097e710328c27b28a85e8db3e Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:05:10 +0200 Subject: [PATCH 07/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 1ada78e9b9b..4f8528d4c11 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -90,7 +90,7 @@ jobs: run: | set PATH=C:\msys64\usr\bin;%PATH% pip install cpufeature - call .\setvars.bat + call .\oneapi\setvars.bat bash .ci/scripts/describe_system.sh - name: Make daal shell: cmd From 80374b2fb7bbedac47c2fd3e72ae624911288de6 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:10:43 +0200 Subject: [PATCH 08/30] Delete .ci/scripts/install_dpc.ps1 --- .ci/scripts/install_dpc.ps1 | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .ci/scripts/install_dpc.ps1 diff --git a/.ci/scripts/install_dpc.ps1 b/.ci/scripts/install_dpc.ps1 deleted file mode 100644 index e822a9de0ed..00000000000 --- a/.ci/scripts/install_dpc.ps1 +++ /dev/null @@ -1,27 +0,0 @@ -#=============================================================================== -# Copyright contributors to the oneDAL project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#=============================================================================== -echo "Download intel DPC++ compiler" -(new-object System.Net.WebClient).DownloadFile("https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7991e201-ca0f-4689-bdb6-1ed73a8246fd/w_dpcpp-cpp-compiler_p_2024.2.0.491_offline.exe", "dpcpp_installer.exe") -echo "Unpacking DPC++ installer" -Start-Process ".\dpcpp_installer.exe" -ArgumentList "--s --x --f oneAPI" -Wait -echo "Installing DPC++ compiler" -# Installing the compiler can take upwards of 20 minutes -# It does not print any messages during installation -Start-Process ".\oneAPI\bootstrapper.exe" -ArgumentList "-s --eula=accept --install-dir=dpcpp" -Wait -echo "remove installer files" -Remove-Item -LiteralPath .\oneAPI -Force -Recurse -ErrorAction Ignore -Remove-Item .\dpcpp_installer.exe -Force -echo "DPC++ install complete" From 8cc5a8889f0b844cb21171358aa3fcb16a9a2f7e Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:17:46 +0200 Subject: [PATCH 09/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 4f8528d4c11..748c66e7397 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -31,7 +31,6 @@ env: jobs: build_lnx: name: oneDAL Linux nightly build - if: github.repository == 'oneapi-src/oneDAL' runs-on: ubuntu-22.04 timeout-minutes: 120 @@ -64,7 +63,6 @@ jobs: build_win: name: oneDAL Windows nightly build - if: github.repository == 'oneapi-src/oneDAL' runs-on: windows-2022 timeout-minutes: 120 From 8843393cc25647293a8ca990f4332771a90b18b4 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:53:02 +0200 Subject: [PATCH 10/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index 4d3ad1916b7..f55b6a41407 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -23,6 +23,8 @@ set URL=%1 if "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2) if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3) +echo %DIRECTORY% + curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log del %TEMP%\webimage.exe From c75c7d76de3aa121ad758a8edd6d2225e15f5576 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 10:55:37 +0200 Subject: [PATCH 11/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index f55b6a41407..fd680b07d3b 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -23,7 +23,9 @@ set URL=%1 if "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2) if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3) +echo test echo %DIRECTORY% +echo test curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log From ca01b99ee330418e90d48bb4db1b5f56c5a9f212 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 11:05:26 +0200 Subject: [PATCH 12/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index fd680b07d3b..23c3b3e0e42 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -1,4 +1,3 @@ -@echo off rem ============================================================================ rem Copyright contributors to the oneDAL project rem @@ -30,7 +29,7 @@ echo test curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log del %TEMP%\webimage.exe -webimage_extracted\bootstrapper.exe -s --action install --components=%COMPONENTS% --eula=accept --install-dir=%DIRECTORY% -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. +webimage_extracted\bootstrapper.exe -s --action install --components %COMPONENTS% --eula accept --install-dir %DIRECTORY% -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. set installer_exit_code=%ERRORLEVEL% rd /s/q "webimage_extracted" exit /b %installer_exit_code% From 984c8a68c27186907ce3ac28eed92ea49b9f16d2 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 11:15:14 +0200 Subject: [PATCH 13/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index 23c3b3e0e42..1d5475aa6f9 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -1,3 +1,4 @@ +@echo on rem ============================================================================ rem Copyright contributors to the oneDAL project rem From d46f55ba94b1a2974d63757909a69ff448908a8c Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 11:23:10 +0200 Subject: [PATCH 14/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 748c66e7397..311ece5f7a4 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -78,6 +78,8 @@ jobs: - name: Install DPC++ shell: cmd run: | + @echo on + echo hello call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ - name: Prepare Intel OpenCL CPU runtime run: | From 25e65078b503575957184e37a9009696a933e857 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 12:57:31 +0200 Subject: [PATCH 15/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 311ece5f7a4..4f8528d4c11 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -31,6 +31,7 @@ env: jobs: build_lnx: name: oneDAL Linux nightly build + if: github.repository == 'oneapi-src/oneDAL' runs-on: ubuntu-22.04 timeout-minutes: 120 @@ -63,6 +64,7 @@ jobs: build_win: name: oneDAL Windows nightly build + if: github.repository == 'oneapi-src/oneDAL' runs-on: windows-2022 timeout-minutes: 120 @@ -78,8 +80,6 @@ jobs: - name: Install DPC++ shell: cmd run: | - @echo on - echo hello call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ - name: Prepare Intel OpenCL CPU runtime run: | From f58d10f1c31c6770ea8beb93b14f89119812454c Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 13:08:50 +0200 Subject: [PATCH 16/30] Update ci.yml --- .ci/pipeline/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index c19a367a1b6..d2148d698d4 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -668,7 +668,7 @@ jobs: pool: vmImage: 'windows-2022' steps: - - script: .ci/scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS) + - script: .ci/scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS) .\oneapi\ displayName: Install oneAPI Base Toolkit - script: | set PATH=C:\msys64\usr\bin;%PATH% @@ -676,17 +676,14 @@ jobs: pacman -S -y --noconfirm zip dos2unix tree displayName: 'pacman' - script: | - set PATH=C:\msys64\usr\bin;%PATH% + call .\oneapi\setvars.bat --force + set MKL_FPK_GPU_VERSION_LINE=2024.0.0 bash .ci/scripts/describe_system.sh displayName: 'System info' - script: | - call C:\temp\oneapi\setvars.bat --force - set MKL_FPK_GPU_VERSION_LINE=2024.0.0 .\.ci\scripts\build.bat daal vc avx2 displayName: 'make daal' - script: | - call C:\temp\oneapi\setvars.bat --force - set MKL_FPK_GPU_VERSION_LINE=2024.0.0 .\.ci\scripts\build.bat onedal_c vc avx2 displayName: 'make onedal_c' - task: PublishPipelineArtifact@1 @@ -696,12 +693,10 @@ jobs: displayName: 'Upload build artifacts' continueOnError: true - script: | - call C:\temp\oneapi\setvars.bat --force .\.ci\scripts\test.bat daal\cpp lib msvs cmake .\.ci\scripts\test.bat daal\cpp dll msvs cmake displayName: 'daal/cpp examples' - script: | - call C:\temp\oneapi\setvars.bat --force .\.ci\scripts\test.bat oneapi\cpp lib msvs cmake .\.ci\scripts\test.bat oneapi\cpp dll msvs cmake displayName: 'oneapi/cpp examples' From 45606dfc94871e1ad2d0427791b5eed322a90620 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 13:10:22 +0200 Subject: [PATCH 17/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index 1d5475aa6f9..64908e36bba 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -1,4 +1,4 @@ -@echo on +@echo off rem ============================================================================ rem Copyright contributors to the oneDAL project rem From 80fc0baf9ef13acec2a279bcffd7171ef9d565cf Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 14:19:09 +0200 Subject: [PATCH 18/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 4f8528d4c11..0134ef8e22b 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -95,12 +95,14 @@ jobs: - name: Make daal shell: cmd run: | - call .\oneapi\setvars.bat + call .\oneapi\tbb\latest\bin\vars.bat + call .\oneapi\mkl\latest\bin\vars.bat call .\.ci\scripts\build.bat daal vc avx2 - name: Make onedal shell: cmd run: | - call .\oneapi\setvars.bat + call .\oneapi\tbb\latest\bin\vars.bat + call .\oneapi\mkl\latest\bin\vars.bat call .\.ci\scripts\build.bat onedal_c vc avx2 - name: Make oneapi_dpc shell: cmd From 98b1ae532e7867b6d472ccaf4f5aa237cda41ae9 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 14:35:31 +0200 Subject: [PATCH 19/30] Update ci.yml --- .ci/pipeline/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index d2148d698d4..6b3fbf20bbc 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -665,6 +665,7 @@ jobs: variables: release.dir: '__release_win_vc' platform.type : 'win32e' + MKL_FPK_GPU_VERSION_LINE : 2024.0.0 pool: vmImage: 'windows-2022' steps: @@ -677,13 +678,14 @@ jobs: displayName: 'pacman' - script: | call .\oneapi\setvars.bat --force - set MKL_FPK_GPU_VERSION_LINE=2024.0.0 bash .ci/scripts/describe_system.sh displayName: 'System info' - script: | + call .\oneapi\setvars.bat --force .\.ci\scripts\build.bat daal vc avx2 displayName: 'make daal' - script: | + call .\oneapi\setvars.bat --force .\.ci\scripts\build.bat onedal_c vc avx2 displayName: 'make onedal_c' - task: PublishPipelineArtifact@1 From fc279cf0a83a916558a49844eb47c6cb6d7b8250 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 16:27:15 +0200 Subject: [PATCH 20/30] Update build.bat --- .ci/scripts/build.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/scripts/build.bat b/.ci/scripts/build.bat index 2f460df60c4..d70857f184b 100644 --- a/.ci/scripts/build.bat +++ b/.ci/scripts/build.bat @@ -29,15 +29,15 @@ echo pacman -S --noconfirm msys/make msys/dos2unix pacman -S --noconfirm msys/make msys/dos2unix IF "%VS_VER%"=="2017_build_tools" ( - @call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" + @call C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat echo "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" ) ELSE ( IF "%VS_VER%"=="2019_build_tools" ( - @call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" + @call C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" ) ELSE ( - @call "C:\temp\oneapi\setvars-vcvarsall.bat" %VS_VER% - echo "C:\temp\oneapi\setvars-vcvarsall.bat" %VS_VER% + @call %ONEAPI_ROOT%\setvars-vcvarsall.bat %VS_VER% + echo "%ONEAPI_ROOT%\setvars-vcvarsall.bat" %VS_VER% ) ) From 4ccf2b4b78443b27d87592effc4bd428f03beeb9 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 16:47:36 +0200 Subject: [PATCH 21/30] Update build.bat --- .ci/scripts/build.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/scripts/build.bat b/.ci/scripts/build.bat index d70857f184b..aab716b40e0 100644 --- a/.ci/scripts/build.bat +++ b/.ci/scripts/build.bat @@ -29,14 +29,14 @@ echo pacman -S --noconfirm msys/make msys/dos2unix pacman -S --noconfirm msys/make msys/dos2unix IF "%VS_VER%"=="2017_build_tools" ( - @call C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat + @call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" echo "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" ) ELSE ( IF "%VS_VER%"=="2019_build_tools" ( - @call C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat + @call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" ) ELSE ( - @call %ONEAPI_ROOT%\setvars-vcvarsall.bat %VS_VER% + @call "%ONEAPI_ROOT%\setvars-vcvarsall.bat" %VS_VER% echo "%ONEAPI_ROOT%\setvars-vcvarsall.bat" %VS_VER% ) ) From da859511f651afe440ae767568e998f80fa13a81 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 16:50:04 +0200 Subject: [PATCH 22/30] Update nightly-build.yml --- .github/workflows/nightly-build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 0134ef8e22b..4f8528d4c11 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -95,14 +95,12 @@ jobs: - name: Make daal shell: cmd run: | - call .\oneapi\tbb\latest\bin\vars.bat - call .\oneapi\mkl\latest\bin\vars.bat + call .\oneapi\setvars.bat call .\.ci\scripts\build.bat daal vc avx2 - name: Make onedal shell: cmd run: | - call .\oneapi\tbb\latest\bin\vars.bat - call .\oneapi\mkl\latest\bin\vars.bat + call .\oneapi\setvars.bat call .\.ci\scripts\build.bat onedal_c vc avx2 - name: Make oneapi_dpc shell: cmd From 1faae950b09c7c733e76fb257b0f51fddbe7b41f Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 16:52:41 +0200 Subject: [PATCH 23/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index 64908e36bba..e42fb0e30dd 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -23,10 +23,6 @@ set URL=%1 if "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2) if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3) -echo test -echo %DIRECTORY% -echo test - curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log del %TEMP%\webimage.exe From 55978ae8128f6ef6226011e15b645cebd91c647c Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 16:56:40 +0200 Subject: [PATCH 24/30] Update ci.yml --- .ci/pipeline/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index 6b3fbf20bbc..7e644a3182a 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -685,7 +685,7 @@ jobs: .\.ci\scripts\build.bat daal vc avx2 displayName: 'make daal' - script: | - call .\oneapi\setvars.bat --force + call .\oneapi\setvars.bat --force .\.ci\scripts\build.bat onedal_c vc avx2 displayName: 'make onedal_c' - task: PublishPipelineArtifact@1 From 0d17de3570df57cf9e547256c0e0e996a99c7dd7 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 20:44:33 +0200 Subject: [PATCH 25/30] Update ci.yml --- .ci/pipeline/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index 7e644a3182a..df83296d8a9 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -30,7 +30,7 @@ variables: 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_DPCPP_COMPONENTS: 'intel.oneapi.win.cpp-dpcpp-common:intel.oneapi.win.mkl.devel:intel.oneapi.win.tbb.devel' + WINDOWS_DPCPP_COMPONENTS: 'intel.oneapi.win.mkl.devel:intel.oneapi.win.tbb.devel' jobs: - job: 'FormatterChecks' From f5f890a7ad1a272eb1d0fee9018fc3cd2d4e58df Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 22:38:56 +0200 Subject: [PATCH 26/30] Update install_windows.bat --- .ci/scripts/install_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_windows.bat index e42fb0e30dd..e4f04e81189 100644 --- a/.ci/scripts/install_windows.bat +++ b/.ci/scripts/install_windows.bat @@ -21,7 +21,7 @@ rem %3 - install directory (default: C:\temp\oneapi\) set URL=%1 if "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2) -if "%3"=="" (set DIRECTORY=C:\temp\oneapi\) else (set DIRECTORY=%3) +if "%3"=="" (set DIRECTORY=%TEMP%\oneapi\) else (set DIRECTORY=%3) curl.exe --output %TEMP%\webimage.exe --url %URL% --retry 5 --retry-delay 5 start /b /wait %TEMP%\webimage.exe -s -x -f webimage_extracted --log extract.log From 00eb09662a2897f8dd280a931d0a721712785192 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 22:40:35 +0200 Subject: [PATCH 27/30] Update ci.yml --- .ci/pipeline/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index df83296d8a9..10cd169fd78 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -669,7 +669,7 @@ jobs: pool: vmImage: 'windows-2022' steps: - - script: .ci/scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS) .\oneapi\ + - script: .ci/scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS) displayName: Install oneAPI Base Toolkit - script: | set PATH=C:\msys64\usr\bin;%PATH% @@ -677,15 +677,15 @@ jobs: pacman -S -y --noconfirm zip dos2unix tree displayName: 'pacman' - script: | - call .\oneapi\setvars.bat --force + call %TEMP%\oneapi\setvars.bat --force bash .ci/scripts/describe_system.sh displayName: 'System info' - script: | - call .\oneapi\setvars.bat --force + call %TEMP%\oneapi\setvars.bat --force .\.ci\scripts\build.bat daal vc avx2 displayName: 'make daal' - script: | - call .\oneapi\setvars.bat --force + call %TEMP%\oneapi\setvars.bat --force .\.ci\scripts\build.bat onedal_c vc avx2 displayName: 'make onedal_c' - task: PublishPipelineArtifact@1 From 5601681241b8fb7d19db291f99b52dd00305dfc0 Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 22:43:08 +0200 Subject: [PATCH 28/30] Update test.bat --- .ci/scripts/test.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/scripts/test.bat b/.ci/scripts/test.bat index a2ef555a66f..0a704e25768 100644 --- a/.ci/scripts/test.bat +++ b/.ci/scripts/test.bat @@ -44,8 +44,8 @@ IF "%VS_VER%"=="2017_build_tools" ( @call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" ) ELSE ( - @call "C:\temp\oneapi\setvars-vcvarsall.bat" %VS_VER% - echo "C:\temp\oneapi\setvars-vcvarsall.bat" %VS_VER% + @call "%ONEAPI_ROOT%\setvars-vcvarsall.bat" %VS_VER% + echo "%ONEAPI_ROOT%\setvars-vcvarsall.bat" %VS_VER% ) ) From cbecea5354a74e8727fdc0b60d6c1e26a5344d4d Mon Sep 17 00:00:00 2001 From: Ian Faust Date: Fri, 27 Sep 2024 22:45:35 +0200 Subject: [PATCH 29/30] Update ci.yml --- .ci/pipeline/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index 10cd169fd78..fd7edb5138b 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -695,10 +695,12 @@ jobs: displayName: 'Upload build artifacts' continueOnError: true - script: | + call %TEMP%\oneapi\setvars.bat --force .\.ci\scripts\test.bat daal\cpp lib msvs cmake .\.ci\scripts\test.bat daal\cpp dll msvs cmake displayName: 'daal/cpp examples' - script: | + call %TEMP%\oneapi\setvars.bat --force .\.ci\scripts\test.bat oneapi\cpp lib msvs cmake .\.ci\scripts\test.bat oneapi\cpp dll msvs cmake displayName: 'oneapi/cpp examples' From e217570e17788f8e29a388f58129f2c3f197c60b Mon Sep 17 00:00:00 2001 From: icfaust Date: Mon, 30 Sep 2024 01:15:48 -0700 Subject: [PATCH 30/30] install_windows -> install_basekit --- .ci/pipeline/ci.yml | 2 +- .ci/scripts/{install_windows.bat => install_basekit.bat} | 0 .github/workflows/nightly-build.yml | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename .ci/scripts/{install_windows.bat => install_basekit.bat} (100%) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index fd7edb5138b..97078720971 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -669,7 +669,7 @@ jobs: pool: vmImage: 'windows-2022' steps: - - script: .ci/scripts/install_windows.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS) + - script: .ci/scripts/install_basekit.bat $(WINDOWS_BASEKIT_URL) $(WINDOWS_DPCPP_COMPONENTS) displayName: Install oneAPI Base Toolkit - script: | set PATH=C:\msys64\usr\bin;%PATH% diff --git a/.ci/scripts/install_windows.bat b/.ci/scripts/install_basekit.bat similarity index 100% rename from .ci/scripts/install_windows.bat rename to .ci/scripts/install_basekit.bat diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 4f8528d4c11..7802a4bd541 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -80,7 +80,7 @@ jobs: - name: Install DPC++ shell: cmd run: | - call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }} .\oneapi\ + call .\.ci\scripts\install_basekit.bat ${{ env.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