Skip to content

fixed deformable conv2d bug #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 23, 2018
Merged

fixed deformable conv2d bug #346

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
483e4da
improve docs
zsdonghao Feb 19, 2018
b3fd238
Merge branch 'master' of https://github.com/zsdonghao/tensorlayer
zsdonghao Feb 19, 2018
4bd1c82
Merge branch 'master' of https://github.com/zsdonghao/tensorlayer
zsdonghao Feb 20, 2018
6461729
Merge branch 'master' of https://github.com/zsdonghao/tensorlayer
zsdonghao Feb 22, 2018
c5caeac
fixed bug of deformable conv2d
zsdonghao Feb 22, 2018
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
8 changes: 4 additions & 4 deletions tensorlayer/layers/convolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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])
Expand Down