From: 윤현식/동작제어Lab(SR)/Principal Engineer/삼성전자 Date: Thu, 14 Jun 2018 04:38:28 +0000 (+0900) Subject: [nnapi_unittest] more cases for MUL (3D, 1D) (#1669) X-Git-Tag: 0.2~614 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c1df16ba60aa5ea1d2b78119b0afb5284b89d50;p=platform%2Fcore%2Fml%2Fnnfw.git [nnapi_unittest] more cases for MUL (3D, 1D) (#1669) For PR #1665, `Mul` without ` 1 ` from shape ([5, 3, 12] * [12]) was written. Previous version `Mul_1' (for ADAS, [300, 1, 4] * [4]) sometimes worked with buggy intermediate code while working on #1665. Signed-off-by: Hyun Sik Yoon --- diff --git a/tools/nnapi_unittests/CMakeLists.txt b/tools/nnapi_unittests/CMakeLists.txt index c0b9215..eca0ac0 100644 --- a/tools/nnapi_unittests/CMakeLists.txt +++ b/tools/nnapi_unittests/CMakeLists.txt @@ -23,6 +23,7 @@ add_nnapi_unittest(div_2) add_nnapi_unittest(sub_1) add_nnapi_unittest(sub_2) add_nnapi_unittest(mul_1) +add_nnapi_unittest(mul_2) add_nnapi_unittest(conv_1) add_nnapi_unittest(dconv_1) add_nnapi_unittest(max_pool_1) diff --git a/tools/nnapi_unittests/tests/mul_2.cpp b/tools/nnapi_unittests/tests/mul_2.cpp new file mode 100644 index 0000000..5b1e94a --- /dev/null +++ b/tools/nnapi_unittests/tests/mul_2.cpp @@ -0,0 +1,146 @@ +/* + * 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/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 "mul_2.lst" +#undef INT_VALUE + + const int32_t LEFT_D1 = LEFT_D1_Value(); + const int32_t LEFT_D2 = LEFT_D2_Value(); + const int32_t LEFT_D3 = LEFT_D3_Value(); + + const int32_t RIGHT_D1 = RIGHT_D1_Value(); + + const int32_t OFM_D1 = LEFT_D1; + const int32_t OFM_D2 = LEFT_D2; + const int32_t OFM_D3 = LEFT_D3; + + // 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_D1); + PRINT_VALUE(LEFT_D2); + PRINT_VALUE(LEFT_D3); + PRINT_NEWLINE(); + + PRINT_VALUE(RIGHT_D1); + PRINT_NEWLINE(); + + PRINT_VALUE(OFM_D1); + PRINT_VALUE(OFM_D2); + PRINT_VALUE(OFM_D3); +#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; + + quantization.scale = 1; + quantization.zero_point = 0; + + // 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_D1, OFM_D2, OFM_D3} /* dims */, quantization); + + // Configure input(s) + interp.SetTensorParametersReadWrite(1, kTfLiteFloat32 /* type */, "left" /* name */, + {LEFT_D1, LEFT_D2, LEFT_D3} /* dims */, quantization); + + interp.SetTensorParametersReadWrite(2, kTfLiteFloat32 /* type */, "right" /* name */, + {RIGHT_D1} /* dims */, quantization); + + // Add Convolution 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 Add and store the result into Tensor #0 + // - Read Left from Tensor #1 + // - Read Left from Tensor #2, + interp.AddNodeWithParameters({1, 2}, {0}, nullptr, 0, reinterpret_cast(param), + BuiltinOpResolver().FindOp(BuiltinOperator_MUL)); + + 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/mul_2.lst b/tools/nnapi_unittests/tests/mul_2.lst new file mode 100644 index 0000000..da53e7e --- /dev/null +++ b/tools/nnapi_unittests/tests/mul_2.lst @@ -0,0 +1,9 @@ +#ifndef INT_VALUE +#error "INT_VALUE should be defined" +#endif // INT_VALUE + +INT_VALUE(LEFT_D1, 5) +INT_VALUE(LEFT_D2, 3) +INT_VALUE(LEFT_D3, 12) + +INT_VALUE(RIGHT_D1, 12)