summaryrefslogtreecommitdiff
path: root/tools/nnapi_quickcheck
diff options
context:
space:
mode:
Diffstat (limited to 'tools/nnapi_quickcheck')
-rw-r--r--tools/nnapi_quickcheck/CMakeLists.txt4
-rw-r--r--tools/nnapi_quickcheck/tests/add_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_2.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_3.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_4.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_5.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_6.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_7.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_8.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_9.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/add_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/avg_pool_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/cast_1.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/cast_2.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/concat_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/concat_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/conv_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/conv_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/dconv_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/dconv_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/dequantize_1.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/div_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/div_2.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/fully_connected_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/gather_1.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/gather_2.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/logistic_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/max_pool_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/mul_1.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/mul_2.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/mul_quan_1.cpp6
-rw-r--r--tools/nnapi_quickcheck/tests/relu1_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/relu6_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/relu6_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/relu_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/relu_2.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/relu_3.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/relu_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/reshape_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/reshape_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/softmax_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/softmax_2.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/softmax_quan_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/split_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/split_2.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/split_3.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/split_4.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/sub_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/sub_2.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/sub_3.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/sub_4.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/sub_5.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/sub_6.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/tanh_1.cpp8
-rw-r--r--tools/nnapi_quickcheck/tests/topk_v2_1.cpp8
60 files changed, 230 insertions, 230 deletions
diff --git a/tools/nnapi_quickcheck/CMakeLists.txt b/tools/nnapi_quickcheck/CMakeLists.txt
index 9dd7f5b3b..c88155aa1 100644
--- a/tools/nnapi_quickcheck/CMakeLists.txt
+++ b/tools/nnapi_quickcheck/CMakeLists.txt
@@ -8,8 +8,8 @@ list(REMOVE_ITEM NNAPI_QUICKCHECK_LIB_SOURCES ${NNAPI_QUICKCHECK_LIB_TESTS})
add_library(nnapi_quickcheck_common ${NNAPI_QUICKCHECK_LIB_SOURCES})
target_include_directories(nnapi_quickcheck_common PUBLIC "inc")
-target_link_libraries(nnapi_quickcheck_common nnfw_util)
-target_link_libraries(nnapi_quickcheck_common nnfw_support_tflite)
+target_link_libraries(nnapi_quickcheck_common nnfw_lib_misc)
+target_link_libraries(nnapi_quickcheck_common nnfw_lib_tflite)
add_executable(nnapi_quickcheck_lib_env_test "lib/env.test.cpp")
target_link_libraries(nnapi_quickcheck_lib_env_test nnapi_quickcheck_common)
diff --git a/tools/nnapi_quickcheck/tests/add_1.cpp b/tools/nnapi_quickcheck/tests/add_1.cpp
index 52aa2afa0..098b8591b 100644
--- a/tools/nnapi_quickcheck/tests/add_1.cpp
+++ b/tools/nnapi_quickcheck/tests/add_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_2.cpp b/tools/nnapi_quickcheck/tests/add_2.cpp
index 9b5b19c06..12851f1b0 100644
--- a/tools/nnapi_quickcheck/tests/add_2.cpp
+++ b/tools/nnapi_quickcheck/tests/add_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_3.cpp b/tools/nnapi_quickcheck/tests/add_3.cpp
index e692fe314..a7b2f436e 100644
--- a/tools/nnapi_quickcheck/tests/add_3.cpp
+++ b/tools/nnapi_quickcheck/tests/add_3.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/TensorShapeUtils.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/TensorShapeUtils.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_4.cpp b/tools/nnapi_quickcheck/tests/add_4.cpp
index e519f1731..217438fb1 100644
--- a/tools/nnapi_quickcheck/tests/add_4.cpp
+++ b/tools/nnapi_quickcheck/tests/add_4.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_5.cpp b/tools/nnapi_quickcheck/tests/add_5.cpp
index cacb5e42d..2f02c8292 100644
--- a/tools/nnapi_quickcheck/tests/add_5.cpp
+++ b/tools/nnapi_quickcheck/tests/add_5.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_6.cpp b/tools/nnapi_quickcheck/tests/add_6.cpp
index 245b7ad39..3af2c4af3 100644
--- a/tools/nnapi_quickcheck/tests/add_6.cpp
+++ b/tools/nnapi_quickcheck/tests/add_6.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_7.cpp b/tools/nnapi_quickcheck/tests/add_7.cpp
index 43d285c72..1ebf18e32 100644
--- a/tools/nnapi_quickcheck/tests/add_7.cpp
+++ b/tools/nnapi_quickcheck/tests/add_7.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_8.cpp b/tools/nnapi_quickcheck/tests/add_8.cpp
index ec11c3969..d4a5e4838 100644
--- a/tools/nnapi_quickcheck/tests/add_8.cpp
+++ b/tools/nnapi_quickcheck/tests/add_8.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_9.cpp b/tools/nnapi_quickcheck/tests/add_9.cpp
index f3cf02875..6c0cc2240 100644
--- a/tools/nnapi_quickcheck/tests/add_9.cpp
+++ b/tools/nnapi_quickcheck/tests/add_9.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_quan_1.cpp b/tools/nnapi_quickcheck/tests/add_quan_1.cpp
index 45f0ba681..daf15e091 100644
--- a/tools/nnapi_quickcheck/tests/add_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/add_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
index c938ed690..e68cfc5b3 100644
--- a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
+++ b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
index ba41c030c..b24733ab0 100644
--- a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/cast_1.cpp b/tools/nnapi_quickcheck/tests/cast_1.cpp
index 01d49cd59..bf493d091 100644
--- a/tools/nnapi_quickcheck/tests/cast_1.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/cast_2.cpp b/tools/nnapi_quickcheck/tests/cast_2.cpp
index b0032210d..d85781d0c 100644
--- a/tools/nnapi_quickcheck/tests/cast_2.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
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 763ca940c..ede763701 100644
--- a/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/concat_1.cpp b/tools/nnapi_quickcheck/tests/concat_1.cpp
index 77d670fed..cc14d083a 100644
--- a/tools/nnapi_quickcheck/tests/concat_1.cpp
+++ b/tools/nnapi_quickcheck/tests/concat_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
index cd522b049..f804b819b 100644
--- a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/conv_1.cpp b/tools/nnapi_quickcheck/tests/conv_1.cpp
index 10046d1ce..57b6abdfd 100644
--- a/tools/nnapi_quickcheck/tests/conv_1.cpp
+++ b/tools/nnapi_quickcheck/tests/conv_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
index aebf2333a..025cccadd 100644
--- a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/dconv_1.cpp b/tools/nnapi_quickcheck/tests/dconv_1.cpp
index bd0cacfd0..21d648331 100644
--- a/tools/nnapi_quickcheck/tests/dconv_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dconv_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
index 43f305f06..7cb9383e4 100644
--- a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/dequantize_1.cpp b/tools/nnapi_quickcheck/tests/dequantize_1.cpp
index fe310a11d..467392dc3 100644
--- a/tools/nnapi_quickcheck/tests/dequantize_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dequantize_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/div_1.cpp b/tools/nnapi_quickcheck/tests/div_1.cpp
index ffa0d6cac..1fe0f7a28 100644
--- a/tools/nnapi_quickcheck/tests/div_1.cpp
+++ b/tools/nnapi_quickcheck/tests/div_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/div_2.cpp b/tools/nnapi_quickcheck/tests/div_2.cpp
index c836c259a..883167e95 100644
--- a/tools/nnapi_quickcheck/tests/div_2.cpp
+++ b/tools/nnapi_quickcheck/tests/div_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
index 57af253f5..ea5df23d2 100644
--- a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
+++ b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
@@ -16,16 +16,16 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/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 "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
index 1cb75fea0..c434d75f8 100644
--- a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
@@ -16,16 +16,16 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/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 "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/gather_1.cpp b/tools/nnapi_quickcheck/tests/gather_1.cpp
index 0d5b30eb6..b916676c7 100644
--- a/tools/nnapi_quickcheck/tests/gather_1.cpp
+++ b/tools/nnapi_quickcheck/tests/gather_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/gather_2.cpp b/tools/nnapi_quickcheck/tests/gather_2.cpp
index b3cb3c6ef..4b115685d 100644
--- a/tools/nnapi_quickcheck/tests/gather_2.cpp
+++ b/tools/nnapi_quickcheck/tests/gather_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
index dc6902d66..e9e3bc1f7 100644
--- a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/max_pool_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_1.cpp
index bb538141d..07fa9ac5b 100644
--- a/tools/nnapi_quickcheck/tests/max_pool_1.cpp
+++ b/tools/nnapi_quickcheck/tests/max_pool_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
index 5768ddde8..d241c43ba 100644
--- a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/mul_1.cpp b/tools/nnapi_quickcheck/tests/mul_1.cpp
index 3a4ae5c8e..cf7282bc7 100644
--- a/tools/nnapi_quickcheck/tests/mul_1.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/mul_2.cpp b/tools/nnapi_quickcheck/tests/mul_2.cpp
index b117cd602..734be8e3f 100644
--- a/tools/nnapi_quickcheck/tests/mul_2.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
index 7207a90fb..72903fe42 100644
--- a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,8 +24,8 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/relu1_1.cpp b/tools/nnapi_quickcheck/tests/relu1_1.cpp
index aeefe2f06..b729c50c3 100644
--- a/tools/nnapi_quickcheck/tests/relu1_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu1_1.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -23,9 +23,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu6_1.cpp b/tools/nnapi_quickcheck/tests/relu6_1.cpp
index 76bbe954c..cafbe8377 100644
--- a/tools/nnapi_quickcheck/tests/relu6_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu6_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
index fe849f955..3d8ce4f7c 100644
--- a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -23,9 +23,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_1.cpp b/tools/nnapi_quickcheck/tests/relu_1.cpp
index f754c3d8e..c7141ca6a 100644
--- a/tools/nnapi_quickcheck/tests/relu_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_2.cpp b/tools/nnapi_quickcheck/tests/relu_2.cpp
index c08764520..74ab113c2 100644
--- a/tools/nnapi_quickcheck/tests/relu_2.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_3.cpp b/tools/nnapi_quickcheck/tests/relu_3.cpp
index 6c41bc12a..f876e18ee 100644
--- a/tools/nnapi_quickcheck/tests/relu_3.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_3.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
index 59fe5d254..7bc6181ad 100644
--- a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -23,9 +23,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/reshape_1.cpp b/tools/nnapi_quickcheck/tests/reshape_1.cpp
index 21d35a5ca..a35623ced 100644
--- a/tools/nnapi_quickcheck/tests/reshape_1.cpp
+++ b/tools/nnapi_quickcheck/tests/reshape_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
index 7f852fd80..fb1db77e7 100644
--- a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
index 37d8ab525..3c7ce28b1 100644
--- a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
+++ b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/softmax_1.cpp b/tools/nnapi_quickcheck/tests/softmax_1.cpp
index 5e15b6169..b9cc6bf0f 100644
--- a/tools/nnapi_quickcheck/tests/softmax_1.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/softmax_2.cpp b/tools/nnapi_quickcheck/tests/softmax_2.cpp
index 489016af5..402435718 100644
--- a/tools/nnapi_quickcheck/tests/softmax_2.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
index 347262fa6..2c12e1104 100644
--- a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_1.cpp b/tools/nnapi_quickcheck/tests/split_1.cpp
index 742c5dbed..735a0777f 100644
--- a/tools/nnapi_quickcheck/tests/split_1.cpp
+++ b/tools/nnapi_quickcheck/tests/split_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_2.cpp b/tools/nnapi_quickcheck/tests/split_2.cpp
index d70e35ca7..0d4bf3e13 100644
--- a/tools/nnapi_quickcheck/tests/split_2.cpp
+++ b/tools/nnapi_quickcheck/tests/split_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_3.cpp b/tools/nnapi_quickcheck/tests/split_3.cpp
index 47359642d..eaa65bdc2 100644
--- a/tools/nnapi_quickcheck/tests/split_3.cpp
+++ b/tools/nnapi_quickcheck/tests/split_3.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_4.cpp b/tools/nnapi_quickcheck/tests/split_4.cpp
index d16e75d5c..394c392b6 100644
--- a/tools/nnapi_quickcheck/tests/split_4.cpp
+++ b/tools/nnapi_quickcheck/tests/split_4.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -25,9 +25,9 @@
#include "util/environment.h"
#include "util/feature/Shape.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <random>
diff --git a/tools/nnapi_quickcheck/tests/sub_1.cpp b/tools/nnapi_quickcheck/tests/sub_1.cpp
index 2734f525e..9e4ff4ce7 100644
--- a/tools/nnapi_quickcheck/tests/sub_1.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_2.cpp b/tools/nnapi_quickcheck/tests/sub_2.cpp
index 88e060847..2702edbf1 100644
--- a/tools/nnapi_quickcheck/tests/sub_2.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_2.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_3.cpp b/tools/nnapi_quickcheck/tests/sub_3.cpp
index fd2d4aaea..6122e2486 100644
--- a/tools/nnapi_quickcheck/tests/sub_3.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_3.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_4.cpp b/tools/nnapi_quickcheck/tests/sub_4.cpp
index 993acddce..28922fe4b 100644
--- a/tools/nnapi_quickcheck/tests/sub_4.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_4.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_5.cpp b/tools/nnapi_quickcheck/tests/sub_5.cpp
index 610be5754..e421a12c2 100644
--- a/tools/nnapi_quickcheck/tests/sub_5.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_5.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_6.cpp b/tools/nnapi_quickcheck/tests/sub_6.cpp
index b9e37c8d7..00bfc5423 100644
--- a/tools/nnapi_quickcheck/tests/sub_6.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_6.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/tanh_1.cpp b/tools/nnapi_quickcheck/tests/tanh_1.cpp
index 67847eceb..6a9a29933 100644
--- a/tools/nnapi_quickcheck/tests/tanh_1.cpp
+++ b/tools/nnapi_quickcheck/tests/tanh_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <iostream>
#include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
index bb9d8535e..4b145e5a7 100644
--- a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
+++ b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
#include "tensorflow/contrib/lite/model.h"
#include "tensorflow/contrib/lite/builtin_op_data.h"
@@ -24,9 +24,9 @@
#include "memory.h"
#include "util/environment.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
#include <chrono>
#include <iostream>