Merge pull request #515 from kmaehashi/numpy-1.17

Test on NumPy 1.17

docker.py

@@ -126,6 +126,7 @@ def get_numpy_choices():
             # cupy v5 or later
             choices.append('1.15')
             choices.append('1.16')
+            choices.append('1.17')
     return choices
 
 

run_multi_test.py

@@ -16,7 +16,7 @@
     parser.add_argument('--nccl', choices=docker.nccl_choices, required=True)
     parser.add_argument('--ideep', choices=['none', '1.0', '2.0'], required=True)
     parser.add_argument('--numpy',
-                        choices=['1.9', '1.10', '1.11', '1.12', '1.13', '1.14', '1.15', '1.16'],
+                        choices=['1.9', '1.10', '1.11', '1.12', '1.13', '1.14', '1.15', '1.16', '1.17'],
                         required=True)
     parser.add_argument('--scipy', choices=['none', '0.18', '0.19', '1.0'])
     parser.add_argument('--protobuf', choices=['2', '3', 'cpp-3'])
@@ -87,6 +87,8 @@
         conf['requires'].append('numpy<1.16')
     elif args.numpy == '1.16':
         conf['requires'].append('numpy<1.17')
+    elif args.numpy == '1.17':
+        conf['requires'].append('numpy<1.18')
 
     if args.scipy == '0.18':
         conf['requires'].append('scipy<0.19')

run_test.py

@@ -98,7 +98,7 @@
             'cudnn': 'cudnn75-cuda101',
             'nccl': 'nccl2.4-cuda101',
             'requires': [
-                'setuptools', 'pip', 'cython==0.28.3', 'numpy<1.17',
+                'setuptools', 'pip', 'cython==0.28.3', 'numpy<1.18',
                 'pillow',
             ],
         }
@@ -214,7 +214,7 @@
             'cudnn': 'cudnn7-cuda9',
             'nccl': 'nccl2.0-cuda9',
             'requires': [
-                'setuptools', 'pip', 'cython==0.28.0', 'numpy<1.17',
+                'setuptools', 'pip', 'cython==0.28.0', 'numpy<1.18',
             ],
         }
         script = './test_cupy.sh'

shuffle.py

@@ -77,14 +77,12 @@ def get_shuffle_params(params, index):
             if ret['numpy'] in ['1.9', '1.10', '1.11', '1.12']:
                 ret['numpy'] = '1.13'
 
-    # SciPy 0.19 installation from source (--no-binary) fails with new NumPy
-    if ret['numpy'] in ['1.16']:
+    # SciPy 0.19 installation from source (--no-binary) fails with new NumPy 1.16+.
+    # Theano 1.0.3 or earlier does not support NumPy 1.16+.
+    if ret['numpy'] not in ['1.9', '1.10', '1.11', '1.12', '1.13', '1.14', '1.15']:
         if ret.get('scipy', None) in ['0.18', '0.19']:
             ret['scipy'] = '1.0'
-
-    # Theano 1.0.3 or earlier does not support NumPy 1.16
-    if ret.get('theano') in ['0.8', '0.9']:
-        if ret['numpy'] == '1.16':
+        if ret.get('theano') in ['0.8', '0.9']:
             ret['theano'] = '1.0'
 
     cuda, cudnn, nccl = ret['cuda_cudnn_nccl']