Skip to content

Commit e7e71b3

Browse files
chore: meta.yaml to accommodate numpy-base or numpy
2 parents 9f9e8b5 + d367969 commit e7e71b3

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313
* 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)
14+
* Made conda recipe dependency on numpy configurable through `USE_NUMPY_BASE` environment variable [gh-299](https://github.com/IntelPython/mkl_fft/pull/299)
1415

1516
### Removed
1617
* Dropped support for Python 3.9 [gh-243](https://github.com/IntelPython/mkl_fft/pull/243)

conda-recipe/meta.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Intel numpy-base is still needed for internal wheels CI, so we control its use with this optional toggle
2+
{% set use_numpy_base = environ.get('USE_NUMPY_BASE', 'true').lower() == 'true' %}
3+
14
package:
25
name: mkl_fft
36
version: {{ GIT_DESCRIBE_TAG }}
@@ -11,6 +14,11 @@ build:
1114
- WHEELS_OUTPUT_FOLDER
1215
ignore_run_exports:
1316
- blas
17+
{% if use_numpy_base %}
18+
- numpy-base
19+
{% else %}
20+
- numpy
21+
{% endif %}
1422

1523
requirements:
1624
build:
@@ -23,13 +31,21 @@ requirements:
2331
- setuptools >=77
2432
- mkl-devel
2533
- cython
34+
{% if use_numpy_base %}
2635
- numpy-base
36+
{% else %}
37+
- numpy
38+
{% endif %}
2739
- wheel >=0.41.3
2840
run:
2941
- python
3042
- python-gil # [py>=314]
3143
- mkl-service
32-
- {{ pin_compatible('numpy-base') }}
44+
{% if use_numpy_base %}
45+
- numpy-base
46+
{% else %}
47+
- numpy >=1.26.4
48+
{% endif %}
3349

3450
test:
3551
commands:

mkl_fft/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.2.0dev5"
1+
__version__ = "2.2.0dev6"

0 commit comments

Comments
 (0)