From 920bf272c8187ee68d810d468209400ba7f7c4c9 Mon Sep 17 00:00:00 2001 From: Karim Nosir Date: Thu, 11 Jun 2020 10:25:04 -0700 Subject: [PATCH] Move Hexagon Delegate out of experimental. RELNOTES=TFLite Hexagon Delegate out of experimental PiperOrigin-RevId: 315925875 Change-Id: Ic286fc1e203c13d712ea1c904dbd928aa7e4d6af --- .../{experimental => }/delegates/hexagon/BUILD | 6 +++--- .../{experimental => }/delegates/hexagon/README.md | 5 ++--- .../delegates/hexagon/builders/BUILD | 4 ++-- .../hexagon/builders/activation_builder.cc | 4 ++-- .../hexagon/builders/activation_builder.h | 8 ++++---- .../hexagon/builders/arg_min_max_builder.cc | 2 +- .../hexagon/builders/arg_min_max_builder.h | 8 ++++---- .../hexagon/builders/arithmetic_builder.cc | 4 ++-- .../hexagon/builders/arithmetic_builder.h | 8 ++++---- .../hexagon/builders/batch_seq_builder.cc | 2 +- .../delegates/hexagon/builders/batch_seq_builder.h | 8 ++++---- .../delegates/hexagon/builders/cast_builder.cc | 4 ++-- .../delegates/hexagon/builders/cast_builder.h | 8 ++++---- .../delegates/hexagon/builders/concat_builder.cc | 4 ++-- .../delegates/hexagon/builders/concat_builder.h | 8 ++++---- .../delegates/hexagon/builders/conv_2d_builder.cc | 4 ++-- .../delegates/hexagon/builders/conv_2d_builder.h | 8 ++++---- .../delegates/hexagon/builders/conv_2d_helpers.cc | 4 ++-- .../hexagon/builders/hardswish_builder.cc | 4 ++-- .../delegates/hexagon/builders/hardswish_builder.h | 8 ++++---- .../hexagon/builders/l2_normalization_builder.cc | 4 ++-- .../hexagon/builders/l2_normalization_builder.h | 8 ++++---- .../delegates/hexagon/builders/matmul_builder.cc | 4 ++-- .../delegates/hexagon/builders/matmul_builder.h | 8 ++++---- .../delegates/hexagon/builders/min_max_builder.cc | 2 +- .../delegates/hexagon/builders/min_max_builder.h | 8 ++++---- .../hexagon/builders/mirror_pad_builder.cc | 4 ++-- .../hexagon/builders/mirror_pad_builder.h | 8 ++++---- .../delegates/hexagon/builders/neg_op_builder.cc | 2 +- .../delegates/hexagon/builders/neg_op_builder.h | 8 ++++---- .../delegates/hexagon/builders/op_builder.cc | 4 ++-- .../delegates/hexagon/builders/op_builder.h | 10 +++++----- .../delegates/hexagon/builders/op_factory.h | 6 +++--- .../delegates/hexagon/builders/pack_builder.cc | 2 +- .../delegates/hexagon/builders/pack_builder.h | 8 ++++---- .../delegates/hexagon/builders/pad_builder.cc | 4 ++-- .../delegates/hexagon/builders/pad_builder.h | 8 ++++---- .../delegates/hexagon/builders/pool_2d_builder.cc | 4 ++-- .../delegates/hexagon/builders/pool_2d_builder.h | 8 ++++---- .../delegates/hexagon/builders/quantize_builder.cc | 4 ++-- .../delegates/hexagon/builders/quantize_builder.h | 8 ++++---- .../delegates/hexagon/builders/reduce_builder.cc | 4 ++-- .../delegates/hexagon/builders/reduce_builder.h | 8 ++++---- .../delegates/hexagon/builders/reshape_builder.cc | 4 ++-- .../delegates/hexagon/builders/reshape_builder.h | 8 ++++---- .../hexagon/builders/resize_bilinear_builder.cc | 2 +- .../hexagon/builders/resize_bilinear_builder.h | 8 ++++---- .../builders/resize_nearest_neighbor_builder.cc | 4 ++-- .../builders/resize_nearest_neighbor_builder.h | 8 ++++---- .../delegates/hexagon/builders/slice_builder.cc | 2 +- .../delegates/hexagon/builders/slice_builder.h | 8 ++++---- .../delegates/hexagon/builders/softmax_builder.cc | 4 ++-- .../delegates/hexagon/builders/softmax_builder.h | 8 ++++---- .../hexagon/builders/space_to_depth_builder.cc | 4 ++-- .../hexagon/builders/space_to_depth_builder.h | 8 ++++---- .../delegates/hexagon/builders/split_builder.cc | 4 ++-- .../delegates/hexagon/builders/split_builder.h | 8 ++++---- .../hexagon/builders/strided_slice_builder.cc | 2 +- .../hexagon/builders/strided_slice_builder.h | 8 ++++---- .../delegates/hexagon/builders/tests/BUILD | 4 ++-- .../delegates/hexagon/builders/tests/README.md | 2 +- .../hexagon/builders/tests/activations_test.cc | 2 +- .../hexagon/builders/tests/arg_min_max_test.cc | 2 +- .../hexagon/builders/tests/arithmetic_test.cc | 2 +- .../builders/tests/batch_seq_config_test.cc | 2 +- .../hexagon/builders/tests/concat_test.cc | 2 +- .../delegates/hexagon/builders/tests/conv_test.cc | 2 +- .../builders/tests/hexagon_delegate_op_model.h | 8 ++++---- .../hexagon/builders/tests/l2_norm_test.cc | 2 +- .../hexagon/builders/tests/matmul_test.cc | 2 +- .../hexagon/builders/tests/min_max_builder_test.cc | 2 +- .../hexagon/builders/tests/mirror_pad_test.cc | 2 +- .../delegates/hexagon/builders/tests/mul_test.cc | 2 +- .../delegates/hexagon/builders/tests/neg_test.cc | 2 +- .../delegates/hexagon/builders/tests/pack_test.cc | 2 +- .../delegates/hexagon/builders/tests/pad_test.cc | 2 +- .../delegates/hexagon/builders/tests/pool_test.cc | 2 +- .../hexagon/builders/tests/quantize_test.cc | 2 +- .../hexagon/builders/tests/reduce_test.cc | 2 +- .../hexagon/builders/tests/reshape_test.cc | 2 +- .../hexagon/builders/tests/resize_test.cc | 2 +- .../delegates/hexagon/builders/tests/run_tests.sh | 8 ++++---- .../delegates/hexagon/builders/tests/slice_test.cc | 2 +- .../hexagon/builders/tests/softmax_test.cc | 2 +- .../hexagon/builders/tests/space_to_depth_test.cc | 2 +- .../delegates/hexagon/builders/tests/split_test.cc | 2 +- .../hexagon/builders/tests/strided_slice_test.cc | 2 +- .../delegates/hexagon/builders/tests/tests.bzl | 0 .../hexagon/builders/tests/transpose_conv_test.cc | 2 +- .../hexagon/builders/tests/transpose_test.cc | 2 +- .../hexagon/builders/transpose_builder.cc | 2 +- .../delegates/hexagon/builders/transpose_builder.h | 8 ++++---- .../hexagon/builders/transpose_conv_2d_builder.cc | 4 ++-- .../hexagon/builders/transpose_conv_2d_builder.h | 8 ++++---- .../delegates/hexagon/hexagon_delegate.cc | 8 ++++---- .../delegates/hexagon/hexagon_delegate.h | 6 +++--- .../delegates/hexagon/hexagon_delegate_kernel.cc | 6 +++--- .../delegates/hexagon/hexagon_delegate_kernel.h | 14 +++++++------- .../delegates/hexagon/hexagon_implementation.cc | 4 ++-- .../delegates/hexagon/hexagon_implementation.h | 8 ++++---- .../delegates/hexagon/hexagon_nn/BUILD | 0 .../delegates/hexagon/hexagon_nn/hexagon_nn.h | 8 ++++---- .../delegates/hexagon/hexagon_nn/hexagon_nn_init.h | 6 +++--- .../hexagon/hexagon_nn/version_scripts.lds | 0 .../delegates/hexagon/hexagon_nn_interface.h | 8 ++++---- .../delegates/hexagon/java/AndroidManifest.xml | 0 .../delegates/hexagon/java/BUILD | 8 ++++---- .../delegates/hexagon/java/proguard.flags | 0 .../java/src/main/java/org/tensorflow/lite}/BUILD | 0 .../java/org/tensorflow/lite}/HexagonDelegate.java | 3 +-- .../delegates/hexagon/java/src/main/native/BUILD | 4 ++-- .../java/src/main/native/hexagon_delegate_jni.cc | 8 ++++---- .../{experimental => }/delegates/hexagon/utils.cc | 2 +- .../{experimental => }/delegates/hexagon/utils.h | 6 +++--- .../delegates/hexagon/utils_test.cc | 2 +- .../delegates/hexagon/version_script.lds | 0 tensorflow/lite/examples/label_image/BUILD | 8 ++++---- .../lite/g3doc/performance/hexagon_delegate.md | 10 +++++----- tensorflow/lite/tools/benchmark/README.md | 4 ++-- tensorflow/lite/tools/delegates/BUILD | 4 ++-- .../tools/delegates/hexagon_delegate_provider.cc | 2 +- tensorflow/lite/tools/evaluation/BUILD | 4 ++-- tensorflow/lite/tools/evaluation/utils.h | 2 +- 123 files changed, 282 insertions(+), 284 deletions(-) rename tensorflow/lite/{experimental => }/delegates/hexagon/BUILD (91%) rename tensorflow/lite/{experimental => }/delegates/hexagon/README.md (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/BUILD (93%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/activation_builder.cc (94%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/activation_builder.h (82%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/arg_min_max_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/arg_min_max_builder.h (80%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/arithmetic_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/arithmetic_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/batch_seq_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/batch_seq_builder.h (87%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/cast_builder.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/cast_builder.h (84%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/concat_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/concat_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/conv_2d_builder.cc (99%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/conv_2d_builder.h (90%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/conv_2d_helpers.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/hardswish_builder.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/hardswish_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/l2_normalization_builder.cc (94%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/l2_normalization_builder.h (80%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/matmul_builder.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/matmul_builder.h (89%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/min_max_builder.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/min_max_builder.h (80%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/mirror_pad_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/mirror_pad_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/neg_op_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/neg_op_builder.h (80%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/op_builder.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/op_builder.h (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/op_factory.h (93%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/pack_builder.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/pack_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/pad_builder.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/pad_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/pool_2d_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/pool_2d_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/quantize_builder.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/quantize_builder.h (82%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/reduce_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/reduce_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/reshape_builder.cc (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/reshape_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/resize_bilinear_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/resize_bilinear_builder.h (79%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/resize_nearest_neighbor_builder.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/resize_nearest_neighbor_builder.h (80%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/slice_builder.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/slice_builder.h (80%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/softmax_builder.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/softmax_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/space_to_depth_builder.cc (94%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/space_to_depth_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/split_builder.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/split_builder.h (81%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/strided_slice_builder.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/strided_slice_builder.h (79%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/BUILD (93%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/README.md (86%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/activations_test.cc (99%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/arg_min_max_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/arithmetic_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/batch_seq_config_test.cc (99%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/concat_test.cc (99%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/conv_test.cc (99%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h (88%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/l2_norm_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/matmul_test.cc (99%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/min_max_builder_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/mirror_pad_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/mul_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/neg_test.cc (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/pack_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/pad_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/pool_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/quantize_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/reduce_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/reshape_test.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/resize_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/run_tests.sh (82%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/slice_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/softmax_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/space_to_depth_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/split_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/strided_slice_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/tests.bzl (100%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/transpose_conv_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/tests/transpose_test.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/transpose_builder.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/transpose_builder.h (80%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/transpose_conv_2d_builder.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/builders/transpose_conv_2d_builder.h (85%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_delegate.cc (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_delegate.h (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_delegate_kernel.cc (98%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_delegate_kernel.h (84%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_implementation.cc (95%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_implementation.h (94%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_nn/BUILD (100%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_nn/hexagon_nn.h (68%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_nn/hexagon_nn_init.h (77%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_nn/version_scripts.lds (100%) rename tensorflow/lite/{experimental => }/delegates/hexagon/hexagon_nn_interface.h (86%) rename tensorflow/lite/{experimental => }/delegates/hexagon/java/AndroidManifest.xml (100%) rename tensorflow/lite/{experimental => }/delegates/hexagon/java/BUILD (79%) rename tensorflow/lite/{experimental => }/delegates/hexagon/java/proguard.flags (100%) rename tensorflow/lite/{experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental => delegates/hexagon/java/src/main/java/org/tensorflow/lite}/BUILD (100%) rename tensorflow/lite/{experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental => delegates/hexagon/java/src/main/java/org/tensorflow/lite}/HexagonDelegate.java (96%) rename tensorflow/lite/{experimental => }/delegates/hexagon/java/src/main/native/BUILD (74%) rename tensorflow/lite/{experimental => }/delegates/hexagon/java/src/main/native/hexagon_delegate_jni.cc (85%) rename tensorflow/lite/{experimental => }/delegates/hexagon/utils.cc (99%) rename tensorflow/lite/{experimental => }/delegates/hexagon/utils.h (88%) rename tensorflow/lite/{experimental => }/delegates/hexagon/utils_test.cc (97%) rename tensorflow/lite/{experimental => }/delegates/hexagon/version_script.lds (100%) diff --git a/tensorflow/lite/experimental/delegates/hexagon/BUILD b/tensorflow/lite/delegates/hexagon/BUILD similarity index 91% rename from tensorflow/lite/experimental/delegates/hexagon/BUILD rename to tensorflow/lite/delegates/hexagon/BUILD index e799140b2ef..c2845478020 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/BUILD +++ b/tensorflow/lite/delegates/hexagon/BUILD @@ -35,7 +35,7 @@ cc_library( ], deps = [ "//tensorflow/lite:minimal_logging", - "//tensorflow/lite/experimental/delegates/hexagon/hexagon_nn:hexagon_nn_header", + "//tensorflow/lite/delegates/hexagon/hexagon_nn:hexagon_nn_header", "//tensorflow/lite/kernels/internal:compatibility", ], ) @@ -58,8 +58,8 @@ cc_library( "//tensorflow/lite/c:common", "//tensorflow/lite/core/api", "//tensorflow/lite/delegates:utils", - "//tensorflow/lite/experimental/delegates/hexagon/builders:op_builder", - "//tensorflow/lite/experimental/delegates/hexagon/hexagon_nn:hexagon_nn_header", + "//tensorflow/lite/delegates/hexagon/builders:op_builder", + "//tensorflow/lite/delegates/hexagon/hexagon_nn:hexagon_nn_header", "//tensorflow/lite/kernels:kernel_util", "//tensorflow/lite/schema:schema_fbs", "@hexagon_nn//:hexagon_nn_ops", diff --git a/tensorflow/lite/experimental/delegates/hexagon/README.md b/tensorflow/lite/delegates/hexagon/README.md similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/README.md rename to tensorflow/lite/delegates/hexagon/README.md index 7af76059c58..226f3a61077 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/README.md +++ b/tensorflow/lite/delegates/hexagon/README.md @@ -1,7 +1,6 @@ # Hexagon Delegate -Experimental delegate which uses Hexagon SDK to delegate the processing -to QC DSP. +Delegate which uses Hexagon SDK to delegate the processing to QC DSP. Note that we only support quantized models, since the DSP is efficient with quantized versions. So all op support is for quantized versions. @@ -12,7 +11,7 @@ Usage: - Code change example: ``` - #include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" + #include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" // Assuming shared libraries are under "/data/local/tmp/" // If files are packaged with native lib in android App then it diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/BUILD b/tensorflow/lite/delegates/hexagon/builders/BUILD similarity index 93% rename from tensorflow/lite/experimental/delegates/hexagon/builders/BUILD rename to tensorflow/lite/delegates/hexagon/builders/BUILD index e3dd9a01c33..63ff274c7b7 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/BUILD +++ b/tensorflow/lite/delegates/hexagon/builders/BUILD @@ -79,8 +79,8 @@ cc_library( "//tensorflow/lite:kernel_api", "//tensorflow/lite:util", "//tensorflow/lite/c:common", - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_implementation", - "//tensorflow/lite/experimental/delegates/hexagon/hexagon_nn:hexagon_nn_header", + "//tensorflow/lite/delegates/hexagon:hexagon_implementation", + "//tensorflow/lite/delegates/hexagon/hexagon_nn:hexagon_nn_header", "//tensorflow/lite/kernels:kernel_util", "//tensorflow/lite/kernels:padding", "//tensorflow/lite/kernels/internal:optimized_base", diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/activation_builder.cc b/tensorflow/lite/delegates/hexagon/builders/activation_builder.cc similarity index 94% rename from tensorflow/lite/experimental/delegates/hexagon/builders/activation_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/activation_builder.cc index db46f6cdab2..feb061158ea 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/activation_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/activation_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/hexagon/builders/activation_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/activation_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/activation_builder.h b/tensorflow/lite/delegates/hexagon/builders/activation_builder.h similarity index 82% rename from tensorflow/lite/experimental/delegates/hexagon/builders/activation_builder.h rename to tensorflow/lite/delegates/hexagon/builders/activation_builder.h index 3329a855990..ffd6ffdabb7 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/activation_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/activation_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ACTIVATION_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ACTIVATION_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ACTIVATION_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ACTIVATION_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -49,4 +49,4 @@ class ActivationOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ACTIVATION_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ACTIVATION_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/arg_min_max_builder.cc b/tensorflow/lite/delegates/hexagon/builders/arg_min_max_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/arg_min_max_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/arg_min_max_builder.cc index 61b609c2bb7..4cd2dc1f897 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/arg_min_max_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/arg_min_max_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/hexagon/builders/arg_min_max_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/arg_min_max_builder.h" #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/arg_min_max_builder.h b/tensorflow/lite/delegates/hexagon/builders/arg_min_max_builder.h similarity index 80% rename from tensorflow/lite/experimental/delegates/hexagon/builders/arg_min_max_builder.h rename to tensorflow/lite/delegates/hexagon/builders/arg_min_max_builder.h index 7859e637559..0ffa4ac9505 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/arg_min_max_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/arg_min_max_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ARG_MIN_MAX_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ARG_MIN_MAX_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ARG_MIN_MAX_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ARG_MIN_MAX_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -43,4 +43,4 @@ class ArgMinMaxOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ARG_MIN_MAX_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ARG_MIN_MAX_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/arithmetic_builder.cc b/tensorflow/lite/delegates/hexagon/builders/arithmetic_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/arithmetic_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/arithmetic_builder.cc index 5211f9f266a..5b069ed4e24 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/arithmetic_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/arithmetic_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/hexagon/builders/arithmetic_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/arithmetic_builder.h" #include @@ -20,7 +20,7 @@ limitations under the License. #include "hexagon/hexagon_nn_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/arithmetic_builder.h b/tensorflow/lite/delegates/hexagon/builders/arithmetic_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/arithmetic_builder.h rename to tensorflow/lite/delegates/hexagon/builders/arithmetic_builder.h index af9b5dc815d..e3cba846884 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/arithmetic_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/arithmetic_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ARITHMETIC_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ARITHMETIC_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ARITHMETIC_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ARITHMETIC_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -46,4 +46,4 @@ class ArithmeticOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_ARITHMETIC_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_ARITHMETIC_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/batch_seq_builder.cc b/tensorflow/lite/delegates/hexagon/builders/batch_seq_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/batch_seq_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/batch_seq_builder.cc index ecc45beeeac..2b867e30002 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/batch_seq_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/batch_seq_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/hexagon/builders/batch_seq_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/batch_seq_builder.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/batch_seq_builder.h b/tensorflow/lite/delegates/hexagon/builders/batch_seq_builder.h similarity index 87% rename from tensorflow/lite/experimental/delegates/hexagon/builders/batch_seq_builder.h rename to tensorflow/lite/delegates/hexagon/builders/batch_seq_builder.h index 17f02207015..9975b30634a 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/batch_seq_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/batch_seq_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_BATCH_SEQ_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_BATCH_SEQ_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_BATCH_SEQ_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_BATCH_SEQ_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -66,4 +66,4 @@ class BatchSeqBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_BATCH_SEQ_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_BATCH_SEQ_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/cast_builder.cc b/tensorflow/lite/delegates/hexagon/builders/cast_builder.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/cast_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/cast_builder.cc index b1aba7711b1..d60b58be590 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/cast_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/cast_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/hexagon/builders/cast_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/cast_builder.h" #include @@ -20,7 +20,7 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/cast_builder.h b/tensorflow/lite/delegates/hexagon/builders/cast_builder.h similarity index 84% rename from tensorflow/lite/experimental/delegates/hexagon/builders/cast_builder.h rename to tensorflow/lite/delegates/hexagon/builders/cast_builder.h index d40a640712e..901318b126e 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/cast_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/cast_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CAST_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CAST_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CAST_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CAST_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -51,4 +51,4 @@ class CastOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CAST_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CAST_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/concat_builder.cc b/tensorflow/lite/delegates/hexagon/builders/concat_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/concat_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/concat_builder.cc index 71d818a5d68..c85d8ea8f34 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/concat_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/concat_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/hexagon/builders/concat_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/concat_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/concat_builder.h b/tensorflow/lite/delegates/hexagon/builders/concat_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/concat_builder.h rename to tensorflow/lite/delegates/hexagon/builders/concat_builder.h index 02045e13c15..0146c91fcb7 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/concat_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/concat_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CONCAT_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CONCAT_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CONCAT_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CONCAT_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -47,4 +47,4 @@ class ConcatOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CONCAT_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CONCAT_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_builder.cc b/tensorflow/lite/delegates/hexagon/builders/conv_2d_builder.cc similarity index 99% rename from tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/conv_2d_builder.cc index 47485fb782f..97db6bf8fd0 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/conv_2d_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/hexagon/builders/conv_2d_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/conv_2d_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_builder.h b/tensorflow/lite/delegates/hexagon/builders/conv_2d_builder.h similarity index 90% rename from tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_builder.h rename to tensorflow/lite/delegates/hexagon/builders/conv_2d_builder.h index 7cae15fbc32..4980b294481 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/conv_2d_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CONV_2D_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CONV_2D_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CONV_2D_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CONV_2D_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -84,4 +84,4 @@ class Conv2dOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_CONV_2D_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_CONV_2D_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_helpers.cc b/tensorflow/lite/delegates/hexagon/builders/conv_2d_helpers.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_helpers.cc rename to tensorflow/lite/delegates/hexagon/builders/conv_2d_helpers.cc index f897d56bf1d..bf68bbe5a25 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_helpers.cc +++ b/tensorflow/lite/delegates/hexagon/builders/conv_2d_helpers.cc @@ -21,8 +21,8 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/builders/conv_2d_builder.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/builders/conv_2d_builder.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/hardswish_builder.cc b/tensorflow/lite/delegates/hexagon/builders/hardswish_builder.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/hardswish_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/hardswish_builder.cc index b08cb0b36e0..af7daec7875 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/hardswish_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/hardswish_builder.cc @@ -11,14 +11,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/hexagon/builders/hardswish_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/hardswish_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/hardswish_builder.h b/tensorflow/lite/delegates/hexagon/builders/hardswish_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/hardswish_builder.h rename to tensorflow/lite/delegates/hexagon/builders/hardswish_builder.h index dac297db457..ba173bec466 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/hardswish_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/hardswish_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_HARDSWISH_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_HARDSWISH_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_HARDSWISH_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_HARDSWISH_BUILDER_H_ #include #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -47,4 +47,4 @@ class HardSwishOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_HARDSWISH_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_HARDSWISH_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/l2_normalization_builder.cc b/tensorflow/lite/delegates/hexagon/builders/l2_normalization_builder.cc similarity index 94% rename from tensorflow/lite/experimental/delegates/hexagon/builders/l2_normalization_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/l2_normalization_builder.cc index 79284db7846..1adc5102ead 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/l2_normalization_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/l2_normalization_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/hexagon/builders/l2_normalization_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/l2_normalization_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/l2_normalization_builder.h b/tensorflow/lite/delegates/hexagon/builders/l2_normalization_builder.h similarity index 80% rename from tensorflow/lite/experimental/delegates/hexagon/builders/l2_normalization_builder.h rename to tensorflow/lite/delegates/hexagon/builders/l2_normalization_builder.h index e78fe9580a2..d552d6f7a09 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/l2_normalization_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/l2_normalization_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_L2_NORMALIZATION_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_L2_NORMALIZATION_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_L2_NORMALIZATION_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_L2_NORMALIZATION_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -45,4 +45,4 @@ class L2NormalizationOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_L2_NORMALIZATION_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_L2_NORMALIZATION_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/matmul_builder.cc b/tensorflow/lite/delegates/hexagon/builders/matmul_builder.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/matmul_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/matmul_builder.cc index f0253165c86..0757ea6180e 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/matmul_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/matmul_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/hexagon/builders/matmul_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/matmul_builder.h" #include @@ -21,7 +21,7 @@ limitations under the License. #include "hexagon/hexagon_nn_ops.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/matmul_builder.h b/tensorflow/lite/delegates/hexagon/builders/matmul_builder.h similarity index 89% rename from tensorflow/lite/experimental/delegates/hexagon/builders/matmul_builder.h rename to tensorflow/lite/delegates/hexagon/builders/matmul_builder.h index 25d2f20287c..d891208b66a 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/matmul_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/matmul_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MATMUL_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MATMUL_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MATMUL_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MATMUL_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -74,4 +74,4 @@ class MatMulOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MATMUL_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MATMUL_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/min_max_builder.cc b/tensorflow/lite/delegates/hexagon/builders/min_max_builder.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/min_max_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/min_max_builder.cc index c06a707966e..67027619415 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/min_max_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/min_max_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/hexagon/builders/min_max_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/min_max_builder.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/min_max_builder.h b/tensorflow/lite/delegates/hexagon/builders/min_max_builder.h similarity index 80% rename from tensorflow/lite/experimental/delegates/hexagon/builders/min_max_builder.h rename to tensorflow/lite/delegates/hexagon/builders/min_max_builder.h index 4d50d941e4f..c12cb5ee665 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/min_max_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/min_max_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MIN_MAX_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MIN_MAX_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MIN_MAX_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MIN_MAX_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -42,4 +42,4 @@ class MinMaxOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MIN_MAX_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MIN_MAX_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/mirror_pad_builder.cc b/tensorflow/lite/delegates/hexagon/builders/mirror_pad_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/builders/mirror_pad_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/mirror_pad_builder.cc index 244c3ea603c..441140cd570 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/mirror_pad_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/mirror_pad_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/hexagon/builders/mirror_pad_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/mirror_pad_builder.h" #include @@ -20,7 +20,7 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/mirror_pad_builder.h b/tensorflow/lite/delegates/hexagon/builders/mirror_pad_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/mirror_pad_builder.h rename to tensorflow/lite/delegates/hexagon/builders/mirror_pad_builder.h index 6fcb2606701..50af36b7417 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/mirror_pad_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/mirror_pad_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MIRROR_PAD_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MIRROR_PAD_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MIRROR_PAD_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MIRROR_PAD_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -46,4 +46,4 @@ class MirrorPadOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_MIRROR_PAD_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_MIRROR_PAD_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/neg_op_builder.cc b/tensorflow/lite/delegates/hexagon/builders/neg_op_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/builders/neg_op_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/neg_op_builder.cc index d8edba9d4a7..8454258f700 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/neg_op_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/neg_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/hexagon/builders/neg_op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/neg_op_builder.h" #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/neg_op_builder.h b/tensorflow/lite/delegates/hexagon/builders/neg_op_builder.h similarity index 80% rename from tensorflow/lite/experimental/delegates/hexagon/builders/neg_op_builder.h rename to tensorflow/lite/delegates/hexagon/builders/neg_op_builder.h index e0b0e430193..c7b535e7b29 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/neg_op_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/neg_op_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_NEG_OP_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_NEG_OP_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_NEG_OP_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_NEG_OP_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -41,4 +41,4 @@ class NegOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_NEG_OP_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_NEG_OP_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.cc b/tensorflow/lite/delegates/hexagon/builders/op_builder.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/op_builder.cc index b91c825199c..95cec93a41a 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/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/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" #include "hexagon/hexagon_nn_ops.h" #include "tensorflow/lite/builtin_ops.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_factory.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_factory.h" namespace tflite { namespace delegates { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h b/tensorflow/lite/delegates/hexagon/builders/op_builder.h similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h rename to tensorflow/lite/delegates/hexagon/builders/op_builder.h index e130e6d2efb..8cfa90565bd 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/op_builder.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_OP_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_OP_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_OP_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_OP_BUILDER_H_ #include #include @@ -25,8 +25,8 @@ 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/hexagon/hexagon_implementation.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_implementation.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" namespace tflite { namespace delegates { @@ -371,4 +371,4 @@ class GraphBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_OP_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_OP_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/op_factory.h b/tensorflow/lite/delegates/hexagon/builders/op_factory.h similarity index 93% rename from tensorflow/lite/experimental/delegates/hexagon/builders/op_factory.h rename to tensorflow/lite/delegates/hexagon/builders/op_factory.h index 95879013d53..7f75725946e 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/op_factory.h +++ b/tensorflow/lite/delegates/hexagon/builders/op_factory.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_OP_FACTORY_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_OP_FACTORY_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_OP_FACTORY_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_OP_FACTORY_H_ #include "tensorflow/lite/c/common.h" @@ -65,4 +65,4 @@ OpBuilder* CreateStridedSliceBuilder(GraphBuilder* graph_builder, int op_type); } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_OP_FACTORY_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_OP_FACTORY_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/pack_builder.cc b/tensorflow/lite/delegates/hexagon/builders/pack_builder.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/pack_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/pack_builder.cc index 6b48e8f2ae7..102bfa828b0 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/pack_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/pack_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/hexagon/builders/pack_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/pack_builder.h" #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/pack_builder.h b/tensorflow/lite/delegates/hexagon/builders/pack_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/pack_builder.h rename to tensorflow/lite/delegates/hexagon/builders/pack_builder.h index a372c519c01..895a0d643cb 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/pack_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/pack_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_PACK_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_PACK_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_PACK_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_PACK_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -43,4 +43,4 @@ class PackOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_PACK_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_PACK_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/pad_builder.cc b/tensorflow/lite/delegates/hexagon/builders/pad_builder.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/pad_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/pad_builder.cc index 6474b854990..08393cb8720 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/pad_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/pad_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/hexagon/builders/pad_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/pad_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/pad_builder.h b/tensorflow/lite/delegates/hexagon/builders/pad_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/pad_builder.h rename to tensorflow/lite/delegates/hexagon/builders/pad_builder.h index a7d50d2cbda..855d6d582bb 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/pad_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/pad_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_PAD_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_PAD_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_PAD_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_PAD_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -45,4 +45,4 @@ class PadOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_PAD_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_PAD_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/pool_2d_builder.cc b/tensorflow/lite/delegates/hexagon/builders/pool_2d_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/pool_2d_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/pool_2d_builder.cc index 6857b79a915..5dddcbfb0b3 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/pool_2d_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/pool_2d_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/hexagon/builders/pool_2d_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/pool_2d_builder.h" #include @@ -20,7 +20,7 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/pool_2d_builder.h b/tensorflow/lite/delegates/hexagon/builders/pool_2d_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/pool_2d_builder.h rename to tensorflow/lite/delegates/hexagon/builders/pool_2d_builder.h index 2ea80bcd644..53bb0eb1b29 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/pool_2d_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/pool_2d_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_POOL_2D_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_POOL_2D_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_POOL_2D_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_POOL_2D_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -47,4 +47,4 @@ class Pool2dOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_POOL_2D_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_POOL_2D_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/quantize_builder.cc b/tensorflow/lite/delegates/hexagon/builders/quantize_builder.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/quantize_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/quantize_builder.cc index 052fbadd28d..cc8ab5e6313 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/quantize_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/quantize_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/hexagon/builders/quantize_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/quantize_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/quantize_builder.h b/tensorflow/lite/delegates/hexagon/builders/quantize_builder.h similarity index 82% rename from tensorflow/lite/experimental/delegates/hexagon/builders/quantize_builder.h rename to tensorflow/lite/delegates/hexagon/builders/quantize_builder.h index 9851ce46f00..446d1e3b9d8 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/quantize_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/quantize_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_QUANTIZE_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_QUANTIZE_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_QUANTIZE_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_QUANTIZE_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -45,4 +45,4 @@ class QuantizeOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_QUANTIZE_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_QUANTIZE_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/reduce_builder.cc b/tensorflow/lite/delegates/hexagon/builders/reduce_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/builders/reduce_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/reduce_builder.cc index f72fd0b48c1..ddc492541f7 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/reduce_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/reduce_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/hexagon/builders/reduce_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/reduce_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" #include "tensorflow/lite/util.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/reduce_builder.h b/tensorflow/lite/delegates/hexagon/builders/reduce_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/reduce_builder.h rename to tensorflow/lite/delegates/hexagon/builders/reduce_builder.h index 4f3f3a43ddc..8cab32637ac 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/reduce_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/reduce_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_REDUCE_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_REDUCE_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_REDUCE_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_REDUCE_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -45,4 +45,4 @@ class ReduceOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_REDUCE_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_REDUCE_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/reshape_builder.cc b/tensorflow/lite/delegates/hexagon/builders/reshape_builder.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/builders/reshape_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/reshape_builder.cc index 7a69d56b349..1e8ebf807c9 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/reshape_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/reshape_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/hexagon/builders/reshape_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/reshape_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/reshape_builder.h b/tensorflow/lite/delegates/hexagon/builders/reshape_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/reshape_builder.h rename to tensorflow/lite/delegates/hexagon/builders/reshape_builder.h index dff417dda34..b5514e584a4 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/reshape_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/reshape_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESHAPE_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESHAPE_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESHAPE_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESHAPE_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -46,4 +46,4 @@ class ReshapeOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESHAPE_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESHAPE_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_bilinear_builder.cc b/tensorflow/lite/delegates/hexagon/builders/resize_bilinear_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/resize_bilinear_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/resize_bilinear_builder.cc index 4b0f2bc9f9e..dda1d83717e 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_bilinear_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/resize_bilinear_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/hexagon/builders/resize_bilinear_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/resize_bilinear_builder.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_bilinear_builder.h b/tensorflow/lite/delegates/hexagon/builders/resize_bilinear_builder.h similarity index 79% rename from tensorflow/lite/experimental/delegates/hexagon/builders/resize_bilinear_builder.h rename to tensorflow/lite/delegates/hexagon/builders/resize_bilinear_builder.h index 3dca07f1d81..3fb23f88542 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_bilinear_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/resize_bilinear_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESIZE_BILINEAR_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESIZE_BILINEAR_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESIZE_BILINEAR_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESIZE_BILINEAR_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -43,4 +43,4 @@ class ResizeBilinearOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESIZE_BILINEAR_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESIZE_BILINEAR_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_nearest_neighbor_builder.cc b/tensorflow/lite/delegates/hexagon/builders/resize_nearest_neighbor_builder.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/resize_nearest_neighbor_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/resize_nearest_neighbor_builder.cc index 6685470d3a7..c8dc0d60363 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_nearest_neighbor_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/resize_nearest_neighbor_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/hexagon/builders/resize_nearest_neighbor_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/resize_nearest_neighbor_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_nearest_neighbor_builder.h b/tensorflow/lite/delegates/hexagon/builders/resize_nearest_neighbor_builder.h similarity index 80% rename from tensorflow/lite/experimental/delegates/hexagon/builders/resize_nearest_neighbor_builder.h rename to tensorflow/lite/delegates/hexagon/builders/resize_nearest_neighbor_builder.h index 0129340682c..f9fc9281080 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/resize_nearest_neighbor_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/resize_nearest_neighbor_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESIZE_NEAREST_NEIGHBOR_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESIZE_NEAREST_NEIGHBOR_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESIZE_NEAREST_NEIGHBOR_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESIZE_NEAREST_NEIGHBOR_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -47,4 +47,4 @@ class ResizeNearestNeighborOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_RESIZE_NEAREST_NEIGHBOR_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_RESIZE_NEAREST_NEIGHBOR_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/slice_builder.cc b/tensorflow/lite/delegates/hexagon/builders/slice_builder.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/slice_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/slice_builder.cc index c58754cdf56..4ef6c302ad8 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/slice_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/slice_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/hexagon/builders/slice_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/slice_builder.h" #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/slice_builder.h b/tensorflow/lite/delegates/hexagon/builders/slice_builder.h similarity index 80% rename from tensorflow/lite/experimental/delegates/hexagon/builders/slice_builder.h rename to tensorflow/lite/delegates/hexagon/builders/slice_builder.h index 0ee06630dba..700c3097bed 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/slice_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/slice_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SLICE_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SLICE_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SLICE_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SLICE_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -42,4 +42,4 @@ class SliceOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SLICE_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SLICE_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/softmax_builder.cc b/tensorflow/lite/delegates/hexagon/builders/softmax_builder.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/softmax_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/softmax_builder.cc index 26c6e94c21f..fea696b7421 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/softmax_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/softmax_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/hexagon/builders/softmax_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/softmax_builder.h" #include @@ -20,7 +20,7 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/softmax_builder.h b/tensorflow/lite/delegates/hexagon/builders/softmax_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/softmax_builder.h rename to tensorflow/lite/delegates/hexagon/builders/softmax_builder.h index fe4333f2b31..1d86a82b5c5 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/softmax_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/softmax_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SOFTMAX_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SOFTMAX_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SOFTMAX_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SOFTMAX_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -46,4 +46,4 @@ class SoftmaxOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SOFTMAX_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SOFTMAX_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/space_to_depth_builder.cc b/tensorflow/lite/delegates/hexagon/builders/space_to_depth_builder.cc similarity index 94% rename from tensorflow/lite/experimental/delegates/hexagon/builders/space_to_depth_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/space_to_depth_builder.cc index 49141e486c0..4447ed9ca2b 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/space_to_depth_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/space_to_depth_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/hexagon/builders/space_to_depth_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/space_to_depth_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/space_to_depth_builder.h b/tensorflow/lite/delegates/hexagon/builders/space_to_depth_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/space_to_depth_builder.h rename to tensorflow/lite/delegates/hexagon/builders/space_to_depth_builder.h index 2e07a2b1ec6..95d1a02feed 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/space_to_depth_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/space_to_depth_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SPACE_TO_DEPTH_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SPACE_TO_DEPTH_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SPACE_TO_DEPTH_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SPACE_TO_DEPTH_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -48,4 +48,4 @@ class SpaceToDepthOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SPACE_TO_DEPTH_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SPACE_TO_DEPTH_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/split_builder.cc b/tensorflow/lite/delegates/hexagon/builders/split_builder.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/split_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/split_builder.cc index 4a809f3f1c5..833ef2f5d3d 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/split_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/split_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/hexagon/builders/split_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/split_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/split_builder.h b/tensorflow/lite/delegates/hexagon/builders/split_builder.h similarity index 81% rename from tensorflow/lite/experimental/delegates/hexagon/builders/split_builder.h rename to tensorflow/lite/delegates/hexagon/builders/split_builder.h index 1ae7cfb04c8..6681158e7e7 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/split_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/split_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SPLIT_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SPLIT_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SPLIT_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SPLIT_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -46,4 +46,4 @@ class SplitOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_SPLIT_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_SPLIT_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/strided_slice_builder.cc b/tensorflow/lite/delegates/hexagon/builders/strided_slice_builder.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/strided_slice_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/strided_slice_builder.cc index 2859439905d..125c1f9ea87 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/strided_slice_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/strided_slice_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/hexagon/builders/strided_slice_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/strided_slice_builder.h" #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/strided_slice_builder.h b/tensorflow/lite/delegates/hexagon/builders/strided_slice_builder.h similarity index 79% rename from tensorflow/lite/experimental/delegates/hexagon/builders/strided_slice_builder.h rename to tensorflow/lite/delegates/hexagon/builders/strided_slice_builder.h index eb91e696fdb..330e6636a1a 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/strided_slice_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/strided_slice_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_STRIDED_SLICE_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_STRIDED_SLICE_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_STRIDED_SLICE_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_STRIDED_SLICE_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -42,4 +42,4 @@ class StridedSliceOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_STRIDED_SLICE_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_STRIDED_SLICE_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/BUILD b/tensorflow/lite/delegates/hexagon/builders/tests/BUILD similarity index 93% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/BUILD rename to tensorflow/lite/delegates/hexagon/builders/tests/BUILD index f7e6d3a220c..044a03f5f0c 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/BUILD +++ b/tensorflow/lite/delegates/hexagon/builders/tests/BUILD @@ -14,7 +14,7 @@ cc_library( deps = [ "//tensorflow/lite:framework", "//tensorflow/lite/c:common", - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", "//tensorflow/lite/kernels:builtin_ops", "//tensorflow/lite/kernels:test_util", "//tensorflow/lite/kernels/internal:reference_base", @@ -73,7 +73,7 @@ cc_test( deps = [ "//tensorflow/lite:framework", "//tensorflow/lite/c:common", - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", "//tensorflow/lite/kernels:builtin_ops", "//tensorflow/lite/kernels:kernel_util", "//tensorflow/lite/kernels:test_util", diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/README.md b/tensorflow/lite/delegates/hexagon/builders/tests/README.md similarity index 86% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/README.md rename to tensorflow/lite/delegates/hexagon/builders/tests/README.md index 6f615cc3cb6..ac9cdbd4177 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/README.md +++ b/tensorflow/lite/delegates/hexagon/builders/tests/README.md @@ -15,5 +15,5 @@ and download the hexagon_nn_skel and extract the files. For example if files are extracted in /tmp/hexagon_skel, the sample command. ` -bash tensorflow/lite/experimental/delegates/hexagon/builders/tests/run_tests.sh /tmp/hexagon_skel +bash tensorflow/lite/delegates/hexagon/builders/tests/run_tests.sh /tmp/hexagon_skel ` diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/activations_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/activations_test.cc similarity index 99% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/activations_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/activations_test.cc index 45698da7a17..a908910e209 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/activations_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/activations_test.cc @@ -18,7 +18,7 @@ limitations under the License. #include #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/arg_min_max_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/arg_min_max_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/arg_min_max_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/arg_min_max_test.cc index 7a878c98876..41fc6740f7f 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/arg_min_max_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/arg_min_max_test.cc @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ #include #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/arithmetic_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/arithmetic_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/arithmetic_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/arithmetic_test.cc index 9bd19eb137e..5aa20ebabf7 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/arithmetic_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/arithmetic_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" #include "tensorflow/lite/kernels/kernel_util.h" #include "tensorflow/lite/schema/schema_generated.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/batch_seq_config_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/batch_seq_config_test.cc similarity index 99% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/batch_seq_config_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/batch_seq_config_test.cc index 9217d088db0..db8cf88c72e 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/batch_seq_config_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/batch_seq_config_test.cc @@ -20,7 +20,7 @@ limitations under the License. #include "absl/flags/flag.h" #include "absl/flags/parse.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/interpreter_builder.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/concat_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/concat_test.cc similarity index 99% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/concat_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/concat_test.cc index be036323e10..c40e5c4d2f5 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/concat_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/concat_test.cc @@ -15,7 +15,7 @@ limitations under the License. #include #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/conv_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/conv_test.cc similarity index 99% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/conv_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/conv_test.cc index dc230f514ca..13fd768fded 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/conv_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/conv_test.cc @@ -16,7 +16,7 @@ limitations under the License. #include #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h b/tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h similarity index 88% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h rename to tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h index 9fd9dc69172..25b2d2bdc89 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h +++ b/tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TESTS_HEXAGON_DELEGATE_OP_MODEL_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TESTS_HEXAGON_DELEGATE_OP_MODEL_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TESTS_HEXAGON_DELEGATE_OP_MODEL_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TESTS_HEXAGON_DELEGATE_OP_MODEL_H_ #include #include #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" @@ -82,4 +82,4 @@ class SingleOpModelWithHexagon : public SingleOpModel { }; } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TESTS_HEXAGON_DELEGATE_OP_MODEL_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TESTS_HEXAGON_DELEGATE_OP_MODEL_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/l2_norm_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/l2_norm_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/l2_norm_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/l2_norm_test.cc index 34d53d6e68f..ffe7f56b1bf 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/l2_norm_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/l2_norm_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/matmul_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/matmul_test.cc similarity index 99% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/matmul_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/matmul_test.cc index 3b426b38da7..3c1fde2faf0 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/matmul_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/matmul_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" #include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/schema/schema_generated.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/min_max_builder_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/min_max_builder_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/min_max_builder_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/min_max_builder_test.cc index 315ea909c53..132fa0913e0 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/min_max_builder_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/min_max_builder_test.cc @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mirror_pad_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/mirror_pad_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/mirror_pad_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/mirror_pad_test.cc index 4caf96ac8ce..fa355e46cfd 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mirror_pad_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/mirror_pad_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mul_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/mul_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/mul_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/mul_test.cc index c0b2ea78815..a359ee8e451 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/mul_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/mul_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" #include "tensorflow/lite/schema/schema_generated.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/neg_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/neg_test.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/neg_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/neg_test.cc index fd3b9fdb404..b5ba8d13133 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/neg_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/neg_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/pack_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/pack_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/pack_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/pack_test.cc index 6f030575a01..ae68e97e86a 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/pack_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/pack_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/pad_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/pad_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/pad_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/pad_test.cc index a12a2d39463..cc66b71b783 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/pad_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/pad_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/pool_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/pool_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/pool_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/pool_test.cc index 6b0edd0f12d..18674bed4cb 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/pool_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/pool_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/quantize_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/quantize_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/quantize_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/quantize_test.cc index 93cd138f014..7e305308f8f 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/quantize_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/quantize_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/reduce_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/reduce_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/reduce_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/reduce_test.cc index a3cd8c8255b..5fed2005536 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/reduce_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/reduce_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/reshape_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/reshape_test.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/reshape_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/reshape_test.cc index a8bc9551411..817aa3d817f 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/reshape_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/reshape_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" #include "tensorflow/lite/kernels/reshape_test_common.h" #include "tensorflow/lite/schema/schema_generated.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/resize_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/resize_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/resize_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/resize_test.cc index 7164cb38b4c..a34c65d7d45 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/resize_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/resize_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/run_tests.sh b/tensorflow/lite/delegates/hexagon/builders/tests/run_tests.sh similarity index 82% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/run_tests.sh rename to tensorflow/lite/delegates/hexagon/builders/tests/run_tests.sh index b800cb9fd77..7c69e667776 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/run_tests.sh +++ b/tensorflow/lite/delegates/hexagon/builders/tests/run_tests.sh @@ -28,13 +28,13 @@ hexagon_libs_path="${hexagon_libs_path}/libhexagon_nn_skel*" adb shell rm -rf "${on_device_dir}" adb shell mkdir "${on_device_dir}" -bazel --bazelrc=/dev/null build -c opt --config=android_arm64 //tensorflow/lite/experimental/delegates/hexagon/builders/tests:all -bazel --bazelrc=/dev/null build -c opt --config=android_arm64 //tensorflow/lite/experimental/delegates/hexagon/hexagon_nn:libhexagon_interface.so +bazel --bazelrc=/dev/null build -c opt --config=android_arm64 //tensorflow/lite/delegates/hexagon/builders/tests:all +bazel --bazelrc=/dev/null build -c opt --config=android_arm64 //tensorflow/lite/delegates/hexagon/hexagon_nn:libhexagon_interface.so -adb push bazel-bin/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/libhexagon_interface.so "${on_device_dir}" +adb push bazel-bin/tensorflow/lite/delegates/hexagon/hexagon_nn/libhexagon_interface.so "${on_device_dir}" adb push ${hexagon_libs_path} "${on_device_dir}" -for test_binary in bazel-bin/tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_*_test; do +for test_binary in bazel-bin/tensorflow/lite/delegates/hexagon/builders/tests/hexagon_*_test; do echo "Copying $test_binary" adb push $test_binary "${on_device_dir}" IFS='/' diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/slice_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/slice_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/slice_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/slice_test.cc index 5b14a5d97d8..610da8d538e 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/slice_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/slice_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/softmax_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/softmax_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/softmax_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/softmax_test.cc index 094c5478997..5671784dc6f 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/softmax_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/softmax_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/space_to_depth_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/space_to_depth_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/space_to_depth_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/space_to_depth_test.cc index bb08b6d35dd..1082f4e8f06 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/space_to_depth_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/space_to_depth_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/split_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/split_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/split_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/split_test.cc index bdadf14adb2..a4e234004c9 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/split_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/split_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/strided_slice_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/strided_slice_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/strided_slice_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/strided_slice_test.cc index 8d62804ba8c..3e54b0480d7 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/strided_slice_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/strided_slice_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/tests.bzl b/tensorflow/lite/delegates/hexagon/builders/tests/tests.bzl similarity index 100% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/tests.bzl rename to tensorflow/lite/delegates/hexagon/builders/tests/tests.bzl diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/transpose_conv_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/transpose_conv_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/transpose_conv_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/transpose_conv_test.cc index 232d4bab4b2..c9a0f0eda00 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/transpose_conv_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/transpose_conv_test.cc @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ #include #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/transpose_test.cc b/tensorflow/lite/delegates/hexagon/builders/tests/transpose_test.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/tests/transpose_test.cc rename to tensorflow/lite/delegates/hexagon/builders/tests/transpose_test.cc index 3d790253a3b..07d10aca02e 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/tests/transpose_test.cc +++ b/tensorflow/lite/delegates/hexagon/builders/tests/transpose_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" +#include "tensorflow/lite/delegates/hexagon/builders/tests/hexagon_delegate_op_model.h" namespace tflite { using testing::ElementsAreArray; diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_builder.cc b/tensorflow/lite/delegates/hexagon/builders/transpose_builder.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/builders/transpose_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/transpose_builder.cc index 510f117cc11..9ad0262fbc2 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/transpose_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/hexagon/builders/transpose_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/transpose_builder.h" #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_builder.h b/tensorflow/lite/delegates/hexagon/builders/transpose_builder.h similarity index 80% rename from tensorflow/lite/experimental/delegates/hexagon/builders/transpose_builder.h rename to tensorflow/lite/delegates/hexagon/builders/transpose_builder.h index b28f4438419..5f99087b935 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/transpose_builder.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_BUILDER_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -40,4 +40,4 @@ class TransposeOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_conv_2d_builder.cc b/tensorflow/lite/delegates/hexagon/builders/transpose_conv_2d_builder.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/builders/transpose_conv_2d_builder.cc rename to tensorflow/lite/delegates/hexagon/builders/transpose_conv_2d_builder.cc index a6424979ea6..d7d700b2e77 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_conv_2d_builder.cc +++ b/tensorflow/lite/delegates/hexagon/builders/transpose_conv_2d_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/hexagon/builders/transpose_conv_2d_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/transpose_conv_2d_builder.h" #include #include #include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/kernel_util.h" #include "tensorflow/lite/kernels/padding.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_conv_2d_builder.h b/tensorflow/lite/delegates/hexagon/builders/transpose_conv_2d_builder.h similarity index 85% rename from tensorflow/lite/experimental/delegates/hexagon/builders/transpose_conv_2d_builder.h rename to tensorflow/lite/delegates/hexagon/builders/transpose_conv_2d_builder.h index f38f9a9693a..0a6a90a0297 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/builders/transpose_conv_2d_builder.h +++ b/tensorflow/lite/delegates/hexagon/builders/transpose_conv_2d_builder.h @@ -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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_CONV_2D_BUILDER_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_CONV_2D_BUILDER_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_CONV_2D_BUILDER_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_CONV_2D_BUILDER_H_ #include -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" namespace tflite { namespace delegates { @@ -60,4 +60,4 @@ class TransposeConv2dOpBuilder : public OpBuilder { } // namespace delegates } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_CONV_2D_BUILDER_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_BUILDERS_TRANSPOSE_CONV_2D_BUILDER_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.cc b/tensorflow/lite/delegates/hexagon/hexagon_delegate.cc similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.cc rename to tensorflow/lite/delegates/hexagon/hexagon_delegate.cc index c1b31135df0..8f689f8f357 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.cc +++ b/tensorflow/lite/delegates/hexagon/hexagon_delegate.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/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" #include #include @@ -21,9 +21,9 @@ limitations under the License. #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/context_util.h" #include "tensorflow/lite/delegates/utils.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate_kernel.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.h" -#include "tensorflow/lite/experimental/delegates/hexagon/utils.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_implementation.h" +#include "tensorflow/lite/delegates/hexagon/utils.h" #include "tensorflow/lite/minimal_logging.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h b/tensorflow/lite/delegates/hexagon/hexagon_delegate.h similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h rename to tensorflow/lite/delegates/hexagon/hexagon_delegate.h index 8838181aae7..264a132b995 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h +++ b/tensorflow/lite/delegates/hexagon/hexagon_delegate.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_DELEGATE_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_DELEGATE_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_DELEGATE_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_DELEGATE_H_ #include "tensorflow/lite/c/common.h" @@ -133,4 +133,4 @@ void TFL_CAPI_EXPORT TfLiteHexagonTearDown(); } #endif // __cplusplus -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_DELEGATE_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_DELEGATE_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate_kernel.cc b/tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.cc similarity index 98% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate_kernel.cc rename to tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.cc index e051e48ab94..63e2e850f20 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate_kernel.cc +++ b/tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.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/hexagon/hexagon_delegate_kernel.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.h" #include @@ -21,8 +21,8 @@ limitations under the License. #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/context_util.h" #include "tensorflow/lite/delegates/utils.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.h" -#include "tensorflow/lite/experimental/delegates/hexagon/utils.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_implementation.h" +#include "tensorflow/lite/delegates/hexagon/utils.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate_kernel.h b/tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.h similarity index 84% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate_kernel.h rename to tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.h index 87e2eeb5c60..2feec7be075 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate_kernel.h +++ b/tensorflow/lite/delegates/hexagon/hexagon_delegate_kernel.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_DELEGATE_KERNEL_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_DELEGATE_KERNEL_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_DELEGATE_KERNEL_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_DELEGATE_KERNEL_H_ #include @@ -27,10 +27,10 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/core/api/profiler.h" -#include "tensorflow/lite/experimental/delegates/hexagon/builders/op_builder.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/builders/op_builder.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_implementation.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" #include "tensorflow/lite/schema/schema_generated.h" namespace tflite { @@ -93,4 +93,4 @@ class HexagonDelegateKernel { } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_DELEGATE_KERNEL_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_DELEGATE_KERNEL_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.cc b/tensorflow/lite/delegates/hexagon/hexagon_implementation.cc similarity index 95% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.cc rename to tensorflow/lite/delegates/hexagon/hexagon_implementation.cc index 3cf64496e00..7149ebe59a2 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.cc +++ b/tensorflow/lite/delegates/hexagon/hexagon_implementation.cc @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_implementation.h" #include #include #include -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn_interface.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn_interface.h" #include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/minimal_logging.h" diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.h b/tensorflow/lite/delegates/hexagon/hexagon_implementation.h similarity index 94% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.h rename to tensorflow/lite/delegates/hexagon/hexagon_implementation.h index fb81a650205..c65d93657d9 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_implementation.h +++ b/tensorflow/lite/delegates/hexagon/hexagon_implementation.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_IMPLEMENTATION_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_IMPLEMENTATION_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_IMPLEMENTATION_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_IMPLEMENTATION_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn_interface.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn_interface.h" namespace tflite { // Holds the methods to use to Construct/Execute NN graph using Hexagon NNLib. @@ -139,4 +139,4 @@ const HexagonNN* HexagonNNImplementation(); } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_IMPLEMENTATION_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_IMPLEMENTATION_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/BUILD b/tensorflow/lite/delegates/hexagon/hexagon_nn/BUILD similarity index 100% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/BUILD rename to tensorflow/lite/delegates/hexagon/hexagon_nn/BUILD diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h b/tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h similarity index 68% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h rename to tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h index 31770fbbad5..2d7e37da157 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h +++ b/tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_H_ #include "hexagon/hexagon_nn.h" -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn_init.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn_init.h" -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn_init.h b/tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn_init.h similarity index 77% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn_init.h rename to tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn_init.h index d142edd4d03..370f36fb605 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn_init.h +++ b/tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn_init.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_INIT_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_INIT_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_INIT_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_INIT_H_ #ifdef __cplusplus extern "C" { @@ -25,4 +25,4 @@ int hexagon_nn_hexagon_interface_version(void); #ifdef __cplusplus } #endif -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_INIT_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_HEXAGON_NN_INIT_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/version_scripts.lds b/tensorflow/lite/delegates/hexagon/hexagon_nn/version_scripts.lds similarity index 100% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/version_scripts.lds rename to tensorflow/lite/delegates/hexagon/hexagon_nn/version_scripts.lds diff --git a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn_interface.h b/tensorflow/lite/delegates/hexagon/hexagon_nn_interface.h similarity index 86% rename from tensorflow/lite/experimental/delegates/hexagon/hexagon_nn_interface.h rename to tensorflow/lite/delegates/hexagon/hexagon_nn_interface.h index cfb61a59182..9942b9db53f 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn_interface.h +++ b/tensorflow/lite/delegates/hexagon/hexagon_nn_interface.h @@ -12,10 +12,10 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_INTERFACE_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_INTERFACE_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_INTERFACE_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_INTERFACE_H_ -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/hexagon_nn.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_nn/hexagon_nn.h" using hexagon_nn_config_fn = decltype(hexagon_nn_config); using hexagon_nn_init_fn = decltype(hexagon_nn_init); @@ -59,4 +59,4 @@ using hexagon_nn_version_fn = decltype(hexagon_nn_version); using hexagon_nn_hexagon_interface_version_fn = decltype(hexagon_nn_hexagon_interface_version); -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_HEXAGON_NN_INTERFACE_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_HEXAGON_NN_INTERFACE_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/java/AndroidManifest.xml b/tensorflow/lite/delegates/hexagon/java/AndroidManifest.xml similarity index 100% rename from tensorflow/lite/experimental/delegates/hexagon/java/AndroidManifest.xml rename to tensorflow/lite/delegates/hexagon/java/AndroidManifest.xml diff --git a/tensorflow/lite/experimental/delegates/hexagon/java/BUILD b/tensorflow/lite/delegates/hexagon/java/BUILD similarity index 79% rename from tensorflow/lite/experimental/delegates/hexagon/java/BUILD rename to tensorflow/lite/delegates/hexagon/java/BUILD index 0502c0f822e..b86d73135d3 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/java/BUILD +++ b/tensorflow/lite/delegates/hexagon/java/BUILD @@ -11,14 +11,14 @@ package( # The Hexagon backend-related targets are intentionally not included in BUILD.bazel. tflite_jni_binary( name = "libtensorflowlite_hexagon_jni.so", - linkscript = "//tensorflow/lite/experimental/delegates/hexagon:version_script.lds", + linkscript = "//tensorflow/lite/delegates/hexagon:version_script.lds", tags = [ "manual", "nobuilder", "notap", ], deps = [ - "//tensorflow/lite/experimental/delegates/hexagon/java/src/main/native", + "//tensorflow/lite/delegates/hexagon/java/src/main/native", ], ) @@ -40,7 +40,7 @@ cc_library( android_library( name = "tensorflowlite_java_hexagon", - srcs = ["//tensorflow/lite/experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental:hexagon_delegate"], + srcs = ["//tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite:hexagon_delegate"], manifest = "AndroidManifest.xml", proguard_specs = ["proguard.flags"], tags = [ @@ -58,5 +58,5 @@ android_library( aar_with_jni( name = "tensorflow-lite-hexagon", android_library = ":tensorflowlite_java_hexagon", - headers = ["//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate.h"], + headers = ["//tensorflow/lite/delegates/hexagon:hexagon_delegate.h"], ) diff --git a/tensorflow/lite/experimental/delegates/hexagon/java/proguard.flags b/tensorflow/lite/delegates/hexagon/java/proguard.flags similarity index 100% rename from tensorflow/lite/experimental/delegates/hexagon/java/proguard.flags rename to tensorflow/lite/delegates/hexagon/java/proguard.flags diff --git a/tensorflow/lite/experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental/BUILD b/tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/BUILD similarity index 100% rename from tensorflow/lite/experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental/BUILD rename to tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/BUILD diff --git a/tensorflow/lite/experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental/HexagonDelegate.java b/tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/HexagonDelegate.java similarity index 96% rename from tensorflow/lite/experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental/HexagonDelegate.java rename to tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/HexagonDelegate.java index 2139a7f445a..2d8017dc453 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/java/src/main/java/org/tensorflow/lite/experimental/HexagonDelegate.java +++ b/tensorflow/lite/delegates/hexagon/java/src/main/java/org/tensorflow/lite/HexagonDelegate.java @@ -12,11 +12,10 @@ 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. ==============================================================================*/ -package org.tensorflow.lite.experimental; +package org.tensorflow.lite; import android.content.Context; import java.io.Closeable; -import org.tensorflow.lite.Delegate; /** {@link Delegate} for Hexagon inference. */ public class HexagonDelegate implements Delegate, Closeable { diff --git a/tensorflow/lite/experimental/delegates/hexagon/java/src/main/native/BUILD b/tensorflow/lite/delegates/hexagon/java/src/main/native/BUILD similarity index 74% rename from tensorflow/lite/experimental/delegates/hexagon/java/src/main/native/BUILD rename to tensorflow/lite/delegates/hexagon/java/src/main/native/BUILD index fa0ee8a8897..d92dbef4ec4 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/java/src/main/native/BUILD +++ b/tensorflow/lite/delegates/hexagon/java/src/main/native/BUILD @@ -2,7 +2,7 @@ # Java Native Interface (JNI) library intended for implementing the # TensorFlow Lite Hexagon delegate Java API using the TensorFlow Lite CC library. -package(default_visibility = ["//tensorflow/lite/experimental/delegates/hexagon/java:__subpackages__"]) +package(default_visibility = ["//tensorflow/lite/delegates/hexagon/java:__subpackages__"]) load("//tensorflow/lite:build_def.bzl", "tflite_copts") @@ -18,7 +18,7 @@ cc_library( "notap", ], deps = [ - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", "//tensorflow/lite/java/jni", ], alwayslink = 1, diff --git a/tensorflow/lite/experimental/delegates/hexagon/java/src/main/native/hexagon_delegate_jni.cc b/tensorflow/lite/delegates/hexagon/java/src/main/native/hexagon_delegate_jni.cc similarity index 85% rename from tensorflow/lite/experimental/delegates/hexagon/java/src/main/native/hexagon_delegate_jni.cc rename to tensorflow/lite/delegates/hexagon/java/src/main/native/hexagon_delegate_jni.cc index e5bfce314e3..387ccb21ed3 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/java/src/main/native/hexagon_delegate_jni.cc +++ b/tensorflow/lite/delegates/hexagon/java/src/main/native/hexagon_delegate_jni.cc @@ -16,14 +16,14 @@ limitations under the License. #include -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" #ifdef __cplusplus extern "C" { #endif JNIEXPORT jlong JNICALL -Java_org_tensorflow_lite_experimental_HexagonDelegate_createDelegate( +Java_org_tensorflow_lite_HexagonDelegate_createDelegate( JNIEnv* env, jclass clazz) { // Auto-choosing the best performing config for closed release. TfLiteHexagonDelegateOptions options = {0}; @@ -32,14 +32,14 @@ Java_org_tensorflow_lite_experimental_HexagonDelegate_createDelegate( } JNIEXPORT void JNICALL -Java_org_tensorflow_lite_experimental_HexagonDelegate_deleteDelegate( +Java_org_tensorflow_lite_HexagonDelegate_deleteDelegate( JNIEnv* env, jclass clazz, jlong delegate) { TfLiteHexagonDelegateDelete(reinterpret_cast(delegate)); TfLiteHexagonTearDown(); } JNIEXPORT jboolean JNICALL -Java_org_tensorflow_lite_experimental_HexagonDelegate_setAdspLibraryPath( +Java_org_tensorflow_lite_HexagonDelegate_setAdspLibraryPath( JNIEnv* env, jclass clazz, jstring native_lib_path) { const char* lib_dir_path = env->GetStringUTFChars(native_lib_path, nullptr); std::stringstream path; diff --git a/tensorflow/lite/experimental/delegates/hexagon/utils.cc b/tensorflow/lite/delegates/hexagon/utils.cc similarity index 99% rename from tensorflow/lite/experimental/delegates/hexagon/utils.cc rename to tensorflow/lite/delegates/hexagon/utils.cc index fa3724715fb..9253836a3b1 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/utils.cc +++ b/tensorflow/lite/delegates/hexagon/utils.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/hexagon/utils.h" +#include "tensorflow/lite/delegates/hexagon/utils.h" #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/utils.h b/tensorflow/lite/delegates/hexagon/utils.h similarity index 88% rename from tensorflow/lite/experimental/delegates/hexagon/utils.h rename to tensorflow/lite/delegates/hexagon/utils.h index 0438b37e7c2..54ef2056e93 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/utils.h +++ b/tensorflow/lite/delegates/hexagon/utils.h @@ -12,8 +12,8 @@ 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. ==============================================================================*/ -#ifndef TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_UTILS_H_ -#define TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_UTILS_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_HEXAGON_UTILS_H_ +#define TENSORFLOW_LITE_DELEGATES_HEXAGON_UTILS_H_ #include "tensorflow/lite/c/common.h" @@ -35,4 +35,4 @@ bool IsNodeSupportedByHexagon(const TfLiteRegistration* registration, } // namespace tflite -#endif // TENSORFLOW_LITE_EXPERIMENTAL_DELEGATES_HEXAGON_UTILS_H_ +#endif // TENSORFLOW_LITE_DELEGATES_HEXAGON_UTILS_H_ diff --git a/tensorflow/lite/experimental/delegates/hexagon/utils_test.cc b/tensorflow/lite/delegates/hexagon/utils_test.cc similarity index 97% rename from tensorflow/lite/experimental/delegates/hexagon/utils_test.cc rename to tensorflow/lite/delegates/hexagon/utils_test.cc index 514912e3947..da46fe674a5 100644 --- a/tensorflow/lite/experimental/delegates/hexagon/utils_test.cc +++ b/tensorflow/lite/delegates/hexagon/utils_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/hexagon/utils.h" +#include "tensorflow/lite/delegates/hexagon/utils.h" #include #include diff --git a/tensorflow/lite/experimental/delegates/hexagon/version_script.lds b/tensorflow/lite/delegates/hexagon/version_script.lds similarity index 100% rename from tensorflow/lite/experimental/delegates/hexagon/version_script.lds rename to tensorflow/lite/delegates/hexagon/version_script.lds diff --git a/tensorflow/lite/examples/label_image/BUILD b/tensorflow/lite/examples/label_image/BUILD index 92bb503e6d2..01296b0b2a0 100644 --- a/tensorflow/lite/examples/label_image/BUILD +++ b/tensorflow/lite/examples/label_image/BUILD @@ -41,11 +41,11 @@ cc_binary( ] + select({ "//tensorflow:android": [ "//tensorflow/lite/delegates/gpu:delegate", - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//tensorflow:android_arm64": [ "//tensorflow/lite/delegates/gpu:delegate", - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//conditions:default": [], }), @@ -69,11 +69,11 @@ cc_library( ] + select({ "//tensorflow:android": [ "//tensorflow/lite/delegates/gpu:delegate", - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//tensorflow:android_arm64": [ "//tensorflow/lite/delegates/gpu:delegate", - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//conditions:default": [], }), diff --git a/tensorflow/lite/g3doc/performance/hexagon_delegate.md b/tensorflow/lite/g3doc/performance/hexagon_delegate.md index 9d5abe01620..30d108d6990 100644 --- a/tensorflow/lite/g3doc/performance/hexagon_delegate.md +++ b/tensorflow/lite/g3doc/performance/hexagon_delegate.md @@ -97,7 +97,7 @@ will need to add the Hexagon shared libs to both 32 and 64-bit lib folders. #### Step 3. Create a delegate and initialize a TensorFlow Lite Interpreter ```java -import org.tensorflow.lite.experimental.HexagonDelegate; +import org.tensorflow.lite.HexagonDelegate; // Create the Delegate instance. try { @@ -202,7 +202,7 @@ will need to add the Hexagon shared libs to both 32 and 64-bit lib folders. #### Step 3. Include the C header * The header file "hexagon_delegate.h" can be downloaded from - [GitHub](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h) + [GitHub](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/delegates/hexagon/hexagon_delegate.h) or extracted from the Hexagon delegate AAR. #### Step 4. Create a delegate and initialize a TensorFlow Lite Interpreter @@ -214,7 +214,7 @@ will need to add the Hexagon shared libs to both 32 and 64-bit lib folders. * Create a delegate, example: ```c -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" // Assuming shared libraries are under "/data/local/tmp/" // If files are packaged with native lib in android App then it @@ -260,7 +260,7 @@ ro.board.platform`). * Which ops are supported by the delegate? * See the current list of - [supported ops and constraints](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/experimental/delegates/hexagon/README.md) + [supported ops and constraints](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/delegates/hexagon/README.md) * How can I tell that the model is using the DSP when I enable the delegate? * Two log messages will be printed when you enable the delegate - one to indicate if the delegate was created and another to indicate how many @@ -272,7 +272,7 @@ ro.board.platform`). ops. Any unsupported ops will run on the CPU. * How can I build the Hexagon delegate AAR from source? * Use `bazel build -c opt --config=android_arm64 - tensorflow/lite/experimental/delegates/hexagon/java:tensorflow-lite-hexagon`. + tensorflow/lite/delegates/hexagon/java:tensorflow-lite-hexagon`. * Why does Hexagon delegate fail to initialize although my Android device has a supported SoC? * Verify if your device indeed has a supported SoC. Run `adb shell cat diff --git a/tensorflow/lite/tools/benchmark/README.md b/tensorflow/lite/tools/benchmark/README.md index ae7e4ae150d..a43383cff9d 100644 --- a/tensorflow/lite/tools/benchmark/README.md +++ b/tensorflow/lite/tools/benchmark/README.md @@ -133,8 +133,8 @@ That step is only needed when using the Hexagon delegate. ``` bazel build --config=android_arm64 \ - tensorflow/lite/experimental/delegates/hexagon/hexagon_nn:libhexagon_interface.so -adb push bazel-bin/tensorflow/lite/experimental/delegates/hexagon/hexagon_nn/libhexagon_interface.so /data/local/tmp + tensorflow/lite/delegates/hexagon/hexagon_nn:libhexagon_interface.so +adb push bazel-bin/tensorflow/lite/delegates/hexagon/hexagon_nn/libhexagon_interface.so /data/local/tmp adb push libhexagon_nn_skel*.so /data/local/tmp ``` diff --git a/tensorflow/lite/tools/delegates/BUILD b/tensorflow/lite/tools/delegates/BUILD index 9f2108d07d6..93b918d37b1 100644 --- a/tensorflow/lite/tools/delegates/BUILD +++ b/tensorflow/lite/tools/delegates/BUILD @@ -95,10 +95,10 @@ cc_library( "//tensorflow/lite/tools/evaluation:utils", ] + select({ "//tensorflow:android_arm": [ - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//tensorflow:android_arm64": [ - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//conditions:default": [], }), diff --git a/tensorflow/lite/tools/delegates/hexagon_delegate_provider.cc b/tensorflow/lite/tools/delegates/hexagon_delegate_provider.cc index 0afb0b28b3f..002246df6e4 100644 --- a/tensorflow/lite/tools/delegates/hexagon_delegate_provider.cc +++ b/tensorflow/lite/tools/delegates/hexagon_delegate_provider.cc @@ -23,7 +23,7 @@ limitations under the License. #endif #if defined(TFLITE_ENABLE_HEXAGON) -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" #endif namespace tflite { diff --git a/tensorflow/lite/tools/evaluation/BUILD b/tensorflow/lite/tools/evaluation/BUILD index f6d2c8d8141..85dfb183254 100644 --- a/tensorflow/lite/tools/evaluation/BUILD +++ b/tensorflow/lite/tools/evaluation/BUILD @@ -49,10 +49,10 @@ cc_library( "//conditions:default": [], }) + select({ "//tensorflow:android_arm": [ - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//tensorflow:android_arm64": [ - "//tensorflow/lite/experimental/delegates/hexagon:hexagon_delegate", + "//tensorflow/lite/delegates/hexagon:hexagon_delegate", ], "//conditions:default": [], }) + select({ diff --git a/tensorflow/lite/tools/evaluation/utils.h b/tensorflow/lite/tools/evaluation/utils.h index 7269d04a802..5d9920cf22b 100644 --- a/tensorflow/lite/tools/evaluation/utils.h +++ b/tensorflow/lite/tools/evaluation/utils.h @@ -25,7 +25,7 @@ limitations under the License. #include "tensorflow/lite/delegates/gpu/delegate.h" #include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h" #if (defined(__arm__) || defined(__aarch64__)) -#include "tensorflow/lite/experimental/delegates/hexagon/hexagon_delegate.h" +#include "tensorflow/lite/delegates/hexagon/hexagon_delegate.h" #endif #endif