提交 61761bf8 编写于 作者: wgzqz's avatar wgzqz

Fix _process_input bug that will appear when (sub,div) are lists but not np.array instances.

上级 b5c4e506
...@@ -24,11 +24,21 @@ class Model(object): ...@@ -24,11 +24,21 @@ class Model(object):
assert len(bounds) == 2 assert len(bounds) == 2
assert channel_axis in [0, 1, 2, 3] assert channel_axis in [0, 1, 2, 3]
if preprocess is None:
preprocess = (0, 1)
self._bounds = bounds self._bounds = bounds
self._channel_axis = channel_axis self._channel_axis = channel_axis
self._preprocess = preprocess
# Make self._preprocess to be (0,1) if possible, so that don't need
# to do substract or divide.
if preprocess is not None:
sub, div = preprocess
if not np.any(sub):
sub = None
if np.all(np.array(div) == 1):
div = None
assert (div is None) or np.all(div)
self._preprocess = (sub, div)
else:
self._preprocess = (None, None)
def bounds(self): def bounds(self):
""" """
...@@ -45,10 +55,9 @@ class Model(object): ...@@ -45,10 +55,9 @@ class Model(object):
def _process_input(self, input_): def _process_input(self, input_):
res = None res = None
sub, div = self._preprocess sub, div = self._preprocess
if np.any(sub != 0): if sub is not None:
res = input_ - sub res = input_ - sub
assert np.any(div != 0) if div is not None:
if np.any(div != 1):
if res is None: # "res = input_ - sub" is not executed! if res is None: # "res = input_ - sub" is not executed!
res = input_ / div res = input_ / div
else: else:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册