[fix] correct Nightly-build, clean up ci files. (#2920)

* Update nightly-build.yml * Update install_windows.bat * Update nightly-build.yml * Update nightly-build.yml * Update install_windows.bat * Update install_windows.bat * Update nightly-build.yml * Delete .ci/scripts/install_dpc.ps1 * Update nightly-build.yml * Update install_windows.bat * Update install_windows.bat * Update install_windows.bat * Update install_windows.bat * Update nightly-build.yml * Update nightly-build.yml * Update ci.yml * Update install_windows.bat * Update nightly-build.yml * Update ci.yml * Update build.bat * Update build.bat * Update nightly-build.yml * Update install_windows.bat * Update ci.yml * Update ci.yml * Update install_windows.bat * Update ci.yml * Update test.bat * Update ci.yml * install_windows -> install_basekit
uxlfoundation · Sep 30, 2024 · 76d0a1d · 76d0a1d
1 parent f0790c4
commit 76d0a1d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 56 deletions.
diff --git 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'
@@ -665,28 +665,27 @@ jobs:
   variables:
     release.dir: '__release_win_vc'
     platform.type : 'win32e'
+    MKL_FPK_GPU_VERSION_LINE : 2024.0.0
   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%
       pip install cpufeature
       pacman -S -y --noconfirm zip dos2unix tree
     displayName: 'pacman'
   - script: |
-      set PATH=C:\msys64\usr\bin;%PATH%
+      call %TEMP%\oneapi\setvars.bat --force
       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
+      call %TEMP%\oneapi\setvars.bat --force
       .\.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
+      call %TEMP%\oneapi\setvars.bat --force
       .\.ci\scripts\build.bat onedal_c vc avx2
     displayName: 'make onedal_c'
   - task: PublishPipelineArtifact@1
@@ -696,12 +695,12 @@ jobs:
     displayName: 'Upload build artifacts'
     continueOnError: true
   - script: |
-      call C:\temp\oneapi\setvars.bat --force
+      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 C:\temp\oneapi\setvars.bat --force
+      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'

diff --git a/.ci/scripts/build.bat b/.ci/scripts/build.bat
@@ -36,8 +36,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%
     )
 )
 

diff --git a/.ci/scripts/install_windows.bat → .ci/scripts/install_basekit.bat b/.ci/scripts/install_windows.bat → .ci/scripts/install_basekit.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
+if "%2"=="" (set COMPONENTS=default) else (set COMPONENTS=%2)
+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
 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%
diff --git a/.ci/scripts/install_dpc.ps1 b/.ci/scripts/install_dpc.ps1
diff --git 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%
     )
 )
 

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -73,35 +73,40 @@ 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: |
-            call .\.ci\scripts\install_windows.bat ${{ env.WINDOWS_BASEKIT_URL }} ${{ env.WINDOWS_ALL_COMPONENTS }}
+            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
+          & .ci/scripts/collect_opencl_rt.ps1
       - name: System Info
         shell: cmd
         run: |
           set PATH=C:\msys64\usr\bin;%PATH%
           pip install cpufeature
-          call C:\temp\oneapi\setvars.bat
+          call .\oneapi\setvars.bat
           bash .ci/scripts/describe_system.sh
       - name: Make daal
         shell: cmd
         run: |
-          call C:\temp\oneapi\setvars.bat
-          set MKL_FPK_GPU_VERSION_LINE=2024.0.0
+          call .\oneapi\setvars.bat
           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 .\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
-          set MKL_FPK_GPU_VERSION_LINE=2024.0.0
-          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
@@ -111,9 +116,14 @@ 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:
           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