@@ -396,7 +396,7 @@ def __op_have_grad_input__(op):
396
396
return varname
397
397
return ""
398
398
399
- def __clone_lr_op_sub_block__ (op , program , new_block ):
399
+ def __clone_lr_op_sub_block__ (op , program , lr_block ):
400
400
if not op .has_attr ('sub_block' ):
401
401
return
402
402
@@ -405,17 +405,17 @@ def __clone_lr_op_sub_block__(op, program, new_block):
405
405
assert isinstance (origin_block , Block )
406
406
# we put the new sub block to new block to follow the block
407
407
# hierarchy of the original blocks
408
- new_sub_block = program .create_block (new_block .idx )
408
+ new_sub_block = program .create_block (lr_block .idx )
409
409
410
410
# clone vars
411
411
for var in origin_block .vars :
412
412
new_sub_block .clone_variable (var )
413
413
414
414
# clone ops
415
- for op in origin_block .ops :
416
- self ._clone_lr_op (program , new_sub_block , op )
415
+ for origin_op in origin_block .ops :
416
+ cloned_op = self ._clone_lr_op (program , new_sub_block , origin_op )
417
417
# clone sub_block of op
418
- __clone_lr_op_sub_block__ (op , program , new_sub_block )
418
+ __clone_lr_op_sub_block__ (cloned_op , program , new_sub_block )
419
419
420
420
# reset the block of op
421
421
op .set_attr ('sub_block' , new_sub_block )
@@ -429,9 +429,10 @@ def __clone_lr_op_sub_block__(op, program, new_block):
429
429
pserver_program .num_blocks - 1 )
430
430
optimize_blocks .append (lr_decay_block )
431
431
for _ , op in enumerate (lr_ops ):
432
- self ._append_pserver_non_opt_ops (lr_decay_block , op )
432
+ cloned_op = self ._append_pserver_non_opt_ops (lr_decay_block , op )
433
433
# append sub blocks to pserver_program in lr_decay_op
434
- __clone_lr_op_sub_block__ (op , pserver_program , lr_decay_block )
434
+ __clone_lr_op_sub_block__ (cloned_op , pserver_program ,
435
+ lr_decay_block )
435
436
436
437
# append op to the current block
437
438
grad_to_block_id = []
@@ -1214,7 +1215,7 @@ def _clone_lr_op(self, program, block, op):
1214
1215
if var not in program .global_block ().vars :
1215
1216
block .clone_variable (var )
1216
1217
1217
- block .append_op (
1218
+ return block .append_op (
1218
1219
type = op .type , inputs = inputs , outputs = outputs , attrs = op .attrs )
1219
1220
1220
1221
def _append_pserver_non_opt_ops (self , optimize_block , opt_op ):
@@ -1252,7 +1253,7 @@ def _append_pserver_non_opt_ops(self, optimize_block, opt_op):
1252
1253
elif not program .global_block ().vars .has_key (var .name ):
1253
1254
program .global_block ().clone_variable (var )
1254
1255
1255
- optimize_block .append_op (
1256
+ return optimize_block .append_op (
1256
1257
type = opt_op .type ,
1257
1258
inputs = inputs ,
1258
1259
outputs = outputs ,
0 commit comments