From f58d10f1c31c6770ea8beb93b14f89119812454c Mon Sep 17 00:00:00 2001
From: Ian Faust <icfaust@gmail.com>
Date: Fri, 27 Sep 2024 13:08:50 +0200
Subject: [PATCH] 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'