From d53c05f2b36fcf934bfb6a7e552bad1458d53cfa Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=82=A8=EA=B6=81=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Mon, 27 Aug 2018 10:43:20 +0900 Subject: [PATCH] Modify topkV2 testdata and rename test name (#2425) `GeneratedTests.topk_v2_1D_uint8` and `GeneratedTests.topk_v2_2D_uint8` are tests for `topkV2` operation using quant8 type However, despite not correctly given test data format, two tests are passed because of weak dataset - Modify `_uint8` to `_quant8` in test name - Modify test data information of quant8 for `GeneratedTests.topk_v2_1D_uint8` and `GeneratedTests.topk_v2_2D_uint8` Signed-off-by: Seok NamKoong --- .../generated/all_generated_tests.cpp | 36 +++++++++++----------- ...8.example.cpp => topk_v2_1D_quant8.example.cpp} | 2 +- ...8.example.cpp => topk_v2_2D_quant8.example.cpp} | 2 +- ...uint8.model.cpp => topk_v2_1D_quant8.model.cpp} | 6 ++-- ...uint8.model.cpp => topk_v2_2D_quant8.model.cpp} | 6 ++-- ...v2_1D_uint8.mod.py => topk_v2_1D_quant8.mod.py} | 4 +-- ...v2_2D_uint8.mod.py => topk_v2_2D_quant8.mod.py} | 4 +-- 7 files changed, 30 insertions(+), 30 deletions(-) rename runtimes/tests/neural_networks_test/generated/examples/{topk_v2_1D_uint8.example.cpp => topk_v2_1D_quant8.example.cpp} (86%) rename runtimes/tests/neural_networks_test/generated/examples/{topk_v2_2D_uint8.example.cpp => topk_v2_2D_quant8.example.cpp} (88%) rename runtimes/tests/neural_networks_test/generated/models/{topk_v2_1D_uint8.model.cpp => topk_v2_1D_quant8.model.cpp} (79%) rename runtimes/tests/neural_networks_test/generated/models/{topk_v2_2D_uint8.model.cpp => topk_v2_2D_quant8.model.cpp} (78%) rename runtimes/tests/neural_networks_test/specs/Ex/{topk_v2_1D_uint8.mod.py => topk_v2_1D_quant8.mod.py} (71%) rename runtimes/tests/neural_networks_test/specs/Ex/{topk_v2_2D_uint8.mod.py => topk_v2_2D_quant8.mod.py} (76%) diff --git a/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp b/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp index da475b3..2f95b9f 100644 --- a/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp +++ b/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp @@ -3039,18 +3039,18 @@ TEST_F(GeneratedTests, topk_v2_1D_int32) { topk_v2_1D_int32::examples); } -namespace topk_v2_1D_uint8 { +namespace topk_v2_1D_quant8 { std::vector examples = { -// Generated topk_v2_1D_uint8 test -#include "generated/examples/topk_v2_1D_uint8.example.cpp" +// Generated topk_v2_1D_quant8 test +#include "generated/examples/topk_v2_1D_quant8.example.cpp" }; // Generated model constructor -#include "generated/models/topk_v2_1D_uint8.model.cpp" -} // namespace topk_v2_1D_uint8 -TEST_F(GeneratedTests, topk_v2_1D_uint8) { - execute(topk_v2_1D_uint8::CreateModel, - topk_v2_1D_uint8::is_ignored, - topk_v2_1D_uint8::examples); +#include "generated/models/topk_v2_1D_quant8.model.cpp" +} // namespace topk_v2_1D_quant8 +TEST_F(GeneratedTests, topk_v2_1D_quant8) { + execute(topk_v2_1D_quant8::CreateModel, + topk_v2_1D_quant8::is_ignored, + topk_v2_1D_quant8::examples); } namespace topk_v2_2D_float { @@ -3081,16 +3081,16 @@ TEST_F(GeneratedTests, topk_v2_2D_int32) { topk_v2_2D_int32::examples); } -namespace topk_v2_2D_uint8 { +namespace topk_v2_2D_quant8 { std::vector examples = { -// Generated topk_v2_2D_uint8 test -#include "generated/examples/topk_v2_2D_uint8.example.cpp" +// Generated topk_v2_2D_quant8 test +#include "generated/examples/topk_v2_2D_quant8.example.cpp" }; // Generated model constructor -#include "generated/models/topk_v2_2D_uint8.model.cpp" -} // namespace topk_v2_2D_uint8 -TEST_F(GeneratedTests, topk_v2_2D_uint8) { - execute(topk_v2_2D_uint8::CreateModel, - topk_v2_2D_uint8::is_ignored, - topk_v2_2D_uint8::examples); +#include "generated/models/topk_v2_2D_quant8.model.cpp" +} // namespace topk_v2_2D_quant8 +TEST_F(GeneratedTests, topk_v2_2D_quant8) { + execute(topk_v2_2D_quant8::CreateModel, + topk_v2_2D_quant8::is_ignored, + topk_v2_2D_quant8::examples); } diff --git a/runtimes/tests/neural_networks_test/generated/examples/topk_v2_1D_uint8.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/topk_v2_1D_quant8.example.cpp similarity index 86% rename from runtimes/tests/neural_networks_test/generated/examples/topk_v2_1D_uint8.example.cpp rename to runtimes/tests/neural_networks_test/generated/examples/topk_v2_1D_quant8.example.cpp index 74e0141..ce173e9 100644 --- a/runtimes/tests/neural_networks_test/generated/examples/topk_v2_1D_uint8.example.cpp +++ b/runtimes/tests/neural_networks_test/generated/examples/topk_v2_1D_quant8.example.cpp @@ -1,4 +1,4 @@ -// Generated file (from: topk_v2_1D_uint8.mod.py). Do not edit +// Generated file (from: topk_v2_1D_quant8.mod.py). Do not edit // Begin of an example { //Input(s) diff --git a/runtimes/tests/neural_networks_test/generated/examples/topk_v2_2D_uint8.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/topk_v2_2D_quant8.example.cpp similarity index 88% rename from runtimes/tests/neural_networks_test/generated/examples/topk_v2_2D_uint8.example.cpp rename to runtimes/tests/neural_networks_test/generated/examples/topk_v2_2D_quant8.example.cpp index 3363c8b..5a192ce 100644 --- a/runtimes/tests/neural_networks_test/generated/examples/topk_v2_2D_uint8.example.cpp +++ b/runtimes/tests/neural_networks_test/generated/examples/topk_v2_2D_quant8.example.cpp @@ -1,4 +1,4 @@ -// Generated file (from: topk_v2_2D_uint8.mod.py). Do not edit +// Generated file (from: topk_v2_2D_quant8.mod.py). Do not edit // Begin of an example { //Input(s) diff --git a/runtimes/tests/neural_networks_test/generated/models/topk_v2_1D_uint8.model.cpp b/runtimes/tests/neural_networks_test/generated/models/topk_v2_1D_quant8.model.cpp similarity index 79% rename from runtimes/tests/neural_networks_test/generated/models/topk_v2_1D_uint8.model.cpp rename to runtimes/tests/neural_networks_test/generated/models/topk_v2_1D_quant8.model.cpp index 0d3cd4f..ff60c1d 100644 --- a/runtimes/tests/neural_networks_test/generated/models/topk_v2_1D_uint8.model.cpp +++ b/runtimes/tests/neural_networks_test/generated/models/topk_v2_1D_quant8.model.cpp @@ -1,9 +1,9 @@ -// Generated file (from: topk_v2_1D_uint8.mod.py). Do not edit +// Generated file (from: topk_v2_1D_quant8.mod.py). Do not edit void CreateModel(Model *model) { OperandType type1(Type::INT32, {}); OperandType type3(Type::TENSOR_INT32, {2}); - OperandType type2(Type::TENSOR_QUANT8_ASYMM, {2}); - OperandType type0(Type::TENSOR_QUANT8_ASYMM, {4}); + OperandType type2(Type::TENSOR_QUANT8_ASYMM, {2}, 0.5f, 1); + OperandType type0(Type::TENSOR_QUANT8_ASYMM, {4}, 0.5f, 1); // Phase 1, operands auto op1 = model->addOperand(&type0); auto k = model->addOperand(&type1); diff --git a/runtimes/tests/neural_networks_test/generated/models/topk_v2_2D_uint8.model.cpp b/runtimes/tests/neural_networks_test/generated/models/topk_v2_2D_quant8.model.cpp similarity index 78% rename from runtimes/tests/neural_networks_test/generated/models/topk_v2_2D_uint8.model.cpp rename to runtimes/tests/neural_networks_test/generated/models/topk_v2_2D_quant8.model.cpp index e86a070..a0ffc89 100644 --- a/runtimes/tests/neural_networks_test/generated/models/topk_v2_2D_uint8.model.cpp +++ b/runtimes/tests/neural_networks_test/generated/models/topk_v2_2D_quant8.model.cpp @@ -1,9 +1,9 @@ -// Generated file (from: topk_v2_2D_uint8.mod.py). Do not edit +// Generated file (from: topk_v2_2D_quant8.mod.py). Do not edit void CreateModel(Model *model) { OperandType type1(Type::INT32, {}); OperandType type3(Type::TENSOR_INT32, {3,2}); - OperandType type2(Type::TENSOR_QUANT8_ASYMM, {3,2}); - OperandType type0(Type::TENSOR_QUANT8_ASYMM, {3,4}); + OperandType type2(Type::TENSOR_QUANT8_ASYMM, {3,2}, 0.5f, 1); + OperandType type0(Type::TENSOR_QUANT8_ASYMM, {3,4}, 0.5f, 1); // Phase 1, operands auto op1 = model->addOperand(&type0); auto k = model->addOperand(&type1); diff --git a/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_1D_uint8.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_1D_quant8.mod.py similarity index 71% rename from runtimes/tests/neural_networks_test/specs/Ex/topk_v2_1D_uint8.mod.py rename to runtimes/tests/neural_networks_test/specs/Ex/topk_v2_1D_quant8.mod.py index 0700dbe..6f36ce4 100644 --- a/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_1D_uint8.mod.py +++ b/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_1D_quant8.mod.py @@ -1,8 +1,8 @@ # model model = Model() -i1 = Input("op1", "TENSOR_QUANT8_ASYMM", "{4}") # a vector of input +i1 = Input("op1", "TENSOR_QUANT8_ASYMM", "{4}, 0.5f, 1") # a vector of input k = Int32Scalar("k", 2) -i2 = Output("op2", "TENSOR_QUANT8_ASYMM", "{2}") # values of output +i2 = Output("op2", "TENSOR_QUANT8_ASYMM", "{2}, 0.5f, 1") # values of output i3 = Output("op3", "TENSOR_INT32", "{2}") # indexes of output model = model.Operation("TOPK_V2_EX", i1, k).To([i2, i3]) diff --git a/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_2D_uint8.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_2D_quant8.mod.py similarity index 76% rename from runtimes/tests/neural_networks_test/specs/Ex/topk_v2_2D_uint8.mod.py rename to runtimes/tests/neural_networks_test/specs/Ex/topk_v2_2D_quant8.mod.py index c18847d..d8b5c60 100644 --- a/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_2D_uint8.mod.py +++ b/runtimes/tests/neural_networks_test/specs/Ex/topk_v2_2D_quant8.mod.py @@ -1,8 +1,8 @@ # model model = Model() -i1 = Input("op1", "TENSOR_QUANT8_ASYMM", "{3,4}") # a vector of input +i1 = Input("op1", "TENSOR_QUANT8_ASYMM", "{3,4}, 0.5f, 1") # a vector of input k = Int32Scalar("k", 2) -i2 = Output("op2", "TENSOR_QUANT8_ASYMM", "{3,2}") # values of output +i2 = Output("op2", "TENSOR_QUANT8_ASYMM", "{3,2}, 0.5f, 1") # values of output i3 = Output("op3", "TENSOR_INT32", "{3,2}") # indexes of output model = model.Operation("TOPK_V2_EX", i1, k).To([i2, i3]) -- 2.7.4