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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 28, 2024
Merged

Update oneAPI components versions in CI #2958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70645ef
Update oneAPI components versions in CI
Alexsandruss Oct 25, 2024
a7e5a9c
Update oneTBB to 2022.0.0-rc1
Alexsandruss Oct 25, 2024
8f604f1
Enable tbb 2022 from intel debian channel
Alexsandruss Oct 25, 2024
96ecf97
Apply tbb installation to correct configs
Alexsandruss Oct 25, 2024
8983713
Fix bash syntax error
Alexsandruss Oct 25, 2024
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
View file
Open in desktop
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 intel-oneapi-tbb-devel-2022.0
}

function install_clang-format {
Expand Down
24 changes: 14 additions & 10 deletions .ci/pipeline/ci.yml
View file
Open in desktop
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 Expand Up @@ -603,7 +606,7 @@ jobs:
displayName: 'System info'
- script: |
conda update -y -q conda
conda create -q -y -n CB -c conda-forge python=$(python.version) tbb mpich
conda create -q -y -n CB -c conda-forge python=$(python.version) mpich
displayName: 'Conda create'
- script: |
git clone https://github.com/intel/scikit-learn-intelex.git sklearnex
Expand All @@ -613,6 +616,7 @@ jobs:
conda activate CB
pip install -r sklearnex/dependencies-dev
pip install -r sklearnex/requirements-test.txt
pip install tbb==2022.*
displayName: Create python environment
- script: |
source /usr/share/miniconda/etc/profile.d/conda.sh
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ fi
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
elif [ "${ARCH}" == "32e" ] && [ "${backend_config}" == "ref" ]; then
"${ONEDAL_DIR}"/dev/download_tbb.sh
elif [[ "${ARCH}" == "arm" || ("${ARCH}" == "riscv64") ]]; then
if [[ "${ARCH}" == "arm" ]] ; then
Expand Down
Loading