Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

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

### Fixed
* 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)
Expand Down
12 changes: 11 additions & 1 deletion conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{% set use_numpy_base = environ.get('USE_NUMPY_BASE', 'true').lower() == 'true' %}

package:
name: mkl_random
version: {{ GIT_DESCRIBE_TAG }}
Expand All @@ -23,14 +25,22 @@ requirements:
- setuptools >=77
- mkl-devel
- cython
{% if use_numpy_base %}
- numpy-base
{% else %}
- numpy
{% endif %}
- pip
- wheel >=0.41.3
run:
- python
- python-gil # [py>=314]
- {{ pin_compatible('mkl', min_pin="x.x", max_pin="x") }}
Comment thread
jharlow-intel marked this conversation as resolved.
- {{ pin_compatible('numpy-base', min_pin="x.x", max_pin="x") }}
{% if use_numpy_base %}
- numpy-base
{% else %}
- numpy >=1.26.4
{% endif %}

test:
commands:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
project = "mkl_random"
copyright = "2017-2025, Intel Corp."
author = "Intel Corp."
release = "1.4.0dev1"
release = "1.4.0dev3"

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
2 changes: 1 addition & 1 deletion mkl_random/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.4.0dev1"
__version__ = "1.4.0dev3"
Loading