From a93e9e643ddc539399859c904d1002543c0cd224 Mon Sep 17 00:00:00 2001 From: YoungSeok Yoon Date: Mon, 30 Nov 2020 16:09:22 -0800 Subject: [PATCH] Migrate CoreML delegate directory out of experimental PiperOrigin-RevId: 344908641 Change-Id: Idd3b06c150cc4a68b9b43960fed9fdc288657111 --- .../lite/{experimental => }/delegates/coreml/BUILD | 10 +++++----- .../lite/{experimental => }/delegates/coreml/README.md | 0 .../{experimental => }/delegates/coreml/builders/BUILD | 0 .../coreml/builders/activation_layer_builder.cc | 6 +++--- .../coreml/builders/activation_layer_builder.h | 2 +- .../delegates/coreml/builders/add_op_builder.cc | 6 +++--- .../delegates/coreml/builders/add_op_builder.h | 2 +- .../coreml/builders/concatenation_op_builder.cc | 4 ++-- .../coreml/builders/concatenation_op_builder.h | 2 +- .../coreml/builders/convolution_op_builder.cc | 8 ++++---- .../delegates/coreml/builders/convolution_op_builder.h | 2 +- .../delegates/coreml/builders/dummy_op_builder.cc | 4 ++-- .../delegates/coreml/builders/dummy_op_builder.h | 2 +- .../coreml/builders/fully_connected_op_builder.cc | 6 +++--- .../coreml/builders/fully_connected_op_builder.h | 2 +- .../delegates/coreml/builders/hardswish_op_builder.cc | 8 ++++---- .../delegates/coreml/builders/hardswish_op_builder.h | 2 +- .../delegates/coreml/builders/mul_op_builder.cc | 10 +++++----- .../delegates/coreml/builders/mul_op_builder.h | 2 +- .../delegates/coreml/builders/op_builder.cc | 4 ++-- .../delegates/coreml/builders/op_builder.h | 0 .../delegates/coreml/builders/op_factory.h | 0 .../delegates/coreml/builders/op_validator.h | 0 .../delegates/coreml/builders/pad_op_builder.cc | 4 ++-- .../delegates/coreml/builders/pad_op_builder.h | 2 +- .../delegates/coreml/builders/pooling_layer_builder.cc | 4 ++-- .../delegates/coreml/builders/pooling_layer_builder.h | 2 +- .../delegates/coreml/builders/reshape_op_builder.cc | 8 ++++---- .../delegates/coreml/builders/reshape_op_builder.h | 2 +- .../coreml/builders/resize_bilinear_op_builder.cc | 6 +++--- .../coreml/builders/resize_bilinear_op_builder.h | 2 +- .../delegates/coreml/builders/softmax_op_builder.cc | 2 +- .../delegates/coreml/builders/softmax_op_builder.h | 2 +- .../delegates/coreml/builders/test_util.h | 2 +- .../delegates/coreml/builders/test_util.mm | 2 +- .../coreml/builders/threshold_layer_builder.cc | 2 +- .../coreml/builders/threshold_layer_builder.h | 2 +- .../delegates/coreml/builders/util.cc | 4 ++-- .../delegates/coreml/builders/util.h | 0 .../delegates/coreml/builders/util_test.cc | 2 +- .../delegates/coreml/coreml_delegate.h | 0 .../delegates/coreml/coreml_delegate.mm | 8 ++++---- .../delegates/coreml/coreml_delegate_kernel.h | 4 ++-- .../delegates/coreml/coreml_delegate_kernel.mm | 4 ++-- .../delegates/coreml/coreml_executor.h | 0 .../delegates/coreml/coreml_executor.mm | 2 +- tensorflow/lite/experimental/delegates/testdata/BUILD | 3 --- .../lite/experimental/delegates/testdata/README.txt | 1 - tensorflow/lite/g3doc/_book.yaml | 1 - tensorflow/lite/g3doc/performance/coreml_delegate.md | 6 +++--- tensorflow/lite/ios/BUILD.apple | 4 ++-- tensorflow/lite/objc/BUILD.apple | 2 +- tensorflow/lite/objc/sources/TFLCoreMLDelegate.m | 2 +- tensorflow/lite/swift/BUILD.apple | 4 ++-- tensorflow/lite/tools/delegates/BUILD | 2 +- tensorflow/lite/tools/delegates/README.md | 2 +- .../lite/tools/delegates/coreml_delegate_provider.cc | 2 +- 57 files changed, 86 insertions(+), 91 deletions(-) rename tensorflow/lite/{experimental => }/delegates/coreml/BUILD (86%) rename tensorflow/lite/{experimental => }/delegates/coreml/README.md (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/BUILD (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/activation_layer_builder.cc (94%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/activation_layer_builder.h (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/add_op_builder.cc (93%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/add_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/concatenation_op_builder.cc (94%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/concatenation_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/convolution_op_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/convolution_op_builder.h (97%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/dummy_op_builder.cc (90%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/dummy_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/fully_connected_op_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/fully_connected_op_builder.h (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/hardswish_op_builder.cc (90%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/hardswish_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/mul_op_builder.cc (90%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/mul_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/op_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/op_builder.h (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/op_factory.h (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/op_validator.h (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/pad_op_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/pad_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/pooling_layer_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/pooling_layer_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/reshape_op_builder.cc (93%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/reshape_op_builder.h (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/resize_bilinear_op_builder.cc (93%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/resize_bilinear_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/softmax_op_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/softmax_op_builder.h (95%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/test_util.h (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/test_util.mm (97%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/threshold_layer_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/threshold_layer_builder.h (96%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/util.cc (94%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/util.h (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/builders/util_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/coreml/coreml_delegate.h (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/coreml_delegate.mm (97%) rename tensorflow/lite/{experimental => }/delegates/coreml/coreml_delegate_kernel.h (94%) rename tensorflow/lite/{experimental => }/delegates/coreml/coreml_delegate_kernel.mm (98%) rename tensorflow/lite/{experimental => }/delegates/coreml/coreml_executor.h (100%) rename tensorflow/lite/{experimental => }/delegates/coreml/coreml_executor.mm (99%) delete mode 100644 tensorflow/lite/experimental/delegates/testdata/BUILD delete mode 100644 tensorflow/lite/experimental/delegates/testdata/README.txt diff --git a/tensorflow/lite/experimental/delegates/coreml/BUILD b/tensorflow/lite/delegates/coreml/BUILD similarity index 86% rename from tensorflow/lite/experimental/delegates/coreml/BUILD rename to tensorflow/lite/delegates/coreml/BUILD index ee209704161..2df71534f14 100644 --- a/tensorflow/lite/experimental/delegates/coreml/BUILD +++ b/tensorflow/lite/delegates/coreml/BUILD @@ -17,7 +17,7 @@ package(default_visibility = [ "//visibility:public", ]) -licenses(["notice"]) # Apache 2.0 +licenses(["notice"]) exports_files(["coreml_delegate.h"]) @@ -58,9 +58,9 @@ objc_library( "//tensorflow/lite:minimal_logging", "//tensorflow/lite/c:common", "//tensorflow/lite/delegates:utils", - "//tensorflow/lite/experimental/delegates/coreml/builders:op_builder", - "//tensorflow/lite/experimental/delegates/coreml/builders:op_validator", - "//tensorflow/lite/experimental/delegates/coreml/builders:util", + "//tensorflow/lite/delegates/coreml/builders:op_builder", + "//tensorflow/lite/delegates/coreml/builders:op_validator", + "//tensorflow/lite/delegates/coreml/builders:util", "//tensorflow/lite/kernels:kernel_util", ], ) @@ -78,7 +78,7 @@ objc_library( ":mlmodel_proto_cc", "//tensorflow/lite:kernel_api", "//tensorflow/lite/c:common", - "//tensorflow/lite/experimental/delegates/coreml/builders:op_builder", + "//tensorflow/lite/delegates/coreml/builders:op_builder", "//tensorflow/lite/kernels:kernel_util", "//tensorflow/lite/kernels/internal:optimized_base", "//tensorflow/lite/kernels/internal:types", diff --git a/tensorflow/lite/experimental/delegates/coreml/README.md b/tensorflow/lite/delegates/coreml/README.md similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/README.md rename to tensorflow/lite/delegates/coreml/README.md diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/BUILD b/tensorflow/lite/delegates/coreml/builders/BUILD similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/builders/BUILD rename to tensorflow/lite/delegates/coreml/builders/BUILD diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.cc b/tensorflow/lite/delegates/coreml/builders/activation_layer_builder.cc similarity index 94% rename from tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.cc rename to tensorflow/lite/delegates/coreml/builders/activation_layer_builder.cc index 9fec9769c62..537d222c687 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/activation_layer_builder.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h" #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h b/tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h rename to tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h index ca316011336..7b94b2bedf4 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h @@ -16,7 +16,7 @@ limitations under the License. #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_ACTIVATION_LAYER_BUILDER_H_ #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/add_op_builder.cc similarity index 93% rename from tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/add_op_builder.cc index d850d150eed..86725f4376d 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/add_op_builder.cc @@ -12,12 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/add_op_builder.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.h b/tensorflow/lite/delegates/coreml/builders/add_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/add_op_builder.h index a58e6fa0e31..8479e15d684 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/add_op_builder.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_ADD_OP_BUILDER_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_ADD_OP_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/concatenation_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/concatenation_op_builder.cc similarity index 94% rename from tensorflow/lite/experimental/delegates/coreml/builders/concatenation_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/concatenation_op_builder.cc index 1a61d9fd997..33b48994167 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/concatenation_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/concatenation_op_builder.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/concatenation_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/concatenation_op_builder.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h" +#include "tensorflow/lite/delegates/coreml/builders/op_validator.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/concatenation_op_builder.h b/tensorflow/lite/delegates/coreml/builders/concatenation_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/concatenation_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/concatenation_op_builder.h index 97220942cf3..cc5f75a8615 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/concatenation_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/concatenation_op_builder.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_CONCATENATION_OP_BUILDER_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_CONCATENATION_OP_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/convolution_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/convolution_op_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/coreml/builders/convolution_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/convolution_op_builder.cc index babfc5f079f..c898b705233 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/convolution_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/convolution_op_builder.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/convolution_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/convolution_op_builder.h" #include "google/protobuf/repeated_field.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h" +#include "tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_validator.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/convolution_op_builder.h b/tensorflow/lite/delegates/coreml/builders/convolution_op_builder.h similarity index 97% rename from tensorflow/lite/experimental/delegates/coreml/builders/convolution_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/convolution_op_builder.h index 959c358e37a..82f4aeb41c7 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/convolution_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/convolution_op_builder.h @@ -18,7 +18,7 @@ limitations under the License. #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/dummy_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/dummy_op_builder.cc similarity index 90% rename from tensorflow/lite/experimental/delegates/coreml/builders/dummy_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/dummy_op_builder.cc index 11527655799..83b44a3d502 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/dummy_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/dummy_op_builder.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/dummy_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/dummy_op_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/dummy_op_builder.h b/tensorflow/lite/delegates/coreml/builders/dummy_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/dummy_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/dummy_op_builder.h index ec6f0e883c5..b8b9eabe8e8 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/dummy_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/dummy_op_builder.h @@ -18,7 +18,7 @@ limitations under the License. #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/fully_connected_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/fully_connected_op_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/fully_connected_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/fully_connected_op_builder.cc index c7e53024f69..e9142e9f555 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/fully_connected_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/fully_connected_op_builder.cc @@ -12,12 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/fully_connected_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/fully_connected_op_builder.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/fully_connected_op_builder.h b/tensorflow/lite/delegates/coreml/builders/fully_connected_op_builder.h similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/fully_connected_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/fully_connected_op_builder.h index 32ef070031b..7856c30b421 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/fully_connected_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/fully_connected_op_builder.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_FULLY_CONNECTED_OP_BUILDER_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_FULLY_CONNECTED_OP_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/hardswish_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/hardswish_op_builder.cc similarity index 90% rename from tensorflow/lite/experimental/delegates/coreml/builders/hardswish_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/hardswish_op_builder.cc index d1d2364bc7b..c2b7842280a 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/hardswish_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/hardswish_op_builder.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/hardswish_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/hardswish_op_builder.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/add_op_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/add_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/mul_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/hardswish_op_builder.h b/tensorflow/lite/delegates/coreml/builders/hardswish_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/hardswish_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/hardswish_op_builder.h index 0f95d3e42bc..700c5207a07 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/hardswish_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/hardswish_op_builder.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_HARDSWISH_OP_BUILDER_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_HARDSWISH_OP_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/mul_op_builder.cc similarity index 90% rename from tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/mul_op_builder.cc index eabdd519590..50fc86a4927 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/mul_op_builder.cc @@ -12,14 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/mul_op_builder.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/activation_layer_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/util.h" +#include "tensorflow/lite/delegates/coreml/builders/activation_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_validator.h" +#include "tensorflow/lite/delegates/coreml/builders/util.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.h b/tensorflow/lite/delegates/coreml/builders/mul_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/mul_op_builder.h index c2849e760cc..8a04dcabaac 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/mul_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/mul_op_builder.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_MUL_OP_BUILDER_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_MUL_OP_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/op_builder.cc b/tensorflow/lite/delegates/coreml/builders/op_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/coreml/builders/op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/op_builder.cc index 9b9f0cbd9c3..a63ef1633bb 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/op_builder.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" #include #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h b/tensorflow/lite/delegates/coreml/builders/op_builder.h similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h rename to tensorflow/lite/delegates/coreml/builders/op_builder.h diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h b/tensorflow/lite/delegates/coreml/builders/op_factory.h similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h rename to tensorflow/lite/delegates/coreml/builders/op_factory.h diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h b/tensorflow/lite/delegates/coreml/builders/op_validator.h similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h rename to tensorflow/lite/delegates/coreml/builders/op_validator.h diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/pad_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/pad_op_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/pad_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/pad_op_builder.cc index 448633fa268..c2be66e2bb5 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/pad_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/pad_op_builder.cc @@ -12,12 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/pad_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/pad_op_builder.h" #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/pad_op_builder.h b/tensorflow/lite/delegates/coreml/builders/pad_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/pad_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/pad_op_builder.h index 77f26e3445d..70a2dcb6700 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/pad_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/pad_op_builder.h @@ -16,7 +16,7 @@ limitations under the License. #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_PAD_OP_BUILDER_H_ #include "tensorflow/lite/builtin_ops.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/pooling_layer_builder.cc b/tensorflow/lite/delegates/coreml/builders/pooling_layer_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/coreml/builders/pooling_layer_builder.cc rename to tensorflow/lite/delegates/coreml/builders/pooling_layer_builder.cc index 295a077590d..d71061d702b 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/pooling_layer_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/pooling_layer_builder.cc @@ -12,12 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/pooling_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/pooling_layer_builder.h" #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/pooling_layer_builder.h b/tensorflow/lite/delegates/coreml/builders/pooling_layer_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/pooling_layer_builder.h rename to tensorflow/lite/delegates/coreml/builders/pooling_layer_builder.h index 37e3cb1b070..d01de8c2f46 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/pooling_layer_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/pooling_layer_builder.h @@ -16,7 +16,7 @@ limitations under the License. #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_POOLING_LAYER_BUILDER_H_ #include "tensorflow/lite/builtin_ops.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/reshape_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/reshape_op_builder.cc similarity index 93% rename from tensorflow/lite/experimental/delegates/coreml/builders/reshape_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/reshape_op_builder.cc index d0bf921373e..83840552dfd 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/reshape_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/reshape_op_builder.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/reshape_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/reshape_op_builder.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_validator.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/reshape_op_builder.h b/tensorflow/lite/delegates/coreml/builders/reshape_op_builder.h similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/reshape_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/reshape_op_builder.h index 41f0398daff..8a3c50d0e54 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/reshape_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/reshape_op_builder.h @@ -16,7 +16,7 @@ limitations under the License. #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_RESHAPE_OP_BUILDER_H_ #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/resize_bilinear_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/resize_bilinear_op_builder.cc similarity index 93% rename from tensorflow/lite/experimental/delegates/coreml/builders/resize_bilinear_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/resize_bilinear_op_builder.cc index 04cfd7cbe50..0b2f5aaa2d3 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/resize_bilinear_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/resize_bilinear_op_builder.cc @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/resize_bilinear_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/resize_bilinear_op_builder.h" #include #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_factory.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h" +#include "tensorflow/lite/delegates/coreml/builders/op_factory.h" +#include "tensorflow/lite/delegates/coreml/builders/op_validator.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/resize_bilinear_op_builder.h b/tensorflow/lite/delegates/coreml/builders/resize_bilinear_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/resize_bilinear_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/resize_bilinear_op_builder.h index 9d0b35f2f50..2f8ea5cb177 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/resize_bilinear_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/resize_bilinear_op_builder.h @@ -16,7 +16,7 @@ limitations under the License. #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_RESIZE_BILINEAR_OP_BUILDER_H_ #include "tensorflow/lite/builtin_ops.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/softmax_op_builder.cc b/tensorflow/lite/delegates/coreml/builders/softmax_op_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/softmax_op_builder.cc rename to tensorflow/lite/delegates/coreml/builders/softmax_op_builder.cc index bc1a3aba1f8..7137c9b4070 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/softmax_op_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/softmax_op_builder.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/softmax_op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/softmax_op_builder.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/softmax_op_builder.h b/tensorflow/lite/delegates/coreml/builders/softmax_op_builder.h similarity index 95% rename from tensorflow/lite/experimental/delegates/coreml/builders/softmax_op_builder.h rename to tensorflow/lite/delegates/coreml/builders/softmax_op_builder.h index c04d1ae5219..1c09ac78c7f 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/softmax_op_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/softmax_op_builder.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_SOFTMAX_OP_BUILDER_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_SOFTMAX_OP_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/test_util.h b/tensorflow/lite/delegates/coreml/builders/test_util.h similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/test_util.h rename to tensorflow/lite/delegates/coreml/builders/test_util.h index c6f1f3bed03..8bf9eec46bd 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/test_util.h +++ b/tensorflow/lite/delegates/coreml/builders/test_util.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_TEST_UTIL_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_TEST_UTIL_H_ -#include "tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h" +#include "tensorflow/lite/delegates/coreml/coreml_delegate.h" #include "tensorflow/lite/kernels/test_util.h" #import diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/test_util.mm b/tensorflow/lite/delegates/coreml/builders/test_util.mm similarity index 97% rename from tensorflow/lite/experimental/delegates/coreml/builders/test_util.mm rename to tensorflow/lite/delegates/coreml/builders/test_util.mm index a57e766ba53..5a792a6a3e7 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/test_util.mm +++ b/tensorflow/lite/delegates/coreml/builders/test_util.mm @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/test_util.h" +#include "tensorflow/lite/delegates/coreml/builders/test_util.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.cc b/tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.cc rename to tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.cc index 983f8f1ca60..e11d05f5386 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.cc +++ b/tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.h b/tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.h similarity index 96% rename from tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.h rename to tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.h index 10e0f40a414..4b9866d5aa4 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/threshold_layer_builder.h +++ b/tensorflow/lite/delegates/coreml/builders/threshold_layer_builder.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_THRESHOLD_LAYER_BUILDER_H_ #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_BUILDERS_THRESHOLD_LAYER_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/util.cc b/tensorflow/lite/delegates/coreml/builders/util.cc similarity index 94% rename from tensorflow/lite/experimental/delegates/coreml/builders/util.cc rename to tensorflow/lite/delegates/coreml/builders/util.cc index acaf4ab4bd4..e11caa411fa 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/util.cc +++ b/tensorflow/lite/delegates/coreml/builders/util.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/util.h" +#include "tensorflow/lite/delegates/coreml/builders/util.h" #include -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h" +#include "tensorflow/lite/delegates/coreml/builders/op_validator.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/util.h b/tensorflow/lite/delegates/coreml/builders/util.h similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/builders/util.h rename to tensorflow/lite/delegates/coreml/builders/util.h diff --git a/tensorflow/lite/experimental/delegates/coreml/builders/util_test.cc b/tensorflow/lite/delegates/coreml/builders/util_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/coreml/builders/util_test.cc rename to tensorflow/lite/delegates/coreml/builders/util_test.cc index 8ba8a9bb5bc..795b93ded82 100644 --- a/tensorflow/lite/experimental/delegates/coreml/builders/util_test.cc +++ b/tensorflow/lite/delegates/coreml/builders/util_test.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/builders/util.h" +#include "tensorflow/lite/delegates/coreml/builders/util.h" #include diff --git a/tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h b/tensorflow/lite/delegates/coreml/coreml_delegate.h similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h rename to tensorflow/lite/delegates/coreml/coreml_delegate.h diff --git a/tensorflow/lite/experimental/delegates/coreml/coreml_delegate.mm b/tensorflow/lite/delegates/coreml/coreml_delegate.mm similarity index 97% rename from tensorflow/lite/experimental/delegates/coreml/coreml_delegate.mm rename to tensorflow/lite/delegates/coreml/coreml_delegate.mm index 173546be879..d83e1cb405c 100644 --- a/tensorflow/lite/experimental/delegates/coreml/coreml_delegate.mm +++ b/tensorflow/lite/delegates/coreml/coreml_delegate.mm @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h" +#include "tensorflow/lite/delegates/coreml/coreml_delegate.h" #include #include @@ -22,10 +22,10 @@ limitations under the License. #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/context_util.h" +#include "tensorflow/lite/delegates/coreml/builders/op_validator.h" +#include "tensorflow/lite/delegates/coreml/builders/util.h" +#include "tensorflow/lite/delegates/coreml/coreml_delegate_kernel.h" #include "tensorflow/lite/delegates/utils.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_validator.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/util.h" -#include "tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.h" #include "tensorflow/lite/kernels/kernel_util.h" #include "tensorflow/lite/minimal_logging.h" diff --git a/tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.h b/tensorflow/lite/delegates/coreml/coreml_delegate_kernel.h similarity index 94% rename from tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.h rename to tensorflow/lite/delegates/coreml/coreml_delegate_kernel.h index ac84c15d714..5ff77c73d31 100644 --- a/tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.h +++ b/tensorflow/lite/delegates/coreml/coreml_delegate_kernel.h @@ -16,8 +16,8 @@ limitations under the License. #define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_COREML_COREML_DELEGATE_KERNEL_H_ #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/coreml/builders/op_builder.h" -#import "tensorflow/lite/experimental/delegates/coreml/coreml_executor.h" +#include "tensorflow/lite/delegates/coreml/builders/op_builder.h" +#import "tensorflow/lite/delegates/coreml/coreml_executor.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.mm b/tensorflow/lite/delegates/coreml/coreml_delegate_kernel.mm similarity index 98% rename from tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.mm rename to tensorflow/lite/delegates/coreml/coreml_delegate_kernel.mm index 6a668bc971b..cb2cfb4af12 100644 --- a/tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.mm +++ b/tensorflow/lite/delegates/coreml/coreml_delegate_kernel.mm @@ -12,14 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/coreml/coreml_delegate_kernel.h" +#include "tensorflow/lite/delegates/coreml/coreml_delegate_kernel.h" #include "tensorflow/lite/context_util.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#import "tensorflow/lite/experimental/delegates/coreml/coreml_executor.h" +#import "tensorflow/lite/delegates/coreml/coreml_executor.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/coreml/coreml_executor.h b/tensorflow/lite/delegates/coreml/coreml_executor.h similarity index 100% rename from tensorflow/lite/experimental/delegates/coreml/coreml_executor.h rename to tensorflow/lite/delegates/coreml/coreml_executor.h diff --git a/tensorflow/lite/experimental/delegates/coreml/coreml_executor.mm b/tensorflow/lite/delegates/coreml/coreml_executor.mm similarity index 99% rename from tensorflow/lite/experimental/delegates/coreml/coreml_executor.mm rename to tensorflow/lite/delegates/coreml/coreml_executor.mm index 1f808e08d49..59aeb5698be 100644 --- a/tensorflow/lite/experimental/delegates/coreml/coreml_executor.mm +++ b/tensorflow/lite/delegates/coreml/coreml_executor.mm @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#import "tensorflow/lite/experimental/delegates/coreml/coreml_executor.h" +#import "tensorflow/lite/delegates/coreml/coreml_executor.h" #import #import diff --git a/tensorflow/lite/experimental/delegates/testdata/BUILD b/tensorflow/lite/experimental/delegates/testdata/BUILD deleted file mode 100644 index 1935dfce190..00000000000 --- a/tensorflow/lite/experimental/delegates/testdata/BUILD +++ /dev/null @@ -1,3 +0,0 @@ -licenses(["notice"]) - -exports_files(glob(["*.tflite"])) diff --git a/tensorflow/lite/experimental/delegates/testdata/README.txt b/tensorflow/lite/experimental/delegates/testdata/README.txt deleted file mode 100644 index b10966d1150..00000000000 --- a/tensorflow/lite/experimental/delegates/testdata/README.txt +++ /dev/null @@ -1 +0,0 @@ -posenet_mobilenet_v1_100_257x257_multi_kpt_stripped.tflite: downloaded from https://storage.googleapis.com/download.tensorflow.org/models/tflite/posenet_mobilenet_v1_100_257x257_multi_kpt_stripped.tflite diff --git a/tensorflow/lite/g3doc/_book.yaml b/tensorflow/lite/g3doc/_book.yaml index 84a09824613..c47ac9dc8ec 100644 --- a/tensorflow/lite/g3doc/_book.yaml +++ b/tensorflow/lite/g3doc/_book.yaml @@ -149,7 +149,6 @@ upper_tabs: path: /lite/performance/hexagon_delegate - title: "Core ML delegate" path: /lite/performance/coreml_delegate - status: experimental - title: "Implementing a delegate" path: /lite/performance/implementing_delegate status: experimental diff --git a/tensorflow/lite/g3doc/performance/coreml_delegate.md b/tensorflow/lite/g3doc/performance/coreml_delegate.md index 21cf75d7344..f9d40e1fab1 100644 --- a/tensorflow/lite/g3doc/performance/coreml_delegate.md +++ b/tensorflow/lite/g3doc/performance/coreml_delegate.md @@ -70,7 +70,7 @@ The Core ML delegate uses C API for Objective-C codes. #### Step 1. Include `coreml_delegate.h`. ```c -#include "tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h" +#include "tensorflow/lite/delegates/coreml/coreml_delegate.h" ``` #### Step 2. Create a delegate and initialize a TensorFlow Lite Interpreter @@ -168,7 +168,7 @@ if (delegate == NULL) { The delegate creation logic reads device's machine id (e.g. iPhone11,1) to determine its Neural Engine availability. See the -[code](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/experimental/delegates/coreml/coreml_delegate.mm) +[code](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/delegates/coreml/coreml_delegate.mm) for more detail. Alternatively, you can implement your own set of denylist devices using other libraries such as [DeviceKit](https://github.com/devicekit/DeviceKit). @@ -248,5 +248,5 @@ issue with all the necessary details to reproduce. ## APIs * [Core ML delegate Swift API](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/swift/Sources/CoreMLDelegate.swift) -* [Core ML delegate C API](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h) +* [Core ML delegate C API](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/delegates/coreml/coreml_delegate.h) * This can be used for Objective-C codes. diff --git a/tensorflow/lite/ios/BUILD.apple b/tensorflow/lite/ios/BUILD.apple index 9a582e858b6..44cd298bf7a 100644 --- a/tensorflow/lite/ios/BUILD.apple +++ b/tensorflow/lite/ios/BUILD.apple @@ -38,8 +38,8 @@ strip_common_include_path_prefix( strip_common_include_path_prefix( name = "strip_common_include_path_subspecs", hdr_labels = [ + "//tensorflow/lite/delegates/coreml:coreml_delegate.h", "//tensorflow/lite/delegates/gpu:metal_delegate.h", - "//tensorflow/lite/experimental/delegates/coreml:coreml_delegate.h", ], prefix = "TensorFlowLiteC/", ) @@ -94,7 +94,7 @@ tflite_ios_static_framework( bundle_name = "TensorFlowLiteCCoreML", minimum_os_version = TFL_MINIMUM_OS_VERSION, deps = [ - "//tensorflow/lite/experimental/delegates/coreml:coreml_delegate", + "//tensorflow/lite/delegates/coreml:coreml_delegate", ], ) diff --git a/tensorflow/lite/objc/BUILD.apple b/tensorflow/lite/objc/BUILD.apple index b963c8f6978..3fc4aedfb57 100644 --- a/tensorflow/lite/objc/BUILD.apple +++ b/tensorflow/lite/objc/BUILD.apple @@ -64,9 +64,9 @@ objc_library( visibility = ios_visibility_whitelist(), deps = [ "//tensorflow/lite/c:c_api", + "//tensorflow/lite/delegates/coreml:coreml_delegate", "//tensorflow/lite/delegates/gpu:metal_delegate", "//tensorflow/lite/delegates/xnnpack:xnnpack_delegate", - "//tensorflow/lite/experimental/delegates/coreml:coreml_delegate", ], alwayslink = 1, ) diff --git a/tensorflow/lite/objc/sources/TFLCoreMLDelegate.m b/tensorflow/lite/objc/sources/TFLCoreMLDelegate.m index 55735301d25..307b5a74b86 100644 --- a/tensorflow/lite/objc/sources/TFLCoreMLDelegate.m +++ b/tensorflow/lite/objc/sources/TFLCoreMLDelegate.m @@ -17,7 +17,7 @@ #ifdef COCOAPODS @import TensorFlowLiteCCoreML; #else -#include "tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h" +#include "tensorflow/lite/delegates/coreml/coreml_delegate.h" #endif NS_ASSUME_NONNULL_BEGIN diff --git a/tensorflow/lite/swift/BUILD.apple b/tensorflow/lite/swift/BUILD.apple index 2bf76f493c5..7c4a8f158d8 100644 --- a/tensorflow/lite/swift/BUILD.apple +++ b/tensorflow/lite/swift/BUILD.apple @@ -62,7 +62,7 @@ swift_library( "//tensorflow/lite/ios:tensorflow_lite_c", ] + select({ ":use_coreml_delegate": [ - "//tensorflow/lite/experimental/delegates/coreml:coreml_delegate", + "//tensorflow/lite/delegates/coreml:coreml_delegate", ], "//conditions:default": [], }) + select({ @@ -84,8 +84,8 @@ swift_library( module_name = "TensorFlowLite", tags = TFL_DEFAULT_TAGS + ["builder_default_ios_arm64"], deps = [ + "//tensorflow/lite/delegates/coreml:coreml_delegate", "//tensorflow/lite/delegates/gpu:metal_delegate", - "//tensorflow/lite/experimental/delegates/coreml:coreml_delegate", "//tensorflow/lite/ios:tensorflow_lite_c", ], ) diff --git a/tensorflow/lite/tools/delegates/BUILD b/tensorflow/lite/tools/delegates/BUILD index fca64467bdf..bcea4becab1 100644 --- a/tensorflow/lite/tools/delegates/BUILD +++ b/tensorflow/lite/tools/delegates/BUILD @@ -123,7 +123,7 @@ cc_library( "//tensorflow/lite/tools/evaluation:utils", ] + select({ "//tensorflow:ios": [ - "//tensorflow/lite/experimental/delegates/coreml:coreml_delegate", + "//tensorflow/lite/delegates/coreml:coreml_delegate", ], "//conditions:default": [], }), diff --git a/tensorflow/lite/tools/delegates/README.md b/tensorflow/lite/tools/delegates/README.md index 3a9669bbdd7..424f1cc81bd 100644 --- a/tensorflow/lite/tools/delegates/README.md +++ b/tensorflow/lite/tools/delegates/README.md @@ -103,7 +103,7 @@ Only Android and iOS devices support GPU delegate. ### CoreML delegate provider * `use_coreml`: `bool` (default=false) \ - Whether to use the [Core ML delegate](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/experimental/delegates/coreml). + Whether to use the [Core ML delegate](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/delegates/coreml). This option is only available in iOS. * `coreml_version`: `int` (default=0) \ Target Core ML version for model conversion. The default value is 0 and it diff --git a/tensorflow/lite/tools/delegates/coreml_delegate_provider.cc b/tensorflow/lite/tools/delegates/coreml_delegate_provider.cc index 4f270e3fa94..2b2c114c08a 100644 --- a/tensorflow/lite/tools/delegates/coreml_delegate_provider.cc +++ b/tensorflow/lite/tools/delegates/coreml_delegate_provider.cc @@ -21,7 +21,7 @@ limitations under the License. #if TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR // Only enable metal delegate when using a real iPhone device. #define REAL_IPHONE_DEVICE -#include "tensorflow/lite/experimental/delegates/coreml/coreml_delegate.h" +#include "tensorflow/lite/delegates/coreml/coreml_delegate.h" #endif #endif