提交 6fe5f212 authored 作者: Caglar's avatar Caglar

few other cosmetic changes.

reverted back the min to numpy.min revert back to zip from izip.
上级 dff25cb4
...@@ -61,7 +61,6 @@ import logging ...@@ -61,7 +61,6 @@ import logging
import copy import copy
from sys import maxsize from sys import maxsize
import numpy import numpy
from itertools import izip
import theano import theano
from theano import tensor from theano import tensor
...@@ -297,7 +296,7 @@ class PushOutNonSeqScan(gof.Optimizer): ...@@ -297,7 +296,7 @@ class PushOutNonSeqScan(gof.Optimizer):
'which is not allowed to move. Report ' 'which is not allowed to move. Report '
'this on theano-users list'), x) 'this on theano-users list'), x)
outside_ins = [x.type.filter_variable(y) for x, y in outside_ins = [x.type.filter_variable(y) for x, y in
izip(nd.inputs, outside_ins)] zip(nd.inputs, outside_ins)]
# Do not call make_node for test_value # Do not call make_node for test_value
nw_outer_node = nd.op(*outside_ins, nw_outer_node = nd.op(*outside_ins,
...@@ -345,7 +344,7 @@ class PushOutNonSeqScan(gof.Optimizer): ...@@ -345,7 +344,7 @@ class PushOutNonSeqScan(gof.Optimizer):
givens = OrderedDict() givens = OrderedDict()
nw_outer = [] nw_outer = []
nw_inner = [] nw_inner = []
for to_repl, repl_in, repl_out in izip(clean_to_replace, for to_repl, repl_in, repl_out in zip(clean_to_replace,
clean_replace_with_in, clean_replace_with_in,
clean_replace_with_out): clean_replace_with_out):
if isinstance(repl_out, theano.Constant): if isinstance(repl_out, theano.Constant):
...@@ -467,7 +466,7 @@ class PushOutSeqScan(gof.Optimizer): ...@@ -467,7 +466,7 @@ class PushOutSeqScan(gof.Optimizer):
isinstance(x, tensor.Constant) or isinstance(x, tensor.Constant) or
(x in inner_seqs_set) (x in inner_seqs_set)
for x in nd.inputs]) and for x in nd.inputs]) and
not nd in to_remove_set): nd not in to_remove_set):
to_remove_add(nd) to_remove_add(nd)
outside_ins = [] outside_ins = []
depends_on_seqs = False depends_on_seqs = False
...@@ -580,7 +579,7 @@ class PushOutSeqScan(gof.Optimizer): ...@@ -580,7 +579,7 @@ class PushOutSeqScan(gof.Optimizer):
givens = OrderedDict() givens = OrderedDict()
nw_outer = [] nw_outer = []
nw_inner = [] nw_inner = []
for to_repl, repl_in, repl_out in izip(clean_to_replace, for to_repl, repl_in, repl_out in zip(clean_to_replace,
clean_replace_with_in, clean_replace_with_in,
clean_replace_with_out): clean_replace_with_out):
if isinstance(repl_out, theano.Constant): if isinstance(repl_out, theano.Constant):
...@@ -621,7 +620,7 @@ class PushOutSeqScan(gof.Optimizer): ...@@ -621,7 +620,7 @@ class PushOutSeqScan(gof.Optimizer):
if out in op.inner_mitsot_outs(ls): if out in op.inner_mitsot_outs(ls):
odx = op.inner_mitsot_outs(ls).index(out) odx = op.inner_mitsot_outs(ls).index(out)
inp = op.outer_mitsot(node)[odx] inp = op.outer_mitsot(node)[odx]
st = abs(min(op.mitsot_taps())) st = abs(numpy.min(op.mitsot_taps()))
y = tensor.set_subtensor(inp[st:], _y) y = tensor.set_subtensor(inp[st:], _y)
elif out in op.inner_sitsot_outs(ls): elif out in op.inner_sitsot_outs(ls):
odx = op.inner_sitsot_outs(ls).index(out) odx = op.inner_sitsot_outs(ls).index(out)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论