Skip to content

[Bugfix][Relay][Keras] Fix the wrong implementation logic about cropping2D #15053

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
echuraev merged 10 commits into from
Jun 15, 2023
Merged

[Bugfix][Relay][Keras] Fix the wrong implementation logic about cropping2D #15053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ce84aa8
fix the wrong calculation logic of cropping2d
jikechao Jun 7, 2023
2a37471
add a test case to caputure the bug
jikechao Jun 7, 2023
ccaf32f
Update test_forward.py
jikechao Jun 8, 2023
5d364f3
Update test_forward.py
jikechao Jun 8, 2023
577240a
correct the patch
jikechao Jun 13, 2023
81cc215
Update keras.py
jikechao Jun 13, 2023
ddce339
Update test_forward.py
jikechao Jun 13, 2023
c9cb062
Update test_forward.py
jikechao Jun 13, 2023
9e3f885
Update test_forward.py
jikechao Jun 13, 2023
385b58c
Merge branch 'apache:main' into fix_cropping2d
jikechao Jun 14, 2023
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
10 changes: 8 additions & 2 deletions python/tvm/relay/frontend/keras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,10 +816,16 @@ def _convert_cropping(
f"Operator {crop_type} is not supported for frontend Keras."
)
int32_max = np.iinfo(np.int32).max
if data_layout == "NHWC":
begin = [0, crop_t, crop_l, 0]
end = [int32_max, in_h - crop_b, in_w - crop_r, int32_max]
else:
begin = [0, 0, crop_t, crop_l]
end = [int32_max, int32_max, in_h - crop_b, in_w - crop_r]
return _op.strided_slice(
inexpr,
begin=[0, 0, crop_t, crop_l],
end=[int32_max, int32_max, in_h - crop_b, in_w - crop_r],
begin=begin,
end=end,
)


Expand Down
10 changes: 9 additions & 1 deletion tests/python/frontend/keras/test_forward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,15 @@ def test_forward_crop(self, keras_mod):
x = keras_mod.layers.Cropping2D(cropping=0)(x)
x = keras_mod.layers.Add()([x, x])
keras_model = keras_mod.models.Model(data, x)
verify_keras_frontend(keras_model)
verify_keras_frontend(keras_model, layout="NHWC")
verify_keras_frontend(keras_model, layout="NHWC")

data = keras_mod.layers.Input(shape=(32, 32, 3))
x = keras_mod.layers.Cropping2D(cropping=(2, 1))(data)
x = keras_mod.layers.Cropping2D(cropping=(1, 2))(x)
keras_model = keras_mod.models.Model(data, x)
verify_keras_frontend(keras_model, layout="NHWC")
verify_keras_frontend(keras_model, layout="NCHW")

def test_forward_multi_inputs(self, keras_mod):
data1 = keras_mod.layers.Input(shape=(32, 32, 3))
Expand Down