Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 30

# Number of days of inactivity before a stale issue is closed
daysUntilClose: 15

# Issues with these labels will never be considered stale
exemptLabels:
- features
- bug
- discussion
- help wanted
- enhancement

# Label to use when marking an issue as stale
staleLabel:
- stale
- awaiting_response

# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.

# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
This issue has been automatically closed because it has not had
recent activity. Thank you for your contributions.
11 changes: 8 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,16 @@ To release a new version, please update the changelog as followed:
## [Unreleased]

### Added
- Repository:
- Danger CI has been added to enforce the update of the changelog (by @lgarithm and @DEKHTIARJonathan)
- Tutorials:
- `tutorial_tfslim` added by (@2wins).
- `tutorial_tfslim` has been introduced to show how to use `SlimNetsLayer` (by @2wins in #560).
- Test:
- `Layer_DeformableConvolution_Test` added to reproduce issue #572 with deformable convolution (by @DEKHTIARJonathan in #573)
- CI Tool:
- Danger CI has been added to enforce the update of the changelog (by @lgarithm and @DEKHTIARJonathan in #563)
- https://github.com/apps/stale/ added to clean stale issues (by @DEKHTIARJonathan in #573)

### Changed
- Tensorflow CPU & GPU dependencies moved to separated requirement files in order to allow PyUP.io to parse them (by @DEKHTIARJonathan in #573)

### Deprecated

Expand All @@ -83,6 +87,7 @@ To release a new version, please update the changelog as followed:
### Fixed
- Issue #498 - Deprecation Warning Fix in `tl.layers.RNNLayer` with `inspect` (by @DEKHTIARJonathan in #574)
- Issue #498 - Deprecation Warning Fix in `tl.files` with truth value of an empty array is ambiguous (by @DEKHTIARJonathan in #575)
- Issue #572 with deformable convolution fixed (by @DEKHTIARJonathan in #573)

### Security

Expand Down
2 changes: 1 addition & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ end
github.api.update_pull_request(
github.pr_json.base.repo.full_name,
github.pr_json.number,
{:body => github.pr_body + "Some new text"}
{:body => github.pr_body}
)
1 change: 1 addition & 0 deletions requirements_tf_cpu.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tensorflow>=1.8.0,<1.9
1 change: 1 addition & 0 deletions requirements_tf_gpu.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tensorflow-gpu>=1.8.0,<1.9
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def req_file(filename):
install_requires = req_file("requirements.txt")

extras_require = {
'tf_cpu': ['tensorflow>=1.8.0,<1.9'],
'tf_gpu': ['tensorflow-gpu>=1.8.0,<1.9'],
'tf_cpu': req_file("requirements_tf_cpu.txt"),
'tf_gpu': req_file("requirements_tf_gpu.txt"),
'db': req_file("requirements_db.txt"),
'dev': req_file("requirements_dev.txt"),
'doc': req_file("docs/requirements.txt"),
Expand Down
2 changes: 1 addition & 1 deletion tensorlayer/layers/convolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ def _tf_batch_map_offsets(inputs, offsets, grid_offset):
name='b_deformableconv2d', shape=(shape[-1]), initializer=b_init, dtype=LayersConfig.tf_dtype,
**b_init_args
)
tf.reshape()

self.outputs = tf.reshape(
tensor=act(tf.nn.conv3d(input_deform, W, strides=[1, 1, 1, 1, 1], padding='VALID', name=None) + b),
shape=(tf.shape(self.inputs)[0], input_h, input_w, shape[-1])
Expand Down
25 changes: 25 additions & 0 deletions tests/test_layers_convolution.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,31 @@ def test_layers_n10(self):
self.assertEqual(len(self.n10_all_layers), 1)


class Layer_DeformableConvolution_Test(unittest.TestCase):

@classmethod
def setUpClass(cls):

x = tf.placeholder(tf.float32, [None, 299, 299, 3])
net = tl.layers.InputLayer(x, name='input_layer')

offset1 = tl.layers.Conv2d(net, 18, (3, 3), (1, 1), act=tf.nn.relu, padding='SAME', name='offset1')
cls.net1 = tl.layers.DeformableConv2d(net, offset1, 32, (3, 3), act=tf.nn.relu, name='deformable1')

offset2 = tl.layers.Conv2d(cls.net1, 18, (3, 3), (1, 1), act=tf.nn.relu, padding='SAME', name='offset2')
cls.net2 = tl.layers.DeformableConv2d(cls.net1, offset2, 64, (3, 3), act=tf.nn.relu, name='deformable2')

@classmethod
def tearDownClass(cls):
tf.reset_default_graph()

def test_net1_shape(self):
self.assertEqual(self.net1.outputs.shape[1:], [299, 299, 32])

def test_net2_shape(self):
self.assertEqual(self.net2.outputs.shape[1:], [299, 299, 64])


if __name__ == '__main__':
# tf.logging.set_verbosity(tf.logging.INFO)
tf.logging.set_verbosity(tf.logging.DEBUG)
Expand Down