update

python/paddle/fluid/distribute_transpiler.py

@@ -408,10 +408,6 @@ class DistributeTranspiler:
         pserver_vars = pserver_program.global_block().vars
         created_var_map = dict()
         for _, var in pserver_vars.iteritems():
-            if var.type == core.VarDesc.VarType.STEP_SCOPES:
-                tmpvar = s_prog.global_block().create_var(
-                    name=var.name, persistable=var.persistable, type=var.type)
-            else:
             tmpvar = s_prog.global_block().clone_variable(var)
             created_var_map[var.name] = tmpvar
 
@@ -708,12 +704,6 @@ class DistributeTranspiler:
                 varlist = [varlist]
 
             for var in varlist:
-                if var.type == core.VarDesc.VarType.STEP_SCOPES:
-                    program.global_block().create_var(
-                        name=var.name,
-                        persistable=var.persistable,
-                        type=var.type)
-                else:
                 program.global_block().clone_variable(var)
 
         optimize_block.append_op(

python/paddle/fluid/framework.py

@@ -946,13 +946,20 @@ class Block(object):
             The new  variable cloned from 'var' in current block.
         """
         assert isinstance(var, Variable)
-        return self.create_var(
+        ret_var = None
+        # make STEP_SCOPES var can be safely cloned.
+        if var.type == core.VarDesc.VarType.STEP_SCOPES:
+            ret_var = self.create_var(
+                name=var.name, persistable=var.persistable, type=var.type)
+        else:
+            ret_var = self.create_var(
                 name=var.name,
                 shape=var.shape,
                 dtype=var.dtype,
                 type=var.type,
                 lod_level=var.lod_level,
                 persistable=True)
+        return ret_var
 
 
 class Program(object):