Skip to content

update sampling layers #901

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 1 commit into from
Dec 7, 2018
Merged

update sampling layers #901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 36 additions & 10 deletions tensorlayer/layers/image_resampling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,31 @@ def __init__(

if not isinstance(size, (list, tuple)) and len(size) == 2:
raise AssertionError()

if len(self.inputs.get_shape()) == 3:
if is_scale:
size_h = size[0] * tf.shape(self.inputs)[0]
size_w = size[1] * tf.shape(self.inputs)[1]
input_shape = self.inputs.shape.as_list()
if input_shape[0] is not None:
size_h = size[0] * input_shape[0]
else:
size_h = size[0] * tf.shape(self.inputs)[0]
if input_shape[1] is not None:
size_w = size[1] * input_shape[1]
else:
size_w = size[1] * tf.shape(self.inputs)[1]
size = [size_h, size_w]

elif len(self.inputs.get_shape()) == 4:
if is_scale:
size_h = size[0] * tf.shape(self.inputs)[1]
size_w = size[1] * tf.shape(self.inputs)[2]
input_shape = self.inputs.shape.as_list()
if input_shape[1] is not None:
size_h = size[0] * input_shape[1]
else:
size_h = size[0] * tf.shape(self.inputs)[1]
if input_shape[2] is not None:
size_w = size[1] * input_shape[2]
else:
size_w = size[1] * tf.shape(self.inputs)[2]
size = [size_h, size_w]

else:
raise Exception("Donot support shape %s" % tf.shape(self.inputs))

Expand Down Expand Up @@ -135,14 +147,28 @@ def __init__(

if len(self.inputs.get_shape()) == 3:
if is_scale:
size_h = size[0] * tf.shape(self.inputs)[0]
size_w = size[1] * tf.shape(self.inputs)[1]
input_shape = self.inputs.shape.as_list()
if input_shape[0] is not None:
size_h = size[0] * input_shape[0]
else:
size_h = size[0] * tf.shape(self.inputs)[0]
if input_shape[1] is not None:
size_w = size[1] * input_shape[1]
else:
size_w = size[1] * tf.shape(self.inputs)[1]
size = [size_h, size_w]

elif len(self.inputs.get_shape()) == 4:
if is_scale:
size_h = size[0] * tf.shape(self.inputs)[1]
size_w = size[1] * tf.shape(self.inputs)[2]
input_shape = self.inputs.shape.as_list()
if input_shape[1] is not None:
size_h = size[0] * input_shape[1]
else:
size_h = size[0] * tf.shape(self.inputs)[1]
if input_shape[2] is not None:
size_w = size[1] * input_shape[2]
else:
size_w = size[1] * tf.shape(self.inputs)[2]
size = [size_h, size_w]

else:
Expand Down