提交 84c54600 authored 作者: Frederic's avatar Frederic

remove the EQ opt in a EQ opt. This is useless as the outer opt had only 1 inner opt.

上级 fe4d5645
...@@ -1681,7 +1681,6 @@ scan_eqopt1 = theano.gof.EquilibriumDB() ...@@ -1681,7 +1681,6 @@ scan_eqopt1 = theano.gof.EquilibriumDB()
scan_seqopt1 = theano.gof.SequenceDB() scan_seqopt1 = theano.gof.SequenceDB()
scan_eqopt2 = theano.gof.EquilibriumDB() scan_eqopt2 = theano.gof.EquilibriumDB()
scan_seqopt2 = theano.gof.EquilibriumDB()
# We run before blas opt at 1.7 and specialize 2.0 # We run before blas opt at 1.7 and specialize 2.0
# but after stabilize at 1.5. Should we put it before stabilize? # but after stabilize at 1.5. Should we put it before stabilize?
optdb.register('scan_eqopt1', scan_eqopt1, .1, 'fast_run', 'scan') optdb.register('scan_eqopt1', scan_eqopt1, .1, 'fast_run', 'scan')
...@@ -1694,8 +1693,6 @@ optdb.register('scanOp_make_inplace', ...@@ -1694,8 +1693,6 @@ optdb.register('scanOp_make_inplace',
'inplace', 'inplace',
'scan') 'scan')
scan_eqopt2.register(
'all_scan_opts', scan_seqopt2, 1, 'fast_run', 'scan')
scan_eqopt1.register( scan_eqopt1.register(
'all_pushout_opt', scan_seqopt1, 1, 'fast_run', 'scan') 'all_pushout_opt', scan_seqopt1, 1, 'fast_run', 'scan')
...@@ -1731,7 +1728,7 @@ scan_seqopt1.register('scan_pushout_dot1', ...@@ -1731,7 +1728,7 @@ scan_seqopt1.register('scan_pushout_dot1',
'scan') 'scan')
scan_seqopt2.register('constant_folding_for_scan2', scan_eqopt2.register('constant_folding_for_scan2',
opt.in2out(tensor.opt.constant_folding, opt.in2out(tensor.opt.constant_folding,
ignore_newtrees=True), ignore_newtrees=True),
1, 1,
...@@ -1739,7 +1736,7 @@ scan_seqopt2.register('constant_folding_for_scan2', ...@@ -1739,7 +1736,7 @@ scan_seqopt2.register('constant_folding_for_scan2',
'scan') 'scan')
scan_seqopt2.register('scanOp_remove_constants_and_unused_inputs1', scan_eqopt2.register('scanOp_remove_constants_and_unused_inputs1',
opt.in2out(remove_constants_and_unused_inputs_scan, opt.in2out(remove_constants_and_unused_inputs_scan,
ignore_newtrees=True), ignore_newtrees=True),
2, 2,
...@@ -1751,14 +1748,14 @@ scan_seqopt2.register('scanOp_remove_constants_and_unused_inputs1', ...@@ -1751,14 +1748,14 @@ scan_seqopt2.register('scanOp_remove_constants_and_unused_inputs1',
# after const merge but before stabilize so that we can have identity # after const merge but before stabilize so that we can have identity
# for equivalent nodes but we still have the chance to hoist stuff out # for equivalent nodes but we still have the chance to hoist stuff out
# of the scan later. # of the scan later.
scan_seqopt2.register('scanOp_merge', scan_eqopt2.register('scanOp_merge',
ScanMerge(), ScanMerge(),
4, 4,
'fast_run', 'fast_run',
'scan') 'scan')
# After Merge optimization # After Merge optimization
scan_seqopt2.register('scanop_remove_constants_and_unused_inputs2', scan_eqopt2.register('scanop_remove_constants_and_unused_inputs2',
opt.in2out(remove_constants_and_unused_inputs_scan, opt.in2out(remove_constants_and_unused_inputs_scan,
ignore_newtrees=True), ignore_newtrees=True),
5, 5,
...@@ -1766,7 +1763,7 @@ scan_seqopt2.register('scanop_remove_constants_and_unused_inputs2', ...@@ -1766,7 +1763,7 @@ scan_seqopt2.register('scanop_remove_constants_and_unused_inputs2',
'fast_run', 'fast_run',
'scan') 'scan')
scan_seqopt2.register('scanOp_merge_inouts', scan_eqopt2.register('scanOp_merge_inouts',
opt.in2out(scan_merge_inouts, ignore_newtrees=True), opt.in2out(scan_merge_inouts, ignore_newtrees=True),
6, 6,
'scan_merge_inouts', 'scan_merge_inouts',
...@@ -1776,14 +1773,14 @@ scan_seqopt2.register('scanOp_merge_inouts', ...@@ -1776,14 +1773,14 @@ scan_seqopt2.register('scanOp_merge_inouts',
# Just before specialize to have the other optimization # Just before specialize to have the other optimization
# like constant folding being applied # like constant folding being applied
# This don't introduce inplace. # This don't introduce inplace.
scan_seqopt2.register('scanOp_save_mem', scan_eqopt2.register('scanOp_save_mem',
ScanSaveMem(), ScanSaveMem(),
7, 7,
'fast_run', 'fast_run',
'scan') 'scan')
# After everything else # After everything else
scan_seqopt2.register('scanOp_remove_constants_and_unused_inputs3', scan_eqopt2.register('scanOp_remove_constants_and_unused_inputs3',
opt.in2out(remove_constants_and_unused_inputs_scan, opt.in2out(remove_constants_and_unused_inputs_scan,
ignore_newtrees=True), ignore_newtrees=True),
8, 8,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论