From 3074f60a04f29296e103de1c84819ad0fa41d881 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=94=D0=B8=D0=BB=D1=88=D0=BE=D0=B4=D0=B6=D0=BE=D0=BD=20?= =?utf8?q?=D0=A3=D0=BC=D1=80=D0=BE=D0=BD=D1=85=D0=BE=D0=BD=D0=BE=D0=B2?= =?utf8?q?=D0=B8=D1=87=20=D0=9F=D0=BE=D1=88=D1=88=D0=BE=D0=B5=D0=B2/AI=20T?= =?utf8?q?ools=20Lab=20/SRR/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Fri, 11 Jan 2019 06:05:59 +0300 Subject: [PATCH] Synch tools/nnapi_quickcheck with current changes (#4197) Since we don't build tools/nnapi_quickcheck, it's far behind from current state. So, this change updates all files of this dir to be able to build and run them Signed-off-by: Poshshoev Dilshodzhon --- tools/nnapi_quickcheck/lib/env.cpp | 6 +++--- tools/nnapi_quickcheck/tests/add_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_2.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_3.cpp | 22 +++++++++++----------- tools/nnapi_quickcheck/tests/add_4.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_5.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_6.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_7.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_8.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_9.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/add_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/avg_pool_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/cast_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/cast_2.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/concat_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/concat_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/conv_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/conv_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/dconv_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/dconv_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/dequantize_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/div_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/div_2.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/fully_connected_1.cpp | 14 +++++++------- .../tests/fully_connected_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/gather_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/gather_2.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/logistic_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/max_pool_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/mul_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/mul_2.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/mul_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/relu1_1.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/relu6_1.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/relu6_quan_1.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/relu_1.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/relu_2.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/relu_3.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/relu_quan_1.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/reshape_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/reshape_quan_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/softmax_1.cpp | 18 +++++++++--------- tools/nnapi_quickcheck/tests/softmax_2.cpp | 18 +++++++++--------- tools/nnapi_quickcheck/tests/softmax_quan_1.cpp | 18 +++++++++--------- tools/nnapi_quickcheck/tests/split_1.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/split_2.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/split_3.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/split_4.cpp | 16 ++++++++-------- tools/nnapi_quickcheck/tests/sub_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/sub_2.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/sub_3.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/sub_4.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/sub_5.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/sub_6.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/tanh_1.cpp | 14 +++++++------- tools/nnapi_quickcheck/tests/topk_v2_1.cpp | 14 +++++++------- 60 files changed, 437 insertions(+), 437 deletions(-) diff --git a/tools/nnapi_quickcheck/lib/env.cpp b/tools/nnapi_quickcheck/lib/env.cpp index 7585167..005e876 100644 --- a/tools/nnapi_quickcheck/lib/env.cpp +++ b/tools/nnapi_quickcheck/lib/env.cpp @@ -16,14 +16,14 @@ #include "env.h" -#include "util/environment.h" +#include "misc/environment.h" // // Integer variable // IntVar::IntVar(const std::string &name, int32_t value) : _value{value} { - nnfw::util::env::IntAccessor{name}.access(_value); + nnfw::misc::env::IntAccessor{name}.access(_value); } // @@ -31,7 +31,7 @@ IntVar::IntVar(const std::string &name, int32_t value) : _value{value} // FloatVar::FloatVar(const std::string &name, float value) : _value{value} { - nnfw::util::env::FloatAccessor{name}.access(_value); + nnfw::misc::env::FloatAccessor{name}.access(_value); } // diff --git a/tools/nnapi_quickcheck/tests/add_1.cpp b/tools/nnapi_quickcheck/tests/add_1.cpp index 098b859..6cf110e 100644 --- a/tools/nnapi_quickcheck/tests/add_1.cpp +++ b/tools/nnapi_quickcheck/tests/add_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_1.lst" @@ -146,7 +146,7 @@ TEST(NNAPI_Quickcheck_add_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_2.cpp b/tools/nnapi_quickcheck/tests/add_2.cpp index 12851f1..9629761 100644 --- a/tools/nnapi_quickcheck/tests/add_2.cpp +++ b/tools/nnapi_quickcheck/tests/add_2.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_2.lst" @@ -164,7 +164,7 @@ TEST(NNAPI_Quickcheck_add_2, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_3.cpp b/tools/nnapi_quickcheck/tests/add_3.cpp index a7b2f43..a2aa121 100644 --- a/tools/nnapi_quickcheck/tests/add_3.cpp +++ b/tools/nnapi_quickcheck/tests/add_3.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/TensorShapeUtils.h" @@ -36,14 +36,14 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_3, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -52,9 +52,9 @@ TEST(NNAPI_Quickcheck_add_3, simple_test) #include "add_3.lst" #undef STR_VALUE - const auto LHS_SHAPE = nnfw::util::tensor::Shape::from(LHS_SHAPE_Value()); - const auto RHS_SHAPE = nnfw::util::tensor::Shape::from(RHS_SHAPE_Value()); - const auto OUT_SHAPE = nnfw::support::tflite::broadcast(LHS_SHAPE, RHS_SHAPE); + const auto LHS_SHAPE = nnfw::misc::tensor::Shape::from(LHS_SHAPE_Value()); + const auto RHS_SHAPE = nnfw::misc::tensor::Shape::from(RHS_SHAPE_Value()); + const auto OUT_SHAPE = nnfw::tflite::broadcast(LHS_SHAPE, RHS_SHAPE); std::cout << "Configurations:" << std::endl; #define PRINT_NEWLINE() \ @@ -75,7 +75,7 @@ TEST(NNAPI_Quickcheck_add_3, simple_test) #undef PRINT_NEWLINE auto setup = [&](Interpreter &interp) { - using nnfw::support::tflite::as_dims; + using nnfw::tflite::as_dims; // Comment from 'context.h' // @@ -121,15 +121,15 @@ TEST(NNAPI_Quickcheck_add_3, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; param.verbose = 0; param.tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(param.verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(param.tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(param.verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(param.tolerance); int res = RandomTestRunner{SEED, param}.run(builder); diff --git a/tools/nnapi_quickcheck/tests/add_4.cpp b/tools/nnapi_quickcheck/tests/add_4.cpp index 217438f..d1efcbc 100644 --- a/tools/nnapi_quickcheck/tests/add_4.cpp +++ b/tools/nnapi_quickcheck/tests/add_4.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_4, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_4.lst" @@ -146,7 +146,7 @@ TEST(NNAPI_Quickcheck_add_4, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_5.cpp b/tools/nnapi_quickcheck/tests/add_5.cpp index 2f02c82..cd51e14 100644 --- a/tools/nnapi_quickcheck/tests/add_5.cpp +++ b/tools/nnapi_quickcheck/tests/add_5.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_5, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_5.lst" @@ -139,7 +139,7 @@ TEST(NNAPI_Quickcheck_add_5, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_6.cpp b/tools/nnapi_quickcheck/tests/add_6.cpp index 3af2c4a..52fb225 100644 --- a/tools/nnapi_quickcheck/tests/add_6.cpp +++ b/tools/nnapi_quickcheck/tests/add_6.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_6, simple_test) { int verbose = 1; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_6.lst" @@ -131,7 +131,7 @@ TEST(NNAPI_Quickcheck_add_6, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_7.cpp b/tools/nnapi_quickcheck/tests/add_7.cpp index 1ebf18e..047395c 100644 --- a/tools/nnapi_quickcheck/tests/add_7.cpp +++ b/tools/nnapi_quickcheck/tests/add_7.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_7, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_7.lst" @@ -139,7 +139,7 @@ TEST(NNAPI_Quickcheck_add_7, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_8.cpp b/tools/nnapi_quickcheck/tests/add_8.cpp index d4a5e48..cdb4188 100644 --- a/tools/nnapi_quickcheck/tests/add_8.cpp +++ b/tools/nnapi_quickcheck/tests/add_8.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_8, simple_test) { int verbose = 1; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_8.lst" @@ -177,7 +177,7 @@ TEST(NNAPI_Quickcheck_add_8, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_9.cpp b/tools/nnapi_quickcheck/tests/add_9.cpp index 6c0cc22..e97c7a4 100644 --- a/tools/nnapi_quickcheck/tests/add_9.cpp +++ b/tools/nnapi_quickcheck/tests/add_9.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_9, simple_test) { int verbose = 1; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_9.lst" @@ -174,7 +174,7 @@ TEST(NNAPI_Quickcheck_add_9, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/add_quan_1.cpp b/tools/nnapi_quickcheck/tests/add_quan_1.cpp index daf15e0..b185a6b 100644 --- a/tools/nnapi_quickcheck/tests/add_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/add_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_add_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "add_quan_1.lst" @@ -149,7 +149,7 @@ TEST(NNAPI_Quickcheck_add_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp index e68cfc5..f74d2ff 100644 --- a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp +++ b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_avg_pool_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "avg_pool_1.lst" @@ -137,7 +137,7 @@ TEST(NNAPI_Quickcheck_avg_pool_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp index b24733a..87b2e53 100644 --- a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_avg_pool_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "avg_pool_quan_1.lst" @@ -136,7 +136,7 @@ TEST(NNAPI_Quickcheck_avg_pool_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/cast_1.cpp b/tools/nnapi_quickcheck/tests/cast_1.cpp index bf493d0..81ddc91 100644 --- a/tools/nnapi_quickcheck/tests/cast_1.cpp +++ b/tools/nnapi_quickcheck/tests/cast_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -34,20 +34,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_cast_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "cast_1.lst" @@ -123,7 +123,7 @@ TEST(NNAPI_Quickcheck_cast_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/cast_2.cpp b/tools/nnapi_quickcheck/tests/cast_2.cpp index d85781d..2a202bf 100644 --- a/tools/nnapi_quickcheck/tests/cast_2.cpp +++ b/tools/nnapi_quickcheck/tests/cast_2.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_cast_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "cast_2.lst" @@ -121,7 +121,7 @@ TEST(NNAPI_Quickcheck_cast_2, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp b/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp index ede7637..0b04d95 100644 --- a/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp +++ b/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -34,20 +34,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_cast_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "cast_q_to_f_1.lst" @@ -123,7 +123,7 @@ TEST(NNAPI_Quickcheck_cast_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/concat_1.cpp b/tools/nnapi_quickcheck/tests/concat_1.cpp index cc14d08..ec9b803 100644 --- a/tools/nnapi_quickcheck/tests/concat_1.cpp +++ b/tools/nnapi_quickcheck/tests/concat_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_concat_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "concat_1.lst" @@ -148,7 +148,7 @@ TEST(NNAPI_Quickcheck_concat_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp index f804b81..bdd20f2 100644 --- a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_concat_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "concat_quan_1.lst" @@ -150,7 +150,7 @@ TEST(NNAPI_Quickcheck_concat_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/conv_1.cpp b/tools/nnapi_quickcheck/tests/conv_1.cpp index 57b6abd..8949155 100644 --- a/tools/nnapi_quickcheck/tests/conv_1.cpp +++ b/tools/nnapi_quickcheck/tests/conv_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_conv_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "conv_1.lst" @@ -194,7 +194,7 @@ TEST(NNAPI_Quickcheck_conv_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp index 025ccca..5965e1e 100644 --- a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_conv_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "conv_quan_1.lst" @@ -198,7 +198,7 @@ TEST(NNAPI_Quickcheck_conv_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/dconv_1.cpp b/tools/nnapi_quickcheck/tests/dconv_1.cpp index 21d6483..9417ad4 100644 --- a/tools/nnapi_quickcheck/tests/dconv_1.cpp +++ b/tools/nnapi_quickcheck/tests/dconv_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_dconv_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "dconv_1.lst" @@ -192,7 +192,7 @@ TEST(NNAPI_Quickcheck_dconv_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp index 7cb9383..c29fa81 100644 --- a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_dconv_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "dconv_quan_1.lst" @@ -196,7 +196,7 @@ TEST(NNAPI_Quickcheck_dconv_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/dequantize_1.cpp b/tools/nnapi_quickcheck/tests/dequantize_1.cpp index 467392d..73a3f24 100644 --- a/tools/nnapi_quickcheck/tests/dequantize_1.cpp +++ b/tools/nnapi_quickcheck/tests/dequantize_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -34,20 +34,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_dequantize_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "dequantize_1.lst" @@ -123,7 +123,7 @@ TEST(NNAPI_Quickcheck_dequantize_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/div_1.cpp b/tools/nnapi_quickcheck/tests/div_1.cpp index 1fe0f7a..0cca2ec 100644 --- a/tools/nnapi_quickcheck/tests/div_1.cpp +++ b/tools/nnapi_quickcheck/tests/div_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_div_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "div_1.lst" @@ -146,7 +146,7 @@ TEST(NNAPI_Quickcheck_div_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/div_2.cpp b/tools/nnapi_quickcheck/tests/div_2.cpp index 883167e..cdaf53a 100644 --- a/tools/nnapi_quickcheck/tests/div_2.cpp +++ b/tools/nnapi_quickcheck/tests/div_2.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_div_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "div_2.lst" @@ -139,7 +139,7 @@ TEST(NNAPI_Quickcheck_div_2, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp index ea5df23..74a6c41 100644 --- a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp +++ b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp @@ -16,12 +16,12 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" #include "env.h" -#include "util/environment.h" +#include "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -34,7 +34,7 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; template T *make_malloc(void) { return reinterpret_cast(malloc(sizeof(T))); } @@ -43,13 +43,13 @@ TEST(NNAPI_Quickcheck_fully_connected_1, simple_test) int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "conv_1.lst" @@ -174,7 +174,7 @@ TEST(NNAPI_Quickcheck_fully_connected_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp index c434d75..c2a5726 100644 --- a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp @@ -16,12 +16,12 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" #include "env.h" -#include "util/environment.h" +#include "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -34,7 +34,7 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; template T *make_malloc(void) { return reinterpret_cast(malloc(sizeof(T))); } @@ -43,13 +43,13 @@ TEST(NNAPI_Quickcheck_fully_connected_1, simple_test) int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "fully_connected_quan_1.lst" @@ -176,7 +176,7 @@ TEST(NNAPI_Quickcheck_fully_connected_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/gather_1.cpp b/tools/nnapi_quickcheck/tests/gather_1.cpp index b916676..1f3b529 100644 --- a/tools/nnapi_quickcheck/tests/gather_1.cpp +++ b/tools/nnapi_quickcheck/tests/gather_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -31,21 +31,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_gather_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "gather_1.lst" @@ -119,7 +119,7 @@ TEST(NNAPI_Quickcheck_gather_1, simple_test) interp.SetOutputs({2}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/gather_2.cpp b/tools/nnapi_quickcheck/tests/gather_2.cpp index 4b11568..c026d6f 100644 --- a/tools/nnapi_quickcheck/tests/gather_2.cpp +++ b/tools/nnapi_quickcheck/tests/gather_2.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -31,21 +31,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_gather_2, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "gather_2.lst" @@ -123,7 +123,7 @@ TEST(NNAPI_Quickcheck_gather_2, simple_test) interp.SetOutputs({2}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp index e9e3bc1..cbc34f0 100644 --- a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_logistic_quan_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "logistic_quan_1.lst" @@ -127,7 +127,7 @@ TEST(NNAPI_Quickcheck_logistic_quan_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/max_pool_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_1.cpp index 07fa9ac..30bd42e 100644 --- a/tools/nnapi_quickcheck/tests/max_pool_1.cpp +++ b/tools/nnapi_quickcheck/tests/max_pool_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_max_pool_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "max_pool_1.lst" @@ -143,7 +143,7 @@ TEST(NNAPI_Quickcheck_max_pool_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp index d241c43..d862fe5 100644 --- a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_max_pool_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "max_pool_quan_1.lst" @@ -145,7 +145,7 @@ TEST(NNAPI_Quickcheck_max_pool_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/mul_1.cpp b/tools/nnapi_quickcheck/tests/mul_1.cpp index cf7282b..9f5c028 100644 --- a/tools/nnapi_quickcheck/tests/mul_1.cpp +++ b/tools/nnapi_quickcheck/tests/mul_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -34,20 +34,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_mul_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "mul_1.lst" @@ -137,7 +137,7 @@ TEST(NNAPI_Quickcheck_mul_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/mul_2.cpp b/tools/nnapi_quickcheck/tests/mul_2.cpp index 734be8e..e7f7ba3 100644 --- a/tools/nnapi_quickcheck/tests/mul_2.cpp +++ b/tools/nnapi_quickcheck/tests/mul_2.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -34,20 +34,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_mul_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "mul_2.lst" @@ -137,7 +137,7 @@ TEST(NNAPI_Quickcheck_mul_2, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp index 72903fe..c8bc5b3 100644 --- a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/interp/FunctionBuilder.h" @@ -34,20 +34,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_mul_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "mul_1.lst" @@ -139,7 +139,7 @@ TEST(NNAPI_Quickcheck_mul_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/relu1_1.cpp b/tools/nnapi_quickcheck/tests/relu1_1.cpp index b729c50..511c35c 100644 --- a/tools/nnapi_quickcheck/tests/relu1_1.cpp +++ b/tools/nnapi_quickcheck/tests/relu1_1.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -33,15 +33,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; 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); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "relu1_1.lst" @@ -53,7 +53,7 @@ int main(int argc, char **argv) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -110,7 +110,7 @@ int main(int argc, char **argv) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/relu6_1.cpp b/tools/nnapi_quickcheck/tests/relu6_1.cpp index cafbe83..78d2df0 100644 --- a/tools/nnapi_quickcheck/tests/relu6_1.cpp +++ b/tools/nnapi_quickcheck/tests/relu6_1.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_relu6_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "relu6_1.lst" @@ -55,7 +55,7 @@ TEST(NNAPI_Quickcheck_relu6_1, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -112,7 +112,7 @@ TEST(NNAPI_Quickcheck_relu6_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp index 3d8ce4f..31d4946 100644 --- a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -33,15 +33,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; 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); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "relu6_quan_1.lst" @@ -53,7 +53,7 @@ int main(int argc, char **argv) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -112,7 +112,7 @@ int main(int argc, char **argv) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/relu_1.cpp b/tools/nnapi_quickcheck/tests/relu_1.cpp index c7141ca..0c4ad39 100644 --- a/tools/nnapi_quickcheck/tests/relu_1.cpp +++ b/tools/nnapi_quickcheck/tests/relu_1.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_relu_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "relu_1.lst" @@ -55,7 +55,7 @@ TEST(NNAPI_Quickcheck_relu_1, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -112,7 +112,7 @@ TEST(NNAPI_Quickcheck_relu_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/relu_2.cpp b/tools/nnapi_quickcheck/tests/relu_2.cpp index 74ab113..d002732 100644 --- a/tools/nnapi_quickcheck/tests/relu_2.cpp +++ b/tools/nnapi_quickcheck/tests/relu_2.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_relu_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "relu_2.lst" @@ -56,7 +56,7 @@ TEST(NNAPI_Quickcheck_relu_2, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -115,7 +115,7 @@ TEST(NNAPI_Quickcheck_relu_2, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/relu_3.cpp b/tools/nnapi_quickcheck/tests/relu_3.cpp index f876e18..3b542e9 100644 --- a/tools/nnapi_quickcheck/tests/relu_3.cpp +++ b/tools/nnapi_quickcheck/tests/relu_3.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_relu_3, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "relu_3.lst" @@ -57,7 +57,7 @@ TEST(NNAPI_Quickcheck_relu_3, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -118,7 +118,7 @@ TEST(NNAPI_Quickcheck_relu_3, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp index 7bc6181..0a8e08b 100644 --- a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -33,15 +33,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; 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); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "relu_quan_1.lst" @@ -53,7 +53,7 @@ int main(int argc, char **argv) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -112,7 +112,7 @@ int main(int argc, char **argv) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/reshape_1.cpp b/tools/nnapi_quickcheck/tests/reshape_1.cpp index a35623c..f3e50fc 100644 --- a/tools/nnapi_quickcheck/tests/reshape_1.cpp +++ b/tools/nnapi_quickcheck/tests/reshape_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_reshape_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "max_pool_1.lst" @@ -128,7 +128,7 @@ TEST(NNAPI_Quickcheck_reshape_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp index fb1db77..28b990a 100644 --- a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_reshape_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "reshape_quan_1.lst" @@ -130,7 +130,7 @@ TEST(NNAPI_Quickcheck_reshape_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp index 3c7ce28..323c137 100644 --- a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp +++ b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_resize_bilinear_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "resize_bilinear_1.lst" @@ -128,7 +128,7 @@ TEST(NNAPI_Quickcheck_resize_bilinear_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/softmax_1.cpp b/tools/nnapi_quickcheck/tests/softmax_1.cpp index b9cc6bf..15a9d99 100644 --- a/tools/nnapi_quickcheck/tests/softmax_1.cpp +++ b/tools/nnapi_quickcheck/tests/softmax_1.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_softmax_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "softmax_1.lst" @@ -56,12 +56,12 @@ TEST(NNAPI_Quickcheck_softmax_1, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); - const nnfw::util::feature::Shape ifm_shape{IFM_C, IFM_H, IFM_W}; + const nnfw::misc::feature::Shape ifm_shape{IFM_C, IFM_H, IFM_W}; const int32_t OFM_C = IFM_C; const int32_t OFM_H = IFM_H; @@ -107,7 +107,7 @@ TEST(NNAPI_Quickcheck_softmax_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/softmax_2.cpp b/tools/nnapi_quickcheck/tests/softmax_2.cpp index 4024357..1507559 100644 --- a/tools/nnapi_quickcheck/tests/softmax_2.cpp +++ b/tools/nnapi_quickcheck/tests/softmax_2.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_softmax_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define FLOAT_VALUE(NAME, VALUE) FloatVar NAME##_Value(#NAME, VALUE); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); @@ -75,12 +75,12 @@ TEST(NNAPI_Quickcheck_softmax_2, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); - const nnfw::util::feature::Shape ifm_shape{IFM_C, IFM_H, IFM_W}; + const nnfw::misc::feature::Shape ifm_shape{IFM_C, IFM_H, IFM_W}; const int32_t OFM_C = IFM_C; const int32_t OFM_H = IFM_H; @@ -126,7 +126,7 @@ TEST(NNAPI_Quickcheck_softmax_2, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp index 2c12e11..010c76b 100644 --- a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp +++ b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_softmax_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "softmax_quan_1.lst" @@ -56,12 +56,12 @@ TEST(NNAPI_Quickcheck_softmax_1, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); - const nnfw::util::feature::Shape ifm_shape{IFM_C, IFM_H, IFM_W}; + const nnfw::misc::feature::Shape ifm_shape{IFM_C, IFM_H, IFM_W}; const int32_t OFM_C = IFM_C; const int32_t OFM_H = IFM_H; @@ -109,7 +109,7 @@ TEST(NNAPI_Quickcheck_softmax_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/split_1.cpp b/tools/nnapi_quickcheck/tests/split_1.cpp index 735a077..9834c8e 100644 --- a/tools/nnapi_quickcheck/tests/split_1.cpp +++ b/tools/nnapi_quickcheck/tests/split_1.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_split_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "split_1.lst" @@ -59,7 +59,7 @@ TEST(NNAPI_Quickcheck_split_1, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -140,7 +140,7 @@ TEST(NNAPI_Quickcheck_split_1, simple_test) interp.SetOutputs(ofm_indexes); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/split_2.cpp b/tools/nnapi_quickcheck/tests/split_2.cpp index 0d4bf3e..b996fb2 100644 --- a/tools/nnapi_quickcheck/tests/split_2.cpp +++ b/tools/nnapi_quickcheck/tests/split_2.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_split_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "split_2.lst" @@ -59,7 +59,7 @@ TEST(NNAPI_Quickcheck_split_2, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -140,7 +140,7 @@ TEST(NNAPI_Quickcheck_split_2, simple_test) interp.SetOutputs(ofm_indexes); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/split_3.cpp b/tools/nnapi_quickcheck/tests/split_3.cpp index eaa65bd..848faea 100644 --- a/tools/nnapi_quickcheck/tests/split_3.cpp +++ b/tools/nnapi_quickcheck/tests/split_3.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_split_3, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "split_3.lst" @@ -57,7 +57,7 @@ TEST(NNAPI_Quickcheck_split_3, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -134,7 +134,7 @@ TEST(NNAPI_Quickcheck_split_3, simple_test) interp.SetOutputs(ofm_indexes); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/split_4.cpp b/tools/nnapi_quickcheck/tests/split_4.cpp index 394c392..92ccda4 100644 --- a/tools/nnapi_quickcheck/tests/split_4.cpp +++ b/tools/nnapi_quickcheck/tests/split_4.cpp @@ -16,14 +16,14 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" +#include "misc/feature/Shape.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,15 +35,15 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_split_4, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "split_4.lst" @@ -57,7 +57,7 @@ TEST(NNAPI_Quickcheck_split_4, simple_test) // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Initialize random number generator std::minstd_rand random(SEED); @@ -134,7 +134,7 @@ TEST(NNAPI_Quickcheck_split_4, simple_test) interp.SetOutputs(ofm_indexes); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/sub_1.cpp b/tools/nnapi_quickcheck/tests/sub_1.cpp index 9e4ff4c..f3c22c2 100644 --- a/tools/nnapi_quickcheck/tests/sub_1.cpp +++ b/tools/nnapi_quickcheck/tests/sub_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_sub_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "sub_1.lst" @@ -146,7 +146,7 @@ TEST(NNAPI_Quickcheck_sub_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/sub_2.cpp b/tools/nnapi_quickcheck/tests/sub_2.cpp index 2702edb..7f3ea6f 100644 --- a/tools/nnapi_quickcheck/tests/sub_2.cpp +++ b/tools/nnapi_quickcheck/tests/sub_2.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_sub_2, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "sub_2.lst" @@ -139,7 +139,7 @@ TEST(NNAPI_Quickcheck_sub_2, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/sub_3.cpp b/tools/nnapi_quickcheck/tests/sub_3.cpp index 6122e24..2c962ca 100644 --- a/tools/nnapi_quickcheck/tests/sub_3.cpp +++ b/tools/nnapi_quickcheck/tests/sub_3.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_sub_3, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "sub_3.lst" @@ -131,7 +131,7 @@ TEST(NNAPI_Quickcheck_sub_3, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/sub_4.cpp b/tools/nnapi_quickcheck/tests/sub_4.cpp index 28922fe..2c62073 100644 --- a/tools/nnapi_quickcheck/tests/sub_4.cpp +++ b/tools/nnapi_quickcheck/tests/sub_4.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_sub_4, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "sub_1.lst" @@ -139,7 +139,7 @@ TEST(NNAPI_Quickcheck_sub_4, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/sub_5.cpp b/tools/nnapi_quickcheck/tests/sub_5.cpp index e421a12..7ee8472 100644 --- a/tools/nnapi_quickcheck/tests/sub_5.cpp +++ b/tools/nnapi_quickcheck/tests/sub_5.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_sub_5, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "sub_5.lst" @@ -175,7 +175,7 @@ TEST(NNAPI_Quickcheck_sub_5, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/sub_6.cpp b/tools/nnapi_quickcheck/tests/sub_6.cpp index 00bfc54..312e1f1 100644 --- a/tools/nnapi_quickcheck/tests/sub_6.cpp +++ b/tools/nnapi_quickcheck/tests/sub_6.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_sub_6, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "sub_6.lst" @@ -175,7 +175,7 @@ TEST(NNAPI_Quickcheck_sub_6, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/tanh_1.cpp b/tools/nnapi_quickcheck/tests/tanh_1.cpp index 6a9a299..f2de9cc 100644 --- a/tools/nnapi_quickcheck/tests/tanh_1.cpp +++ b/tools/nnapi_quickcheck/tests/tanh_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -35,20 +35,20 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_tanh_1, simple_test) { int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::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); + nnfw::misc::env::IntAccessor("SEED").access(SEED); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "tanh_1.lst" @@ -121,7 +121,7 @@ TEST(NNAPI_Quickcheck_tanh_1, simple_test) interp.SetOutputs({0}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; diff --git a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp index 4b145e5..0d61030 100644 --- a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp +++ b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp @@ -16,13 +16,13 @@ #include "gtest/gtest.h" -#include "tflite/kernels/register.h" +#include "tflite/ext/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 "misc/environment.h" #include "tflite/Diff.h" #include "tflite/Quantization.h" @@ -32,21 +32,21 @@ #include using namespace tflite; -using namespace tflite::ops::builtin; +using namespace nnfw::tflite; TEST(NNAPI_Quickcheck_topk_v2_1, simple_test) { // Set random seed int SEED = std::chrono::system_clock::now().time_since_epoch().count(); - nnfw::util::env::IntAccessor("SEED").access(SEED); + nnfw::misc::env::IntAccessor("SEED").access(SEED); // Set random test parameters int verbose = 0; int tolerance = 1; - nnfw::util::env::IntAccessor("VERBOSE").access(verbose); - nnfw::util::env::IntAccessor("TOLERANCE").access(tolerance); + nnfw::misc::env::IntAccessor("VERBOSE").access(verbose); + nnfw::misc::env::IntAccessor("TOLERANCE").access(tolerance); #define INT_VALUE(NAME, VALUE) IntVar NAME##_Value(#NAME, VALUE); #include "topk_v2_1.lst" @@ -125,7 +125,7 @@ TEST(NNAPI_Quickcheck_topk_v2_1, simple_test) interp.SetOutputs({2, 3}); }; - const nnfw::support::tflite::interp::FunctionBuilder builder(setup); + const nnfw::tflite::FunctionBuilder builder(setup); RandomTestParam param; -- 2.7.4