Hello community,
here is the log from the commit of package python-numexpr for openSUSE:Factory checked in at 2019-09-02 13:26:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-numexpr (Old)
and /work/SRC/openSUSE:Factory/.python-numexpr.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-numexpr"
Mon Sep 2 13:26:03 2019 rev:11 rq:727462 version:2.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-numexpr/python-numexpr.changes 2019-01-08 12:28:22.276279198 +0100
+++ /work/SRC/openSUSE:Factory/.python-numexpr.new.7948/python-numexpr.changes 2019-09-02 13:26:03.701304388 +0200
@@ -1,0 +2,20 @@
+Sat Aug 31 04:46:34 UTC 2019 - Arun Persaud
+
+- specfile:
+ * update copyright year
+ * added fix to call python in tests: fix_test.patch
+
+- update to version 2.7.0:
+ * The default number of 'safe' threads has been restored to the
+ historical limit of 8, if the environment variable
+ "NUMEXPR_MAX_THREADS" has not been set.
+ * Thanks to @eltoder who fixed a small memory leak.
+ * Support for Python 2.6 has been dropped, as it is no longer
+ available via TravisCI.
+ * A typo in the test suite that had a less than rather than greater
+ than symbol in the NumPy version check has been corrected thanks
+ to dhomeier.
+ * The file site.cfg was being accidently included in the sdists on
+ PyPi. It has now been excluded.
+
+-------------------------------------------------------------------
Old:
----
numexpr-2.6.9.tar.gz
New:
----
fix_test.patch
numexpr-2.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-numexpr.spec ++++++
--- /var/tmp/diff_new_pack.abG29L/_old 2019-09-02 13:26:04.237304287 +0200
+++ /var/tmp/diff_new_pack.abG29L/_new 2019-09-02 13:26:04.241304287 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-numexpr
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-numexpr
-Version: 2.6.9
+Version: 2.7.0
Release: 0
Summary: Numerical expression evaluator for NumPy
License: MIT
Group: Development/Languages/Python
URL: https://github.com/pydata/numexpr/
Source: https://files.pythonhosted.org/packages/source/n/numexpr/numexpr-%{version}.tar.gz
+Patch0: fix_test.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module numpy-devel >= 1.6}
BuildRequires: %{python_module setuptools}
@@ -42,6 +43,7 @@
%prep
%setup -q -n numexpr-%{version}
+%patch0 -p1
# wrong-file-end-of-line-encoding
sed -i 's/\r$//' ANNOUNCE.rst AUTHORS.txt README.rst RELEASE_NOTES.rst site.cfg.example
# remove unwanted shebang
++++++ fix_test.patch ++++++
--- numexpr-2.7.0/numexpr/tests/test_numexpr.py.old 2019-08-30 21:56:34.913388358 -0700
+++ numexpr-2.7.0/numexpr/tests/test_numexpr.py 2019-08-30 21:57:10.341563205 -0700
@@ -967,7 +967,7 @@
"import numexpr",
"assert(numexpr.nthreads <= 8)",
"exit(0)"])
- subprocess.check_call(['python', '-c', script])
+ subprocess.check_call([sys.executable, '-c', script])
def test_max_threads_set(self):
# Has to be done in a subprocess as `importlib.reload` doesn't let us
@@ -978,7 +978,7 @@
"import numexpr",
"assert(numexpr.MAX_THREADS == 4)",
"exit(0)"])
- subprocess.check_call(['python', '-c', script])
+ subprocess.check_call([sys.executable, '-c', script])
def test_numexpr_num_threads(self):
with _environment('OMP_NUM_THREADS', '5'):
++++++ numexpr-2.6.9.tar.gz -> numexpr-2.7.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/ANNOUNCE.rst new/numexpr-2.7.0/ANNOUNCE.rst
--- old/numexpr-2.6.9/ANNOUNCE.rst 2018-12-21 00:59:52.000000000 +0100
+++ new/numexpr-2.7.0/ANNOUNCE.rst 2019-08-13 22:11:18.000000000 +0200
@@ -1,23 +1,35 @@
-==========================
- Announcing Numexpr 2.6.9
-==========================
+=========================
+ Announcing Numexpr 2.7.0
+=========================
Hi everyone,
-This is a version-bump release to provide wheels for Python 3.7.1 on Windows
-platforms.
+This is a minor version bump for NumExpr. We would like to highlight the changes
+made in 2.6.9 (which in retrospec should have been a minor version bump), where
+the maximum number of threads spawned can be limited by setting the environment
+variable "NUMEXPR_MAX_THREADS". If this variable is not set, in 2.7.0 the
+historical limit of 8 threads will be used. The lack of a check caused some
+problems on very large hosts in cluster environments in 2.6.9.
+
+In addition, we are officially dropping Python 2.6 support in this release as
+we cannot perform continuous integration for it.
Project documentation is available at:
http://numexpr.readthedocs.io/
-Changes from 2.6.8 to 2.6.9
----------------------------
+Changes from 2.6.9 to 2.7.0
+----------------------------
-- Thanks to Mike Toews for more robust handling of the thread-setting
- environment variables.
-- With Appveyor updating to Python 3.7.1, wheels for Python 3.7 are now
- available in addition to those for other OSes.
+- The default number of 'safe' threads has been restored to the historical limit
+ of 8, if the environment variable "NUMEXPR_MAX_THREADS" has not been set.
+- Thanks to @eltoder who fixed a small memory leak.
+- Support for Python 2.6 has been dropped, as it is no longer available via
+ TravisCI.
+- A typo in the test suite that had a less than rather than greater than symbol
+ in the NumPy version check has been corrected thanks to dhomeier.
+- The file `site.cfg` was being accidently included in the sdists on PyPi.
+ It has now been excluded.
What's Numexpr?
---------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/MANIFEST.in new/numexpr-2.7.0/MANIFEST.in
--- old/numexpr-2.6.9/MANIFEST.in 2018-07-12 19:33:23.000000000 +0200
+++ new/numexpr-2.7.0/MANIFEST.in 2019-08-13 19:49:26.000000000 +0200
@@ -4,7 +4,6 @@
recursive-include numexpr *.cpp *.hpp *.py
recursive-include numexpr/win32 *.c *.h
-exclude numexpr/__config__.py
-exclude RELEASING.txt
+exclude numexpr/__config__.py RELEASING.txt site.cfg
recursive-include bench *.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/PKG-INFO new/numexpr-2.7.0/PKG-INFO
--- old/numexpr-2.6.9/PKG-INFO 2018-12-21 19:38:11.000000000 +0100
+++ new/numexpr-2.7.0/PKG-INFO 2019-08-14 16:07:42.000000000 +0200
@@ -1,11 +1,12 @@
Metadata-Version: 1.0
Name: numexpr
-Version: 2.6.9
+Version: 2.7.0
Summary: Fast numerical expression evaluator for NumPy
Home-page: https://github.com/pydata/numexpr
Author: David M. Cooke, Francesc Alted and others
Author-email: david.m.cooke@gmail.com, faltet@gmail.com
License: MIT
+Description-Content-Type: UNKNOWN
Description: ======================================================
NumExpr: Fast numerical expression evaluator for NumPy
======================================================
@@ -26,8 +27,8 @@
:target: https://ci.appveyor.com/project/robbmcleod/numexpr
.. |docs| image:: https://readthedocs.org/projects/numexpr/badge/?version=latest
:target: http://numexpr.readthedocs.io/en/latest
- .. |doi| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1492916.svg
- :target: https://zenodo.org/record/1492916
+ .. |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
:target: https://pypi.python.org/pypi/numexpr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/README.rst new/numexpr-2.7.0/README.rst
--- old/numexpr-2.6.9/README.rst 2018-11-21 06:28:24.000000000 +0100
+++ new/numexpr-2.7.0/README.rst 2018-12-21 19:41:59.000000000 +0100
@@ -18,8 +18,8 @@
:target: https://ci.appveyor.com/project/robbmcleod/numexpr
.. |docs| image:: https://readthedocs.org/projects/numexpr/badge/?version=latest
:target: http://numexpr.readthedocs.io/en/latest
-.. |doi| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1492916.svg
- :target: https://zenodo.org/record/1492916
+.. |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
:target: https://pypi.python.org/pypi/numexpr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/RELEASE_NOTES.rst new/numexpr-2.7.0/RELEASE_NOTES.rst
--- old/numexpr-2.6.9/RELEASE_NOTES.rst 2018-12-21 00:59:50.000000000 +0100
+++ new/numexpr-2.7.0/RELEASE_NOTES.rst 2019-08-13 22:05:36.000000000 +0200
@@ -2,6 +2,19 @@
Release notes for Numexpr 2.6 series
=====================================
+Changes from 2.6.9 to 2.7.0
+----------------------------
+
+- The default number of 'safe' threads has been restored to the historical limit
+ of 8, if the environment variable "NUMEXPR_MAX_THREADS" has not been set.
+- Thanks to @eltoder who fixed a small memory leak.
+- Support for Python 2.6 has been dropped, as it is no longer available via
+ TravisCI.
+- A typo in the test suite that had a less than rather than greater than symbol
+ in the NumPy version check has been corrected thanks to dhomeier.
+- The file `site.cfg` was being accidently included in the sdists on PyPi.
+ It has now been excluded.
+
Changes from 2.6.8 to 2.6.9
---------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr/__init__.py new/numexpr-2.7.0/numexpr/__init__.py
--- old/numexpr-2.6.9/numexpr/__init__.py 2018-07-19 23:15:31.000000000 +0200
+++ new/numexpr-2.7.0/numexpr/__init__.py 2019-01-28 20:07:35.000000000 +0100
@@ -37,35 +37,19 @@
import platform
from numexpr.expressions import E
from numexpr.necompiler import NumExpr, disassemble, evaluate, re_evaluate
-# from numexpr.tests import test, print_versions
from numexpr.interpreter import MAX_THREADS
-from numexpr.utils import (
+from numexpr.utils import (_init_num_threads,
get_vml_version, set_vml_accuracy_mode, set_vml_num_threads,
set_num_threads, detect_number_of_cores, detect_number_of_threads)
# Detect the number of cores
ncores = detect_number_of_cores()
-nthreads = detect_number_of_threads()
-
# Initialize the number of threads to be used
-if 'sparc' in platform.machine():
- import warnings
-
- warnings.warn('The number of threads have been set to 1 because problems related '
- 'to threading have been reported on some sparc machine. '
- 'The number of threads can be changed using the "set_num_threads" '
- 'function.')
- set_num_threads(1)
-else:
- set_num_threads(nthreads)
-
+nthreads = _init_num_threads()
# The default for VML is 1 thread (see #39)
set_vml_num_threads(1)
import version
-
-dirname = os.path.dirname(__file__)
-
__version__ = version.version
def print_versions():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr/module.cpp new/numexpr-2.7.0/numexpr/module.cpp
--- old/numexpr-2.6.9/numexpr/module.cpp 2018-07-12 19:49:43.000000000 +0200
+++ new/numexpr-2.7.0/numexpr/module.cpp 2019-08-13 22:12:07.000000000 +0200
@@ -366,12 +366,15 @@
o = PyLong_FromLong(name);
s = PyBytes_FromString(sname);
- if (!s) {
+ if (!o || !s) {
PyErr_SetString(PyExc_RuntimeError, routine_name);
- return -1;
+ r = -1;
+ }
+ else {
+ r = PyDict_SetItem(d, s, o);
}
- r = PyDict_SetItem(d, s, o);
Py_XDECREF(o);
+ Py_XDECREF(s);
return r;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr/numexpr_config.hpp new/numexpr-2.7.0/numexpr/numexpr_config.hpp
--- old/numexpr-2.6.9/numexpr/numexpr_config.hpp 2018-07-12 19:33:23.000000000 +0200
+++ new/numexpr-2.7.0/numexpr/numexpr_config.hpp 2019-01-28 20:02:45.000000000 +0100
@@ -21,10 +21,8 @@
#define BLOCK_SIZE2 16
#endif
-/* The maximum number of threads (for some static arrays).
- * Choose this large enough for most monsters out there.
- Keep in sync this with the number in __init__.py. */
-// #define MAX_THREADS 4096
+// The default threadpool size. It's prefer that the user set this via an
+// environment variable, "NUMEXPR_MAX_THREADS"
#define DEFAULT_MAX_THREADS 64
#if defined(_WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr/tests/test_numexpr.py new/numexpr-2.7.0/numexpr/tests/test_numexpr.py
--- old/numexpr-2.6.9/numexpr/tests/test_numexpr.py 2018-08-16 19:26:59.000000000 +0200
+++ new/numexpr-2.7.0/numexpr/tests/test_numexpr.py 2019-01-28 20:40:17.000000000 +0100
@@ -14,6 +14,7 @@
import platform
import warnings
from contextlib import contextmanager
+import subprocess
import numpy as np
from numpy import (
@@ -319,7 +320,6 @@
# Check for issue #313, whereby clearing f_locals also clear f_globals
# if in the top-frame. This cannot be done inside `unittest` as it is always
# executing code in a child frame.
- import subprocess
script = r';'.join([
r"import numexpr as ne",
r"a=10",
@@ -333,7 +333,7 @@
r"a += 1",
])
# Raises CalledProcessError on a non-normal exit
- check = subprocess.check_call('{0} -c "{1}"'.format(sys.executable, script), shell=True)
+ check = subprocess.check_call([sys.executable, '-c', script])
# Ideally this test should also be done against ipython but it's not
# a requirement.
@@ -956,17 +956,39 @@
else:
del os.environ[key]
-
# Test cases for the threading configuration
class test_threading_config(TestCase):
+ def test_max_threads_unset(self):
+ # Has to be done in a subprocess as `importlib.reload` doesn't let us
+ # re-initialize the threadpool
+ script = '\n'.join([
+ "import os",
+ "if 'NUMEXPR_MAX_THREADS' in os.environ: os.environ.pop('NUMEXPR_MAX_THREADS')",
+ "import numexpr",
+ "assert(numexpr.nthreads <= 8)",
+ "exit(0)"])
+ subprocess.check_call(['python', '-c', script])
+
+ def test_max_threads_set(self):
+ # Has to be done in a subprocess as `importlib.reload` doesn't let us
+ # re-initialize the threadpool
+ script = '\n'.join([
+ "import os",
+ "os.environ['NUMEXPR_MAX_THREADS'] = '4'",
+ "import numexpr",
+ "assert(numexpr.MAX_THREADS == 4)",
+ "exit(0)"])
+ subprocess.check_call(['python', '-c', script])
+
def test_numexpr_num_threads(self):
with _environment('OMP_NUM_THREADS', '5'):
+ # NUMEXPR_NUM_THREADS has priority
with _environment('NUMEXPR_NUM_THREADS', '3'):
- self.assertEquals(3, numexpr.detect_number_of_threads())
+ self.assertEquals(3, numexpr._init_num_threads())
def test_omp_num_threads(self):
with _environment('OMP_NUM_THREADS', '5'):
- self.assertEquals(5, numexpr.detect_number_of_threads())
+ self.assertEquals(5, numexpr._init_num_threads())
# Case test for threads
@@ -1042,7 +1064,7 @@
np_version = LooseVersion(np.__version__)
- if minimum_numpy_version < np_version:
+ if np_version < minimum_numpy_version:
print('*Warning*: NumPy version is lower than recommended: %s < %s' % (np_version, minimum_numpy_version))
print('-=' * 38)
print('Numexpr version: %s' % numexpr.__version__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr/utils.py new/numexpr-2.7.0/numexpr/utils.py
--- old/numexpr-2.6.9/numexpr/utils.py 2018-09-28 17:52:46.000000000 +0200
+++ new/numexpr-2.7.0/numexpr/utils.py 2019-01-28 20:33:20.000000000 +0100
@@ -8,8 +8,12 @@
# rights to use.
####################################################################
+import logging
+log = logging.getLogger(__name__)
+
import os
import subprocess
+import platform
from numexpr.interpreter import _set_num_threads, MAX_THREADS
from numexpr import use_vml
@@ -93,7 +97,54 @@
old_nthreads = _set_num_threads(nthreads)
return old_nthreads
+def _init_num_threads():
+ """
+ Detects the environment variable 'NUMEXPR_MAX_THREADS' to set the threadpool
+ size, and if necessary the slightly redundant 'NUMEXPR_NUM_THREADS' or
+ 'OMP_NUM_THREADS' env vars to set the initial number of threads used by
+ the virtual machine.
+ """
+ # Any platform-specific short-circuits
+ if 'sparc' in platform.machine():
+ log.warning('The number of threads have been set to 1 because problems related '
+ 'to threading have been reported on some sparc machine. '
+ 'The number of threads can be changed using the "set_num_threads" '
+ 'function.')
+ set_num_threads(1)
+ return 1
+
+ env_configured = False
+ n_cores = detect_number_of_cores()
+ if 'NUMEXPR_MAX_THREADS' in os.environ:
+ # The user has configured NumExpr in the expected way, so suppress logs.
+ env_configured = True
+ n_cores = MAX_THREADS
+ else:
+ # The use has not set 'NUMEXPR_MAX_THREADS', so likely they have not
+ # configured NumExpr as desired, so we emit info logs.
+ if n_cores > MAX_THREADS:
+ log.info('Note: detected %d virtual cores but NumExpr set to maximum of %d, check "NUMEXPR_MAX_THREADS" environment variable.'%(n_cores, MAX_THREADS))
+ if n_cores > 8:
+ # The historical 'safety' limit.
+ log.info('Note: NumExpr detected %d cores but "NUMEXPR_MAX_THREADS" not set, so enforcing safe limit of 8.'%n_cores)
+ n_cores = 8
+
+ # 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:
+ requested_threads = int(os.environ['NUMEXPR_NUM_THREADS'])
+ elif 'OMP_NUM_THREADS' in os.environ:
+ requested_threads = int(os.environ['OMP_NUM_THREADS'])
+ else:
+ requested_threads = n_cores
+ if not env_configured:
+ log.info('NumExpr defaulting to %d threads.'%n_cores)
+
+ # The C-extension function performs its own checks against `MAX_THREADS`
+ set_num_threads(requested_threads)
+ return requested_threads
+
def detect_number_of_cores():
"""
Detects the number of cores on a system. Cribbed from pp.
@@ -119,8 +170,10 @@
def detect_number_of_threads():
"""
+ DEPRECATED: use `_init_num_threads` instead.
If this is modified, please update the note in: https://github.com/pydata/numexpr/wiki/Numexpr-Users-Guide
"""
+ log.warning('Deprecated, use `init_num_threads` instead.')
try:
nthreads = int(os.environ.get('NUMEXPR_NUM_THREADS', ''))
except ValueError:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr/version.py new/numexpr-2.7.0/numexpr/version.py
--- old/numexpr-2.6.9/numexpr/version.py 2018-12-21 01:00:09.000000000 +0100
+++ new/numexpr-2.7.0/numexpr/version.py 2019-08-13 22:10:52.000000000 +0200
@@ -8,4 +8,4 @@
# rights to use.
####################################################################
-version = '2.6.9'
+version = '2.7.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr.egg-info/PKG-INFO new/numexpr-2.7.0/numexpr.egg-info/PKG-INFO
--- old/numexpr-2.6.9/numexpr.egg-info/PKG-INFO 2018-12-21 19:38:11.000000000 +0100
+++ new/numexpr-2.7.0/numexpr.egg-info/PKG-INFO 2019-08-14 16:07:41.000000000 +0200
@@ -1,11 +1,12 @@
Metadata-Version: 1.0
Name: numexpr
-Version: 2.6.9
+Version: 2.7.0
Summary: Fast numerical expression evaluator for NumPy
Home-page: https://github.com/pydata/numexpr
Author: David M. Cooke, Francesc Alted and others
Author-email: david.m.cooke@gmail.com, faltet@gmail.com
License: MIT
+Description-Content-Type: UNKNOWN
Description: ======================================================
NumExpr: Fast numerical expression evaluator for NumPy
======================================================
@@ -26,8 +27,8 @@
:target: https://ci.appveyor.com/project/robbmcleod/numexpr
.. |docs| image:: https://readthedocs.org/projects/numexpr/badge/?version=latest
:target: http://numexpr.readthedocs.io/en/latest
- .. |doi| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1492916.svg
- :target: https://zenodo.org/record/1492916
+ .. |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
:target: https://pypi.python.org/pypi/numexpr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/numexpr.egg-info/SOURCES.txt new/numexpr-2.7.0/numexpr.egg-info/SOURCES.txt
--- old/numexpr-2.6.9/numexpr.egg-info/SOURCES.txt 2018-12-21 19:38:11.000000000 +0100
+++ new/numexpr-2.7.0/numexpr.egg-info/SOURCES.txt 2019-08-14 16:07:41.000000000 +0200
@@ -8,7 +8,6 @@
RELEASE_NOTES.rst
requirements.txt
setup.py
-site.cfg
site.cfg.example
./numexpr/tests/__init__.py
./numexpr/tests/test_numexpr.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/numexpr-2.6.9/site.cfg new/numexpr-2.7.0/site.cfg
--- old/numexpr-2.6.9/site.cfg 2018-12-21 01:06:15.000000000 +0100
+++ new/numexpr-2.7.0/site.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-# if setup does not find the MKL or does not use the configuration, copy this
-# file to "site.cfg" and edit the paths according to your installation of the
-# Intel MKL.
-
-# Note: some versions of MKL need to be linked to gfortran if compiled with
-# GNU C compiler. Uncomment next line if you get an error like "undefined
-# symbol: _gfortran_malloc"
-#
-# Note2: Some Fedora users reported that they had to install a
-# compatible version of the gfortran lib. See:
-# http://code.google.com/p/numexpr/issues/detail?id=15
-# for more info.
-[DEFAULT]
-#libraries = gfortran
-
-#[mkl]
-# Example for the MKL included in Intel C 11.0 compiler
-# (you may need a recent NumPy version for being able to search libraries
-# in different directories at a time)
-#library_dirs = /opt/intel/Compiler/11.0/074/mkl/lib/em64t/:/opt/intel/Compiler/11.0/074/lib/intel64
-#include_dirs = /opt/intel/Compiler/11.0/074/mkl/include/
-#mkl_libs = mkl_solver_ilp64, mkl_intel_ilp64, mkl_intel_thread, mkl_core, iomp5
-
-# This seems to work for MKL 11 with processors with AVX (Sandy Bridge and above) for Linux
-#library_dirs = /opt/intel/composerxe/mkl/lib/intel64:/opt/intel/composer_xe_2013.3.163/compiler/lib/intel64
-#include_dirs = /opt/intel/composerxe/mkl/include/
-#mkl_libs = mkl_intel_lp64, mkl_gf_lp64, mkl_intel_thread, mkl_core, mkl_blas95_lp64, mkl_lapack95_lp64, mkl_avx, mkl_vml_avx, mkl_rt, iomp5
-
-## Example for using MKL 10.0
-#library_dirs = /opt/intel/mkl/10.0.2.018/lib/em64t
-#include_dirs = /opt/intel/mkl/10.0.2.018/include
-
-# Example for using MKL 10.2 for Windows 64-bit
-#include_dirs = \Program Files\Intel\MKL\10.2.5.035\include
-#library_dirs = \Program Files\Intel\MKL\10.2.5.035\em64t\lib
-#mkl_libs = mkl_solver_ilp64, mkl_core, mkl_intel_thread, mkl_intel_ilp64, libiomp5md
-# The next works too, but for LP64 arithmetic
-#mkl_libs = mkl_core, mkl_intel_thread, mkl_intel_lp64, libiomp5md
-
-# Example with Intel compiler version 14.0.2 and MKL v11.1.2 on intel64 architecture
-#mkl_libs = mkl_intel_lp64, mkl_gf_lp64, mkl_intel_thread, mkl_core, mkl_def, mkl_vml_avx, mkl_rt, iomp5
-# For details, see https://github.com/pydata/numexpr/issues/148
-
-# Example for MKL2018 on Windows x64
-# https://software.intel.com/en-us/articles/building-numpyscipy-with-intel-mkl...
-# Please note that the valid os.pathsep is ';' on Windows and ':' on Linux
-# and that numpy.distutils.system_info only accepts the first instance of library_dirs
-[mkl]
-library_dirs=/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/mkl/lib/intel64;/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/compiler/lib/intel64
-include_dirs=/Program Files (x86)/IntelSWTools/compilers_and_libraries/windows/mkl/include
-mkl_libs = mkl_intel_lp64, mkl_intel_thread, mkl_core, libiomp5md
\ No newline at end of file