Skip to content

Commit e508685

Browse files
chore: meta.yaml to accommodate numpy-base or numpy
2 parents 9788e39 + 80ff2f2 commit e508685

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

CHANGELOG.md

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

1616
### Changed
1717
* Updates to `mkl_random` implementations to better align with newer versions of `numpy.random` [gh-103](https://github.com/IntelPython/mkl_random/pull/103)
18+
* Made conda recipe dependency on numpy configurable through `USE_NUMPY_BASE` environment variable [gh-105](https://github.com/IntelPython/mkl_random/pull/105)
1819

1920
### Fixed
2021
* Various bugfixes including a hang in `zipf` when called with `np.nan` and size-1 1D arrays being cast to scalars [gh-103](https://github.com/IntelPython/mkl_random/pull/103)

conda-recipe/meta.yaml

Lines changed: 12 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_random
36
version: {{ GIT_DESCRIBE_TAG }}
@@ -23,14 +26,22 @@ requirements:
2326
- setuptools >=77
2427
- mkl-devel
2528
- cython
29+
{% if use_numpy_base %}
2630
- numpy-base
31+
{% else %}
32+
- numpy
33+
{% endif %}
2734
- pip
2835
- wheel >=0.41.3
2936
run:
3037
- python
3138
- python-gil # [py>=314]
3239
- {{ pin_compatible('mkl', min_pin="x.x", max_pin="x") }}
33-
- {{ pin_compatible('numpy-base', min_pin="x.x", max_pin="x") }}
40+
{% if use_numpy_base %}
41+
- numpy-base
42+
{% else %}
43+
- numpy >=1.26.4
44+
{% endif %}
3445

3546
test:
3647
commands:

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
project = "mkl_random"
1010
copyright = "2017-2025, Intel Corp."
1111
author = "Intel Corp."
12-
release = "1.4.0dev1"
12+
release = "1.4.0dev3"
1313

1414
# -- General configuration ---------------------------------------------------
1515
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

mkl_random/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.4.0dev1"
1+
__version__ = "1.4.0dev3"

0 commit comments

Comments
 (0)