diff options
author | 장지섭/On-Device Lab(SR)/Engineer/삼성전자 <jiseob.jang@samsung.com> | 2019-04-03 17:27:58 +0900 |
---|---|---|
committer | 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com> | 2019-04-03 17:27:58 +0900 |
commit | 123d4db1c4d0fb5c7f8caeb0dc6f0a33f78408ff (patch) | |
tree | e4b5d0f3be011fd8dffd298c91045f777c16a7ca /tests | |
parent | 0b0af067aef19c1266b0de0b7c65c028a8cd3513 (diff) | |
download | nnfw-123d4db1c4d0fb5c7f8caeb0dc6f0a33f78408ff.tar.gz nnfw-123d4db1c4d0fb5c7f8caeb0dc6f0a33f78408ff.tar.bz2 nnfw-123d4db1c4d0fb5c7f8caeb0dc6f0a33f78408ff.zip |
Support GREATER_EQUAL and LESS (#4900)
* Append nnapi tests of GREATER_EQUAL and LESS
This commit appends nnapi tests of of GREATER_EQUAL and LESS.
Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>
* [neurun] Support GREATER_EQUAL and LESS
This commit supports GREATER_EQUAL and LESS operations.
Signed-off-by: jiseob.jang <jiseob.jang@samsung.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/nnapi/nnapi_gtest.skip.armv7l-linux | 2 | ||||
-rw-r--r-- | tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu | 2 | ||||
-rw-r--r-- | tests/nnapi/nnapi_gtest.skip.armv7l-tizen | 2 | ||||
-rw-r--r-- | tests/nnapi/specs/Ex/greater_equal_ex.mod.py | 35 | ||||
-rw-r--r-- | tests/nnapi/specs/Ex/less_ex.mod.py | 35 |
5 files changed, 76 insertions, 0 deletions
diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux b/tests/nnapi/nnapi_gtest.skip.armv7l-linux index 344beb362..27a18d35d 100644 --- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux +++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux @@ -1,3 +1,5 @@ +GeneratedTests.greater_equal_ex* +GeneratedTests.less_ex* GeneratedTests.lsh_projection GeneratedTests.lsh_projection_2 GeneratedTests.lsh_projection_weights_as_inputs diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu index f04f13059..630e98ab6 100644 --- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu +++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu @@ -27,10 +27,12 @@ GeneratedTests.embedding_lookup_4d_nnfw GeneratedTests.equal_ex* GeneratedTests.exp_ex* GeneratedTests.floor_ +GeneratedTests.greater_equal_ex* GeneratedTests.hashtable_lookup* GeneratedTests.l2_normalization* GeneratedTests.l2_pool* GeneratedTests.local_response_norm* +GeneratedTests.less_ex* GeneratedTests.logical_and_ex* GeneratedTests.logical_or_ex* GeneratedTests.logistic* diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-tizen b/tests/nnapi/nnapi_gtest.skip.armv7l-tizen index 2859a02b3..a188c2882 100644 --- a/tests/nnapi/nnapi_gtest.skip.armv7l-tizen +++ b/tests/nnapi/nnapi_gtest.skip.armv7l-tizen @@ -1,5 +1,7 @@ GeneratedTests.add_broadcast_quant8 GeneratedTests.add_quant8 +GeneratedTests.greater_equal_ex* +GeneratedTests.less_ex* GeneratedTests.logical_and_ex* GeneratedTests.logical_not_ex* GeneratedTests.logical_or_ex* diff --git a/tests/nnapi/specs/Ex/greater_equal_ex.mod.py b/tests/nnapi/specs/Ex/greater_equal_ex.mod.py new file mode 100644 index 000000000..7c62d568b --- /dev/null +++ b/tests/nnapi/specs/Ex/greater_equal_ex.mod.py @@ -0,0 +1,35 @@ +# +# Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved +# Copyright (C) 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# model +model = Model() +i1 = Input("op1", "TENSOR_FLOAT32", "{2, 1}") +i2 = Input("op2", "TENSOR_FLOAT32", "{2}") +i3 = Output("op3", "TENSOR_QUANT8_ASYMM", "{2, 2}, 1.0, 0") +model = model.Operation("GREATER_EQUAL_EX", i1, i2).To(i3) + +# Example 1. Input in operand 0, +input0 = {i1: # input 0 + [5, 10], + i2: # input 1 + [10, 5]} + +output0 = {i3: # output 0 + [0, 255, 255, 255]} + +# Instantiate an example +Example((input0, output0)) diff --git a/tests/nnapi/specs/Ex/less_ex.mod.py b/tests/nnapi/specs/Ex/less_ex.mod.py new file mode 100644 index 000000000..3ae15b62f --- /dev/null +++ b/tests/nnapi/specs/Ex/less_ex.mod.py @@ -0,0 +1,35 @@ +# +# Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved +# Copyright (C) 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# model +model = Model() +i1 = Input("op1", "TENSOR_FLOAT32", "{2, 1}") +i2 = Input("op2", "TENSOR_FLOAT32", "{2}") +i3 = Output("op3", "TENSOR_QUANT8_ASYMM", "{2, 2}, 1.0, 0") +model = model.Operation("LESS_EX", i1, i2).To(i3) + +# Example 1. Input in operand 0, +input0 = {i1: # input 0 + [5, 10], + i2: # input 1 + [10, 5]} + +output0 = {i3: # output 0 + [255, 0, 0, 0]} + +# Instantiate an example +Example((input0, output0)) |