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 2017/12/10 20:11:11 UTC
[GitHub] piiswrong closed pull request #9013: Pylint fixes
piiswrong closed pull request #9013: Pylint fixes
URL: https://github.com/apache/incubator-mxnet/pull/9013
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/python/mxnet/base.py b/python/mxnet/base.py
index 80fc9011db..fbdf15f4f9 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 6ed9c3a974..fbcb4355a6 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 @@ def __init__(self, min_object_covered=0.1, aspect_ratio_range=(0.75, 1.33),
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 @@ def __init__(self, aspect_ratio_range=(0.75, 1.33), area_range=(1.0, 3.0),
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 @@ def draw_next(self, color=None, thickness=2, mean=None, std=None, clip=True,
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 013455614f..2da6452d44 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 @@ def register(klass):
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 12568ed206..3f6883e1c3 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 _process_layer_parameters(layer):
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
----------------------------------------------------------------
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