Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/uxlfoundation/oneDAL into u…
Browse files Browse the repository at this point in the history
…xlfoundation-main
  • Loading branch information
Vika-F committed Dec 18, 2024
2 parents 7985c6b + f077d53 commit 0563591
Show file tree
Hide file tree
Showing 478 changed files with 5,788 additions and 6,512 deletions.
12 changes: 10 additions & 2 deletions .ci/env/apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,13 @@ function install_dpcpp {
sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-2025.0 intel-oneapi-runtime-libs=2025.0.0-406
}

function install_tbb {
sudo apt-get install -y intel-oneapi-tbb-devel-2022.0
}

function install_mkl {
sudo apt-get install -y intel-oneapi-mkl-devel-2025.0 intel-oneapi-tbb-devel-2022.0
sudo apt-get install -y intel-oneapi-mkl-devel-2025.0
install_tbb
}

function install_clang-format {
Expand Down Expand Up @@ -97,6 +102,9 @@ function build_sysroot {
if [ "${component}" == "dpcpp" ]; then
add_repo
install_dpcpp
elif [ "${component}" == "tbb" ]; then
add_repo
install_tbb
elif [ "${component}" == "mkl" ]; then
add_repo
install_mkl
Expand Down Expand Up @@ -126,6 +134,6 @@ elif [ "${component}" == "build-sysroot" ] ; then
build_sysroot "$2" "$3" "$4" "$5"
else
echo "Usage:"
echo " $0 [dpcpp|mkl|gnu-cross-compilers|clang-format|dev-base|qemu-apt|qemu-deb|llvm-version|build-sysroot]"
echo " $0 [dpcpp|tbb|mkl|gnu-cross-compilers|clang-format|dev-base|qemu-apt|qemu-deb|llvm-version|build-sysroot]"
exit 1
fi
2 changes: 1 addition & 1 deletion .ci/env/openblas.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SCRIPT_PATH=$(readlink -f "${BASH_SOURCE[0]}")
SCRIPT_DIR=$(dirname "${SCRIPT_PATH}")
ONEDAL_DIR=$(readlink -f "${SCRIPT_DIR}/../..")
OPENBLAS_DEFAULT_SOURCE_DIR="${ONEDAL_DIR}/__work/openblas"
BLAS_DEFAULT_VERSION="v0.3.27"
BLAS_DEFAULT_VERSION="v0.3.28"

show_help() {
echo "Usage: $0 [--help]"
Expand Down
2 changes: 1 addition & 1 deletion .ci/env/tbb.bat
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rem ============================================================================
rem req: PowerShell 3.0+
powershell.exe -command "if ($PSVersionTable.PSVersion.Major -ge 3) {exit 1} else {Write-Host \"The script requires PowerShell 3.0 or above (current version: $($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor))\"}" && goto Error_load

set TBBURLROOT=https://github.com/oneapi-src/oneTBB/releases/download/v2021.5.0/
set TBBURLROOT=https://github.com/uxlfoundation/oneTBB/releases/download/v2021.5.0/
set TBBVERSION=oneapi-tbb-2021.5.0
set TBBPACKAGE=%TBBVERSION%-win

Expand Down
2 changes: 1 addition & 1 deletion .ci/env/tbb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ sudo apt-get install build-essential gcc gfortran cmake -y
tbb_src=${tbb_src:-${ONEDAL_DIR}/__work/onetbb-src}
if [[ ! -d "${tbb_src}" ]] ; then
TBB_VERSION="${TBB_VERSION:-${TBB_DEFAULT_VERSION}}"
git clone --depth 1 --branch "${TBB_VERSION}" https://github.com/oneapi-src/oneTBB.git "${tbb_src}"
git clone --depth 1 --branch "${TBB_VERSION}" https://github.com/uxlfoundation/oneTBB.git "${tbb_src}"
fi

rm -rf "${tbb_prefix}"
Expand Down
96 changes: 34 additions & 62 deletions .ci/pipeline/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ variables:
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'

resources:
repositories:
- repository: sklearnex
type: github
name: uxlfoundation/scikit-learn-intelex
ref: main
endpoint: intel-daal-connection

jobs:
- job: 'FormatterChecks'
pool:
Expand Down Expand Up @@ -81,6 +89,12 @@ jobs:
targetPath: '$(Build.Repository.LocalPath)/$(release.dir)'
displayName: 'Upload build artifacts'
continueOnError: true
- task: PublishPipelineArtifact@1
inputs:
artifactName: 'oneDAL environment'
targetPath: '$(Build.Repository.LocalPath)/.ci/env'
displayName: 'Upload environment 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
Expand Down Expand Up @@ -582,83 +596,41 @@ jobs:
timeoutInMinutes: 0
variables:
release.dir: '__release_lnx_gnu'
platform.type : 'lnx32e'
platform.type: 'lnx32e'
DALROOT: '$(Pipeline.Workspace)/daal/latest'
TBBROOT: '/opt/intel/oneapi/tbb/latest'
NO_DPC: 1
NO_DIST: 1
pool:
vmImage: '$(VM_IMAGE)'
maxParallel: 2
strategy:
matrix:
Python311:
python.version: '3.11'
PYTHON_VERSION: '3.11'
SKLEARN_VERSION: '1.5'
steps:
- checkout: none
- script: |
git clone https://github.com/uxlfoundation/scikit-learn-intelex.git .
displayName: 'Clone sklearnex'
- task: DownloadPipelineArtifact@2
inputs:
artifact: 'oneDAL environment'
path: '$(Build.Repository.LocalPath)/.ci/env'
- task: DownloadPipelineArtifact@2
inputs:
artifact: '$(platform.type) build'
path: $(Pipeline.Workspace)
- script: .ci/env/apt.sh dev-base
displayName: 'apt-get'
- script: |
.ci/scripts/describe_system.sh
displayName: 'System info'
- script: |
conda update -y -q conda
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
displayName: Clone sklearnex
- script: |
source /usr/share/miniconda/etc/profile.d/conda.sh
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
conda activate CB
export DALROOT=$(Pipeline.Workspace)/daal/latest
source ${DALROOT}/env/vars.sh
export PREFIX=${CONDA_PREFIX}
cd sklearnex
export PYTHON=python
./conda-recipe/build.sh
displayName: sklearnex build
chmod -R 755 .ci/env
.ci/env/apt.sh tbb
displayName: 'tbb installation'
- template: .ci/pipeline/build-and-test-lnx.yml@sklearnex
- task: PublishPipelineArtifact@1
inputs:
artifactName: '$(platform.type) sklearnex build'
targetPath: '$(Build.Repository.LocalPath)/sklearnex'
displayName: 'Upload sklearnex build artifacts'
continueOnError: true
- script: |
source /usr/share/miniconda/etc/profile.d/conda.sh
conda activate CB
source $(Pipeline.Workspace)/daal/latest/env/vars.sh
./sklearnex/conda-recipe/run_test.sh
timeoutInMinutes: 20
displayName: sklearnex test
- script: |
source /usr/share/miniconda/etc/profile.d/conda.sh
conda activate CB
source $(Pipeline.Workspace)/daal/latest/env/vars.sh
ret_code=0
python -m sklearnex sklearnex/tests/run_examples.py
ret_code=$(($ret_code + $?))
exit $ret_code
displayName: sklearnex examples
- script: |
source /usr/share/miniconda/etc/profile.d/conda.sh
conda activate CB
source $(Pipeline.Workspace)/daal/latest/env/vars.sh
$(Pipeline.Workspace)/s/.ci/scripts/conformance_test.sh --build-dir $(Pipeline.Workspace) --conda-dir $HOME/miniconda --oneapi-dir /opt/intel/oneapi
timeoutInMinutes: 15
displayName: Conformance tests
- task: PublishPipelineArtifact@1
inputs:
artifactName: '$(platform.type) conformance tests report'
targetPath: '$(Pipeline.Workspace)/s/.ci/scripts/conformance-scripts/'
displayName: 'Upload conformance tests artifacts'
continueOnError: true
targetPath: '$(Build.Repository.LocalPath)/build'

- job: 'WindowsMakeVC'
timeoutInMinutes: 0
Expand Down
11 changes: 0 additions & 11 deletions .ci/scripts/conformance-scripts/algorithms.txt

This file was deleted.

73 changes: 0 additions & 73 deletions .ci/scripts/conformance-scripts/download_tests.sh

This file was deleted.

49 changes: 0 additions & 49 deletions .ci/scripts/conformance-scripts/run_tests.py

This file was deleted.

15 changes: 0 additions & 15 deletions .ci/scripts/conformance-scripts/run_tests_with_context.py

This file was deleted.

Loading

0 comments on commit 0563591

Please sign in to comment.