From cde348fff1dcec998de70f3658ea894d1763c37b Mon Sep 17 00:00:00 2001 From: Alexander Andreev Date: Tue, 13 Aug 2024 21:34:58 +0100 Subject: [PATCH] Pin CI images and add comments --- .ci/pipeline/nightly.yml | 6 +++--- .ci/scripts/gen_release_jobs.py | 2 +- conda-recipe/meta.yaml | 2 ++ scripts/CMakeLists.txt | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.ci/pipeline/nightly.yml b/.ci/pipeline/nightly.yml index b6f32c0ff4..998ccd934e 100644 --- a/.ci/pipeline/nightly.yml +++ b/.ci/pipeline/nightly.yml @@ -34,7 +34,7 @@ variables: jobs: - job: Coverity pool: - vmImage: 'ubuntu-latest' + vmImage: 'ubuntu-22.04' steps: - script: | cd $(Agent.BuildDirectory) @@ -58,7 +58,7 @@ jobs: - job: Jupyter timeoutInMinutes: 0 pool: - vmImage: 'ubuntu-latest' + vmImage: 'ubuntu-22.04' steps: - script: | conda config --append channels conda-forge @@ -110,6 +110,6 @@ jobs: PYTHON_VERSION: '3.11' SKLEARN_VERSION: 'main' pool: - vmImage: 'windows-latest' + vmImage: 'windows-2022' steps: - template: build-and-test-win.yml diff --git a/.ci/scripts/gen_release_jobs.py b/.ci/scripts/gen_release_jobs.py index f8de27f4f8..66bba66f6c 100644 --- a/.ci/scripts/gen_release_jobs.py +++ b/.ci/scripts/gen_release_jobs.py @@ -24,7 +24,7 @@ CHANNELS = args.channels PYTHON_VERSIONS = ["3.9", "3.10", "3.11"] -SYSTEMS = ["ubuntu-latest", "windows-latest"] +SYSTEMS = ["ubuntu-22.04", "windows-2022"] ACTIVATE = { "ubuntu-latest": "conda activate", "windows-latest": "call activate", diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index ffb75f25e0..bf23a004b2 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -14,6 +14,8 @@ # limitations under the License. #=============================================================================== +# NB: this recipe should be synced with conda-forge one + {% set name = "scikit-learn-intelex" %} {% set version = "2024.7" %} {% set buildnumber = 0 %} diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 1160710e28..0b26468768 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -27,6 +27,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) if(WIN32) + # hint CMake to get python from PYTHON env. variable if defined if(DEFINED ENV{PYTHON}) set(PYTHON_EXECUTABLE $ENV{PYTHON}) endif()