diff options
| author | 오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com> | 2019-04-22 11:25:55 +0900 |
|---|---|---|
| committer | 박세희/On-Device Lab(SR)/Principal Engineer/삼성전자 <saehie.park@samsung.com> | 2019-04-22 11:25:55 +0900 |
| commit | 090005abfd5d5eee8ba9ad29b64a118106e88ad7 (patch) | |
| tree | 9242adaf9ccbd94cb8ce75f422348e224ab8fd4a /tests | |
| parent | ec76f7f9ec5842623df5d4f144b81af308ffe15e (diff) | |
| download | nnfw-090005abfd5d5eee8ba9ad29b64a118106e88ad7.tar.gz nnfw-090005abfd5d5eee8ba9ad29b64a118106e88ad7.tar.bz2 nnfw-090005abfd5d5eee8ba9ad29b64a118106e88ad7.zip | |
Change ARGMAX definition (#5021)
Chagne ARGMAX definition same with current NNAPI
- Allow one axis reduce
- Output rank = input rank - 1
Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
Diffstat (limited to 'tests')
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/nnapi/specs/Ex/argmax_ex_float_1.mod.py b/tests/nnapi/specs/Ex/argmax_ex_float_1.mod.py index e2255e004..dc29fb358 100644 --- a/tests/nnapi/specs/Ex/argmax_ex_float_1.mod.py +++ b/tests/nnapi/specs/Ex/argmax_ex_float_1.mod.py @@ -1,7 +1,7 @@ model = Model() i1 = Input("input", "TENSOR_FLOAT32", "{1, 2, 2, 1}") axis = Parameter("axis", "TENSOR_INT32", "{1}", [1]) -output = Output("output", "TENSOR_INT32", "{1, 1, 2, 1}") +output = Output("output", "TENSOR_INT32", "{1, 2, 1}") model = model.Operation("ARGMAX_EX", i1, axis).To(output) diff --git a/tests/nnapi/specs/Ex/argmax_ex_float_2.mod.py b/tests/nnapi/specs/Ex/argmax_ex_float_2.mod.py index 6f06bfd0b..8b6ed565f 100644 --- a/tests/nnapi/specs/Ex/argmax_ex_float_2.mod.py +++ b/tests/nnapi/specs/Ex/argmax_ex_float_2.mod.py @@ -1,7 +1,7 @@ model = Model() i1 = Input("input", "TENSOR_FLOAT32", "{1, 2, 2, 2}") axis = Parameter("axis", "TENSOR_INT32", "{1}", [3]) -output = Output("output", "TENSOR_INT32", "{1, 2, 2, 1}") +output = Output("output", "TENSOR_INT32", "{1, 2, 2}") model = model.Operation("ARGMAX_EX", i1, axis).To(output) diff --git a/tests/nnapi/specs/Ex/argmax_ex_int32.mod.py b/tests/nnapi/specs/Ex/argmax_ex_int32.mod.py index f7f98afe2..b5d01dd85 100644 --- a/tests/nnapi/specs/Ex/argmax_ex_int32.mod.py +++ b/tests/nnapi/specs/Ex/argmax_ex_int32.mod.py @@ -1,7 +1,7 @@ model = Model() i1 = Input("input", "TENSOR_INT32", "{1, 2, 2, 1}") axis = Parameter("axis", "TENSOR_INT32", "{1}", [1]) -output = Output("output", "TENSOR_INT32", "{1, 1, 2, 1}") +output = Output("output", "TENSOR_INT32", "{1, 2, 1}") model = model.Operation("ARGMAX_EX", i1, axis).To(output) diff --git a/tests/nnapi/specs/Ex/argmax_ex_neg_axis_float.mod.py b/tests/nnapi/specs/Ex/argmax_ex_neg_axis_float.mod.py index b29cf1eb6..977cac061 100644 --- a/tests/nnapi/specs/Ex/argmax_ex_neg_axis_float.mod.py +++ b/tests/nnapi/specs/Ex/argmax_ex_neg_axis_float.mod.py @@ -1,7 +1,7 @@ model = Model() i1 = Input("input", "TENSOR_FLOAT32", "{1, 2, 4, 1}") axis = Parameter("axis", "TENSOR_INT32", "{1}", [-3]) -output = Output("output", "TENSOR_INT32", "{1, 1, 4, 1}") +output = Output("output", "TENSOR_INT32", "{1, 4, 1}") model = model.Operation("ARGMAX_EX", i1, axis).To(output) diff --git a/tests/nnapi/specs/Ex/argmax_ex_neg_axis_int32.mod.py b/tests/nnapi/specs/Ex/argmax_ex_neg_axis_int32.mod.py index ddc27b35a..9f448e08d 100644 --- a/tests/nnapi/specs/Ex/argmax_ex_neg_axis_int32.mod.py +++ b/tests/nnapi/specs/Ex/argmax_ex_neg_axis_int32.mod.py @@ -1,7 +1,7 @@ model = Model() i1 = Input("input", "TENSOR_INT32", "{1, 2, 4, 1}") axis = Parameter("axis", "TENSOR_INT32", "{1}", [-3]) -output = Output("output", "TENSOR_INT32", "{1, 1, 4, 1}") +output = Output("output", "TENSOR_INT32", "{1, 4, 1}") model = model.Operation("ARGMAX_EX", i1, axis).To(output) diff --git a/tests/nnapi/specs/Ex/argmax_ex_quant8.mod.py b/tests/nnapi/specs/Ex/argmax_ex_quant8.mod.py index fd3c5230b..c3131ef91 100644 --- a/tests/nnapi/specs/Ex/argmax_ex_quant8.mod.py +++ b/tests/nnapi/specs/Ex/argmax_ex_quant8.mod.py @@ -1,7 +1,7 @@ model = Model() i1 = Input("input", "TENSOR_QUANT8_ASYMM", "{1, 2, 2, 1}, 0.5f, 2") axis = Parameter("axis", "TENSOR_INT32", "{1}", [1]) -output = Output("output", "TENSOR_INT32", "{1, 1, 2, 1}") +output = Output("output", "TENSOR_INT32", "{1, 2, 1}") model = model.Operation("ARGMAX_EX", i1, axis).To(output) diff --git a/tests/nnapi/specs/Ex/argmax_ex_quant8_neg_axis.mod.py b/tests/nnapi/specs/Ex/argmax_ex_quant8_neg_axis.mod.py index c7ddc0e5d..9146d8f14 100644 --- a/tests/nnapi/specs/Ex/argmax_ex_quant8_neg_axis.mod.py +++ b/tests/nnapi/specs/Ex/argmax_ex_quant8_neg_axis.mod.py @@ -1,7 +1,7 @@ model = Model() i1 = Input("input", "TENSOR_QUANT8_ASYMM", "{1, 2, 4, 1}, 0.5f, 5") axis = Parameter("axis", "TENSOR_INT32", "{1}", [-3]) -output = Output("output", "TENSOR_INT32", "{1, 1, 4, 1}") +output = Output("output", "TENSOR_INT32", "{1, 4, 1}") model = model.Operation("ARGMAX_EX", i1, axis).To(output) |