Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update oneAPI components versions in CI #2958

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/env/apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ function add_repo {
}

function install_dpcpp {
sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp intel-oneapi-runtime-libs
sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-2025.0 intel-oneapi-runtime-libs=2025.0.0-406
}

function install_mkl {
sudo apt-get install -y intel-oneapi-mkl-devel=2024.2.1-103
sudo apt-get install -y intel-oneapi-mkl-devel-2025.0
}

function install_clang-format {
Expand Down
2 changes: 1 addition & 1 deletion .ci/env/tbb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set -eo pipefail
SCRIPT_PATH=$(readlink -f "${BASH_SOURCE[0]}")
SCRIPT_DIR=$(dirname "${SCRIPT_PATH}")
ONEDAL_DIR=$(readlink -f "${SCRIPT_DIR}/../..")
TBB_DEFAULT_VERSION="v2021.10.0"
TBB_DEFAULT_VERSION="v2022.0.0-rc1"

# Function to display help
show_help() {
Expand Down
21 changes: 12 additions & 9 deletions .ci/pipeline/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,15 @@ jobs:
.ci/env/apt.sh mkl
displayName: 'mkl installation'
- script: |
source /opt/intel/oneapi/setvars.sh
.ci/scripts/describe_system.sh
displayName: 'System info'
- script: |
source /opt/intel/oneapi/setvars.sh
.ci/scripts/build.sh --compiler gnu --optimizations avx2 --target daal --conda-env ci-env
displayName: 'make daal'
- script: |
source /opt/intel/oneapi/setvars.sh
.ci/scripts/build.sh --compiler gnu --optimizations avx2 --target onedal_c
displayName: 'make onedal_c'
- task: PublishPipelineArtifact@1
Expand All @@ -80,12 +83,15 @@ jobs:
displayName: 'Upload build artifacts'
continueOnError: true
- script: |
source /opt/intel/oneapi/setvars.sh
.ci/scripts/test.sh --test-kind examples --build-dir $(release.dir) --compiler gnu --interface daal/cpp --build-system cmake
displayName: 'daal/cpp examples'
- script: |
source /opt/intel/oneapi/setvars.sh
.ci/scripts/test.sh --test-kind examples --build-dir $(release.dir) --compiler gnu --interface oneapi/cpp --build-system cmake
displayName: 'oneapi/cpp examples'
- script: |
source /opt/intel/oneapi/setvars.sh
.ci/scripts/test.sh --test-kind samples --build-dir $(release.dir) --compiler gnu --interface daal/cpp/mpi --conda-env ci-env --build-system cmake
displayName: 'daal/cpp/mpi samples'
- script: |
Expand Down Expand Up @@ -425,15 +431,15 @@ jobs:
.ci/env/apt.sh mkl
displayName: 'mkl installation'
- script: |
source /opt/intel/oneapi/compiler/latest/env/vars.sh
source /opt/intel/oneapi/setvars.sh
.ci/scripts/describe_system.sh
displayName: 'System info'
- script: |
source /opt/intel/oneapi/compiler/latest/env/vars.sh
source /opt/intel/oneapi/setvars.sh
.ci/scripts/build.sh --compiler icx --optimizations avx2 --target daal --conda-env ci-env
displayName: 'make daal'
- script: |
source /opt/intel/oneapi/compiler/latest/env/vars.sh
source /opt/intel/oneapi/setvars.sh
.ci/scripts/build.sh --compiler icx --optimizations avx2 --target onedal_dpc
displayName: 'make onedal_dpc'
- task: PublishPipelineArtifact@1
Expand All @@ -443,18 +449,15 @@ jobs:
displayName: 'Upload build artifacts'
continueOnError: true
- script: |
source /opt/intel/oneapi/compiler/latest/env/vars.sh
source /opt/intel/oneapi/mkl/latest/env/vars.sh
source /opt/intel/oneapi/setvars.sh
.ci/scripts/test.sh --test-kind examples --build-dir $(release.dir) --compiler clang --interface daal/cpp --build-system cmake
displayName: 'daal/cpp examples'
- script: |
source /opt/intel/oneapi/compiler/latest/env/vars.sh
source /opt/intel/oneapi/mkl/latest/env/vars.sh
source /opt/intel/oneapi/setvars.sh
.ci/scripts/test.sh --test-kind examples --build-dir $(release.dir) --compiler clang --interface oneapi/cpp --build-system cmake
displayName: 'oneapi/cpp examples'
- script: |
source /opt/intel/oneapi/compiler/latest/env/vars.sh
source /opt/intel/oneapi/mkl/latest/env/vars.sh
source /opt/intel/oneapi/setvars.sh
.ci/scripts/test.sh --test-kind samples --build-dir $(release.dir) --compiler gnu --interface daal/cpp/mpi --conda-env ci-env --build-system cmake
displayName: 'daal/cpp/mpi samples'
- task: PublishPipelineArtifact@1
Expand Down
3 changes: 2 additions & 1 deletion .ci/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ if [[ ! -z "${TBB_INSTALL_DIR}" ]] ; then
export TBBROOT="${TBB_INSTALL_DIR}"
export LD_LIBRARY_PATH="${TBBROOT}/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
elif [[ "${ARCH}" == "32e" ]]; then
"${ONEDAL_DIR}"/dev/download_tbb.sh
# "${ONEDAL_DIR}"/dev/download_tbb.sh
sudo apt-get install -y intel-oneapi-tbb-devel-2022.0
elif [[ "${ARCH}" == "arm" || ("${ARCH}" == "riscv64") ]]; then
if [[ "${ARCH}" == "arm" ]] ; then
ARCH_STR=aarch64
Expand Down
Loading