Upgrade to tensorflow v1.13.1 (#5590)

* Upgrade to tensorflow v1.13.1

- update link to v1.13.1
- tensorflow/contribe/lite to tensorflow/lite
- TFLITE_MINOR_VER to 13

Signed-off-by: Chunseok Lee <chunseok.lee@samsung.com>
* upgrade absl to 389ec3f90

* add custom for SquaredDifference

* Fix x64 build error(Eigen)

- update eigen version to 88fc23324517

* fix wrong comment : lite -> contrib/lite

diff --git a/Makefile.template b/Makefile.template
index f93d2db..5fbb49d 100644 (file)
--- a/Makefile.template
+++ b/Makefile.template
@@ -12,7 +12,7 @@ BENCHMARK_ACL_BUILD?=0
 OPTIONS?=
 GENERATE_NNAPI_TESTS?=1
 TFLITE_MAJOR_VER?=1
-TFLITE_MINOR_VER?=12
+TFLITE_MINOR_VER?=13
 
 # make TARGET and TYPE to lowercase
 HOST_ARCH_LC=$(shell echo $(HOST_ARCH) | tr A-Z a-z)

diff --git a/cmake/packages/AbslSourceConfig.cmake b/cmake/packages/AbslSourceConfig.cmake
index 2f75ece..685550d 100644 (file)
--- a/cmake/packages/AbslSourceConfig.cmake
+++ b/cmake/packages/AbslSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_AbslSource_import)
 
   # NOTE The following URL comes from TensorFlow 1.12
   envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
