diff --git a/.ci/env/apt.sh b/.ci/env/apt.sh index d5ca5a3f48e..33d53adfc21 100755 --- a/.ci/env/apt.sh +++ b/.ci/env/apt.sh @@ -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 { diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index 7e5dd244c21..2e9da929e93 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -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 @@ -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: | @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.ci/scripts/build.sh b/.ci/scripts/build.sh index f9c25245483..0a62509c3a2 100755 --- a/.ci/scripts/build.sh +++ b/.ci/scripts/build.sh @@ -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