提交 5dac6c2d authored 作者: sentient07's avatar sentient07

moved the node_created out of the loop

上级 fab5ab7b
...@@ -347,7 +347,6 @@ class GraphToGPU(NavigatorOptimizer): ...@@ -347,7 +347,6 @@ class GraphToGPU(NavigatorOptimizer):
process_count[lopt] += 1 process_count[lopt] += 1
if move_to_GPU: if move_to_GPU:
node_created[lopt] += len(theano.gof.graph.ops([mapping[i] for i in node.inputs], node.outputs))
t_opt = time.time() t_opt = time.time()
try: try:
new_ops = lopt.transform( new_ops = lopt.transform(
...@@ -358,9 +357,10 @@ class GraphToGPU(NavigatorOptimizer): ...@@ -358,9 +357,10 @@ class GraphToGPU(NavigatorOptimizer):
[mapping[i] for i in node.inputs], [mapping[i] for i in node.inputs],
node.outputs) node.outputs)
finally: finally:
time_opts[lopt] += time.time() - t_opt t_opt2 = time.time()
self.new_opts.append(lopt)
if new_ops: if new_ops:
self.new_opts.append(lopt)
time_opts[lopt] = max(time_opts[lopt], (t_opt2 - t_opt))
break break
if not new_ops: if not new_ops:
newnode = node.clone_with_new_inputs([mapping.get(i) newnode = node.clone_with_new_inputs([mapping.get(i)
...@@ -381,6 +381,10 @@ class GraphToGPU(NavigatorOptimizer): ...@@ -381,6 +381,10 @@ class GraphToGPU(NavigatorOptimizer):
else: else:
outputs = new_ops(*[mapping[i] for i in node.inputs], outputs = new_ops(*[mapping[i] for i in node.inputs],
return_list=True) return_list=True)
if new_ops:
node_created[lopt] += len(theano.gof.graph.ops([mapping[i] for i in node.inputs], outputs))
for new_o, old_o in zip(outputs, node.outputs): for new_o, old_o in zip(outputs, node.outputs):
mapping[old_o] = new_o mapping[old_o] = new_o
...@@ -434,6 +438,7 @@ class GraphToGPU(NavigatorOptimizer): ...@@ -434,6 +438,7 @@ class GraphToGPU(NavigatorOptimizer):
process_count = {} process_count = {}
for o in (opt.new_opts): for o in (opt.new_opts):
process_count.setdefault(o, 0) process_count.setdefault(o, 0)
process_count[o] + 1
for o, count in iteritems(process_count): for o, count in iteritems(process_count):
if count > 0: if count > 0:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论