From 483e4da5470dd46fc1453b6729cae1dcbd1bfae7 Mon Sep 17 00:00:00 2001 From: zsdonghao Date: Mon, 19 Feb 2018 17:51:33 +0000 Subject: [PATCH 1/2] improve docs --- tensorlayer/layers/convolution.py | 2 ++ tensorlayer/layers/core.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tensorlayer/layers/convolution.py b/tensorlayer/layers/convolution.py index e313b221b..a103739fc 100644 --- a/tensorlayer/layers/convolution.py +++ b/tensorlayer/layers/convolution.py @@ -1382,6 +1382,8 @@ def deconv2d(layer, A :class:`DeConv2dLayer` object. """ + if act is None: + act = tf.identity assert len(strides) == 2, "len(strides) should be 2, DeConv2d and DeConv2dLayer are different." if tf.__version__ > '1.3': logging.info("DeConv2d %s: n_filters:%s strides:%s pad:%s act:%s" % (name, str(n_filter), str(strides), padding, act.__name__)) diff --git a/tensorlayer/layers/core.py b/tensorlayer/layers/core.py index 3233e459b..213335df9 100644 --- a/tensorlayer/layers/core.py +++ b/tensorlayer/layers/core.py @@ -69,7 +69,7 @@ def clear_layers_name(): Examples --------- - Reset the current graph and try to refine model. + Clean the current graph and try to re-define model. >>> for .... (different model settings): >>> with tf.Graph().as_default() as graph: # clear all variables of TF @@ -912,7 +912,7 @@ class ReconLayer(DenseLayer): Methods ------- - pretrain(self, sess, x, X_train, X_val, denoise_name=None, n_epoch=100, batch_size=128, print_freq=10, save=True, save_name='w1pre') + pretrain(sess, x, X_train, X_val, denoise_name=None, n_epoch=100, batch_size=128, print_freq=10, save=True, save_name='w1pre') Start to pre-train the parameters of the previous DenseLayer. Notes From c5caeaca125690d4a307f6c8ef9800ec4edb4222 Mon Sep 17 00:00:00 2001 From: zsdonghao Date: Thu, 22 Feb 2018 19:48:39 +0000 Subject: [PATCH 2/2] fixed bug of deformable conv2d --- tensorlayer/layers/convolution.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tensorlayer/layers/convolution.py b/tensorlayer/layers/convolution.py index a103739fc..d7b3432d8 100644 --- a/tensorlayer/layers/convolution.py +++ b/tensorlayer/layers/convolution.py @@ -59,7 +59,7 @@ def __init__( act = tf.identity logging.info("Conv1dLayer %s: shape:%s stride:%s pad:%s act:%s" % (self.name, str(shape), str(stride), padding, act.__name__)) - with tf.variable_scope(name) as vs: + with tf.variable_scope(name): # as vs: W = tf.get_variable(name='W_conv1d', shape=shape, initializer=W_init, dtype=D_TYPE, **W_init_args) self.outputs = tf.nn.convolution( self.inputs, W, strides=(stride, ), padding=padding, dilation_rate=(dilation_rate, ), data_format=data_format) # 1.2 @@ -834,9 +834,9 @@ def _tf_batch_map_offsets(inputs, offsets, grid_offset): offset_params = [osparam for osparam in offset_layer.all_params if osparam not in layer.all_params] offset_layers = [oslayer for oslayer in offset_layer.all_layers if oslayer not in layer.all_layers] - self.all_params.extend(offset_params) - self.all_layers.extend(offset_layers) - self.all_drop.update(offset_layer.all_drop) + self.all_params.extend(list(offset_params)) + self.all_layers.extend(list(offset_layers)) + self.all_drop.update(dict(offset_layer.all_drop)) # this layer self.all_layers.extend([self.outputs])