minor fix for dpl from toolkit

uxlfoundation · Jan 22, 2025 · ab367c0 · ab367c0
1 parent 2a91928
commit ab367c0
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 13 deletions.
diff --git a/.ci/env/apt.sh b/.ci/env/apt.sh
@@ -43,10 +43,6 @@ function install_mkl {
     install_tbb
 }
 
-function install_dpl {
-    sudo apt-get install -y onedpl-devel
-}
-
 function install_clang-format {
     sudo apt-get install -y clang-format-14
 }
@@ -112,9 +108,6 @@ elif [ "${component}" == "tbb" ]; then
 elif [ "${component}" == "mkl" ]; then
     add_repo
     install_mkl
-elif [ "${component}" == "dpl" ]; then
-    add_repo
-    install_dpl
 elif [ "${component}" == "gnu-cross-compilers" ]; then
     update
     install_gnu-cross-compilers "$2"

diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml
@@ -30,6 +30,8 @@ variables:
   SYSROOT_OS: 'jammy'
   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:intel.oneapi.win.dpl'
+  LINUX_BASEKIT_URL: 'https://registrationcenter-download.intel.com/akdlm/IRC_NAS/dfc4a434-838c-4450-a6fe-2fa903b75aa7/intel-oneapi-base-toolkit-2025.0.1.46_offline.sh'
+  LINUX_DPCPP_COMPONENTS: 'intel.oneapi.lin.dpl'
 
 resources:
   repositories:
@@ -71,9 +73,9 @@ jobs:
   - script: |
       .ci/env/apt.sh mkl
     displayName: 'mkl installation'
-  - script: |
-      .ci/env/apt.sh dpl
-    displayName: 'dpl installation'
+  - script: 
+      .ci/scripts/install_basekit.bat $(LINUX_BASEKIT_URL) $(LINUX_DPCPP_COMPONENTS)
+    displayName: 'Install oneAPI Base Toolkit'
   - script: |
       source /opt/intel/oneapi/setvars.sh
       .ci/scripts/describe_system.sh
@@ -396,9 +398,9 @@ jobs:
   - script: |
       .ci/env/apt.sh mkl
     displayName: 'mkl installation'
-  - script: |
-      .ci/env/apt.sh dpl
-    displayName: 'dpl installation'
+  - script: 
+      .ci/scripts/install_basekit.bat $(LINUX_BASEKIT_URL) $(LINUX_DPCPP_COMPONENTS)
+    displayName: 'Install oneAPI Base Toolkit'
   - script: |
       source /opt/intel/oneapi/setvars.sh
       .ci/scripts/describe_system.sh

diff --git a/.ci/scripts/install_basekit.sh b/.ci/scripts/install_basekit.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+#===============================================================================
+# Copyright 2025 Intel Corporation
+#
+# 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.
+#===============================================================================
+
+URL=$1
+COMPONENTS=$2
+
+curl --output webimage.sh --url "$URL" --retry 5 --retry-delay 5
+chmod +x webimage.sh
+./webimage.sh -x -f webimage_extracted --log extract.log
+rm -rf webimage.sh
+WEBIMAGE_NAME=$(ls -1 webimage_extracted/)
+if [ -z "$COMPONENTS" ]; then
+  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --eula=accept --log-dir=.
+  installer_exit_code=$?
+else
+  sudo webimage_extracted/"$WEBIMAGE_NAME"/bootstrapper -s --action install --components="$COMPONENTS" --eula=accept --log-dir=.
+  installer_exit_code=$?
+fi
+rm -rf webimage_extracted
+exit $installer_exit_code