You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/08/24 16:19:58 UTC
[GitHub] marcoabreu closed pull request #12322: Tighten up PyLint directives
again
marcoabreu closed pull request #12322: Tighten up PyLint directives again
URL: https://github.com/apache/incubator-mxnet/pull/12322
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ci/other/pylintrc b/ci/other/pylintrc
index db3da4cae57..841a3bea13f 100644
--- a/ci/other/pylintrc
+++ b/ci/other/pylintrc
@@ -83,24 +83,15 @@ enable=indexing-exception,old-raise-syntax,undefined-variable
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=
- design,
- similarities,
no-self-use,
attribute-defined-outside-init,
- locally-disabled,
- star-args,
- pointless-except,
bad-option-value,
global-statement,
fixme,
- suppressed-message,
- useless-suppression,
- locally-enabled,
no-member,
no-name-in-module,
import-error,
unsubscriptable-object,
- unbalanced-tuple-unpacking,
protected-access,
superfluous-parens,
invalid-name,
@@ -111,15 +102,18 @@ disable=
chained-comparison,
consider-using-dict-comprehension,
consider-using-set-comprehension,
- invalid-envvar-default,
- singleton-comparison,
try-except-raise,
useless-object-inheritance,
- useless-return,
c-extension-no-member,
deprecated-lambda,
redefined-builtin,
- unexpected-keyword-arg
+ too-few-public-methods,
+ too-many-arguments,
+ too-many-branches,
+ too-many-instance-attributes,
+ too-many-locals,
+ too-many-public-methods,
+ too-many-statements
# disable=unicode-builtin,delslice-method,using-cmp-argument,setslice-method,dict-view-method,parameter-unpacking,range-builtin-not-iterating,print-statement,file-builtin,old-raise-syntax,basestring-builtin,execfile-builtin,indexing-exception,import-star-module-level,coerce-method,long-builtin,old-ne-operator,old-division,no-absolute-import,raw_input-builtin,old-octal-literal,oct-method,xrange-builtin,hex-method,unpacking-in-except,nonzero-method,raising-string,intern-builtin,reload-builtin,metaclass-assignment,cmp-method,filter-builtin-not-iterating,apply-builtin,map-builtin-not-iterating,next-method-called,unichr-builtin,buffer-builtin,dict-iter-method,input-builtin,coerce-builtin,getslice-method,useless-suppression,standarderror-builtin,zip-builtin-not-iterating,suppressed-message,cmp-builtin,backtick,long-suffix,reduce-builtin,round-builtin
diff --git a/python/mxnet/base.py b/python/mxnet/base.py
index 2bfcdd62eda..89e1c9e087b 100644
--- a/python/mxnet/base.py
+++ b/python/mxnet/base.py
@@ -574,7 +574,7 @@ def _get_op_name_prefix(op_name):
return ""
-# pylint: enable=too-many-locals, invalid-name
+# pylint: enable=invalid-name
def _init_op_module(root_namespace, module_name, make_op_func):
"""
Registers op functions created by `make_op_func` under
diff --git a/python/mxnet/executor_manager.py b/python/mxnet/executor_manager.py
index 825aa76e43c..9a53562204b 100644
--- a/python/mxnet/executor_manager.py
+++ b/python/mxnet/executor_manager.py
@@ -127,7 +127,7 @@ def _bind_exec(sym, ctx, input_shapes, param_names, need_grad=False,
assert(arg_types is not None)
arg_arrays = []
- grad_arrays = {} if need_grad != False else None
+ grad_arrays = {} if need_grad is not False else None
arg_names = sym.list_arguments()
diff --git a/python/mxnet/gluon/rnn/rnn_cell.py b/python/mxnet/gluon/rnn/rnn_cell.py
index 21cc8043154..557837c3fa5 100644
--- a/python/mxnet/gluon/rnn/rnn_cell.py
+++ b/python/mxnet/gluon/rnn/rnn_cell.py
@@ -252,14 +252,12 @@ def unroll(self, length, inputs, begin_state=None, layout='NTC', merge_outputs=N
#pylint: disable=no-self-use
def _get_activation(self, F, inputs, activation, **kwargs):
"""Get activation function. Convert if is string"""
- if activation == 'tanh':
- return F.tanh(inputs, **kwargs)
- elif activation == 'sigmoid':
- return F.sigmoid(inputs, **kwargs)
- elif activation == 'relu':
- return F.relu(inputs, **kwargs)
- elif activation == 'softsign':
- return F.softsign(inputs, **kwargs)
+ func = {'tanh': F.tanh,
+ 'relu': F.relu,
+ 'sigmoid': F.sigmoid,
+ 'softsign': F.softsign}.get(activation)
+ if func:
+ return func(inputs, **kwargs)
elif isinstance(activation, string_types):
return F.Activation(inputs, act_type=activation, **kwargs)
elif isinstance(activation, LeakyReLU):
diff --git a/python/mxnet/image/detection.py b/python/mxnet/image/detection.py
index 63a44ab4643..caaa4006302 100644
--- a/python/mxnet/image/detection.py
+++ b/python/mxnet/image/detection.py
@@ -308,8 +308,7 @@ def _random_crop_proposal(self, label, height, width):
h -= 1
w = int(round(h * ratio))
area = w * h
- if (area < min_area or area > max_area or w > width or h > height \
- or w <= 0 or h <= 0):
+ if not (min_area <= area <= max_area and 0 <= w <= width and 0 <= h <= height):
continue
y = random.randint(0, max(0, height - h))
diff --git a/python/mxnet/model.py b/python/mxnet/model.py
index 3a50553a615..2666f8bbcd4 100644
--- a/python/mxnet/model.py
+++ b/python/mxnet/model.py
@@ -132,7 +132,7 @@ def _update_params_on_kvstore_nccl(param_arrays, grad_arrays, kvstore, param_nam
size = len(valid_grad_arrays)
start = 0
# Use aggregation by default only with NCCL
- default_batch = 16
+ default_batch = '16'
batch = int(os.getenv('MXNET_UPDATE_AGGREGATION_SIZE', default_batch))
while start < size:
end = start + batch if start + batch < size else size
@@ -378,7 +378,6 @@ def _train_multi_device(symbol, ctx, arg_names, param_names, aux_names,
_multiple_callbacks(eval_end_callback, eval_end_params)
eval_data.reset()
# end of all epochs
- return
def save_checkpoint(prefix, epoch, symbol, arg_params, aux_params):
diff --git a/python/mxnet/ndarray/register.py b/python/mxnet/ndarray/register.py
index 48d5c01fb43..3b19a772411 100644
--- a/python/mxnet/ndarray/register.py
+++ b/python/mxnet/ndarray/register.py
@@ -26,6 +26,7 @@
from ..base import mx_uint, check_call, _LIB, py_str, _init_op_module, _Null # pylint: disable=unused-import
+# pylint: disable=too-many-locals
def _generate_ndarray_function_code(handle, name, func_name, signature_only=False):
"""Generate function for ndarray op by handle and function name."""
real_name = ctypes.c_char_p()
diff --git a/python/mxnet/symbol/symbol.py b/python/mxnet/symbol/symbol.py
index 5f6cbd6b6e1..090726dc605 100644
--- a/python/mxnet/symbol/symbol.py
+++ b/python/mxnet/symbol/symbol.py
@@ -1285,6 +1285,7 @@ def _get_ndarray_inputs(arg_key, args, arg_names, allow_missing):
raise TypeError('Only accept list of NDArrays or dict of str to NDArray')
return c_array(NDArrayHandle, arg_handles), arg_arrays
+ # pylint: disable=too-many-locals
def simple_bind(self, ctx, grad_req='write', type_dict=None, stype_dict=None,
group2ctx=None, shared_arg_names=None, shared_exec=None,
shared_buffer=None, **kwargs):
diff --git a/python/mxnet/util.py b/python/mxnet/util.py
index 57bc2bf7638..62c05d25282 100644
--- a/python/mxnet/util.py
+++ b/python/mxnet/util.py
@@ -27,4 +27,4 @@ def makedirs(d):
from distutils.dir_util import mkpath
mkpath(d)
else:
- os.makedirs(d, exist_ok=True)
+ os.makedirs(d, exist_ok=True) # pylint: disable=unexpected-keyword-arg
diff --git a/python/setup.py b/python/setup.py
index add5e6681fe..91563539822 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -20,6 +20,8 @@
from __future__ import absolute_import
import os
import sys
+
+from setuptools import find_packages
# need to use distutils.core for correct placement of cython dll
kwargs = {}
if "--inplace" in sys.argv:
@@ -29,7 +31,6 @@
from setuptools import setup
from setuptools.extension import Extension
kwargs = {'install_requires': ['numpy<=1.15.0,>=1.8.2', 'requests<2.19.0,>=2.18.4', 'graphviz<0.9.0,>=0.8.1'], 'zip_safe': False}
-from setuptools import find_packages
with_cython = False
if '--with-cython' in sys.argv:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services