You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by jx...@apache.org on 2017/12/10 20:11:14 UTC
[incubator-mxnet] branch master updated: Pylint fixes (#9013)
This is an automated email from the ASF dual-hosted git repository.
jxie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 8a8e770 Pylint fixes (#9013)
8a8e770 is described below
commit 8a8e770c59ec9a085b3c2b7b3d919a9f75503bc4
Author: Aston Zhang <as...@amazon.com>
AuthorDate: Sun Dec 10 12:11:07 2017 -0800
Pylint fixes (#9013)
* Fix pylint errors
* Fixing more pylint errors
* Fix optimizer legacy logging.warning call to be self-consistent
---
python/mxnet/base.py | 2 +-
python/mxnet/image/detection.py | 20 +++++++++++---------
python/mxnet/optimizer.py | 10 ++++------
tools/caffe_converter/compare_layers.py | 10 ++++++----
4 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/python/mxnet/base.py b/python/mxnet/base.py
index 80fc901..fbdf15f 100644
--- a/python/mxnet/base.py
+++ b/python/mxnet/base.py
@@ -16,7 +16,7 @@
# under the License.
# coding: utf-8
-# pylint: disable=invalid-name, no-member
+# pylint: disable=invalid-name, no-member, trailing-comma-tuple
"""ctypes library of mxnet and helper functions."""
from __future__ import absolute_import
diff --git a/python/mxnet/image/detection.py b/python/mxnet/image/detection.py
index 6ed9c3a..fbcb435 100644
--- a/python/mxnet/image/detection.py
+++ b/python/mxnet/image/detection.py
@@ -20,9 +20,11 @@
from __future__ import absolute_import, print_function
-import random
-import logging
import json
+import logging
+import random
+import warnings
+
import numpy as np
from ..base import numeric_types
@@ -193,10 +195,10 @@ class DetRandomCropAug(DetAugmenter):
self.area_range = area_range
self.enabled = False
if (area_range[1] <= 0 or area_range[0] > area_range[1]):
- logging.warn('Skip DetRandomCropAug due to invalid area_range: %s', area_range)
+ warnings.warn('Skip DetRandomCropAug due to invalid area_range: %s', area_range)
elif (aspect_ratio_range[0] > aspect_ratio_range[1] or aspect_ratio_range[0] <= 0):
- logging.warn('Skip DetRandomCropAug due to invalid aspect_ratio_range: %s',
- aspect_ratio_range)
+ warnings.warn('Skip DetRandomCropAug due to invalid aspect_ratio_range: %s',
+ aspect_ratio_range)
else:
self.enabled = True
@@ -359,10 +361,10 @@ class DetRandomPadAug(DetAugmenter):
self.max_attempts = max_attempts
self.enabled = False
if (area_range[1] <= 1.0 or area_range[0] > area_range[1]):
- logging.warn('Skip DetRandomPadAug due to invalid parameters: %s', area_range)
+ warnings.warn('Skip DetRandomPadAug due to invalid parameters: %s', area_range)
elif (aspect_ratio_range[0] <= 0 or aspect_ratio_range[0] > aspect_ratio_range[1]):
- logging.warn('Skip DetRandomPadAug due to invalid aspect_ratio_range: %s',
- aspect_ratio_range)
+ warnings.warn('Skip DetRandomPadAug due to invalid aspect_ratio_range: %s',
+ aspect_ratio_range)
else:
self.enabled = True
@@ -840,7 +842,7 @@ class ImageDetIter(ImageIter):
try:
import cv2
except ImportError as e:
- logging.warn('Unable to import cv2, skip drawing: %s', str(e))
+ warnings.warn('Unable to import cv2, skip drawing: %s', str(e))
raise StopIteration
count = 0
try:
diff --git a/python/mxnet/optimizer.py b/python/mxnet/optimizer.py
index 0134556..2da6452 100644
--- a/python/mxnet/optimizer.py
+++ b/python/mxnet/optimizer.py
@@ -20,7 +20,6 @@
"""Weight updating functions."""
import math
import pickle
-import logging
import warnings
import numpy
from .base import py_str
@@ -129,11 +128,10 @@ class Optimizer(object):
assert(isinstance(klass, type))
name = klass.__name__.lower()
if name in Optimizer.opt_registry:
- logging.warning('WARNING: New optimizer %s.%s is overriding '
- 'existing optimizer %s.%s',
- klass.__module__, klass.__name__,
- Optimizer.opt_registry[name].__module__,
- Optimizer.opt_registry[name].__name__)
+ warnings.warn('WARNING: New optimizer %s.%s is overriding existing '
+ 'optimizer %s.%s', klass.__module__, klass.__name__,
+ Optimizer.opt_registry[name].__module__,
+ Optimizer.opt_registry[name].__name__)
Optimizer.opt_registry[name] = klass
return klass
diff --git a/tools/caffe_converter/compare_layers.py b/tools/caffe_converter/compare_layers.py
index 12568ed..3f6883e 100644
--- a/tools/caffe_converter/compare_layers.py
+++ b/tools/caffe_converter/compare_layers.py
@@ -17,11 +17,13 @@
"""Test converted models layer by layer
"""
-import os
import argparse
import logging
-import mxnet as mx
+import os
+import warnings
+
import cv2
+import mxnet as mx
import numpy as np
logging.basicConfig(level=logging.INFO)
@@ -275,8 +277,8 @@ def compare_layers_from_nets(caffe_net, arg_params, aux_params, exe, layer_name_
pass
else:
- logging.warn('No handling for layer %s of type %s, should we ignore it?', layer.name,
- layer.type)
+ warnings.warn('No handling for layer %s of type %s, should we ignore it?', layer.name,
+ layer.type)
return
--
To stop receiving notification emails like this one, please contact
['"commits@mxnet.apache.org" <co...@mxnet.apache.org>'].