提交 939bce9e authored 作者: Arnaud Bergeron's avatar Arnaud Bergeron

"risky" flake8 corrections.

上级 251889e4
...@@ -139,8 +139,9 @@ class Scan(PureOp): ...@@ -139,8 +139,9 @@ class Scan(PureOp):
self.output_types = [] self.output_types = []
idx = 0 idx = 0
jdx = 0 jdx = 0
tensorConstructor = lambda broadcastable, dtype: TensorType(
broadcastable=broadcastable, dtype=dtype) def tensorConstructor(broadcastable, dtype):
return TensorType(broadcastable=broadcastable, dtype=dtype)
if typeConstructor is None: if typeConstructor is None:
typeConstructor = tensorConstructor typeConstructor = tensorConstructor
...@@ -208,7 +209,8 @@ class Scan(PureOp): ...@@ -208,7 +209,8 @@ class Scan(PureOp):
else: else:
tmp_in, tmp_out = scan_utils.reconstruct_graph(self.inputs, tmp_in, tmp_out = scan_utils.reconstruct_graph(self.inputs,
self.outputs) self.outputs)
local_fgraph = gof.FunctionGraph(tmp_in, tmp_out, clone=False) # This is actually required for the line just after.
gof.FunctionGraph(tmp_in, tmp_out, clone=False)
self._cmodule_key = gof.CLinker().cmodule_key_variables(self.inputs, self._cmodule_key = gof.CLinker().cmodule_key_variables(self.inputs,
self.outputs, self.outputs,
[]) [])
...@@ -735,9 +737,6 @@ class Scan(PureOp): ...@@ -735,9 +737,6 @@ class Scan(PureOp):
node_input_storage = [storage_map[r] for r in node.inputs] node_input_storage = [storage_map[r] for r in node.inputs]
node_output_storage = [storage_map[r] for r in node.outputs] node_output_storage = [storage_map[r] for r in node.outputs]
node_input_compute = [compute_map[r] for r in node.inputs]
node_output_compute = [compute_map[r] for r in node.outputs]
#_logger.debug('Compiling node %i of graph' % node_idx)
# If a shared variable is the result of a ViewOp it is a clear # If a shared variable is the result of a ViewOp it is a clear
# indication that we need to copy that value after the perform of # indication that we need to copy that value after the perform of
# scan is done # scan is done
...@@ -914,32 +913,33 @@ class Scan(PureOp): ...@@ -914,32 +913,33 @@ class Scan(PureOp):
cython_destroy_map = numpy.asarray(cython_destroy_map, cython_destroy_map = numpy.asarray(cython_destroy_map,
dtype='int32') dtype='int32')
from . import scan_perform_ext from . import scan_perform_ext
p = lambda node, args, outs:\
scan_perform_ext.perform(self.n_shared_outs, def p(node, args, outs):
self.n_mit_mot_outs, return scan_perform_ext.perform(self.n_shared_outs,
self.n_seqs, self.n_mit_mot_outs,
self.n_mit_mot, self.n_seqs,
self.n_mit_sot, self.n_mit_mot,
self.n_sit_sot, self.n_mit_sot,
self.n_nit_sot, self.n_sit_sot,
args[0], self.n_nit_sot,
self.as_while, args[0],
cython_mintaps, self.as_while,
cython_tap_array, cython_mintaps,
cython_tap_array_len, cython_tap_array,
cython_vector_seqs, cython_tap_array_len,
cython_vector_outs, cython_vector_seqs,
cython_mit_mot_out_slices, cython_vector_outs,
cython_mit_mot_out_nslices, cython_mit_mot_out_slices,
cython_mitmots_preallocated, cython_mit_mot_out_nslices,
cython_inps_is_tensor, cython_mitmots_preallocated,
cython_outs_is_tensor, cython_inps_is_tensor,
self.fn.fn, cython_outs_is_tensor,
self.fn, self.fn.fn,
cython_destroy_map, self.fn,
args, cython_destroy_map,
outs, args,
self, node) outs,
self, node)
except (ImportError, theano.gof.cmodule.MissingGXX): except (ImportError, theano.gof.cmodule.MissingGXX):
p = self.execute p = self.execute
# default arguments are stored in the closure of `rval` # default arguments are stored in the closure of `rval`
...@@ -1759,7 +1759,7 @@ class Scan(PureOp): ...@@ -1759,7 +1759,7 @@ class Scan(PureOp):
j_inp_idx = self.var_mappings["outer_inp_from_outer_out"][jidx] j_inp_idx = self.var_mappings["outer_inp_from_outer_out"][jidx]
if j_inp_idx != -1: if j_inp_idx != -1:
if connection_pattern[j_inp_idx][iidx] == True: if connection_pattern[j_inp_idx][iidx] is True:
for k in xrange(len(connection_pattern)): for k in xrange(len(connection_pattern)):
if connection_pattern[k][jidx]: if connection_pattern[k][jidx]:
connection_pattern[k][iidx] = True connection_pattern[k][iidx] = True
...@@ -2165,7 +2165,6 @@ class Scan(PureOp): ...@@ -2165,7 +2165,6 @@ class Scan(PureOp):
outer_inp_seqs = [x[::-1] for x in inputs[1:1 + self.n_seqs]] outer_inp_seqs = [x[::-1] for x in inputs[1:1 + self.n_seqs]]
for idx in xrange(self.n_mit_mot + self.n_mit_sot): for idx in xrange(self.n_mit_mot + self.n_mit_sot):
mintap = numpy.min(self.tap_array[idx]) mintap = numpy.min(self.tap_array[idx])
maxtap = numpy.max(self.tap_array[idx])
if idx < self.n_mit_mot: if idx < self.n_mit_mot:
outmaxtap = numpy.max(self.mitmot_out_taps()[idx]) outmaxtap = numpy.max(self.mitmot_out_taps()[idx])
else: else:
...@@ -2221,7 +2220,6 @@ class Scan(PureOp): ...@@ -2221,7 +2220,6 @@ class Scan(PureOp):
inner_inp_seqs += Xts inner_inp_seqs += Xts
# mitmot # mitmot
outer_inp_mitmot = [] outer_inp_mitmot = []
outer_out_mitmot = []
inner_inp_mitmot = [] inner_inp_mitmot = []
inner_out_mitmot = [] inner_out_mitmot = []
mitmot_inp_taps = [] mitmot_inp_taps = []
...@@ -2506,7 +2504,6 @@ class Scan(PureOp): ...@@ -2506,7 +2504,6 @@ class Scan(PureOp):
self.outer_shared(inputs) + self.outer_shared(inputs) +
self.outer_non_seqs(inputs)) self.outer_non_seqs(inputs))
inner_other_args = self_inputs[offset:]
inner_gfn_ins = (inner_inp_seqs + inner_gfn_ins = (inner_inp_seqs +
inner_inp_mitmot + inner_inp_mitmot +
inner_inp_sitsot + inner_inp_sitsot +
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论