Merge branch 'master' into Laicheng0830-patch-1

Author: Laicheng0830

LICENSE.rst

@@ -1,7 +1,7 @@
 License
 =======
 
-Copyright (c) 2016~2018 The TensorLayer contributors.  All rights reserved.
+Copyright (c) 2016~2020 The TensorLayer contributors.  All rights reserved.
 
                                  Apache License
                            Version 2.0, January 2004
@@ -208,4 +208,4 @@ Copyright (c) 2016~2018 The TensorLayer contributors.  All rights reserved.
 
 Contact
 =======
-Questions? Please contact hao.[email protected]
+Questions? Please contact hao.[email protected]

tensorlayer/layers/normalization.py

@@ -226,7 +226,6 @@ def __init__(
         self.moving_var_init = moving_var_init
         self.num_features = num_features
 
-        self.channel_axis = -1 if data_format == 'channels_last' else 1
         self.axes = None
 
         if num_features is not None:
@@ -288,6 +287,7 @@ def build(self, inputs_shape):
     def forward(self, inputs):
         self._check_input_shape(inputs)
 
+        self.channel_axis = len(inputs.shape) - 1 if self.data_format == 'channels_last' else 1
         if self.axes is None:
             self.axes = [i for i in range(len(inputs.shape)) if i != self.channel_axis]