From 2548ff40581b1121767815187d0200d8cd0d5369 Mon Sep 17 00:00:00 2001 From: Sam Skalicky Date: Mon, 4 May 2020 17:18:39 +0000 Subject: [PATCH 1/4] fixed overwrite of args/aux variables --- python/mxnet/symbol/symbol.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/mxnet/symbol/symbol.py b/python/mxnet/symbol/symbol.py index 37b91867f84c..0bbbc1f29689 100644 --- a/python/mxnet/symbol/symbol.py +++ b/python/mxnet/symbol/symbol.py @@ -1484,17 +1484,17 @@ def optimize_for(self, backend, args=None, aux=None, ctx=None, **kwargs): assert isinstance(backend, str) if args is None or len(args) == 0: - args = [] + args_ = [] args_handle = c_array(NDArrayHandle, []) else: - args_handle, args = self._get_ndarray_inputs('args', args, + args_handle, args_ = self._get_ndarray_inputs('args', args, self.list_arguments(), False) if aux is None or len(aux) == 0: - aux = [] + aux_ = [] aux_handle = c_array(NDArrayHandle, []) else: - aux_handle, aux = self._get_ndarray_inputs('aux_states', aux, + aux_handle, aux_ = self._get_ndarray_inputs('aux_states', aux, self.list_auxiliary_states(), False) if ctx is None: ctx = current_context() @@ -1516,9 +1516,9 @@ def optimize_for(self, backend, args=None, aux=None, ctx=None, **kwargs): c_str(backend), ctypes.c_int(ctx.device_typeid), ctypes.byref(out), - mx_uint(len(args)), + mx_uint(len(args_)), args_handle, - mx_uint(len(aux)), + mx_uint(len(aux_)), aux_handle, mx_uint(len(key_list)), c_str_array(key_list), From e2d3e3129480d3caf84ebd2d3eafb3a308f91962 Mon Sep 17 00:00:00 2001 From: Sam Skalicky Date: Mon, 4 May 2020 17:38:39 +0000 Subject: [PATCH 2/4] fixed spacing --- python/mxnet/symbol/symbol.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/mxnet/symbol/symbol.py b/python/mxnet/symbol/symbol.py index 0bbbc1f29689..e90fb9b31e36 100644 --- a/python/mxnet/symbol/symbol.py +++ b/python/mxnet/symbol/symbol.py @@ -1488,14 +1488,14 @@ def optimize_for(self, backend, args=None, aux=None, ctx=None, **kwargs): args_handle = c_array(NDArrayHandle, []) else: args_handle, args_ = self._get_ndarray_inputs('args', args, - self.list_arguments(), False) + self.list_arguments(), False) if aux is None or len(aux) == 0: aux_ = [] aux_handle = c_array(NDArrayHandle, []) else: aux_handle, aux_ = self._get_ndarray_inputs('aux_states', aux, - self.list_auxiliary_states(), False) + self.list_auxiliary_states(), False) if ctx is None: ctx = current_context() assert isinstance(ctx, Context) From 44a9c80b71c261f81bcb7684d76c4384feebc8aa Mon Sep 17 00:00:00 2001 From: Sam Skalicky Date: Tue, 5 May 2020 01:37:45 +0000 Subject: [PATCH 3/4] Merged #18177 --- ci/docker/install/requirements | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/docker/install/requirements b/ci/docker/install/requirements index 2d5125e8e2da..a9ae997972a8 100644 --- a/ci/docker/install/requirements +++ b/ci/docker/install/requirements @@ -27,7 +27,8 @@ mock==2.0.0 nose==1.3.7 nose-timer==0.7.3 numpy>1.16.0,<2.0.0 -pylint==2.3.1; python_version >= '3.0' +pylint==2.3.1 # pylint and astroid need to be aligned +astroid==2.3.3 # pylint and astroid need to be aligned requests<2.19.0,>=2.18.4 scipy==1.2.1 six==1.11.0 From 54dd101a30609fe2d2260a323280896b491530aa Mon Sep 17 00:00:00 2001 From: Sam Skalicky Date: Tue, 26 May 2020 16:10:05 +0000 Subject: [PATCH 4/4] updated python RPM URL --- ci/docker/install/centos7_python.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/install/centos7_python.sh b/ci/docker/install/centos7_python.sh index 06c53bea48c1..796387e1b2ee 100755 --- a/ci/docker/install/centos7_python.sh +++ b/ci/docker/install/centos7_python.sh @@ -23,7 +23,7 @@ set -ex # Python 2.7 is installed by default, install 3.6 on top -yum -y install https://centos7.iuscommunity.org/ius-release.rpm +yum -y install https://repo.ius.io/ius-release-el7.rpm yum -y install python36u # Install PIP