From f606eed327ead3727eb89a1f951217488a5db955 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=EC=84=B1=EC=A7=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Principal=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Thu, 21 Jun 2018 08:41:12 +0900 Subject: [PATCH] Add testcases for sub operation (#1730) This commit adds test cases for sub operation to check various broadcasting cases. Signed-off-by: SungJin Choi --- tools/nnapi_unittests/CMakeLists.txt | 2 + tools/nnapi_unittests/tests/sub_3.cpp | 140 ++++++++++++++++++++++++++++++++ tools/nnapi_unittests/tests/sub_3.lst | 8 ++ tools/nnapi_unittests/tests/sub_4.cpp | 148 ++++++++++++++++++++++++++++++++++ tools/nnapi_unittests/tests/sub_4.lst | 11 +++ 5 files changed, 309 insertions(+) create mode 100644 tools/nnapi_unittests/tests/sub_3.cpp create mode 100644 tools/nnapi_unittests/tests/sub_3.lst create mode 100644 tools/nnapi_unittests/tests/sub_4.cpp create mode 100644 tools/nnapi_unittests/tests/sub_4.lst diff --git a/tools/nnapi_unittests/CMakeLists.txt b/tools/nnapi_unittests/CMakeLists.txt index 0bbacdb..cb81194 100644 --- a/tools/nnapi_unittests/CMakeLists.txt +++ b/tools/nnapi_unittests/CMakeLists.txt @@ -23,6 +23,8 @@ add_nnapi_unittest(div_1) add_nnapi_unittest(div_2) add_nnapi_unittest(sub_1) add_nnapi_unittest(sub_2) +add_nnapi_unittest(sub_3) +add_nnapi_unittest(sub_4) add_nnapi_unittest(mul_1) add_nnapi_unittest(mul_2) add_nnapi_unittest(conv_1) diff --git a/tools/nnapi_unittests/tests/sub_3.cpp b/tools/nnapi_unittests/tests/sub_3.cpp new file mode 100644 index 0000000..ec9b34c --- /dev/null +++ b/tools/nnapi_unittests/tests/sub_3.cpp @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved + * + * 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. + */ + +#include "support/tflite/kernels/register.h" +#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/contrib/lite/builtin_op_data.h" + +#include "env.h" +#include "memory.h" +#include "util/environment.h" + +#include "support/tflite/Diff.h" +#include "support/tflite/Quantization.h" +#include "support/tflite/interp/FunctionBuilder.h" + +#include +#include + +#include +#include + +using namespace tflite; +using namespace tflite::ops::builtin; + +int main(int argc, char **argv) +{ + int verbose = 0; + int tolerance = 1; + + nnfw::util::env::IntAccessor("VERBOSE").access(verbose); + nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + + // Set random seed + int SEED = std::chrono::system_clock::now().time_since_epoch().count(); + + nnfw::util::env::IntAccessor("SEED").access(SEED); + +#define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); +#include "sub_3.lst" +#undef INT_VALUE + + const int32_t LEFT_H = LEFT_H_Value(); + const int32_t LEFT_W = LEFT_W_Value(); + + const int32_t RIGHT = RIGHT_Value(); + + const int32_t OFM_H = LEFT_H; + const int32_t OFM_W = LEFT_W; + + // Initialize random number generator + std::minstd_rand random(SEED); + + std::cout << "Configurations:" << std::endl; +#define PRINT_NEWLINE() \ + { \ + std::cout << std::endl; \ + } +#define PRINT_VALUE(value) \ + { \ + std::cout << " " << #value << ": " << (value) << std::endl; \ + } + PRINT_VALUE(SEED); + PRINT_NEWLINE(); + + PRINT_VALUE(LEFT_H); + PRINT_VALUE(LEFT_W); + PRINT_NEWLINE(); + + PRINT_VALUE(RIGHT); + PRINT_NEWLINE(); + + PRINT_VALUE(OFM_H); + PRINT_VALUE(OFM_W); +#undef PRINT_VALUE +#undef PRINT_NEWLINE + + auto setup = [&](Interpreter &interp) { + // Comment from 'context.h' + // + // Parameters for asymmetric quantization. Quantized values can be converted + // back to float using: + // real_value = scale * (quantized_value - zero_point); + // + // Q: Is this necessary? + TfLiteQuantizationParams quantization = make_default_quantization(); + + // On AddTensors(N) call, T/F Lite interpreter creates N tensors whose index is [0 ~ N) + interp.AddTensors(3); + + // Configure output + interp.SetTensorParametersReadWrite(0, kTfLiteFloat32 /* type */, "output" /* name */, + {OFM_H, OFM_W} /* dims */, quantization); + + // Configure input(s) + interp.SetTensorParametersReadWrite(1, kTfLiteFloat32 /* type */, "left" /* name */, + {LEFT_H, LEFT_W} /* dims */, quantization); + + interp.SetTensorParametersReadWrite(2, kTfLiteFloat32 /* type */, "right" /* name */, + {RIGHT, LEFT_W} /* dims */, quantization); + + // Add Subtraction Node + // + // NOTE AddNodeWithParameters take the ownership of param, and deallocate it with free + // So, param should be allocated with malloc + auto param = make_alloc(); + + param->activation = kTfLiteActNone; + + // Run Sub and store the result into Tensor #0 + // - Read Left from Tensor #1 + // - Read Right from Tensor #2, + interp.AddNodeWithParameters({1, 2}, {0}, nullptr, 0, reinterpret_cast(param), + BuiltinOpResolver().FindOp(BuiltinOperator_SUB)); + + interp.SetInputs({1, 2}); + interp.SetOutputs({0}); + }; + + const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + + RandomTestParam param; + + param.verbose = verbose; + param.tolerance = tolerance; + + return RandomTestRunner{SEED, param}.run(builder); +} diff --git a/tools/nnapi_unittests/tests/sub_3.lst b/tools/nnapi_unittests/tests/sub_3.lst new file mode 100644 index 0000000..c568750 --- /dev/null +++ b/tools/nnapi_unittests/tests/sub_3.lst @@ -0,0 +1,8 @@ +#ifndef INT_VALUE +#error "INT_VALUE should be defined" +#endif // INT_VALUE + +INT_VALUE(LEFT_H, 8) +INT_VALUE(LEFT_W, 16) + +INT_VALUE(RIGHT, 1) diff --git a/tools/nnapi_unittests/tests/sub_4.cpp b/tools/nnapi_unittests/tests/sub_4.cpp new file mode 100644 index 0000000..ea06222 --- /dev/null +++ b/tools/nnapi_unittests/tests/sub_4.cpp @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved + * + * 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. + */ + +#include "support/tflite/kernels/register.h" +#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/contrib/lite/builtin_op_data.h" + +#include "env.h" +#include "memory.h" +#include "util/environment.h" + +#include "support/tflite/Diff.h" +#include "support/tflite/Quantization.h" +#include "support/tflite/interp/FunctionBuilder.h" + +#include +#include + +#include +#include + +using namespace tflite; +using namespace tflite::ops::builtin; + +int main(int argc, char **argv) +{ + int verbose = 0; + int tolerance = 1; + + nnfw::util::env::IntAccessor("VERBOSE").access(verbose); + nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + + // Set random seed + int SEED = std::chrono::system_clock::now().time_since_epoch().count(); + + nnfw::util::env::IntAccessor("SEED").access(SEED); + +#define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); +#include "sub_1.lst" +#undef INT_VALUE + + const int32_t LEFT_C = LEFT_C_Value(); + const int32_t LEFT_H = LEFT_H_Value(); + const int32_t LEFT_W = LEFT_W_Value(); + + const int32_t RIGHT_C = RIGHT_C_Value(); + const int32_t RIGHT_H = RIGHT_H_Value(); + const int32_t RIGHT_W = RIGHT_W_Value(); + + const int32_t OFM_C = std::max(LEFT_C, RIGHT_C); + const int32_t OFM_H = std::max(LEFT_H, RIGHT_H); + const int32_t OFM_W = std::max(LEFT_W, RIGHT_W); + + // Initialize random number generator + std::minstd_rand random(SEED); + + std::cout << "Configurations:" << std::endl; +#define PRINT_NEWLINE() \ + { \ + std::cout << std::endl; \ + } +#define PRINT_VALUE(value) \ + { \ + std::cout << " " << #value << ": " << (value) << std::endl; \ + } + PRINT_VALUE(SEED); + PRINT_NEWLINE(); + + PRINT_VALUE(LEFT_C); + PRINT_VALUE(LEFT_H); + PRINT_VALUE(LEFT_W); + PRINT_NEWLINE(); + + PRINT_VALUE(RIGHT_C); + PRINT_VALUE(RIGHT_H); + PRINT_VALUE(RIGHT_W); + PRINT_NEWLINE(); + + PRINT_VALUE(OFM_C); + PRINT_VALUE(OFM_H); + PRINT_VALUE(OFM_W); +#undef PRINT_VALUE +#undef PRINT_NEWLINE + + auto setup = [&](Interpreter &interp) { + // Comment from 'context.h' + // + // Parameters for asymmetric quantization. Quantized values can be converted + // back to float using: + // real_value = scale * (quantized_value - zero_point); + // + // Q: Is this necessary? + TfLiteQuantizationParams quantization = make_default_quantization(); + + // On AddTensors(N) call, T/F Lite interpreter creates N tensors whose index is [0 ~ N) + interp.AddTensors(3); + + // Configure output + interp.SetTensorParametersReadWrite(0, kTfLiteFloat32 /* type */, "output" /* name */, + {OFM_H, OFM_W, OFM_C} /* dims */, quantization); + + // Configure input(s) + interp.SetTensorParametersReadWrite(1, kTfLiteFloat32 /* type */, "left" /* name */, + {LEFT_H, LEFT_W, LEFT_C} /* dims */, quantization); + + interp.SetTensorParametersReadWrite(2, kTfLiteFloat32 /* type */, "right" /* name */, + {RIGHT_H, RIGHT_W, RIGHT_C} /* dims */, quantization); + + // Add Subtraction Node + // + // NOTE AddNodeWithParameters take the ownership of param, and deallocate it with free + // So, param should be allocated with malloc + auto param = make_alloc(); + + param->activation = kTfLiteActNone; + + // Run Sub and store the result into Tensor #0 + // - Read Left from Tensor #1 + // - Read Right from Tensor #2, + interp.AddNodeWithParameters({1, 2}, {0}, nullptr, 0, reinterpret_cast(param), + BuiltinOpResolver().FindOp(BuiltinOperator_SUB)); + + interp.SetInputs({1, 2}); + interp.SetOutputs({0}); + }; + + const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + + RandomTestParam param; + + param.verbose = verbose; + param.tolerance = tolerance; + + return RandomTestRunner{SEED, param}.run(builder); +} diff --git a/tools/nnapi_unittests/tests/sub_4.lst b/tools/nnapi_unittests/tests/sub_4.lst new file mode 100644 index 0000000..ce6128f --- /dev/null +++ b/tools/nnapi_unittests/tests/sub_4.lst @@ -0,0 +1,11 @@ +#ifndef INT_VALUE +#error "INT_VALUE should be defined" +#endif // INT_VALUE + +INT_VALUE(LEFT_C, 3) +INT_VALUE(LEFT_H, 8) +INT_VALUE(LEFT_W, 16) + +INT_VALUE(RIGHT_C, 3) +INT_VALUE(RIGHT_H, 1) +INT_VALUE(RIGHT_W, 16) -- 2.7.4