Move libs/support/tflite to libs/tflite (#3920)

Move libs/support/tflite to libs/tflite
Update header include path

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/contrib/tf_test/tf_test.cpp b/contrib/tf_test/tf_test.cpp
index 7597a9a..56ec1d2 100644 (file)
--- a/contrib/tf_test/tf_test.cpp
+++ b/contrib/tf_test/tf_test.cpp
@@ -17,11 +17,11 @@
 #include <tensorflow/contrib/lite/model.h>
 #include <tensorflow/core/public/session.h>
 
-#include "support/tflite/Assert.h"
-#include "support/tflite/Session.h"
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/Assert.h"
+#include "tflite/Session.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
+#include "tflite/kernels/register.h"
 
 #include "util/fp32.h"
 

diff --git a/contrib/tflite_classify/src/InferenceInterface.h b/contrib/tflite_classify/src/InferenceInterface.h
index 2f01190..b15a044 100644 (file)
--- a/contrib/tflite_classify/src/InferenceInterface.h
+++ b/contrib/tflite_classify/src/InferenceInterface.h
@@ -23,11 +23,11 @@
 #ifndef __TFLITE_CLASSIFY_INFERENCE_INTERFACE_H__
 #define __TFLITE_CLASSIFY_INFERENCE_INTERFACE_H__
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
 
 #include <iostream>
 #include <string>

diff --git a/libs/support/CMakeLists.txt b/libs/support/CMakeLists.txt
deleted file mode 100644 (file)
index 3e0ecbb..0000000
--- a/libs/support/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(tflite)

diff --git a/libs/support/tflite/CMakeLists.txt b/libs/tflite/CMakeLists.txt
similarity index 91%
rename from libs/support/tflite/CMakeLists.txt
rename to libs/tflite/CMakeLists.txt
index c253481..78193b1 100644 (file)
--- a/libs/support/tflite/CMakeLists.txt
+++ b/libs/tflite/CMakeLists.txt
@@ -4,7 +4,7 @@ list(REMOVE_ITEM SOURCES ${TESTS})
 
 add_library(nnfw_support_tflite STATIC ${SOURCES})
 set_target_properties(nnfw_support_tflite PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libs/support/include)
+target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_link_libraries(nnfw_support_tflite tensorflow-lite ${LIB_PTHREAD} dl)
 target_link_libraries(nnfw_support_tflite static_nnfw_util)
 

diff --git a/libs/support/include/support/tflite/Assert.h b/libs/tflite/include/tflite/Assert.h
similarity index 100%
rename from libs/support/include/support/tflite/Assert.h
rename to libs/tflite/include/tflite/Assert.h

diff --git a/libs/support/include/support/tflite/Diff.h b/libs/tflite/include/tflite/Diff.h
similarity index 97%
rename from libs/support/include/support/tflite/Diff.h
rename to libs/tflite/include/tflite/Diff.h
index 29d5ae6..45b7c9e 100644 (file)
--- a/libs/support/include/support/tflite/Diff.h
+++ b/libs/tflite/include/tflite/Diff.h
@@ -30,7 +30,7 @@
 #include "util/tensor/Shape.h"
 #include "util/tensor/Comparator.h"
 
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 #include <functional>
 #include <vector>
@@ -84,8 +84,8 @@ private:
   const nnfw::util::tensor::Comparator &_comparator;
 };
 
-#include "support/tflite/interp/Builder.h"
-#include "support/tflite/Quantization.h"
+#include "tflite/interp/Builder.h"
+#include "tflite/Quantization.h"
 
 #include <random>
 

diff --git a/libs/support/include/support/tflite/FeatureView.h b/libs/tflite/include/tflite/FeatureView.h
similarity index 97%
rename from libs/support/include/support/tflite/FeatureView.h
rename to libs/tflite/include/tflite/FeatureView.h
index 29a6d7b..b7266ca 100644 (file)
--- a/libs/support/include/support/tflite/FeatureView.h
+++ b/libs/tflite/include/tflite/FeatureView.h
@@ -25,8 +25,8 @@
 
 #include "tensorflow/contrib/lite/interpreter.h"
 
