change type of BN's 'mean' and 'variance' from persistable variable to Parameter

python/paddle/v2/fluid/layers/nn.py

@@ -1519,21 +1519,21 @@ def batch_norm(input,
     bias = helper.create_parameter(
         attr=helper.bias_attr, shape=param_shape, dtype=dtype, is_bias=True)
 
-    mean = helper.create_global_variable(
+    mean = helper.create_parameter(
-        name=moving_mean_name,
+        attr=ParamAttr(
-        dtype=input.dtype,
+            name=moving_mean_name, initializer=Constant(0.0), trainable=False),
         shape=param_shape,
-        persistable=True,
+        dtype=input.dtype)
-        stop_gradient=True)
+    mean.stop_gradient = True
-    helper.set_variable_initializer(var=mean, initializer=Constant(0.0))
 
-    variance = helper.create_global_variable(
+    variance = helper.create_parameter(
+        attr=ParamAttr(
             name=moving_variance_name,
-        dtype=input.dtype,
+            initializer=Constant(1.0),
+            trainable=False),
         shape=param_shape,
-        persistable=True,
+        dtype=input.dtype)
-        stop_gradient=True)
+    variance.stop_gradient = True
-    helper.set_variable_initializer(var=variance, initializer=Constant(1.0))
 
     # create output
     # mean and mean_out share the same memory