This is an automated email from the ASF dual-hosted git repository.
masahi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 3136ff4bb6 [FRONTEND][KERAS] Fix bug concat convert for NCHW (#16159)
3136ff4bb6 is described below
commit 3136ff4bb6b2d0459112e1b1be084e037fea32ea
Author: krishnaraj36 <[email protected]>
AuthorDate: Wed Nov 29 04:28:50 2023 +0530
[FRONTEND][KERAS] Fix bug concat convert for NCHW (#16159)
* [FRONTEND][KERAS] Fix bug concat convert for NCHW
Fixed the bug in keras frontend for inception_v3 keras
in concat convertion for NCHW.
* fix the lint error
* Removed weight download
---
python/tvm/relay/frontend/keras.py | 2 +-
tests/python/frontend/keras/test_forward.py | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/python/tvm/relay/frontend/keras.py
b/python/tvm/relay/frontend/keras.py
index e89c0a3c03..2186208994 100644
--- a/python/tvm/relay/frontend/keras.py
+++ b/python/tvm/relay/frontend/keras.py
@@ -967,7 +967,7 @@ def _convert_concat(
if axis == -1:
axis = 1
else:
- axis = axis + 1 if axis < dims else 1
+ axis = axis + 1 if axis < (dims - 1) else 1
return _op.concatenate(_as_list(inexpr), axis=axis)
diff --git a/tests/python/frontend/keras/test_forward.py
b/tests/python/frontend/keras/test_forward.py
index 8c5b578060..aef137e634 100644
--- a/tests/python/frontend/keras/test_forward.py
+++ b/tests/python/frontend/keras/test_forward.py
@@ -177,6 +177,14 @@ class TestKeras:
keras_model = keras_mod.models.Model([data1, data2], out)
verify_keras_frontend(keras_model, layout="NHWC")
verify_keras_frontend(keras_model, layout="NCHW")
+ # test axis at last dimension
+ data1 = keras_mod.layers.Input(shape=(1, 2, 2))
+ data2 = keras_mod.layers.Input(shape=(1, 2, 3))
+ merge_func = keras_mod.layers.Concatenate(axis=3)
+ out = merge_func([data1, data2])
+ keras_model = keras_mod.models.Model([data1, data2], out)
+ verify_keras_frontend(keras_model, layout="NHWC")
+ verify_keras_frontend(keras_model, layout="NCHW")
def test_forward_merge_dot(self, keras_mod):
"""test_forward_merge_dot"""
@@ -643,6 +651,20 @@ class TestKeras:
)
verify_keras_frontend(keras_model, layout=layout)
+ def test_forward_inception_v3(self, keras_mod, layout="NCHW"):
+ """test_forward_inception_v3"""
+ if hasattr(keras_mod.applications, "InceptionV3"):
+ # Keras 2.4.x and older
+ inception_v3_mod = keras_mod.applications.InceptionV3
+ else:
+ # Keras 2.6.x and newer
+ inception_v3_mod = keras_mod.applications.inception_v3.InceptionV3
+
+ keras_model = inception_v3_mod(
+ include_top=True, weights=None, input_shape=(299, 299, 3),
classes=1000
+ )
+ verify_keras_frontend(keras_model, layout=layout)
+
def test_forward_mobilenet(self, keras_mod, layout="NCHW"):
mobilenet_mod = get_mobilenet(keras_mod)
@@ -877,6 +899,8 @@ if __name__ == "__main__":
sut.test_forward_xception(keras_mod=k)
sut.test_forward_resnet50(keras_mod=k)
sut.test_forward_resnet50(keras_mod=k, layout="NHWC")
+ sut.test_forward_inception_v3(keras_mod=k)
+ sut.test_forward_inception_v3(keras_mod=k, layout="NHWC")
sut.test_forward_mobilenet(keras_mod=k)
sut.test_forward_mobilenet(keras_mod=k, layout="NHWC")
sut.test_forward_conv3d(keras_mod=k)
