[compat] remove contrib from tf headers

This patch remove contrib path from tflite headers as contrib headers is
being removed.

**Self evaluation:**
1. Build test: [X]Passed [ ]Failed [ ]Skipped
2. Run test: [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Jihoon Lee <jhoon.it.lee@samsung.com>

diff --git a/Applications/KNN/jni/main_sample.cpp b/Applications/KNN/jni/main_sample.cpp
index dd2459b..164e4d0 100644 (file)
--- a/Applications/KNN/jni/main_sample.cpp
+++ b/Applications/KNN/jni/main_sample.cpp
@@ -17,10 +17,10 @@
  */
 #include "bitmap_helpers.h"
 #include "math.h"
-#include "tensorflow/contrib/lite/interpreter.h"
-#include "tensorflow/contrib/lite/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/tools/gen_op_registration.h"
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/tools/gen_op_registration.h"
 #include <fstream>
 #include <iostream>
 #include <stdio.h>

diff --git a/Applications/TransferLearning/CIFAR_Classification/jni/main.cpp b/Applications/TransferLearning/CIFAR_Classification/jni/main.cpp
index b639bb4..afa1720 100644 (file)
--- a/Applications/TransferLearning/CIFAR_Classification/jni/main.cpp
+++ b/Applications/TransferLearning/CIFAR_Classification/jni/main.cpp
@@ -25,11 +25,11 @@
  */
 
 #include "bitmap_helpers.h"
-#include "tensorflow/contrib/lite/interpreter.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/gen_op_registration.h"
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/string_util.h"
+#include "tensorflow/lite/tools/gen_op_registration.h"
 #include <cmath>
 #include <fstream>
 #include <iomanip>

diff --git a/nntrainer/layers/tflite_layer.h b/nntrainer/layers/tflite_layer.h
index cb1c17e..bf5ec74 100644 (file)
--- a/nntrainer/layers/tflite_layer.h
+++ b/nntrainer/layers/tflite_layer.h
@@ -18,9 +18,9 @@
 #include <layer_devel.h>
 #include <vector>
 
-#include <tensorflow/contrib/lite/interpreter.h>
-#include <tensorflow/contrib/lite/kernels/register.h>
-#include <tensorflow/contrib/lite/model.h>
+#include <tensorflow/lite/interpreter.h>
+#include <tensorflow/lite/kernels/register.h>
+#include <tensorflow/lite/model.h>
 
 namespace ml::train {
 class TensorDim;

diff --git a/test/unittest/compiler/unittest_interpreter.cpp b/test/unittest/compiler/unittest_interpreter.cpp
index 6ef4fe2..c737cd7 100644 (file)
--- a/test/unittest/compiler/unittest_interpreter.cpp
+++ b/test/unittest/compiler/unittest_interpreter.cpp
@@ -26,9 +26,9 @@
 #ifdef ENABLE_TFLITE_INTERPRETER
 #include <tflite_interpreter.h>
 
-#include <tensorflow/contrib/lite/interpreter.h>
-#include <tensorflow/contrib/lite/kernels/register.h>
-#include <tensorflow/contrib/lite/model.h>
+#include <tensorflow/lite/interpreter.h>
+#include <tensorflow/lite/kernels/register.h>
+#include <tensorflow/lite/model.h>
 #endif
 
 #include <app_context.h>