From 6db8afd5b500cf915783312f80f68a0d7f5e0121 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Tue, 1 Jul 2025 08:37:48 -0700 Subject: [PATCH 1/2] Remove separate CI steps for sklearnex preview --- .ci/pipeline/build-and-test-lnx.yml | 13 +------------ .ci/pipeline/build-and-test-mac.yml | 7 +------ .ci/pipeline/build-and-test-win.yml | 12 +----------- .github/workflows/ci.yml | 23 +++-------------------- 4 files changed, 6 insertions(+), 49 deletions(-) diff --git a/.ci/pipeline/build-and-test-lnx.yml b/.ci/pipeline/build-and-test-lnx.yml index e3104fb26e..584ae08bf9 100644 --- a/.ci/pipeline/build-and-test-lnx.yml +++ b/.ci/pipeline/build-and-test-lnx.yml @@ -88,17 +88,6 @@ steps: TBBROOT: ${{ variables.TBBROOT }} COVERAGE_RCFILE: ${{ variables.COVERAGE_RCFILE }} NO_DPC: ${{ variables.NO_DPC }} - displayName: "Sklearn testing" - condition: succeededOrFailed() - - script: | - . /usr/share/miniconda/etc/profile.d/conda.sh - conda activate CB - if [ -n "${TBBROOT}" ] && [ "${TBBROOT}" != "${CONDA_PREFIX}" ]; then source ${TBBROOT}/env/vars.sh; fi - if [ -z "${NO_DPC}" ]; then export CPU="cpu"; fi - bash .ci/scripts/run_sklearn_tests.sh $CPU - env: - TBBROOT: ${{ variables.TBBROOT }} - NO_DPC: ${{ variables.NO_DPC }} SKLEARNEX_PREVIEW: "YES" - displayName: "Sklearn testing [preview]" + displayName: "Sklearn testing" condition: succeededOrFailed() diff --git a/.ci/pipeline/build-and-test-mac.yml b/.ci/pipeline/build-and-test-mac.yml index 030d60f665..1d5d557f1c 100644 --- a/.ci/pipeline/build-and-test-mac.yml +++ b/.ci/pipeline/build-and-test-mac.yml @@ -48,15 +48,10 @@ steps: cd .. ./s/conda-recipe/run_test.sh displayName: 'Sklearnex testing' - - script: | - source activate CB - bash .ci/scripts/run_sklearn_tests.sh - displayName: 'Sklearn testing' - condition: succeededOrFailed() - script: | source activate CB bash .ci/scripts/run_sklearn_tests.sh env: SKLEARNEX_PREVIEW: "YES" - displayName: 'Sklearn testing [preview]' + displayName: 'Sklearn testing' condition: succeededOrFailed() diff --git a/.ci/pipeline/build-and-test-win.yml b/.ci/pipeline/build-and-test-win.yml index 7ba357e7e0..8b894df68f 100644 --- a/.ci/pipeline/build-and-test-win.yml +++ b/.ci/pipeline/build-and-test-win.yml @@ -71,18 +71,8 @@ steps: bash .ci/scripts/run_sklearn_tests.sh displayName: 'Sklearn testing' condition: succeededOrFailed() - env: - COVERAGE_RCFILE: ${{ variables.COVERAGE_RCFILE }} - DALROOT: ${{ variables.DALROOT }} - TBBROOT: ${{ variables.TBBROOT }} - - script: | - call activate CB - if defined DALROOT call "%DALROOT%\env\vars.bat" - if defined TBBROOT call "%TBBROOT%\env\vars.bat" - bash .ci/scripts/run_sklearn_tests.sh env: SKLEARNEX_PREVIEW: "YES" + COVERAGE_RCFILE: ${{ variables.COVERAGE_RCFILE }} DALROOT: ${{ variables.DALROOT }} TBBROOT: ${{ variables.TBBROOT }} - displayName: 'Sklearn testing [preview]' - condition: succeededOrFailed() diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30b1e59e1e..e30a3352ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,6 +154,7 @@ jobs: source venv/bin/activate source .github/scripts/activate_components.sh export COVERAGE_FILE=$(pwd)/.coverage.sklearn + export SKLEARNEX_PREVIEW='YES' if [ "${{ steps.set-env.outputs.DPCFLAG }}" == "" ]; then export CPU=cpu; fi bash .ci/scripts/run_sklearn_tests.sh $CPU - name: Create coverage report @@ -167,13 +168,6 @@ jobs: name: coverage_lnx_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }} path: | *_lnx${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.info - - name: Sklearn testing [preview] - run: | - source venv/bin/activate - source .github/scripts/activate_components.sh - if [ "${{ steps.set-env.outputs.DPCFLAG }}" == "" ]; then export CPU=cpu; fi - export SKLEARNEX_PREVIEW='YES' - bash .ci/scripts/run_sklearn_tests.sh $CPU sklearn_win: needs: onedal_nightly @@ -287,6 +281,7 @@ jobs: call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }} set PYTHON=python set COVERAGE_FILE=%cd%\.coverage.sklearnex + set SKLEARNEX_PREVIEW=YES cd .. call scikit-learn-intelex\conda-recipe\run_test.bat scikit-learn-intelex\ - name: Sklearn testing @@ -309,14 +304,6 @@ jobs: name: coverage_win_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }} path: | *_win${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.info - - name: Sklearn testing [preview] - shell: cmd - run: | - call .\venv\Scripts\activate.bat - call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }} - if "${{ steps.set-env.outputs.DPCFLAG }}"=="" set CPU=cpu - set SKLEARNEX_PREVIEW=YES - bash .ci/scripts/run_sklearn_tests.sh %CPU% build_uxl: if: github.repository == 'uxlfoundation/scikit-learn-intelex' @@ -474,6 +461,7 @@ jobs: run: | source .github/scripts/activate_components.sh export COVERAGE_FILE=$(pwd)/.coverage.sklearnex + export SKLEARNEX_PREVIEW='YES' cd .ci ../conda-recipe/run_test.sh - name: Sklearn testing @@ -491,8 +479,3 @@ jobs: name: coverage_uxl_lnx_${{ matrix.DEVICE }} path: | *uxl_lnx_${{ matrix.DEVICE }}.info - - name: Sklearn testing [preview] - run: | - source .github/scripts/activate_components.sh - export SKLEARNEX_PREVIEW='YES' - bash .ci/scripts/run_sklearn_tests.sh ${{ matrix.DEVICE }} From dce6c4a0cadb7dd9f05b7538dc84a0a8dfb6aed5 Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Tue, 1 Jul 2025 09:17:31 -0700 Subject: [PATCH 2/2] Place env. variable in correct places --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e30a3352ad..e206f2c62b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -281,7 +281,6 @@ jobs: call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }} set PYTHON=python set COVERAGE_FILE=%cd%\.coverage.sklearnex - set SKLEARNEX_PREVIEW=YES cd .. call scikit-learn-intelex\conda-recipe\run_test.bat scikit-learn-intelex\ - name: Sklearn testing @@ -290,6 +289,7 @@ jobs: call .\venv\Scripts\activate.bat call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }} set COVERAGE_FILE=%cd%\.coverage.sklearn + set SKLEARNEX_PREVIEW=YES if "${{ steps.set-env.outputs.DPCFLAG }}"=="" set CPU=cpu bash .ci/scripts/run_sklearn_tests.sh %CPU% - name: Create coverage report @@ -461,13 +461,13 @@ jobs: run: | source .github/scripts/activate_components.sh export COVERAGE_FILE=$(pwd)/.coverage.sklearnex - export SKLEARNEX_PREVIEW='YES' cd .ci ../conda-recipe/run_test.sh - name: Sklearn testing run: | source .github/scripts/activate_components.sh export COVERAGE_FILE=$(pwd)/.coverage.sklearn + export SKLEARNEX_PREVIEW='YES' bash .ci/scripts/run_sklearn_tests.sh ${{ matrix.DEVICE }} - name: Create coverage report run: |