numexpr 2.9.0__tar.gz → 2.10.0__tar.gz

{numexpr-2.9.0 → numexpr-2.10.0}/ANNOUNCE.rst

@@ -13,20 +13,17 @@ Project documentation is available at:
 
 http://numexpr.readthedocs.io/
 
-Changes from 2.8.7 to 2.8.8
+Changes from 2.8.8 to 2.9.0
 ---------------------------
 
-* Fix re_evaluate not taking global_dict as argument. Thanks to Teng Liu
-  (@27rabbitlt).
+* Support for PyPy (see PRs #467 and #740).  The full test suite
+  should pass now, at least for the 3.10 version.  Thanks to
+  @27rabbitlt for most of the work and @mgorny and @mattip for
+  providing help and additional fixes.  Fixes #463.
 
-* Fix parsing of simple complex numbers.  Now, `ne.evaluate('1.5j')` works.
-  Thanks to Teng Liu (@27rabbitlt).
+* Fixed more sanitizer issues (see PR #469).  Thanks to @27rabbitlt.
 
-* Fixes for upcoming NumPy 2.0:
-
-  * Replace npy_cdouble with C++ complex. Thanks to Teng Liu (@27rabbitlt).
-  * Add NE_MAXARGS for future numpy change NPY_MAXARGS. Now it is set to 64
-    to match NumPy 2.0 value. Thanks to Teng Liu (@27rabbitlt).
+* Modernized the test suite to avoid some warnings.
 
 What's Numexpr?
 ---------------

{numexpr-2.9.0 → numexpr-2.10.0}/AUTHORS.txt

@@ -24,4 +24,8 @@ Google Inc. contributed bug fixes.
 David Cox improved readability of the Readme.
 
 Robert A. McLeod contributed bug fixes and ported the documentation to 
-numexpr.readthedocs.io. He is the maintainer of the package since 2016.
+numexpr.readthedocs.io. He has served as the maintainer of the package
+since 2016 to 2023.
+
+Teng Liu fixed many bugs, and in particular, contributed valuable fixes
+to the new regex sanitizer for expressions.

{numexpr-2.9.0 → numexpr-2.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numexpr
-Version: 2.9.0
+Version: 2.10.0
 Summary: Fast numerical expression evaluator for NumPy
 Home-page: https://github.com/pydata/numexpr
 Author: David M. Cooke, Francesc Alted, and others
@@ -23,7 +23,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS.txt
-Requires-Dist: numpy>=1.13.3
+Requires-Dist: numpy>=1.19.3
 
 ======================================================
 NumExpr: Fast numerical expression evaluator for NumPy
@@ -34,7 +34,6 @@ NumExpr: Fast numerical expression evaluator for NumPy
 :Contact: faltet@gmail.com
 :URL: https://github.com/pydata/numexpr
 :Documentation: http://numexpr.readthedocs.io/en/latest/
-:Travis CI: |travis|
 :GitHub Actions: |actions|
 :PyPi: |version|
 :DOI: |doi|
@@ -48,7 +47,7 @@ NumExpr: Fast numerical expression evaluator for NumPy
         :target: http://numexpr.readthedocs.io/en/latest
 .. |doi| image:: https://zenodo.org/badge/doi/10.5281/zenodo.2483274.svg
         :target:  https://doi.org/10.5281/zenodo.2483274
-.. |version| image:: https://img.shields.io/pypi/v/numexpr.png
+.. |version| image:: https://img.shields.io/pypi/v/numexpr
         :target: https://pypi.python.org/pypi/numexpr
 
 
@@ -175,7 +174,7 @@ Usage
   array([  1.00000000e+00,   2.00000000e+00,   3.00000000e+00, ...,
            9.99998000e+05,   9.99999000e+05,   1.00000000e+06])
 
-  >>> ne.evaluate('a*b-4.1*a > 2.5*b')   # a more complex one
+  >>> ne.evaluate("a * b - 4.1 * a > 2.5 * b")   # a more complex one
   array([False, False, False, ...,  True,  True,  True], dtype=bool)
 
   >>> ne.evaluate("sin(a) + arcsinh(a/b)")   # you can also use functions

{numexpr-2.9.0 → numexpr-2.10.0}/README.rst

@@ -7,7 +7,6 @@ NumExpr: Fast numerical expression evaluator for NumPy
 :Contact: faltet@gmail.com
 :URL: https://github.com/pydata/numexpr
 :Documentation: http://numexpr.readthedocs.io/en/latest/
-:Travis CI: |travis|
 :GitHub Actions: |actions|
 :PyPi: |version|
 :DOI: |doi|
@@ -21,7 +20,7 @@ NumExpr: Fast numerical expression evaluator for NumPy
         :target: http://numexpr.readthedocs.io/en/latest
 .. |doi| image:: https://zenodo.org/badge/doi/10.5281/zenodo.2483274.svg
         :target:  https://doi.org/10.5281/zenodo.2483274
-.. |version| image:: https://img.shields.io/pypi/v/numexpr.png
+.. |version| image:: https://img.shields.io/pypi/v/numexpr
         :target: https://pypi.python.org/pypi/numexpr
 
 
@@ -148,7 +147,7 @@ Usage
   array([  1.00000000e+00,   2.00000000e+00,   3.00000000e+00, ...,
            9.99998000e+05,   9.99999000e+05,   1.00000000e+06])
 
-  >>> ne.evaluate('a*b-4.1*a > 2.5*b')   # a more complex one
+  >>> ne.evaluate("a * b - 4.1 * a > 2.5 * b")   # a more complex one
   array([False, False, False, ...,  True,  True,  True], dtype=bool)
 
   >>> ne.evaluate("sin(a) + arcsinh(a/b)")   # you can also use functions

{numexpr-2.9.0 → numexpr-2.10.0}/RELEASE_NOTES.rst

@@ -1,6 +1,19 @@
-====================================
-Release notes for NumExpr 2.9 series
-====================================
+=====================================
+Release notes for NumExpr 2.10 series
+=====================================
+
+Changes from 2.9.0 to 2.10.0
+----------------------------
+
+* Support for NumPy 2.0.0.  This is still experimental, so please
+  report any issues you find.  Thanks to Clément Robert and Thomas
+  Caswell for the work.
+
+* Avoid erroring when OMP_NUM_THREADS is empty string.  Thanks to
+  Patrick Hoefler.
+
+* Do not warn if OMP_NUM_THREAD set.
+
 
 Changes from 2.8.8 to 2.9.0
 ---------------------------

{numexpr-2.9.0 → numexpr-2.10.0}/numexpr/interpreter.cpp

@@ -1203,7 +1203,7 @@ NumExpr_run(NumExprObject *self, PyObject *args, PyObject *kwds)
                 Py_INCREF(dtypes[0]);
             } else {  // constant, like in '"foo"'
                 dtypes[0] = PyArray_DescrNewFromType(NPY_STRING);
-                dtypes[0]->elsize = (int)self->memsizes[1];
+                PyDataType_SET_ELSIZE(dtypes[0], (npy_intp)self->memsizes[1]);
             }  // no string temporaries, so no third case
         }
         if (dtypes[0] == NULL) {
@@ -1449,7 +1449,7 @@ NumExpr_run(NumExprObject *self, PyObject *args, PyObject *kwds)
     /* Get the sizes of all the operands */
     dtypes_tmp = NpyIter_GetDescrArray(iter);
     for (i = 0; i < n_inputs+1; ++i) {
-        self->memsizes[i] = dtypes_tmp[i]->elsize;
+        self->memsizes[i] = PyDataType_ELSIZE(dtypes_tmp[i]);
     }
 
     /* For small calculations, just use 1 thread */

{numexpr-2.9.0 → numexpr-2.10.0}/numexpr/tests/test_numexpr.py

@@ -33,6 +33,7 @@ from numpy import shape, allclose, array_equal, ravel, isnan, isinf
 import numexpr
 from numexpr import E, NumExpr, evaluate, re_evaluate, validate, disassemble, use_vml
 from numexpr.expressions import ConstantNode
+from numexpr.utils import detect_number_of_cores
 
 import unittest
 
@@ -1158,6 +1159,20 @@ class test_threading_config(TestCase):
             else:
                 self.assertEqual(5, numexpr._init_num_threads())
 
+    def test_omp_num_threads_empty_string(self):
+        with _environment('OMP_NUM_THREADS', ''):
+            if 'sparc' in platform.machine():
+                self.assertEqual(1, numexpr._init_num_threads())
+            else:
+                self.assertEqual(detect_number_of_cores(), numexpr._init_num_threads())
+
+    def test_numexpr_max_threads_empty_string(self):
+        with _environment('NUMEXPR_MAX_THREADS', ''):
+            if 'sparc' in platform.machine():
+                self.assertEqual(1, numexpr._init_num_threads())
+            else:
+                self.assertEqual(detect_number_of_cores(), numexpr._init_num_threads())
+
     def test_vml_threads_round_trip(self):
         n_threads = 3
         if use_vml:

{numexpr-2.9.0 → numexpr-2.10.0}/numexpr/utils.py

@@ -13,7 +13,6 @@ log = logging.getLogger(__name__)
 
 import os
 import subprocess
-import platform
 
 from numexpr.interpreter import _set_num_threads, _get_num_threads, MAX_THREADS
 from numexpr import use_vml
@@ -134,7 +133,8 @@ def _init_num_threads():
 
     env_configured = False
     n_cores = detect_number_of_cores()
-    if 'NUMEXPR_MAX_THREADS' in os.environ:
+    if ('NUMEXPR_MAX_THREADS' in os.environ and os.environ['NUMEXPR_MAX_THREADS'] != '' or
+        'OMP_NUM_THREADS' in os.environ and os.environ['OMP_NUM_THREADS'] != ''):
         # The user has configured NumExpr in the expected way, so suppress logs.
         env_configured = True
         n_cores = MAX_THREADS
@@ -150,9 +150,10 @@ def _init_num_threads():
 
     # Now we check for 'NUMEXPR_NUM_THREADS' or 'OMP_NUM_THREADS' to set the 
     # actual number of threads used.
-    if 'NUMEXPR_NUM_THREADS' in os.environ:
+    if 'NUMEXPR_NUM_THREADS' in os.environ and os.environ['NUMEXPR_NUM_THREADS'] != '':
         requested_threads = int(os.environ['NUMEXPR_NUM_THREADS'])
-    elif 'OMP_NUM_THREADS' in os.environ:
+    elif 'OMP_NUM_THREADS' in os.environ and os.environ['OMP_NUM_THREADS'] != '':
+        # Empty string is commonly used to unset the variable
         requested_threads = int(os.environ['OMP_NUM_THREADS'])
     else:
         requested_threads = n_cores

{numexpr-2.9.0 → numexpr-2.10.0}/numexpr/version.py

@@ -1,4 +1,4 @@
 # THIS FILE IS GENERATED BY `SETUP.PY`
-version = '2.9.0'
-numpy_build_version = '1.26.2'
+version = '2.10.0'
+numpy_build_version = '2.0.0rc1'
 platform_machine = 'AMD64'

{numexpr-2.9.0 → numexpr-2.10.0}/numexpr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numexpr
-Version: 2.9.0
+Version: 2.10.0
 Summary: Fast numerical expression evaluator for NumPy
 Home-page: https://github.com/pydata/numexpr
 Author: David M. Cooke, Francesc Alted, and others
@@ -23,7 +23,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS.txt
-Requires-Dist: numpy>=1.13.3
+Requires-Dist: numpy>=1.19.3
 
 ======================================================
 NumExpr: Fast numerical expression evaluator for NumPy
@@ -34,7 +34,6 @@ NumExpr: Fast numerical expression evaluator for NumPy
 :Contact: faltet@gmail.com
 :URL: https://github.com/pydata/numexpr
 :Documentation: http://numexpr.readthedocs.io/en/latest/
-:Travis CI: |travis|
 :GitHub Actions: |actions|
 :PyPi: |version|
 :DOI: |doi|
@@ -48,7 +47,7 @@ NumExpr: Fast numerical expression evaluator for NumPy
         :target: http://numexpr.readthedocs.io/en/latest
 .. |doi| image:: https://zenodo.org/badge/doi/10.5281/zenodo.2483274.svg
         :target:  https://doi.org/10.5281/zenodo.2483274
-.. |version| image:: https://img.shields.io/pypi/v/numexpr.png
+.. |version| image:: https://img.shields.io/pypi/v/numexpr
         :target: https://pypi.python.org/pypi/numexpr
 
 
@@ -175,7 +174,7 @@ Usage
   array([  1.00000000e+00,   2.00000000e+00,   3.00000000e+00, ...,
            9.99998000e+05,   9.99999000e+05,   1.00000000e+06])
 
-  >>> ne.evaluate('a*b-4.1*a > 2.5*b')   # a more complex one
+  >>> ne.evaluate("a * b - 4.1 * a > 2.5 * b")   # a more complex one
   array([False, False, False, ...,  True,  True,  True], dtype=bool)
 
   >>> ne.evaluate("sin(a) + arcsinh(a/b)")   # you can also use functions

numexpr-2.10.0/numexpr.egg-info/requires.txt

@@ -0,0 +1 @@
+numpy>=1.19.3

numexpr-2.10.0/pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+    "setuptools",
+    "wheel",
+    "numpy>=2.0.0rc1",
+]
+build-backend = "setuptools.build_meta"

numexpr-2.10.0/requirements.txt

@@ -0,0 +1 @@
+numpy >= 1.19.3 # keep in sync with NPY_TARGET_VERSION (setup.py)

{numexpr-2.9.0 → numexpr-2.10.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = numexpr
-version = 2.9.0
+version = 2.10.0
 description = Fast numerical expression evaluator for NumPy
 author = David M. Cooke, Francesc Alted, and others
 maintainer = Francesc Alted

{numexpr-2.9.0 → numexpr-2.10.0}/setup.py

@@ -33,7 +33,10 @@ lib_dirs = []
 inc_dirs = [np.get_include()]
 libs = []  # Pre-built libraries ONLY, like python36.so
 clibs = []
-def_macros = []
+def_macros = [
+    # keep in sync with minimal runtime requirement (requirements.txt) 
+    ('NPY_TARGET_VERSION', 'NPY_1_19_API_VERSION')
+]
 sources = ['numexpr/interpreter.cpp',
            'numexpr/module.cpp',
            'numexpr/numexpr_object.cpp']

numexpr-2.9.0/numexpr.egg-info/requires.txt

@@ -1 +0,0 @@
-numpy>=1.13.3

numexpr-2.9.0/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel", "oldest-supported-numpy"]
-build-backend = "setuptools.build_meta"

numexpr-2.9.0/requirements.txt

@@ -1 +0,0 @@
-numpy >= 1.13.3