Change do_model_average_for_mean_and_var to boolean in batch_normal.

python/paddle/fluid/layers/nn.py

@@ -1518,9 +1518,6 @@ def batch_norm(input,
     bias = helper.create_parameter(
         attr=helper.bias_attr, shape=param_shape, dtype=dtype, is_bias=True)
 
-    if do_model_average_for_mean_and_var:
-        do_model_average_for_mean_and_var = None
-
     mean = helper.create_parameter(
         attr=ParamAttr(
             name=moving_mean_name,

python/paddle/fluid/optimizer.py

@@ -853,7 +853,8 @@ class ModelAverage(Optimizer):
         self.params_grads = [] if params_grads is None else params_grads
         params = {}
         for param, grad in self.params_grads:
-            params[param.name] = (param, grad)
+            if param.do_model_average != False:
+                params[param.name] = (param, grad)
         for param in framework.default_main_program().global_block(
         ).all_parameters():
             if param.name not in params and param.do_model_average != False: