wassname/Flex-Convolution
1
0
Fork 0
mirror of https://github.com/wassname/Flex-Convolution.git synced 2026-09-09 11:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix layer, when input is not a tensor

Browse Source
This commit is contained in:
PatWie
2018-10-04 14:08:40 +02:00
parent 8be1b9ccf9
commit e2fdad61d9
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layers.py
+8 -19
View File
@@ -83,11 +83,8 @@ class FlexPooling(Layer):
neighborhoods = ops.convert_to_tensor(inputs[1], dtype=tf.int32)
if self.data_format == 'expanded':
features = _remove_dim(inputs[0], 2)
neighborhoods = _remove_dim(inputs[1], 2)
else:
features = inputs[0]
neighborhoods = inputs[1]
features = _remove_dim(features, 2)
neighborhoods = _remove_dim(neighborhoods, 2)
y, _ = _flex_pooling(features, neighborhoods)
@@ -234,13 +231,9 @@ class FlexConvolution(Layer):
neighborhoods = ops.convert_to_tensor(inputs[2], dtype=tf.int32)
if self.data_format == 'expanded':
features = _remove_dim(inputs[0], 2)
positions = _remove_dim(inputs[1], 2)
neighborhoods = _remove_dim(inputs[2], 2)
else:
features = inputs[0]
positions = inputs[1]
neighborhoods = inputs[2]
features = _remove_dim(features, 2)
positions = _remove_dim(positions, 2)
neighborhoods = _remove_dim(neighborhoods, 2)
y = _flex_convolution(features, positions, neighborhoods,
self.position_theta, self.position_bias)
@@ -339,13 +332,9 @@ class FlexConvolutionTranspose(FlexConvolution):
neighborhoods = ops.convert_to_tensor(inputs[2], dtype=tf.int32)
if self.data_format == 'expanded':
features = _remove_dim(inputs[0], 2)
positions = _remove_dim(inputs[1], 2)
neighborhoods = _remove_dim(inputs[2], 2)
else:
features = inputs[0]
positions = inputs[1]
neighborhoods = inputs[2]
features = _remove_dim(features, 2)
positions = _remove_dim(positions, 2)
neighborhoods = _remove_dim(neighborhoods, 2)
y = _flex_convolution_transpose(features, positions, neighborhoods,
self.position_theta, self.position_bias)