Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions python/paddle/v2/fluid/layer_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,12 @@ def get_parameter(self, name):
raise ValueError("no Parameter name %s found" % name)
return param

def create_tmp_variable(self, dtype):
def create_tmp_variable(self, dtype, stop_gradient=False):
return self.main_program.current_block().create_var(
name=unique_name(".".join([self.name, 'tmp'])),
dtype=dtype,
persistable=False)
persistable=False,
stop_gradient=stop_gradient)

def create_variable(self, *args, **kwargs):
return self.main_program.current_block().create_var(*args, **kwargs)
Expand Down
14 changes: 10 additions & 4 deletions python/paddle/v2/fluid/layers/nn.py
Original file line number Diff line number Diff line change
Expand Up @@ -971,20 +971,26 @@ def batch_norm(input,
attr=helper.param_attr, shape=param_shape, dtype=dtype, is_bias=True)

mean = helper.create_global_variable(
dtype=input.dtype, shape=param_shape, persistable=True)
dtype=input.dtype,
shape=param_shape,
persistable=True,
stop_gradient=True)
helper.set_variable_initializer(var=mean, initializer=Constant(0.0))

variance = helper.create_global_variable(
dtype=input.dtype, shape=param_shape, persistable=True)
dtype=input.dtype,
shape=param_shape,
persistable=True,
stop_gradient=True)
helper.set_variable_initializer(var=variance, initializer=Constant(1.0))

# create output
# mean and mean_out share the same memory
mean_out = mean
# variance and variance out share the same memory
variance_out = variance
saved_mean = helper.create_tmp_variable(dtype)
saved_variance = helper.create_tmp_variable(dtype)
saved_mean = helper.create_tmp_variable(dtype=dtype, stop_gradient=True)
saved_variance = helper.create_tmp_variable(dtype=dtype, stop_gradient=True)

batch_norm_out = helper.create_tmp_variable(dtype)

Expand Down