diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 8c2d499..a9ee22f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,24 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.12.____cpython: - CONFIG: linux_64_python3.12.____cpython + linux_64_numpy1.23python3.11.____cpython: + CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 833c571..41bb8c8 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,20 +8,17 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython + win_64_numpy1.22python3.10.____cpython: + CONFIG: win_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython + win_64_numpy1.22python3.9.____cpython: + CONFIG: win_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython + win_64_numpy1.23python3.11.____cpython: + CONFIG: win_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpython: - CONFIG: win_64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython + win_64_numpy1.26python3.12.____cpython: + CONFIG: win_64_numpy1.26python3.12.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 57% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 9f28a9b..a5e808b 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,11 +1,23 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +mpich: +- '4' +numpy: +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -14,3 +26,8 @@ python: - 3.10.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 57% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 2c75808..c24fd66 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,11 +1,23 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +mpich: +- '4' +numpy: +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -14,3 +26,8 @@ python: - 3.9.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml similarity index 57% rename from .ci_support/linux_64_python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 2024659..8092474 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,11 +1,23 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +mpich: +- '4' +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -14,3 +26,8 @@ python: - 3.11.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml similarity index 57% rename from .ci_support/linux_64_python3.12.____cpython.yaml rename to .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 6184c6e..8a184c2 100644 --- a/.ci_support/linux_64_python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -1,11 +1,23 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +mpich: +- '4' +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -14,3 +26,8 @@ python: - 3.12.* *_cpython target_platform: - linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - python + - numpy diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml deleted file mode 100644 index ca0d923..0000000 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,16 +0,0 @@ -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- linux-64 diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml similarity index 68% rename from .ci_support/win_64_python3.10.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.10.____cpython.yaml index d30d308..f2d1070 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,13 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -10,3 +16,6 @@ python: - 3.10.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml similarity index 68% rename from .ci_support/win_64_python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.22python3.9.____cpython.yaml index 53204fb..0ff9638 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,13 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.22' pin_run_as_build: python: min_pin: x.x @@ -10,3 +16,6 @@ python: - 3.9.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml similarity index 68% rename from .ci_support/win_64_python3.11.____cpython.yaml rename to .ci_support/win_64_numpy1.23python3.11.____cpython.yaml index 05291b6..e4f87da 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,13 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -10,3 +16,6 @@ python: - 3.11.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml similarity index 68% rename from .ci_support/win_64_python3.12.____cpython.yaml rename to .ci_support/win_64_numpy1.26python3.12.____cpython.yaml index fdaa043..a5fa04d 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_numpy1.26python3.12.____cpython.yaml @@ -1,7 +1,13 @@ +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: - conda-forge main +cxx_compiler: +- vs2019 +numpy: +- '1.26' pin_run_as_build: python: min_pin: x.x @@ -10,3 +16,6 @@ python: - 3.12.* *_cpython target_platform: - win-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml deleted file mode 100644 index 4f0d022..0000000 --- a/.ci_support/win_64_python3.8.____cpython.yaml +++ /dev/null @@ -1,12 +0,0 @@ -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6c805a9..af0b9ac 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 24ef201..33f3277 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +mamba.exe install pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -43,7 +43,7 @@ if EXIST LICENSE.txt ( ) if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" ) call :end_group diff --git a/README.md b/README.md index 5d55bd5..414535e 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,9 @@ Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/scikit-learn-in Home: https://intel.github.io/scikit-learn-intelex -Package license: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT +Package license: Apache-2.0 -Summary: Intel(R) Extension for Scikit-learn is a seamless way to speed up your Scikit-learn application. +Summary: Intel(R) Extension for Scikit-learn* is a seamless way to speed up your Scikit-learn application. Development: https://github.com/intel/scikit-learn-intelex @@ -41,73 +41,59 @@ Current build status - + - + - + - + - + - + - + - + - - - - - - diff --git a/build-locally.py b/build-locally.py index d78427b..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob import os import platform
VariantStatus
linux_64_python3.10.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_python3.11.____cpythonlinux_64_numpy1.22python3.9.____cpython - variant + variant
linux_64_python3.12.____cpythonlinux_64_numpy1.23python3.11.____cpython - variant + variant
linux_64_python3.8.____cpythonlinux_64_numpy1.26python3.12.____cpython - variant + variant
linux_64_python3.9.____cpythonwin_64_numpy1.22python3.10.____cpython - variant + variant
win_64_python3.10.____cpythonwin_64_numpy1.22python3.9.____cpython - variant + variant
win_64_python3.11.____cpythonwin_64_numpy1.23python3.11.____cpython - variant + variant
win_64_python3.12.____cpythonwin_64_numpy1.26python3.12.____cpython - variant - -
win_64_python3.8.____cpython - - variant - -
win_64_python3.9.____cpython - - variant + variant