提交 aba58aec authored 作者: Frederic Bastien's avatar Frederic Bastien

backport to python 2.4

上级 667defc5
......@@ -155,7 +155,12 @@ class SeqOptimizer(Optimizer, list):
elif hasattr(self,"__name__"): print self.__name__,
print " time %.3fs for %d/%d nodes before/after optimization"%(sum(l),nb_node_before,len(env.nodes))
ll = [(opt.__name__ if hasattr(opt,"__name__")else opt.name,opt.__class__.__name__) for opt in self]
ll=[]
for opt in self:
if hasattr(opt,"__name__"):
ll.append((opt.__name__,opt.__class__.__name__))
else:
ll.append((opt.name,opt.__class__.__name__))
lll=zip(l,ll)
def cmp(a,b):
if a[0]==b[0]: return 0
......
......@@ -1900,7 +1900,10 @@ class ScanSpaceOptimizer(Optimizer):
except:
req_steps = None
break
store_steps[i] = req_steps if req_steps != None else 0
if req_steps != None:
store_steps[i] = req_steps
else:
store_steps[i] = 0
else:
store_steps[i] = op.store_steps[i]
if numpy.any(store_steps!= op.store_steps):
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论