提交 9a2ef83c authored 作者: Ziye Fan's avatar Ziye Fan

fix profile output problems with final_optimizer

上级 658ec11f
...@@ -1939,7 +1939,9 @@ class EquilibriumOptimizer(NavigatorOptimizer): ...@@ -1939,7 +1939,9 @@ class EquilibriumOptimizer(NavigatorOptimizer):
not_used = [] not_used = []
not_used_time = 0 not_used_time = 0
process_count = {} process_count = {}
for o in opt.global_optimizers + list(opt.get_local_optimizers()): for o in (opt.global_optimizers +
list(opt.get_local_optimizers()) +
opt.final_optimizers):
process_count.setdefault(o, 0) process_count.setdefault(o, 0)
for count in loop_process_count: for count in loop_process_count:
for o, v in count.iteritems(): for o, v in count.iteritems():
...@@ -1977,9 +1979,15 @@ class EquilibriumOptimizer(NavigatorOptimizer): ...@@ -1977,9 +1979,15 @@ class EquilibriumOptimizer(NavigatorOptimizer):
prof2[0].get_local_optimizers()) prof2[0].get_local_optimizers())
global_optimizers = set(prof1[0].global_optimizers).union( global_optimizers = set(prof1[0].global_optimizers).union(
prof2[0].global_optimizers) prof2[0].global_optimizers)
if len(prof1[0].final_optimizers) > 0 or len(prof2[0].final_optimizers) > 0:
final_optimizers = set(prof1[0].final_optimizers).union(
prof2[0].final_optimizers)
else:
final_optimizers = None
new_opt = EquilibriumOptimizer( new_opt = EquilibriumOptimizer(
local_optimizers.union(global_optimizers), local_optimizers.union(global_optimizers),
max_use_ratio=1) max_use_ratio=1,
final_optimizers=final_optimizers)
def merge_list(l1, l2): def merge_list(l1, l2):
l = copy.copy(l1) l = copy.copy(l1)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论