-#include "support/tflite/InputIndex.h"
-#include "support/tflite/OutputIndex.h"
+#include "tflite/InputIndex.h"
+#include "tflite/OutputIndex.h"
 
 #include "util/feature/Shape.h"
 #include "util/feature/Reader.h"

diff --git a/libs/support/include/support/tflite/InputIndex.h b/libs/tflite/include/tflite/InputIndex.h
similarity index 100%
rename from libs/support/include/support/tflite/InputIndex.h
rename to libs/tflite/include/tflite/InputIndex.h

diff --git a/libs/support/include/support/tflite/InterpreterSession.h b/libs/tflite/include/tflite/InterpreterSession.h
similarity index 100%
rename from libs/support/include/support/tflite/InterpreterSession.h
rename to libs/tflite/include/tflite/InterpreterSession.h

diff --git a/libs/support/include/support/tflite/NNAPISession.h b/libs/tflite/include/tflite/NNAPISession.h
similarity index 98%
rename from libs/support/include/support/tflite/NNAPISession.h
rename to libs/tflite/include/tflite/NNAPISession.h
index d6ad46b..1c5e501 100644 (file)
--- a/libs/support/include/support/tflite/NNAPISession.h
+++ b/libs/tflite/include/tflite/NNAPISession.h
@@ -24,7 +24,7 @@
 #define __NNFW_SUPPORT_TFLITE_NNAPI_SESSION_H__
 
 #include "Session.h"
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/nnapi_delegate.h"
 
 namespace nnfw
 {

diff --git a/libs/support/include/support/tflite/OutputIndex.h b/libs/tflite/include/tflite/OutputIndex.h
similarity index 100%
rename from libs/support/include/support/tflite/OutputIndex.h
rename to libs/tflite/include/tflite/OutputIndex.h

diff --git a/libs/support/include/support/tflite/Quantization.h b/libs/tflite/include/tflite/Quantization.h
similarity index 100%
rename from libs/support/include/support/tflite/Quantization.h
rename to libs/tflite/include/tflite/Quantization.h

diff --git a/libs/support/include/support/tflite/Session.h b/libs/tflite/include/tflite/Session.h
similarity index 100%
rename from libs/support/include/support/tflite/Session.h
rename to libs/tflite/include/tflite/Session.h

diff --git a/libs/support/include/support/tflite/TensorLogger.h b/libs/tflite/include/tflite/TensorLogger.h
similarity index 99%
rename from libs/support/include/support/tflite/TensorLogger.h
rename to libs/tflite/include/tflite/TensorLogger.h
index e124cae..9af5ffe 100644 (file)
--- a/libs/support/include/support/tflite/TensorLogger.h
+++ b/libs/tflite/include/tflite/TensorLogger.h
@@ -24,7 +24,7 @@
 #define __NNFW_SUPPORT_TFLITE_TENSOR_LOGGER_H__
 
 #include "util/tensor/IndexIterator.h"
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 #include <tensorflow/contrib/lite/interpreter.h>
 #include <tensorflow/contrib/lite/context.h>

diff --git a/libs/support/include/support/tflite/TensorShapeUtils.h b/libs/tflite/include/tflite/TensorShapeUtils.h
similarity index 100%
rename from libs/support/include/support/tflite/TensorShapeUtils.h
rename to libs/tflite/include/tflite/TensorShapeUtils.h

diff --git a/libs/support/include/support/tflite/TensorUtils.h b/libs/tflite/include/tflite/TensorUtils.h
similarity index 100%
rename from libs/support/include/support/tflite/TensorUtils.h
rename to libs/tflite/include/tflite/TensorUtils.h

diff --git a/libs/support/include/support/tflite/TensorView.h b/libs/tflite/include/tflite/TensorView.h
similarity index 100%
rename from libs/support/include/support/tflite/TensorView.h
rename to libs/tflite/include/tflite/TensorView.h

diff --git a/libs/support/include/support/tflite/interp/Builder.h b/libs/tflite/include/tflite/interp/Builder.h
similarity index 100%
rename from libs/support/include/support/tflite/interp/Builder.h
rename to libs/tflite/include/tflite/interp/Builder.h

diff --git a/libs/support/include/support/tflite/interp/FlatBufferBuilder.h b/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
similarity index 97%
rename from libs/support/include/support/tflite/interp/FlatBufferBuilder.h
rename to libs/tflite/include/tflite/interp/FlatBufferBuilder.h
index f7e7b65..2758686 100644 (file)
--- a/libs/support/include/support/tflite/interp/FlatBufferBuilder.h
+++ b/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
@@ -25,7 +25,7 @@
 
 #include <tensorflow/contrib/lite/model.h>
 
-#include "support/tflite/interp/Builder.h"
+#include "tflite/interp/Builder.h"
 
 namespace nnfw
 {

diff --git a/libs/support/include/support/tflite/interp/FunctionBuilder.h b/libs/tflite/include/tflite/interp/FunctionBuilder.h
similarity index 97%
rename from libs/support/include/support/tflite/interp/FunctionBuilder.h
rename to libs/tflite/include/tflite/interp/FunctionBuilder.h
index 0e2f368..bdf765d 100644 (file)
--- a/libs/support/include/support/tflite/interp/FunctionBuilder.h
+++ b/libs/tflite/include/tflite/interp/FunctionBuilder.h
@@ -25,7 +25,7 @@
 
 #include <tensorflow/contrib/lite/model.h>
 
-#include "support/tflite/interp/Builder.h"
+#include "tflite/interp/Builder.h"
 
 namespace nnfw
 {

diff --git a/libs/support/include/support/tflite/kernels/Abs.h b/libs/tflite/include/tflite/kernels/Abs.h
similarity index 100%
rename from libs/support/include/support/tflite/kernels/Abs.h
rename to libs/tflite/include/tflite/kernels/Abs.h

diff --git a/libs/support/include/support/tflite/kernels/CustomOps.h b/libs/tflite/include/tflite/kernels/CustomOps.h
similarity index 91%
rename from libs/support/include/support/tflite/kernels/CustomOps.h
rename to libs/tflite/include/tflite/kernels/CustomOps.h
index fa33c7b..b106ca2 100644 (file)
--- a/libs/support/include/support/tflite/kernels/CustomOps.h
+++ b/libs/tflite/include/tflite/kernels/CustomOps.h
@@ -24,10 +24,10 @@
 #define __NNFW_SUPPORT_TFLITE_KERNELS_CUSTOM_OP_H__
 
 #include "tensorflow/contrib/lite/context.h"
-#include "support/tflite/kernels/TensorFlowMax.h"
-#include "support/tflite/kernels/SquaredDifference.h"
-#include "support/tflite/kernels/TensorFlowSum.h"
-#include "support/tflite/kernels/Abs.h"
+#include "tflite/kernels/TensorFlowMax.h"
+#include "tflite/kernels/SquaredDifference.h"
+#include "tflite/kernels/TensorFlowSum.h"
+#include "tflite/kernels/Abs.h"
 
 namespace tflite
 {

diff --git a/libs/support/include/support/tflite/kernels/SquaredDifference.h b/libs/tflite/include/tflite/kernels/SquaredDifference.h
similarity index 100%
rename from libs/support/include/support/tflite/kernels/SquaredDifference.h
rename to libs/tflite/include/tflite/kernels/SquaredDifference.h

diff --git a/libs/support/include/support/tflite/kernels/TensorFlowMax.h b/libs/tflite/include/tflite/kernels/TensorFlowMax.h
similarity index 100%
rename from libs/support/include/support/tflite/kernels/TensorFlowMax.h
rename to libs/tflite/include/tflite/kernels/TensorFlowMax.h

diff --git a/libs/support/include/support/tflite/kernels/TensorFlowSum.h b/libs/tflite/include/tflite/kernels/TensorFlowSum.h
similarity index 100%
rename from libs/support/include/support/tflite/kernels/TensorFlowSum.h
rename to libs/tflite/include/tflite/kernels/TensorFlowSum.h

diff --git a/libs/support/include/support/tflite/kernels/register.h b/libs/tflite/include/tflite/kernels/register.h
similarity index 100%
rename from libs/support/include/support/tflite/kernels/register.h
rename to libs/tflite/include/tflite/kernels/register.h

diff --git a/libs/support/include/support/tflite/nnapi_delegate.h b/libs/tflite/include/tflite/nnapi_delegate.h
similarity index 100%
rename from libs/support/include/support/tflite/nnapi_delegate.h
rename to libs/tflite/include/tflite/nnapi_delegate.h

diff --git a/libs/support/tflite/src/Diff.cpp b/libs/tflite/src/Diff.cpp
similarity index 99%
rename from libs/support/tflite/src/Diff.cpp
rename to libs/tflite/src/Diff.cpp
index 8d7082e..f2b4254 100644 (file)
--- a/libs/support/tflite/src/Diff.cpp
+++ b/libs/tflite/src/Diff.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/Diff.h"
+#include "tflite/nnapi_delegate.h"
 
 #include "util/fp32.h"
 
@@ -273,7 +273,7 @@ template <> uint8_t RandomGenerator::generate<uint8_t>(void)
   return static_cast<uint8_t>((_dist(_rand) - min_range) * type_range / (max_range - min_range));
 }
 
-#include "support/tflite/TensorLogger.h"
+#include "tflite/TensorLogger.h"
 //
 // Random Test Runner
 //

diff --git a/libs/support/tflite/src/FeatureView.cpp b/libs/tflite/src/FeatureView.cpp
similarity index 96%
rename from libs/support/tflite/src/FeatureView.cpp
rename to libs/tflite/src/FeatureView.cpp
index 4c76367..7b226ed 100644 (file)
--- a/libs/support/tflite/src/FeatureView.cpp
+++ b/libs/tflite/src/FeatureView.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "support/tflite/FeatureView.h"
-#include "support/tflite/TensorUtils.h"
+#include "tflite/FeatureView.h"
+#include "tflite/TensorUtils.h"
 
 #include <cassert>
 

diff --git a/libs/support/tflite/src/Quantization.cpp b/libs/tflite/src/Quantization.cpp
similarity index 94%
rename from libs/support/tflite/src/Quantization.cpp
rename to libs/tflite/src/Quantization.cpp
index b23204d..9c162c3 100644 (file)
--- a/libs/support/tflite/src/Quantization.cpp
+++ b/libs/tflite/src/Quantization.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/Quantization.h"
+#include "tflite/Quantization.h"
 
 TfLiteQuantizationParams make_default_quantization(void)
 {

diff --git a/libs/support/tflite/src/TensorShapeUtils.cpp b/libs/tflite/src/TensorShapeUtils.cpp
similarity index 96%
rename from libs/support/tflite/src/TensorShapeUtils.cpp
rename to libs/tflite/src/TensorShapeUtils.cpp
index 611ba92..3913748 100644 (file)
--- a/libs/support/tflite/src/TensorShapeUtils.cpp
+++ b/libs/tflite/src/TensorShapeUtils.cpp
@@ -1,4 +1,4 @@
-#include "support/tflite/TensorShapeUtils.h"
+#include "tflite/TensorShapeUtils.h"
 
 namespace nnfw
 {

diff --git a/libs/support/tflite/src/TensorView.test.cpp b/libs/tflite/src/TensorView.test.cpp
similarity index 97%
rename from libs/support/tflite/src/TensorView.test.cpp
rename to libs/tflite/src/TensorView.test.cpp
index 1d3a705..0c461fe 100644 (file)
--- a/libs/support/tflite/src/TensorView.test.cpp
+++ b/libs/tflite/src/TensorView.test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 #include <cassert>
 

diff --git a/libs/support/tflite/src/interp/FlatBufferBuilder.cpp b/libs/tflite/src/interp/FlatBufferBuilder.cpp
similarity index 91%
rename from libs/support/tflite/src/interp/FlatBufferBuilder.cpp
rename to libs/tflite/src/interp/FlatBufferBuilder.cpp
index 67df13f..87e022c 100644 (file)
--- a/libs/support/tflite/src/interp/FlatBufferBuilder.cpp
+++ b/libs/tflite/src/interp/FlatBufferBuilder.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "support/tflite/interp/FlatBufferBuilder.h"
+#include "tflite/interp/FlatBufferBuilder.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 
 namespace nnfw
 {

diff --git a/libs/support/tflite/src/interp/FunctionBuilder.cpp b/libs/tflite/src/interp/FunctionBuilder.cpp
similarity index 95%
rename from libs/support/tflite/src/interp/FunctionBuilder.cpp
rename to libs/tflite/src/interp/FunctionBuilder.cpp
index 65783bd..c06d86d 100644 (file)
--- a/libs/support/tflite/src/interp/FunctionBuilder.cpp
+++ b/libs/tflite/src/interp/FunctionBuilder.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 namespace nnfw
 {

diff --git a/libs/support/tflite/src/kernels/Abs.cpp b/libs/tflite/src/kernels/Abs.cpp
similarity index 98%
rename from libs/support/tflite/src/kernels/Abs.cpp
rename to libs/tflite/src/kernels/Abs.cpp
index c8a16bb..87f09de 100644 (file)
--- a/libs/support/tflite/src/kernels/Abs.cpp
+++ b/libs/tflite/src/kernels/Abs.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/Abs.h"
+#include "tflite/kernels/Abs.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>

diff --git a/libs/support/tflite/src/kernels/SquaredDifference.cpp b/libs/tflite/src/kernels/SquaredDifference.cpp
similarity index 98%
rename from libs/support/tflite/src/kernels/SquaredDifference.cpp
rename to libs/tflite/src/kernels/SquaredDifference.cpp
index 25e10a8..fda7436 100644 (file)
--- a/libs/support/tflite/src/kernels/SquaredDifference.cpp
+++ b/libs/tflite/src/kernels/SquaredDifference.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/SquaredDifference.h"
+#include "tflite/kernels/SquaredDifference.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>

diff --git a/libs/support/tflite/src/kernels/TensorFlowMax.cpp b/libs/tflite/src/kernels/TensorFlowMax.cpp
similarity index 99%
rename from libs/support/tflite/src/kernels/TensorFlowMax.cpp
rename to libs/tflite/src/kernels/TensorFlowMax.cpp
index 4280b88..7a85bc8 100644 (file)
--- a/libs/support/tflite/src/kernels/TensorFlowMax.cpp
+++ b/libs/tflite/src/kernels/TensorFlowMax.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/TensorFlowMax.h"
+#include "tflite/kernels/TensorFlowMax.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>

diff --git a/libs/support/tflite/src/kernels/TensorFlowSum.cpp b/libs/tflite/src/kernels/TensorFlowSum.cpp
similarity index 99%
rename from libs/support/tflite/src/kernels/TensorFlowSum.cpp
rename to libs/tflite/src/kernels/TensorFlowSum.cpp
index c7a3803..1eba62f 100644 (file)
--- a/libs/support/tflite/src/kernels/TensorFlowSum.cpp
+++ b/libs/tflite/src/kernels/TensorFlowSum.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/TensorFlowSum.h"
+#include "tflite/kernels/TensorFlowSum.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>

diff --git a/libs/support/tflite/src/kernels/register.cpp b/libs/tflite/src/kernels/register.cpp
similarity index 99%
rename from libs/support/tflite/src/kernels/register.cpp
rename to libs/tflite/src/kernels/register.cpp
index ef138d8..9757e4a 100644 (file)
--- a/libs/support/tflite/src/kernels/register.cpp
+++ b/libs/tflite/src/kernels/register.cpp
@@ -16,8 +16,8 @@ limitations under the License.
 
 // NOTE This code is derived from the following file (in TensorFlow)
 //        'externals/tensorflow/tensorflow/contrib/lite/kernels/register.cc'
-#include "support/tflite/kernels/register.h"
-#include "support/tflite/kernels/CustomOps.h"
+#include "tflite/kernels/register.h"
+#include "tflite/kernels/CustomOps.h"
 
 // TODO Use namespace nnfw
 namespace tflite

diff --git a/libs/support/tflite/src/nnapi_delegate.cpp b/libs/tflite/src/nnapi_delegate.cpp
similarity index 99%
rename from libs/support/tflite/src/nnapi_delegate.cpp
rename to libs/tflite/src/nnapi_delegate.cpp
index 55c5233..759c16c 100644 (file)
--- a/libs/support/tflite/src/nnapi_delegate.cpp
+++ b/libs/tflite/src/nnapi_delegate.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 
 // NOTE This code is derived from the following file (in TensorFlow v1.12)
 //        'externals/tensorflow/tensorflow/contrib/lite/nnapi_delegate.cc'
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/nnapi_delegate.h"
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>

diff --git a/libs/support/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc b/libs/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
similarity index 100%
rename from libs/support/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
rename to libs/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc

diff --git a/tools/nnapi_quickcheck/tests/add_1.cpp b/tools/nnapi_quickcheck/tests/add_1.cpp
index 52aa2af..098b859 100644 (file)
--- 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 9b5b19c..12851f1 100644 (file)
--- 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 e692fe3..a7b2f43 100644 (file)
--- 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 e519f17..217438f 100644 (file)
--- 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 cacb5e4..2f02c82 100644 (file)
--- 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 245b7ad..3af2c4a 100644 (file)
--- 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 43d285c..1ebf18e 100644 (file)
--- 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 ec11c39..d4a5e48 100644 (file)
--- 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 f3cf028..6c0cc22 100644 (file)
--- 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 45f0ba6..daf15e0 100644 (file)
--- 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 c938ed6..e68cfc5 100644 (file)
--- 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 ba41c03..b24733a 100644 (file)
--- 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 01d49cd..bf493d0 100644 (file)
--- 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 b003221..d85781d 100644 (file)
--- 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 763ca94..ede7637 100644 (file)
--- 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 77d670f..cc14d08 100644 (file)
--- 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 cd522b0..f804b81 100644 (file)
--- 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 10046d1..57b6abd 100644 (file)
--- 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 aebf233..025ccca 100644 (file)
--- 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 bd0cacf..21d6483 100644 (file)
--- 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 43f305f..7cb9383 100644 (file)
--- 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 fe310a1..467392d 100644 (file)
--- 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 ffa0d6c..1fe0f7a 100644 (file)
--- 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 c836c25..883167e 100644 (file)
--- 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 57af253..ea5df23 100644 (file)
--- 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 1cb75fe..c434d75 100644 (file)
--- 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 0d5b30e..b916676 100644 (file)
--- 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 b3cb3c6..4b11568 100644 (file)
--- 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 dc6902d..e9e3bc1 100644 (file)
--- 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 bb53814..07fa9ac 100644 (file)
--- 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 5768ddd..d241c43 100644 (file)
--- 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 3a4ae5c..cf7282b 100644 (file)
--- 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 b117cd6..734be8e 100644 (file)
--- 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 7207a90..72903fe 100644 (file)
--- 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 aeefe2f..b729c50 100644 (file)
--- 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 76bbe95..cafbe83 100644 (file)
--- 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 fe849f9..3d8ce4f 100644 (file)
--- 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 f754c3d..c7141ca 100644 (file)
--- 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 c087645..74ab113 100644 (file)
--- 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 6c41bc1..f876e18 100644 (file)
--- 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 59fe5d2..7bc6181 100644 (file)
--- 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 21d35a5..a35623c 100644 (file)
--- 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 7f852fd..fb1db77 100644 (file)
--- 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 37d8ab5..3c7ce28 100644 (file)
--- 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 5e15b61..b9cc6bf 100644 (file)
--- 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 489016a..4024357 100644 (file)
--- 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 347262f..2c12e11 100644 (file)
--- 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 742c5db..735a077 100644 (file)
--- 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 d70e35c..0d4bf3e 100644 (file)
--- 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 4735964..eaa65bd 100644 (file)
--- 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 d16e75d..394c392 100644 (file)
--- 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 2734f52..9e4ff4c 100644 (file)
--- 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 88e0608..2702edb 100644 (file)
--- 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 fd2d4aa..6122e24 100644 (file)
--- 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 993acdd..28922fe 100644 (file)
--- 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 610be57..e421a12 100644 (file)
--- 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 b9e37c8..00bfc54 100644 (file)
--- 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 67847ec..6a9a299 100644 (file)
--- 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 bb9d853..4b145e5 100644 (file)
--- 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>

diff --git a/tools/nnapi_test/src/nnapi_test.cc b/tools/nnapi_test/src/nnapi_test.cc
index 1f98bb0..4a19087 100644 (file)
--- a/tools/nnapi_test/src/nnapi_test.cc
+++ b/tools/nnapi_test/src/nnapi_test.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
-#include "support/tflite/interp/FlatBufferBuilder.h"
-#include "support/tflite/Diff.h"
+#include "tflite/interp/FlatBufferBuilder.h"
+#include "tflite/Diff.h"
 
 #include <iostream>
 #include <stdexcept>

diff --git a/tools/tflite_benchmark/src/tflite_benchmark.cc b/tools/tflite_benchmark/src/tflite_benchmark.cc
index 1726db3..03e7760 100644 (file)
--- a/tools/tflite_benchmark/src/tflite_benchmark.cc
+++ b/tools/tflite_benchmark/src/tflite_benchmark.cc
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
-#include "support/tflite/Assert.h"
-#include "support/tflite/Session.h"
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
-#include "support/tflite/Diff.h"
+#include "tflite/Assert.h"
+#include "tflite/Session.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
+#include "tflite/Diff.h"
 #include "util/tensor/IndexIterator.h"
 
 #include <boost/accumulators/accumulators.hpp>

diff --git a/tools/tflite_benchmark_model/benchmark_tflite_model.cc b/tools/tflite_benchmark_model/benchmark_tflite_model.cc
index 4d25e77..a02cf53 100644 (file)
--- a/tools/tflite_benchmark_model/benchmark_tflite_model.cc
+++ b/tools/tflite_benchmark_model/benchmark_tflite_model.cc
@@ -42,7 +42,7 @@ limitations under the License.
 #ifdef TFLITE_FLEX
 #include "tensorflow/contrib/lite/delegates/flex/delegate.h"
 #endif  // TFLITE_FLEX
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/op_resolver.h"
 #include "tensorflow/contrib/lite/string_util.h"
@@ -50,7 +50,7 @@ limitations under the License.
 
 // For profiling nnapi_delegate
 #include "util/profiling/profiling.h"
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/nnapi_delegate.h"
 
 namespace {
   nnfw::NNAPIDelegate nnfw_delegate_;

diff --git a/tools/tflite_examples/src/conv.cpp b/tools/tflite_examples/src/conv.cpp
index a647346..56f5d3e 100644 (file)
--- a/tools/tflite_examples/src/conv.cpp
+++ b/tools/tflite_examples/src/conv.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"
 

diff --git a/tools/tflite_run/src/tensor_loader.h b/tools/tflite_run/src/tensor_loader.h
index f2a6991..2d4fdb7 100644 (file)
--- a/tools/tflite_run/src/tensor_loader.h
+++ b/tools/tflite_run/src/tensor_loader.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 namespace tflite
 {

diff --git a/tools/tflite_run/src/tflite_run.cc b/tools/tflite_run/src/tflite_run.cc
index 23a2380..e737b13 100644 (file)
--- a/tools/tflite_run/src/tflite_run.cc
+++ b/tools/tflite_run/src/tflite_run.cc
@@ -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 "bin_image.h"
@@ -24,11 +24,11 @@
 #include "util/benchmark.h"
 #include "util/environment.h"
 #include "util/fp32.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Assert.h"
-#include "support/tflite/Session.h"
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
+#include "tflite/Diff.h"
+#include "tflite/Assert.h"
+#include "tflite/Session.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
 #include "util/tensor/IndexIterator.h"
 
 #include <iostream>