Commit 0c65c338 authored by Yuxin Wu's avatar Yuxin Wu

fix new linting rules

parent 9ecf87de
...@@ -79,24 +79,22 @@ def eval_with_funcs(predictors, nr_eval, get_player_fn): ...@@ -79,24 +79,22 @@ def eval_with_funcs(predictors, nr_eval, get_player_fn):
k.start() k.start()
time.sleep(0.1) # avoid simulator bugs time.sleep(0.1) # avoid simulator bugs
stat = StatCounter() stat = StatCounter()
try:
for _ in tqdm(range(nr_eval), **get_tqdm_kwargs()): for _ in tqdm(range(nr_eval), **get_tqdm_kwargs()):
r = q.get() r = q.get()
stat.feed(r) stat.feed(r)
logger.info("Waiting for all the workers to finish the last run...") logger.info("Waiting for all the workers to finish the last run...")
for k in threads: for k in threads:
k.stop() k.stop()
for k in threads: for k in threads:
k.join() k.join()
while q.qsize(): while q.qsize():
r = q.get() r = q.get()
stat.feed(r) stat.feed(r)
except:
logger.exception("Eval") if stat.count > 0:
finally: return (stat.average, stat.max)
if stat.count > 0: return (0, 0)
return (stat.average, stat.max)
return (0, 0)
def eval_model_multithread(pred, nr_eval, get_player_fn): def eval_model_multithread(pred, nr_eval, get_player_fn):
......
...@@ -258,7 +258,7 @@ class ExpReplay(DataFlow, Callback): ...@@ -258,7 +258,7 @@ class ExpReplay(DataFlow, Callback):
mean, max = v.average, v.max mean, max = v.average, v.max
self.trainer.monitors.put_scalar('expreplay/mean_score', mean) self.trainer.monitors.put_scalar('expreplay/mean_score', mean)
self.trainer.monitors.put_scalar('expreplay/max_score', max) self.trainer.monitors.put_scalar('expreplay/max_score', max)
except: except Exception:
logger.exception("Cannot log training scores.") logger.exception("Cannot log training scores.")
v.reset() v.reset()
......
...@@ -152,7 +152,7 @@ def convert_param_name(param): ...@@ -152,7 +152,7 @@ def convert_param_name(param):
for k, v in six.iteritems(param): for k, v in six.iteritems(param):
try: try:
newname = name_conversion(k) newname = name_conversion(k)
except: except Exception:
logger.error("Exception when processing caffe layer {}".format(k)) logger.error("Exception when processing caffe layer {}".format(k))
raise raise
logger.info("Name Transform: " + k + ' --> ' + newname) logger.info("Name Transform: " + k + ' --> ' + newname)
......
[flake8] [flake8]
max-line-length = 120 max-line-length = 120
ignore = F403,F401,F405,F841,E401,E402 ignore = F403,F401,F405,F841,E4,E741,E742,E743
exclude = private, exclude = private,
FasterRCNN/utils FasterRCNN/utils
...@@ -38,7 +38,7 @@ class Inferencer(Callback): ...@@ -38,7 +38,7 @@ class Inferencer(Callback):
for k, v in six.iteritems(ret): for k, v in six.iteritems(ret):
try: try:
v = float(v) v = float(v)
except: except ValueError:
logger.warn("{} returns a non-scalar statistics!".format(type(self).__name__)) logger.warn("{} returns a non-scalar statistics!".format(type(self).__name__))
continue continue
else: else:
......
...@@ -199,7 +199,7 @@ class HumanHyperParamSetter(HyperParamSetter): ...@@ -199,7 +199,7 @@ class HumanHyperParamSetter(HyperParamSetter):
dic = {str(k): float(v) for k, v in lines} dic = {str(k): float(v) for k, v in lines}
ret = dic[self.param.readable_name] ret = dic[self.param.readable_name]
return ret return ret
except: except Exception:
logger.warn( logger.warn(
"Cannot find {} in {}".format( "Cannot find {} in {}".format(
self.param.readable_name, self.file_name)) self.param.readable_name, self.file_name))
......
...@@ -129,7 +129,7 @@ class BatchData(ProxyDataFlow): ...@@ -129,7 +129,7 @@ class BatchData(ProxyDataFlow):
else: else:
try: try:
tp = dt.dtype tp = dt.dtype
except: except AttributeError:
raise TypeError("Unsupported type to batch: {}".format(type(dt))) raise TypeError("Unsupported type to batch: {}".format(type(dt)))
try: try:
result.append( result.append(
...@@ -144,7 +144,7 @@ class BatchData(ProxyDataFlow): ...@@ -144,7 +144,7 @@ class BatchData(ProxyDataFlow):
try: try:
# open an ipython shell if possible # open an ipython shell if possible
import IPython as IP; IP.embed() # noqa import IPython as IP; IP.embed() # noqa
except: except ImportError:
pass pass
return result return result
......
...@@ -247,7 +247,7 @@ class ILSVRC12(ILSVRC12Files): ...@@ -247,7 +247,7 @@ class ILSVRC12(ILSVRC12Files):
cnt += 1 cnt += 1
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except: except Exception:
ret.append(None) ret.append(None)
logger.info("{}/{} images have bounding box.".format(cnt, len(imglist))) logger.info("{}/{} images have bounding box.".format(cnt, len(imglist)))
return ret return ret
......
...@@ -61,7 +61,7 @@ def _zmq_catch_error(name): ...@@ -61,7 +61,7 @@ def _zmq_catch_error(name):
raise DataFlowTerminated() raise DataFlowTerminated()
else: else:
raise raise
except: except Exception:
raise raise
...@@ -110,7 +110,7 @@ class _MultiProcessZMQDataFlow(DataFlow): ...@@ -110,7 +110,7 @@ class _MultiProcessZMQDataFlow(DataFlow):
x.terminate() x.terminate()
try: try:
print("{} successfully cleaned-up.".format(type(self).__name__)) print("{} successfully cleaned-up.".format(type(self).__name__))
except: except Exception:
pass pass
...@@ -347,7 +347,7 @@ class MultiThreadMapData(ProxyDataFlow): ...@@ -347,7 +347,7 @@ class MultiThreadMapData(ProxyDataFlow):
return return
# cannot ignore None here. will lead to unsynced send/recv # cannot ignore None here. will lead to unsynced send/recv
self.outq.put(self.func(dp)) self.outq.put(self.func(dp))
except: except Exception:
if self.stopped(): if self.stopped():
pass # skip duplicated error messages pass # skip duplicated error messages
else: else:
......
...@@ -16,7 +16,7 @@ class StaticDynamicAxis(object): ...@@ -16,7 +16,7 @@ class StaticDynamicAxis(object):
try: try:
st = f(self.static) st = f(self.static)
return StaticDynamicAxis(st, st) return StaticDynamicAxis(st, st)
except: except TypeError:
return StaticDynamicAxis(None, f(self.dynamic)) return StaticDynamicAxis(None, f(self.dynamic))
def __str__(self): def __str__(self):
...@@ -53,7 +53,7 @@ class StaticDynamicShape(object): ...@@ -53,7 +53,7 @@ class StaticDynamicShape(object):
self.static[axis] = st self.static[axis] = st
self.dynamic[axis] = StaticLazyAxis(st) self.dynamic[axis] = StaticLazyAxis(st)
return return
except: except TypeError:
pass pass
self.static[axis] = None self.static[axis] = None
dyn = self.dynamic[axis] dyn = self.dynamic[axis]
......
...@@ -193,7 +193,7 @@ class Trainer(object): ...@@ -193,7 +193,7 @@ class Trainer(object):
logger.info("Training was stopped.") logger.info("Training was stopped.")
except KeyboardInterrupt: except KeyboardInterrupt:
logger.info("Detected Ctrl-C and exiting main loop.") logger.info("Detected Ctrl-C and exiting main loop.")
except: except Exception:
raise raise
finally: finally:
self._callbacks.after_train() self._callbacks.after_train()
......
...@@ -273,7 +273,7 @@ class Trainer(object): ...@@ -273,7 +273,7 @@ class Trainer(object):
logger.info("Training was stopped.") logger.info("Training was stopped.")
except KeyboardInterrupt: except KeyboardInterrupt:
logger.info("Detected Ctrl-C and exiting main loop.") logger.info("Detected Ctrl-C and exiting main loop.")
except: except Exception:
raise raise
finally: finally:
self._callbacks.after_train() self._callbacks.after_train()
......
...@@ -15,7 +15,7 @@ from tensorpack.user_ops.zmq_recv import ( # noqa ...@@ -15,7 +15,7 @@ from tensorpack.user_ops.zmq_recv import ( # noqa
try: try:
num = int(sys.argv[1]) num = int(sys.argv[1])
except: except ValueError:
num = 2 num = 2
ENDPOINT = 'ipc://test-pipe' ENDPOINT = 'ipc://test-pipe'
......
...@@ -53,7 +53,7 @@ def download(url, dir, filename=None): ...@@ -53,7 +53,7 @@ def download(url, dir, filename=None):
fpath, _ = urllib.request.urlretrieve(url, fpath, reporthook=hook(t)) fpath, _ = urllib.request.urlretrieve(url, fpath, reporthook=hook(t))
statinfo = os.stat(fpath) statinfo = os.stat(fpath)
size = statinfo.st_size size = statinfo.st_size
except: except IOError:
logger.error("Failed to download {}".format(url)) logger.error("Failed to download {}".format(url))
raise raise
assert size > 0, "Download an empty file!" assert size > 0, "Download an empty file!"
......
...@@ -135,7 +135,7 @@ def get_caffe_pb(): ...@@ -135,7 +135,7 @@ def get_caffe_pb():
version = version.decode('utf-8') version = version.decode('utf-8')
version = float('.'.join(version.split(' ')[1].split('.')[:2])) version = float('.'.join(version.split(' ')[1].split('.')[:2]))
assert version >= 2.7, "Require protoc>=2.7 for Python3" assert version >= 2.7, "Require protoc>=2.7 for Python3"
except: except Exception:
logger.exception("protoc --version gives: " + str(version)) logger.exception("protoc --version gives: " + str(version))
raise raise
......
[flake8] [flake8]
max-line-length = 120 max-line-length = 120
ignore = E265 ignore = E265,E741,E742,E743
exclude = .git, exclude = .git,
tensorpack/__init__.py, tensorpack/__init__.py,
setup.py, setup.py,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment