From 2bf2308872a6dfa8d6d0809acf0098f666e00fe8 Mon Sep 17 00:00:00 2001 From: Yu-Cheng Ling Date: Mon, 14 May 2018 15:14:53 -0700 Subject: [PATCH] Refactoring: Remove lite/tools:mutable_op_resolver dependency. PiperOrigin-RevId: 196575387 --- .../contrib/lite/examples/ios/camera/CameraExampleViewController.mm | 2 +- tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm | 2 +- tensorflow/contrib/lite/models/smartreply/BUILD | 2 -- tensorflow/contrib/lite/models/smartreply/predictor.cc | 2 +- tensorflow/contrib/lite/tools/gen_op_registration_main.cc | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm b/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm index d74e275..59b575a 100644 --- a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm +++ b/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm @@ -25,8 +25,8 @@ #include "tensorflow/contrib/lite/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/mutable_op_resolver.h" #define LOG(x) std::cerr diff --git a/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm b/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm index 0ab7aa2..32da7f7 100644 --- a/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm +++ b/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm @@ -24,8 +24,8 @@ #include "tensorflow/contrib/lite/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/mutable_op_resolver.h" #include "ios_image_load.h" diff --git a/tensorflow/contrib/lite/models/smartreply/BUILD b/tensorflow/contrib/lite/models/smartreply/BUILD index a82d1f2..8b5fa24 100644 --- a/tensorflow/contrib/lite/models/smartreply/BUILD +++ b/tensorflow/contrib/lite/models/smartreply/BUILD @@ -22,7 +22,6 @@ cc_library( "//tensorflow/contrib/lite:framework", "//tensorflow/contrib/lite:string_util", "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/tools:mutable_op_resolver", "@com_google_absl//absl/strings", "@com_googlesource_code_re2//:re2", "@farmhash_archive//:farmhash", @@ -39,7 +38,6 @@ cc_library( "//tensorflow/contrib/lite:framework", "//tensorflow/contrib/lite:string_util", "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/tools:mutable_op_resolver", "@com_google_absl//absl/strings", "@com_googlesource_code_re2//:re2", ], diff --git a/tensorflow/contrib/lite/models/smartreply/predictor.cc b/tensorflow/contrib/lite/models/smartreply/predictor.cc index 6da5cc8..ceef8e6 100644 --- a/tensorflow/contrib/lite/models/smartreply/predictor.cc +++ b/tensorflow/contrib/lite/models/smartreply/predictor.cc @@ -20,8 +20,8 @@ limitations under the License. #include "tensorflow/contrib/lite/interpreter.h" #include "tensorflow/contrib/lite/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/mutable_op_resolver.h" void RegisterSelectedOps(::tflite::MutableOpResolver* resolver); diff --git a/tensorflow/contrib/lite/tools/gen_op_registration_main.cc b/tensorflow/contrib/lite/tools/gen_op_registration_main.cc index 17b514c..f7df808 100644 --- a/tensorflow/contrib/lite/tools/gen_op_registration_main.cc +++ b/tensorflow/contrib/lite/tools/gen_op_registration_main.cc @@ -55,7 +55,7 @@ void GenerateFileContent(const std::string& tflite_path, std::ofstream fout(filename); fout << "#include \"" << tflite_path << "/model.h\"\n"; - fout << "#include \"" << tflite_path << "/tools/mutable_op_resolver.h\"\n"; + fout << "#include \"" << tflite_path << "/op_resolver.h\"\n"; fout << "namespace tflite {\n"; fout << "namespace ops {\n"; -- 2.7.4