From bbdb3d60086f8f9209c32597baa924cbf8eea7a3 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Mon, 23 Mar 2026 16:57:42 +0100 Subject: [PATCH 1/6] meta.yaml to accommodate numpy-base or numpy --- conda-recipe/meta.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 1b4c4c2..db309fd 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,3 +1,5 @@ +{% set use_numpy_base = environ.get('USE_NUMPY_BASE', 'true').lower() == 'true' %} + package: name: mkl_fft version: {{ GIT_DESCRIBE_TAG }} @@ -23,13 +25,21 @@ requirements: - setuptools >=77 - mkl-devel - cython + {% if use_numpy_base %} - numpy-base + {% else %} + - numpy + {% endif %} - wheel >=0.41.3 run: - python - python-gil # [py>=314] - mkl-service - - {{ pin_compatible('numpy-base') }} + {% if use_numpy_base %} + - numpy-base + {% else %} + - numpy >=1.26.4 + {% endif %} test: commands: From 39d372dbaa1ae32e820dd82fc3427c6b00f66c63 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Mon, 23 Mar 2026 17:05:50 +0100 Subject: [PATCH 2/6] Bumps the version --- mkl_fft/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkl_fft/_version.py b/mkl_fft/_version.py index fbb3ce8..5cada40 100644 --- a/mkl_fft/_version.py +++ b/mkl_fft/_version.py @@ -1 +1 @@ -__version__ = "2.2.0dev5" +__version__ = "2.2.0dev6" From c498a7611ada0f3ffdaa8fea644086953bca96a4 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Mon, 23 Mar 2026 17:16:06 +0100 Subject: [PATCH 3/6] Add PR to the chnagelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8222e07..4ad9c2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * In `mkl_fft.fftn` and `mkl_fft.ifftn`, improved checking of the shape argument `s` to use faster direct transforms more often. This makes performance more consistent between `mkl_fft.fftn/ifftn` and `mkl.interfaces`. [gh-283](https://github.com/IntelPython/mkl_fft/pull/283) +* Made conda recipe dependency on numpy configurable through `USE_NUMPY_BASE` environment variable [gh-299](https://github.com/IntelPython/mkl_fft/pull/299) ### Removed * Dropped support for Python 3.9 [gh-243](https://github.com/IntelPython/mkl_fft/pull/243) From d7dfbe885870daeafd7326000a89cfabb6c858de Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Mon, 23 Mar 2026 17:45:01 +0100 Subject: [PATCH 4/6] Suppress dependency warning per conda-build recommndation --- conda-recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index db309fd..b90b3b5 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -13,6 +13,11 @@ build: - WHEELS_OUTPUT_FOLDER ignore_run_exports: - blas + {% if use_numpy_base %} + - numpy-base + {% else %} + - numpy >=1.26.4 + {% endif %} requirements: build: From 2da05128f05f0fbb024bee9d1ac46e35a1771910 Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Mon, 23 Mar 2026 18:23:16 +0100 Subject: [PATCH 5/6] The ignore_run_exports section should only contain package names without version specifiers --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index b90b3b5..6472958 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -16,7 +16,7 @@ build: {% if use_numpy_base %} - numpy-base {% else %} - - numpy >=1.26.4 + - numpy {% endif %} requirements: From d36796962b22ec76bcb6335b2bea42f643ababee Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 25 Mar 2026 10:36:56 +0100 Subject: [PATCH 6/6] Add a comment to the code to clarify the motivation of new env variable --- conda-recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 6472958..949fdec 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,3 +1,4 @@ +# Intel numpy-base is still needed for internal wheels CI, so we control its use with this optional toggle {% set use_numpy_base = environ.get('USE_NUMPY_BASE', 'true').lower() == 'true' %} package: