Merge pull request #1029 from warshallrho/master

[fix bug] (1) add (non)trainable_weights in Layerlist (2) remove redu…

Author: rundiwu

CHANGELOG.md

@@ -110,6 +110,8 @@ To release a new version, please update the changelog as followed:
 - Set allow_pickle=True in np.load() (#PR 1021)
 - Remove `private_method` decorator (#PR 1025)
 - Copy original model's `trainable_weights` and `nontrainable_weights` when initializing `ModelLayer` (#PR 1026)
+- Copy original model's `trainable_weights` and `nontrainable_weights` when initializing `LayerList` (#PR 1029)
+- remove redundant parts in `model.all_layers` (#PR 1029)
 
 ### Removed
 
@@ -119,7 +121,7 @@ To release a new version, please update the changelog as followed:
 
 - @zsdonghao
 - @ChrisWu1997: #1010 #1015 #1025
-- @warshallrho: #1017 #1021 #1026
+- @warshallrho: #1017 #1021 #1026 #1029
 - @ArnoldLIULJ: #1023
 - @JingqingZ: #1023
 

tensorlayer/layers/core.py

@@ -602,6 +602,8 @@ def __init__(self, layers, name=None):
 
         is_built = True
         for layer in self.layers:
+            self._trainable_weights.extend(layer.trainable_weights)
+            self._nontrainable_weights.extend(layer.nontrainable_weights)
             if layer._built is False:
                 is_built = False
             if layer._built and layer.all_weights is not None:

tensorlayer/models/core.py

@@ -358,7 +358,12 @@ def all_layers(self):
             attr_list.remove("all_weights")
             attr_list.remove("trainable_weights")
             attr_list.remove("nontrainable_weights")
+            attr_list.remove("_all_weights")
+            attr_list.remove("_trainable_weights")
+            attr_list.remove("_nontrainable_weights")
             attr_list.remove("all_layers")
+            attr_list.remove("_all_layers")
+            attr_list.remove("n_weights")
             for idx, attr in enumerate(attr_list):
                 try:
                     if isinstance(getattr(self, attr), Layer):