Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[Dependency Update]Update the numpy version #14588

Merged
merged 10 commits into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/docker/install/docs_requirements
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ h5py==2.8.0rc1
mock==2.0.0
nose==1.3.7
nose-timer==0.7.3
numpy<=1.15.2,>=1.8.2
pylint==1.8.3
numpy>1.16.0,<2.0.0
pylint==2.3.1; python_version >= '3.0'
pypandoc==1.4
recommonmark==0.4.0
requests<2.19.0,>=2.18.4
Expand Down
4 changes: 2 additions & 2 deletions ci/docker/install/ubuntu_publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ python2 get-pip.py

apt-get remove -y python3-urllib3

pip2 install nose cpplint==1.3.0 'numpy<=1.15.2,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip3 install nose cpplint==1.3.0 pylint==2.3.1 'numpy<=1.15.2,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip2 install nose cpplint==1.3.0 'numpy>1.16.0,<2.0.0' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip3 install nose cpplint==1.3.0 pylint==2.3.1 'numpy>1.16.0,<2.0.0' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
4 changes: 2 additions & 2 deletions ci/docker/install/ubuntu_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ wget -nv https://bootstrap.pypa.io/get-pip.py
python3 get-pip.py
python2 get-pip.py

pip2 install nose cpplint==1.3.0 'numpy<=1.15.2,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip3 install nose cpplint==1.3.0 pylint==2.3.1 'numpy<=1.15.2,>=1.8.2' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip2 install nose cpplint==1.3.0 'numpy>1.16.0,<2.0.0' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
pip3 install nose cpplint==1.3.0 pylint==2.3.1 'numpy>1.16.0,<2.0.0' nose-timer 'requests<2.19.0,>=2.18.4' h5py==2.8.0rc1 scipy==1.0.1 boto3
2 changes: 1 addition & 1 deletion ci/qemu/mxnet_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
urllib3<1.23,>=1.21.1
requests<2.19.0,>=2.18.4
graphviz<0.9.0,>=0.8.1
numpy<=1.15.0,>=1.8.2
numpy>1.16.0,<2.0.0
mock
nose
nose-timer
2 changes: 1 addition & 1 deletion docs/install/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cpplint==1.3.0
h5py==2.8.0rc1
nose
nose-timer
numpy<=1.15.2,>=1.8.2
numpy>1.16.0,<2.0.0
pylint==2.3.1; python_version >= '3.0'
requests<2.19.0,>=2.18.4
scipy==1.0.1
6 changes: 3 additions & 3 deletions python/mxnet/gluon/contrib/estimator/event_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ def train_begin(self, estimator, *args, **kwargs):
self.current_epoch = 0
self.current_batch = 0
if self.save_best:
self.best = np.Inf if self.monitor_op == np.less else -np.Inf
self.best = np.Inf if self.monitor_op == np.less else -np.Inf # pylint: disable=comparison-with-callable
if self.resume_from_checkpoint:
error_msg = "To use resume from checkpoint, you must only specify " \
"the same type of period you used for training." \
Expand Down Expand Up @@ -666,7 +666,7 @@ def __init__(self,
"if you want otherwise", self.monitor.get()[0])
self.monitor_op = np.less

if self.monitor_op == np.greater:
if self.monitor_op == np.greater: # pylint: disable=comparison-with-callable
self.min_delta *= 1
else:
self.min_delta *= -1
Expand All @@ -679,7 +679,7 @@ def train_begin(self, estimator, *args, **kwargs):
if self.baseline is not None:
self.best = self.baseline
else:
self.best = np.Inf if self.monitor_op == np.less else -np.Inf
self.best = np.Inf if self.monitor_op == np.less else -np.Inf # pylint: disable=comparison-with-callable

def epoch_end(self, estimator, *args, **kwargs):
monitor_name, monitor_value = self.monitor.get()
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
else:
from setuptools import setup
from setuptools.extension import Extension
kwargs = {'install_requires': ['numpy<=1.15.2,>=1.8.2', 'requests>=2.20.0,<3', 'graphviz<0.9.0,>=0.8.1'], 'zip_safe': False}
kwargs = {'install_requires': ['numpy>1.16.0,<2.0.0', 'requests>=2.20.0,<3', 'graphviz<0.9.0,>=0.8.1'], 'zip_safe': False}

with_cython = False
if '--with-cython' in sys.argv:
Expand Down
2 changes: 1 addition & 1 deletion tools/pip/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def has_ext_modules(self):


DEPENDENCIES = [
'numpy<1.15.0,>=1.8.2',
'numpy>1.16.0,<2.0.0',
'requests>=2.20.0',
'graphviz<0.9.0,>=0.8.1'
]
Expand Down