Getting ready for release 2.6.4

pydata · Sep 14, 2017 · 2e45faf · 2e45faf
1 parent 7e1b543
commit 2e45faf
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ numexpr.egg-info/
 *.swp
 *~
 doc/_build
+site.cfg
 
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
@@ -9,10 +9,20 @@ Project documentation is now available at:
 
 http://numexpr.readthedocs.io/
 
+P.S. due to seg-faults occuring for MKL with ceil and floor we have pushed a 
+quick patch for 2.6.3 to 2.6.4. Thanks to Christoph Gohkle for the fixes.
+
 ==========================
- Announcing Numexpr 2.6.3
+ Announcing Numexpr 2.6.4
 ==========================
 
+Changes from 2.6.3 to 2.6.4
+---------------------------
+
+- Christoph Gohkle noticed a lack of coverage for the 2.6.3 
+  `floor` and `ceil` functions for MKL that caused seg-faults in 
+   test, so thanks to him for that.
+
 Changes from 2.6.2 to 2.6.3
 ---------------------------
 

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -5,7 +5,9 @@
 Changes from 2.6.3 to 2.6.4
 ---------------------------
 
-  #XXX version-specific blurb XXX#
+- Christoph Gohkle noticed a lack of coverage for the 2.6.3 
+  `floor` and `ceil` functions for MKL that caused seg-faults in 
+   test, so thanks to him for that.
 
 Changes from 2.6.2 to 2.6.3
 ---------------------------

diff --git a/numexpr/version.py b/numexpr/version.py
@@ -8,4 +8,4 @@
 #  rights to use.
 ####################################################################
 
-version = '2.6.4dev0'
+version = '2.6.4'
diff --git a/site.cfg.example b/site.cfg.example
@@ -14,7 +14,6 @@
 #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)
@@ -42,3 +41,11 @@
 #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-and-intel-fortran-on-windows
+# 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_2018.0.124/windows/mkl/lib/intel64;/Program Files (x86)/IntelSWTools/compilers_and_libraries_2018.0.124/windows/compiler/lib/intel64_win
+include_dirs=/Program Files (x86)/IntelSWTools/compilers_and_libraries_2018.0.124/windows/mkl/include
+mkl_libs = mkl_intel_lp64, mkl_intel_thread, mkl_core, libiomp5md