-  set(ABSL_URL ${EXTERNAL_DOWNLOAD_SERVER}/abseil/abseil-cpp/archive/48cd2c3f351ff188bc85684b84a91b6e6d17d896.tar.gz)
+  set(ABSL_URL ${EXTERNAL_DOWNLOAD_SERVER}/abseil/abseil-cpp/archive/389ec3f906f018661a5308458d623d01f96d7b23.tar.gz)
   ExternalSource_Get("absl" ${DOWNLOAD_ABSL} ${ABSL_URL})
 
   set(AbslSource_DIR ${absl_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/EigenSourceConfig.cmake b/cmake/packages/EigenSourceConfig.cmake
index f8a7192..e9b0ba8 100644 (file)
--- a/cmake/packages/EigenSourceConfig.cmake
+++ b/cmake/packages/EigenSourceConfig.cmake
@@ -4,7 +4,7 @@ function(_EigenSource_import)
 
   # NOTE TensorFlow 1.12 downloads Eign from the following URL
   envoption(EXTERNAL_DOWNLOAD_SERVER "https://bitbucket.org")
-  set(EIGEN_URL ${EXTERNAL_DOWNLOAD_SERVER}/eigen/eigen/get/fd6845384b86.tar.gz)
+  set(EIGEN_URL ${EXTERNAL_DOWNLOAD_SERVER}/eigen/eigen/get/88fc23324517.tar.gz)
   ExternalSource_Get("eigen" ${DOWNLOAD_EIGEN} ${EIGEN_URL})
 
   set(EigenSource_DIR ${eigen_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/TensorFlowLite/CMakeLists.txt b/cmake/packages/TensorFlowLite/CMakeLists.txt
index 562e7cf..9367652 100644 (file)
--- a/cmake/packages/TensorFlowLite/CMakeLists.txt
+++ b/cmake/packages/TensorFlowLite/CMakeLists.txt
@@ -1,9 +1,9 @@
-set(TENSORFLOW_LITE_BASE ${TensorFlowSource_DIR}/tensorflow/contrib/lite)
+set(TENSORFLOW_LITE_BASE ${TensorFlowSource_DIR}/tensorflow/lite)
 
 #
 # Tensorflow Lite library
 #
-file(GLOB TFLITE_CORE_SRCS "${TENSORFLOW_LITE_BASE}/*.c" "${TENSORFLOW_LITE_BASE}/*.cc")
+file(GLOB TFLITE_CORE_SRCS "${TENSORFLOW_LITE_BASE}/*.c" "${TENSORFLOW_LITE_BASE}/*.cc" "${TENSORFLOW_LITE_BASE}/core/*.cc")
 file(GLOB TFLITE_CORE_TESTS "${TENSORFLOW_LITE_BASE}/*test*.cc")
 list(REMOVE_ITEM TFLITE_CORE_SRCS ${TFLITE_CORE_TESTS})
 

diff --git a/cmake/packages/TensorFlowLiteConfig.cmake b/cmake/packages/TensorFlowLiteConfig.cmake
index 8429b19..4dbc1d1 100644 (file)
--- a/cmake/packages/TensorFlowLiteConfig.cmake
+++ b/cmake/packages/TensorFlowLiteConfig.cmake
@@ -37,7 +37,7 @@ if(BUILD_TENSORFLOW_LITE)
 endif(BUILD_TENSORFLOW_LITE)
 
 # Use pre-built TensorFlow Lite
-find_path(TFLITE_INCLUDE_DIR NAMES  tensorflow/contrib/lite/interpreter.h)
+find_path(TFLITE_INCLUDE_DIR NAMES  tensorflow/lite/interpreter.h)
 find_library(TFLITE_LIB NAMES       tensorflow-lite)
 
 if(NOT TFLITE_INCLUDE_DIR)

diff --git a/cmake/packages/TensorFlowSourceConfig.cmake b/cmake/packages/TensorFlowSourceConfig.cmake
index 47f2e47..f9fd3af 100644 (file)
--- a/cmake/packages/TensorFlowSourceConfig.cmake
+++ b/cmake/packages/TensorFlowSourceConfig.cmake
@@ -8,7 +8,7 @@ function(_TensorFlowSource_import)
   nnfw_include(OptionTools)
 
   envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
-  set(TENSORFLOW_URL ${EXTERNAL_DOWNLOAD_SERVER}/tensorflow/tensorflow/archive/v1.12.0.tar.gz)
+  set(TENSORFLOW_URL ${EXTERNAL_DOWNLOAD_SERVER}/tensorflow/tensorflow/archive/v1.13.1.tar.gz)
   ExternalSource_Get("tensorflow" ${DOWNLOAD_TENSORFLOW} ${TENSORFLOW_URL})
 
   set(TensorFlowSource_DIR ${tensorflow_SOURCE_DIR} PARENT_SCOPE)

diff --git a/cmake/packages/TensorflowConfig.cmake b/cmake/packages/TensorflowConfig.cmake
index 30afb99..5df0008 100644 (file)
--- a/cmake/packages/TensorflowConfig.cmake
+++ b/cmake/packages/TensorflowConfig.cmake
@@ -7,7 +7,7 @@ function(_Tensorflow_Import)
     set(NSYNC_ARCH "default")
   endif(NOT DEFINED NSYNC_ARCH)
 
-  set(TENSROFLOW_MAKEFILE_DIR "${TENSORFLOW_DIR}/tensorflow/contrib/makefile")
+  set(TENSROFLOW_MAKEFILE_DIR "${TENSORFLOW_DIR}/tensorflow/makefile")
   set(TENSORFLOW_GEN_DIR "${TENSROFLOW_MAKEFILE_DIR}/gen")
   set(TENSORFLOW_DOWNLOADS_DIR "${TENSROFLOW_MAKEFILE_DIR}/downloads")
 

diff --git a/contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h b/contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h
index c5a5375..af1947f 100644 (file)
--- a/contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h
+++ b/contrib/TFLiteSharp/TFLiteNative/include/tflite_nativewrapper.h
@@ -17,10 +17,10 @@
 #ifndef _TFLITE_NATIVEWRAPPER_H_
 #define _TFLITE_NATIVEWRAPPER_H_
 
-#include "tensorflow/contrib/lite/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/string_util.h"
-#include "tensorflow/contrib/lite/tools/mutable_op_resolver.h"
+#include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/string_util.h"
+#include "tensorflow/lite/tools/mutable_op_resolver.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/contrib/labs/tflite_examples/src/conv.cpp b/contrib/labs/tflite_examples/src/conv.cpp
index e517da9..3117c31 100644 (file)
--- a/contrib/labs/tflite_examples/src/conv.cpp
+++ b/contrib/labs/tflite_examples/src/conv.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include <iostream>
 

diff --git a/contrib/tflite_classify/src/InferenceInterface.h b/contrib/tflite_classify/src/InferenceInterface.h
index 06ebb3d..fe2c1aa 100644 (file)
--- a/contrib/tflite_classify/src/InferenceInterface.h
+++ b/contrib/tflite_classify/src/InferenceInterface.h
@@ -24,7 +24,7 @@
 #define __TFLITE_CLASSIFY_INFERENCE_INTERFACE_H__
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/model.h"
 
 #include "tflite/InterpreterSession.h"
 #include "tflite/NNAPISession.h"

diff --git a/contrib/tflite_test/tflite_test.cpp b/contrib/tflite_test/tflite_test.cpp
index 3a27789..80ba448 100644 (file)
--- a/contrib/tflite_test/tflite_test.cpp
+++ b/contrib/tflite_test/tflite_test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <tensorflow/contrib/lite/model.h>
+#include <tensorflow/lite/model.h>
 #include <tensorflow/core/public/session.h>
 
 #include "tflite/Assert.h"

diff --git a/docs/howto/HowtoMakeSampleAppOnNnfw.md b/docs/howto/HowtoMakeSampleAppOnNnfw.md
index 0bd65c4..d272a83 100644 (file)
--- a/docs/howto/HowtoMakeSampleAppOnNnfw.md
+++ b/docs/howto/HowtoMakeSampleAppOnNnfw.md
@@ -8,7 +8,7 @@ To use tensorflow lite, you need to prepare tensorflow lite model file, and you
 
 You can select one of kernel register: tensorflow lite official kernel register or extended register (for pre-implemented custom op)
 ```
-#include "tensorflow/contrib/lite/kernels/register.h"
+#include "tensorflow/lite/kernels/register.h"
 #include "tflite/ext/kernels/register.h"
 ```
 

diff --git a/libs/profiling/include/profiling/profile_buffer.h b/libs/profiling/include/profiling/profile_buffer.h
index 83cd3eb..bc8d75e 100644 (file)
--- a/libs/profiling/include/profiling/profile_buffer.h
+++ b/libs/profiling/include/profiling/profile_buffer.h
@@ -33,7 +33,7 @@ limitations under the License.
 // clang-format off
 
 // NOTE This header is derived from the following file (in TensorFlow v1.12)
-//        'externals/tensorflow/tensorflow/contrib/lite/profiling/profile_buffer.h
+//        'externals/tensorflow/tensorflow/lite/profiling/profile_buffer.h
 #ifndef TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_BUFFER_H_
 #define TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_BUFFER_H_
 

diff --git a/libs/profiling/include/profiling/profiler.h b/libs/profiling/include/profiling/profiler.h
index 953042d..ed36881 100644 (file)
--- a/libs/profiling/include/profiling/profiler.h
+++ b/libs/profiling/include/profiling/profiler.h
@@ -33,7 +33,7 @@ limitations under the License.
 // clang-format off
 
 // NOTE This header is derived from the following file (in TensorFlow v1.12)
-//        'externals/tensorflow/tensorflow/contrib/lite/profiling/profiler.h
+//        'externals/tensorflow/tensorflow/lite/profiling/profiler.h
 #ifndef TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILER_H_
 #define TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILER_H_
 

diff --git a/libs/profiling/include/profiling/time.h b/libs/profiling/include/profiling/time.h
index 4b19494..200563a 100644 (file)
--- a/libs/profiling/include/profiling/time.h
+++ b/libs/profiling/include/profiling/time.h
@@ -17,7 +17,7 @@ limitations under the License.
 // clang-format off
 
 // NOTE This header is derived from the following file (in TensorFlow v1.12)
-//        'externals/tensorflow/tensorflow/contrib/lite/profiling/time.h
+//        'externals/tensorflow/tensorflow/lite/profiling/time.h
 #ifndef TENSORFLOW_CONTRIB_LITE_PROFILING_TIME_H_
 #define TENSORFLOW_CONTRIB_LITE_PROFILING_TIME_H_
 

diff --git a/libs/profiling/src/profiling/time.cpp b/libs/profiling/src/profiling/time.cpp
index 92d8595..761023e 100644 (file)
--- a/libs/profiling/src/profiling/time.cpp
+++ b/libs/profiling/src/profiling/time.cpp
@@ -17,7 +17,7 @@ limitations under the License.
 // clang-format off
 
 // NOTE This header is derived from the following file (in TensorFlow v1.12)
-//        'externals/tensorflow/tensorflow/contrib/lite/profiling/time.cpp
+//        'externals/tensorflow/tensorflow/lite/profiling/time.cpp
 #include "profiling/time.h"
 
 #if defined(_MSC_VER)

diff --git a/libs/tflite/include/tflite/Assert.h b/libs/tflite/include/tflite/Assert.h
index 6d12d37..148ac7e 100644 (file)
--- a/libs/tflite/include/tflite/Assert.h
+++ b/libs/tflite/include/tflite/Assert.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_ASSERT_H__
 #define __NNFW_TFLITE_ASSERT_H__
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 
 #include <sstream>
 

diff --git a/libs/tflite/include/tflite/Diff.h b/libs/tflite/include/tflite/Diff.h
index 908bc38..55b7526 100644 (file)
--- a/libs/tflite/include/tflite/Diff.h
+++ b/libs/tflite/include/tflite/Diff.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_DIFF_H__
 #define __NNFW_TFLITE_DIFF_H__
 
-#include "tensorflow/contrib/lite/interpreter.h"
+#include "tensorflow/lite/interpreter.h"
 
 #include "misc/tensor/Index.h"
 #include "misc/tensor/Diff.h"

diff --git a/libs/tflite/include/tflite/FeatureView.h b/libs/tflite/include/tflite/FeatureView.h
index 7bee854..a8f069c 100644 (file)
--- a/libs/tflite/include/tflite/FeatureView.h
+++ b/libs/tflite/include/tflite/FeatureView.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_FEATURE_VIEW_H__
 #define __NNFW_TFLITE_FEATURE_VIEW_H__
 
-#include "tensorflow/contrib/lite/interpreter.h"
+#include "tensorflow/lite/interpreter.h"
 
 #include "tflite/InputIndex.h"
 #include "tflite/OutputIndex.h"

diff --git a/libs/tflite/include/tflite/Quantization.h b/libs/tflite/include/tflite/Quantization.h
index 4a8a0f1..8272bcd 100644 (file)
--- a/libs/tflite/include/tflite/Quantization.h
+++ b/libs/tflite/include/tflite/Quantization.h
@@ -33,7 +33,7 @@ union BitwiseIntToFloat {
 
 static const float FLOAT_NEAREST_TO_1 = BitwiseIntToFloat{0x3f7fffff}.f;
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 
 /**
  * @brief   Get TfLiteQuantizationParams object with default values

diff --git a/libs/tflite/include/tflite/Session.h b/libs/tflite/include/tflite/Session.h
index 4f2e5c5..b653acf 100644 (file)
--- a/libs/tflite/include/tflite/Session.h
+++ b/libs/tflite/include/tflite/Session.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_SESSION_H__
 #define __NNFW_TFLITE_SESSION_H__
 
-#include <tensorflow/contrib/lite/interpreter.h>
+#include <tensorflow/lite/interpreter.h>
 
 namespace nnfw
 {

diff --git a/libs/tflite/include/tflite/TensorLogger.h b/libs/tflite/include/tflite/TensorLogger.h
index a878dfe..7b3363b 100644 (file)
--- a/libs/tflite/include/tflite/TensorLogger.h
+++ b/libs/tflite/include/tflite/TensorLogger.h
@@ -26,8 +26,8 @@
 #include "misc/tensor/IndexIterator.h"
 #include "tflite/TensorView.h"
 
-#include <tensorflow/contrib/lite/interpreter.h>
-#include <tensorflow/contrib/lite/context.h>
+#include <tensorflow/lite/interpreter.h>
+#include <tensorflow/lite/context.h>
 #include <fstream>
 #include <iomanip>
 

diff --git a/libs/tflite/include/tflite/TensorUtils.h b/libs/tflite/include/tflite/TensorUtils.h
index 6266c5d..08af146 100644 (file)
--- a/libs/tflite/include/tflite/TensorUtils.h
+++ b/libs/tflite/include/tflite/TensorUtils.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_TENSOR_UTILS_H__
 #define __NNFW_TFLITE_TENSOR_UTILS_H__
 
-#include <tensorflow/contrib/lite/context.h>
+#include <tensorflow/lite/context.h>
 
 namespace nnfw
 {

diff --git a/libs/tflite/include/tflite/TensorView.h b/libs/tflite/include/tflite/TensorView.h
index 79c754c..ce791a7 100644 (file)
--- a/libs/tflite/include/tflite/TensorView.h
+++ b/libs/tflite/include/tflite/TensorView.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_TENSOR_VIEW_H__
 #define __NNFW_TFLITE_TENSOR_VIEW_H__
 
-#include "tensorflow/contrib/lite/interpreter.h"
+#include "tensorflow/lite/interpreter.h"
 
 #include "misc/tensor/Shape.h"
 #include "misc/tensor/Index.h"

diff --git a/libs/tflite/include/tflite/ext/kernels/Abs.h b/libs/tflite/include/tflite/ext/kernels/Abs.h
index 74e4aa6..697ba33 100644 (file)
--- a/libs/tflite/include/tflite/ext/kernels/Abs.h
+++ b/libs/tflite/include/tflite/ext/kernels/Abs.h
@@ -17,7 +17,7 @@
 #ifndef __NNFW_TFLITE_EXT_KERNELS_ABS_H__
 #define __NNFW_TFLITE_EXT_KERNELS_ABS_H__
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 
 namespace nnfw
 {

diff --git a/libs/tflite/include/tflite/ext/kernels/CustomOps.h b/libs/tflite/include/tflite/ext/kernels/CustomOps.h
index e5374fc..3370db7 100644 (file)
--- a/libs/tflite/include/tflite/ext/kernels/CustomOps.h
+++ b/libs/tflite/include/tflite/ext/kernels/CustomOps.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_EXT_KERNELS_CUSTOM_OP_H__
 #define __NNFW_TFLITE_EXT_KERNELS_CUSTOM_OP_H__
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 #include "tflite/ext/kernels/TensorFlowMax.h"
 #include "tflite/ext/kernels/SquaredDifference.h"
 #include "tflite/ext/kernels/TensorFlowSum.h"

diff --git a/libs/tflite/include/tflite/ext/kernels/SquaredDifference.h b/libs/tflite/include/tflite/ext/kernels/SquaredDifference.h
index 492523c..5512ead 100644 (file)
--- a/libs/tflite/include/tflite/ext/kernels/SquaredDifference.h
+++ b/libs/tflite/include/tflite/ext/kernels/SquaredDifference.h
@@ -24,7 +24,7 @@
 #ifndef __NNFW_TFLITE_EXT_KERNELS_SQUARED_DIFFERENCE_H__
 #define __NNFW_TFLITE_EXT_KERNELS_SQUARED_DIFFERENCE_H__
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 
 namespace nnfw
 {

diff --git a/libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h b/libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h
index d31d764..d573308 100644 (file)
--- a/libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h
+++ b/libs/tflite/include/tflite/ext/kernels/TensorFlowMax.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_EXT_KERNELS_TENSORFLOW_MAX_H__
 #define __NNFW_TFLITE_EXT_KERNELS_TENSORFLOW_MAX_H__
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 
 namespace nnfw
 {

diff --git a/libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h b/libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h
index 66783cf..29455aa 100644 (file)
--- a/libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h
+++ b/libs/tflite/include/tflite/ext/kernels/TensorFlowSum.h
@@ -17,7 +17,7 @@
 #ifndef __NNFW_TFLITE_EXT_KERNELS_TENSORFLOW_SUM_H__
 #define __NNFW_TFLITE_EXT_KERNELS_TENSORFLOW_SUM_H__
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 
 namespace nnfw
 {

diff --git a/libs/tflite/include/tflite/ext/kernels/register.h b/libs/tflite/include/tflite/ext/kernels/register.h
index 124af7a..7d2bd78 100644 (file)
--- a/libs/tflite/include/tflite/ext/kernels/register.h
+++ b/libs/tflite/include/tflite/ext/kernels/register.h
@@ -18,13 +18,13 @@ limitations under the License.
 // clang-format off
 
 // NOTE This header is derived from the following file (in TensorFlow)
-//        'externals/tensorflow/tensorflow/contrib/lite/kernels/register.h'
+//        'externals/tensorflow/tensorflow/lite/kernels/register.h'
 #ifndef __NNFW_TFLITE_EXT_KERNELS_REGISTER_H__
 #define __NNFW_TFLITE_EXT_KERNELS_REGISTER_H__
 
 #include <unordered_map>
-#include "tensorflow/contrib/lite/context.h"
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/context.h"
+#include "tensorflow/lite/model.h"
 
 namespace nnfw {
 namespace tflite {

diff --git a/libs/tflite/include/tflite/ext/nnapi_delegate.h b/libs/tflite/include/tflite/ext/nnapi_delegate.h
index 6829395..21017b2 100644 (file)
--- a/libs/tflite/include/tflite/ext/nnapi_delegate.h
+++ b/libs/tflite/include/tflite/ext/nnapi_delegate.h
@@ -18,19 +18,19 @@ limitations under the License.
 // clang-format off
 
 // NOTE This header is derived from the following file (in TensorFlow v1.12)
-//        'externals/tensorflow/tensorflow/contrib/lite/nnapi_delegate.h'
+//        'externals/tensorflow/tensorflow/lite/nnapi_delegate.h'
 #ifndef __NNFW_TFLITE_EXT_NNAPI_DELEGATE_H__
 #define __NNFW_TFLITE_EXT_NNAPI_DELEGATE_H__
 
-#include "tensorflow/contrib/lite/allocation.h"
+#include "tensorflow/lite/allocation.h"
 #if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 9
-#include "tensorflow/contrib/lite/context.h"
-#include "tensorflow/contrib/lite/error_reporter.h"
+#include "tensorflow/lite/context.h"
+#include "tensorflow/lite/error_reporter.h"
 #else
-#include "tensorflow/contrib/lite/c/c_api_internal.h"
-#include "tensorflow/contrib/lite/core/api/error_reporter.h"
+#include "tensorflow/lite/c/c_api_internal.h"
+#include "tensorflow/lite/core/api/error_reporter.h"
 #endif
-#include "tensorflow/contrib/lite/interpreter.h"
+#include "tensorflow/lite/interpreter.h"
 
 struct ANeuralNetworksModel;
 struct ANeuralNetworksMemory;

diff --git a/libs/tflite/include/tflite/interp/Builder.h b/libs/tflite/include/tflite/interp/Builder.h
index b4d0824..0f54e17 100644 (file)
--- a/libs/tflite/include/tflite/interp/Builder.h
+++ b/libs/tflite/include/tflite/interp/Builder.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_INTERP_BUILDER_H__
 #define __NNFW_TFLITE_INTERP_BUILDER_H__
 
-#include <tensorflow/contrib/lite/interpreter.h>
+#include <tensorflow/lite/interpreter.h>
 
 namespace nnfw
 {

diff --git a/libs/tflite/include/tflite/interp/FlatBufferBuilder.h b/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
index 13470b8..2d96af5 100644 (file)
--- a/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
+++ b/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_INTERP_FLAT_BUFFER_BUILDER_H__
 #define __NNFW_TFLITE_INTERP_FLAT_BUFFER_BUILDER_H__
 
-#include <tensorflow/contrib/lite/model.h>
+#include <tensorflow/lite/model.h>
 
 #include "tflite/interp/Builder.h"
 

diff --git a/libs/tflite/include/tflite/interp/FunctionBuilder.h b/libs/tflite/include/tflite/interp/FunctionBuilder.h
index 0643759..7bfb8db 100644 (file)
--- a/libs/tflite/include/tflite/interp/FunctionBuilder.h
+++ b/libs/tflite/include/tflite/interp/FunctionBuilder.h
@@ -23,7 +23,7 @@
 #ifndef __NNFW_TFLITE_INTERP_FUNCTION_BUILDER_H__
 #define __NNFW_TFLITE_INTERP_FUNCTION_BUILDER_H__
 
-#include <tensorflow/contrib/lite/model.h>
+#include <tensorflow/lite/model.h>
 
 #include "tflite/interp/Builder.h"
 

diff --git a/libs/tflite/src/ext/kernels/Abs.cpp b/libs/tflite/src/ext/kernels/Abs.cpp
index 5fe9b26..6118146 100644 (file)
--- a/libs/tflite/src/ext/kernels/Abs.cpp
+++ b/libs/tflite/src/ext/kernels/Abs.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "tflite/ext/kernels/Abs.h"
-#include "tensorflow/contrib/lite/kernels/kernel_util.h"
+#include "tensorflow/lite/kernels/kernel_util.h"
 
 #include <iostream>
 #include <cmath>

diff --git a/libs/tflite/src/ext/kernels/SquaredDifference.cpp b/libs/tflite/src/ext/kernels/SquaredDifference.cpp
index 5301ad5..6158785 100644 (file)
--- a/libs/tflite/src/ext/kernels/SquaredDifference.cpp
+++ b/libs/tflite/src/ext/kernels/SquaredDifference.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "tflite/ext/kernels/SquaredDifference.h"
-#include "tensorflow/contrib/lite/kernels/kernel_util.h"
+#include "tensorflow/lite/kernels/kernel_util.h"
 
 #include <iostream>
 

diff --git a/libs/tflite/src/ext/kernels/TensorFlowMax.cpp b/libs/tflite/src/ext/kernels/TensorFlowMax.cpp
index 5d4e821..207de98 100644 (file)
--- a/libs/tflite/src/ext/kernels/TensorFlowMax.cpp
+++ b/libs/tflite/src/ext/kernels/TensorFlowMax.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "tflite/ext/kernels/TensorFlowMax.h"
-#include "tensorflow/contrib/lite/kernels/kernel_util.h"
+#include "tensorflow/lite/kernels/kernel_util.h"
 
 #include <iostream>
 

diff --git a/libs/tflite/src/ext/kernels/TensorFlowSum.cpp b/libs/tflite/src/ext/kernels/TensorFlowSum.cpp
index b6d5f28..40f266b 100644 (file)
--- a/libs/tflite/src/ext/kernels/TensorFlowSum.cpp
+++ b/libs/tflite/src/ext/kernels/TensorFlowSum.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "tflite/ext/kernels/TensorFlowSum.h"
-#include "tensorflow/contrib/lite/kernels/kernel_util.h"
+#include "tensorflow/lite/kernels/kernel_util.h"
 
 #include <iostream>
 

diff --git a/libs/tflite/src/ext/kernels/register.cpp b/libs/tflite/src/ext/kernels/register.cpp
index e354bbf..cf2c81f 100644 (file)
--- a/libs/tflite/src/ext/kernels/register.cpp
+++ b/libs/tflite/src/ext/kernels/register.cpp
@@ -18,7 +18,7 @@ limitations under the License.
 // clang-format off
 
 // NOTE This code is derived from the following file (in TensorFlow)
-//        'externals/tensorflow/tensorflow/contrib/lite/kernels/register.cc'
+//        'externals/tensorflow/tensorflow/lite/kernels/register.cc'
 #include "tflite/ext/kernels/register.h"
 #include "tflite/ext/kernels/CustomOps.h"
 
@@ -90,7 +90,7 @@ TfLiteRegistration *Register_SLICE();
 TfLiteRegistration *Register_SIN();
 TfLiteRegistration *Register_TRANSPOSE_CONV();
 TfLiteRegistration *Register_SPARSE_TO_DENSE();
-#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
 TfLiteRegistration *Register_SUM();
 TfLiteRegistration *Register_REDUCE_MAX();
 TfLiteRegistration *Register_REDUCE_MIN();
@@ -110,6 +110,12 @@ TfLiteRegistration *Register_UNPACK();
 TfLiteRegistration *Register_FLOOR_DIV();
 TfLiteRegistration *Register_SQUARE();
 TfLiteRegistration *Register_ZEROS_LIKE();
+TfLiteRegistration* Register_FLOOR_MOD();
+TfLiteRegistration* Register_RANGE();
+TfLiteRegistration* Register_LEAKY_RELU();
+TfLiteRegistration* Register_SQUARED_DIFFERENCE();
+TfLiteRegistration* Register_FILL();
+TfLiteRegistration* Register_MIRROR_PAD();
 #endif // TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
 
 }  // namespace builtin
@@ -187,7 +193,7 @@ BuiltinOpResolver::BuiltinOpResolver()
   AddBuiltin(BuiltinOperator_SELECT, Register_SELECT());
   AddBuiltin(BuiltinOperator_SLICE, Register_SLICE());
   AddBuiltin(BuiltinOperator_SIN, Register_SIN());
-#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
   AddBuiltin(BuiltinOperator_SUM, Register_SUM());
   AddBuiltin(BuiltinOperator_REDUCE_MAX, Register_REDUCE_MAX());
   AddBuiltin(BuiltinOperator_REDUCE_MIN, Register_REDUCE_MIN());
@@ -209,7 +215,13 @@ BuiltinOpResolver::BuiltinOpResolver()
   AddBuiltin(BuiltinOperator_FLOOR_DIV, Register_FLOOR_DIV());
   AddBuiltin(BuiltinOperator_SQUARE, Register_SQUARE());
   AddBuiltin(BuiltinOperator_ZEROS_LIKE, Register_ZEROS_LIKE());
-#endif // TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+  AddBuiltin(BuiltinOperator_FLOOR_MOD, Register_FLOOR_MOD());
+  AddBuiltin(BuiltinOperator_RANGE, Register_RANGE());
+  AddBuiltin(BuiltinOperator_LEAKY_RELU, Register_LEAKY_RELU());
+  AddBuiltin(BuiltinOperator_SQUARED_DIFFERENCE, Register_SQUARED_DIFFERENCE());
+  AddBuiltin(BuiltinOperator_FILL, Register_FILL());
+  AddBuiltin(BuiltinOperator_MIRROR_PAD, Register_MIRROR_PAD());
+#endif // TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
 
   AddCustom("TensorFlowMax", nnfw::tflite::custom::Register_TensorFlowMax());
   AddCustom("SquaredDifference", nnfw::tflite::custom::Register_SquaredDifference());

diff --git a/libs/tflite/src/ext/nnapi_delegate.cpp b/libs/tflite/src/ext/nnapi_delegate.cpp
index 71a78af..0a2afa5 100644 (file)
--- a/libs/tflite/src/ext/nnapi_delegate.cpp
+++ b/libs/tflite/src/ext/nnapi_delegate.cpp
@@ -18,20 +18,20 @@ limitations under the License.
 // clang-format off
 
 // NOTE This code is derived from the following file (in TensorFlow v1.12)
-//        'externals/tensorflow/tensorflow/contrib/lite/nnapi_delegate.cc'
+//        'externals/tensorflow/tensorflow/lite/nnapi_delegate.cc'
 #include "tflite/ext/nnapi_delegate.h"
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 9
-#include "tensorflow/contrib/lite/builtin_op_data.h"
-#include "tensorflow/contrib/lite/error_reporter.h"
+#include "tensorflow/lite/builtin_op_data.h"
+#include "tensorflow/lite/error_reporter.h"
 #else
-#include "tensorflow/contrib/lite/c/builtin_op_data.h"
-#include "tensorflow/contrib/lite/core/api/error_reporter.h"
+#include "tensorflow/lite/c/builtin_op_data.h"
+#include "tensorflow/lite/core/api/error_reporter.h"
 #endif
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/model.h"
 #include <rua/Shim.h>
 #include "NeuralNetworksExShim.h"
 
@@ -765,7 +765,7 @@ TfLiteStatus AddOpsAndParams(
             augmented_inputs.data(), static_cast<uint32_t>(node.outputs->size),
             reinterpret_cast<uint32_t*>(node.outputs->data)));
         continue;
-#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
       case tflite::BuiltinOperator_PACK:
         add_pack_ex_params(node.builtin_data);
         CHECK_NN(ANeuralNetworksModel_addOperationEx(
@@ -888,7 +888,7 @@ TfLiteStatus AddOpsAndParams(
       //case tflite::BuiltinOperator_PRELU:
       case tflite::BuiltinOperator_MAXIMUM:
       case tflite::BuiltinOperator_MINIMUM:
-#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
       case tflite::BuiltinOperator_ARG_MIN:
 #endif
       case tflite::BuiltinOperator_GREATER:
@@ -899,11 +899,11 @@ TfLiteStatus AddOpsAndParams(
       case tflite::BuiltinOperator_SELECT:
       case tflite::BuiltinOperator_SLICE:
       case tflite::BuiltinOperator_SIN:
-#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
       case tflite::BuiltinOperator_LOG:
 #endif
       //case tflite::BuiltinOperator_TRANSPOSE_CONV:
-#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
       case tflite::BuiltinOperator_TILE:
       case tflite::BuiltinOperator_EXPAND_DIMS:
       case tflite::BuiltinOperator_SPARSE_TO_DENSE:

diff --git a/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc b/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
index 727d611..a3e99ee 100644 (file)
--- a/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
+++ b/libs/tflite/src/ext/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
@@ -56,7 +56,7 @@
       }
     };
 
-#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 12
+#if TFLITE_MAJOR_VER == 1 && TFLITE_MINOR_VER == 13
     auto add_pack_ex_params = [&add_scalar_int32](void* data) {
       auto builtin = reinterpret_cast<TfLitePackParams*>(data);
       add_scalar_int32(builtin->values_count);

diff --git a/tests/tools/nnapi_test/src/nnapi_test.cc b/tests/tools/nnapi_test/src/nnapi_test.cc
index 73e80f0..799188f 100644 (file)
--- a/tests/tools/nnapi_test/src/nnapi_test.cc
+++ b/tests/tools/nnapi_test/src/nnapi_test.cc
@@ -15,7 +15,7 @@
  */
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/model.h"
 
 #include "tflite/interp/FlatBufferBuilder.h"
 #include "tflite/Diff.h"

diff --git a/tests/tools/tflite_benchmark/src/tflite_benchmark.cc b/tests/tools/tflite_benchmark/src/tflite_benchmark.cc
index b77afc1..27ef2cb 100644 (file)
--- a/tests/tools/tflite_benchmark/src/tflite_benchmark.cc
+++ b/tests/tools/tflite_benchmark/src/tflite_benchmark.cc
@@ -15,7 +15,7 @@
  */
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/model.h"
 
 #include "tflite/Assert.h"
 #include "tflite/Session.h"

diff --git a/tests/tools/tflite_benchmark_model/CMakeLists.txt b/tests/tools/tflite_benchmark_model/CMakeLists.txt
index 7e0e9d8..ea4986a 100644 (file)
--- a/tests/tools/tflite_benchmark_model/CMakeLists.txt
+++ b/tests/tools/tflite_benchmark_model/CMakeLists.txt
@@ -11,7 +11,7 @@ target_compile_definitions(tensorflow-lite PUBLIC "TFLITE_PROFILING_ENABLED")
 file(GLOB_RECURSE SOURCES "*.cc")
 
 nnfw_find_package(TensorFlowSource REQUIRED)
-set(TENSORFLOW_LITE_BASE "${TensorFlowSource_DIR}/tensorflow/contrib/lite")
+set(TENSORFLOW_LITE_BASE "${TensorFlowSource_DIR}/tensorflow/lite")
 list(APPEND SOURCES "${TENSORFLOW_LITE_BASE}/tools/benchmark/benchmark_main.cc"
                     "${TENSORFLOW_LITE_BASE}/tools/benchmark/benchmark_model.cc"
                     "${TENSORFLOW_LITE_BASE}/tools/benchmark/benchmark_params.cc"

diff --git a/tests/tools/tflite_benchmark_model/README.md b/tests/tools/tflite_benchmark_model/README.md
index 8d99763..a71a2fa 100644 (file)
--- a/tests/tools/tflite_benchmark_model/README.md
+++ b/tests/tools/tflite_benchmark_model/README.md
@@ -9,7 +9,7 @@ of runs. Aggregrate latency statistics are reported after running the benchmark.
 
 The instructions below are for running the binary on Desktop and Android,
 for iOS please use the
-[iOS benchmark app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark/ios).
+[iOS benchmark app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark/ios).
 
 ## Parameters
 
@@ -45,14 +45,14 @@ and the following optional parameters:
 bazel build -c opt \
   --config=android_arm \
   --cxxopt='--std=c++11' \
-  tensorflow/contrib/lite/tools/benchmark:benchmark_model
+  tensorflow/lite/tools/benchmark:benchmark_model
 ```
 
 (2) Connect your phone. Push the binary to your phone with adb push
      (make the directory if required):
 
 ```
-adb push bazel-bin/tensorflow/contrib/lite/tools/benchmark/benchmark_model /data/local/tmp
+adb push bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model /data/local/tmp
 ```
 
 (3) Make the binary executable.
@@ -79,14 +79,14 @@ adb shell /data/local/tmp/benchmark_model \
 (1) build the binary
 
 ```
-bazel build -c opt tensorflow/contrib/lite/tools/benchmark:benchmark_model
+bazel build -c opt tensorflow/lite/tools/benchmark:benchmark_model
 ```
 
 (2) Run on your compute graph, similar to the Android case but without the need of adb shell.
 For example:
 
 ```
-bazel-bin/tensorflow/contrib/lite/tools/benchmark/benchmark_model \
+bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model \
   --graph=mobilenet_quant_v1_224.tflite \
   --num_threads=4
 ```
@@ -126,7 +126,7 @@ bazel build -c opt \
   --config=android_arm \
   --cxxopt='--std=c++11' \
   --copt=-DTFLITE_PROFILING_ENABLED \
-  tensorflow/contrib/lite/tools/benchmark:benchmark_model
+  tensorflow/lite/tools/benchmark:benchmark_model
 ```
 This compiles TFLite with profiling enabled, now you can run the benchmark binary like before. The binary will produce detailed statistics for each operation similar to those shown below:
 

diff --git a/tests/tools/tflite_benchmark_model/benchmark_tflite_model.cc b/tests/tools/tflite_benchmark_model/benchmark_tflite_model.cc
index cb8b49d..f6dda26 100644 (file)
--- a/tests/tools/tflite_benchmark_model/benchmark_tflite_model.cc
+++ b/tests/tools/tflite_benchmark_model/benchmark_tflite_model.cc
@@ -29,7 +29,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h"
+#include "tensorflow/lite/tools/benchmark/benchmark_tflite_model.h"
 
 #include <cstdarg>
 #include <cstdlib>
@@ -40,13 +40,13 @@ limitations under the License.
 #include <vector>
 
 #ifdef TFLITE_FLEX
-#include "tensorflow/contrib/lite/delegates/flex/delegate.h"
+#include "tensorflow/lite/delegates/flex/delegate.h"
 #endif  // TFLITE_FLEX
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/op_resolver.h"
-#include "tensorflow/contrib/lite/string_util.h"
-#include "tensorflow/contrib/lite/tools/benchmark/logging.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/op_resolver.h"
+#include "tensorflow/lite/string_util.h"
+#include "tensorflow/lite/tools/benchmark/logging.h"
 
 // For profiling nnapi_delegate
 #include "profiling/profiling.h"

diff --git a/tests/tools/tflite_benchmark_model/profile_summarizer.cc b/tests/tools/tflite_benchmark_model/profile_summarizer.cc
index ce19b0c..b547c70 100644 (file)
--- a/tests/tools/tflite_benchmark_model/profile_summarizer.cc
+++ b/tests/tools/tflite_benchmark_model/profile_summarizer.cc
@@ -29,11 +29,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tensorflow/contrib/lite/profiling/profile_summarizer.h"
+#include "tensorflow/lite/profiling/profile_summarizer.h"
 
 #include <sstream>
 
-#include "tensorflow/contrib/lite/schema/schema_generated.h"
+#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace profiling {

diff --git a/tests/tools/tflite_run/src/bin_image.h b/tests/tools/tflite_run/src/bin_image.h
index 845011b..5fc813e 100644 (file)
--- a/tests/tools/tflite_run/src/bin_image.h
+++ b/tests/tools/tflite_run/src/bin_image.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
 
 class BinImage
 {

diff --git a/tests/tools/tflite_run/src/tensor_dumper.cc b/tests/tools/tflite_run/src/tensor_dumper.cc
index 8568c9b..cdf83fe 100644 (file)
--- a/tests/tools/tflite_run/src/tensor_dumper.cc
+++ b/tests/tools/tflite_run/src/tensor_dumper.cc
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <cstring>
 
-#include "tensorflow/contrib/lite/interpreter.h"
+#include "tensorflow/lite/interpreter.h"
 
 namespace TFLiteRun
 {

diff --git a/tests/tools/tflite_run/src/tflite_run.cc b/tests/tools/tflite_run/src/tflite_run.cc
index 96c669b..9c41439 100644 (file)
--- a/tests/tools/tflite_run/src/tflite_run.cc
+++ b/tests/tools/tflite_run/src/tflite_run.cc
@@ -15,7 +15,7 @@
  */
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/model.h"
 
 #include "args.h"
 #include "tensor_dumper.h"

diff --git a/tools/extract_weights_from_tflite/extract_from_tflite.sh b/tools/extract_weights_from_tflite/extract_from_tflite.sh
index be84f25..7bc870b 100755 (executable)
--- a/tools/extract_weights_from_tflite/extract_from_tflite.sh
+++ b/tools/extract_weights_from_tflite/extract_from_tflite.sh
@@ -27,5 +27,5 @@ TFLITE_FILE=$1
 TFLITE_FILENAME=${TFLITE_FILE##*\/}
 TFLITE_JSON=${TFLITE_FILENAME%\.tflite}.json
 
-$FLATC --json --strict-json $ROOT_PATH/externals/tensorflow/tensorflow/contrib/lite/schema/schema.fbs -- $TFLITE_FILE
+$FLATC --json --strict-json $ROOT_PATH/externals/tensorflow/tensorflow/lite/schema/schema.fbs -- $TFLITE_FILE
 $SCRIPT_PATH/extract.py $TFLITE_JSON

diff --git a/tools/nnapi_quickcheck/tests/add_1.cpp b/tools/nnapi_quickcheck/tests/add_1.cpp
index 6cf110e..f5363f9 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_1.cpp
+++ b/tools/nnapi_quickcheck/tests/add_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_2.cpp b/tools/nnapi_quickcheck/tests/add_2.cpp
index 9629761..fe4d12f 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_2.cpp
+++ b/tools/nnapi_quickcheck/tests/add_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_3.cpp b/tools/nnapi_quickcheck/tests/add_3.cpp
index a2aa121..ce409cc 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_3.cpp
+++ b/tools/nnapi_quickcheck/tests/add_3.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_4.cpp b/tools/nnapi_quickcheck/tests/add_4.cpp
index d1efcbc..b1231dd 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_4.cpp
+++ b/tools/nnapi_quickcheck/tests/add_4.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_5.cpp b/tools/nnapi_quickcheck/tests/add_5.cpp
index cd51e14..f900153 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_5.cpp
+++ b/tools/nnapi_quickcheck/tests/add_5.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_6.cpp b/tools/nnapi_quickcheck/tests/add_6.cpp
index 52fb225..83b87ef 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_6.cpp
+++ b/tools/nnapi_quickcheck/tests/add_6.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_7.cpp b/tools/nnapi_quickcheck/tests/add_7.cpp
index 047395c..732320f 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_7.cpp
+++ b/tools/nnapi_quickcheck/tests/add_7.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_8.cpp b/tools/nnapi_quickcheck/tests/add_8.cpp
index cdb4188..d89e977 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_8.cpp
+++ b/tools/nnapi_quickcheck/tests/add_8.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_9.cpp b/tools/nnapi_quickcheck/tests/add_9.cpp
index e97c7a4..fd4e1f9 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_9.cpp
+++ b/tools/nnapi_quickcheck/tests/add_9.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/add_quan_1.cpp b/tools/nnapi_quickcheck/tests/add_quan_1.cpp
index b185a6b..e3d8512 100644 (file)
--- a/tools/nnapi_quickcheck/tests/add_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/add_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
index f74d2ff..052c689 100644 (file)
--- a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
+++ b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
index 87b2e53..86f35f7 100644 (file)
--- a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/cast_1.cpp b/tools/nnapi_quickcheck/tests/cast_1.cpp
index 81ddc91..788cd57 100644 (file)
--- a/tools/nnapi_quickcheck/tests/cast_1.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/cast_2.cpp b/tools/nnapi_quickcheck/tests/cast_2.cpp
index 2a202bf..a9e99ee 100644 (file)
--- a/tools/nnapi_quickcheck/tests/cast_2.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

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 0b04d95..4af6c77 100644 (file)
--- a/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/concat_1.cpp b/tools/nnapi_quickcheck/tests/concat_1.cpp
index ec9b803..d2cb1aa 100644 (file)
--- a/tools/nnapi_quickcheck/tests/concat_1.cpp
+++ b/tools/nnapi_quickcheck/tests/concat_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
index bdd20f2..f861ac8 100644 (file)
--- a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/conv_1.cpp b/tools/nnapi_quickcheck/tests/conv_1.cpp
index 8949155..b5b145c 100644 (file)
--- a/tools/nnapi_quickcheck/tests/conv_1.cpp
+++ b/tools/nnapi_quickcheck/tests/conv_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
index 5965e1e..2824547 100644 (file)
--- a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/dconv_1.cpp b/tools/nnapi_quickcheck/tests/dconv_1.cpp
index 9417ad4..36ec7a9 100644 (file)
--- a/tools/nnapi_quickcheck/tests/dconv_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dconv_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
index c29fa81..8305ad1 100644 (file)
--- a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/dequantize_1.cpp b/tools/nnapi_quickcheck/tests/dequantize_1.cpp
index 73a3f24..e725fa2 100644 (file)
--- a/tools/nnapi_quickcheck/tests/dequantize_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dequantize_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/div_1.cpp b/tools/nnapi_quickcheck/tests/div_1.cpp
index 0cca2ec..26dfbbe 100644 (file)
--- a/tools/nnapi_quickcheck/tests/div_1.cpp
+++ b/tools/nnapi_quickcheck/tests/div_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/div_2.cpp b/tools/nnapi_quickcheck/tests/div_2.cpp
index cdaf53a..df4efa4 100644 (file)
--- a/tools/nnapi_quickcheck/tests/div_2.cpp
+++ b/tools/nnapi_quickcheck/tests/div_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
index 74a6c41..43cd0a4 100644 (file)
--- a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
+++ b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "misc/environment.h"

diff --git a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
index c2a5726..2c68835 100644 (file)
--- a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "misc/environment.h"

diff --git a/tools/nnapi_quickcheck/tests/gather_1.cpp b/tools/nnapi_quickcheck/tests/gather_1.cpp
index 1f3b529..4ab164e 100644 (file)
--- a/tools/nnapi_quickcheck/tests/gather_1.cpp
+++ b/tools/nnapi_quickcheck/tests/gather_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/gather_2.cpp b/tools/nnapi_quickcheck/tests/gather_2.cpp
index c026d6f..ac9ec8b 100644 (file)
--- a/tools/nnapi_quickcheck/tests/gather_2.cpp
+++ b/tools/nnapi_quickcheck/tests/gather_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
index cbc34f0..0b0a690 100644 (file)
--- a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/max_pool_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_1.cpp
index 30bd42e..62f985d 100644 (file)
--- a/tools/nnapi_quickcheck/tests/max_pool_1.cpp
+++ b/tools/nnapi_quickcheck/tests/max_pool_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
index d862fe5..2c05a7d 100644 (file)
--- a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/mul_1.cpp b/tools/nnapi_quickcheck/tests/mul_1.cpp
index 9f5c028..57ab713 100644 (file)
--- a/tools/nnapi_quickcheck/tests/mul_1.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/mul_2.cpp b/tools/nnapi_quickcheck/tests/mul_2.cpp
index e7f7ba3..a692616 100644 (file)
--- a/tools/nnapi_quickcheck/tests/mul_2.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
index c8bc5b3..5f0061e 100644 (file)
--- a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/relu1_1.cpp b/tools/nnapi_quickcheck/tests/relu1_1.cpp
index 511c35c..25e71dc 100644 (file)
--- a/tools/nnapi_quickcheck/tests/relu1_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu1_1.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/relu6_1.cpp b/tools/nnapi_quickcheck/tests/relu6_1.cpp
index 78d2df0..43e8383 100644 (file)
--- a/tools/nnapi_quickcheck/tests/relu6_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu6_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
index 31d4946..8356442 100644 (file)
--- a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/relu_1.cpp b/tools/nnapi_quickcheck/tests/relu_1.cpp
index 0c4ad39..decd0dd 100644 (file)
--- a/tools/nnapi_quickcheck/tests/relu_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/relu_2.cpp b/tools/nnapi_quickcheck/tests/relu_2.cpp
index d002732..ccb9f06 100644 (file)
--- a/tools/nnapi_quickcheck/tests/relu_2.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/relu_3.cpp b/tools/nnapi_quickcheck/tests/relu_3.cpp
index 3b542e9..59a8560 100644 (file)
--- a/tools/nnapi_quickcheck/tests/relu_3.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_3.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
index 0a8e08b..303080e 100644 (file)
--- a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/reshape_1.cpp b/tools/nnapi_quickcheck/tests/reshape_1.cpp
index f3e50fc..54cfce2 100644 (file)
--- a/tools/nnapi_quickcheck/tests/reshape_1.cpp
+++ b/tools/nnapi_quickcheck/tests/reshape_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
index 28b990a..8eb0bf3 100644 (file)
--- a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
index 323c137..5b2d7b6 100644 (file)
--- a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
+++ b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/softmax_1.cpp b/tools/nnapi_quickcheck/tests/softmax_1.cpp
index 15a9d99..7142475 100644 (file)
--- a/tools/nnapi_quickcheck/tests/softmax_1.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/softmax_2.cpp b/tools/nnapi_quickcheck/tests/softmax_2.cpp
index 1507559..df1ff27 100644 (file)
--- a/tools/nnapi_quickcheck/tests/softmax_2.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
index 010c76b..5d38f77 100644 (file)
--- a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/split_1.cpp b/tools/nnapi_quickcheck/tests/split_1.cpp
index 9834c8e..95a7aa8 100644 (file)
--- a/tools/nnapi_quickcheck/tests/split_1.cpp
+++ b/tools/nnapi_quickcheck/tests/split_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/split_2.cpp b/tools/nnapi_quickcheck/tests/split_2.cpp
index b996fb2..eb06ea0 100644 (file)
--- a/tools/nnapi_quickcheck/tests/split_2.cpp
+++ b/tools/nnapi_quickcheck/tests/split_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/split_3.cpp b/tools/nnapi_quickcheck/tests/split_3.cpp
index 848faea..e3beb5b 100644 (file)
--- a/tools/nnapi_quickcheck/tests/split_3.cpp
+++ b/tools/nnapi_quickcheck/tests/split_3.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/split_4.cpp b/tools/nnapi_quickcheck/tests/split_4.cpp
index 92ccda4..e098973 100644 (file)
--- a/tools/nnapi_quickcheck/tests/split_4.cpp
+++ b/tools/nnapi_quickcheck/tests/split_4.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/sub_1.cpp b/tools/nnapi_quickcheck/tests/sub_1.cpp
index f3c22c2..8bc4208 100644 (file)
--- a/tools/nnapi_quickcheck/tests/sub_1.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/sub_2.cpp b/tools/nnapi_quickcheck/tests/sub_2.cpp
index 7f3ea6f..423e105 100644 (file)
--- a/tools/nnapi_quickcheck/tests/sub_2.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_2.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/sub_3.cpp b/tools/nnapi_quickcheck/tests/sub_3.cpp
index 2c962ca..7bb6ab4 100644 (file)
--- a/tools/nnapi_quickcheck/tests/sub_3.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_3.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/sub_4.cpp b/tools/nnapi_quickcheck/tests/sub_4.cpp
index 2c62073..7fc8577 100644 (file)
--- a/tools/nnapi_quickcheck/tests/sub_4.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_4.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/sub_5.cpp b/tools/nnapi_quickcheck/tests/sub_5.cpp
index 7ee8472..19f95b6 100644 (file)
--- a/tools/nnapi_quickcheck/tests/sub_5.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_5.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/sub_6.cpp b/tools/nnapi_quickcheck/tests/sub_6.cpp
index 312e1f1..66b167e 100644 (file)
--- a/tools/nnapi_quickcheck/tests/sub_6.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_6.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/tanh_1.cpp b/tools/nnapi_quickcheck/tests/tanh_1.cpp
index f2de9cc..7dd9261 100644 (file)
--- a/tools/nnapi_quickcheck/tests/tanh_1.cpp
+++ b/tools/nnapi_quickcheck/tests/tanh_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
index 0d61030..c47af57 100644 (file)
--- a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
+++ b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
@@ -17,8 +17,8 @@
 #include "gtest/gtest.h"
 
 #include "tflite/ext/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/builtin_op_data.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "memory.h"

diff --git a/tools/tflite_accuracy/src/tflite_accuracy.cc b/tools/tflite_accuracy/src/tflite_accuracy.cc
index 83b7ba9..3b7d21e 100644 (file)
--- a/tools/tflite_accuracy/src/tflite_accuracy.cc
+++ b/tools/tflite_accuracy/src/tflite_accuracy.cc
@@ -34,9 +34,9 @@
 #include <cstdint>
 #include <signal.h>
 
-#include <tensorflow/contrib/lite/context.h>
-#include <tensorflow/contrib/lite/interpreter.h>
-#include <tensorflow/contrib/lite/model.h>
+#include <tensorflow/lite/context.h>
+#include <tensorflow/lite/interpreter.h>
+#include <tensorflow/lite/model.h>
 
 #include "labels.h"
 #include "tflite/ext/nnapi_delegate.h"

diff --git a/tools/tflkit/tflite_convert.sh b/tools/tflkit/tflite_convert.sh
index 2056797..3fe1432 100755 (executable)
--- a/tools/tflkit/tflite_convert.sh
+++ b/tools/tflkit/tflite_convert.sh
@@ -119,7 +119,7 @@ CUR_DIR=$(pwd)
       --output_arrays="$OUTPUT" \
       --allow_custom_ops=true
     else
-      bazel run tensorflow/contrib/lite/python:tflite_convert -- \
+      bazel run tensorflow/lite/python:tflite_convert -- \
       --output_file="${NAME_LIST[$i]}" \
       --graph_def_file="$GRAPHDEF_PATH" \
       --input_arrays="$INPUT" \