From 48cf043adc9cb793e43776d5aa8ec94d6bb6312c Mon Sep 17 00:00:00 2001
From: Ian Faust <icfaust@gmail.com>
Date: Thu, 17 Oct 2024 21:18:14 +0200
Subject: [PATCH] [enhancement] interface with compressed artifacts
 oneapi-src/oneDAL#2938 (#2093)

* Update ci.yml

* Update activate_components.bat

* Update ci.yml

* Update ci.yml
---
 .github/scripts/activate_components.bat |  8 +++-----
 .github/workflows/ci.yml                | 27 +++++++++++--------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/scripts/activate_components.bat b/.github/scripts/activate_components.bat
index 6d2e9427c6..0f1d0d5453 100644
--- a/.github/scripts/activate_components.bat
+++ b/.github/scripts/activate_components.bat
@@ -15,15 +15,13 @@ rem See the License for the specific language governing permissions and
 rem limitations under the License.
 rem ============================================================================
 
-rem %1 - dpcpp compiler version
-rem %2 - tbb version
-rem %3 - dpcpp activate flag
+rem %1 - dpcpp activate flag
 
 rem prepare vc
 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall" x64
 rem prepare icx only if no parameter is given.
-if "%3"=="" call .\oneapi\compiler\%1\env\vars.bat
+if "%1"=="" call .\oneapi\compiler\latest\env\vars.bat
 rem prepare tbb
-call .\oneapi\tbb\%2\env\vars.bat
+call .\oneapi\tbb\latest\env\vars.bat
 rem prepare oneDAL
 call .\__release_win\daal\latest\env\vars.bat
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd5a059c5e..0c3af1ec90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,8 +28,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  TBB_VERSION: 2021.13
-  DPCPP_VERSION: 2024.2
   DPCTL_VERSION: 0.17.0
   DPNP_VERSION: 0.15.0
   DPCTL_PY_VERSIONS: '3.9\|3.11'
@@ -168,19 +166,18 @@ jobs:
           github-token: ${{ github.token }}
           repository: oneapi-src/oneDAL
           run-id: ${{ steps.get-run-id.outputs.run-id }}
-          path: .\__release_win
-      - name: Download DPCPP compiler artifact
+          path: ./__release_win
+      - name: Download Intel BaseKit artifact
         uses: actions/download-artifact@v4
         with:
-          name: icx_compiler
+          name: intel_oneapi_basekit
           github-token: ${{ github.token }}
           repository: oneapi-src/oneDAL
           run-id: ${{ steps.get-run-id.outputs.run-id }}
-          path: .
-      - name: Unzip Compiler
+      - name: Decompress Intel BaseKit
         shell: cmd
         run: |
-          tar -xvzf icx.zip
+          tar -xvzf oneapi.tar.gz
           echo "Unzip complete"
       - name: Set Environment Variables
         id: set-env
@@ -219,14 +216,14 @@ jobs:
         shell: cmd
         run: |
           call .\venv\Scripts\activate.bat
-          call .\oneapi\compiler\${{ env.DPCPP_VERSION }}\env\vars.bat
-          call .\oneapi\compiler\${{ env.DPCPP_VERSION }}\bin\sycl-ls.exe
+          call .\oneapi\setvars.bat
+          call .\oneapi\compiler\latest\bin\sycl-ls.exe
           bash .ci/scripts/describe_system.sh
       - name: Build daal4py/sklearnex
         shell: cmd
         run: |
           call .\venv\Scripts\activate.bat
-          call .\.github\scripts\activate_components.bat ${{ env.DPCPP_VERSION }} ${{ env.TBB_VERSION }} ${{ steps.set-env.outputs.DPCFLAG }}
+          call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
           set PREFIX=.
           set PYTHON=python
           call .\conda-recipe\bld.bat
@@ -234,7 +231,7 @@ jobs:
         shell: cmd
         run: |
           call .\venv\Scripts\activate.bat
-          call .\.github\scripts\activate_components.bat ${{ env.DPCPP_VERSION }} ${{ env.TBB_VERSION }} ${{ steps.set-env.outputs.DPCFLAG }}
+          call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
           bash .ci/scripts/setup_sklearn.sh ${{ matrix.SKLEARN_VERSION }}
           pip install --upgrade -r requirements-test.txt
           for /f "delims=" %%c in ('python .ci\scripts\get_compatible_scipy_version.py ${{ matrix.SKLEARN_VERSION }}') do set SCIPY_VERSION=%%c
@@ -245,7 +242,7 @@ jobs:
         shell: cmd
         run: |
           call .\venv\Scripts\activate.bat
-          call .\.github\scripts\activate_components.bat ${{ env.DPCPP_VERSION }} ${{ env.TBB_VERSION }} ${{ steps.set-env.outputs.DPCFLAG }}
+          call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
           set PYTHON=python
           cd ..
           call scikit-learn-intelex\conda-recipe\run_test.bat scikit-learn-intelex
@@ -253,12 +250,12 @@ jobs:
         shell: cmd
         run: |
           call .\venv\Scripts\activate.bat
-          call .\.github\scripts\activate_components.bat ${{ env.DPCPP_VERSION }} ${{ env.TBB_VERSION }} ${{ steps.set-env.outputs.DPCFLAG }}
+          call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
           bash .ci/scripts/run_sklearn_tests.sh
       - name: Sklearn testing [preview]
         shell: cmd
         run: |
           call .\venv\Scripts\activate.bat
-          call .\.github\scripts\activate_components.bat ${{ env.DPCPP_VERSION }} ${{ env.TBB_VERSION }} ${{ steps.set-env.outputs.DPCFLAG }}
+          call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
           set SKLEARNEX_PREVIEW=YES
           bash .ci/scripts/run_sklearn_tests.sh