From 9e83c59c730d198b208ca06b39416c2cfbf4fa45 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9C=A4=EC=A7=80=EC=98=81/=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: Wed, 27 Jun 2018 08:31:19 +0900 Subject: [PATCH] Add nnapi_unittest for ReLU (#1761) relu_1 is for 2 ranks input model. relu_2 is for 3 ranks input model. relu_3 is for 4 ranks input model. Signed-off-by: Jiyoung Yun --- tools/nnapi_unittests/CMakeLists.txt | 3 + tools/nnapi_unittests/tests/relu_1.cpp | 121 +++++++++++++++++++++++++++++++ tools/nnapi_unittests/tests/relu_1.lst | 6 ++ tools/nnapi_unittests/tests/relu_2.cpp | 124 ++++++++++++++++++++++++++++++++ tools/nnapi_unittests/tests/relu_2.lst | 7 ++ tools/nnapi_unittests/tests/relu_3.cpp | 127 +++++++++++++++++++++++++++++++++ tools/nnapi_unittests/tests/relu_3.lst | 8 +++ 7 files changed, 396 insertions(+) create mode 100644 tools/nnapi_unittests/tests/relu_1.cpp create mode 100644 tools/nnapi_unittests/tests/relu_1.lst create mode 100644 tools/nnapi_unittests/tests/relu_2.cpp create mode 100644 tools/nnapi_unittests/tests/relu_2.lst create mode 100644 tools/nnapi_unittests/tests/relu_3.cpp create mode 100644 tools/nnapi_unittests/tests/relu_3.lst diff --git a/tools/nnapi_unittests/CMakeLists.txt b/tools/nnapi_unittests/CMakeLists.txt index 5aadabe..9ccd090 100644 --- a/tools/nnapi_unittests/CMakeLists.txt +++ b/tools/nnapi_unittests/CMakeLists.txt @@ -32,6 +32,9 @@ add_nnapi_unittest(sub_3) add_nnapi_unittest(sub_4) add_nnapi_unittest(mul_1) add_nnapi_unittest(mul_2) +add_nnapi_unittest(relu_1) +add_nnapi_unittest(relu_2) +add_nnapi_unittest(relu_3) add_nnapi_unittest(conv_1) add_nnapi_unittest(dconv_1) add_nnapi_unittest(max_pool_1) diff --git a/tools/nnapi_unittests/tests/relu_1.cpp b/tools/nnapi_unittests/tests/relu_1.cpp new file mode 100644 index 0000000..31f55f6 --- /dev/null +++ b/tools/nnapi_unittests/tests/relu_1.cpp @@ -0,0 +1,121 @@ +/* + * 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 "util/feature/Shape.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); + +#define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); +#include "relu_1.lst" +#undef INT_VALUE + + const int32_t IFM_H = IFM_H_Value(); + const int32_t IFM_W = IFM_W_Value(); + + // Set random seed + int SEED = std::chrono::system_clock::now().time_since_epoch().count(); + + nnfw::util::env::IntAccessor("SEED").access(SEED); + + // 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(IFM_H); + PRINT_VALUE(IFM_W); +#undef PRINT_VALUE +#undef PRINT_NEWLINE + + const int32_t OFM_H = IFM_H; + const int32_t OFM_W = IFM_W; + + 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(2); + + // Configure Output Tensor + interp.SetTensorParametersReadWrite(0, kTfLiteFloat32 /* type */, "output" /* name */, + {OFM_H, OFM_W} /* dims */, quantization); + + // Configure Input Tensor + interp.SetTensorParametersReadWrite(1, kTfLiteFloat32 /* type */, "input" /* name */, + {IFM_H, IFM_W} /* dims */, quantization); + + // Add ReLU Node + // Run ReLU and store its result into Tensor #0 + // - Read IFM from Tensor #1 + interp.AddNodeWithParameters({1}, {0}, nullptr, 0, nullptr, + BuiltinOpResolver().FindOp(BuiltinOperator_RELU)); + + // Set Tensor #1 as Input #0, and Tensor #0 as Output #0 + interp.SetInputs({1}); + 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/relu_1.lst b/tools/nnapi_unittests/tests/relu_1.lst new file mode 100644 index 0000000..4f61845 --- /dev/null +++ b/tools/nnapi_unittests/tests/relu_1.lst @@ -0,0 +1,6 @@ +#ifndef INT_VALUE +#error "INT_VALUE should be defined" +#endif // INT_VALUE + +INT_VALUE(IFM_H, 16) +INT_VALUE(IFM_W, 16) diff --git a/tools/nnapi_unittests/tests/relu_2.cpp b/tools/nnapi_unittests/tests/relu_2.cpp new file mode 100644 index 0000000..481993f --- /dev/null +++ b/tools/nnapi_unittests/tests/relu_2.cpp @@ -0,0 +1,124 @@ +/* + * 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 "util/feature/Shape.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); + +#define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); +#include "relu_2.lst" +#undef INT_VALUE + + const int32_t IFM_C = IFM_C_Value(); + const int32_t IFM_H = IFM_H_Value(); + const int32_t IFM_W = IFM_W_Value(); + + // Set random seed + int SEED = std::chrono::system_clock::now().time_since_epoch().count(); + + nnfw::util::env::IntAccessor("SEED").access(SEED); + + // 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(IFM_C); + PRINT_VALUE(IFM_H); + PRINT_VALUE(IFM_W); +#undef PRINT_VALUE +#undef PRINT_NEWLINE + + const int32_t OFM_C = IFM_C; + const int32_t OFM_H = IFM_H; + const int32_t OFM_W = IFM_W; + + 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(2); + + // Configure Output Tensor + interp.SetTensorParametersReadWrite(0, kTfLiteFloat32 /* type */, "output" /* name */, + {OFM_H, OFM_W, OFM_C} /* dims */, quantization); + + // Configure Input Tensor + interp.SetTensorParametersReadWrite(1, kTfLiteFloat32 /* type */, "input" /* name */, + {IFM_H, IFM_W, IFM_C} /* dims */, quantization); + + // Add ReLU Node + // Run ReLU and store its result into Tensor #0 + // - Read IFM from Tensor #1 + interp.AddNodeWithParameters({1}, {0}, nullptr, 0, nullptr, + BuiltinOpResolver().FindOp(BuiltinOperator_RELU)); + + // Set Tensor #1 as Input #0, and Tensor #0 as Output #0 + interp.SetInputs({1}); + 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/relu_2.lst b/tools/nnapi_unittests/tests/relu_2.lst new file mode 100644 index 0000000..343bff8 --- /dev/null +++ b/tools/nnapi_unittests/tests/relu_2.lst @@ -0,0 +1,7 @@ +#ifndef INT_VALUE +#error "INT_VALUE should be defined" +#endif // INT_VALUE + +INT_VALUE(IFM_H, 16) +INT_VALUE(IFM_W, 16) +INT_VALUE(IFM_C, 3) diff --git a/tools/nnapi_unittests/tests/relu_3.cpp b/tools/nnapi_unittests/tests/relu_3.cpp new file mode 100644 index 0000000..c848d30 --- /dev/null +++ b/tools/nnapi_unittests/tests/relu_3.cpp @@ -0,0 +1,127 @@ +/* + * 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 "util/feature/Shape.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); + +#define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); +#include "relu_3.lst" +#undef INT_VALUE + + const int32_t IFM_N = IFM_N_Value(); + const int32_t IFM_C = IFM_C_Value(); + const int32_t IFM_H = IFM_H_Value(); + const int32_t IFM_W = IFM_W_Value(); + + // Set random seed + int SEED = std::chrono::system_clock::now().time_since_epoch().count(); + + nnfw::util::env::IntAccessor("SEED").access(SEED); + + // 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(IFM_N); + PRINT_VALUE(IFM_C); + PRINT_VALUE(IFM_H); + PRINT_VALUE(IFM_W); +#undef PRINT_VALUE +#undef PRINT_NEWLINE + + const int32_t OFM_N = IFM_N; + const int32_t OFM_C = IFM_C; + const int32_t OFM_H = IFM_H; + const int32_t OFM_W = IFM_W; + + 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(2); + + // Configure Output Tensor + interp.SetTensorParametersReadWrite(0, kTfLiteFloat32 /* type */, "output" /* name */, + {OFM_N, OFM_H, OFM_W, OFM_C} /* dims */, quantization); + + // Configure Input Tensor + interp.SetTensorParametersReadWrite(1, kTfLiteFloat32 /* type */, "input" /* name */, + {IFM_N, IFM_H, IFM_W, IFM_C} /* dims */, quantization); + + // Add ReLU Node + // Run ReLU and store its result into Tensor #0 + // - Read IFM from Tensor #1 + interp.AddNodeWithParameters({1}, {0}, nullptr, 0, nullptr, + BuiltinOpResolver().FindOp(BuiltinOperator_RELU)); + + // Set Tensor #1 as Input #0, and Tensor #0 as Output #0 + interp.SetInputs({1}); + 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/relu_3.lst b/tools/nnapi_unittests/tests/relu_3.lst new file mode 100644 index 0000000..a3a405c --- /dev/null +++ b/tools/nnapi_unittests/tests/relu_3.lst @@ -0,0 +1,8 @@ +#ifndef INT_VALUE +#error "INT_VALUE should be defined" +#endif // INT_VALUE + +INT_VALUE(IFM_H, 16) +INT_VALUE(IFM_W, 16) +INT_VALUE(IFM_C, 3) +INT_VALUE(IFM_N, 1) -- 2.7.4