From eedeb7e577cbb93c2e16dbf70e9d5f6c7299df6f Mon Sep 17 00:00:00 2001 From: lg Date: Sat, 10 Mar 2018 20:23:02 +0800 Subject: [PATCH 1/3] simplify --- tensorlayer/layers/core.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/tensorlayer/layers/core.py b/tensorlayer/layers/core.py index 090d48588..31a1a941c 100644 --- a/tensorlayer/layers/core.py +++ b/tensorlayer/layers/core.py @@ -371,24 +371,11 @@ def __init__(self, layer=None, name='layer'): self.all_params = list(layer.all_params) self.all_drop = dict(layer.all_drop) elif isinstance(layer, list): # 2. for layer have multiply inputs i.e. ConcatLayer - # add 1st layer - self.all_layers = list(layer[0].all_layers) - self.all_params = list(layer[0].all_params) - self.all_drop = dict(layer[0].all_drop) - # add other layers - for i in range(1, len(layer)): - self.all_layers.extend(list(layer[i].all_layers)) - self.all_params.extend(list(layer[i].all_params)) - self.all_drop.update(dict(layer[i].all_drop)) - # remove repeated stuff - self.all_layers = list_remove_repeat(self.all_layers) - self.all_params = list_remove_repeat(self.all_params) + self.all_layers = list_remove_repeat(sum([l.all_layers for l in layer], [])) + self.all_params = list_remove_repeat(sum([l.all_params for l in layer], [])) + self.all_drop = dict(sum([l.all_drop.items() for l in layer], [])) elif isinstance(layer, tf.Tensor): raise Exception("Please use InputLayer to convert Tensor/Placeholder to TL layer") - self.all_layers = [] - self.all_params = [] - self.all_drop = {} - elif layer is not None: raise Exception("Unsupport layer type %s" % type(layer)) From 836716ef52bc99031512ddc3920947d4edb40183 Mon Sep 17 00:00:00 2001 From: lg Date: Sat, 10 Mar 2018 20:47:12 +0800 Subject: [PATCH 2/3] fix --- .travis.yml | 2 +- tensorlayer/layers/core.py | 2 +- tests/requirements.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index af5497df1..b74d0385d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: - python tests/test_mnist_simple.py - python tests/test_reuse_mlp.py - python tests/test_layers_basic.py - - python tests/test_layers_convolutional.py + - python tests/test_layers_convolution.py - python tests/test_layers_core.py - python tests/test_layers_extend.py - python tests/test_layers_flow_control.py diff --git a/tensorlayer/layers/core.py b/tensorlayer/layers/core.py index 31a1a941c..db43f50ca 100644 --- a/tensorlayer/layers/core.py +++ b/tensorlayer/layers/core.py @@ -373,7 +373,7 @@ def __init__(self, layer=None, name='layer'): elif isinstance(layer, list): # 2. for layer have multiply inputs i.e. ConcatLayer self.all_layers = list_remove_repeat(sum([l.all_layers for l in layer], [])) self.all_params = list_remove_repeat(sum([l.all_params for l in layer], [])) - self.all_drop = dict(sum([l.all_drop.items() for l in layer], [])) + self.all_drop = dict(sum([list(l.all_drop.items()) for l in layer], [])) elif isinstance(layer, tf.Tensor): raise Exception("Please use InputLayer to convert Tensor/Placeholder to TL layer") elif layer is not None: diff --git a/tests/requirements.txt b/tests/requirements.txt index 50607888f..93a66198c 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,2 +1,3 @@ yapf==0.20.2 pydocstyle==2.1.1 +keras=2.1.5 From 6d6e816059df82e98e9217951ce3427d8d04ed36 Mon Sep 17 00:00:00 2001 From: lg Date: Sat, 10 Mar 2018 20:51:33 +0800 Subject: [PATCH 3/3] fix --- tests/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements.txt b/tests/requirements.txt index 93a66198c..d907538be 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ yapf==0.20.2 pydocstyle==2.1.1 -keras=2.1.5 +keras==2.1.5