Commit d9c9d475 authored by jcfr's avatar jcfr

ENH: Update numpy python package from 1.13.1 to 1.16.2

From: jamesobutler <jbutler@sonovol.com>

git-svn-id: http://svn.slicer.org/Slicer4/trunk@27989 3bd1e089-480b-0410-8dfb-8563597acbee
parent 2ba0c4d3
......@@ -71,7 +71,7 @@ set(${proj}_WORKING_DIR \"${EP_SOURCE_DIR}\")
ExternalProject_Execute(${proj} \"install\" \"${PYTHON_EXECUTABLE}\" setup.py install)
")
set(_version "1.13.1")
set(_version "1.16.2")
if(CMAKE_CONFIGURATION_TYPES)
set(_download_stamp "${Slicer_BINARY_DIR}/${proj}-prefix/src/${proj}-stamp/${CMAKE_CFG_INTDIR}/${proj}-download")
......@@ -88,8 +88,8 @@ ExternalProject_Execute(${proj} \"install\" \"${PYTHON_EXECUTABLE}\" setup.py in
#------------------------------------------------------------------------------
ExternalProject_Add(${proj}
${${proj}_EP_ARGS}
URL "https://pypi.python.org/packages/c0/3a/40967d9f5675fbb097ffec170f59c2ba19fc96373e73ad47c2cae9a30aed/numpy-${_version}.zip"
URL_MD5 "2c3c0f4edf720c3a7b525dacc825b9ae"
URL "https://files.pythonhosted.org/packages/cf/8d/6345b4f32b37945fedc1e027e83970005fc9c699068d2f566b82826515f2/numpy-${_version}.zip"
URL_HASH "SHA256=6c692e3879dde0b67a9dc78f9bfb6f61c666b4562fd8619632d7043fb5b691b0"
DOWNLOAD_DIR ${CMAKE_BINARY_DIR}
SOURCE_DIR ${EP_SOURCE_DIR}
BUILD_IN_SOURCE 1
......
--- numpy-1.13.1/numpy/distutils/system_info.py 2017-07-06 09:18:34.000000000 -0400
+++ NUMPY/numpy/distutils/system_info.py 2017-08-04 01:39:07.923887789 -0400
@@ -1501,17 +1501,9 @@
intel = 0
if os.path.exists('/System/Library/Frameworks'
'/Accelerate.framework/'):
- if intel:
- args.extend(['-msse3'])
- else:
- args.extend(['-faltivec'])
link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
elif os.path.exists('/System/Library/Frameworks'
'/vecLib.framework/'):
- if intel:
- args.extend(['-msse3'])
- else:
- args.extend(['-faltivec'])
link_args.extend(['-Wl,-framework', '-Wl,vecLib'])
if args:
self.set_info(extra_compile_args=args,
@@ -1607,19 +1599,11 @@
intel = 0
if os.path.exists('/System/Library/Frameworks'
'/Accelerate.framework/'):
--- numpy-1.16.2/numpy/distutils/system_info.py 2019-02-26 11:42:42.000000000 -0400
+++ NUMPY/numpy/distutils/system_info.py 2019-03-04 09:10:00.000000000 -0400
@@ -1919,20 +1919,12 @@ class accelerate_info(system_info):
if (os.path.exists('/System/Library/Frameworks'
'/Accelerate.framework/') and
'accelerate' in libraries):
- if intel:
- args.extend(['-msse3'])
- else:
......@@ -29,8 +11,9 @@
args.extend([
'-I/System/Library/Frameworks/vecLib.framework/Headers'])
link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
elif os.path.exists('/System/Library/Frameworks'
'/vecLib.framework/'):
elif (os.path.exists('/System/Library/Frameworks'
'/vecLib.framework/') and
'veclib' in libraries):
- if intel:
- args.extend(['-msse3'])
- else:
......
--- numpy-1.13.1/numpy/distutils/fcompiler/__init__.py 2017-07-01 09:18:08.000000000 -0400
+++ NUMPY/numpy/distutils/fcompiler/__init__.py 2017-09-04 15:17:11.936427258 -0400
@@ -430,8 +430,8 @@
--- numpy-1.16.2/numpy/distutils/fcompiler/__init__.py 2019-02-26 11:42:42.000000000 -0400
+++ NUMPY/numpy/distutils/fcompiler/__init__.py 2019-03-04 09:10:00.000000000 -0400
@@ -428,8 +428,8 @@ class FCompiler(CCompiler):
def get_version(self, force=False, ok_status=[0]):
assert self._is_customised
version = CCompiler.get_version(self, force=force, ok_status=ok_status)
......@@ -9,5 +9,3 @@
+ # if version is None:
+ # raise CompilerNotFound()
return version
############################################################
--- numpy-1.13.1/numpy/core/getlimits.py 2017-07-01 09:18:08.000000000 -0400
+++ NUMPY/numpy/core/getlimits.py 2017-09-04 16:12:45.169686811 -0400
@@ -167,7 +167,9 @@
# Ignore runtime error when this is not f128
with numeric.errstate(all='ignore'):
_huge_f128 = (_ld(1) - _epsneg_f128) / _tiny_f128 * _ld(4)
-_float128_ma = MachArLike(_ld,
+with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ _float128_ma = MachArLike(_ld,
machep=-112,
negep=-113,
minexp=-16382,
--- numpy-1.16.2/numpy/core/getlimits.py 2019-02-26 11:42:42.000000000 -0400
+++ NUMPY/numpy/core/getlimits.py 2019-03-04 09:10:00.000000000 -0400
@@ -161,7 +161,9 @@ def _register_known_types():
# Ignore runtime error when this is not f128
with numeric.errstate(all='ignore'):
huge_f128 = (ld(1) - epsneg_f128) / tiny_f128 * ld(4)
- float128_ma = MachArLike(ld,
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ float128_ma = MachArLike(ld,
machep=-112,
negep=-113,
minexp=-16382,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment