From 61c6c84964b4aec80aeace187aab8cb2c3e55a72 Mon Sep 17 00:00:00 2001 From: Austin Anderson Date: Wed, 31 Oct 2018 14:16:59 -0700 Subject: [PATCH] Migrate TensorFlow Lite out of tensorflow/contrib This change moves //tensorflow/contrib/lite to //tensorflow/lite in preparation for TensorFlow 2.0's deprecation of contrib/. If you refer to TF Lite build targets or headers, you will need to update them manually. If you use TF Lite from the TensorFlow python package, "tf.contrib.lite" now points to "tf.lite". Please update your imports as soon as possible. For more details, see https://groups.google.com/a/tensorflow.org/forum/#!topic/tflite/iIIXOTOFvwQ @angersson and @aselle are conducting this migration. Please contact them if you have any further questions. PiperOrigin-RevId: 219536476 --- .gitignore | 8 +- RELEASE.md | 8 +- tensorflow/contrib/cmake/python_modules.txt | 8 +- tensorflow/contrib/cmake/python_protos.txt | 2 +- tensorflow/contrib/cmake/tf_python.cmake | 8 +- .../lite/experimental/micro/kernels/BUILD | 107 ----- tensorflow/contrib/lite/python/BUILD | 182 +------- tensorflow/contrib/lite/python/__init__.py | 26 ++ tensorflow/contrib/makefile/Makefile | 42 +- .../contrib/makefile/build_all_android.sh | 2 +- tensorflow/contrib/makefile/build_all_ios.sh | 2 +- tensorflow/contrib/quantize/README.md | 2 +- tensorflow/core/util/ctc/ctc_beam_entry.h | 2 +- tensorflow/core/util/ctc/ctc_beam_scorer.h | 2 +- tensorflow/core/util/ctc/ctc_beam_search.h | 2 +- tensorflow/core/util/ctc/ctc_decoder.h | 2 +- tensorflow/core/util/ctc/ctc_loss_util.h | 2 +- tensorflow/{contrib => }/lite/BUILD | 74 ++-- tensorflow/{contrib => }/lite/README.md | 2 +- tensorflow/{contrib => }/lite/allocation.cc | 6 +- tensorflow/{contrib => }/lite/allocation.h | 14 +- .../{contrib => }/lite/arena_planner.cc | 2 +- tensorflow/{contrib => }/lite/arena_planner.h | 14 +- .../{contrib => }/lite/arena_planner_test.cc | 4 +- tensorflow/{contrib => }/lite/build_def.bzl | 22 +- .../{contrib => }/lite/builtin_op_data.h | 8 +- tensorflow/{contrib => }/lite/builtin_ops.h | 6 +- tensorflow/{contrib => }/lite/c/BUILD | 1 + .../{contrib => }/lite/c/builtin_op_data.h | 8 +- .../lite/c/builtin_op_data_test.cc | 2 +- .../{contrib => }/lite/c/c_api_internal.c | 2 +- .../{contrib => }/lite/c/c_api_internal.h | 6 +- .../lite/c/c_api_internal_test.cc | 2 +- tensorflow/{contrib => }/lite/context.h | 8 +- tensorflow/{contrib => }/lite/context_util.h | 8 +- tensorflow/{contrib => }/lite/core/api/BUILD | 8 +- .../lite/core/api/error_reporter.cc | 2 +- .../lite/core/api/error_reporter.h | 6 +- .../lite/core/api/error_reporter_test.cc | 2 +- .../lite/core/api/flatbuffer_conversions.cc | 4 +- .../lite/core/api/flatbuffer_conversions.h | 14 +- .../core/api/flatbuffer_conversions_test.cc | 4 +- .../lite/core/api/op_resolver.cc | 2 +- .../{contrib => }/lite/core/api/op_resolver.h | 12 +- .../lite/core/api/op_resolver_test.cc | 2 +- .../{contrib => }/lite/delegates/flex/BUILD | 50 +-- .../lite/delegates/flex/buffer_map.cc | 8 +- .../lite/delegates/flex/buffer_map.h | 8 +- .../lite/delegates/flex/buffer_map_test.cc | 10 +- .../lite/delegates/flex/delegate.cc | 12 +- .../lite/delegates/flex/delegate.h | 10 +- .../lite/delegates/flex/delegate_data.cc | 2 +- .../lite/delegates/flex/delegate_data.h | 8 +- .../lite/delegates/flex/delegate_data_test.cc | 6 +- .../lite/delegates/flex/delegate_test.cc | 4 +- .../lite/delegates/flex/kernel.cc | 16 +- .../lite/delegates/flex/kernel.h | 8 +- .../lite/delegates/flex/kernel_test.cc | 6 +- .../lite/delegates/flex/test_util.cc | 4 +- .../lite/delegates/flex/test_util.h | 8 +- .../{contrib => }/lite/delegates/flex/util.cc | 2 +- .../{contrib => }/lite/delegates/flex/util.h | 8 +- .../lite/delegates/flex/util_test.cc | 6 +- .../{contrib => }/lite/delegates/nnapi/BUILD | 16 +- .../lite/delegates/nnapi/nnapi_delegate.cc | 16 +- .../lite/delegates/nnapi/nnapi_delegate.h | 8 +- .../delegates/nnapi/nnapi_delegate_test.cc | 8 +- .../{contrib => }/lite/error_reporter.h | 10 +- .../{contrib => }/lite/examples/android/BUILD | 10 +- .../lite/examples/android/android.iml | 0 .../lite/examples/android/app/README.md | 4 +- .../lite/examples/android/app/build.gradle | 0 .../android/app/download-models.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 0 .../android/app/src/main/assets/BUILD | 0 .../app/src/main/assets/box_priors.txt | 0 .../app/src/main/assets/coco_labels_list.txt | 0 .../src/main/assets/conv_actions_labels.txt | 0 .../assets/labels_mobilenet_quant_v1_224.txt | 0 .../app/src/main/assets/pets_labels_list.txt | 0 .../tensorflow/demo/AutoFitTextureView.java | 0 .../org/tensorflow/demo/CameraActivity.java | 0 .../demo/CameraConnectionFragment.java | 0 .../java/org/tensorflow/demo/Classifier.java | 0 .../tensorflow/demo/ClassifierActivity.java | 0 .../org/tensorflow/demo/DetectorActivity.java | 0 .../demo/LegacyCameraConnectionFragment.java | 0 .../java/org/tensorflow/demo/OverlayView.java | 0 .../tensorflow/demo/RecognitionScoreView.java | 0 .../tensorflow/demo/RecognizeCommands.java | 0 .../java/org/tensorflow/demo/ResultsView.java | 0 .../org/tensorflow/demo/SpeechActivity.java | 0 .../demo/TFLiteImageClassifier.java | 0 .../demo/TFLiteObjectDetectionAPIModel.java | 0 .../org/tensorflow/demo/env/AssetUtils.java | 0 .../org/tensorflow/demo/env/BorderedText.java | 0 .../org/tensorflow/demo/env/ImageUtils.java | 0 .../java/org/tensorflow/demo/env/Logger.java | 0 .../java/org/tensorflow/demo/env/Size.java | 0 .../org/tensorflow/demo/env/SplitTimer.java | 0 .../demo/tracking/MultiBoxTracker.java | 0 .../demo/tracking/ObjectTracker.java | 0 .../src/main/res/animator/color_animation.xml | 0 .../main/res/drawable-hdpi/ic_action_info.png | Bin .../main/res/drawable-hdpi/ic_launcher.png | Bin .../app/src/main/res/drawable-hdpi/tile.9.png | Bin .../main/res/drawable-mdpi/ic_action_info.png | Bin .../main/res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/ic_action_info.png | Bin .../main/res/drawable-xhdpi/ic_launcher.png | Bin .../res/drawable-xxhdpi/ic_action_info.png | Bin .../main/res/drawable-xxhdpi/ic_launcher.png | Bin .../app/src/main/res/drawable/border.xml | 0 .../src/main/res/layout/activity_camera.xml | 0 .../src/main/res/layout/activity_speech.xml | 0 .../res/layout/camera_connection_fragment.xml | 0 .../camera_connection_fragment_stylize.xml | 0 .../camera_connection_fragment_tracking.xml | 0 .../src/main/res/layout/list_text_item.xml | 0 .../res/values-sw600dp/template-dimens.xml | 0 .../res/values-sw600dp/template-styles.xml | 0 .../app/src/main/res/values-v11/styles.xml | 0 .../main/res/values-v11/template-styles.xml | 0 .../app/src/main/res/values-v14/styles.xml | 0 .../src/main/res/values-v21/base-colors.xml | 0 .../res/values-v21/base-template-styles.xml | 0 .../android/app/src/main/res/values/attrs.xml | 0 .../app/src/main/res/values/base-strings.xml | 0 .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../src/main/res/values/template-dimens.xml | 0 .../src/main/res/values/template-styles.xml | 0 .../lite/examples/android/build.gradle | 0 .../lite/examples/android/settings.gradle | 0 .../lite/examples/ios/camera/.gitignore | 0 .../ios/camera/CameraExampleAppDelegate.h | 0 .../ios/camera/CameraExampleAppDelegate.m | 0 .../ios/camera/CameraExampleViewController.h | 4 +- .../ios/camera/CameraExampleViewController.mm | 8 +- .../lite/examples/ios/camera/Info.plist | 0 .../camera/MainStoryboard_iPhone.storyboard | 0 .../lite/examples/ios/camera/Podfile | 0 .../lite/examples/ios/camera/README.md | 0 .../lite/examples/ios/camera/data/.gitignore | 0 .../lite/examples/ios/camera/main.mm | 0 .../project.pbxproj | 0 .../project.pbxproj | 0 .../lite/examples/ios/download_models.sh | 0 .../lite/examples/ios/simple/AppDelegate.h | 0 .../lite/examples/ios/simple/AppDelegate.mm | 0 .../lite/examples/ios/simple/Podfile | 0 .../examples/ios/simple/RunModel-Info.plist | 0 .../ios/simple/RunModelViewController.h | 0 .../ios/simple/RunModelViewController.mm | 8 +- .../ios/simple/RunModelViewController.xib | 0 .../examples/ios/simple/data/grace_hopper.jpg | Bin .../lite/examples/ios/simple/ios_image_load.h | 6 +- .../examples/ios/simple/ios_image_load.mm | 0 .../lite/examples/ios/simple/main.mm | 0 .../simple/simple.xcodeproj/project.pbxproj | 0 .../lite/examples/label_image/BUILD | 22 +- .../examples/label_image/bitmap_helpers.cc | 2 +- .../examples/label_image/bitmap_helpers.h | 10 +- .../label_image/bitmap_helpers_impl.h | 18 +- .../lite/examples/label_image/get_top_n.h | 8 +- .../examples/label_image/get_top_n_impl.h | 6 +- .../lite/examples/label_image/label_image.cc | 12 +- .../lite/examples/label_image/label_image.h | 8 +- .../lite/examples/label_image/label_image.md | 10 +- .../examples/label_image/label_image_test.cc | 8 +- .../label_image/testdata/grace_hopper.bmp | Bin .../{contrib => }/lite/examples/minimal/BUILD | 6 +- .../lite/examples/minimal/minimal.cc | 8 +- .../{contrib => }/lite/examples/python/BUILD | 2 +- .../lite/examples/python/label_image.md | 6 +- .../lite/examples/python/label_image.py | 2 +- .../{contrib => }/lite/experimental/c/BUILD | 40 +- .../lite/experimental/c/c_api.cc | 16 +- .../{contrib => }/lite/experimental/c/c_api.h | 8 +- .../lite/experimental/c/c_api_experimental.cc | 4 +- .../lite/experimental/c/c_api_experimental.h | 10 +- .../experimental/c/c_api_experimental_test.cc | 10 +- .../lite/experimental/c/c_api_internal.h | 14 +- .../lite/experimental/c/c_api_test.cc | 12 +- .../lite/experimental/c/exported_symbols.lds | 0 .../lite/experimental/c/version_script.lds | 0 .../lite/experimental/examples/lstm/BUILD | 4 +- .../experimental/examples/lstm/tflite_lstm.py | 2 +- .../lstm/unidirectional_sequence_lstm_test.py | 8 +- .../unity/TensorFlowLitePlugin/.gitignore | 0 .../Assets/TensorFlowLite.meta | 0 .../Assets/TensorFlowLite/Examples.meta | 0 .../TensorFlowLite/Examples/HelloTFLite.meta | 0 .../Examples/HelloTFLite/Scenes.meta | 0 .../HelloTFLite/Scenes/HelloTFLite.unity | 0 .../HelloTFLite/Scenes/HelloTFLite.unity.meta | 0 .../Examples/HelloTFLite/Scenes/add.bytes | Bin .../HelloTFLite/Scenes/add.bytes.meta | 0 .../Examples/HelloTFLite/Scripts.meta | 0 .../HelloTFLite/Scripts/HelloTFLite.cs | 0 .../HelloTFLite/Scripts/HelloTFLite.cs.meta | 0 .../Assets/TensorFlowLite/SDK.meta | 0 .../Assets/TensorFlowLite/SDK/Scripts.meta | 0 .../TensorFlowLite/SDK/Scripts/Interpreter.cs | 0 .../SDK/Scripts/Interpreter.cs.meta | 0 .../ProjectSettings/AudioManager.asset | 0 .../ProjectSettings/ClusterInputManager.asset | 0 .../ProjectSettings/DynamicsManager.asset | 0 .../ProjectSettings/EditorBuildSettings.asset | 0 .../ProjectSettings/EditorSettings.asset | 0 .../ProjectSettings/GraphicsSettings.asset | 0 .../ProjectSettings/InputManager.asset | 0 .../ProjectSettings/NavMeshAreas.asset | 0 .../ProjectSettings/NetworkManager.asset | 0 .../ProjectSettings/Physics2DSettings.asset | 0 .../ProjectSettings/ProjectSettings.asset | 0 .../ProjectSettings/ProjectVersion.txt | 0 .../ProjectSettings/QualitySettings.asset | 0 .../ProjectSettings/TagManager.asset | 0 .../ProjectSettings/TimeManager.asset | 0 .../UnityConnectSettings.asset | 0 .../unity/TensorFlowLitePlugin/README.md | 4 +- .../UnityPackageManager/manifest.json | 0 .../lite/experimental/kernels/BUILD | 42 +- .../experimental/kernels/ctc_beam_entry.h | 8 +- .../experimental/kernels/ctc_beam_scorer.h | 8 +- .../experimental/kernels/ctc_beam_search.h | 18 +- .../kernels/ctc_beam_search_decoder.cc | 12 +- .../kernels/ctc_beam_search_decoder_test.cc | 8 +- .../lite/experimental/kernels/ctc_decoder.h | 6 +- .../lite/experimental/kernels/ctc_loss_util.h | 6 +- .../lite/experimental/kernels/top_n.h | 8 +- .../lite/experimental/micro/BUILD | 16 +- .../lite/experimental/micro/README.md | 18 +- .../lite/experimental/micro/compatibility.h | 6 +- .../micro/examples/micro_speech/BUILD | 20 +- .../micro/examples/micro_speech/README.md | 14 +- .../micro_speech/micro_speech_test.cc | 18 +- .../micro_speech/no_30ms_sample_data.cc | 2 +- .../micro_speech/no_30ms_sample_data.h | 6 +- .../examples/micro_speech/no_features_data.cc | 2 +- .../examples/micro_speech/no_features_data.h | 6 +- .../micro_speech/no_power_spectrum_data.cc | 2 +- .../micro_speech/no_power_spectrum_data.h | 6 +- .../examples/micro_speech/preprocessor.cc | 2 +- .../examples/micro_speech/preprocessor.h | 10 +- .../micro_speech/preprocessor_test.cc | 16 +- .../micro_speech/tiny_conv_model_data.cc | 2 +- .../micro_speech/tiny_conv_model_data.h | 6 +- .../micro_speech/yes_30ms_sample_data.cc | 2 +- .../micro_speech/yes_30ms_sample_data.h | 6 +- .../micro_speech/yes_features_data.cc | 2 +- .../examples/micro_speech/yes_features_data.h | 6 +- .../micro_speech/yes_power_spectrum_data.cc | 2 +- .../micro_speech/yes_power_spectrum_data.h | 6 +- .../lite/experimental/micro/kernels/BUILD | 107 +++++ .../micro/kernels/all_ops_resolver.cc | 2 +- .../micro/kernels/all_ops_resolver.h | 10 +- .../micro/kernels/depthwise_conv.cc | 20 +- .../micro/kernels/depthwise_conv_test.cc | 12 +- .../micro/kernels/fully_connected.cc | 14 +- .../micro/kernels/fully_connected_test.cc | 12 +- .../experimental/micro/kernels/softmax.cc | 16 +- .../micro/kernels/softmax_test.cc | 12 +- .../experimental/micro/kernels/test_utils.h | 16 +- .../micro/micro_error_reporter.cc | 2 +- .../experimental/micro/micro_error_reporter.h | 10 +- .../micro/micro_error_reporter_test.cc | 2 +- .../experimental/micro/micro_interpreter.cc | 6 +- .../experimental/micro/micro_interpreter.h | 16 +- .../micro/micro_interpreter_test.cc | 4 +- .../micro/micro_mutable_op_resolver.cc | 2 +- .../micro/micro_mutable_op_resolver.h | 10 +- .../micro/micro_mutable_op_resolver_test.cc | 4 +- .../micro/simple_tensor_allocator.cc | 4 +- .../micro/simple_tensor_allocator.h | 12 +- .../micro/simple_tensor_allocator_test.cc | 4 +- .../lite/experimental/micro/testing/BUILD | 2 +- .../micro/testing/Dockerfile.bluepill | 0 .../experimental/micro/testing/bluepill.resc | 0 .../experimental/micro/testing/bluepill.robot | 0 .../experimental/micro/testing/micro_test.bzl | 2 +- .../experimental/micro/testing/micro_test.h | 8 +- .../micro/testing/test_bluepill_binary.sh | 8 +- .../micro/testing/test_linux_binary.sh | 0 .../experimental/micro/tools/make/Makefile | 52 +-- .../micro/tools/make/download_dependencies.sh | 2 +- .../tools/make/targets/apollo3evb/_main.c | 0 .../make/targets/apollo3evb/apollo3evb.ld | 0 .../make/targets/apollo3evb_makefile.inc | 6 +- .../tools/make/targets/bluepill_makefile.inc | 6 +- .../lite/experimental/microfrontend/BUILD | 16 +- .../microfrontend/audio_microfrontend.cc | 10 +- .../microfrontend/audio_microfrontend_test.cc | 6 +- .../lite/experimental/microfrontend/lib/BUILD | 0 .../experimental/microfrontend/lib/README | 0 .../experimental/microfrontend/lib/bits.h | 6 +- .../lite/experimental/microfrontend/lib/fft.c | 2 +- .../lite/experimental/microfrontend/lib/fft.h | 6 +- .../experimental/microfrontend/lib/fft_io.c | 2 +- .../experimental/microfrontend/lib/fft_io.h | 8 +- .../microfrontend/lib/fft_test.cc | 4 +- .../experimental/microfrontend/lib/fft_util.c | 2 +- .../experimental/microfrontend/lib/fft_util.h | 8 +- .../microfrontend/lib/filterbank.c | 4 +- .../microfrontend/lib/filterbank.h | 8 +- .../microfrontend/lib/filterbank_io.c | 2 +- .../microfrontend/lib/filterbank_io.h | 8 +- .../microfrontend/lib/filterbank_test.cc | 4 +- .../microfrontend/lib/filterbank_util.c | 2 +- .../microfrontend/lib/filterbank_util.h | 8 +- .../experimental/microfrontend/lib/frontend.c | 4 +- .../experimental/microfrontend/lib/frontend.h | 18 +- .../microfrontend/lib/frontend_io.c | 12 +- .../microfrontend/lib/frontend_io.h | 8 +- .../microfrontend/lib/frontend_main.c | 4 +- .../lib/frontend_memmap_generator.c | 6 +- .../microfrontend/lib/frontend_memmap_main.c | 2 +- .../microfrontend/lib/frontend_test.cc | 4 +- .../microfrontend/lib/frontend_util.c | 4 +- .../microfrontend/lib/frontend_util.h | 20 +- .../experimental/microfrontend/lib/log_lut.c | 2 +- .../experimental/microfrontend/lib/log_lut.h | 6 +- .../microfrontend/lib/log_scale.c | 6 +- .../microfrontend/lib/log_scale.h | 6 +- .../microfrontend/lib/log_scale_io.c | 2 +- .../microfrontend/lib/log_scale_io.h | 8 +- .../microfrontend/lib/log_scale_test.cc | 4 +- .../microfrontend/lib/log_scale_util.c | 2 +- .../microfrontend/lib/log_scale_util.h | 8 +- .../microfrontend/lib/noise_reduction.c | 2 +- .../microfrontend/lib/noise_reduction.h | 6 +- .../microfrontend/lib/noise_reduction_io.c | 2 +- .../microfrontend/lib/noise_reduction_io.h | 8 +- .../microfrontend/lib/noise_reduction_test.cc | 4 +- .../microfrontend/lib/noise_reduction_util.c | 2 +- .../microfrontend/lib/noise_reduction_util.h | 8 +- .../microfrontend/lib/pcan_gain_control.c | 4 +- .../microfrontend/lib/pcan_gain_control.h | 6 +- .../lib/pcan_gain_control_test.cc | 4 +- .../lib/pcan_gain_control_util.c | 2 +- .../lib/pcan_gain_control_util.h | 8 +- .../experimental/microfrontend/lib/window.c | 2 +- .../experimental/microfrontend/lib/window.h | 6 +- .../microfrontend/lib/window_io.c | 2 +- .../microfrontend/lib/window_io.h | 8 +- .../microfrontend/lib/window_test.cc | 4 +- .../microfrontend/lib/window_util.c | 2 +- .../microfrontend/lib/window_util.h | 8 +- .../ops/audio_microfrontend_op.cc | 4 +- .../audio_microfrontend_op_test.py | 2 +- .../python/ops/audio_microfrontend_op.py | 2 +- .../lite/experimental/writer/BUILD | 22 +- .../lite/experimental/writer/enum_mapping.h | 10 +- .../writer/option_writer_generator.cc | 4 +- .../lite/experimental/writer/writer.cc | 6 +- .../lite/experimental/writer/writer_lib.cc | 16 +- .../lite/experimental/writer/writer_lib.h | 20 +- .../experimental/writer/writer_lib_test.cc | 10 +- .../{contrib => }/lite/g3doc/_book.yaml | 4 +- .../{contrib => }/lite/g3doc/_index.yaml | 4 +- .../{contrib => }/lite/g3doc/_project.yaml | 0 tensorflow/{contrib => }/lite/g3doc/apis.md | 2 +- .../lite/g3doc/convert/cmdline_examples.md | 2 +- .../lite/g3doc/convert/cmdline_reference.md | 0 .../{contrib => }/lite/g3doc/convert/index.md | 0 .../lite/g3doc/convert/python_api.md | 34 +- .../lite/g3doc/custom_operators.md | 4 +- .../{contrib => }/lite/g3doc/demo_android.md | 14 +- .../{contrib => }/lite/g3doc/demo_ios.md | 4 +- .../{contrib => }/lite/g3doc/devguide.md | 22 +- .../g3doc/images/convert/sample_after.png | Bin .../g3doc/images/convert/sample_before.png | Bin .../lite/g3doc/images/convert/workflow.svg | 0 .../images/landing-page/assistant_logo.png | Bin .../detect_crop_disease_in_africa.png | Bin .../images/landing-page/fishbrain_logo.png | Bin .../landing-page/fishbrain_logo_big.png | Bin .../g3doc/images/landing-page/gboard_logo.png | Bin .../g3doc/images/landing-page/gmail_logo.png | Bin .../g3doc/images/landing-page/loseit_logo.png | Bin .../images/landing-page/loseit_logo_big.png | Bin .../g3doc/images/landing-page/nest_logo.png | Bin .../g3doc/images/landing-page/photos_logo.png | Bin .../g3doc/images/landing-page/shazam_logo.png | Bin .../g3doc/images/landing-page/vsco_logo.png | Bin .../performance/model_size_vs_accuracy.png | Bin .../performance/model_size_vs_latency.png | Bin tensorflow/{contrib => }/lite/g3doc/ios.md | 20 +- tensorflow/{contrib => }/lite/g3doc/models.md | 0 .../lite/g3doc/ops_versioning.md | 0 .../{contrib => }/lite/g3doc/overview.md | 8 +- .../lite/g3doc/performance/benchmarks.md | 10 +- .../lite/g3doc/performance/best_practices.md | 8 +- .../g3doc/performance/model_optimization.md | 0 .../performance/post_training_quantization.md | 6 +- tensorflow/{contrib => }/lite/g3doc/rpi.md | 12 +- .../lite/g3doc/tf_ops_compatibility.md | 0 .../lite/g3doc/tfmobile/android_build.md | 0 .../lite/g3doc/tfmobile/index.md | 0 .../lite/g3doc/tfmobile/ios_build.md | 0 .../lite/g3doc/tfmobile/linking_libs.md | 0 .../lite/g3doc/tfmobile/optimizing.md | 0 .../lite/g3doc/tfmobile/prepare_models.md | 0 tensorflow/{contrib => }/lite/graph_info.cc | 2 +- tensorflow/{contrib => }/lite/graph_info.h | 8 +- .../{contrib => }/lite/graph_info_test.cc | 4 +- tensorflow/{contrib => }/lite/interpreter.cc | 22 +- tensorflow/{contrib => }/lite/interpreter.h | 18 +- .../{contrib => }/lite/interpreter_test.cc | 14 +- .../lite/java/AndroidManifest.xml | 0 tensorflow/{contrib => }/lite/java/BUILD | 22 +- .../{contrib => }/lite/java/aar_with_jni.bzl | 0 .../lite/java/build_aar_for_release.sh | 2 +- .../{contrib => }/lite/java/demo/.gitignore | 0 .../{contrib => }/lite/java/demo/README.md | 4 +- .../lite/java/demo/app/build.gradle | 0 .../demo/app/src/main/AndroidManifest.xml | 0 .../lite/java/demo/app/src/main/BUILD | 6 +- .../lite/java/demo/app/src/main/assets/BUILD | 0 .../src/main/assets/labels_imagenet_slim.txt | 0 .../assets/labels_mobilenet_quant_v1_224.txt | 0 .../tflitecamerademo/AutoFitTextureView.java | 0 .../Camera2BasicFragment.java | 0 .../tflitecamerademo/CameraActivity.java | 0 .../tflitecamerademo/ImageClassifier.java | 0 .../ImageClassifierFloatInception.java | 0 .../ImageClassifierQuantizedMobileNet.java | 0 .../main/res/drawable-hdpi/ic_action_info.png | Bin .../main/res/drawable-hdpi/ic_launcher.png | Bin .../app/src/main/res/drawable-hdpi/tile.9.png | Bin .../main/res/drawable-mdpi/ic_action_info.png | Bin .../main/res/drawable-mdpi/ic_launcher.png | Bin .../res/drawable-xhdpi/ic_action_info.png | Bin .../main/res/drawable-xhdpi/ic_launcher.png | Bin .../res/drawable-xxhdpi/ic_action_info.png | Bin .../main/res/drawable-xxhdpi/ic_launcher.png | Bin .../app/src/main/res/drawable-xxhdpi/logo.png | Bin .../layout-land/fragment_camera2_basic.xml | 0 .../res/layout-v26/fragment_camera2_basic.xml | 0 .../src/main/res/layout/activity_camera.xml | 0 .../res/layout/fragment_camera2_basic.xml | 0 .../res/values-sw600dp/template-dimens.xml | 0 .../res/values-sw600dp/template-styles.xml | 0 .../main/res/values-v11/template-styles.xml | 0 .../src/main/res/values-v21/base-colors.xml | 0 .../res/values-v21/base-template-styles.xml | 0 .../app/src/main/res/values/base-strings.xml | 0 .../demo/app/src/main/res/values/colors.xml | 0 .../demo/app/src/main/res/values/strings.xml | 0 .../demo/app/src/main/res/values/styles.xml | 0 .../src/main/res/values/template-dimens.xml | 0 .../src/main/res/values/template-styles.xml | 0 .../{contrib => }/lite/java/demo/build.gradle | 0 .../lite/java/demo/gradle.properties | 0 .../demo/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../{contrib => }/lite/java/demo/gradlew | 0 .../{contrib => }/lite/java/demo/gradlew.bat | 0 .../lite/java/demo/settings.gradle | 0 tensorflow/{contrib => }/lite/java/ovic/BUILD | 46 +- .../{contrib => }/lite/java/ovic/README.md | 24 +- .../java/ovic/demo/app/AndroidManifest.xml | 0 .../lite/java/ovic/demo/app/BUILD | 12 +- .../demo/app/OvicBenchmarkerActivity.java | 0 .../lite/java/ovic/demo/app/build.gradle | 0 .../app/res/drawable-mdpi/ic_launcher.png | Bin .../app/res/drawable-xhdpi/ic_launcher.png | Bin .../app/res/drawable/start_button_color.xml | 0 .../demo/app/res/layout/activity_main.xml | 0 .../java/ovic/demo/app/res/values/dimens.xml | 0 .../java/ovic/demo/app/res/values/strings.xml | 0 .../lite/java/ovic/demo/build.gradle | 0 .../lite/java/ovic/demo/gradle.properties | 0 .../demo/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../{contrib => }/lite/java/ovic/demo/gradlew | 0 .../lite/java/ovic/demo/gradlew.bat | 0 .../lite/java/ovic/demo/settings.gradle | 0 .../java/org/tensorflow/ovic/BoundingBox.java | 0 .../org/tensorflow/ovic/OvicBenchmarker.java | 0 .../ovic/OvicClassificationResult.java | 0 .../org/tensorflow/ovic/OvicClassifier.java | 0 .../ovic/OvicClassifierBenchmarker.java | 0 .../tensorflow/ovic/OvicDetectionResult.java | 0 .../org/tensorflow/ovic/OvicDetector.java | 0 .../ovic/OvicDetectorBenchmarker.java | 0 .../org/tensorflow/ovic/OvicValidator.java | 2 +- .../tensorflow/ovic/OvicClassifierTest.java | 2 +- .../org/tensorflow/ovic/OvicDetectorTest.java | 2 +- .../lite/java/ovic/src/testdata/BUILD | 0 .../java/ovic/src/testdata/coco_labels.txt | 0 .../lite/java/ovic/src/testdata/labels.txt | 0 .../{contrib => }/lite/java/proguard.flags | 0 .../java/org/tensorflow/lite/DataType.java | 0 .../java/org/tensorflow/lite/Delegate.java | 0 .../java/org/tensorflow/lite/Interpreter.java | 0 .../lite/NativeInterpreterWrapper.java | 0 .../main/java/org/tensorflow/lite/Tensor.java | 0 .../org/tensorflow/lite/TensorFlowLite.java | 0 .../org/tensorflow/lite/package-info.java | 0 .../lite/java/src/main/native/BUILD | 12 +- .../java/src/main/native/builtin_ops_jni.cc | 2 +- .../java/src/main/native/exception_jni.cc | 2 +- .../lite/java/src/main/native/exception_jni.h | 8 +- .../src/main/native/init_tensorflow_jni.cc | 4 +- .../src/main/native/init_tensorflow_jni.h | 6 +- .../native/nativeinterpreterwrapper_jni.cc | 2 +- .../native/nativeinterpreterwrapper_jni.h | 16 +- .../lite/java/src/main/native/tensor_jni.cc | 6 +- .../lite/java/src/main/native/tensor_jni.h | 8 +- .../src/main/native/tensorflow_lite_jni.cc | 4 +- .../src/main/native/tensorflow_lite_jni.h | 6 +- .../java/src/main/native/version_script.lds | 0 .../org/tensorflow/lite/DataTypeTest.java | 0 .../tensorflow/lite/InterpreterFlexTest.java | 2 +- .../org/tensorflow/lite/InterpreterTest.java | 6 +- .../lite/NativeInterpreterWrapperTest.java | 16 +- .../tensorflow/lite/TensorFlowLiteTest.java | 0 .../java/org/tensorflow/lite/TensorTest.java | 2 +- .../lite/java/src/test/native/BUILD | 8 +- .../src/test/native/interpreter_test_jni.cc | 2 +- .../lite/java/src/testdata/add.bin | Bin .../lite/java/src/testdata/float32.bin | Bin .../lite/java/src/testdata/int32.bin | Bin .../lite/java/src/testdata/int64.bin | Bin .../lite/java/src/testdata/invalid_model.bin | 0 .../lite/java/src/testdata/quantized.bin | Bin .../lite/java/src/testdata/uint8.bin | Bin .../java/src/testdata/with_custom_op.lite | Bin .../testhelper/java/org/tensorflow/lite/BUILD | 2 +- .../java/org/tensorflow/lite/TestHelper.java | 0 tensorflow/{contrib => }/lite/kernels/BUILD | 408 +++++++++--------- .../lite/kernels/activation_functor.h | 8 +- .../{contrib => }/lite/kernels/activations.cc | 16 +- .../lite/kernels/activations_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/add.cc | 16 +- .../{contrib => }/lite/kernels/add_test.cc | 8 +- .../{contrib => }/lite/kernels/arg_min_max.cc | 14 +- .../lite/kernels/arg_min_max_test.cc | 8 +- .../lite/kernels/audio_spectrogram.cc | 16 +- .../lite/kernels/audio_spectrogram_test.cc | 8 +- .../{contrib => }/lite/kernels/basic_rnn.cc | 12 +- .../lite/kernels/basic_rnn_test.cc | 8 +- .../lite/kernels/batch_to_space_nd.cc | 14 +- .../lite/kernels/batch_to_space_nd_test.cc | 8 +- .../kernels/bidirectional_sequence_lstm.cc | 16 +- .../bidirectional_sequence_lstm_test.cc | 10 +- .../kernels/bidirectional_sequence_rnn.cc | 12 +- .../bidirectional_sequence_rnn_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/cast.cc | 14 +- .../{contrib => }/lite/kernels/cast_test.cc | 8 +- .../{contrib => }/lite/kernels/comparisons.cc | 12 +- .../lite/kernels/comparisons_test.cc | 8 +- .../lite/kernels/concatenation.cc | 14 +- .../lite/kernels/concatenation_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/conv.cc | 28 +- .../{contrib => }/lite/kernels/conv_test.cc | 8 +- .../lite/kernels/depthwise_conv.cc | 22 +- .../lite/kernels/depthwise_conv_test.cc | 8 +- .../{contrib => }/lite/kernels/dequantize.cc | 12 +- .../lite/kernels/dequantize_test.cc | 8 +- .../lite/kernels/detection_postprocess.cc | 14 +- .../kernels/detection_postprocess_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/div.cc | 16 +- .../{contrib => }/lite/kernels/div_test.cc | 8 +- .../lite/kernels/eigen_support.cc | 8 +- .../lite/kernels/eigen_support.h | 8 +- .../{contrib => }/lite/kernels/elementwise.cc | 6 +- .../lite/kernels/elementwise_test.cc | 8 +- .../lite/kernels/embedding_lookup.cc | 8 +- .../lite/kernels/embedding_lookup_sparse.cc | 10 +- .../kernels/embedding_lookup_sparse_test.cc | 8 +- .../lite/kernels/embedding_lookup_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/exp.cc | 12 +- .../{contrib => }/lite/kernels/exp_test.cc | 8 +- .../{contrib => }/lite/kernels/expand_dims.cc | 12 +- .../lite/kernels/expand_dims_test.cc | 10 +- .../{contrib => }/lite/kernels/fake_quant.cc | 12 +- .../lite/kernels/fake_quant_test.cc | 8 +- .../{contrib => }/lite/kernels/floor.cc | 8 +- .../{contrib => }/lite/kernels/floor_div.cc | 10 +- .../lite/kernels/floor_div_test.cc | 8 +- .../{contrib => }/lite/kernels/floor_mod.cc | 10 +- .../lite/kernels/floor_mod_test.cc | 8 +- .../{contrib => }/lite/kernels/floor_test.cc | 8 +- .../lite/kernels/fully_connected.cc | 22 +- .../lite/kernels/fully_connected_test.cc | 10 +- .../{contrib => }/lite/kernels/gather.cc | 14 +- .../{contrib => }/lite/kernels/gather_test.cc | 10 +- .../lite/kernels/gemm_support.cc | 4 +- .../{contrib => }/lite/kernels/gemm_support.h | 8 +- .../lite/kernels/hashtable_lookup.cc | 10 +- .../lite/kernels/hashtable_lookup_test.cc | 10 +- .../{contrib => }/lite/kernels/internal/BUILD | 58 +-- .../internal/batch_to_space_nd_test.cc | 2 +- .../lite/kernels/internal/common.h | 8 +- .../lite/kernels/internal/compatibility.h | 8 +- .../internal/depthwiseconv_float_test.cc | 10 +- .../internal/depthwiseconv_quantized_test.cc | 10 +- .../lite/kernels/internal/kernel_utils.cc | 4 +- .../lite/kernels/internal/kernel_utils.h | 8 +- .../lite/kernels/internal/legacy_types.h | 8 +- .../kernels/internal/log_quantized_test.cc | 6 +- .../internal/logsoftmax_quantized_test.cc | 10 +- .../lite/kernels/internal/mfcc.cc | 2 +- .../lite/kernels/internal/mfcc.h | 10 +- .../lite/kernels/internal/mfcc_dct.cc | 2 +- .../lite/kernels/internal/mfcc_dct.h | 6 +- .../kernels/internal/mfcc_mel_filterbank.cc | 2 +- .../kernels/internal/mfcc_mel_filterbank.h | 6 +- .../kernels/internal/optimized/cblas_conv.h | 12 +- .../internal/optimized/cblas_reference.h | 8 +- .../kernels/internal/optimized/cpu_check.h | 6 +- .../internal/optimized/depthwiseconv_float.h | 10 +- .../internal/optimized/depthwiseconv_uint8.h | 12 +- .../depthwiseconv_uint8_3x3_filter.h | 10 +- .../optimized/eigen_spatial_convolutions.h | 10 +- ...gen_tensor_reduced_instantiations_google.h | 6 +- .../eigen_tensor_reduced_instantiations_oss.h | 6 +- .../internal/optimized/legacy_optimized_ops.h | 18 +- .../internal/optimized/multithreaded_conv.h | 16 +- .../internal/optimized/neon_tensor_utils.cc | 12 +- .../internal/optimized/neon_tensor_utils.h | 12 +- .../internal/optimized/optimized_ops.h | 20 +- .../internal/optimized/tensor_utils_impl.h | 8 +- .../kernels/internal/quantization_util.cc | 6 +- .../lite/kernels/internal/quantization_util.h | 12 +- .../internal/quantization_util_test.cc | 2 +- .../internal/reference/depthwiseconv_float.h | 12 +- .../internal/reference/depthwiseconv_uint8.h | 12 +- .../internal/reference/fully_connected.h | 14 +- .../internal/reference/legacy_reference_ops.h | 16 +- .../reference/portable_tensor_utils.cc | 8 +- .../reference/portable_tensor_utils.h | 8 +- .../internal/reference/reference_ops.h | 20 +- .../lite/kernels/internal/reference/softmax.h | 16 +- .../kernels/internal/resize_bilinear_test.cc | 8 +- .../internal/resize_nearest_neighbor_test.cc | 8 +- .../lite/kernels/internal/round.h | 6 +- .../internal/softmax_quantized_test.cc | 10 +- .../lite/kernels/internal/spectrogram.cc | 2 +- .../lite/kernels/internal/spectrogram.h | 6 +- .../kernels/internal/strided_slice_logic.h | 10 +- .../lite/kernels/internal/tensor.h | 12 +- .../lite/kernels/internal/tensor_ctypes.h | 10 +- .../lite/kernels/internal/tensor_test.cc | 2 +- .../lite/kernels/internal/tensor_utils.cc | 8 +- .../lite/kernels/internal/tensor_utils.h | 8 +- .../kernels/internal/tensor_utils_test.cc | 6 +- .../lite/kernels/internal/test_util.cc | 2 +- .../lite/kernels/internal/test_util.h | 8 +- .../lite/kernels/internal/types.h | 10 +- .../{contrib => }/lite/kernels/kernel_util.cc | 4 +- .../{contrib => }/lite/kernels/kernel_util.h | 10 +- .../lite/kernels/kernel_util_test.cc | 4 +- .../{contrib => }/lite/kernels/l2norm.cc | 14 +- .../{contrib => }/lite/kernels/l2norm_test.cc | 8 +- .../lite/kernels/layer_norm_lstm.cc | 6 +- .../lite/kernels/layer_norm_lstm_test.cc | 8 +- .../lite/kernels/local_response_norm.cc | 14 +- .../lite/kernels/local_response_norm_test.cc | 8 +- .../lite/kernels/log_softmax_test.cc | 10 +- .../{contrib => }/lite/kernels/logical.cc | 10 +- .../lite/kernels/logical_test.cc | 8 +- .../lite/kernels/lsh_projection.cc | 8 +- .../lite/kernels/lsh_projection_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/lstm.cc | 22 +- .../{contrib => }/lite/kernels/lstm_eval.cc | 8 +- .../{contrib => }/lite/kernels/lstm_eval.h | 10 +- .../{contrib => }/lite/kernels/lstm_test.cc | 8 +- .../lite/kernels/maximum_minimum.cc | 12 +- .../lite/kernels/maximum_minimum_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/mfcc.cc | 20 +- .../{contrib => }/lite/kernels/mfcc_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/mul.cc | 16 +- .../{contrib => }/lite/kernels/mul_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/neg.cc | 4 +- .../{contrib => }/lite/kernels/neg_test.cc | 8 +- .../{contrib => }/lite/kernels/one_hot.cc | 10 +- .../lite/kernels/one_hot_test.cc | 8 +- .../{contrib => }/lite/kernels/op_macros.h | 8 +- .../lite/kernels/optional_tensor_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/pack.cc | 10 +- .../{contrib => }/lite/kernels/pack_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/pad.cc | 14 +- .../{contrib => }/lite/kernels/pad_test.cc | 8 +- .../{contrib => }/lite/kernels/padding.h | 8 +- .../{contrib => }/lite/kernels/pooling.cc | 16 +- .../lite/kernels/pooling_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/pow.cc | 10 +- .../{contrib => }/lite/kernels/pow_test.cc | 8 +- .../{contrib => }/lite/kernels/range.cc | 12 +- .../{contrib => }/lite/kernels/range_test.cc | 8 +- .../{contrib => }/lite/kernels/reduce.cc | 14 +- .../{contrib => }/lite/kernels/reduce_test.cc | 8 +- .../{contrib => }/lite/kernels/register.cc | 4 +- .../{contrib => }/lite/kernels/register.h | 12 +- .../{contrib => }/lite/kernels/relu1.cc | 6 +- .../{contrib => }/lite/kernels/relu1_test.cc | 4 +- .../{contrib => }/lite/kernels/reshape.cc | 10 +- .../lite/kernels/reshape_test.cc | 8 +- .../lite/kernels/resize_bilinear.cc | 14 +- .../lite/kernels/resize_bilinear_test.cc | 8 +- .../lite/kernels/resize_nearest_neighbor.cc | 14 +- .../kernels/resize_nearest_neighbor_test.cc | 8 +- .../{contrib => }/lite/kernels/select.cc | 12 +- .../{contrib => }/lite/kernels/select_test.cc | 8 +- .../{contrib => }/lite/kernels/shape.cc | 10 +- .../{contrib => }/lite/kernels/shape_test.cc | 8 +- .../{contrib => }/lite/kernels/skip_gram.cc | 10 +- .../lite/kernels/skip_gram_test.cc | 10 +- .../{contrib => }/lite/kernels/slice.cc | 12 +- .../{contrib => }/lite/kernels/slice_test.cc | 8 +- .../lite/kernels/softmax_test.cc | 10 +- .../lite/kernels/space_to_batch_nd.cc | 14 +- .../lite/kernels/space_to_batch_nd_test.cc | 8 +- .../lite/kernels/space_to_depth.cc | 14 +- .../lite/kernels/space_to_depth_test.cc | 8 +- .../kernels/sparse_output_fully_connected.cc | 8 +- .../sparse_output_fully_connected_test.cc | 4 +- .../lite/kernels/sparse_to_dense.cc | 14 +- .../lite/kernels/sparse_to_dense_test.cc | 8 +- .../{contrib => }/lite/kernels/split.cc | 14 +- .../{contrib => }/lite/kernels/split_test.cc | 8 +- .../{contrib => }/lite/kernels/squeeze.cc | 10 +- .../lite/kernels/squeeze_test.cc | 8 +- .../lite/kernels/strided_slice.cc | 12 +- .../lite/kernels/strided_slice_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/sub.cc | 16 +- .../{contrib => }/lite/kernels/sub_test.cc | 8 +- tensorflow/{contrib => }/lite/kernels/svdf.cc | 12 +- .../{contrib => }/lite/kernels/svdf_test.cc | 8 +- .../{contrib => }/lite/kernels/test_util.cc | 4 +- .../{contrib => }/lite/kernels/test_util.h | 20 +- .../lite/kernels/test_util_test.cc | 2 +- tensorflow/{contrib => }/lite/kernels/tile.cc | 12 +- .../{contrib => }/lite/kernels/tile_test.cc | 10 +- .../{contrib => }/lite/kernels/topk_v2.cc | 10 +- .../lite/kernels/topk_v2_test.cc | 10 +- .../{contrib => }/lite/kernels/transpose.cc | 12 +- .../lite/kernels/transpose_conv.cc | 16 +- .../lite/kernels/transpose_conv_test.cc | 8 +- .../lite/kernels/transpose_test.cc | 12 +- .../kernels/unidirectional_sequence_lstm.cc | 16 +- .../unidirectional_sequence_lstm_test.cc | 8 +- .../kernels/unidirectional_sequence_rnn.cc | 12 +- .../unidirectional_sequence_rnn_test.cc | 8 +- .../{contrib => }/lite/kernels/unpack.cc | 10 +- .../{contrib => }/lite/kernels/unpack_test.cc | 8 +- .../{contrib => }/lite/kernels/zeros_like.cc | 6 +- .../lite/kernels/zeros_like_test.cc | 8 +- .../{contrib => }/lite/lib_package/BUILD | 0 .../lite/lib_package/concat_licenses.sh | 0 .../lite/lib_package/create_ios_frameworks.sh | 14 +- .../{contrib => }/lite/memory_planner.h | 8 +- .../{contrib => }/lite/mmap_allocation.cc | 4 +- .../lite/mmap_allocation_disabled.cc | 2 +- tensorflow/{contrib => }/lite/model.cc | 14 +- tensorflow/{contrib => }/lite/model.h | 16 +- .../{contrib => }/lite/model_flex_test.cc | 8 +- tensorflow/{contrib => }/lite/model_test.cc | 34 +- tensorflow/{contrib => }/lite/models/BUILD | 2 +- .../lite/models/smartreply/BUILD | 36 +- .../demo/app/src/main/AndroidManifest.xml | 0 .../models/smartreply/demo/app/src/main/BUILD | 6 +- .../smartreply/demo/app/src/main/assets/BUILD | 0 .../app/src/main/assets/backoff_response.txt | 0 .../android/smartreply/MainActivity.java | 0 .../android/smartreply/SmartReply.java | 0 .../android/smartreply/SmartReplyClient.java | 0 .../app/src/main/res/layout/main_activity.xml | 0 .../demo/app/src/main/smartreply_jni.cc | 4 +- .../lite/models/smartreply/g3doc/README.md | 4 +- .../models/smartreply/ops/extract_feature.cc | 6 +- .../smartreply/ops/extract_feature_test.cc | 8 +- .../lite/models/smartreply/ops/normalize.cc | 6 +- .../models/smartreply/ops/normalize_test.cc | 10 +- .../lite/models/smartreply/ops/predict.cc | 2 +- .../models/smartreply/ops/predict_test.cc | 10 +- .../lite/models/smartreply/predictor.cc | 12 +- .../lite/models/smartreply/predictor.h | 8 +- .../lite/models/smartreply/predictor_test.cc | 8 +- .../{contrib => }/lite/models/speech_test.cc | 8 +- .../lite/models/testdata/g3doc/README.md | 16 +- .../lite/models/testdata/g3doc/asr_am.svg | 0 .../lite/models/testdata/g3doc/asr_lm.svg | 0 .../lite/models/testdata/g3doc/endpointer.svg | 0 .../lite/models/testdata/g3doc/hotword.svg | 0 .../lite/models/testdata/g3doc/speakerid.svg | 0 .../lite/models/testdata/g3doc/tts.svg | 0 .../models/testdata/smartreply_samples.tsv | 0 .../testdata/speech_asr_lm_model.test_spec | 0 .../{contrib => }/lite/mutable_op_resolver.cc | 2 +- .../{contrib => }/lite/mutable_op_resolver.h | 10 +- .../lite/mutable_op_resolver_test.cc | 4 +- tensorflow/{contrib => }/lite/nnapi/BUILD | 0 .../lite/nnapi/NeuralNetworksShim.h | 6 +- tensorflow/{contrib => }/lite/nnapi/README.md | 0 .../{contrib => }/lite/nnapi_delegate.cc | 10 +- .../{contrib => }/lite/nnapi_delegate.h | 14 +- .../lite/nnapi_delegate_disabled.cc | 2 +- tensorflow/{contrib => }/lite/op_resolver.h | 10 +- .../lite/optional_debug_tools.cc | 2 +- .../{contrib => }/lite/optional_debug_tools.h | 8 +- tensorflow/{contrib => }/lite/profiling/BUILD | 22 +- .../lite/profiling/profile_buffer.h | 8 +- .../lite/profiling/profile_buffer_test.cc | 4 +- .../lite/profiling/profile_summarizer.cc | 4 +- .../lite/profiling/profile_summarizer.h | 10 +- .../lite/profiling/profile_summarizer_test.cc | 14 +- .../{contrib => }/lite/profiling/profiler.h | 8 +- .../lite/profiling/profiler_test.cc | 4 +- .../{contrib => }/lite/profiling/time.cc | 2 +- .../{contrib => }/lite/profiling/time.h | 6 +- tensorflow/lite/python/BUILD | 189 ++++++++ .../{contrib => }/lite/python/convert.py | 10 +- .../lite/python/convert_saved_model.py | 2 +- .../lite/python/convert_saved_model_test.py | 2 +- .../{contrib => }/lite/python/convert_test.py | 8 +- .../lite/python/create_custom_op.py | 2 +- .../{contrib => }/lite/python/interpreter.py | 2 +- .../lite/python/interpreter_test.py | 2 +- .../lite/python/interpreter_wrapper/BUILD | 4 +- .../interpreter_wrapper.cc | 8 +- .../interpreter_wrapper/interpreter_wrapper.h | 6 +- .../interpreter_wrapper/interpreter_wrapper.i | 8 +- tensorflow/{contrib => }/lite/python/lite.py | 30 +- .../lite/python/lite_constants.py | 4 +- .../{contrib => }/lite/python/lite_test.py | 6 +- .../{contrib => }/lite/python/op_hint.py | 6 +- .../lite/python/tflite_convert.py | 8 +- tensorflow/{contrib => }/lite/schema/BUILD | 2 +- .../lite/schema/builtin_ops_header/BUILD | 4 +- .../lite/schema/builtin_ops_header/README.md | 4 +- .../builtin_ops_header/consistency_test.cc | 4 +- .../schema/builtin_ops_header/generate.cc | 2 +- .../schema/builtin_ops_header/generator.cc | 10 +- .../schema/builtin_ops_header/generator.h | 6 +- .../builtin_ops_header/generator_test.cc | 2 +- .../schema/flatbuffer_compatibility_test.cc | 4 +- .../{contrib => }/lite/schema/schema.fbs | 0 .../lite/schema/schema_generated.h | 0 .../{contrib => }/lite/schema/schema_v0.fbs | 0 .../{contrib => }/lite/schema/schema_v1.fbs | 0 .../{contrib => }/lite/schema/schema_v2.fbs | 0 .../{contrib => }/lite/schema/schema_v3.fbs | 0 .../lite/schema/upgrade_schema.py | 10 +- .../lite/schema/upgrade_schema_test.py | 2 +- .../{contrib => }/lite/simple_memory_arena.cc | 2 +- .../{contrib => }/lite/simple_memory_arena.h | 8 +- .../lite/simple_memory_arena_test.cc | 4 +- .../{contrib => }/lite/special_rules.bzl | 6 +- .../{contrib => }/lite/stderr_reporter.cc | 2 +- .../{contrib => }/lite/stderr_reporter.h | 10 +- tensorflow/{contrib => }/lite/string.h | 6 +- tensorflow/{contrib => }/lite/string_util.cc | 4 +- tensorflow/{contrib => }/lite/string_util.h | 10 +- .../{contrib => }/lite/string_util_test.cc | 8 +- .../lite/testdata/0_subgraphs.bin | Bin .../lite/testdata/2_subgraphs.bin | Bin .../{contrib => }/lite/testdata/add.bin | Bin .../{contrib => }/lite/testdata/add.json | 0 .../lite/testdata/add_quantized.bin | Bin .../lite/testdata/add_quantized.json | 0 .../lite/testdata/empty_model.bin | Bin .../{contrib => }/lite/testdata/multi_add.bin | Bin .../lite/testdata/multi_add.json | 0 .../{contrib => }/lite/testdata/multi_add.pb | 0 .../lite/testdata/multi_add_flex.bin | Bin .../lite/testdata/no_subgraphs.bin | Bin .../lite/testdata/test_model.bin | Bin .../lite/testdata/test_model_broken.bin | Bin .../lite/testdata/test_model_broken.json | 0 .../lite/testdata/two_subgraphs.bin | Bin tensorflow/{contrib => }/lite/testing/BUILD | 62 +-- .../lite/testing/generate_examples.py | 4 +- .../lite/testing/generate_examples_report.py | 0 .../lite/testing/generate_testspec.cc | 8 +- .../lite/testing/generate_testspec.h | 8 +- .../lite/testing/generate_testspec_test.cc | 2 +- .../testing/generated_examples_zip_test.cc | 6 +- .../lite/testing/init_tensorflow.cc | 2 +- .../lite/testing/init_tensorflow.h | 6 +- tensorflow/{contrib => }/lite/testing/join.h | 8 +- .../{contrib => }/lite/testing/join_test.cc | 2 +- .../{contrib => }/lite/testing/message.cc | 4 +- .../{contrib => }/lite/testing/message.h | 6 +- .../lite/testing/message_test.cc | 2 +- .../lite/testing/model_coverage/BUILD | 4 +- .../model_coverage/model_coverage_lib.py | 4 +- .../model_coverage/model_coverage_lib_test.py | 4 +- .../lite/testing/nnapi_example.cc | 8 +- .../lite/testing/parse_testdata.cc | 8 +- .../lite/testing/parse_testdata.h | 10 +- .../{contrib => }/lite/testing/split.cc | 2 +- tensorflow/{contrib => }/lite/testing/split.h | 8 +- .../{contrib => }/lite/testing/split_test.cc | 2 +- .../{contrib => }/lite/testing/test_runner.h | 8 +- .../lite/testing/test_runner_test.cc | 2 +- .../{contrib => }/lite/testing/tf_driver.cc | 6 +- .../{contrib => }/lite/testing/tf_driver.h | 10 +- .../lite/testing/tf_driver_test.cc | 4 +- .../lite/testing/tflite_diff_example_test.cc | 6 +- .../lite/testing/tflite_diff_flags.h | 10 +- .../lite/testing/tflite_diff_util.cc | 8 +- .../lite/testing/tflite_diff_util.h | 8 +- .../lite/testing/tflite_driver.cc | 8 +- .../lite/testing/tflite_driver.h | 16 +- .../lite/testing/tflite_driver_test.cc | 4 +- .../{contrib => }/lite/testing/tokenize.cc | 4 +- .../{contrib => }/lite/testing/tokenize.h | 6 +- .../lite/testing/tokenize_test.cc | 2 +- tensorflow/{contrib => }/lite/testing/util.h | 10 +- tensorflow/{contrib => }/lite/toco/BUILD | 16 +- tensorflow/{contrib => }/lite/toco/README.md | 0 .../lite/toco/allocate_transient_arrays.cc | 8 +- .../lite/toco/allocate_transient_arrays.h | 8 +- tensorflow/{contrib => }/lite/toco/args.h | 10 +- .../{contrib => }/lite/toco/dump_graphviz.cc | 12 +- .../{contrib => }/lite/toco/dump_graphviz.h | 8 +- .../lite/toco/export_tensorflow.cc | 10 +- .../lite/toco/export_tensorflow.h | 8 +- .../{contrib => }/lite/toco/format_port.h | 8 +- .../{contrib => }/lite/toco/g3doc/README.md | 0 .../convert_expanddims_to_reshape.cc | 6 +- .../convert_pure_conv_to_depthwise.cc | 6 +- .../convert_reorder_axes.cc | 6 +- .../convert_squeeze_to_reshape.cc | 6 +- .../convert_trivial_addn_to_add.cc | 4 +- .../convert_trivial_pack_to_reshape.cc | 6 +- .../convert_trivial_tile_to_concat.cc | 6 +- .../convert_trivial_transpose_to_reshape.cc | 6 +- .../create_im2col_arrays.cc | 6 +- .../toco/graph_transformations/dequantize.cc | 8 +- .../graph_transformations/drop_fake_quant.cc | 8 +- .../drop_im2col_arrays.cc | 6 +- .../ensure_bias_vectors.cc | 6 +- ...int8_weights_safe_for_fast_int8_kernels.cc | 6 +- .../fuse_activation_functions.cc | 8 +- .../fuse_binary_into_following_affine.cc | 8 +- .../fuse_binary_into_preceding_affine.cc | 8 +- .../fuse_broadcast_into_following_binary.cc | 6 +- .../graph_transformations.cc | 6 +- .../graph_transformations.h | 10 +- .../graph_transformations/hardcode_min_max.cc | 6 +- .../identify_dilated_conv.cc | 6 +- .../identify_l2_normalization.cc | 6 +- .../graph_transformations/identify_l2_pool.cc | 6 +- .../graph_transformations/identify_lstm.cc | 6 +- .../identify_lstm_merge_inputs.cc | 8 +- .../identify_lstm_split_inputs.cc | 8 +- .../graph_transformations/identify_prelu.cc | 6 +- .../graph_transformations/identify_relu1.cc | 6 +- .../toco/graph_transformations/lstm_utils.cc | 2 +- .../toco/graph_transformations/lstm_utils.h | 12 +- .../make_initial_dequantize_operator.cc | 10 +- .../merge_reshape_into_preceding_transpose.cc | 10 +- .../move_binary_operator_before_reshape.cc | 6 +- ...gate_activation_function_into_constants.cc | 10 +- .../propagate_array_data_types.cc | 4 +- .../propagate_default_min_max.cc | 8 +- .../propagate_fake_quant_num_bits.cc | 8 +- .../propagate_fixed_sizes.cc | 8 +- .../quantization_util.cc | 8 +- .../graph_transformations/quantization_util.h | 12 +- .../toco/graph_transformations/quantize.cc | 10 +- ...minmax_and_narrow_range_from_fake_quant.cc | 6 +- .../remove_final_dequantize_op.cc | 8 +- .../remove_tensorflow_assert.cc | 6 +- .../remove_tensorflow_identity.cc | 8 +- .../remove_trivial_binary.cc | 8 +- .../remove_trivial_concatenation.cc | 8 +- .../remove_trivial_concatenation_input.cc | 6 +- .../remove_trivial_fake_quant.cc | 8 +- .../remove_trivial_passthrough.cc | 6 +- .../remove_trivial_passthrough.h | 10 +- ...emove_trivial_quantized_activation_func.cc | 14 +- .../remove_trivial_quantized_min_max.cc | 14 +- .../remove_trivial_reshape.cc | 8 +- .../remove_trivial_slice.cc | 8 +- .../graph_transformations/remove_unused_op.cc | 8 +- .../reorder_elementwise_unary.cc | 6 +- .../reorder_reshape_transpose.cc | 6 +- .../resolve_batch_normalization.cc | 8 +- .../resolve_batch_to_space_nd_attributes.cc | 6 +- .../resolve_constant_binary.cc | 8 +- .../resolve_constant_concatenation.cc | 6 +- .../resolve_constant_fake_quant.cc | 8 +- .../resolve_constant_fill.cc | 6 +- .../resolve_constant_gather.cc | 6 +- .../resolve_constant_pack.cc | 6 +- .../resolve_constant_random_uniform.cc | 6 +- .../resolve_constant_range.cc | 6 +- .../resolve_constant_reshape.cc | 6 +- .../resolve_constant_select.cc | 8 +- .../resolve_constant_shape_or_rank.cc | 6 +- .../resolve_constant_slice.cc | 6 +- .../resolve_constant_strided_slice.cc | 8 +- .../resolve_constant_tile.cc | 6 +- .../resolve_constant_transpose.cc | 6 +- .../resolve_constant_unary.cc | 8 +- .../resolve_fake_quant_args_from_vars.cc | 6 +- .../resolve_gather_attributes.cc | 6 +- .../resolve_multiply_by_zero.cc | 6 +- .../resolve_pad_attributes.cc | 6 +- .../resolve_padv2_attributes.cc | 6 +- .../resolve_reduce_attributes.cc | 6 +- .../resolve_reorder_axes.cc | 6 +- .../resolve_reshape_attributes.cc | 6 +- .../resolve_slice_attributes.cc | 6 +- .../resolve_space_to_batch_nd_attributes.cc | 6 +- .../resolve_squeeze_attributes.cc | 8 +- .../resolve_strided_slice_attributes.cc | 6 +- .../resolve_tensorflow_concat.cc | 6 +- .../resolve_tensorflow_matmul.cc | 6 +- .../resolve_tensorflow_merge.cc | 6 +- .../resolve_tensorflow_switch.cc | 6 +- .../resolve_transpose_attributes.cc | 6 +- .../shuffle_fc_weights.cc | 6 +- .../toco/graph_transformations/tests/BUILD | 18 +- .../tests/lstm_utils_test.cc | 6 +- .../resolve_constant_concatenation_test.cc | 6 +- .../tests/resolve_constant_unary_test.cc | 6 +- .../unfuse_activation_functions.cc | 8 +- .../unpartition_embedding_lookup.cc | 6 +- .../unroll_batch_matmul.cc | 6 +- .../lite/toco/import_tensorflow.cc | 12 +- .../lite/toco/import_tensorflow.h | 10 +- .../lite/toco/import_tensorflow_test.cc | 2 +- tensorflow/{contrib => }/lite/toco/model.h | 14 +- .../lite/toco/model_cmdline_flags.cc | 8 +- .../lite/toco/model_cmdline_flags.h | 12 +- .../{contrib => }/lite/toco/model_flags.proto | 2 +- .../{contrib => }/lite/toco/python/BUILD | 18 +- .../{contrib => }/lite/toco/python/toco.i | 2 +- .../lite/toco/python/toco_from_protos.py | 2 +- .../lite/toco/python/toco_from_protos_test.py | 6 +- .../lite/toco/python/toco_python_api.cc | 14 +- .../lite/toco/python/toco_python_api.h | 6 +- .../{contrib => }/lite/toco/runtime/common.h | 8 +- .../{contrib => }/lite/toco/runtime/types.h | 12 +- .../lite/toco/tensorflow_graph_matching/BUILD | 14 +- .../toco/tensorflow_graph_matching/cluster.cc | 2 +- .../toco/tensorflow_graph_matching/cluster.h | 12 +- .../cluster_utils.cc | 2 +- .../tensorflow_graph_matching/cluster_utils.h | 6 +- .../resolve_cluster.cc | 10 +- .../resolve_cluster.h | 10 +- .../tensorflow_graph_matching/resolve_svdf.cc | 12 +- .../tensorflow_graph_matching/resolve_svdf.h | 14 +- .../resolve_svdf_test.cc | 8 +- .../lite/toco/tensorflow_util.cc | 6 +- .../{contrib => }/lite/toco/tensorflow_util.h | 8 +- .../{contrib => }/lite/toco/tflite/BUILD | 40 +- .../lite/toco/tflite/builtin_operator.h | 8 +- .../lite/toco/tflite/custom_operator.h | 8 +- .../{contrib => }/lite/toco/tflite/export.cc | 22 +- .../{contrib => }/lite/toco/tflite/export.h | 12 +- .../lite/toco/tflite/export_test.cc | 10 +- .../{contrib => }/lite/toco/tflite/import.cc | 14 +- .../{contrib => }/lite/toco/tflite/import.h | 10 +- .../lite/toco/tflite/import_test.cc | 6 +- .../lite/toco/tflite/operator.cc | 14 +- .../{contrib => }/lite/toco/tflite/operator.h | 10 +- .../lite/toco/tflite/operator_test.cc | 6 +- .../lite/toco/tflite/simple_operator.h | 8 +- .../{contrib => }/lite/toco/tflite/types.cc | 4 +- .../{contrib => }/lite/toco/tflite/types.h | 10 +- .../lite/toco/tflite/types_test.cc | 2 +- .../lite/toco/tflite/whitelisted_flex_ops.cc | 2 +- .../lite/toco/tflite/whitelisted_flex_ops.h | 6 +- tensorflow/{contrib => }/lite/toco/toco.cc | 18 +- .../lite/toco/toco_cmdline_flags.cc | 4 +- .../lite/toco/toco_cmdline_flags.h | 12 +- .../{contrib => }/lite/toco/toco_flags.proto | 2 +- .../lite/toco/toco_graphviz_dump_options.cc | 2 +- .../lite/toco/toco_graphviz_dump_options.h | 6 +- .../{contrib => }/lite/toco/toco_port.cc | 4 +- .../{contrib => }/lite/toco/toco_port.h | 8 +- .../{contrib => }/lite/toco/toco_port_test.cc | 8 +- .../{contrib => }/lite/toco/toco_tooling.cc | 22 +- .../{contrib => }/lite/toco/toco_tooling.h | 12 +- .../{contrib => }/lite/toco/toco_types.h | 6 +- .../{contrib => }/lite/toco/tooling_util.cc | 8 +- .../{contrib => }/lite/toco/tooling_util.h | 18 +- .../lite/toco/tooling_util_test.cc | 4 +- .../{contrib => }/lite/toco/types.proto | 0 tensorflow/{contrib => }/lite/tools/BUILD | 36 +- .../{contrib => }/lite/tools/accuracy/BUILD | 20 +- .../lite/tools/accuracy/README.md | 0 .../lite/tools/accuracy/accuracy_eval_stage.h | 6 +- .../accuracy/android_required_build_flags.cc | 0 .../lite/tools/accuracy/csv_writer.h | 6 +- .../lite/tools/accuracy/eval_pipeline.cc | 2 +- .../lite/tools/accuracy/eval_pipeline.h | 10 +- .../tools/accuracy/eval_pipeline_builder.cc | 2 +- .../tools/accuracy/eval_pipeline_builder.h | 12 +- .../accuracy/eval_pipeline_builder_test.cc | 2 +- .../lite/tools/accuracy/eval_pipeline_test.cc | 2 +- .../lite/tools/accuracy/file_reader_stage.cc | 2 +- .../lite/tools/accuracy/file_reader_stage.h | 8 +- .../tools/accuracy/file_reader_stage_test.cc | 2 +- .../lite/tools/accuracy/ilsvrc/BUILD | 28 +- .../lite/tools/accuracy/ilsvrc/README.md | 6 +- .../ilsvrc/clsloc_validation_blacklist.txt | 0 .../ilsvrc/generate_validation_labels.py | 0 .../accuracy/ilsvrc/imagenet_accuracy_eval.cc | 6 +- .../ilsvrc/imagenet_model_evaluator.cc | 16 +- .../ilsvrc/imagenet_model_evaluator.h | 10 +- .../accuracy/ilsvrc/imagenet_topk_eval.cc | 2 +- .../accuracy/ilsvrc/imagenet_topk_eval.h | 8 +- .../ilsvrc/imagenet_topk_eval_test.cc | 2 +- .../ilsvrc/inception_preprocessing.cc | 2 +- .../accuracy/ilsvrc/inception_preprocessing.h | 8 +- .../ilsvrc/inception_preprocessing_test.cc | 2 +- .../accuracy/ilsvrc/testdata/grace_hopper.jpg | Bin .../tools/accuracy/run_tflite_model_op.cc | 12 +- .../accuracy/run_tflite_model_op_test.cc | 0 .../tools/accuracy/run_tflite_model_stage.cc | 2 +- .../tools/accuracy/run_tflite_model_stage.h | 8 +- .../{contrib => }/lite/tools/accuracy/stage.h | 6 +- .../lite/tools/accuracy/utils.cc | 10 +- .../{contrib => }/lite/tools/accuracy/utils.h | 8 +- .../lite/tools/accuracy/utils_test.cc | 2 +- .../{contrib => }/lite/tools/benchmark/BUILD | 38 +- .../lite/tools/benchmark/README.md | 12 +- .../lite/tools/benchmark/benchmark_main.cc | 4 +- .../lite/tools/benchmark/benchmark_model.cc | 6 +- .../lite/tools/benchmark/benchmark_model.h | 10 +- .../lite/tools/benchmark/benchmark_params.cc | 4 +- .../lite/tools/benchmark/benchmark_params.h | 8 +- .../benchmark/benchmark_plus_flex_main.cc | 6 +- .../lite/tools/benchmark/benchmark_test.cc | 6 +- .../tools/benchmark/benchmark_tflite_model.cc | 12 +- .../tools/benchmark/benchmark_tflite_model.h | 12 +- .../tools/benchmark/command_line_flags.cc | 2 +- .../lite/tools/benchmark/command_line_flags.h | 6 +- .../benchmark/command_line_flags_test.cc | 4 +- .../lite/tools/benchmark/ios/README.md | 8 +- .../TFLiteBenchmark.xcodeproj/project.pbxproj | 26 +- .../TFLiteBenchmark/AppDelegate.h | 0 .../TFLiteBenchmark/AppDelegate.m | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../Base.lproj/Main.storyboard | 0 .../TFLiteBenchmark/BenchmarkViewController.h | 0 .../BenchmarkViewController.mm | 4 +- .../TFLiteBenchmark/Info.plist | 0 .../benchmark_data/benchmark_params.json | 0 .../TFLiteBenchmark/TFLiteBenchmark/main.m | 0 .../lite/tools/benchmark/logging.h | 6 +- .../lite/tools/gen_op_registration.cc | 4 +- .../lite/tools/gen_op_registration.h | 10 +- .../lite/tools/gen_op_registration_main.cc | 2 +- .../lite/tools/gen_op_registration_test.cc | 10 +- .../{contrib => }/lite/tools/make/Makefile | 58 +-- .../tools/make/build_ios_universal_lib.sh | 14 +- .../lite/tools/make/build_rpi_lib.sh | 2 +- .../lite/tools/make/download_dependencies.sh | 2 +- .../lite/tools/make/targets/ios_makefile.inc | 0 .../tools/make/targets/linux_makefile.inc | 0 .../tools/make/targets/riscv_makefile.inc | 0 .../lite/tools/make/targets/rpi_makefile.inc | 0 .../tools/make/targets/stm32f1_makefile.inc | 0 .../tools/make/targets/stm32f7_makefile.inc | 0 .../{contrib => }/lite/tools/optimize/BUILD | 8 +- .../tools/optimize/g3doc/quantize_weights.md | 2 +- .../lite/tools/optimize/quantize_weights.cc | 24 +- .../lite/tools/optimize/quantize_weights.h | 12 +- .../tools/optimize/quantize_weights_test.cc | 12 +- .../{contrib => }/lite/tools/verifier.cc | 8 +- .../{contrib => }/lite/tools/verifier.h | 10 +- .../{contrib => }/lite/tools/verifier_test.cc | 14 +- .../{contrib => }/lite/tools/visualize.py | 2 +- tensorflow/{contrib => }/lite/tutorials/BUILD | 0 .../{contrib => }/lite/tutorials/dataset.py | 0 .../lite/tutorials/mnist_tflite.py | 4 +- .../lite/tutorials/post_training_quant.ipynb | 18 +- tensorflow/{contrib => }/lite/util.cc | 2 +- tensorflow/{contrib => }/lite/util.h | 8 +- tensorflow/{contrib => }/lite/util_test.cc | 4 +- tensorflow/{contrib => }/lite/version.h | 6 +- tensorflow/python/BUILD | 8 +- .../python/tools/api/generator/api_gen.bzl | 2 +- .../api/generator/output_init_files_test.py | 2 +- .../v1/tensorflow.lite.-interpreter.pbtxt | 2 +- ...e.-op-hint.-op-hint-argument-tracker.pbtxt | 2 +- .../golden/v1/tensorflow.lite.-op-hint.pbtxt | 2 +- .../tensorflow.lite.-t-f-lite-converter.pbtxt | 2 +- .../v1/tensorflow.lite.-toco-converter.pbtxt | 2 +- .../v2/tensorflow.lite.-interpreter.pbtxt | 2 +- ...e.-op-hint.-op-hint-argument-tracker.pbtxt | 2 +- .../golden/v2/tensorflow.lite.-op-hint.pbtxt | 2 +- .../tensorflow.lite.-t-f-lite-converter.pbtxt | 2 +- .../v2/tensorflow.lite.-toco-converter.pbtxt | 2 +- .../api/lib/python_object_to_proto_visitor.py | 4 +- tensorflow/tools/ci_build/ci_sanity.sh | 6 +- .../tools/ci_build/osx/cpu/run_contrib.sh | 2 +- tensorflow/tools/pip_package/BUILD | 12 +- .../tools/pip_package/build_pip_package.sh | 2 +- .../tools/pip_package/pip_smoke_test.py | 18 +- tensorflow/tools/pip_package/setup.py | 6 +- 1205 files changed, 4284 insertions(+), 4242 deletions(-) delete mode 100644 tensorflow/contrib/lite/experimental/micro/kernels/BUILD create mode 100644 tensorflow/contrib/lite/python/__init__.py rename tensorflow/{contrib => }/lite/BUILD (76%) rename tensorflow/{contrib => }/lite/README.md (79%) rename tensorflow/{contrib => }/lite/allocation.cc (94%) rename tensorflow/{contrib => }/lite/allocation.h (88%) rename tensorflow/{contrib => }/lite/arena_planner.cc (99%) rename tensorflow/{contrib => }/lite/arena_planner.h (92%) rename tensorflow/{contrib => }/lite/arena_planner_test.cc (99%) rename tensorflow/{contrib => }/lite/build_def.bzl (95%) rename tensorflow/{contrib => }/lite/builtin_op_data.h (77%) rename tensorflow/{contrib => }/lite/builtin_ops.h (96%) rename tensorflow/{contrib => }/lite/c/BUILD (94%) rename tensorflow/{contrib => }/lite/c/builtin_op_data.h (97%) rename tensorflow/{contrib => }/lite/c/builtin_op_data_test.cc (98%) rename tensorflow/{contrib => }/lite/c/c_api_internal.c (98%) rename tensorflow/{contrib => }/lite/c/c_api_internal.h (99%) rename tensorflow/{contrib => }/lite/c/c_api_internal_test.cc (98%) rename tensorflow/{contrib => }/lite/context.h (79%) rename tensorflow/{contrib => }/lite/context_util.h (89%) rename tensorflow/{contrib => }/lite/core/api/BUILD (80%) rename tensorflow/{contrib => }/lite/core/api/error_reporter.cc (95%) rename tensorflow/{contrib => }/lite/core/api/error_reporter.h (88%) rename tensorflow/{contrib => }/lite/core/api/error_reporter_test.cc (95%) rename tensorflow/{contrib => }/lite/core/api/flatbuffer_conversions.cc (99%) rename tensorflow/{contrib => }/lite/core/api/flatbuffer_conversions.h (85%) rename tensorflow/{contrib => }/lite/core/api/flatbuffer_conversions_test.cc (97%) rename tensorflow/{contrib => }/lite/core/api/op_resolver.cc (97%) rename tensorflow/{contrib => }/lite/core/api/op_resolver.h (84%) rename tensorflow/{contrib => }/lite/core/api/op_resolver_test.cc (99%) rename tensorflow/{contrib => }/lite/delegates/flex/BUILD (80%) rename tensorflow/{contrib => }/lite/delegates/flex/buffer_map.cc (96%) rename tensorflow/{contrib => }/lite/delegates/flex/buffer_map.h (89%) rename tensorflow/{contrib => }/lite/delegates/flex/buffer_map_test.cc (96%) rename tensorflow/{contrib => }/lite/delegates/flex/delegate.cc (92%) rename tensorflow/{contrib => }/lite/delegates/flex/delegate.h (85%) rename tensorflow/{contrib => }/lite/delegates/flex/delegate_data.cc (96%) rename tensorflow/{contrib => }/lite/delegates/flex/delegate_data.h (87%) rename tensorflow/{contrib => }/lite/delegates/flex/delegate_data_test.cc (90%) rename tensorflow/{contrib => }/lite/delegates/flex/delegate_test.cc (98%) rename tensorflow/{contrib => }/lite/delegates/flex/kernel.cc (96%) rename tensorflow/{contrib => }/lite/delegates/flex/kernel.h (83%) rename tensorflow/{contrib => }/lite/delegates/flex/kernel_test.cc (97%) rename tensorflow/{contrib => }/lite/delegates/flex/test_util.cc (98%) rename tensorflow/{contrib => }/lite/delegates/flex/test_util.h (94%) rename tensorflow/{contrib => }/lite/delegates/flex/util.cc (98%) rename tensorflow/{contrib => }/lite/delegates/flex/util.h (88%) rename tensorflow/{contrib => }/lite/delegates/flex/util_test.cc (96%) rename tensorflow/{contrib => }/lite/delegates/nnapi/BUILD (58%) rename tensorflow/{contrib => }/lite/delegates/nnapi/nnapi_delegate.cc (99%) rename tensorflow/{contrib => }/lite/delegates/nnapi/nnapi_delegate.h (80%) rename tensorflow/{contrib => }/lite/delegates/nnapi/nnapi_delegate_test.cc (99%) rename tensorflow/{contrib => }/lite/error_reporter.h (72%) rename tensorflow/{contrib => }/lite/examples/android/BUILD (77%) rename tensorflow/{contrib => }/lite/examples/android/android.iml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/README.md (94%) rename tensorflow/{contrib => }/lite/examples/android/app/build.gradle (100%) rename tensorflow/{contrib => }/lite/examples/android/app/download-models.gradle (96%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/AndroidManifest.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/assets/BUILD (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/assets/box_priors.txt (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/assets/coco_labels_list.txt (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/assets/conv_actions_labels.txt (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/assets/pets_labels_list.txt (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/animator/color_animation.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/drawable/border.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/layout/activity_camera.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/layout/activity_speech.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/layout/list_text_item.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values-v11/styles.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values-v11/template-styles.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values-v14/styles.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values-v21/base-colors.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values/attrs.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values/base-strings.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values/colors.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values/strings.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values/styles.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values/template-dimens.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/app/src/main/res/values/template-styles.xml (100%) rename tensorflow/{contrib => }/lite/examples/android/build.gradle (100%) rename tensorflow/{contrib => }/lite/examples/android/settings.gradle (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/.gitignore (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/CameraExampleAppDelegate.h (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/CameraExampleAppDelegate.m (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/CameraExampleViewController.h (94%) rename tensorflow/{contrib => }/lite/examples/ios/camera/CameraExampleViewController.mm (99%) rename tensorflow/{contrib => }/lite/examples/ios/camera/Info.plist (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/MainStoryboard_iPhone.storyboard (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/Podfile (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/README.md (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/data/.gitignore (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/main.mm (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/tflite_camera_example.xcodeproj/project.pbxproj (100%) rename tensorflow/{contrib => }/lite/examples/ios/camera/tflite_camera_example_with_select_tf_ops.xcodeproj/project.pbxproj (100%) rename tensorflow/{contrib => }/lite/examples/ios/download_models.sh (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/AppDelegate.h (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/AppDelegate.mm (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/Podfile (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/RunModel-Info.plist (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/RunModelViewController.h (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/RunModelViewController.mm (97%) rename tensorflow/{contrib => }/lite/examples/ios/simple/RunModelViewController.xib (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/data/grace_hopper.jpg (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/ios_image_load.h (78%) rename tensorflow/{contrib => }/lite/examples/ios/simple/ios_image_load.mm (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/main.mm (100%) rename tensorflow/{contrib => }/lite/examples/ios/simple/simple.xcodeproj/project.pbxproj (100%) rename tensorflow/{contrib => }/lite/examples/label_image/BUILD (67%) rename tensorflow/{contrib => }/lite/examples/label_image/bitmap_helpers.cc (98%) rename tensorflow/{contrib => }/lite/examples/label_image/bitmap_helpers.h (79%) rename tensorflow/{contrib => }/lite/examples/label_image/bitmap_helpers_impl.h (84%) rename tensorflow/{contrib => }/lite/examples/label_image/get_top_n.h (82%) rename tensorflow/{contrib => }/lite/examples/label_image/get_top_n_impl.h (90%) rename tensorflow/{contrib => }/lite/examples/label_image/label_image.cc (97%) rename tensorflow/{contrib => }/lite/examples/label_image/label_image.h (82%) rename tensorflow/{contrib => }/lite/examples/label_image/label_image.md (84%) rename tensorflow/{contrib => }/lite/examples/label_image/label_image_test.cc (86%) rename tensorflow/{contrib => }/lite/examples/label_image/testdata/grace_hopper.bmp (100%) rename tensorflow/{contrib => }/lite/examples/minimal/BUILD (76%) rename tensorflow/{contrib => }/lite/examples/minimal/minimal.cc (92%) rename tensorflow/{contrib => }/lite/examples/python/BUILD (83%) rename tensorflow/{contrib => }/lite/examples/python/label_image.md (81%) rename tensorflow/{contrib => }/lite/examples/python/label_image.py (97%) rename tensorflow/{contrib => }/lite/experimental/c/BUILD (63%) rename tensorflow/{contrib => }/lite/experimental/c/c_api.cc (93%) rename tensorflow/{contrib => }/lite/experimental/c/c_api.h (97%) rename tensorflow/{contrib => }/lite/experimental/c/c_api_experimental.cc (92%) rename tensorflow/{contrib => }/lite/experimental/c/c_api_experimental.h (87%) rename tensorflow/{contrib => }/lite/experimental/c/c_api_experimental_test.cc (86%) rename tensorflow/{contrib => }/lite/experimental/c/c_api_internal.h (82%) rename tensorflow/{contrib => }/lite/experimental/c/c_api_test.cc (95%) rename tensorflow/{contrib => }/lite/experimental/c/exported_symbols.lds (100%) rename tensorflow/{contrib => }/lite/experimental/c/version_script.lds (100%) rename tensorflow/{contrib => }/lite/experimental/examples/lstm/BUILD (91%) rename tensorflow/{contrib => }/lite/experimental/examples/lstm/tflite_lstm.py (99%) rename tensorflow/{contrib => }/lite/experimental/examples/lstm/unidirectional_sequence_lstm_test.py (96%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/.gitignore (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs.meta (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/AudioManager.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ClusterInputManager.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/DynamicsManager.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorBuildSettings.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorSettings.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/GraphicsSettings.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/InputManager.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NavMeshAreas.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NetworkManager.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/Physics2DSettings.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectSettings.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectVersion.txt (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/QualitySettings.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TagManager.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TimeManager.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/UnityConnectSettings.asset (100%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/README.md (88%) rename tensorflow/{contrib => }/lite/experimental/examples/unity/TensorFlowLitePlugin/UnityPackageManager/manifest.json (100%) rename tensorflow/{contrib => }/lite/experimental/kernels/BUILD (51%) rename tensorflow/{contrib => }/lite/experimental/kernels/ctc_beam_entry.h (94%) rename tensorflow/{contrib => }/lite/experimental/kernels/ctc_beam_scorer.h (91%) rename tensorflow/{contrib => }/lite/experimental/kernels/ctc_beam_search.h (96%) rename tensorflow/{contrib => }/lite/experimental/kernels/ctc_beam_search_decoder.cc (96%) rename tensorflow/{contrib => }/lite/experimental/kernels/ctc_beam_search_decoder_test.cc (97%) rename tensorflow/{contrib => }/lite/experimental/kernels/ctc_decoder.h (94%) rename tensorflow/{contrib => }/lite/experimental/kernels/ctc_loss_util.h (88%) rename tensorflow/{contrib => }/lite/experimental/kernels/top_n.h (98%) rename tensorflow/{contrib => }/lite/experimental/micro/BUILD (71%) rename tensorflow/{contrib => }/lite/experimental/micro/README.md (82%) rename tensorflow/{contrib => }/lite/experimental/micro/compatibility.h (86%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/BUILD (58%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/README.md (88%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc (88%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc (97%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h (80%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/no_features_data.cc (99%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/no_features_data.h (74%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc (90%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h (78%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/preprocessor.cc (98%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/preprocessor.h (68%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc (76%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc (99%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h (78%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc (97%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h (80%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/yes_features_data.cc (99%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/yes_features_data.h (74%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc (90%) rename tensorflow/{contrib => }/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h (77%) create mode 100644 tensorflow/lite/experimental/micro/kernels/BUILD rename tensorflow/{contrib => }/lite/experimental/micro/kernels/all_ops_resolver.cc (95%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/all_ops_resolver.h (70%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/depthwise_conv.cc (93%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/depthwise_conv_test.cc (97%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/fully_connected.cc (93%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/fully_connected_test.cc (98%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/softmax.cc (93%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/softmax_test.cc (94%) rename tensorflow/{contrib => }/lite/experimental/micro/kernels/test_utils.h (91%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_error_reporter.cc (96%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_error_reporter.h (82%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_error_reporter_test.cc (93%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_interpreter.cc (98%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_interpreter.h (81%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_interpreter_test.cc (98%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_mutable_op_resolver.cc (97%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_mutable_op_resolver.h (79%) rename tensorflow/{contrib => }/lite/experimental/micro/micro_mutable_op_resolver_test.cc (94%) rename tensorflow/{contrib => }/lite/experimental/micro/simple_tensor_allocator.cc (97%) rename tensorflow/{contrib => }/lite/experimental/micro/simple_tensor_allocator.h (78%) rename tensorflow/{contrib => }/lite/experimental/micro/simple_tensor_allocator_test.cc (97%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/BUILD (77%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/Dockerfile.bluepill (100%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/bluepill.resc (100%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/bluepill.robot (100%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/micro_test.bzl (96%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/micro_test.h (96%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/test_bluepill_binary.sh (83%) rename tensorflow/{contrib => }/lite/experimental/micro/testing/test_linux_binary.sh (100%) rename tensorflow/{contrib => }/lite/experimental/micro/tools/make/Makefile (73%) rename tensorflow/{contrib => }/lite/experimental/micro/tools/make/download_dependencies.sh (97%) rename tensorflow/{contrib => }/lite/experimental/micro/tools/make/targets/apollo3evb/_main.c (100%) rename tensorflow/{contrib => }/lite/experimental/micro/tools/make/targets/apollo3evb/apollo3evb.ld (100%) rename tensorflow/{contrib => }/lite/experimental/micro/tools/make/targets/apollo3evb_makefile.inc (93%) rename tensorflow/{contrib => }/lite/experimental/micro/tools/make/targets/bluepill_makefile.inc (87%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/BUILD (81%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/audio_microfrontend.cc (95%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/audio_microfrontend_test.cc (97%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/BUILD (100%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/README (100%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/bits.h (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/fft.c (96%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/fft.h (84%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/fft_io.c (95%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/fft_io.h (76%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/fft_test.cc (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/fft_util.c (96%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/fft_util.h (76%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/filterbank.c (96%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/filterbank.h (86%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/filterbank_io.c (97%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/filterbank_io.h (75%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/filterbank_test.cc (97%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/filterbank_util.c (99%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/filterbank_util.h (81%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend.c (94%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend.h (73%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_io.c (83%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_io.h (73%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_main.c (93%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_memmap_generator.c (86%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_memmap_main.c (96%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_test.cc (96%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_util.c (95%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/frontend_util.h (62%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_lut.c (95%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_lut.h (82%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_scale.c (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_scale.h (82%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_scale_io.c (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_scale_io.h (73%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_scale_test.cc (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_scale_util.c (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/log_scale_util.h (79%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/noise_reduction.c (95%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/noise_reduction.h (83%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/noise_reduction_io.c (94%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/noise_reduction_io.h (75%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/noise_reduction_test.cc (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/noise_reduction_util.c (95%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/noise_reduction_util.h (82%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/pcan_gain_control.c (92%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/pcan_gain_control.h (82%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/pcan_gain_control_test.cc (91%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/pcan_gain_control_util.c (97%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/pcan_gain_control_util.h (84%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/window.c (97%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/window.h (85%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/window_io.c (95%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/window_io.h (75%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/window_test.cc (97%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/window_util.c (96%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/lib/window_util.h (80%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/ops/audio_microfrontend_op.cc (98%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/python/kernel_tests/audio_microfrontend_op_test.py (98%) rename tensorflow/{contrib => }/lite/experimental/microfrontend/python/ops/audio_microfrontend_op.py (98%) rename tensorflow/{contrib => }/lite/experimental/writer/BUILD (61%) rename tensorflow/{contrib => }/lite/experimental/writer/enum_mapping.h (91%) rename tensorflow/{contrib => }/lite/experimental/writer/option_writer_generator.cc (99%) rename tensorflow/{contrib => }/lite/experimental/writer/writer.cc (89%) rename tensorflow/{contrib => }/lite/experimental/writer/writer_lib.cc (95%) rename tensorflow/{contrib => }/lite/experimental/writer/writer_lib.h (88%) rename tensorflow/{contrib => }/lite/experimental/writer/writer_lib_test.cc (89%) rename tensorflow/{contrib => }/lite/g3doc/_book.yaml (95%) rename tensorflow/{contrib => }/lite/g3doc/_index.yaml (99%) rename tensorflow/{contrib => }/lite/g3doc/_project.yaml (100%) rename tensorflow/{contrib => }/lite/g3doc/apis.md (99%) rename tensorflow/{contrib => }/lite/g3doc/convert/cmdline_examples.md (99%) rename tensorflow/{contrib => }/lite/g3doc/convert/cmdline_reference.md (100%) rename tensorflow/{contrib => }/lite/g3doc/convert/index.md (100%) rename tensorflow/{contrib => }/lite/g3doc/convert/python_api.md (87%) rename tensorflow/{contrib => }/lite/g3doc/custom_operators.md (98%) rename tensorflow/{contrib => }/lite/g3doc/demo_android.md (90%) rename tensorflow/{contrib => }/lite/g3doc/demo_ios.md (95%) rename tensorflow/{contrib => }/lite/g3doc/devguide.md (93%) rename tensorflow/{contrib => }/lite/g3doc/images/convert/sample_after.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/convert/sample_before.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/convert/workflow.svg (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/assistant_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/detect_crop_disease_in_africa.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/fishbrain_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/fishbrain_logo_big.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/gboard_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/gmail_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/loseit_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/loseit_logo_big.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/nest_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/photos_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/shazam_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/landing-page/vsco_logo.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/performance/model_size_vs_accuracy.png (100%) rename tensorflow/{contrib => }/lite/g3doc/images/performance/model_size_vs_latency.png (100%) rename tensorflow/{contrib => }/lite/g3doc/ios.md (78%) rename tensorflow/{contrib => }/lite/g3doc/models.md (100%) rename tensorflow/{contrib => }/lite/g3doc/ops_versioning.md (100%) rename tensorflow/{contrib => }/lite/g3doc/overview.md (97%) rename tensorflow/{contrib => }/lite/g3doc/performance/benchmarks.md (93%) rename tensorflow/{contrib => }/lite/g3doc/performance/best_practices.md (84%) rename tensorflow/{contrib => }/lite/g3doc/performance/model_optimization.md (100%) rename tensorflow/{contrib => }/lite/g3doc/performance/post_training_quantization.md (91%) rename tensorflow/{contrib => }/lite/g3doc/rpi.md (78%) rename tensorflow/{contrib => }/lite/g3doc/tf_ops_compatibility.md (100%) rename tensorflow/{contrib => }/lite/g3doc/tfmobile/android_build.md (100%) rename tensorflow/{contrib => }/lite/g3doc/tfmobile/index.md (100%) rename tensorflow/{contrib => }/lite/g3doc/tfmobile/ios_build.md (100%) rename tensorflow/{contrib => }/lite/g3doc/tfmobile/linking_libs.md (100%) rename tensorflow/{contrib => }/lite/g3doc/tfmobile/optimizing.md (100%) rename tensorflow/{contrib => }/lite/g3doc/tfmobile/prepare_models.md (100%) rename tensorflow/{contrib => }/lite/graph_info.cc (99%) rename tensorflow/{contrib => }/lite/graph_info.h (93%) rename tensorflow/{contrib => }/lite/graph_info_test.cc (99%) rename tensorflow/{contrib => }/lite/interpreter.cc (98%) rename tensorflow/{contrib => }/lite/interpreter.h (98%) rename tensorflow/{contrib => }/lite/interpreter_test.cc (99%) rename tensorflow/{contrib => }/lite/java/AndroidManifest.xml (100%) rename tensorflow/{contrib => }/lite/java/BUILD (88%) rename tensorflow/{contrib => }/lite/java/aar_with_jni.bzl (100%) rename tensorflow/{contrib => }/lite/java/build_aar_for_release.sh (98%) rename tensorflow/{contrib => }/lite/java/demo/.gitignore (100%) rename tensorflow/{contrib => }/lite/java/demo/README.md (93%) rename tensorflow/{contrib => }/lite/java/demo/app/build.gradle (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/AndroidManifest.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/BUILD (78%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/assets/BUILD (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/assets/labels_imagenet_slim.txt (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/assets/labels_mobilenet_quant_v1_224.txt (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/AutoFitTextureView.java (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/Camera2BasicFragment.java (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/CameraActivity.java (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifier.java (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierFloatInception.java (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierQuantizedMobileNet.java (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-hdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-hdpi/tile.9.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-mdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_action_info.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/drawable-xxhdpi/logo.png (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/layout-land/fragment_camera2_basic.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/layout/activity_camera.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values-sw600dp/template-dimens.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values-sw600dp/template-styles.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values-v11/template-styles.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values-v21/base-colors.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values-v21/base-template-styles.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values/base-strings.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values/colors.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values/strings.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values/styles.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values/template-dimens.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/app/src/main/res/values/template-styles.xml (100%) rename tensorflow/{contrib => }/lite/java/demo/build.gradle (100%) rename tensorflow/{contrib => }/lite/java/demo/gradle.properties (100%) rename tensorflow/{contrib => }/lite/java/demo/gradle/wrapper/gradle-wrapper.jar (100%) rename tensorflow/{contrib => }/lite/java/demo/gradle/wrapper/gradle-wrapper.properties (100%) rename tensorflow/{contrib => }/lite/java/demo/gradlew (100%) rename tensorflow/{contrib => }/lite/java/demo/gradlew.bat (100%) rename tensorflow/{contrib => }/lite/java/demo/settings.gradle (100%) rename tensorflow/{contrib => }/lite/java/ovic/BUILD (63%) rename tensorflow/{contrib => }/lite/java/ovic/README.md (87%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/AndroidManifest.xml (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/BUILD (62%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/OvicBenchmarkerActivity.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/build.gradle (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/res/drawable-mdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/res/drawable-xhdpi/ic_launcher.png (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/res/drawable/start_button_color.xml (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/res/layout/activity_main.xml (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/res/values/dimens.xml (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/app/res/values/strings.xml (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/build.gradle (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/gradle.properties (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.properties (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/gradlew (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/gradlew.bat (100%) rename tensorflow/{contrib => }/lite/java/ovic/demo/settings.gradle (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/BoundingBox.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicBenchmarker.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassificationResult.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifier.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifierBenchmarker.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectionResult.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetector.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectorBenchmarker.java (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicValidator.java (98%) rename tensorflow/{contrib => }/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicClassifierTest.java (98%) rename tensorflow/{contrib => }/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicDetectorTest.java (98%) rename tensorflow/{contrib => }/lite/java/ovic/src/testdata/BUILD (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/testdata/coco_labels.txt (100%) rename tensorflow/{contrib => }/lite/java/ovic/src/testdata/labels.txt (100%) rename tensorflow/{contrib => }/lite/java/proguard.flags (100%) rename tensorflow/{contrib => }/lite/java/src/main/java/org/tensorflow/lite/DataType.java (100%) rename tensorflow/{contrib => }/lite/java/src/main/java/org/tensorflow/lite/Delegate.java (100%) rename tensorflow/{contrib => }/lite/java/src/main/java/org/tensorflow/lite/Interpreter.java (100%) rename tensorflow/{contrib => }/lite/java/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java (100%) rename tensorflow/{contrib => }/lite/java/src/main/java/org/tensorflow/lite/Tensor.java (100%) rename tensorflow/{contrib => }/lite/java/src/main/java/org/tensorflow/lite/TensorFlowLite.java (100%) rename tensorflow/{contrib => }/lite/java/src/main/java/org/tensorflow/lite/package-info.java (100%) rename tensorflow/{contrib => }/lite/java/src/main/native/BUILD (90%) rename tensorflow/{contrib => }/lite/java/src/main/native/builtin_ops_jni.cc (95%) rename tensorflow/{contrib => }/lite/java/src/main/native/exception_jni.cc (96%) rename tensorflow/{contrib => }/lite/java/src/main/native/exception_jni.h (84%) rename tensorflow/{contrib => }/lite/java/src/main/native/init_tensorflow_jni.cc (85%) rename tensorflow/{contrib => }/lite/java/src/main/native/init_tensorflow_jni.h (81%) rename tensorflow/{contrib => }/lite/java/src/main/native/nativeinterpreterwrapper_jni.cc (99%) rename tensorflow/{contrib => }/lite/java/src/main/native/nativeinterpreterwrapper_jni.h (93%) rename tensorflow/{contrib => }/lite/java/src/main/native/tensor_jni.cc (98%) rename tensorflow/{contrib => }/lite/java/src/main/native/tensor_jni.h (93%) rename tensorflow/{contrib => }/lite/java/src/main/native/tensorflow_lite_jni.cc (88%) rename tensorflow/{contrib => }/lite/java/src/main/native/tensorflow_lite_jni.h (81%) rename tensorflow/{contrib => }/lite/java/src/main/native/version_script.lds (100%) rename tensorflow/{contrib => }/lite/java/src/test/java/org/tensorflow/lite/DataTypeTest.java (100%) rename tensorflow/{contrib => }/lite/java/src/test/java/org/tensorflow/lite/InterpreterFlexTest.java (96%) rename tensorflow/{contrib => }/lite/java/src/test/java/org/tensorflow/lite/InterpreterTest.java (98%) rename tensorflow/{contrib => }/lite/java/src/test/java/org/tensorflow/lite/NativeInterpreterWrapperTest.java (97%) rename tensorflow/{contrib => }/lite/java/src/test/java/org/tensorflow/lite/TensorFlowLiteTest.java (100%) rename tensorflow/{contrib => }/lite/java/src/test/java/org/tensorflow/lite/TensorTest.java (99%) rename tensorflow/{contrib => }/lite/java/src/test/native/BUILD (70%) rename tensorflow/{contrib => }/lite/java/src/test/native/interpreter_test_jni.cc (98%) rename tensorflow/{contrib => }/lite/java/src/testdata/add.bin (100%) rename tensorflow/{contrib => }/lite/java/src/testdata/float32.bin (100%) rename tensorflow/{contrib => }/lite/java/src/testdata/int32.bin (100%) rename tensorflow/{contrib => }/lite/java/src/testdata/int64.bin (100%) rename tensorflow/{contrib => }/lite/java/src/testdata/invalid_model.bin (100%) rename tensorflow/{contrib => }/lite/java/src/testdata/quantized.bin (100%) rename tensorflow/{contrib => }/lite/java/src/testdata/uint8.bin (100%) rename tensorflow/{contrib => }/lite/java/src/testdata/with_custom_op.lite (100%) rename tensorflow/{contrib => }/lite/java/src/testhelper/java/org/tensorflow/lite/BUILD (85%) rename tensorflow/{contrib => }/lite/java/src/testhelper/java/org/tensorflow/lite/TestHelper.java (100%) rename tensorflow/{contrib => }/lite/kernels/BUILD (68%) rename tensorflow/{contrib => }/lite/kernels/activation_functor.h (86%) rename tensorflow/{contrib => }/lite/kernels/activations.cc (98%) rename tensorflow/{contrib => }/lite/kernels/activations_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/add.cc (96%) rename tensorflow/{contrib => }/lite/kernels/add_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/arg_min_max.cc (93%) rename tensorflow/{contrib => }/lite/kernels/arg_min_max_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/audio_spectrogram.cc (91%) rename tensorflow/{contrib => }/lite/kernels/audio_spectrogram_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/basic_rnn.cc (96%) rename tensorflow/{contrib => }/lite/kernels/basic_rnn_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/batch_to_space_nd.cc (93%) rename tensorflow/{contrib => }/lite/kernels/batch_to_space_nd_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/bidirectional_sequence_lstm.cc (99%) rename tensorflow/{contrib => }/lite/kernels/bidirectional_sequence_lstm_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/bidirectional_sequence_rnn.cc (98%) rename tensorflow/{contrib => }/lite/kernels/bidirectional_sequence_rnn_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/cast.cc (91%) rename tensorflow/{contrib => }/lite/kernels/cast_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/comparisons.cc (97%) rename tensorflow/{contrib => }/lite/kernels/comparisons_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/concatenation.cc (94%) rename tensorflow/{contrib => }/lite/kernels/concatenation_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/conv.cc (96%) rename tensorflow/{contrib => }/lite/kernels/conv_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/depthwise_conv.cc (94%) rename tensorflow/{contrib => }/lite/kernels/depthwise_conv_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/dequantize.cc (90%) rename tensorflow/{contrib => }/lite/kernels/dequantize_test.cc (90%) rename tensorflow/{contrib => }/lite/kernels/detection_postprocess.cc (98%) rename tensorflow/{contrib => }/lite/kernels/detection_postprocess_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/div.cc (91%) rename tensorflow/{contrib => }/lite/kernels/div_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/eigen_support.cc (94%) rename tensorflow/{contrib => }/lite/kernels/eigen_support.h (85%) rename tensorflow/{contrib => }/lite/kernels/elementwise.cc (96%) rename tensorflow/{contrib => }/lite/kernels/elementwise_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/embedding_lookup.cc (96%) rename tensorflow/{contrib => }/lite/kernels/embedding_lookup_sparse.cc (96%) rename tensorflow/{contrib => }/lite/kernels/embedding_lookup_sparse_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/embedding_lookup_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/exp.cc (88%) rename tensorflow/{contrib => }/lite/kernels/exp_test.cc (91%) rename tensorflow/{contrib => }/lite/kernels/expand_dims.cc (90%) rename tensorflow/{contrib => }/lite/kernels/expand_dims_test.cc (90%) rename tensorflow/{contrib => }/lite/kernels/fake_quant.cc (89%) rename tensorflow/{contrib => }/lite/kernels/fake_quant_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/floor.cc (88%) rename tensorflow/{contrib => }/lite/kernels/floor_div.cc (93%) rename tensorflow/{contrib => }/lite/kernels/floor_div_test.cc (93%) rename tensorflow/{contrib => }/lite/kernels/floor_mod.cc (94%) rename tensorflow/{contrib => }/lite/kernels/floor_mod_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/floor_test.cc (93%) rename tensorflow/{contrib => }/lite/kernels/fully_connected.cc (96%) rename tensorflow/{contrib => }/lite/kernels/fully_connected_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/gather.cc (92%) rename tensorflow/{contrib => }/lite/kernels/gather_test.cc (94%) rename tensorflow/{contrib => }/lite/kernels/gemm_support.cc (95%) rename tensorflow/{contrib => }/lite/kernels/gemm_support.h (89%) rename tensorflow/{contrib => }/lite/kernels/hashtable_lookup.cc (94%) rename tensorflow/{contrib => }/lite/kernels/hashtable_lookup_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/internal/BUILD (89%) rename tensorflow/{contrib => }/lite/kernels/internal/batch_to_space_nd_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/internal/common.h (97%) rename tensorflow/{contrib => }/lite/kernels/internal/compatibility.h (92%) rename tensorflow/{contrib => }/lite/kernels/internal/depthwiseconv_float_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/internal/depthwiseconv_quantized_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/internal/kernel_utils.cc (99%) rename tensorflow/{contrib => }/lite/kernels/internal/kernel_utils.h (94%) rename tensorflow/{contrib => }/lite/kernels/internal/legacy_types.h (74%) rename tensorflow/{contrib => }/lite/kernels/internal/log_quantized_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/internal/logsoftmax_quantized_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/internal/mfcc.cc (97%) rename tensorflow/{contrib => }/lite/kernels/internal/mfcc.h (88%) rename tensorflow/{contrib => }/lite/kernels/internal/mfcc_dct.cc (97%) rename tensorflow/{contrib => }/lite/kernels/internal/mfcc_dct.h (86%) rename tensorflow/{contrib => }/lite/kernels/internal/mfcc_mel_filterbank.cc (99%) rename tensorflow/{contrib => }/lite/kernels/internal/mfcc_mel_filterbank.h (91%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/cblas_conv.h (90%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/cblas_reference.h (89%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/cpu_check.h (89%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/depthwiseconv_float.h (99%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/depthwiseconv_uint8.h (99%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h (99%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/eigen_spatial_convolutions.h (95%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h (95%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h (95%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/legacy_optimized_ops.h (99%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/multithreaded_conv.h (92%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/neon_tensor_utils.cc (98%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/neon_tensor_utils.h (93%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/optimized_ops.h (99%) rename tensorflow/{contrib => }/lite/kernels/internal/optimized/tensor_utils_impl.h (96%) rename tensorflow/{contrib => }/lite/kernels/internal/quantization_util.cc (98%) rename tensorflow/{contrib => }/lite/kernels/internal/quantization_util.h (96%) rename tensorflow/{contrib => }/lite/kernels/internal/quantization_util_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/depthwiseconv_float.h (90%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/depthwiseconv_uint8.h (91%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/fully_connected.h (96%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/legacy_reference_ops.h (99%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/portable_tensor_utils.cc (97%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/portable_tensor_utils.h (97%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/reference_ops.h (99%) rename tensorflow/{contrib => }/lite/kernels/internal/reference/softmax.h (92%) rename tensorflow/{contrib => }/lite/kernels/internal/resize_bilinear_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/internal/resize_nearest_neighbor_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/internal/round.h (86%) rename tensorflow/{contrib => }/lite/kernels/internal/softmax_quantized_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/internal/spectrogram.cc (99%) rename tensorflow/{contrib => }/lite/kernels/internal/spectrogram.h (95%) rename tensorflow/{contrib => }/lite/kernels/internal/strided_slice_logic.h (94%) rename tensorflow/{contrib => }/lite/kernels/internal/tensor.h (91%) rename tensorflow/{contrib => }/lite/kernels/internal/tensor_ctypes.h (89%) rename tensorflow/{contrib => }/lite/kernels/internal/tensor_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/internal/tensor_utils.cc (74%) rename tensorflow/{contrib => }/lite/kernels/internal/tensor_utils.h (96%) rename tensorflow/{contrib => }/lite/kernels/internal/tensor_utils_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/internal/test_util.cc (98%) rename tensorflow/{contrib => }/lite/kernels/internal/test_util.h (93%) rename tensorflow/{contrib => }/lite/kernels/internal/types.h (98%) rename tensorflow/{contrib => }/lite/kernels/kernel_util.cc (97%) rename tensorflow/{contrib => }/lite/kernels/kernel_util.h (95%) rename tensorflow/{contrib => }/lite/kernels/kernel_util_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/l2norm.cc (90%) rename tensorflow/{contrib => }/lite/kernels/l2norm_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/layer_norm_lstm.cc (99%) rename tensorflow/{contrib => }/lite/kernels/layer_norm_lstm_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/local_response_norm.cc (89%) rename tensorflow/{contrib => }/lite/kernels/local_response_norm_test.cc (94%) rename tensorflow/{contrib => }/lite/kernels/log_softmax_test.cc (91%) rename tensorflow/{contrib => }/lite/kernels/logical.cc (93%) rename tensorflow/{contrib => }/lite/kernels/logical_test.cc (94%) rename tensorflow/{contrib => }/lite/kernels/lsh_projection.cc (96%) rename tensorflow/{contrib => }/lite/kernels/lsh_projection_test.cc (94%) rename tensorflow/{contrib => }/lite/kernels/lstm.cc (98%) rename tensorflow/{contrib => }/lite/kernels/lstm_eval.cc (99%) rename tensorflow/{contrib => }/lite/kernels/lstm_eval.h (93%) rename tensorflow/{contrib => }/lite/kernels/lstm_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/maximum_minimum.cc (93%) rename tensorflow/{contrib => }/lite/kernels/maximum_minimum_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/mfcc.cc (89%) rename tensorflow/{contrib => }/lite/kernels/mfcc_test.cc (93%) rename tensorflow/{contrib => }/lite/kernels/mul.cc (95%) rename tensorflow/{contrib => }/lite/kernels/mul_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/neg.cc (95%) rename tensorflow/{contrib => }/lite/kernels/neg_test.cc (91%) rename tensorflow/{contrib => }/lite/kernels/one_hot.cc (95%) rename tensorflow/{contrib => }/lite/kernels/one_hot_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/op_macros.h (88%) rename tensorflow/{contrib => }/lite/kernels/optional_tensor_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/pack.cc (93%) rename tensorflow/{contrib => }/lite/kernels/pack_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/pad.cc (96%) rename tensorflow/{contrib => }/lite/kernels/pad_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/padding.h (90%) rename tensorflow/{contrib => }/lite/kernels/pooling.cc (96%) rename tensorflow/{contrib => }/lite/kernels/pooling_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/pow.cc (93%) rename tensorflow/{contrib => }/lite/kernels/pow_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/range.cc (93%) rename tensorflow/{contrib => }/lite/kernels/range_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/reduce.cc (97%) rename tensorflow/{contrib => }/lite/kernels/reduce_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/register.cc (99%) rename tensorflow/{contrib => }/lite/kernels/register.h (78%) rename tensorflow/{contrib => }/lite/kernels/relu1.cc (92%) rename tensorflow/{contrib => }/lite/kernels/relu1_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/reshape.cc (94%) rename tensorflow/{contrib => }/lite/kernels/reshape_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/resize_bilinear.cc (92%) rename tensorflow/{contrib => }/lite/kernels/resize_bilinear_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/resize_nearest_neighbor.cc (92%) rename tensorflow/{contrib => }/lite/kernels/resize_nearest_neighbor_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/select.cc (94%) rename tensorflow/{contrib => }/lite/kernels/select_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/shape.cc (91%) rename tensorflow/{contrib => }/lite/kernels/shape_test.cc (93%) rename tensorflow/{contrib => }/lite/kernels/skip_gram.cc (94%) rename tensorflow/{contrib => }/lite/kernels/skip_gram_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/slice.cc (95%) rename tensorflow/{contrib => }/lite/kernels/slice_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/softmax_test.cc (93%) rename tensorflow/{contrib => }/lite/kernels/space_to_batch_nd.cc (94%) rename tensorflow/{contrib => }/lite/kernels/space_to_batch_nd_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/space_to_depth.cc (91%) rename tensorflow/{contrib => }/lite/kernels/space_to_depth_test.cc (94%) rename tensorflow/{contrib => }/lite/kernels/sparse_output_fully_connected.cc (97%) rename tensorflow/{contrib => }/lite/kernels/sparse_output_fully_connected_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/sparse_to_dense.cc (95%) rename tensorflow/{contrib => }/lite/kernels/sparse_to_dense_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/split.cc (92%) rename tensorflow/{contrib => }/lite/kernels/split_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/squeeze.cc (92%) rename tensorflow/{contrib => }/lite/kernels/squeeze_test.cc (95%) rename tensorflow/{contrib => }/lite/kernels/strided_slice.cc (96%) rename tensorflow/{contrib => }/lite/kernels/strided_slice_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/sub.cc (94%) rename tensorflow/{contrib => }/lite/kernels/sub_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/svdf.cc (98%) rename tensorflow/{contrib => }/lite/kernels/svdf_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/test_util.cc (98%) rename tensorflow/{contrib => }/lite/kernels/test_util.h (96%) rename tensorflow/{contrib => }/lite/kernels/test_util_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/tile.cc (95%) rename tensorflow/{contrib => }/lite/kernels/tile_test.cc (96%) rename tensorflow/{contrib => }/lite/kernels/topk_v2.cc (96%) rename tensorflow/{contrib => }/lite/kernels/topk_v2_test.cc (94%) rename tensorflow/{contrib => }/lite/kernels/transpose.cc (93%) rename tensorflow/{contrib => }/lite/kernels/transpose_conv.cc (95%) rename tensorflow/{contrib => }/lite/kernels/transpose_conv_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/transpose_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/unidirectional_sequence_lstm.cc (98%) rename tensorflow/{contrib => }/lite/kernels/unidirectional_sequence_lstm_test.cc (99%) rename tensorflow/{contrib => }/lite/kernels/unidirectional_sequence_rnn.cc (97%) rename tensorflow/{contrib => }/lite/kernels/unidirectional_sequence_rnn_test.cc (98%) rename tensorflow/{contrib => }/lite/kernels/unpack.cc (93%) rename tensorflow/{contrib => }/lite/kernels/unpack_test.cc (97%) rename tensorflow/{contrib => }/lite/kernels/zeros_like.cc (93%) rename tensorflow/{contrib => }/lite/kernels/zeros_like_test.cc (92%) rename tensorflow/{contrib => }/lite/lib_package/BUILD (100%) rename tensorflow/{contrib => }/lite/lib_package/concat_licenses.sh (100%) rename tensorflow/{contrib => }/lite/lib_package/create_ios_frameworks.sh (87%) rename tensorflow/{contrib => }/lite/memory_planner.h (88%) rename tensorflow/{contrib => }/lite/mmap_allocation.cc (94%) rename tensorflow/{contrib => }/lite/mmap_allocation_disabled.cc (96%) rename tensorflow/{contrib => }/lite/model.cc (97%) rename tensorflow/{contrib => }/lite/model.h (95%) rename tensorflow/{contrib => }/lite/model_flex_test.cc (86%) rename tensorflow/{contrib => }/lite/model_test.cc (91%) rename tensorflow/{contrib => }/lite/models/BUILD (74%) rename tensorflow/{contrib => }/lite/models/smartreply/BUILD (60%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/AndroidManifest.xml (100%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/BUILD (88%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/assets/BUILD (100%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/assets/backoff_response.txt (100%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/MainActivity.java (100%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReply.java (100%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReplyClient.java (100%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/res/layout/main_activity.xml (100%) rename tensorflow/{contrib => }/lite/models/smartreply/demo/app/src/main/smartreply_jni.cc (97%) rename tensorflow/{contrib => }/lite/models/smartreply/g3doc/README.md (98%) rename tensorflow/{contrib => }/lite/models/smartreply/ops/extract_feature.cc (95%) rename tensorflow/{contrib => }/lite/models/smartreply/ops/extract_feature_test.cc (93%) rename tensorflow/{contrib => }/lite/models/smartreply/ops/normalize.cc (95%) rename tensorflow/{contrib => }/lite/models/smartreply/ops/normalize_test.cc (90%) rename tensorflow/{contrib => }/lite/models/smartreply/ops/predict.cc (99%) rename tensorflow/{contrib => }/lite/models/smartreply/ops/predict_test.cc (95%) rename tensorflow/{contrib => }/lite/models/smartreply/predictor.cc (92%) rename tensorflow/{contrib => }/lite/models/smartreply/predictor.h (91%) rename tensorflow/{contrib => }/lite/models/smartreply/predictor_test.cc (94%) rename tensorflow/{contrib => }/lite/models/speech_test.cc (96%) rename tensorflow/{contrib => }/lite/models/testdata/g3doc/README.md (93%) rename tensorflow/{contrib => }/lite/models/testdata/g3doc/asr_am.svg (100%) rename tensorflow/{contrib => }/lite/models/testdata/g3doc/asr_lm.svg (100%) rename tensorflow/{contrib => }/lite/models/testdata/g3doc/endpointer.svg (100%) rename tensorflow/{contrib => }/lite/models/testdata/g3doc/hotword.svg (100%) rename tensorflow/{contrib => }/lite/models/testdata/g3doc/speakerid.svg (100%) rename tensorflow/{contrib => }/lite/models/testdata/g3doc/tts.svg (100%) rename tensorflow/{contrib => }/lite/models/testdata/smartreply_samples.tsv (100%) rename tensorflow/{contrib => }/lite/models/testdata/speech_asr_lm_model.test_spec (100%) rename tensorflow/{contrib => }/lite/mutable_op_resolver.cc (97%) rename tensorflow/{contrib => }/lite/mutable_op_resolver.h (91%) rename tensorflow/{contrib => }/lite/mutable_op_resolver_test.cc (98%) rename tensorflow/{contrib => }/lite/nnapi/BUILD (100%) rename tensorflow/{contrib => }/lite/nnapi/NeuralNetworksShim.h (99%) rename tensorflow/{contrib => }/lite/nnapi/README.md (100%) rename tensorflow/{contrib => }/lite/nnapi_delegate.cc (99%) rename tensorflow/{contrib => }/lite/nnapi_delegate.h (86%) rename tensorflow/{contrib => }/lite/nnapi_delegate_disabled.cc (96%) rename tensorflow/{contrib => }/lite/op_resolver.h (73%) rename tensorflow/{contrib => }/lite/optional_debug_tools.cc (98%) rename tensorflow/{contrib => }/lite/optional_debug_tools.h (80%) rename tensorflow/{contrib => }/lite/profiling/BUILD (71%) rename tensorflow/{contrib => }/lite/profiling/profile_buffer.h (95%) rename tensorflow/{contrib => }/lite/profiling/profile_buffer_test.cc (96%) rename tensorflow/{contrib => }/lite/profiling/profile_summarizer.cc (97%) rename tensorflow/{contrib => }/lite/profiling/profile_summarizer.h (84%) rename tensorflow/{contrib => }/lite/profiling/profile_summarizer_test.cc (93%) rename tensorflow/{contrib => }/lite/profiling/profiler.h (95%) rename tensorflow/{contrib => }/lite/profiling/profiler_test.cc (97%) rename tensorflow/{contrib => }/lite/profiling/time.cc (96%) rename tensorflow/{contrib => }/lite/profiling/time.h (84%) create mode 100644 tensorflow/lite/python/BUILD rename tensorflow/{contrib => }/lite/python/convert.py (98%) rename tensorflow/{contrib => }/lite/python/convert_saved_model.py (99%) rename tensorflow/{contrib => }/lite/python/convert_saved_model_test.py (99%) rename tensorflow/{contrib => }/lite/python/convert_test.py (98%) rename tensorflow/{contrib => }/lite/python/create_custom_op.py (98%) rename tensorflow/{contrib => }/lite/python/interpreter.py (99%) rename tensorflow/{contrib => }/lite/python/interpreter_test.py (98%) rename tensorflow/{contrib => }/lite/python/interpreter_wrapper/BUILD (86%) rename tensorflow/{contrib => }/lite/python/interpreter_wrapper/interpreter_wrapper.cc (98%) rename tensorflow/{contrib => }/lite/python/interpreter_wrapper/interpreter_wrapper.h (93%) rename tensorflow/{contrib => }/lite/python/interpreter_wrapper/interpreter_wrapper.i (88%) rename tensorflow/{contrib => }/lite/python/lite.py (94%) rename tensorflow/{contrib => }/lite/python/lite_constants.py (94%) rename tensorflow/{contrib => }/lite/python/lite_test.py (99%) rename tensorflow/{contrib => }/lite/python/op_hint.py (99%) rename tensorflow/{contrib => }/lite/python/tflite_convert.py (98%) rename tensorflow/{contrib => }/lite/schema/BUILD (96%) rename tensorflow/{contrib => }/lite/schema/builtin_ops_header/BUILD (86%) rename tensorflow/{contrib => }/lite/schema/builtin_ops_header/README.md (65%) rename tensorflow/{contrib => }/lite/schema/builtin_ops_header/consistency_test.cc (93%) rename tensorflow/{contrib => }/lite/schema/builtin_ops_header/generate.cc (92%) rename tensorflow/{contrib => }/lite/schema/builtin_ops_header/generator.cc (92%) rename tensorflow/{contrib => }/lite/schema/builtin_ops_header/generator.h (86%) rename tensorflow/{contrib => }/lite/schema/builtin_ops_header/generator_test.cc (96%) rename tensorflow/{contrib => }/lite/schema/flatbuffer_compatibility_test.cc (96%) rename tensorflow/{contrib => }/lite/schema/schema.fbs (100%) rename tensorflow/{contrib => }/lite/schema/schema_generated.h (100%) rename tensorflow/{contrib => }/lite/schema/schema_v0.fbs (100%) rename tensorflow/{contrib => }/lite/schema/schema_v1.fbs (100%) rename tensorflow/{contrib => }/lite/schema/schema_v2.fbs (100%) rename tensorflow/{contrib => }/lite/schema/schema_v3.fbs (100%) rename tensorflow/{contrib => }/lite/schema/upgrade_schema.py (97%) rename tensorflow/{contrib => }/lite/schema/upgrade_schema_test.py (99%) rename tensorflow/{contrib => }/lite/simple_memory_arena.cc (98%) rename tensorflow/{contrib => }/lite/simple_memory_arena.h (92%) rename tensorflow/{contrib => }/lite/simple_memory_arena_test.cc (97%) rename tensorflow/{contrib => }/lite/special_rules.bzl (59%) rename tensorflow/{contrib => }/lite/stderr_reporter.cc (96%) rename tensorflow/{contrib => }/lite/stderr_reporter.h (78%) rename tensorflow/{contrib => }/lite/string.h (86%) rename tensorflow/{contrib => }/lite/string_util.cc (97%) rename tensorflow/{contrib => }/lite/string_util.h (93%) rename tensorflow/{contrib => }/lite/string_util_test.cc (94%) rename tensorflow/{contrib => }/lite/testdata/0_subgraphs.bin (100%) rename tensorflow/{contrib => }/lite/testdata/2_subgraphs.bin (100%) rename tensorflow/{contrib => }/lite/testdata/add.bin (100%) rename tensorflow/{contrib => }/lite/testdata/add.json (100%) rename tensorflow/{contrib => }/lite/testdata/add_quantized.bin (100%) rename tensorflow/{contrib => }/lite/testdata/add_quantized.json (100%) rename tensorflow/{contrib => }/lite/testdata/empty_model.bin (100%) rename tensorflow/{contrib => }/lite/testdata/multi_add.bin (100%) rename tensorflow/{contrib => }/lite/testdata/multi_add.json (100%) rename tensorflow/{contrib => }/lite/testdata/multi_add.pb (100%) rename tensorflow/{contrib => }/lite/testdata/multi_add_flex.bin (100%) rename tensorflow/{contrib => }/lite/testdata/no_subgraphs.bin (100%) rename tensorflow/{contrib => }/lite/testdata/test_model.bin (100%) rename tensorflow/{contrib => }/lite/testdata/test_model_broken.bin (100%) rename tensorflow/{contrib => }/lite/testdata/test_model_broken.json (100%) rename tensorflow/{contrib => }/lite/testdata/two_subgraphs.bin (100%) rename tensorflow/{contrib => }/lite/testing/BUILD (80%) rename tensorflow/{contrib => }/lite/testing/generate_examples.py (99%) rename tensorflow/{contrib => }/lite/testing/generate_examples_report.py (100%) rename tensorflow/{contrib => }/lite/testing/generate_testspec.cc (95%) rename tensorflow/{contrib => }/lite/testing/generate_testspec.h (91%) rename tensorflow/{contrib => }/lite/testing/generate_testspec_test.cc (96%) rename tensorflow/{contrib => }/lite/testing/generated_examples_zip_test.cc (98%) rename tensorflow/{contrib => }/lite/testing/init_tensorflow.cc (94%) rename tensorflow/{contrib => }/lite/testing/init_tensorflow.h (82%) rename tensorflow/{contrib => }/lite/testing/join.h (89%) rename tensorflow/{contrib => }/lite/testing/join_test.cc (96%) rename tensorflow/{contrib => }/lite/testing/message.cc (96%) rename tensorflow/{contrib => }/lite/testing/message.h (94%) rename tensorflow/{contrib => }/lite/testing/message_test.cc (98%) rename tensorflow/{contrib => }/lite/testing/model_coverage/BUILD (85%) rename tensorflow/{contrib => }/lite/testing/model_coverage/model_coverage_lib.py (98%) rename tensorflow/{contrib => }/lite/testing/model_coverage/model_coverage_lib_test.py (97%) rename tensorflow/{contrib => }/lite/testing/nnapi_example.cc (91%) rename tensorflow/{contrib => }/lite/testing/parse_testdata.cc (98%) rename tensorflow/{contrib => }/lite/testing/parse_testdata.h (89%) rename tensorflow/{contrib => }/lite/testing/split.cc (96%) rename tensorflow/{contrib => }/lite/testing/split.h (93%) rename tensorflow/{contrib => }/lite/testing/split_test.cc (97%) rename tensorflow/{contrib => }/lite/testing/test_runner.h (95%) rename tensorflow/{contrib => }/lite/testing/test_runner_test.cc (97%) rename tensorflow/{contrib => }/lite/testing/tf_driver.cc (97%) rename tensorflow/{contrib => }/lite/testing/tf_driver.h (90%) rename tensorflow/{contrib => }/lite/testing/tf_driver_test.cc (93%) rename tensorflow/{contrib => }/lite/testing/tflite_diff_example_test.cc (90%) rename tensorflow/{contrib => }/lite/testing/tflite_diff_flags.h (92%) rename tensorflow/{contrib => }/lite/testing/tflite_diff_util.cc (85%) rename tensorflow/{contrib => }/lite/testing/tflite_diff_util.h (89%) rename tensorflow/{contrib => }/lite/testing/tflite_driver.cc (97%) rename tensorflow/{contrib => }/lite/testing/tflite_driver.h (81%) rename tensorflow/{contrib => }/lite/testing/tflite_driver_test.cc (93%) rename tensorflow/{contrib => }/lite/testing/tokenize.cc (96%) rename tensorflow/{contrib => }/lite/testing/tokenize.h (89%) rename tensorflow/{contrib => }/lite/testing/tokenize_test.cc (98%) rename tensorflow/{contrib => }/lite/testing/util.h (85%) rename tensorflow/{contrib => }/lite/toco/BUILD (96%) rename tensorflow/{contrib => }/lite/toco/README.md (100%) rename tensorflow/{contrib => }/lite/toco/allocate_transient_arrays.cc (98%) rename tensorflow/{contrib => }/lite/toco/allocate_transient_arrays.h (87%) rename tensorflow/{contrib => }/lite/toco/args.h (97%) rename tensorflow/{contrib => }/lite/toco/dump_graphviz.cc (97%) rename tensorflow/{contrib => }/lite/toco/dump_graphviz.h (78%) rename tensorflow/{contrib => }/lite/toco/export_tensorflow.cc (99%) rename tensorflow/{contrib => }/lite/toco/export_tensorflow.h (79%) rename tensorflow/{contrib => }/lite/toco/format_port.h (92%) rename tensorflow/{contrib => }/lite/toco/g3doc/README.md (100%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_expanddims_to_reshape.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_pure_conv_to_depthwise.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_reorder_axes.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_squeeze_to_reshape.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_trivial_addn_to_add.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_trivial_pack_to_reshape.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_trivial_tile_to_concat.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/convert_trivial_transpose_to_reshape.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/create_im2col_arrays.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/dequantize.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/drop_fake_quant.cc (86%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/drop_im2col_arrays.cc (88%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/ensure_bias_vectors.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/fuse_activation_functions.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/fuse_binary_into_following_affine.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/fuse_binary_into_preceding_affine.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/fuse_broadcast_into_following_binary.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/graph_transformations.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/graph_transformations.h (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/hardcode_min_max.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_dilated_conv.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_l2_normalization.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_l2_pool.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_lstm.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_lstm_merge_inputs.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_lstm_split_inputs.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_prelu.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/identify_relu1.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/lstm_utils.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/lstm_utils.h (92%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/make_initial_dequantize_operator.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/merge_reshape_into_preceding_transpose.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/move_binary_operator_before_reshape.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/propagate_activation_function_into_constants.cc (92%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/propagate_array_data_types.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/propagate_default_min_max.cc (92%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/propagate_fake_quant_num_bits.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/propagate_fixed_sizes.cc (99%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/quantization_util.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/quantization_util.h (85%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/quantize.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/read_array_minmax_and_narrow_range_from_fake_quant.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_final_dequantize_op.cc (90%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_tensorflow_assert.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_tensorflow_identity.cc (83%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_binary.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_concatenation.cc (83%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_concatenation_input.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_fake_quant.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_passthrough.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_passthrough.h (86%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_quantized_activation_func.cc (89%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_quantized_min_max.cc (87%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_reshape.cc (92%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_trivial_slice.cc (88%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/remove_unused_op.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/reorder_elementwise_unary.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/reorder_reshape_transpose.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_batch_normalization.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_batch_to_space_nd_attributes.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_binary.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_concatenation.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_fake_quant.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_fill.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_gather.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_pack.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_random_uniform.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_range.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_reshape.cc (95%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_select.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_shape_or_rank.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_slice.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_strided_slice.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_tile.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_transpose.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_constant_unary.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_fake_quant_args_from_vars.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_gather_attributes.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_multiply_by_zero.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_pad_attributes.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_padv2_attributes.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_reduce_attributes.cc (93%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_reorder_axes.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_reshape_attributes.cc (90%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_slice_attributes.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_space_to_batch_nd_attributes.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_squeeze_attributes.cc (86%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_strided_slice_attributes.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_tensorflow_concat.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_tensorflow_matmul.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_tensorflow_merge.cc (92%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_tensorflow_switch.cc (96%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/resolve_transpose_attributes.cc (91%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/shuffle_fc_weights.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/tests/BUILD (60%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/tests/lstm_utils_test.cc (99%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/tests/resolve_constant_concatenation_test.cc (97%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/tests/resolve_constant_unary_test.cc (94%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/unfuse_activation_functions.cc (92%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/unpartition_embedding_lookup.cc (98%) rename tensorflow/{contrib => }/lite/toco/graph_transformations/unroll_batch_matmul.cc (97%) rename tensorflow/{contrib => }/lite/toco/import_tensorflow.cc (99%) rename tensorflow/{contrib => }/lite/toco/import_tensorflow.h (84%) rename tensorflow/{contrib => }/lite/toco/import_tensorflow_test.cc (99%) rename tensorflow/{contrib => }/lite/toco/model.h (99%) rename tensorflow/{contrib => }/lite/toco/model_cmdline_flags.cc (98%) rename tensorflow/{contrib => }/lite/toco/model_cmdline_flags.h (80%) rename tensorflow/{contrib => }/lite/toco/model_flags.proto (99%) rename tensorflow/{contrib => }/lite/toco/python/BUILD (67%) rename tensorflow/{contrib => }/lite/toco/python/toco.i (95%) rename tensorflow/{contrib => }/lite/toco/python/toco_from_protos.py (96%) rename tensorflow/{contrib => }/lite/toco/python/toco_from_protos_test.py (95%) rename tensorflow/{contrib => }/lite/toco/python/toco_python_api.cc (90%) rename tensorflow/{contrib => }/lite/toco/python/toco_python_api.h (88%) rename tensorflow/{contrib => }/lite/toco/runtime/common.h (78%) rename tensorflow/{contrib => }/lite/toco/runtime/types.h (72%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/BUILD (80%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/cluster.cc (95%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/cluster.h (89%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/cluster_utils.cc (95%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/cluster_utils.h (82%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/resolve_cluster.cc (93%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/resolve_cluster.h (86%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/resolve_svdf.cc (96%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/resolve_svdf.h (85%) rename tensorflow/{contrib => }/lite/toco/tensorflow_graph_matching/resolve_svdf_test.cc (96%) rename tensorflow/{contrib => }/lite/toco/tensorflow_util.cc (97%) rename tensorflow/{contrib => }/lite/toco/tensorflow_util.h (81%) rename tensorflow/{contrib => }/lite/toco/tflite/BUILD (68%) rename tensorflow/{contrib => }/lite/toco/tflite/builtin_operator.h (90%) rename tensorflow/{contrib => }/lite/toco/tflite/custom_operator.h (90%) rename tensorflow/{contrib => }/lite/toco/tflite/export.cc (97%) rename tensorflow/{contrib => }/lite/toco/tflite/export.h (95%) rename tensorflow/{contrib => }/lite/toco/tflite/export_test.cc (98%) rename tensorflow/{contrib => }/lite/toco/tflite/import.cc (95%) rename tensorflow/{contrib => }/lite/toco/tflite/import.h (84%) rename tensorflow/{contrib => }/lite/toco/tflite/import_test.cc (98%) rename tensorflow/{contrib => }/lite/toco/tflite/operator.cc (99%) rename tensorflow/{contrib => }/lite/toco/tflite/operator.h (94%) rename tensorflow/{contrib => }/lite/toco/tflite/operator_test.cc (99%) rename tensorflow/{contrib => }/lite/toco/tflite/simple_operator.h (86%) rename tensorflow/{contrib => }/lite/toco/tflite/types.cc (98%) rename tensorflow/{contrib => }/lite/toco/tflite/types.h (87%) rename tensorflow/{contrib => }/lite/toco/tflite/types_test.cc (99%) rename tensorflow/{contrib => }/lite/toco/tflite/whitelisted_flex_ops.cc (99%) rename tensorflow/{contrib => }/lite/toco/tflite/whitelisted_flex_ops.h (86%) rename tensorflow/{contrib => }/lite/toco/toco.cc (90%) rename tensorflow/{contrib => }/lite/toco/toco_cmdline_flags.cc (99%) rename tensorflow/{contrib => }/lite/toco/toco_cmdline_flags.h (79%) rename tensorflow/{contrib => }/lite/toco/toco_flags.proto (99%) rename tensorflow/{contrib => }/lite/toco/toco_graphviz_dump_options.cc (92%) rename tensorflow/{contrib => }/lite/toco/toco_graphviz_dump_options.h (82%) rename tensorflow/{contrib => }/lite/toco/toco_port.cc (98%) rename tensorflow/{contrib => }/lite/toco/toco_port.h (94%) rename tensorflow/{contrib => }/lite/toco/toco_port_test.cc (88%) rename tensorflow/{contrib => }/lite/toco/toco_tooling.cc (96%) rename tensorflow/{contrib => }/lite/toco/toco_tooling.h (84%) rename tensorflow/{contrib => }/lite/toco/toco_types.h (88%) rename tensorflow/{contrib => }/lite/toco/tooling_util.cc (99%) rename tensorflow/{contrib => }/lite/toco/tooling_util.h (96%) rename tensorflow/{contrib => }/lite/toco/tooling_util_test.cc (98%) rename tensorflow/{contrib => }/lite/toco/types.proto (100%) rename tensorflow/{contrib => }/lite/tools/BUILD (60%) rename tensorflow/{contrib => }/lite/tools/accuracy/BUILD (92%) rename tensorflow/{contrib => }/lite/tools/accuracy/README.md (100%) rename tensorflow/{contrib => }/lite/tools/accuracy/accuracy_eval_stage.h (88%) rename tensorflow/{contrib => }/lite/tools/accuracy/android_required_build_flags.cc (100%) rename tensorflow/{contrib => }/lite/tools/accuracy/csv_writer.h (92%) rename tensorflow/{contrib => }/lite/tools/accuracy/eval_pipeline.cc (95%) rename tensorflow/{contrib => }/lite/tools/accuracy/eval_pipeline.h (89%) rename tensorflow/{contrib => }/lite/tools/accuracy/eval_pipeline_builder.cc (97%) rename tensorflow/{contrib => }/lite/tools/accuracy/eval_pipeline_builder.h (89%) rename tensorflow/{contrib => }/lite/tools/accuracy/eval_pipeline_builder_test.cc (99%) rename tensorflow/{contrib => }/lite/tools/accuracy/eval_pipeline_test.cc (98%) rename tensorflow/{contrib => }/lite/tools/accuracy/file_reader_stage.cc (93%) rename tensorflow/{contrib => }/lite/tools/accuracy/file_reader_stage.h (81%) rename tensorflow/{contrib => }/lite/tools/accuracy/file_reader_stage_test.cc (97%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/BUILD (82%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/README.md (95%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/clsloc_validation_blacklist.txt (100%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/generate_validation_labels.py (100%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval.cc (96%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.cc (95%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h (91%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.cc (98%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h (91%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/imagenet_topk_eval_test.cc (98%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/inception_preprocessing.cc (97%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/inception_preprocessing.h (89%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/inception_preprocessing_test.cc (98%) rename tensorflow/{contrib => }/lite/tools/accuracy/ilsvrc/testdata/grace_hopper.jpg (100%) rename tensorflow/{contrib => }/lite/tools/accuracy/run_tflite_model_op.cc (95%) rename tensorflow/{contrib => }/lite/tools/accuracy/run_tflite_model_op_test.cc (100%) rename tensorflow/{contrib => }/lite/tools/accuracy/run_tflite_model_stage.cc (95%) rename tensorflow/{contrib => }/lite/tools/accuracy/run_tflite_model_stage.h (85%) rename tensorflow/{contrib => }/lite/tools/accuracy/stage.h (90%) rename tensorflow/{contrib => }/lite/tools/accuracy/utils.cc (92%) rename tensorflow/{contrib => }/lite/tools/accuracy/utils.h (85%) rename tensorflow/{contrib => }/lite/tools/accuracy/utils_test.cc (97%) rename tensorflow/{contrib => }/lite/tools/benchmark/BUILD (71%) rename tensorflow/{contrib => }/lite/tools/benchmark/README.md (96%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_main.cc (89%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_model.cc (96%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_model.h (93%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_params.cc (92%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_params.h (90%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_plus_flex_main.cc (85%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_test.cc (92%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_tflite_model.cc (97%) rename tensorflow/{contrib => }/lite/tools/benchmark/benchmark_tflite_model.h (84%) rename tensorflow/{contrib => }/lite/tools/benchmark/command_line_flags.cc (98%) rename tensorflow/{contrib => }/lite/tools/benchmark/command_line_flags.h (95%) rename tensorflow/{contrib => }/lite/tools/benchmark/command_line_flags_test.cc (97%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/README.md (84%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark.xcodeproj/project.pbxproj (92%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.h (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.m (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/Contents.json (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/LaunchScreen.storyboard (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/Main.storyboard (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.h (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.mm (97%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Info.plist (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/benchmark_data/benchmark_params.json (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/main.m (100%) rename tensorflow/{contrib => }/lite/tools/benchmark/logging.h (92%) rename tensorflow/{contrib => }/lite/tools/gen_op_registration.cc (93%) rename tensorflow/{contrib => }/lite/tools/gen_op_registration.h (82%) rename tensorflow/{contrib => }/lite/tools/gen_op_registration_main.cc (98%) rename tensorflow/{contrib => }/lite/tools/gen_op_registration_test.cc (88%) rename tensorflow/{contrib => }/lite/tools/make/Makefile (77%) rename tensorflow/{contrib => }/lite/tools/make/build_ios_universal_lib.sh (69%) rename tensorflow/{contrib => }/lite/tools/make/build_rpi_lib.sh (87%) rename tensorflow/{contrib => }/lite/tools/make/download_dependencies.sh (98%) rename tensorflow/{contrib => }/lite/tools/make/targets/ios_makefile.inc (100%) rename tensorflow/{contrib => }/lite/tools/make/targets/linux_makefile.inc (100%) rename tensorflow/{contrib => }/lite/tools/make/targets/riscv_makefile.inc (100%) rename tensorflow/{contrib => }/lite/tools/make/targets/rpi_makefile.inc (100%) rename tensorflow/{contrib => }/lite/tools/make/targets/stm32f1_makefile.inc (100%) rename tensorflow/{contrib => }/lite/tools/make/targets/stm32f7_makefile.inc (100%) rename tensorflow/{contrib => }/lite/tools/optimize/BUILD (67%) rename tensorflow/{contrib => }/lite/tools/optimize/g3doc/quantize_weights.md (96%) rename tensorflow/{contrib => }/lite/tools/optimize/quantize_weights.cc (94%) rename tensorflow/{contrib => }/lite/tools/optimize/quantize_weights.h (85%) rename tensorflow/{contrib => }/lite/tools/optimize/quantize_weights_test.cc (95%) rename tensorflow/{contrib => }/lite/tools/verifier.cc (97%) rename tensorflow/{contrib => }/lite/tools/verifier.h (87%) rename tensorflow/{contrib => }/lite/tools/verifier_test.cc (96%) rename tensorflow/{contrib => }/lite/tools/visualize.py (99%) rename tensorflow/{contrib => }/lite/tutorials/BUILD (100%) rename tensorflow/{contrib => }/lite/tutorials/dataset.py (100%) rename tensorflow/{contrib => }/lite/tutorials/mnist_tflite.py (95%) rename tensorflow/{contrib => }/lite/tutorials/post_training_quant.ipynb (95%) rename tensorflow/{contrib => }/lite/util.cc (97%) rename tensorflow/{contrib => }/lite/util.h (92%) rename tensorflow/{contrib => }/lite/util_test.cc (94%) rename tensorflow/{contrib => }/lite/version.h (87%) diff --git a/.gitignore b/.gitignore index 1ef4c297ee..57d84228cf 100644 --- a/.gitignore +++ b/.gitignore @@ -24,10 +24,10 @@ Pods Podfile.lock *.pbxproj *.xcworkspacedata -/tensorflow/contrib/lite/downloads/** -/tensorflow/contrib/lite/gen/** -/tensorflow/contrib/lite/examples/ios/simple/data/*.txt -/tensorflow/contrib/lite/examples/ios/simple/data/*.tflite +/tensorflow/lite/downloads/** +/tensorflow/lite/gen/** +/tensorflow/lite/examples/ios/simple/data/*.txt +/tensorflow/lite/examples/ios/simple/data/*.tflite xcuserdata/** /api_init_files_list.txt /estimator_api_init_files_list.txt diff --git a/RELEASE.md b/RELEASE.md index 2b00d06580..b13b071bd6 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -258,8 +258,8 @@ Ag Ramesh, Alex Wiltschko, Alexander Pantyukhin, Amogh Mannekote, An Jiaoyang, A * Update `tf.keras` to the Keras 2.1.6 API. * Added [`tf.keras.layers.CuDNNGRU`](https://www.tensorflow.org/versions/r1.9/api_docs/python/tf/keras/layers/CuDNNGRU) and [`tf.keras.layers.CuDNNLSTM`](https://www.tensorflow.org/versions/r1.9/api_docs/python/tf/keras/layers/CuDNNLSTM) layers. [Try it](https://colab.sandbox.google.com/github/tensorflow/tensorflow/blob/master/tensorflow/contrib/eager/python/examples/nmt_with_attention/nmt_with_attention.ipynb?linkId=53292082). * Adding support of core [feature columns](https://www.tensorflow.org/get_started/feature_columns) and [losses](https://www.tensorflow.org/api_docs/python/tf/losses) to [gradient boosted trees estimators](https://github.com/tensorflow/models/tree/master/official/boosted_trees). -* The [python interface](https://www.tensorflow.org/versions/r1.9/api_docs/python/tf/contrib/lite) - for the [TFLite Optimizing Converter](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/toco/README.md) +* The [python interface](https://www.tensorflow.org/versions/r1.9/api_docs/python/tf/lite) + for the [TFLite Optimizing Converter](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/toco/README.md) has been expanded, and the command line interface (AKA: `toco`, `tflite_convert`) is once again included in the standard `pip` installation. * Improved data-loading and text processing with: @@ -562,7 +562,7 @@ Yoni Tsafir, yordun, Yuan (Terry) Tang, Yuxin Wu, zhengdi, Zhengsheng Wei, 田 ## Major Features And Improvements * [Eager execution](https://github.com/tensorflow/tensorflow/tree/r1.5/tensorflow/contrib/eager) preview version is now available. -* [TensorFlow Lite](https://github.com/tensorflow/tensorflow/tree/r1.5/tensorflow/contrib/lite) +* [TensorFlow Lite](https://github.com/tensorflow/tensorflow/tree/r1.5/tensorflow/lite) dev preview is now available. * CUDA 9.0 and cuDNN 7 support. * Accelerated Linear Algebra (XLA): @@ -909,7 +909,7 @@ See also [TensorBoard 0.1.4](https://github.com/tensorflow/tensorboard/releases/ * Adds tf.contrib.nn.rank_sampled_softmax_loss, a sampled-softmax variant that can improve rank loss. * `tf.contrib.metrics`.{streaming_covariance,streaming_pearson_correlation} modified to return nan when they have seen less or equal to 1 unit of weight. * Adds time series models to contrib. See contrib/timeseries/README.md for details. -* Adds FULLY_CONNECTED Op to tensorflow/contrib/lite/schema.fbs +* Adds FULLY_CONNECTED Op to tensorflow/lite/schema.fbs ## Known Issues * Tensorflow_gpu compilation fails with Bazel 0.5.3. diff --git a/tensorflow/contrib/cmake/python_modules.txt b/tensorflow/contrib/cmake/python_modules.txt index dea5a6f966..d94b703700 100644 --- a/tensorflow/contrib/cmake/python_modules.txt +++ b/tensorflow/contrib/cmake/python_modules.txt @@ -279,10 +279,10 @@ tensorflow/contrib/linear_optimizer/kernels/g3doc tensorflow/contrib/linear_optimizer/python tensorflow/contrib/linear_optimizer/python/ops # TODO(drpngx): Fix failing imports -# tensorflow/contrib/lite -# tensorflow/contrib/lite/python -# tensorflow/contrib/lite/toco -# tensorflow/contrib/lite/toco/python +# tensorflow/lite +# tensorflow/lite/python +# tensorflow/lite/toco +# tensorflow/lite/toco/python tensorflow/contrib/lookup tensorflow/contrib/losses tensorflow/contrib/losses/python diff --git a/tensorflow/contrib/cmake/python_protos.txt b/tensorflow/contrib/cmake/python_protos.txt index 42afbd9105..013180c890 100644 --- a/tensorflow/contrib/cmake/python_protos.txt +++ b/tensorflow/contrib/cmake/python_protos.txt @@ -6,7 +6,7 @@ tensorflow/contrib/boosted_trees/proto tensorflow/contrib/cloud/kernels tensorflow/contrib/decision_trees/proto tensorflow/contrib/gdr -tensorflow/contrib/lite/toco +tensorflow/lite/toco tensorflow/contrib/mpi tensorflow/contrib/mpi_collectives tensorflow/contrib/session_bundle diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake index 6d86daf5f1..ef487d3509 100755 --- a/tensorflow/contrib/cmake/tf_python.cmake +++ b/tensorflow/contrib/cmake/tf_python.cmake @@ -222,17 +222,17 @@ endforeach(python_module) add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory - "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/lite") + "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/lite") add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory - "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/lite/python") + "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/lite/python") add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD COMMAND ${CMAKE_COMMAND} -E touch - "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/lite/python/__init__.py") + "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/lite/python/__init__.py") add_custom_command( TARGET tf_python_copy_scripts_to_destination PRE_BUILD COMMAND ${CMAKE_COMMAND} -E touch - ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/lite/python/lite.py) + ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/lite/python/lite.py) # Generate the tensorflow.python.platform.build_info module. set(BUILD_INFO_PY "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/python/platform/build_info.py") diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/BUILD b/tensorflow/contrib/lite/experimental/micro/kernels/BUILD deleted file mode 100644 index a012f950e6..0000000000 --- a/tensorflow/contrib/lite/experimental/micro/kernels/BUILD +++ /dev/null @@ -1,107 +0,0 @@ -package(default_visibility = [ - "//visibility:public", -]) - -licenses(["notice"]) # Apache 2.0 - -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") -load( - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test.bzl", - "tflite_micro_cc_test", -) - -cc_library( - name = "micro_ops", - srcs = [ - "depthwise_conv.cc", - "fully_connected.cc", - "softmax.cc", - ], - hdrs = [ - ], - copts = tflite_copts(), - deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - "//tensorflow/contrib/lite/kernels:kernel_util", - "//tensorflow/contrib/lite/kernels:op_macros", - "//tensorflow/contrib/lite/kernels:padding", - "//tensorflow/contrib/lite/kernels/internal:quantization_util", - "//tensorflow/contrib/lite/kernels/internal:reference_base", - "//tensorflow/contrib/lite/kernels/internal:tensor", - ], -) - -cc_library( - name = "all_ops_resolver", - srcs = [ - "all_ops_resolver.cc", - ], - hdrs = [ - "all_ops_resolver.h", - ], - copts = tflite_copts(), - deps = [ - ":micro_ops", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - ], -) - -cc_library( - name = "test_utils", - srcs = [ - ], - hdrs = [ - "test_utils.h", - ], - copts = tflite_copts(), - deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/core/api", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", - ], -) - -tflite_micro_cc_test( - name = "depthwise_conv_test", - srcs = [ - "depthwise_conv_test.cc", - ], - deps = [ - ":all_ops_resolver", - ":test_utils", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", - ], -) - -tflite_micro_cc_test( - name = "fully_connected_test", - srcs = [ - "fully_connected_test.cc", - ], - deps = [ - ":all_ops_resolver", - ":test_utils", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", - ], -) - -tflite_micro_cc_test( - name = "softmax_test", - srcs = [ - "softmax_test.cc", - ], - deps = [ - ":all_ops_resolver", - ":test_utils", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", - ], -) diff --git a/tensorflow/contrib/lite/python/BUILD b/tensorflow/contrib/lite/python/BUILD index 87d090e31a..893ddd7823 100644 --- a/tensorflow/contrib/lite/python/BUILD +++ b/tensorflow/contrib/lite/python/BUILD @@ -1,186 +1,12 @@ -licenses(["notice"]) # Apache 2.0 - -package(default_visibility = ["//tensorflow:internal"]) - -load("//tensorflow:tensorflow.bzl", "py_test") - -filegroup( - name = "interpreter_test_data", - srcs = glob(["**/testdata/*"]), - visibility = ["//tensorflow:__subpackages__"], -) - -py_library( - name = "interpreter", - srcs = [ - "interpreter.py", - ], - srcs_version = "PY2AND3", - visibility = ["//visibility:public"], - deps = [ - "//tensorflow/contrib/lite/python/interpreter_wrapper:tensorflow_wrap_interpreter_wrapper", - "//tensorflow/python:util", - "//third_party/py/numpy", - ], -) - -py_test( - name = "interpreter_test", - srcs = ["interpreter_test.py"], - data = [":interpreter_test_data"], - srcs_version = "PY2AND3", - tags = ["no_oss"], - deps = [ - ":interpreter", - "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", - "//tensorflow/python:platform", - "//third_party/py/numpy", - ], -) - -py_binary( - name = "tflite_convert", - srcs = ["tflite_convert.py"], - srcs_version = "PY2AND3", - visibility = ["//visibility:public"], - deps = [ - ":lite", - ], -) +licenses(["notice"]) +# DO NOT USE THIS TARGET. TensorFlow Lite has moved to tensorflow/lite. py_library( name = "lite", - srcs = ["lite.py"], - srcs_version = "PY2AND3", - visibility = ["//visibility:public"], - deps = [ - ":convert", - ":convert_saved_model", - ":interpreter", - ":lite_constants", - ":op_hint", - "//tensorflow/python:graph_util", - "//tensorflow/python/keras", - "//tensorflow/python/saved_model:constants", - "//tensorflow/python/saved_model:loader", - ], -) - -py_test( - name = "lite_test", - srcs = ["lite_test.py"], - data = ["@tflite_mobilenet_ssd_quant_protobuf//:tflite_graph.pb"], + srcs = ["__init__.py"], srcs_version = "PY2AND3", - tags = [ - "no_oss", - "no_windows", - ], - deps = [ - ":lite", - "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", - ], -) - -py_library( - name = "lite_constants", - srcs = ["lite_constants.py"], - srcs_version = "PY2AND3", - deps = [ - "//tensorflow/contrib/lite/toco:toco_flags_proto_py", - ], -) - -py_library( - name = "convert", - srcs = ["convert.py"], - srcs_version = "PY2AND3", - visibility = ["//visibility:public"], - deps = [ - ":lite_constants", - "//tensorflow/contrib/lite/toco:model_flags_proto_py", - "//tensorflow/contrib/lite/toco:toco_flags_proto_py", - "//tensorflow/contrib/lite/toco/python:tensorflow_wrap_toco", - "//tensorflow/contrib/lite/toco/python:toco_from_protos", - "//tensorflow/python:platform", - ], -) - -py_library( - name = "op_hint", - srcs = ["op_hint.py"], - srcs_version = "PY2AND3", - visibility = ["//visibility:public"], - deps = [ - "//tensorflow/contrib/framework:framework_py", - "//tensorflow/contrib/graph_editor:graph_editor_py", - "//tensorflow/core:protos_all_py", - "//tensorflow/python:framework", - "//tensorflow/python:platform", - "//tensorflow/python:util", - ], -) - -py_test( - name = "convert_test", - srcs = ["convert_test.py"], - srcs_version = "PY2AND3", - deps = [ - ":convert", - ":interpreter", - ":op_hint", - "//tensorflow/python:array_ops", - "//tensorflow/python:client_testlib", - "//tensorflow/python:dtypes", - "//tensorflow/python:platform_test", - "//tensorflow/python:session", - ], -) - -py_library( - name = "convert_saved_model", - srcs = ["convert_saved_model.py"], - srcs_version = "PY2AND3", - visibility = ["//tensorflow/contrib/lite:__subpackages__"], - deps = [ - ":convert", - "//tensorflow/python:graph_util", - "//tensorflow/python:platform", - "//tensorflow/python/saved_model", - ], -) - -py_binary( - name = "create_custom_op", - srcs = ["create_custom_op.py"], - srcs_version = "PY2AND3", - visibility = ["//visibility:public"], - deps = [ - "//tensorflow/contrib/framework:framework_py", - "//tensorflow/core:protos_all_py", - "//tensorflow/python:platform", - "@absl_py//absl/flags", - ], -) - -py_test( - name = "convert_saved_model_test", - srcs = ["convert_saved_model_test.py"], - srcs_version = "PY2AND3", - tags = [ - "no_windows", - ], visibility = ["//visibility:public"], deps = [ - ":convert_saved_model", - "//tensorflow/python:client_testlib", - "//tensorflow/python:layers", - "//tensorflow/python:nn", - "//tensorflow/python:platform_test", - "//tensorflow/python:session", - "//tensorflow/python/keras", - "//tensorflow/python/ops/losses", - "//tensorflow/python/saved_model", + "//tensorflow/lite/python:lite", ], ) diff --git a/tensorflow/contrib/lite/python/__init__.py b/tensorflow/contrib/lite/python/__init__.py new file mode 100644 index 0000000000..27b1ffb251 --- /dev/null +++ b/tensorflow/contrib/lite/python/__init__.py @@ -0,0 +1,26 @@ +# Copyright 2018 The TensorFlow Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +# ============================================================================== +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function + +from tensorflow import lite + +import warnings as _warnings + +WARNING = ("WARNING: TF Lite has moved from tf.contrib.lite to tf.lite. Please " + "update your imports. This will be a breaking error in TensorFlow " + "version 2.0.") +_warnings.warn(WARNING, PendingDeprecationWarning) diff --git a/tensorflow/contrib/makefile/Makefile b/tensorflow/contrib/makefile/Makefile index 5b29f0185f..7ea6e34cf5 100644 --- a/tensorflow/contrib/makefile/Makefile +++ b/tensorflow/contrib/makefile/Makefile @@ -740,22 +740,22 @@ ifeq ($(WITH_TFLITE_FLEX), true) TF_CC_SRCS += $(EAGER_CC_SRCS) TF_LITE_CORE_CC_ALL_SRCS := \ - $(wildcard tensorflow/contrib/lite/*.cc) \ - $(wildcard tensorflow/contrib/lite/*.c) \ - $(wildcard tensorflow/contrib/lite/c/*.c) \ - $(wildcard tensorflow/contrib/lite/core/api/*.cc) + $(wildcard tensorflow/lite/*.cc) \ + $(wildcard tensorflow/lite/*.c) \ + $(wildcard tensorflow/lite/c/*.c) \ + $(wildcard tensorflow/lite/core/api/*.cc) TF_LITE_CORE_CC_ALL_SRCS += \ - $(wildcard tensorflow/contrib/lite/kernels/*.cc) \ - $(wildcard tensorflow/contrib/lite/kernels/internal/*.cc) \ - $(wildcard tensorflow/contrib/lite/kernels/internal/optimized/*.cc) \ - $(wildcard tensorflow/contrib/lite/kernels/internal/reference/*.cc) \ + $(wildcard tensorflow/lite/kernels/*.cc) \ + $(wildcard tensorflow/lite/kernels/internal/*.cc) \ + $(wildcard tensorflow/lite/kernels/internal/optimized/*.cc) \ + $(wildcard tensorflow/lite/kernels/internal/reference/*.cc) \ $(PROFILER_SRCS) \ - $(wildcard tensorflow/contrib/lite/kernels/*.c) \ - $(wildcard tensorflow/contrib/lite/kernels/internal/*.c) \ - $(wildcard tensorflow/contrib/lite/kernels/internal/optimized/*.c) \ - $(wildcard tensorflow/contrib/lite/kernels/internal/reference/*.c) \ - $(wildcard tensorflow/contrib/lite/delegates/flex/*.cc) + $(wildcard tensorflow/lite/kernels/*.c) \ + $(wildcard tensorflow/lite/kernels/internal/*.c) \ + $(wildcard tensorflow/lite/kernels/internal/optimized/*.c) \ + $(wildcard tensorflow/lite/kernels/internal/reference/*.c) \ + $(wildcard tensorflow/lite/delegates/flex/*.cc) # Hack. This shouldn't be here? TF_LITE_CORE_CC_ALL_SRCS += \ @@ -764,14 +764,14 @@ ifeq ($(WITH_TFLITE_FLEX), true) # Remove any duplicates. TF_LITE_CORE_CC_ALL_SRCS := $(sort $(TF_LITE_CORE_CC_ALL_SRCS)) TF_LITE_CORE_CC_EXCLUDE_SRCS := \ - $(wildcard tensorflow/contrib/lite/*test.cc) \ - $(wildcard tensorflow/contrib/lite/*/*test.cc) \ - $(wildcard tensorflow/contrib/lite/*/*/*test.cc) \ - $(wildcard tensorflow/contrib/lite/*/*/*/*test.cc) \ - $(wildcard tensorflow/contrib/lite/kernels/test_util.cc) \ - $(wildcard tensorflow/contrib/lite/delegates/flex/test_util.cc) \ - $(wildcard tensorflow/contrib/lite/nnapi_delegate.cc) \ - $(wildcard tensorflow/contrib/lite/mmap_allocation_disabled.cc) + $(wildcard tensorflow/lite/*test.cc) \ + $(wildcard tensorflow/lite/*/*test.cc) \ + $(wildcard tensorflow/lite/*/*/*test.cc) \ + $(wildcard tensorflow/lite/*/*/*/*test.cc) \ + $(wildcard tensorflow/lite/kernels/test_util.cc) \ + $(wildcard tensorflow/lite/delegates/flex/test_util.cc) \ + $(wildcard tensorflow/lite/nnapi_delegate.cc) \ + $(wildcard tensorflow/lite/mmap_allocation_disabled.cc) # Filter out all the excluded files. TF_LITE_CC_SRCS := $(filter-out $(TF_LITE_CORE_CC_EXCLUDE_SRCS), $(TF_LITE_CORE_CC_ALL_SRCS)) diff --git a/tensorflow/contrib/makefile/build_all_android.sh b/tensorflow/contrib/makefile/build_all_android.sh index fb9e77ae1b..dc29694449 100755 --- a/tensorflow/contrib/makefile/build_all_android.sh +++ b/tensorflow/contrib/makefile/build_all_android.sh @@ -34,7 +34,7 @@ echo "********************************************************************" echo "TensorFlow Lite is the recommended library for mobile and embedded machine learning inference." echo "You are currently using an older version. Please switch over to TensorFlow Lite." echo "" -echo "Link to the code: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite" +echo "Link to the code: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite" echo "********************************************************************" echo "" diff --git a/tensorflow/contrib/makefile/build_all_ios.sh b/tensorflow/contrib/makefile/build_all_ios.sh index 9cee4f5916..9a8059ce50 100755 --- a/tensorflow/contrib/makefile/build_all_ios.sh +++ b/tensorflow/contrib/makefile/build_all_ios.sh @@ -35,7 +35,7 @@ echo "********************************************************************" echo "TensorFlow Lite is the recommended library for mobile and embedded machine learning inference." echo "You are currently using an older version. Please switch over to TensorFlow Lite." echo "" -echo "Link to the code: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite" +echo "Link to the code: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite" echo "********************************************************************" echo "" diff --git a/tensorflow/contrib/quantize/README.md b/tensorflow/contrib/quantize/README.md index 0ab19c91bb..a1f2b59026 100644 --- a/tensorflow/contrib/quantize/README.md +++ b/tensorflow/contrib/quantize/README.md @@ -145,7 +145,7 @@ Mobilenet-v2, and Inception-v3) using this tool: Our pre-trained models are available in the -TensorFlow Lite model repository. The code used to generate +TensorFlow Lite model repository. The code used to generate these models is available. diff --git a/tensorflow/core/util/ctc/ctc_beam_entry.h b/tensorflow/core/util/ctc/ctc_beam_entry.h index 24002e72a0..7382b8e684 100644 --- a/tensorflow/core/util/ctc/ctc_beam_entry.h +++ b/tensorflow/core/util/ctc/ctc_beam_entry.h @@ -146,4 +146,4 @@ class BeamComparer { } // namespace tensorflow #endif // TENSORFLOW_CORE_UTIL_CTC_CTC_BEAM_ENTRY_H_ -// LINT.ThenChange(//tensorflow/contrib/lite/experimental/kernels/ctc_beam_entry.h) +// LINT.ThenChange(//tensorflow/lite/experimental/kernels/ctc_beam_entry.h) diff --git a/tensorflow/core/util/ctc/ctc_beam_scorer.h b/tensorflow/core/util/ctc/ctc_beam_scorer.h index 1e45a8abd3..fc63dfb0fd 100644 --- a/tensorflow/core/util/ctc/ctc_beam_scorer.h +++ b/tensorflow/core/util/ctc/ctc_beam_scorer.h @@ -74,4 +74,4 @@ class BaseBeamScorer { } // namespace tensorflow #endif // TENSORFLOW_CORE_UTIL_CTC_CTC_BEAM_SCORER_H_ -// LINT.ThenChange(//tensorflow/contrib/lite/experimental/kernels/ctc_beam_scorer.h) +// LINT.ThenChange(//tensorflow/lite/experimental/kernels/ctc_beam_scorer.h) diff --git a/tensorflow/core/util/ctc/ctc_beam_search.h b/tensorflow/core/util/ctc/ctc_beam_search.h index 6fbb1ed0da..f2022d486c 100644 --- a/tensorflow/core/util/ctc/ctc_beam_search.h +++ b/tensorflow/core/util/ctc/ctc_beam_search.h @@ -431,4 +431,4 @@ Status CTCBeamSearchDecoder::TopPaths( } // namespace tensorflow #endif // TENSORFLOW_CORE_UTIL_CTC_CTC_BEAM_SEARCH_H_ -// LINT.ThenChange(//tensorflow/contrib/lite/experimental/kernels/ctc_beam_search.h) +// LINT.ThenChange(//tensorflow/lite/experimental/kernels/ctc_beam_search.h) diff --git a/tensorflow/core/util/ctc/ctc_decoder.h b/tensorflow/core/util/ctc/ctc_decoder.h index b55d7d77ac..f5c9e4bb59 100644 --- a/tensorflow/core/util/ctc/ctc_decoder.h +++ b/tensorflow/core/util/ctc/ctc_decoder.h @@ -113,4 +113,4 @@ class CTCGreedyDecoder : public CTCDecoder { } // namespace tensorflow #endif // TENSORFLOW_CORE_UTIL_CTC_CTC_DECODER_H_ -// LINT.ThenChange(//tensorflow/contrib/lite/experimental/kernels/ctc_decoder.h) +// LINT.ThenChange(//tensorflow/lite/experimental/kernels/ctc_decoder.h) diff --git a/tensorflow/core/util/ctc/ctc_loss_util.h b/tensorflow/core/util/ctc/ctc_loss_util.h index 054412d388..df0de926d9 100644 --- a/tensorflow/core/util/ctc/ctc_loss_util.h +++ b/tensorflow/core/util/ctc/ctc_loss_util.h @@ -47,4 +47,4 @@ inline float LogSumExp(float log_prob_1, float log_prob_2) { } // namespace tensorflow #endif // TENSORFLOW_CORE_UTIL_CTC_CTC_LOSS_UTIL_H_ -// LINT.ThenChange(//tensorflow/contrib/lite/experimental/kernels/ctc_loss_util.h) +// LINT.ThenChange(//tensorflow/lite/experimental/kernels/ctc_loss_util.h) diff --git a/tensorflow/contrib/lite/BUILD b/tensorflow/lite/BUILD similarity index 76% rename from tensorflow/contrib/lite/BUILD rename to tensorflow/lite/BUILD index 787a85644c..f8bb7191c4 100644 --- a/tensorflow/contrib/lite/BUILD +++ b/tensorflow/lite/BUILD @@ -5,7 +5,7 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 load("//tensorflow:tensorflow.bzl", "tf_cc_test") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts", "gen_selected_ops") +load("//tensorflow/lite:build_def.bzl", "tflite_copts", "gen_selected_ops") exports_files(glob([ "testdata/*.bin", @@ -48,7 +48,7 @@ cc_library( ":graph_info", ":memory_planner", ":simple_memory_arena", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -62,9 +62,9 @@ cc_test( ], deps = [ ":arena_planner", - "//tensorflow/contrib/lite/testing:util", "//tensorflow/core:framework", "//tensorflow/core:lib", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -74,26 +74,26 @@ cc_test( cc_library( name = "context", hdrs = ["context.h"], - deps = ["//tensorflow/contrib/lite/c:c_api_internal"], + deps = ["//tensorflow/lite/c:c_api_internal"], ) cc_library( name = "graph_info", hdrs = ["graph_info.h"], - deps = ["//tensorflow/contrib/lite/c:c_api_internal"], + deps = ["//tensorflow/lite/c:c_api_internal"], ) cc_library( name = "memory_planner", hdrs = ["memory_planner.h"], - deps = ["//tensorflow/contrib/lite/c:c_api_internal"], + deps = ["//tensorflow/lite/c:c_api_internal"], ) cc_library( name = "simple_memory_arena", srcs = ["simple_memory_arena.cc"], hdrs = ["simple_memory_arena.h"], - deps = ["//tensorflow/contrib/lite/c:c_api_internal"], + deps = ["//tensorflow/lite/c:c_api_internal"], ) cc_library( @@ -101,7 +101,7 @@ cc_library( hdrs = [ "builtin_op_data.h", ], - deps = ["//tensorflow/contrib/lite/c:c_api_internal"], + deps = ["//tensorflow/lite/c:c_api_internal"], ) cc_library( @@ -182,16 +182,16 @@ cc_library( ":simple_memory_arena", ":string", ":util", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/core/api", - "//tensorflow/contrib/lite/kernels:eigen_support", - "//tensorflow/contrib/lite/kernels:gemm_support", - "//tensorflow/contrib/lite/nnapi:nnapi_lib", - "//tensorflow/contrib/lite/profiling:profiler", - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/core/api", + "//tensorflow/lite/kernels:eigen_support", + "//tensorflow/lite/kernels:gemm_support", + "//tensorflow/lite/nnapi:nnapi_lib", + "//tensorflow/lite/profiling:profiler", + "//tensorflow/lite/schema:schema_fbs", ] + select({ ":with_tflite_flex": [ - "//tensorflow/contrib/lite/delegates/flex:delegate", + "//tensorflow/lite/delegates/flex:delegate", ], "//conditions:default": [], }), @@ -214,7 +214,7 @@ cc_test( deps = [ ":framework", ":string_util", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -227,13 +227,13 @@ cc_test( deps = [ ":framework", ":string_util", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/core/api", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/kernels:kernel_util", - "//tensorflow/contrib/lite/kernels/internal:tensor_utils", - "//tensorflow/contrib/lite/schema:schema_fbs", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/core/api", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:kernel_util", + "//tensorflow/lite/kernels/internal:tensor_utils", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -247,7 +247,7 @@ cc_test( deps = [ ":framework", ":string_util", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -259,7 +259,7 @@ cc_test( srcs = ["simple_memory_arena_test.cc"], deps = [ ":simple_memory_arena", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -279,10 +279,10 @@ cc_test( ], deps = [ ":framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/core/api", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/core/api", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -298,10 +298,10 @@ tf_cc_test( tags = ["no_windows"], # TODO(b/116667551): No weak symbols with MSVC. deps = [ ":framework", - "//tensorflow/contrib/lite/core/api", - "//tensorflow/contrib/lite/delegates/flex:delegate", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/core/api", + "//tensorflow/lite/delegates/flex:delegate", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -314,7 +314,7 @@ cc_test( tags = ["no_oss"], deps = [ ":framework", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -324,7 +324,7 @@ cc_library( srcs = ["util.cc"], hdrs = ["util.h"], deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -335,7 +335,7 @@ cc_test( tags = ["no_oss"], deps = [ ":util", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/README.md b/tensorflow/lite/README.md similarity index 79% rename from tensorflow/contrib/lite/README.md rename to tensorflow/lite/README.md index a4b3d83efe..589d4f9348 100644 --- a/tensorflow/contrib/lite/README.md +++ b/tensorflow/lite/README.md @@ -5,4 +5,4 @@ devices. It enables low-latency inference of on-device machine learning models with a small binary size and fast performance supporting hardware acceleration. See the documentation: https://www.tensorflow.org/lite/ -Documentation edits can be made here: [tensorflow/contrib/lite/g3doc](./g3doc/) +Documentation edits can be made here: [tensorflow/lite/g3doc](./g3doc/) diff --git a/tensorflow/contrib/lite/allocation.cc b/tensorflow/lite/allocation.cc similarity index 94% rename from tensorflow/contrib/lite/allocation.cc rename to tensorflow/lite/allocation.cc index 21cb1832a7..f9a34322f0 100644 --- a/tensorflow/contrib/lite/allocation.cc +++ b/tensorflow/lite/allocation.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/allocation.h" +#include "tensorflow/lite/allocation.h" #include #include @@ -23,8 +23,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" namespace tflite { diff --git a/tensorflow/contrib/lite/allocation.h b/tensorflow/lite/allocation.h similarity index 88% rename from tensorflow/contrib/lite/allocation.h rename to tensorflow/lite/allocation.h index 182bc0977f..f25d7fa232 100644 --- a/tensorflow/contrib/lite/allocation.h +++ b/tensorflow/lite/allocation.h @@ -14,16 +14,16 @@ limitations under the License. ==============================================================================*/ // Main abstraction controlling the tflite interpreter. // See context.h for the API for defining operations (TfLiteRegistration). -#ifndef TENSORFLOW_CONTRIB_LITE_ALLOCATION_H_ -#define TENSORFLOW_CONTRIB_LITE_ALLOCATION_H_ +#ifndef TENSORFLOW_LITE_ALLOCATION_H_ +#define TENSORFLOW_LITE_ALLOCATION_H_ #include #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/simple_memory_arena.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/simple_memory_arena.h" +#include "tensorflow/lite/string.h" namespace tflite { @@ -94,4 +94,4 @@ class MemoryAllocation : public Allocation { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_ALLOCATION_H_ +#endif // TENSORFLOW_LITE_ALLOCATION_H_ diff --git a/tensorflow/contrib/lite/arena_planner.cc b/tensorflow/lite/arena_planner.cc similarity index 99% rename from tensorflow/contrib/lite/arena_planner.cc rename to tensorflow/lite/arena_planner.cc index 02442575b3..8200b6adaa 100644 --- a/tensorflow/contrib/lite/arena_planner.cc +++ b/tensorflow/lite/arena_planner.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/contrib/lite/arena_planner.h" +#include "tensorflow/lite/arena_planner.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/arena_planner.h b/tensorflow/lite/arena_planner.h similarity index 92% rename from tensorflow/contrib/lite/arena_planner.h rename to tensorflow/lite/arena_planner.h index 382577045b..beaadaf4ef 100644 --- a/tensorflow/contrib/lite/arena_planner.h +++ b/tensorflow/lite/arena_planner.h @@ -12,16 +12,16 @@ 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_CONTRIB_LITE_ARENA_PLANNER_H_ -#define TENSORFLOW_CONTRIB_LITE_ARENA_PLANNER_H_ +#ifndef TENSORFLOW_LITE_ARENA_PLANNER_H_ +#define TENSORFLOW_LITE_ARENA_PLANNER_H_ #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/graph_info.h" -#include "tensorflow/contrib/lite/memory_planner.h" -#include "tensorflow/contrib/lite/simple_memory_arena.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/graph_info.h" +#include "tensorflow/lite/memory_planner.h" +#include "tensorflow/lite/simple_memory_arena.h" namespace tflite { @@ -124,4 +124,4 @@ class ArenaPlanner : public MemoryPlanner { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_ARENA_PLANNER_H_ +#endif // TENSORFLOW_LITE_ARENA_PLANNER_H_ diff --git a/tensorflow/contrib/lite/arena_planner_test.cc b/tensorflow/lite/arena_planner_test.cc similarity index 99% rename from tensorflow/contrib/lite/arena_planner_test.cc rename to tensorflow/lite/arena_planner_test.cc index 7d7c41289c..479f25cafe 100644 --- a/tensorflow/contrib/lite/arena_planner_test.cc +++ b/tensorflow/lite/arena_planner_test.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/arena_planner.h" +#include "tensorflow/lite/arena_planner.h" #include #include #include -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/testing/util.h" #include "tensorflow/core/platform/logging.h" namespace tflite { diff --git a/tensorflow/contrib/lite/build_def.bzl b/tensorflow/lite/build_def.bzl similarity index 95% rename from tensorflow/contrib/lite/build_def.bzl rename to tensorflow/lite/build_def.bzl index a5d69372c1..3b0af52fb9 100644 --- a/tensorflow/contrib/lite/build_def.bzl +++ b/tensorflow/lite/build_def.bzl @@ -38,7 +38,7 @@ def tflite_copts(): return copts -LINKER_SCRIPT = "//tensorflow/contrib/lite/java/src/main/native:version_script.lds" +LINKER_SCRIPT = "//tensorflow/lite/java/src/main/native:version_script.lds" def tflite_linkopts_unstripped(): """Defines linker flags to reduce size of TFLite binary. @@ -152,7 +152,7 @@ def tf_to_tflite(name, src, options, out): """ toco_cmdline = " ".join([ - "//tensorflow/contrib/lite/toco:toco", + "//tensorflow/lite/toco:toco", "--input_format=TENSORFLOW_GRAPHDEF", "--output_format=TFLITE", ("--input_file=$(location %s)" % src), @@ -163,7 +163,7 @@ def tf_to_tflite(name, src, options, out): srcs = [src], outs = [out], cmd = toco_cmdline, - tools = ["//tensorflow/contrib/lite/toco:toco"], + tools = ["//tensorflow/lite/toco:toco"], ) def tflite_to_json(name, src, out): @@ -176,7 +176,7 @@ def tflite_to_json(name, src, out): """ flatc = "@flatbuffers//:flatc" - schema = "//tensorflow/contrib/lite/schema:schema.fbs" + schema = "//tensorflow/lite/schema:schema.fbs" native.genrule( name = name, srcs = [schema, src], @@ -199,7 +199,7 @@ def json_to_tflite(name, src, out): """ flatc = "@flatbuffers//:flatc" - schema = "//tensorflow/contrib/lite/schema:schema_fbs" + schema = "//tensorflow/lite/schema:schema_fbs" native.genrule( name = name, srcs = [schema, src], @@ -357,12 +357,12 @@ def gen_zip_test(name, test_name, conversion_mode, **kwargs): list above. **kwargs: tf_cc_test kwargs """ - toco = "//tensorflow/contrib/lite/toco:toco" + toco = "//tensorflow/lite/toco:toco" flags = "" if conversion_mode: # TODO(nupurgarg): Comment in when pb2lite is in open source. b/113614050. # if conversion_mode == "pb2lite": - # toco = "//tensorflow/contrib/lite/experimental/pb2lite:pb2lite" + # toco = "//tensorflow/lite/experimental/pb2lite:pb2lite" flags = "--ignore_toco_errors --run_with_flex" gen_zipped_test_file( @@ -406,8 +406,8 @@ def gen_selected_ops(name, model): model: TFLite model to interpret. """ out = name + "_registration.cc" - tool = "//tensorflow/contrib/lite/tools:generate_op_registrations" - tflite_path = "//tensorflow/contrib/lite" + tool = "//tensorflow/lite/tools:generate_op_registrations" + tflite_path = "//tensorflow/lite" native.genrule( name = name, srcs = [model], @@ -450,8 +450,8 @@ def gen_model_coverage_test(model_name, data, failure_type): "notap", ], deps = [ - "//tensorflow/contrib/lite/testing/model_coverage:model_coverage_lib", - "//tensorflow/contrib/lite/python:lite", + "//tensorflow/lite/testing/model_coverage:model_coverage_lib", + "//tensorflow/lite/python:lite", "//tensorflow/python:client_testlib", ], ) diff --git a/tensorflow/contrib/lite/builtin_op_data.h b/tensorflow/lite/builtin_op_data.h similarity index 77% rename from tensorflow/contrib/lite/builtin_op_data.h rename to tensorflow/lite/builtin_op_data.h index 30901bd0fa..b9d4284513 100644 --- a/tensorflow/contrib/lite/builtin_op_data.h +++ b/tensorflow/lite/builtin_op_data.h @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ // Compatibility shim for new location of interface definitions. -#ifndef TENSORFLOW_CONTRIB_LITE_BUILTIN_OP_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_BUILTIN_OP_DATA_H_ +#ifndef TENSORFLOW_LITE_BUILTIN_OP_DATA_H_ +#define TENSORFLOW_LITE_BUILTIN_OP_DATA_H_ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" -#endif // TENSORFLOW_CONTRIB_LITE_BUILTIN_OP_DATA_H_ +#endif // TENSORFLOW_LITE_BUILTIN_OP_DATA_H_ diff --git a/tensorflow/contrib/lite/builtin_ops.h b/tensorflow/lite/builtin_ops.h similarity index 96% rename from tensorflow/contrib/lite/builtin_ops.h rename to tensorflow/lite/builtin_ops.h index 1b115291b3..b8c05f57bb 100644 --- a/tensorflow/contrib/lite/builtin_ops.h +++ b/tensorflow/lite/builtin_ops.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_BUILTIN_OPS_H_ -#define TENSORFLOW_CONTRIB_LITE_BUILTIN_OPS_H_ +#ifndef TENSORFLOW_LITE_BUILTIN_OPS_H_ +#define TENSORFLOW_LITE_BUILTIN_OPS_H_ // DO NOT EDIT MANUALLY: This file is automatically generated by // `schema/builtin_ops_header/generator.cc`. @@ -128,4 +128,4 @@ typedef enum { #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_BUILTIN_OPS_H_ +#endif // TENSORFLOW_LITE_BUILTIN_OPS_H_ diff --git a/tensorflow/contrib/lite/c/BUILD b/tensorflow/lite/c/BUILD similarity index 94% rename from tensorflow/contrib/lite/c/BUILD rename to tensorflow/lite/c/BUILD index 663eb63cad..91c04a5f1f 100644 --- a/tensorflow/contrib/lite/c/BUILD +++ b/tensorflow/lite/c/BUILD @@ -13,6 +13,7 @@ cc_library( ], visibility = [ "//tensorflow/contrib/lite:__subpackages__", + "//tensorflow/lite:__subpackages__", ], ) diff --git a/tensorflow/contrib/lite/c/builtin_op_data.h b/tensorflow/lite/c/builtin_op_data.h similarity index 97% rename from tensorflow/contrib/lite/c/builtin_op_data.h rename to tensorflow/lite/c/builtin_op_data.h index c0513df9f6..855983d60d 100644 --- a/tensorflow/contrib/lite/c/builtin_op_data.h +++ b/tensorflow/lite/c/builtin_op_data.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_CONTRIB_LITE_C_BUILTIN_OP_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_C_BUILTIN_OP_DATA_H_ +#ifndef TENSORFLOW_LITE_C_BUILTIN_OP_DATA_H_ +#define TENSORFLOW_LITE_C_BUILTIN_OP_DATA_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" #ifdef __cplusplus extern "C" { @@ -332,4 +332,4 @@ typedef struct { } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_C_BUILTIN_OP_DATA_H_ +#endif // TENSORFLOW_LITE_C_BUILTIN_OP_DATA_H_ diff --git a/tensorflow/contrib/lite/c/builtin_op_data_test.cc b/tensorflow/lite/c/builtin_op_data_test.cc similarity index 98% rename from tensorflow/contrib/lite/c/builtin_op_data_test.cc rename to tensorflow/lite/c/builtin_op_data_test.cc index ba458b4252..0e33dcd8c8 100644 --- a/tensorflow/contrib/lite/c/builtin_op_data_test.cc +++ b/tensorflow/lite/c/builtin_op_data_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/c/c_api_internal.c b/tensorflow/lite/c/c_api_internal.c similarity index 98% rename from tensorflow/contrib/lite/c/c_api_internal.c rename to tensorflow/lite/c/c_api_internal.c index 0a88b5ef7b..b131f06774 100644 --- a/tensorflow/contrib/lite/c/c_api_internal.c +++ b/tensorflow/lite/c/c_api_internal.c @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" #ifndef TF_LITE_STATIC_MEMORY #include #include diff --git a/tensorflow/contrib/lite/c/c_api_internal.h b/tensorflow/lite/c/c_api_internal.h similarity index 99% rename from tensorflow/contrib/lite/c/c_api_internal.h rename to tensorflow/lite/c/c_api_internal.h index f6aee92f2a..e76971f57d 100644 --- a/tensorflow/contrib/lite/c/c_api_internal.h +++ b/tensorflow/lite/c/c_api_internal.h @@ -26,8 +26,8 @@ limitations under the License. // TfLiteRegistration - the implementation of a conceptual operation. // // Some abstractions in this file are created and managed by Interpreter. -#ifndef TENSORFLOW_CONTRIB_LITE_C_C_API_INTERNAL_H_ -#define TENSORFLOW_CONTRIB_LITE_C_C_API_INTERNAL_H_ +#ifndef TENSORFLOW_LITE_C_C_API_INTERNAL_H_ +#define TENSORFLOW_LITE_C_C_API_INTERNAL_H_ #include #include @@ -509,4 +509,4 @@ typedef struct { #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_C_C_API_INTERNAL_H_ +#endif // TENSORFLOW_LITE_C_C_API_INTERNAL_H_ diff --git a/tensorflow/contrib/lite/c/c_api_internal_test.cc b/tensorflow/lite/c/c_api_internal_test.cc similarity index 98% rename from tensorflow/contrib/lite/c/c_api_internal_test.cc rename to tensorflow/lite/c/c_api_internal_test.cc index 0292fb2f05..e21823c41f 100644 --- a/tensorflow/contrib/lite/c/c_api_internal_test.cc +++ b/tensorflow/lite/c/c_api_internal_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/context.h b/tensorflow/lite/context.h similarity index 79% rename from tensorflow/contrib/lite/context.h rename to tensorflow/lite/context.h index b86c2819b8..3d3c8c08b2 100644 --- a/tensorflow/contrib/lite/context.h +++ b/tensorflow/lite/context.h @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ // Compatibility shim for moved header location. -#ifndef TENSORFLOW_CONTRIB_LITE_CONTEXT_H_ -#define TENSORFLOW_CONTRIB_LITE_CONTEXT_H_ +#ifndef TENSORFLOW_LITE_CONTEXT_H_ +#define TENSORFLOW_LITE_CONTEXT_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" -#endif // TENSORFLOW_CONTRIB_LITE_CONTEXT_H_ +#endif // TENSORFLOW_LITE_CONTEXT_H_ diff --git a/tensorflow/contrib/lite/context_util.h b/tensorflow/lite/context_util.h similarity index 89% rename from tensorflow/contrib/lite/context_util.h rename to tensorflow/lite/context_util.h index ccda4c7393..68b91ea0b9 100644 --- a/tensorflow/contrib/lite/context_util.h +++ b/tensorflow/lite/context_util.h @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ // This provides a few C++ helpers that are useful for manipulating C structures // in C++. -#ifndef TENSORFLOW_CONTRIB_LITE_CONTEXT_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_CONTEXT_UTIL_H_ +#ifndef TENSORFLOW_LITE_CONTEXT_UTIL_H_ +#define TENSORFLOW_LITE_CONTEXT_UTIL_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { @@ -45,4 +45,4 @@ class TfLiteIntArrayView { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_CONTEXT_UTIL_H_ +#endif // TENSORFLOW_LITE_CONTEXT_UTIL_H_ diff --git a/tensorflow/contrib/lite/core/api/BUILD b/tensorflow/lite/core/api/BUILD similarity index 80% rename from tensorflow/contrib/lite/core/api/BUILD rename to tensorflow/lite/core/api/BUILD index e4500534f3..6a43b0322d 100644 --- a/tensorflow/contrib/lite/core/api/BUILD +++ b/tensorflow/lite/core/api/BUILD @@ -4,7 +4,7 @@ package( licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") cc_library( name = "api", @@ -20,8 +20,8 @@ cc_library( ], copts = tflite_copts(), deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -51,7 +51,7 @@ cc_test( srcs = ["flatbuffer_conversions_test.cc"], deps = [ ":api", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/core/api/error_reporter.cc b/tensorflow/lite/core/api/error_reporter.cc similarity index 95% rename from tensorflow/contrib/lite/core/api/error_reporter.cc rename to tensorflow/lite/core/api/error_reporter.cc index 423f83b1a9..7070eaa57c 100644 --- a/tensorflow/contrib/lite/core/api/error_reporter.cc +++ b/tensorflow/lite/core/api/error_reporter.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/contrib/lite/core/api/error_reporter.h" +#include "tensorflow/lite/core/api/error_reporter.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/core/api/error_reporter.h b/tensorflow/lite/core/api/error_reporter.h similarity index 88% rename from tensorflow/contrib/lite/core/api/error_reporter.h rename to tensorflow/lite/core/api/error_reporter.h index a2f780b003..357722cc45 100644 --- a/tensorflow/contrib/lite/core/api/error_reporter.h +++ b/tensorflow/lite/core/api/error_reporter.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_CONTRIB_LITE_CORE_API_ERROR_REPORTER_H_ -#define TENSORFLOW_CONTRIB_LITE_CORE_API_ERROR_REPORTER_H_ +#ifndef TENSORFLOW_LITE_CORE_API_ERROR_REPORTER_H_ +#define TENSORFLOW_LITE_CORE_API_ERROR_REPORTER_H_ #include @@ -42,4 +42,4 @@ class ErrorReporter { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_CORE_API_ERROR_REPORTER_H_ +#endif // TENSORFLOW_LITE_CORE_API_ERROR_REPORTER_H_ diff --git a/tensorflow/contrib/lite/core/api/error_reporter_test.cc b/tensorflow/lite/core/api/error_reporter_test.cc similarity index 95% rename from tensorflow/contrib/lite/core/api/error_reporter_test.cc rename to tensorflow/lite/core/api/error_reporter_test.cc index 0463eee6be..4e44a6465d 100644 --- a/tensorflow/contrib/lite/core/api/error_reporter_test.cc +++ b/tensorflow/lite/core/api/error_reporter_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/core/api/error_reporter.h" +#include "tensorflow/lite/core/api/error_reporter.h" #include diff --git a/tensorflow/contrib/lite/core/api/flatbuffer_conversions.cc b/tensorflow/lite/core/api/flatbuffer_conversions.cc similarity index 99% rename from tensorflow/contrib/lite/core/api/flatbuffer_conversions.cc rename to tensorflow/lite/core/api/flatbuffer_conversions.cc index 5afde43915..8cd3faabb7 100644 --- a/tensorflow/contrib/lite/core/api/flatbuffer_conversions.cc +++ b/tensorflow/lite/core/api/flatbuffer_conversions.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/core/api/flatbuffer_conversions.h" +#include "tensorflow/lite/core/api/flatbuffer_conversions.h" #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" namespace tflite { diff --git a/tensorflow/contrib/lite/core/api/flatbuffer_conversions.h b/tensorflow/lite/core/api/flatbuffer_conversions.h similarity index 85% rename from tensorflow/contrib/lite/core/api/flatbuffer_conversions.h rename to tensorflow/lite/core/api/flatbuffer_conversions.h index c770e627fd..0132a431c5 100644 --- a/tensorflow/contrib/lite/core/api/flatbuffer_conversions.h +++ b/tensorflow/lite/core/api/flatbuffer_conversions.h @@ -12,17 +12,17 @@ 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_CONTRIB_LITE_CORE_API_FLATBUFFER_CONVERSIONS_H_ -#define TENSORFLOW_CONTRIB_LITE_CORE_API_FLATBUFFER_CONVERSIONS_H_ +#ifndef TENSORFLOW_LITE_CORE_API_FLATBUFFER_CONVERSIONS_H_ +#define TENSORFLOW_LITE_CORE_API_FLATBUFFER_CONVERSIONS_H_ // These functions transform codes and data structures that are defined in the // flatbuffer serialization format into in-memory values that are used by the // runtime API and interpreter. -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/core/api/op_resolver.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/core/api/op_resolver.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { @@ -65,4 +65,4 @@ TfLiteStatus ConvertTensorType(TensorType tensor_type, TfLiteType* type, } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_CORE_API_FLATBUFFER_CONVERSIONS_H_ +#endif // TENSORFLOW_LITE_CORE_API_FLATBUFFER_CONVERSIONS_H_ diff --git a/tensorflow/contrib/lite/core/api/flatbuffer_conversions_test.cc b/tensorflow/lite/core/api/flatbuffer_conversions_test.cc similarity index 97% rename from tensorflow/contrib/lite/core/api/flatbuffer_conversions_test.cc rename to tensorflow/lite/core/api/flatbuffer_conversions_test.cc index 8ae94e1d33..4d1d1b21fd 100644 --- a/tensorflow/contrib/lite/core/api/flatbuffer_conversions_test.cc +++ b/tensorflow/lite/core/api/flatbuffer_conversions_test.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/core/api/flatbuffer_conversions.h" +#include "tensorflow/lite/core/api/flatbuffer_conversions.h" #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/core/api/op_resolver.cc b/tensorflow/lite/core/api/op_resolver.cc similarity index 97% rename from tensorflow/contrib/lite/core/api/op_resolver.cc rename to tensorflow/lite/core/api/op_resolver.cc index 55ee924843..94d76889d0 100644 --- a/tensorflow/contrib/lite/core/api/op_resolver.cc +++ b/tensorflow/lite/core/api/op_resolver.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/core/api/op_resolver.h" +#include "tensorflow/lite/core/api/op_resolver.h" namespace tflite { diff --git a/tensorflow/contrib/lite/core/api/op_resolver.h b/tensorflow/lite/core/api/op_resolver.h similarity index 84% rename from tensorflow/contrib/lite/core/api/op_resolver.h rename to tensorflow/lite/core/api/op_resolver.h index 5f5e6b2736..c8c7479f33 100644 --- a/tensorflow/contrib/lite/core/api/op_resolver.h +++ b/tensorflow/lite/core/api/op_resolver.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_CONTRIB_LITE_CORE_API_OP_RESOLVER_H_ -#define TENSORFLOW_CONTRIB_LITE_CORE_API_OP_RESOLVER_H_ +#ifndef TENSORFLOW_LITE_CORE_API_OP_RESOLVER_H_ +#define TENSORFLOW_LITE_CORE_API_OP_RESOLVER_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { @@ -44,4 +44,4 @@ TfLiteStatus GetRegistrationFromOpCode(const OperatorCode* opcode, } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_CORE_API_OP_RESOLVER_H_ +#endif // TENSORFLOW_LITE_CORE_API_OP_RESOLVER_H_ diff --git a/tensorflow/contrib/lite/core/api/op_resolver_test.cc b/tensorflow/lite/core/api/op_resolver_test.cc similarity index 99% rename from tensorflow/contrib/lite/core/api/op_resolver_test.cc rename to tensorflow/lite/core/api/op_resolver_test.cc index 167463110e..cd8d0929b6 100644 --- a/tensorflow/contrib/lite/core/api/op_resolver_test.cc +++ b/tensorflow/lite/core/api/op_resolver_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/core/api/op_resolver.h" +#include "tensorflow/lite/core/api/op_resolver.h" #include diff --git a/tensorflow/contrib/lite/delegates/flex/BUILD b/tensorflow/lite/delegates/flex/BUILD similarity index 80% rename from tensorflow/contrib/lite/delegates/flex/BUILD rename to tensorflow/lite/delegates/flex/BUILD index ec8ab22e96..f9850112ab 100644 --- a/tensorflow/contrib/lite/delegates/flex/BUILD +++ b/tensorflow/lite/delegates/flex/BUILD @@ -16,9 +16,9 @@ cc_library( deps = [ ":util", "//tensorflow/c:c_api_internal", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite:string", - "//tensorflow/contrib/lite:string_util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite:string", + "//tensorflow/lite:string_util", ] + select({ "//tensorflow:android": [ "//tensorflow/core:android_tensorflow_lib_lite", @@ -36,10 +36,10 @@ tf_cc_test( srcs = ["buffer_map_test.cc"], deps = [ ":buffer_map", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite:util", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -81,9 +81,9 @@ cc_library( ":delegate_data", ":kernel", ":util", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite:kernel_api", - "//tensorflow/contrib/lite:util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite:kernel_api", + "//tensorflow/lite:util", ] + select({ "//tensorflow:android": [ "//tensorflow/core:android_tensorflow_lib_lite", @@ -103,7 +103,7 @@ tf_cc_test( deps = [ ":delegate", ":test_util", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -132,10 +132,10 @@ tf_cc_test( srcs = ["delegate_data_test.cc"], deps = [ ":delegate_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:util", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite:framework", + "//tensorflow/lite:util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -148,10 +148,10 @@ cc_library( ":delegate_data", ":util", "@flatbuffers", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite:kernel_api", - "//tensorflow/contrib/lite:string", - "//tensorflow/contrib/lite/kernels:kernel_util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite:kernel_api", + "//tensorflow/lite:string", + "//tensorflow/lite/kernels:kernel_util", "//tensorflow/core/common_runtime/eager:context", "//tensorflow/core/common_runtime/eager:execute", "//tensorflow/core/common_runtime/eager:tensor_handle", @@ -197,8 +197,8 @@ cc_library( hdrs = ["test_util.h"], deps = [ "//tensorflow/c:c_api_internal", - "//tensorflow/contrib/lite:string", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:string", + "//tensorflow/lite/kernels:test_util", "@com_google_absl//absl/memory", "@flatbuffers", ], @@ -210,8 +210,8 @@ cc_library( hdrs = ["util.h"], deps = [ "//tensorflow/c:c_api_internal", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite:kernel_api", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite:kernel_api", ] + select({ "//tensorflow:android": [ "//tensorflow/core:android_tensorflow_lib_lite", @@ -229,8 +229,8 @@ tf_cc_test( srcs = ["util_test.cc"], deps = [ ":util", - "//tensorflow/contrib/lite:string", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite:string", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/delegates/flex/buffer_map.cc b/tensorflow/lite/delegates/flex/buffer_map.cc similarity index 96% rename from tensorflow/contrib/lite/delegates/flex/buffer_map.cc rename to tensorflow/lite/delegates/flex/buffer_map.cc index 0d4c40d86e..2c4aa7075d 100644 --- a/tensorflow/contrib/lite/delegates/flex/buffer_map.cc +++ b/tensorflow/lite/delegates/flex/buffer_map.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/contrib/lite/delegates/flex/buffer_map.h" +#include "tensorflow/lite/delegates/flex/buffer_map.h" #include "tensorflow/c/c_api_internal.h" -#include "tensorflow/contrib/lite/delegates/flex/util.h" -#include "tensorflow/contrib/lite/string.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/delegates/flex/util.h" +#include "tensorflow/lite/string.h" +#include "tensorflow/lite/string_util.h" #include "tensorflow/core/framework/allocation_description.pb.h" #include "tensorflow/core/framework/log_memory.h" diff --git a/tensorflow/contrib/lite/delegates/flex/buffer_map.h b/tensorflow/lite/delegates/flex/buffer_map.h similarity index 89% rename from tensorflow/contrib/lite/delegates/flex/buffer_map.h rename to tensorflow/lite/delegates/flex/buffer_map.h index 4ce886568a..269a0a2a27 100644 --- a/tensorflow/contrib/lite/delegates/flex/buffer_map.h +++ b/tensorflow/lite/delegates/flex/buffer_map.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_CONTRIB_LITE_DELEGATES_FLEX_BUFFER_MAP_H_ -#define TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_BUFFER_MAP_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_FLEX_BUFFER_MAP_H_ +#define TENSORFLOW_LITE_DELEGATES_FLEX_BUFFER_MAP_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" #include "tensorflow/core/framework/tensor.h" namespace tflite { @@ -58,4 +58,4 @@ class BufferMap { } // namespace flex } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_BUFFER_MAP_H_ +#endif // TENSORFLOW_LITE_DELEGATES_FLEX_BUFFER_MAP_H_ diff --git a/tensorflow/contrib/lite/delegates/flex/buffer_map_test.cc b/tensorflow/lite/delegates/flex/buffer_map_test.cc similarity index 96% rename from tensorflow/contrib/lite/delegates/flex/buffer_map_test.cc rename to tensorflow/lite/delegates/flex/buffer_map_test.cc index cc2959bc35..46cfed4677 100644 --- a/tensorflow/contrib/lite/delegates/flex/buffer_map_test.cc +++ b/tensorflow/lite/delegates/flex/buffer_map_test.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/contrib/lite/delegates/flex/buffer_map.h" +#include "tensorflow/lite/delegates/flex/buffer_map.h" #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/testing/util.h" -#include "tensorflow/contrib/lite/util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/testing/util.h" +#include "tensorflow/lite/util.h" namespace tflite { namespace flex { diff --git a/tensorflow/contrib/lite/delegates/flex/delegate.cc b/tensorflow/lite/delegates/flex/delegate.cc similarity index 92% rename from tensorflow/contrib/lite/delegates/flex/delegate.cc rename to tensorflow/lite/delegates/flex/delegate.cc index c72b0cf513..c31d48539b 100644 --- a/tensorflow/contrib/lite/delegates/flex/delegate.cc +++ b/tensorflow/lite/delegates/flex/delegate.cc @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/delegates/flex/delegate.h" +#include "tensorflow/lite/delegates/flex/delegate.h" #include -#include "tensorflow/contrib/lite/context_util.h" -#include "tensorflow/contrib/lite/delegates/flex/buffer_map.h" -#include "tensorflow/contrib/lite/delegates/flex/kernel.h" -#include "tensorflow/contrib/lite/delegates/flex/util.h" -#include "tensorflow/contrib/lite/util.h" +#include "tensorflow/lite/context_util.h" +#include "tensorflow/lite/delegates/flex/buffer_map.h" +#include "tensorflow/lite/delegates/flex/kernel.h" +#include "tensorflow/lite/delegates/flex/util.h" +#include "tensorflow/lite/util.h" #include "tensorflow/core/lib/core/status.h" namespace tflite { diff --git a/tensorflow/contrib/lite/delegates/flex/delegate.h b/tensorflow/lite/delegates/flex/delegate.h similarity index 85% rename from tensorflow/contrib/lite/delegates/flex/delegate.h rename to tensorflow/lite/delegates/flex/delegate.h index 1017780dc7..018ff3e0b0 100644 --- a/tensorflow/contrib/lite/delegates/flex/delegate.h +++ b/tensorflow/lite/delegates/flex/delegate.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_CONTRIB_LITE_DELEGATES_FLEX_DELEGATE_H_ -#define TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_DELEGATE_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_H_ +#define TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/delegates/flex/delegate_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/delegates/flex/delegate_data.h" namespace tflite { @@ -56,4 +56,4 @@ class FlexDelegate : public TfLiteDelegate { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_DELEGATE_H_ +#endif // TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_H_ diff --git a/tensorflow/contrib/lite/delegates/flex/delegate_data.cc b/tensorflow/lite/delegates/flex/delegate_data.cc similarity index 96% rename from tensorflow/contrib/lite/delegates/flex/delegate_data.cc rename to tensorflow/lite/delegates/flex/delegate_data.cc index 8f985f770c..b62479a448 100644 --- a/tensorflow/contrib/lite/delegates/flex/delegate_data.cc +++ b/tensorflow/lite/delegates/flex/delegate_data.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/contrib/lite/delegates/flex/delegate_data.h" +#include "tensorflow/lite/delegates/flex/delegate_data.h" #include "tensorflow/core/common_runtime/device_factory.h" #include "tensorflow/core/lib/core/status.h" diff --git a/tensorflow/contrib/lite/delegates/flex/delegate_data.h b/tensorflow/lite/delegates/flex/delegate_data.h similarity index 87% rename from tensorflow/contrib/lite/delegates/flex/delegate_data.h rename to tensorflow/lite/delegates/flex/delegate_data.h index 8d75f0b0ef..a88cc98d03 100644 --- a/tensorflow/contrib/lite/delegates/flex/delegate_data.h +++ b/tensorflow/lite/delegates/flex/delegate_data.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_CONTRIB_LITE_DELEGATES_FLEX_DELEGATE_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_DELEGATE_DATA_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_DATA_H_ +#define TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_DATA_H_ -#include "tensorflow/contrib/lite/delegates/flex/buffer_map.h" +#include "tensorflow/lite/delegates/flex/buffer_map.h" #include "tensorflow/core/common_runtime/eager/context.h" namespace tflite { @@ -49,4 +49,4 @@ class DelegateData { } // namespace flex } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_DELEGATE_DATA_H_ +#endif // TENSORFLOW_LITE_DELEGATES_FLEX_DELEGATE_DATA_H_ diff --git a/tensorflow/contrib/lite/delegates/flex/delegate_data_test.cc b/tensorflow/lite/delegates/flex/delegate_data_test.cc similarity index 90% rename from tensorflow/contrib/lite/delegates/flex/delegate_data_test.cc rename to tensorflow/lite/delegates/flex/delegate_data_test.cc index 30b10f435a..cd274e7cb1 100644 --- a/tensorflow/contrib/lite/delegates/flex/delegate_data_test.cc +++ b/tensorflow/lite/delegates/flex/delegate_data_test.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/contrib/lite/delegates/flex/delegate_data.h" +#include "tensorflow/lite/delegates/flex/delegate_data.h" #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace flex { diff --git a/tensorflow/contrib/lite/delegates/flex/delegate_test.cc b/tensorflow/lite/delegates/flex/delegate_test.cc similarity index 98% rename from tensorflow/contrib/lite/delegates/flex/delegate_test.cc rename to tensorflow/lite/delegates/flex/delegate_test.cc index 1813952cef..f9087d5d85 100644 --- a/tensorflow/contrib/lite/delegates/flex/delegate_test.cc +++ b/tensorflow/lite/delegates/flex/delegate_test.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/delegates/flex/delegate.h" +#include "tensorflow/lite/delegates/flex/delegate.h" #include #include -#include "tensorflow/contrib/lite/delegates/flex/test_util.h" +#include "tensorflow/lite/delegates/flex/test_util.h" namespace tflite { namespace flex { diff --git a/tensorflow/contrib/lite/delegates/flex/kernel.cc b/tensorflow/lite/delegates/flex/kernel.cc similarity index 96% rename from tensorflow/contrib/lite/delegates/flex/kernel.cc rename to tensorflow/lite/delegates/flex/kernel.cc index e4f1aea990..2c19580235 100644 --- a/tensorflow/contrib/lite/delegates/flex/kernel.cc +++ b/tensorflow/lite/delegates/flex/kernel.cc @@ -12,16 +12,16 @@ 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/contrib/lite/delegates/flex/kernel.h" +#include "tensorflow/lite/delegates/flex/kernel.h" #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/builtin_ops.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/context_util.h" -#include "tensorflow/contrib/lite/delegates/flex/delegate_data.h" -#include "tensorflow/contrib/lite/delegates/flex/util.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/builtin_ops.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/context_util.h" +#include "tensorflow/lite/delegates/flex/delegate_data.h" +#include "tensorflow/lite/delegates/flex/util.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/string.h" #include "tensorflow/core/common_runtime/eager/context.h" #include "tensorflow/core/common_runtime/eager/execute.h" #include "tensorflow/core/common_runtime/eager/tensor_handle.h" diff --git a/tensorflow/contrib/lite/delegates/flex/kernel.h b/tensorflow/lite/delegates/flex/kernel.h similarity index 83% rename from tensorflow/contrib/lite/delegates/flex/kernel.h rename to tensorflow/lite/delegates/flex/kernel.h index ac9313a37b..ca74c28570 100644 --- a/tensorflow/contrib/lite/delegates/flex/kernel.h +++ b/tensorflow/lite/delegates/flex/kernel.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_CONTRIB_LITE_DELEGATES_FLEX_KERNEL_H_ -#define TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_KERNEL_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_FLEX_KERNEL_H_ +#define TENSORFLOW_LITE_DELEGATES_FLEX_KERNEL_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { namespace flex { @@ -31,4 +31,4 @@ TfLiteRegistration GetKernel(); } // namespace flex } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_KERNEL_H_ +#endif // TENSORFLOW_LITE_DELEGATES_FLEX_KERNEL_H_ diff --git a/tensorflow/contrib/lite/delegates/flex/kernel_test.cc b/tensorflow/lite/delegates/flex/kernel_test.cc similarity index 97% rename from tensorflow/contrib/lite/delegates/flex/kernel_test.cc rename to tensorflow/lite/delegates/flex/kernel_test.cc index 94a6f8b61a..93d472d3f4 100644 --- a/tensorflow/contrib/lite/delegates/flex/kernel_test.cc +++ b/tensorflow/lite/delegates/flex/kernel_test.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/contrib/lite/delegates/flex/kernel.h" +#include "tensorflow/lite/delegates/flex/kernel.h" #include #include -#include "tensorflow/contrib/lite/delegates/flex/delegate_data.h" -#include "tensorflow/contrib/lite/delegates/flex/test_util.h" +#include "tensorflow/lite/delegates/flex/delegate_data.h" +#include "tensorflow/lite/delegates/flex/test_util.h" namespace tflite { namespace flex { diff --git a/tensorflow/contrib/lite/delegates/flex/test_util.cc b/tensorflow/lite/delegates/flex/test_util.cc similarity index 98% rename from tensorflow/contrib/lite/delegates/flex/test_util.cc rename to tensorflow/lite/delegates/flex/test_util.cc index 69c336a01a..08feb349e6 100644 --- a/tensorflow/contrib/lite/delegates/flex/test_util.cc +++ b/tensorflow/lite/delegates/flex/test_util.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/delegates/flex/test_util.h" +#include "tensorflow/lite/delegates/flex/test_util.h" #include "absl/memory/memory.h" #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace flex { diff --git a/tensorflow/contrib/lite/delegates/flex/test_util.h b/tensorflow/lite/delegates/flex/test_util.h similarity index 94% rename from tensorflow/contrib/lite/delegates/flex/test_util.h rename to tensorflow/lite/delegates/flex/test_util.h index a8c81b90a3..4d3f5ad096 100644 --- a/tensorflow/contrib/lite/delegates/flex/test_util.h +++ b/tensorflow/lite/delegates/flex/test_util.h @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_TEST_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_TEST_UTIL_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_FLEX_TEST_UTIL_H_ +#define TENSORFLOW_LITE_DELEGATES_FLEX_TEST_UTIL_H_ #include "tensorflow/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" +#include "tensorflow/lite/kernels/test_util.h" namespace tflite { namespace flex { @@ -116,4 +116,4 @@ class FlexModelTest : public ::testing::Test { } // namespace flex } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_TEST_UTIL_H_ +#endif // TENSORFLOW_LITE_DELEGATES_FLEX_TEST_UTIL_H_ diff --git a/tensorflow/contrib/lite/delegates/flex/util.cc b/tensorflow/lite/delegates/flex/util.cc similarity index 98% rename from tensorflow/contrib/lite/delegates/flex/util.cc rename to tensorflow/lite/delegates/flex/util.cc index 829bc388bf..c786ffa1a2 100644 --- a/tensorflow/contrib/lite/delegates/flex/util.cc +++ b/tensorflow/lite/delegates/flex/util.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/contrib/lite/delegates/flex/util.h" +#include "tensorflow/lite/delegates/flex/util.h" namespace tflite { namespace flex { diff --git a/tensorflow/contrib/lite/delegates/flex/util.h b/tensorflow/lite/delegates/flex/util.h similarity index 88% rename from tensorflow/contrib/lite/delegates/flex/util.h rename to tensorflow/lite/delegates/flex/util.h index 7f910e7316..8aaa73d1b3 100644 --- a/tensorflow/contrib/lite/delegates/flex/util.h +++ b/tensorflow/lite/delegates/flex/util.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_CONTRIB_LITE_DELEGATES_FLEX_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_UTIL_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_FLEX_UTIL_H_ +#define TENSORFLOW_LITE_DELEGATES_FLEX_UTIL_H_ #include "tensorflow/c/c_api_internal.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/lib/core/status.h" @@ -44,4 +44,4 @@ TfLiteType GetTensorFlowLiteType(TF_DataType); } // namespace flex } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_DELEGATES_FLEX_UTIL_H_ +#endif // TENSORFLOW_LITE_DELEGATES_FLEX_UTIL_H_ diff --git a/tensorflow/contrib/lite/delegates/flex/util_test.cc b/tensorflow/lite/delegates/flex/util_test.cc similarity index 96% rename from tensorflow/contrib/lite/delegates/flex/util_test.cc rename to tensorflow/lite/delegates/flex/util_test.cc index 5f049e7b0a..87104751b8 100644 --- a/tensorflow/contrib/lite/delegates/flex/util_test.cc +++ b/tensorflow/lite/delegates/flex/util_test.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/contrib/lite/delegates/flex/util.h" +#include "tensorflow/lite/delegates/flex/util.h" #include #include #include -#include "tensorflow/contrib/lite/string.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/string.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace flex { diff --git a/tensorflow/contrib/lite/delegates/nnapi/BUILD b/tensorflow/lite/delegates/nnapi/BUILD similarity index 58% rename from tensorflow/contrib/lite/delegates/nnapi/BUILD rename to tensorflow/lite/delegates/nnapi/BUILD index 4e7b2948fb..c24f0f71ac 100644 --- a/tensorflow/contrib/lite/delegates/nnapi/BUILD +++ b/tensorflow/lite/delegates/nnapi/BUILD @@ -11,11 +11,11 @@ cc_library( srcs = ["nnapi_delegate.cc"], hdrs = ["nnapi_delegate.h"], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:kernel_api", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:kernel_util", - "//tensorflow/contrib/lite/nnapi:nnapi_lib", + "//tensorflow/lite:framework", + "//tensorflow/lite:kernel_api", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:kernel_util", + "//tensorflow/lite/nnapi:nnapi_lib", ], ) @@ -29,9 +29,9 @@ tf_cc_test( ], deps = [ ":nnapi_delegate", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.cc b/tensorflow/lite/delegates/nnapi/nnapi_delegate.cc similarity index 99% rename from tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.cc rename to tensorflow/lite/delegates/nnapi/nnapi_delegate.cc index d85e576284..5f17e11375 100644 --- a/tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.cc +++ b/tensorflow/lite/delegates/nnapi/nnapi_delegate.cc @@ -17,14 +17,14 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/allocation.h" -#include "tensorflow/contrib/lite/builtin_op_data.h" -#include "tensorflow/contrib/lite/builtin_ops.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/context_util.h" -#include "tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/nnapi/NeuralNetworksShim.h" +#include "tensorflow/lite/allocation.h" +#include "tensorflow/lite/builtin_op_data.h" +#include "tensorflow/lite/builtin_ops.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/context_util.h" +#include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/nnapi/NeuralNetworksShim.h" #ifdef __ANDROID__ #include diff --git a/tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.h b/tensorflow/lite/delegates/nnapi/nnapi_delegate.h similarity index 80% rename from tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.h rename to tensorflow/lite/delegates/nnapi/nnapi_delegate.h index 4852b76974..099fb72429 100644 --- a/tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.h +++ b/tensorflow/lite/delegates/nnapi/nnapi_delegate.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_CONTRIB_LITE_DELEGATES_NNAPI_NNAPI_DELEGATE_H_ -#define TENSORFLOW_CONTRIB_LITE_DELEGATES_NNAPI_NNAPI_DELEGATE_H_ +#ifndef TENSORFLOW_LITE_DELEGATES_NNAPI_NNAPI_DELEGATE_H_ +#define TENSORFLOW_LITE_DELEGATES_NNAPI_NNAPI_DELEGATE_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { @@ -28,4 +28,4 @@ namespace tflite { TfLiteDelegate* NnApiDelegate(); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_DELEGATES_NNAPI_NNAPI_DELEGATE_H_ +#endif // TENSORFLOW_LITE_DELEGATES_NNAPI_NNAPI_DELEGATE_H_ diff --git a/tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate_test.cc b/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc similarity index 99% rename from tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate_test.cc rename to tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc index 9626c54c74..75399fd5e4 100644 --- a/tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate_test.cc +++ b/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/delegates/nnapi/nnapi_delegate.h" +#include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h" #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/error_reporter.h b/tensorflow/lite/error_reporter.h similarity index 72% rename from tensorflow/contrib/lite/error_reporter.h rename to tensorflow/lite/error_reporter.h index 5c20eedc25..38518d6332 100644 --- a/tensorflow/contrib/lite/error_reporter.h +++ b/tensorflow/lite/error_reporter.h @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ // Compatibility shim for moved header location. -#ifndef TENSORFLOW_CONTRIB_LITE_ERROR_REPORTER_H_ -#define TENSORFLOW_CONTRIB_LITE_ERROR_REPORTER_H_ +#ifndef TENSORFLOW_LITE_ERROR_REPORTER_H_ +#define TENSORFLOW_LITE_ERROR_REPORTER_H_ -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/stderr_reporter.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/stderr_reporter.h" -#endif // TENSORFLOW_CONTRIB_LITE_ERROR_REPORTER_H_ +#endif // TENSORFLOW_LITE_ERROR_REPORTER_H_ diff --git a/tensorflow/contrib/lite/examples/android/BUILD b/tensorflow/lite/examples/android/BUILD similarity index 77% rename from tensorflow/contrib/lite/examples/android/BUILD rename to tensorflow/lite/examples/android/BUILD index d180cb4785..761a60314e 100644 --- a/tensorflow/contrib/lite/examples/android/BUILD +++ b/tensorflow/lite/examples/android/BUILD @@ -33,14 +33,14 @@ android_binary( # Remove undesired models (and corresponding Activities in source) # to reduce APK size. assets = [ - "//tensorflow/contrib/lite/examples/android/app/src/main/assets:labels_mobilenet_quant_v1_224.txt", + "//tensorflow/lite/examples/android/app/src/main/assets:labels_mobilenet_quant_v1_224.txt", "@tflite_mobilenet//:mobilenet_quant_v1_224.tflite", "@tflite_conv_actions_frozen//:conv_actions_frozen.tflite", - "//tensorflow/contrib/lite/examples/android/app/src/main/assets:conv_actions_labels.txt", + "//tensorflow/lite/examples/android/app/src/main/assets:conv_actions_labels.txt", "@tflite_mobilenet_ssd//:mobilenet_ssd.tflite", "@tflite_mobilenet_ssd_quant//:detect.tflite", - "//tensorflow/contrib/lite/examples/android/app/src/main/assets:box_priors.txt", - "//tensorflow/contrib/lite/examples/android/app/src/main/assets:coco_labels_list.txt", + "//tensorflow/lite/examples/android/app/src/main/assets:box_priors.txt", + "//tensorflow/lite/examples/android/app/src/main/assets:coco_labels_list.txt", ], assets_dir = "", custom_package = "org.tensorflow.lite.demo", @@ -56,6 +56,6 @@ android_binary( ], deps = [ ":tensorflow_native_libs", - "//tensorflow/contrib/lite/java:tensorflowlite", + "//tensorflow/lite/java:tensorflowlite", ], ) diff --git a/tensorflow/contrib/lite/examples/android/android.iml b/tensorflow/lite/examples/android/android.iml similarity index 100% rename from tensorflow/contrib/lite/examples/android/android.iml rename to tensorflow/lite/examples/android/android.iml diff --git a/tensorflow/contrib/lite/examples/android/app/README.md b/tensorflow/lite/examples/android/app/README.md similarity index 94% rename from tensorflow/contrib/lite/examples/android/app/README.md rename to tensorflow/lite/examples/android/app/README.md index 7347147f99..e2b1b2691b 100644 --- a/tensorflow/contrib/lite/examples/android/app/README.md +++ b/tensorflow/lite/examples/android/app/README.md @@ -43,12 +43,12 @@ for our external and internal code to merge. ```shell bazel build -c opt --cxxopt='--std=c++11' --fat_apk_cpu=x86,x86_64,arm64-v8a,armeabi-v7a \ - //tensorflow/contrib/lite/examples/android:tflite_demo + //tensorflow/lite/examples/android:tflite_demo ``` 3. Install the demo on a [debug-enabled device](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/examples/android#install): ```shell - adb install bazel-bin/tensorflow/contrib/lite/examples/android/tflite_demo.apk + adb install bazel-bin/tensorflow/lite/examples/android/tflite_demo.apk ``` diff --git a/tensorflow/contrib/lite/examples/android/app/build.gradle b/tensorflow/lite/examples/android/app/build.gradle similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/build.gradle rename to tensorflow/lite/examples/android/app/build.gradle diff --git a/tensorflow/contrib/lite/examples/android/app/download-models.gradle b/tensorflow/lite/examples/android/app/download-models.gradle similarity index 96% rename from tensorflow/contrib/lite/examples/android/app/download-models.gradle rename to tensorflow/lite/examples/android/app/download-models.gradle index c100e37c16..d2f03db5f6 100644 --- a/tensorflow/contrib/lite/examples/android/app/download-models.gradle +++ b/tensorflow/lite/examples/android/app/download-models.gradle @@ -14,7 +14,7 @@ def models = ['conv_actions_tflite.zip', 'mobilenet_ssd_tflite_v1.zip', 'mobilenet_v1_224_android_quant_2017_11_08.zip', 'coco_ssd_mobilenet_v1_1.0_quant_2018_06_29.zip'] -// LINT.ThenChange(//tensorflow/contrib/lite/examples/android/BUILD) +// LINT.ThenChange(//tensorflow/lite/examples/android/BUILD) // Root URL for model archives def MODEL_URL = 'https://storage.googleapis.com/download.tensorflow.org/models/tflite' diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/AndroidManifest.xml b/tensorflow/lite/examples/android/app/src/main/AndroidManifest.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/AndroidManifest.xml rename to tensorflow/lite/examples/android/app/src/main/AndroidManifest.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/assets/BUILD b/tensorflow/lite/examples/android/app/src/main/assets/BUILD similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/assets/BUILD rename to tensorflow/lite/examples/android/app/src/main/assets/BUILD diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/assets/box_priors.txt b/tensorflow/lite/examples/android/app/src/main/assets/box_priors.txt similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/assets/box_priors.txt rename to tensorflow/lite/examples/android/app/src/main/assets/box_priors.txt diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/assets/coco_labels_list.txt b/tensorflow/lite/examples/android/app/src/main/assets/coco_labels_list.txt similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/assets/coco_labels_list.txt rename to tensorflow/lite/examples/android/app/src/main/assets/coco_labels_list.txt diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/assets/conv_actions_labels.txt b/tensorflow/lite/examples/android/app/src/main/assets/conv_actions_labels.txt similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/assets/conv_actions_labels.txt rename to tensorflow/lite/examples/android/app/src/main/assets/conv_actions_labels.txt diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt b/tensorflow/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt rename to tensorflow/lite/examples/android/app/src/main/assets/labels_mobilenet_quant_v1_224.txt diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/assets/pets_labels_list.txt b/tensorflow/lite/examples/android/app/src/main/assets/pets_labels_list.txt similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/assets/pets_labels_list.txt rename to tensorflow/lite/examples/android/app/src/main/assets/pets_labels_list.txt diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/AutoFitTextureView.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraActivity.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/CameraConnectionFragment.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/Classifier.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/ClassifierActivity.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/DetectorActivity.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/LegacyCameraConnectionFragment.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/OverlayView.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognitionScoreView.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/RecognizeCommands.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/ResultsView.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/SpeechActivity.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteImageClassifier.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/TFLiteObjectDetectionAPIModel.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/AssetUtils.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/BorderedText.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/ImageUtils.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Logger.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/Size.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/env/SplitTimer.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/MultiBoxTracker.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java b/tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java rename to tensorflow/lite/examples/android/app/src/main/java/org/tensorflow/demo/tracking/ObjectTracker.java diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/animator/color_animation.xml b/tensorflow/lite/examples/android/app/src/main/res/animator/color_animation.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/animator/color_animation.xml rename to tensorflow/lite/examples/android/app/src/main/res/animator/color_animation.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-hdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-hdpi/tile.9.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-mdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/tensorflow/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png rename to tensorflow/lite/examples/android/app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/drawable/border.xml b/tensorflow/lite/examples/android/app/src/main/res/drawable/border.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/drawable/border.xml rename to tensorflow/lite/examples/android/app/src/main/res/drawable/border.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_camera.xml b/tensorflow/lite/examples/android/app/src/main/res/layout/activity_camera.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_camera.xml rename to tensorflow/lite/examples/android/app/src/main/res/layout/activity_camera.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_speech.xml b/tensorflow/lite/examples/android/app/src/main/res/layout/activity_speech.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/layout/activity_speech.xml rename to tensorflow/lite/examples/android/app/src/main/res/layout/activity_speech.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml b/tensorflow/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml rename to tensorflow/lite/examples/android/app/src/main/res/layout/camera_connection_fragment.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml b/tensorflow/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml rename to tensorflow/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_stylize.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml b/tensorflow/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml rename to tensorflow/lite/examples/android/app/src/main/res/layout/camera_connection_fragment_tracking.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/layout/list_text_item.xml b/tensorflow/lite/examples/android/app/src/main/res/layout/list_text_item.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/layout/list_text_item.xml rename to tensorflow/lite/examples/android/app/src/main/res/layout/list_text_item.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml b/tensorflow/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml rename to tensorflow/lite/examples/android/app/src/main/res/values-sw600dp/template-dimens.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml b/tensorflow/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml rename to tensorflow/lite/examples/android/app/src/main/res/values-sw600dp/template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/styles.xml b/tensorflow/lite/examples/android/app/src/main/res/values-v11/styles.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/styles.xml rename to tensorflow/lite/examples/android/app/src/main/res/values-v11/styles.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/template-styles.xml b/tensorflow/lite/examples/android/app/src/main/res/values-v11/template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values-v11/template-styles.xml rename to tensorflow/lite/examples/android/app/src/main/res/values-v11/template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v14/styles.xml b/tensorflow/lite/examples/android/app/src/main/res/values-v14/styles.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values-v14/styles.xml rename to tensorflow/lite/examples/android/app/src/main/res/values-v14/styles.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-colors.xml b/tensorflow/lite/examples/android/app/src/main/res/values-v21/base-colors.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-colors.xml rename to tensorflow/lite/examples/android/app/src/main/res/values-v21/base-colors.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml b/tensorflow/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml rename to tensorflow/lite/examples/android/app/src/main/res/values-v21/base-template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values/attrs.xml b/tensorflow/lite/examples/android/app/src/main/res/values/attrs.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values/attrs.xml rename to tensorflow/lite/examples/android/app/src/main/res/values/attrs.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values/base-strings.xml b/tensorflow/lite/examples/android/app/src/main/res/values/base-strings.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values/base-strings.xml rename to tensorflow/lite/examples/android/app/src/main/res/values/base-strings.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values/colors.xml b/tensorflow/lite/examples/android/app/src/main/res/values/colors.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values/colors.xml rename to tensorflow/lite/examples/android/app/src/main/res/values/colors.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values/strings.xml b/tensorflow/lite/examples/android/app/src/main/res/values/strings.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values/strings.xml rename to tensorflow/lite/examples/android/app/src/main/res/values/strings.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values/styles.xml b/tensorflow/lite/examples/android/app/src/main/res/values/styles.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values/styles.xml rename to tensorflow/lite/examples/android/app/src/main/res/values/styles.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-dimens.xml b/tensorflow/lite/examples/android/app/src/main/res/values/template-dimens.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-dimens.xml rename to tensorflow/lite/examples/android/app/src/main/res/values/template-dimens.xml diff --git a/tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-styles.xml b/tensorflow/lite/examples/android/app/src/main/res/values/template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/examples/android/app/src/main/res/values/template-styles.xml rename to tensorflow/lite/examples/android/app/src/main/res/values/template-styles.xml diff --git a/tensorflow/contrib/lite/examples/android/build.gradle b/tensorflow/lite/examples/android/build.gradle similarity index 100% rename from tensorflow/contrib/lite/examples/android/build.gradle rename to tensorflow/lite/examples/android/build.gradle diff --git a/tensorflow/contrib/lite/examples/android/settings.gradle b/tensorflow/lite/examples/android/settings.gradle similarity index 100% rename from tensorflow/contrib/lite/examples/android/settings.gradle rename to tensorflow/lite/examples/android/settings.gradle diff --git a/tensorflow/contrib/lite/examples/ios/camera/.gitignore b/tensorflow/lite/examples/ios/camera/.gitignore similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/.gitignore rename to tensorflow/lite/examples/ios/camera/.gitignore diff --git a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleAppDelegate.h b/tensorflow/lite/examples/ios/camera/CameraExampleAppDelegate.h similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/CameraExampleAppDelegate.h rename to tensorflow/lite/examples/ios/camera/CameraExampleAppDelegate.h diff --git a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleAppDelegate.m b/tensorflow/lite/examples/ios/camera/CameraExampleAppDelegate.m similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/CameraExampleAppDelegate.m rename to tensorflow/lite/examples/ios/camera/CameraExampleAppDelegate.m diff --git a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.h b/tensorflow/lite/examples/ios/camera/CameraExampleViewController.h similarity index 94% rename from tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.h rename to tensorflow/lite/examples/ios/camera/CameraExampleViewController.h index fb5800e86d..6bc94e9502 100644 --- a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.h +++ b/tensorflow/lite/examples/ios/camera/CameraExampleViewController.h @@ -17,8 +17,8 @@ #include -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" @interface CameraExampleViewController : UIViewController { diff --git a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm b/tensorflow/lite/examples/ios/camera/CameraExampleViewController.mm similarity index 99% rename from tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm rename to tensorflow/lite/examples/ios/camera/CameraExampleViewController.mm index 996cff2616..1e6725592b 100644 --- a/tensorflow/contrib/lite/examples/ios/camera/CameraExampleViewController.mm +++ b/tensorflow/lite/examples/ios/camera/CameraExampleViewController.mm @@ -23,10 +23,10 @@ #include #include -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/op_resolver.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/op_resolver.h" #define LOG(x) std::cerr diff --git a/tensorflow/contrib/lite/examples/ios/camera/Info.plist b/tensorflow/lite/examples/ios/camera/Info.plist similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/Info.plist rename to tensorflow/lite/examples/ios/camera/Info.plist diff --git a/tensorflow/contrib/lite/examples/ios/camera/MainStoryboard_iPhone.storyboard b/tensorflow/lite/examples/ios/camera/MainStoryboard_iPhone.storyboard similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/MainStoryboard_iPhone.storyboard rename to tensorflow/lite/examples/ios/camera/MainStoryboard_iPhone.storyboard diff --git a/tensorflow/contrib/lite/examples/ios/camera/Podfile b/tensorflow/lite/examples/ios/camera/Podfile similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/Podfile rename to tensorflow/lite/examples/ios/camera/Podfile diff --git a/tensorflow/contrib/lite/examples/ios/camera/README.md b/tensorflow/lite/examples/ios/camera/README.md similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/README.md rename to tensorflow/lite/examples/ios/camera/README.md diff --git a/tensorflow/contrib/lite/examples/ios/camera/data/.gitignore b/tensorflow/lite/examples/ios/camera/data/.gitignore similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/data/.gitignore rename to tensorflow/lite/examples/ios/camera/data/.gitignore diff --git a/tensorflow/contrib/lite/examples/ios/camera/main.mm b/tensorflow/lite/examples/ios/camera/main.mm similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/main.mm rename to tensorflow/lite/examples/ios/camera/main.mm diff --git a/tensorflow/contrib/lite/examples/ios/camera/tflite_camera_example.xcodeproj/project.pbxproj b/tensorflow/lite/examples/ios/camera/tflite_camera_example.xcodeproj/project.pbxproj similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/tflite_camera_example.xcodeproj/project.pbxproj rename to tensorflow/lite/examples/ios/camera/tflite_camera_example.xcodeproj/project.pbxproj diff --git a/tensorflow/contrib/lite/examples/ios/camera/tflite_camera_example_with_select_tf_ops.xcodeproj/project.pbxproj b/tensorflow/lite/examples/ios/camera/tflite_camera_example_with_select_tf_ops.xcodeproj/project.pbxproj similarity index 100% rename from tensorflow/contrib/lite/examples/ios/camera/tflite_camera_example_with_select_tf_ops.xcodeproj/project.pbxproj rename to tensorflow/lite/examples/ios/camera/tflite_camera_example_with_select_tf_ops.xcodeproj/project.pbxproj diff --git a/tensorflow/contrib/lite/examples/ios/download_models.sh b/tensorflow/lite/examples/ios/download_models.sh similarity index 100% rename from tensorflow/contrib/lite/examples/ios/download_models.sh rename to tensorflow/lite/examples/ios/download_models.sh diff --git a/tensorflow/contrib/lite/examples/ios/simple/AppDelegate.h b/tensorflow/lite/examples/ios/simple/AppDelegate.h similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/AppDelegate.h rename to tensorflow/lite/examples/ios/simple/AppDelegate.h diff --git a/tensorflow/contrib/lite/examples/ios/simple/AppDelegate.mm b/tensorflow/lite/examples/ios/simple/AppDelegate.mm similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/AppDelegate.mm rename to tensorflow/lite/examples/ios/simple/AppDelegate.mm diff --git a/tensorflow/contrib/lite/examples/ios/simple/Podfile b/tensorflow/lite/examples/ios/simple/Podfile similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/Podfile rename to tensorflow/lite/examples/ios/simple/Podfile diff --git a/tensorflow/contrib/lite/examples/ios/simple/RunModel-Info.plist b/tensorflow/lite/examples/ios/simple/RunModel-Info.plist similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/RunModel-Info.plist rename to tensorflow/lite/examples/ios/simple/RunModel-Info.plist diff --git a/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.h b/tensorflow/lite/examples/ios/simple/RunModelViewController.h similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.h rename to tensorflow/lite/examples/ios/simple/RunModelViewController.h diff --git a/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm b/tensorflow/lite/examples/ios/simple/RunModelViewController.mm similarity index 97% rename from tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm rename to tensorflow/lite/examples/ios/simple/RunModelViewController.mm index 650c73f732..e5764944f6 100644 --- a/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.mm +++ b/tensorflow/lite/examples/ios/simple/RunModelViewController.mm @@ -22,10 +22,10 @@ #include #include -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/op_resolver.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/op_resolver.h" #include "ios_image_load.h" diff --git a/tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.xib b/tensorflow/lite/examples/ios/simple/RunModelViewController.xib similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/RunModelViewController.xib rename to tensorflow/lite/examples/ios/simple/RunModelViewController.xib diff --git a/tensorflow/contrib/lite/examples/ios/simple/data/grace_hopper.jpg b/tensorflow/lite/examples/ios/simple/data/grace_hopper.jpg similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/data/grace_hopper.jpg rename to tensorflow/lite/examples/ios/simple/data/grace_hopper.jpg diff --git a/tensorflow/contrib/lite/examples/ios/simple/ios_image_load.h b/tensorflow/lite/examples/ios/simple/ios_image_load.h similarity index 78% rename from tensorflow/contrib/lite/examples/ios/simple/ios_image_load.h rename to tensorflow/lite/examples/ios/simple/ios_image_load.h index 96d2810937..74c6cf3c7b 100644 --- a/tensorflow/contrib/lite/examples/ios/simple/ios_image_load.h +++ b/tensorflow/lite/examples/ios/simple/ios_image_load.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TENSORFLOW_CONTRIB_LITE_EXAMPLES_IOS_SIMPLE_IOS_IMAGE_LOAD_H_ -#define TENSORFLOW_CONTRIB_LITE_EXAMPLES_IOS_SIMPLE_IOS_IMAGE_LOAD_H_ +#ifndef TENSORFLOW_LITE_EXAMPLES_IOS_SIMPLE_IOS_IMAGE_LOAD_H_ +#define TENSORFLOW_LITE_EXAMPLES_IOS_SIMPLE_IOS_IMAGE_LOAD_H_ #include std::vector LoadImageFromFile(const char* file_name, int* out_width, int* out_height, int* out_channels); -#endif // TENSORFLOW_CONTRIB_LITE_EXAMPLES_IOS_SIMPLE_IOS_IMAGE_LOAD_H_ +#endif // TENSORFLOW_LITE_EXAMPLES_IOS_SIMPLE_IOS_IMAGE_LOAD_H_ diff --git a/tensorflow/contrib/lite/examples/ios/simple/ios_image_load.mm b/tensorflow/lite/examples/ios/simple/ios_image_load.mm similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/ios_image_load.mm rename to tensorflow/lite/examples/ios/simple/ios_image_load.mm diff --git a/tensorflow/contrib/lite/examples/ios/simple/main.mm b/tensorflow/lite/examples/ios/simple/main.mm similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/main.mm rename to tensorflow/lite/examples/ios/simple/main.mm diff --git a/tensorflow/contrib/lite/examples/ios/simple/simple.xcodeproj/project.pbxproj b/tensorflow/lite/examples/ios/simple/simple.xcodeproj/project.pbxproj similarity index 100% rename from tensorflow/contrib/lite/examples/ios/simple/simple.xcodeproj/project.pbxproj rename to tensorflow/lite/examples/ios/simple/simple.xcodeproj/project.pbxproj diff --git a/tensorflow/contrib/lite/examples/label_image/BUILD b/tensorflow/lite/examples/label_image/BUILD similarity index 67% rename from tensorflow/contrib/lite/examples/label_image/BUILD rename to tensorflow/lite/examples/label_image/BUILD index fc55a78019..de1bfd7053 100644 --- a/tensorflow/contrib/lite/examples/label_image/BUILD +++ b/tensorflow/lite/examples/label_image/BUILD @@ -6,7 +6,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 load("//tensorflow:tensorflow.bzl", "tf_cc_binary") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_linkopts") +load("//tensorflow/lite:build_def.bzl", "tflite_linkopts") exports_files(glob([ "testdata/*.bmp", @@ -28,9 +28,9 @@ tf_cc_binary( }), deps = [ ":bitmap_helpers", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", ], ) @@ -43,13 +43,13 @@ cc_library( "label_image.h", ], deps = [ - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite:string", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite:string", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/schema:schema_fbs", ], ) diff --git a/tensorflow/contrib/lite/examples/label_image/bitmap_helpers.cc b/tensorflow/lite/examples/label_image/bitmap_helpers.cc similarity index 98% rename from tensorflow/contrib/lite/examples/label_image/bitmap_helpers.cc rename to tensorflow/lite/examples/label_image/bitmap_helpers.cc index 2735d1f5ea..0adad68ddc 100644 --- a/tensorflow/contrib/lite/examples/label_image/bitmap_helpers.cc +++ b/tensorflow/lite/examples/label_image/bitmap_helpers.cc @@ -21,7 +21,7 @@ limitations under the License. #include // NOLINT(build/include_order) -#include "tensorflow/contrib/lite/examples/label_image/bitmap_helpers.h" +#include "tensorflow/lite/examples/label_image/bitmap_helpers.h" #define LOG(x) std::cerr diff --git a/tensorflow/contrib/lite/examples/label_image/bitmap_helpers.h b/tensorflow/lite/examples/label_image/bitmap_helpers.h similarity index 79% rename from tensorflow/contrib/lite/examples/label_image/bitmap_helpers.h rename to tensorflow/lite/examples/label_image/bitmap_helpers.h index 7881ee80ca..05209963a1 100644 --- a/tensorflow/contrib/lite/examples/label_image/bitmap_helpers.h +++ b/tensorflow/lite/examples/label_image/bitmap_helpers.h @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_H_ -#define TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_H_ +#ifndef TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_H_ +#define TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_H_ -#include "tensorflow/contrib/lite/examples/label_image/bitmap_helpers_impl.h" -#include "tensorflow/contrib/lite/examples/label_image/label_image.h" +#include "tensorflow/lite/examples/label_image/bitmap_helpers_impl.h" +#include "tensorflow/lite/examples/label_image/label_image.h" namespace tflite { namespace label_image { @@ -39,4 +39,4 @@ template void resize(float*, unsigned char*, int, int, int, int, int, } // namespace label_image } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_H_ +#endif // TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_H_ diff --git a/tensorflow/contrib/lite/examples/label_image/bitmap_helpers_impl.h b/tensorflow/lite/examples/label_image/bitmap_helpers_impl.h similarity index 84% rename from tensorflow/contrib/lite/examples/label_image/bitmap_helpers_impl.h rename to tensorflow/lite/examples/label_image/bitmap_helpers_impl.h index 21ad39a6bf..b581d80773 100644 --- a/tensorflow/contrib/lite/examples/label_image/bitmap_helpers_impl.h +++ b/tensorflow/lite/examples/label_image/bitmap_helpers_impl.h @@ -13,16 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_IMPL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_IMPL_H_ +#ifndef TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_IMPL_H_ +#define TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_IMPL_H_ -#include "tensorflow/contrib/lite/examples/label_image/label_image.h" +#include "tensorflow/lite/examples/label_image/label_image.h" -#include "tensorflow/contrib/lite/builtin_op_data.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/builtin_op_data.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/version.h" namespace tflite { namespace label_image { @@ -93,4 +93,4 @@ void resize(T* out, uint8_t* in, int image_height, int image_width, } // namespace label_image } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_IMPL_H_ +#endif // TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_BITMAP_HELPERS_IMPL_H_ diff --git a/tensorflow/contrib/lite/examples/label_image/get_top_n.h b/tensorflow/lite/examples/label_image/get_top_n.h similarity index 82% rename from tensorflow/contrib/lite/examples/label_image/get_top_n.h rename to tensorflow/lite/examples/label_image/get_top_n.h index adef434c00..47fea2f775 100644 --- a/tensorflow/contrib/lite/examples/label_image/get_top_n.h +++ b/tensorflow/lite/examples/label_image/get_top_n.h @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_H_ -#define TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_H_ +#ifndef TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_H_ +#define TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_H_ -#include "tensorflow/contrib/lite/examples/label_image/get_top_n_impl.h" +#include "tensorflow/lite/examples/label_image/get_top_n_impl.h" namespace tflite { namespace label_image { @@ -35,4 +35,4 @@ template void get_top_n(float*, int, size_t, float, } // namespace label_image } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_H_ +#endif // TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_H_ diff --git a/tensorflow/contrib/lite/examples/label_image/get_top_n_impl.h b/tensorflow/lite/examples/label_image/get_top_n_impl.h similarity index 90% rename from tensorflow/contrib/lite/examples/label_image/get_top_n_impl.h rename to tensorflow/lite/examples/label_image/get_top_n_impl.h index 708cf2f2b1..563ac09114 100644 --- a/tensorflow/contrib/lite/examples/label_image/get_top_n_impl.h +++ b/tensorflow/lite/examples/label_image/get_top_n_impl.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_IMPL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_IMPL_H_ +#ifndef TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_IMPL_H_ +#define TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_IMPL_H_ #include #include @@ -67,4 +67,4 @@ void get_top_n(T* prediction, int prediction_size, size_t num_results, } // namespace label_image } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_IMPL_H_ +#endif // TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_GET_TOP_N_IMPL_H_ diff --git a/tensorflow/contrib/lite/examples/label_image/label_image.cc b/tensorflow/lite/examples/label_image/label_image.cc similarity index 97% rename from tensorflow/contrib/lite/examples/label_image/label_image.cc rename to tensorflow/lite/examples/label_image/label_image.cc index 7c6f523041..b8dc2840df 100644 --- a/tensorflow/contrib/lite/examples/label_image/label_image.cc +++ b/tensorflow/lite/examples/label_image/label_image.cc @@ -32,13 +32,13 @@ limitations under the License. #include // NOLINT(build/include_order) #include // NOLINT(build/include_order) -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/optional_debug_tools.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/optional_debug_tools.h" +#include "tensorflow/lite/string_util.h" -#include "tensorflow/contrib/lite/examples/label_image/bitmap_helpers.h" -#include "tensorflow/contrib/lite/examples/label_image/get_top_n.h" +#include "tensorflow/lite/examples/label_image/bitmap_helpers.h" +#include "tensorflow/lite/examples/label_image/get_top_n.h" #define LOG(x) std::cerr diff --git a/tensorflow/contrib/lite/examples/label_image/label_image.h b/tensorflow/lite/examples/label_image/label_image.h similarity index 82% rename from tensorflow/contrib/lite/examples/label_image/label_image.h rename to tensorflow/lite/examples/label_image/label_image.h index f0be881b58..88b047fecc 100644 --- a/tensorflow/contrib/lite/examples/label_image/label_image.h +++ b/tensorflow/lite/examples/label_image/label_image.h @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_LABEL_IMAGE_H_ -#define TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_LABEL_IMAGE_H_ +#ifndef TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_LABEL_IMAGE_H_ +#define TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_LABEL_IMAGE_H_ -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace label_image { @@ -40,4 +40,4 @@ struct Settings { } // namespace label_image } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXAMPLES_LABEL_IMAGE_LABEL_IMAGE_H_ +#endif // TENSORFLOW_LITE_EXAMPLES_LABEL_IMAGE_LABEL_IMAGE_H_ diff --git a/tensorflow/contrib/lite/examples/label_image/label_image.md b/tensorflow/lite/examples/label_image/label_image.md similarity index 84% rename from tensorflow/contrib/lite/examples/label_image/label_image.md rename to tensorflow/lite/examples/label_image/label_image.md index 9ce32cf101..fd9f49918b 100644 --- a/tensorflow/contrib/lite/examples/label_image/label_image.md +++ b/tensorflow/lite/examples/label_image/label_image.md @@ -10,12 +10,12 @@ To build it for android ARMv8: --crosstool_top=//external:android/crosstool \ --host_crosstool_top=@bazel_tools//tools/cpp:toolchain \ --cpu=arm64-v8a \ - //tensorflow/contrib/lite/examples/label_image:label_image + //tensorflow/lite/examples/label_image:label_image ``` or ``` > bazel build --config android_arm64 --config monolithic --cxxopt=-std=c++11 \ - //tensorflow/contrib/lite/examples/label_image:label_image + //tensorflow/lite/examples/label_image:label_image ``` To build it for android arm-v7a: @@ -24,17 +24,17 @@ To build it for android arm-v7a: --crosstool_top=//external:android/crosstool \ --host_crosstool_top=@bazel_tools//tools/cpp:toolchain \ --cpu=armeabi-v7a \ - //tensorflow/contrib/lite/examples/label_image:label_image + //tensorflow/lite/examples/label_image:label_image ``` or ``` > bazel build --config android_arm --config monolithic --cxxopt=-std=c++11 \ - //tensorflow/contrib/lite/examples/label_image:label_image + //tensorflow/lite/examples/label_image:label_image ``` Build it for desktop machines (tested on Ubuntu and OS X) ``` -> bazel build --config opt --cxxopt=-std=c++11 //tensorflow/contrib/lite/examples/label_image:label_image +> bazel build --config opt --cxxopt=-std=c++11 //tensorflow/lite/examples/label_image:label_image ``` To run it. Prepare `./mobilenet_quant_v1_224.tflite`, `./grace_hopper.bmp`, and `./labels.txt`. diff --git a/tensorflow/contrib/lite/examples/label_image/label_image_test.cc b/tensorflow/lite/examples/label_image/label_image_test.cc similarity index 86% rename from tensorflow/contrib/lite/examples/label_image/label_image_test.cc rename to tensorflow/lite/examples/label_image/label_image_test.cc index de7de21f77..6b4ec2a937 100644 --- a/tensorflow/contrib/lite/examples/label_image/label_image_test.cc +++ b/tensorflow/lite/examples/label_image/label_image_test.cc @@ -16,9 +16,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/examples/label_image/bitmap_helpers.h" -#include "tensorflow/contrib/lite/examples/label_image/get_top_n.h" -#include "tensorflow/contrib/lite/examples/label_image/label_image.h" +#include "tensorflow/lite/examples/label_image/bitmap_helpers.h" +#include "tensorflow/lite/examples/label_image/get_top_n.h" +#include "tensorflow/lite/examples/label_image/label_image.h" using ::testing::ElementsAreArray; @@ -27,7 +27,7 @@ namespace label_image { TEST(LabelImageTest, GraceHopper) { std::string lena_file = - "tensorflow/contrib/lite/examples/label_image/testdata/" + "tensorflow/lite/examples/label_image/testdata/" "grace_hopper.bmp"; int height, width, channels; Settings s; diff --git a/tensorflow/contrib/lite/examples/label_image/testdata/grace_hopper.bmp b/tensorflow/lite/examples/label_image/testdata/grace_hopper.bmp similarity index 100% rename from tensorflow/contrib/lite/examples/label_image/testdata/grace_hopper.bmp rename to tensorflow/lite/examples/label_image/testdata/grace_hopper.bmp diff --git a/tensorflow/contrib/lite/examples/minimal/BUILD b/tensorflow/lite/examples/minimal/BUILD similarity index 76% rename from tensorflow/contrib/lite/examples/minimal/BUILD rename to tensorflow/lite/examples/minimal/BUILD index b403628d6c..cdd67af1e9 100644 --- a/tensorflow/contrib/lite/examples/minimal/BUILD +++ b/tensorflow/lite/examples/minimal/BUILD @@ -6,7 +6,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 load("//tensorflow:tensorflow.bzl", "tf_cc_binary") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_linkopts") +load("//tensorflow/lite:build_def.bzl", "tflite_linkopts") tf_cc_binary( name = "minimal", @@ -21,7 +21,7 @@ tf_cc_binary( "//conditions:default": [], }), deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", ], ) diff --git a/tensorflow/contrib/lite/examples/minimal/minimal.cc b/tensorflow/lite/examples/minimal/minimal.cc similarity index 92% rename from tensorflow/contrib/lite/examples/minimal/minimal.cc rename to tensorflow/lite/examples/minimal/minimal.cc index 8b65cde7b7..46f8b09df6 100644 --- a/tensorflow/contrib/lite/examples/minimal/minimal.cc +++ b/tensorflow/lite/examples/minimal/minimal.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/optional_debug_tools.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/optional_debug_tools.h" // This is an example that is minimal to read a model // from disk and perform inference. There is no data being loaded diff --git a/tensorflow/contrib/lite/examples/python/BUILD b/tensorflow/lite/examples/python/BUILD similarity index 83% rename from tensorflow/contrib/lite/examples/python/BUILD rename to tensorflow/lite/examples/python/BUILD index d337c3ddc4..a606d1aa56 100644 --- a/tensorflow/contrib/lite/examples/python/BUILD +++ b/tensorflow/lite/examples/python/BUILD @@ -8,6 +8,6 @@ py_binary( main = "label_image.py", srcs_version = "PY2AND3", deps = [ - "//tensorflow/contrib/lite/python:lite", + "//tensorflow/lite/python:lite", ], ) diff --git a/tensorflow/contrib/lite/examples/python/label_image.md b/tensorflow/lite/examples/python/label_image.md similarity index 81% rename from tensorflow/contrib/lite/examples/python/label_image.md rename to tensorflow/lite/examples/python/label_image.md index e81192a96c..b4ec42f525 100644 --- a/tensorflow/contrib/lite/examples/python/label_image.md +++ b/tensorflow/lite/examples/python/label_image.md @@ -6,7 +6,7 @@ The example input image and labels file are from TensorFlow repo and MobileNet V1 model files. ``` -curl https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/contrib/lite/examples/label_image/testdata/grace_hopper.bmp > /tmp/grace_hopper.bmp +curl https://raw.githubusercontent.com/tensorflow/tensorflow/master/tensorflow/lite/examples/label_image/testdata/grace_hopper.bmp > /tmp/grace_hopper.bmp curl https://storage.googleapis.com/download.tensorflow.org/models/mobilenet_v1_1.0_224_frozen.tgz | tar xzv -C /tmp mobilenet_v1_1.0_224/labels.txt mv /tmp/mobilenet_v1_1.0_224/labels.txt /tmp/ @@ -17,7 +17,7 @@ Run ``` curl http://download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224_quant.tgz | tar xzv -C /tmp -bazel run --config opt //tensorflow/contrib/lite/examples/python:label_image +bazel run --config opt //tensorflow/lite/examples/python:label_image ``` We can get results like @@ -34,7 +34,7 @@ Run ``` curl http://download.tensorflow.org/models/mobilenet_v1_2018_02_22/mobilenet_v1_1.0_224.tgz | tar xzv -C /tmp -bazel run --config opt //tensorflow/contrib/lite/examples/python:label_image \ +bazel run --config opt //tensorflow/lite/examples/python:label_image \ -- --model_file /tmp/mobilenet_v1_1.0_224.tflite ``` diff --git a/tensorflow/contrib/lite/examples/python/label_image.py b/tensorflow/lite/examples/python/label_image.py similarity index 97% rename from tensorflow/contrib/lite/examples/python/label_image.py rename to tensorflow/lite/examples/python/label_image.py index 282118a1d2..0bc15d36a8 100644 --- a/tensorflow/contrib/lite/examples/python/label_image.py +++ b/tensorflow/lite/examples/python/label_image.py @@ -23,7 +23,7 @@ import numpy as np from PIL import Image -from tensorflow.contrib.lite.python import interpreter as interpreter_wrapper +from tensorflow.lite.python import interpreter as interpreter_wrapper def load_labels(filename): my_labels = [] diff --git a/tensorflow/contrib/lite/experimental/c/BUILD b/tensorflow/lite/experimental/c/BUILD similarity index 63% rename from tensorflow/contrib/lite/experimental/c/BUILD rename to tensorflow/lite/experimental/c/BUILD index 8de063ff52..5dd62194de 100644 --- a/tensorflow/contrib/lite/experimental/c/BUILD +++ b/tensorflow/lite/experimental/c/BUILD @@ -3,14 +3,14 @@ package(default_visibility = ["//visibility:private"]) package_group( name = "experimental", packages = [ - "//tensorflow/contrib/lite/experimental/...", + "//tensorflow/lite/experimental/...", ], ) licenses(["notice"]) # Apache 2.0 load( - "//tensorflow/contrib/lite:build_def.bzl", + "//tensorflow/lite:build_def.bzl", "tflite_cc_shared_object", "tflite_copts", "tflite_jni_binary", @@ -21,14 +21,14 @@ tflite_cc_shared_object( linkopts = select({ "//tensorflow:darwin": [ "-Wl,-exported_symbols_list", # This line must be directly followed by the exported_symbols.lds file - "$(location //tensorflow/contrib/lite/experimental/c:exported_symbols.lds)", + "$(location //tensorflow/lite/experimental/c:exported_symbols.lds)", "-Wl,-install_name,@rpath/libtensorflowlite_c.so", ], "//tensorflow:windows": [], "//conditions:default": [ "-z defs", "-Wl,--version-script", # This line must be directly followed by the version_script.lds file - "$(location //tensorflow/contrib/lite/experimental/c:version_script.lds)", + "$(location //tensorflow/lite/experimental/c:version_script.lds)", ], }), deps = [ @@ -45,11 +45,11 @@ cc_library( hdrs = ["c_api_internal.h"], copts = tflite_copts(), visibility = [ - "//tensorflow/contrib/lite/experimental/c:__subpackages__", + "//tensorflow/lite/experimental/c:__subpackages__", ], deps = [ - "//tensorflow/contrib/lite:context", - "//tensorflow/contrib/lite:framework", + "//tensorflow/lite:context", + "//tensorflow/lite:framework", ], ) @@ -63,10 +63,10 @@ cc_library( ], deps = [ ":c_api_internal", - "//tensorflow/contrib/lite:context", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:context", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/kernels:builtin_ops", ], ) @@ -78,7 +78,7 @@ cc_library( deps = [ ":c_api", ":c_api_internal", - "//tensorflow/contrib/lite:kernel_api", + "//tensorflow/lite:kernel_api", ], ) @@ -87,14 +87,14 @@ cc_test( size = "small", srcs = ["c_api_test.cc"], data = [ - "//tensorflow/contrib/lite:testdata/add.bin", - "//tensorflow/contrib/lite:testdata/add_quantized.bin", + "//tensorflow/lite:testdata/add.bin", + "//tensorflow/lite:testdata/add_quantized.bin", ], deps = [ ":c_api", - "//tensorflow/contrib/lite:context", - "//tensorflow/contrib/lite:kernel_api", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite:context", + "//tensorflow/lite:kernel_api", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -103,12 +103,12 @@ cc_test( name = "c_api_experimental_test", size = "small", srcs = ["c_api_experimental_test.cc"], - data = ["//tensorflow/contrib/lite:testdata/add.bin"], + data = ["//tensorflow/lite:testdata/add.bin"], deps = [ ":c_api", ":c_api_experimental", - "//tensorflow/contrib/lite:kernel_api", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite:kernel_api", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/experimental/c/c_api.cc b/tensorflow/lite/experimental/c/c_api.cc similarity index 93% rename from tensorflow/contrib/lite/experimental/c/c_api.cc rename to tensorflow/lite/experimental/c/c_api.cc index 7123bec7fe..9caacfeb36 100644 --- a/tensorflow/contrib/lite/experimental/c/c_api.cc +++ b/tensorflow/lite/experimental/c/c_api.cc @@ -12,16 +12,16 @@ 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/contrib/lite/experimental/c/c_api.h" +#include "tensorflow/lite/experimental/c/c_api.h" #include -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/error_reporter.h" -#include "tensorflow/contrib/lite/experimental/c/c_api_internal.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/error_reporter.h" +#include "tensorflow/lite/experimental/c/c_api_internal.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" #ifdef __cplusplus extern "C" { @@ -203,7 +203,7 @@ TFL_Status TFL_TensorCopyToBuffer(const TFL_Tensor* tensor, void* output_data, return kTfLiteOk; } -// LINT.ThenChange(//tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs) +// LINT.ThenChange(//tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs) #ifdef __cplusplus } // extern "C" diff --git a/tensorflow/contrib/lite/experimental/c/c_api.h b/tensorflow/lite/experimental/c/c_api.h similarity index 97% rename from tensorflow/contrib/lite/experimental/c/c_api.h rename to tensorflow/lite/experimental/c/c_api.h index 6149af750f..49089011d1 100644 --- a/tensorflow/contrib/lite/experimental/c/c_api.h +++ b/tensorflow/lite/experimental/c/c_api.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_CONTRIB_LITE_EXPERIMENTAL_C_C_API_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_C_C_API_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_H_ #include #include @@ -21,7 +21,7 @@ limitations under the License. // Eventually the various C APIs defined in context.h will be migrated into // the appropriate /c/c_api*.h header. For now, we pull in existing definitions // for convenience. -#include "tensorflow/contrib/lite/context.h" +#include "tensorflow/lite/context.h" // -------------------------------------------------------------------------- // Experimental C API for TensorFlowLite. @@ -223,4 +223,4 @@ TFL_CAPI_EXPORT extern TFL_Status TFL_TensorCopyToBuffer( } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_C_C_API_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_H_ diff --git a/tensorflow/contrib/lite/experimental/c/c_api_experimental.cc b/tensorflow/lite/experimental/c/c_api_experimental.cc similarity index 92% rename from tensorflow/contrib/lite/experimental/c/c_api_experimental.cc rename to tensorflow/lite/experimental/c/c_api_experimental.cc index 29f8701f53..a246ed99cd 100644 --- a/tensorflow/contrib/lite/experimental/c/c_api_experimental.cc +++ b/tensorflow/lite/experimental/c/c_api_experimental.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/c/c_api_experimental.h" +#include "tensorflow/lite/experimental/c/c_api_experimental.h" -#include "tensorflow/contrib/lite/experimental/c/c_api_internal.h" +#include "tensorflow/lite/experimental/c/c_api_internal.h" #ifdef __cplusplus extern "C" { diff --git a/tensorflow/contrib/lite/experimental/c/c_api_experimental.h b/tensorflow/lite/experimental/c/c_api_experimental.h similarity index 87% rename from tensorflow/contrib/lite/experimental/c/c_api_experimental.h rename to tensorflow/lite/experimental/c/c_api_experimental.h index fca5d92f77..e4cd084520 100644 --- a/tensorflow/contrib/lite/experimental/c/c_api_experimental.h +++ b/tensorflow/lite/experimental/c/c_api_experimental.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_CONTRIB_LITE_EXPERIMENTAL_C_C_API_EXPERIMENTAL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_C_C_API_EXPERIMENTAL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_EXPERIMENTAL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_EXPERIMENTAL_H_ -#include "tensorflow/contrib/lite/builtin_ops.h" -#include "tensorflow/contrib/lite/experimental/c/c_api.h" +#include "tensorflow/lite/builtin_ops.h" +#include "tensorflow/lite/experimental/c/c_api.h" #ifdef __cplusplus extern "C" { @@ -54,4 +54,4 @@ void TFL_InterpreterOptionsAddCustomOp(TFL_InterpreterOptions* options, } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_C_C_API_EXPERIMENTAL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_EXPERIMENTAL_H_ diff --git a/tensorflow/contrib/lite/experimental/c/c_api_experimental_test.cc b/tensorflow/lite/experimental/c/c_api_experimental_test.cc similarity index 86% rename from tensorflow/contrib/lite/experimental/c/c_api_experimental_test.cc rename to tensorflow/lite/experimental/c/c_api_experimental_test.cc index 1b1bedb754..e79c7204c6 100644 --- a/tensorflow/contrib/lite/experimental/c/c_api_experimental_test.cc +++ b/tensorflow/lite/experimental/c/c_api_experimental_test.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/c/c_api_experimental.h" +#include "tensorflow/lite/experimental/c/c_api_experimental.h" #include -#include "tensorflow/contrib/lite/builtin_ops.h" -#include "tensorflow/contrib/lite/experimental/c/c_api.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/builtin_ops.h" +#include "tensorflow/lite/experimental/c/c_api.h" +#include "tensorflow/lite/testing/util.h" namespace { @@ -34,7 +34,7 @@ TfLiteRegistration* GetDummyRegistration() { TEST(CApiExperimentalSimple, Smoke) { TFL_Model* model = TFL_NewModelFromFile( - "tensorflow/contrib/lite/testdata/add.bin"); + "tensorflow/lite/testdata/add.bin"); ASSERT_NE(model, nullptr); TFL_InterpreterOptions* options = TFL_NewInterpreterOptions(); diff --git a/tensorflow/contrib/lite/experimental/c/c_api_internal.h b/tensorflow/lite/experimental/c/c_api_internal.h similarity index 82% rename from tensorflow/contrib/lite/experimental/c/c_api_internal.h rename to tensorflow/lite/experimental/c/c_api_internal.h index da3af3cad4..8a2987c8f1 100644 --- a/tensorflow/contrib/lite/experimental/c/c_api_internal.h +++ b/tensorflow/lite/experimental/c/c_api_internal.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_CONTRIB_LITE_EXPERIMENTAL_C_C_API_INTERNAL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_C_C_API_INTERNAL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_INTERNAL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_INTERNAL_H_ -#include "tensorflow/contrib/lite/experimental/c/c_api.h" +#include "tensorflow/lite/experimental/c/c_api.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/op_resolver.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/op_resolver.h" // Internal structures used by the C API. These are likely to change and should // not be depended on. @@ -58,4 +58,4 @@ struct TFL_Interpreter { std::unique_ptr impl; }; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_C_C_API_INTERNAL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_C_C_API_INTERNAL_H_ diff --git a/tensorflow/contrib/lite/experimental/c/c_api_test.cc b/tensorflow/lite/experimental/c/c_api_test.cc similarity index 95% rename from tensorflow/contrib/lite/experimental/c/c_api_test.cc rename to tensorflow/lite/experimental/c/c_api_test.cc index 8382e9bbb1..5fb14f342c 100644 --- a/tensorflow/contrib/lite/experimental/c/c_api_test.cc +++ b/tensorflow/lite/experimental/c/c_api_test.cc @@ -15,17 +15,17 @@ limitations under the License. #include -#include "tensorflow/contrib/lite/experimental/c/c_api.h" +#include "tensorflow/lite/experimental/c/c_api.h" #include -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/testing/util.h" namespace { TEST(CApiSimple, Smoke) { TFL_Model* model = TFL_NewModelFromFile( - "tensorflow/contrib/lite/testdata/add.bin"); + "tensorflow/lite/testdata/add.bin"); ASSERT_NE(model, nullptr); TFL_InterpreterOptions* options = TFL_NewInterpreterOptions(); @@ -97,7 +97,7 @@ TEST(CApiSimple, Smoke) { TEST(CApiSimple, QuantizationParams) { TFL_Model* model = TFL_NewModelFromFile( - "tensorflow/contrib/lite/testdata/add_quantized.bin"); + "tensorflow/lite/testdata/add_quantized.bin"); ASSERT_NE(model, nullptr); TFL_Interpreter* interpreter = TFL_NewInterpreter(model, nullptr); @@ -157,7 +157,7 @@ TEST(CApiSimple, QuantizationParams) { TEST(CApiSimple, ErrorReporter) { TFL_Model* model = TFL_NewModelFromFile( - "tensorflow/contrib/lite/testdata/add.bin"); + "tensorflow/lite/testdata/add.bin"); TFL_InterpreterOptions* options = TFL_NewInterpreterOptions(); // Install a custom error reporter into the interpreter by way of options. diff --git a/tensorflow/contrib/lite/experimental/c/exported_symbols.lds b/tensorflow/lite/experimental/c/exported_symbols.lds similarity index 100% rename from tensorflow/contrib/lite/experimental/c/exported_symbols.lds rename to tensorflow/lite/experimental/c/exported_symbols.lds diff --git a/tensorflow/contrib/lite/experimental/c/version_script.lds b/tensorflow/lite/experimental/c/version_script.lds similarity index 100% rename from tensorflow/contrib/lite/experimental/c/version_script.lds rename to tensorflow/lite/experimental/c/version_script.lds diff --git a/tensorflow/contrib/lite/experimental/examples/lstm/BUILD b/tensorflow/lite/experimental/examples/lstm/BUILD similarity index 91% rename from tensorflow/contrib/lite/experimental/examples/lstm/BUILD rename to tensorflow/lite/experimental/examples/lstm/BUILD index 3c1fe5f8be..7a475a24d3 100644 --- a/tensorflow/contrib/lite/experimental/examples/lstm/BUILD +++ b/tensorflow/lite/experimental/examples/lstm/BUILD @@ -11,7 +11,7 @@ py_library( visibility = ["//visibility:public"], deps = [ "//tensorflow:tensorflow_py", - "//tensorflow/contrib/lite/python:lite", + "//tensorflow/lite/python:lite", "//tensorflow/python:framework", "@six_archive//:six", ], @@ -31,8 +31,8 @@ py_test( deps = [ ":tflite_lstm", "//tensorflow:tensorflow_py", - "//tensorflow/contrib/lite/python:lite", "//tensorflow/examples/tutorials/mnist:input_data", + "//tensorflow/lite/python:lite", "//tensorflow/python:framework_test_lib", "//tensorflow/python:platform", "//tensorflow/python/tools:optimize_for_inference", diff --git a/tensorflow/contrib/lite/experimental/examples/lstm/tflite_lstm.py b/tensorflow/lite/experimental/examples/lstm/tflite_lstm.py similarity index 99% rename from tensorflow/contrib/lite/experimental/examples/lstm/tflite_lstm.py rename to tensorflow/lite/experimental/examples/lstm/tflite_lstm.py index 2357743266..2fe8ebf9e9 100644 --- a/tensorflow/contrib/lite/experimental/examples/lstm/tflite_lstm.py +++ b/tensorflow/lite/experimental/examples/lstm/tflite_lstm.py @@ -21,7 +21,7 @@ from __future__ import division from __future__ import print_function import tensorflow as tf -from tensorflow.contrib.lite.python import lite +from tensorflow.lite.python import lite from tensorflow.python.keras import activations from tensorflow.python.keras import initializers from tensorflow.python.layers import base as base_layer diff --git a/tensorflow/contrib/lite/experimental/examples/lstm/unidirectional_sequence_lstm_test.py b/tensorflow/lite/experimental/examples/lstm/unidirectional_sequence_lstm_test.py similarity index 96% rename from tensorflow/contrib/lite/experimental/examples/lstm/unidirectional_sequence_lstm_test.py rename to tensorflow/lite/experimental/examples/lstm/unidirectional_sequence_lstm_test.py index 2ca977518c..81ab6691df 100644 --- a/tensorflow/contrib/lite/experimental/examples/lstm/unidirectional_sequence_lstm_test.py +++ b/tensorflow/lite/experimental/examples/lstm/unidirectional_sequence_lstm_test.py @@ -19,7 +19,7 @@ import tempfile import numpy as np import tensorflow as tf -from tensorflow.contrib.lite.experimental.examples.lstm.tflite_lstm import TFLiteLSTMCell +from tensorflow.lite.experimental.examples.lstm.tflite_lstm import TFLiteLSTMCell from tensorflow.examples.tutorials.mnist import input_data from tensorflow.python.framework import test_util from tensorflow.python.platform import test @@ -150,15 +150,15 @@ class UnidirectionalSequenceLstmTest(test_util.TensorFlowTestCase): tf.import_graph_def(graph, name="", input_map={"INPUT_IMAGE": tflite_input}) with tf.Session() as sess: curr = sess.graph_def - curr = tf.contrib.lite.convert_op_hints_to_stubs(graph_def=curr) + curr = tf.lite.convert_op_hints_to_stubs(graph_def=curr) curr = optimize_for_inference_lib.optimize_for_inference( curr, ["INPUT_IMAGE_LITE"], ["OUTPUT_CLASS"], [tf.float32.as_datatype_enum]) - tflite = tf.contrib.lite.toco_convert( + tflite = tf.lite.toco_convert( curr, [tflite_input], [outputs], allow_custom_ops=False) - interpreter = tf.contrib.lite.Interpreter(model_content=tflite) + interpreter = tf.lite.Interpreter(model_content=tflite) try: interpreter.allocate_tensors() diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/.gitignore b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/.gitignore similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/.gitignore rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/.gitignore diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/HelloTFLite.unity.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scripts/HelloTFLite.cs.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs.meta b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs.meta similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs.meta rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/SDK/Scripts/Interpreter.cs.meta diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/AudioManager.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/AudioManager.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/AudioManager.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/AudioManager.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ClusterInputManager.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ClusterInputManager.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ClusterInputManager.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/DynamicsManager.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/DynamicsManager.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/DynamicsManager.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/DynamicsManager.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorBuildSettings.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorBuildSettings.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorBuildSettings.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorSettings.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorSettings.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorSettings.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/EditorSettings.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/GraphicsSettings.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/GraphicsSettings.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/GraphicsSettings.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/InputManager.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/InputManager.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/InputManager.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/InputManager.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NavMeshAreas.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NavMeshAreas.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NavMeshAreas.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NetworkManager.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NetworkManager.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NetworkManager.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/NetworkManager.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/Physics2DSettings.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/Physics2DSettings.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/Physics2DSettings.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectSettings.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectSettings.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectSettings.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectSettings.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectVersion.txt b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectVersion.txt similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectVersion.txt rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/ProjectVersion.txt diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/QualitySettings.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/QualitySettings.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/QualitySettings.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/QualitySettings.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TagManager.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TagManager.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TagManager.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TagManager.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TimeManager.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TimeManager.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TimeManager.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/TimeManager.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/UnityConnectSettings.asset b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/UnityConnectSettings.asset similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/UnityConnectSettings.asset rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/ProjectSettings/UnityConnectSettings.asset diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/README.md b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/README.md similarity index 88% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/README.md rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/README.md index f480c49cd0..8c85ebfb63 100644 --- a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/README.md +++ b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/README.md @@ -10,7 +10,7 @@ that this has only been tested on Linux; the syntax may differ on Mac/Windows): ```sh bazel build -c opt --cxxopt=--std=c++11 \ - //tensorflow/contrib/lite/experimental/c:libtensorflowlite_c.so + //tensorflow/lite/experimental/c:libtensorflowlite_c.so ``` and for Android: @@ -20,7 +20,7 @@ bazel build -c opt --cxxopt=--std=c++11 \ --crosstool_top=//external:android/crosstool \ --host_crosstool_top=@bazel_tools//tools/cpp:toolchain \ --cpu=armeabi-v7a \ - //tensorflow/contrib/lite/experimental/c:libtensorflowlite_c.so + //tensorflow/lite/experimental/c:libtensorflowlite_c.so ``` If you encounter issues with native plugin discovery on Mac ("Darwin") diff --git a/tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/UnityPackageManager/manifest.json b/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/UnityPackageManager/manifest.json similarity index 100% rename from tensorflow/contrib/lite/experimental/examples/unity/TensorFlowLitePlugin/UnityPackageManager/manifest.json rename to tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/UnityPackageManager/manifest.json diff --git a/tensorflow/contrib/lite/experimental/kernels/BUILD b/tensorflow/lite/experimental/kernels/BUILD similarity index 51% rename from tensorflow/contrib/lite/experimental/kernels/BUILD rename to tensorflow/lite/experimental/kernels/BUILD index 4786cc62f9..dd314545cb 100644 --- a/tensorflow/contrib/lite/experimental/kernels/BUILD +++ b/tensorflow/lite/experimental/kernels/BUILD @@ -4,7 +4,7 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") load("//tensorflow:tensorflow.bzl", "tf_cc_test") # ctc support classes imported directly from TensorFlow. @@ -19,7 +19,7 @@ cc_library( ], deps = [ ":top_n", - "//tensorflow/contrib/lite/kernels/internal:types", + "//tensorflow/lite/kernels/internal:types", "//third_party/eigen3", ], ) @@ -31,7 +31,7 @@ cc_library( "top_n.h", ], deps = [ - "//tensorflow/contrib/lite/kernels/internal:types", + "//tensorflow/lite/kernels/internal:types", ], ) @@ -50,21 +50,21 @@ cc_library( }), deps = [ ":ctc_utils", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/kernels:gemm_support", - "//tensorflow/contrib/lite/kernels:kernel_util", - "//tensorflow/contrib/lite/kernels:op_macros", - "//tensorflow/contrib/lite/kernels/internal:kernel_utils", - "//tensorflow/contrib/lite/kernels/internal:optimized", - "//tensorflow/contrib/lite/kernels/internal:optimized_base", - "//tensorflow/contrib/lite/kernels/internal:quantization_util", - "//tensorflow/contrib/lite/kernels/internal:reference_base", - "//tensorflow/contrib/lite/kernels/internal:tensor", - "//tensorflow/contrib/lite/kernels/internal:tensor_utils", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:gemm_support", + "//tensorflow/lite/kernels:kernel_util", + "//tensorflow/lite/kernels:op_macros", + "//tensorflow/lite/kernels/internal:kernel_utils", + "//tensorflow/lite/kernels/internal:optimized", + "//tensorflow/lite/kernels/internal:optimized_base", + "//tensorflow/lite/kernels/internal:quantization_util", + "//tensorflow/lite/kernels/internal:reference_base", + "//tensorflow/lite/kernels/internal:tensor", + "//tensorflow/lite/kernels/internal:tensor_utils", "@flatbuffers", ], ) @@ -76,9 +76,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":experimental_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], diff --git a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_entry.h b/tensorflow/lite/experimental/kernels/ctc_beam_entry.h similarity index 94% rename from tensorflow/contrib/lite/experimental/kernels/ctc_beam_entry.h rename to tensorflow/lite/experimental/kernels/ctc_beam_entry.h index a60ff2a1c5..70fbefa2ba 100644 --- a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_entry.h +++ b/tensorflow/lite/experimental/kernels/ctc_beam_entry.h @@ -15,8 +15,8 @@ limitations under the License. // Copied from tensorflow/core/util/ctc/ctc_beam_entry.h // TODO(b/111524997): Remove this file. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_ENTRY_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_ENTRY_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_ENTRY_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_ENTRY_H_ #include #include @@ -24,7 +24,7 @@ limitations under the License. #include #include "third_party/eigen3/Eigen/Core" -#include "tensorflow/contrib/lite/experimental/kernels/ctc_loss_util.h" +#include "tensorflow/lite/experimental/kernels/ctc_loss_util.h" namespace tflite { namespace experimental { @@ -147,4 +147,4 @@ class BeamComparer { } // namespace experimental } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_ENTRY_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_ENTRY_H_ diff --git a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_scorer.h b/tensorflow/lite/experimental/kernels/ctc_beam_scorer.h similarity index 91% rename from tensorflow/contrib/lite/experimental/kernels/ctc_beam_scorer.h rename to tensorflow/lite/experimental/kernels/ctc_beam_scorer.h index ec60e26257..202b2af28e 100644 --- a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_scorer.h +++ b/tensorflow/lite/experimental/kernels/ctc_beam_scorer.h @@ -23,10 +23,10 @@ limitations under the License. // Copied from tensorflow/core/util/ctc/ctc_beam_scorer.h // TODO(b/111524997): Remove this file. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SCORER_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SCORER_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SCORER_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SCORER_H_ -#include "tensorflow/contrib/lite/experimental/kernels/ctc_beam_entry.h" +#include "tensorflow/lite/experimental/kernels/ctc_beam_entry.h" namespace tflite { namespace experimental { @@ -76,4 +76,4 @@ class BaseBeamScorer { } // namespace experimental } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SCORER_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SCORER_H_ diff --git a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_search.h b/tensorflow/lite/experimental/kernels/ctc_beam_search.h similarity index 96% rename from tensorflow/contrib/lite/experimental/kernels/ctc_beam_search.h rename to tensorflow/lite/experimental/kernels/ctc_beam_search.h index 7c5099235a..1cc3ab7605 100644 --- a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_search.h +++ b/tensorflow/lite/experimental/kernels/ctc_beam_search.h @@ -15,8 +15,8 @@ limitations under the License. // Copied from tensorflow/core/util/ctc/ctc_beam_search.h // TODO(b/111524997): Remove this file. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SEARCH_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SEARCH_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SEARCH_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SEARCH_H_ #include #include @@ -25,12 +25,12 @@ limitations under the License. #include #include "third_party/eigen3/Eigen/Core" -#include "tensorflow/contrib/lite/experimental/kernels/ctc_beam_entry.h" -#include "tensorflow/contrib/lite/experimental/kernels/ctc_beam_scorer.h" -#include "tensorflow/contrib/lite/experimental/kernels/ctc_decoder.h" -#include "tensorflow/contrib/lite/experimental/kernels/ctc_loss_util.h" -#include "tensorflow/contrib/lite/experimental/kernels/top_n.h" -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/experimental/kernels/ctc_beam_entry.h" +#include "tensorflow/lite/experimental/kernels/ctc_beam_scorer.h" +#include "tensorflow/lite/experimental/kernels/ctc_decoder.h" +#include "tensorflow/lite/experimental/kernels/ctc_loss_util.h" +#include "tensorflow/lite/experimental/kernels/top_n.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" namespace tflite { namespace experimental { @@ -429,4 +429,4 @@ bool CTCBeamSearchDecoder::TopPaths( } // namespace experimental } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SEARCH_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_BEAM_SEARCH_H_ diff --git a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_search_decoder.cc b/tensorflow/lite/experimental/kernels/ctc_beam_search_decoder.cc similarity index 96% rename from tensorflow/contrib/lite/experimental/kernels/ctc_beam_search_decoder.cc rename to tensorflow/lite/experimental/kernels/ctc_beam_search_decoder.cc index b1ebe4a804..9b1a05ee6e 100644 --- a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_search_decoder.cc +++ b/tensorflow/lite/experimental/kernels/ctc_beam_search_decoder.cc @@ -14,12 +14,12 @@ limitations under the License. ==============================================================================*/ #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/experimental/kernels/ctc_beam_search.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/experimental/kernels/ctc_beam_search.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_search_decoder_test.cc b/tensorflow/lite/experimental/kernels/ctc_beam_search_decoder_test.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/kernels/ctc_beam_search_decoder_test.cc rename to tensorflow/lite/experimental/kernels/ctc_beam_search_decoder_test.cc index 942dbbbeae..572b56f122 100644 --- a/tensorflow/contrib/lite/experimental/kernels/ctc_beam_search_decoder_test.cc +++ b/tensorflow/lite/experimental/kernels/ctc_beam_search_decoder_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/kernels/ctc_decoder.h b/tensorflow/lite/experimental/kernels/ctc_decoder.h similarity index 94% rename from tensorflow/contrib/lite/experimental/kernels/ctc_decoder.h rename to tensorflow/lite/experimental/kernels/ctc_decoder.h index 596ad4a5f7..1ceb3f7de4 100644 --- a/tensorflow/contrib/lite/experimental/kernels/ctc_decoder.h +++ b/tensorflow/lite/experimental/kernels/ctc_decoder.h @@ -15,8 +15,8 @@ limitations under the License. // Copied from tensorflow/core/util/ctc/ctc_decoder.h // TODO(b/111524997): Remove this file. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_DECODER_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_DECODER_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_DECODER_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_DECODER_H_ #include #include @@ -111,4 +111,4 @@ class CTCGreedyDecoder : public CTCDecoder { } // namespace experimental } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_DECODER_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_DECODER_H_ diff --git a/tensorflow/contrib/lite/experimental/kernels/ctc_loss_util.h b/tensorflow/lite/experimental/kernels/ctc_loss_util.h similarity index 88% rename from tensorflow/contrib/lite/experimental/kernels/ctc_loss_util.h rename to tensorflow/lite/experimental/kernels/ctc_loss_util.h index 0bae732533..f2206dbcc0 100644 --- a/tensorflow/contrib/lite/experimental/kernels/ctc_loss_util.h +++ b/tensorflow/lite/experimental/kernels/ctc_loss_util.h @@ -15,8 +15,8 @@ limitations under the License. // Copied from tensorflow/core/util/ctc/ctc_loss_util.h // TODO(b/111524997): Remove this file. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_LOSS_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_LOSS_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_LOSS_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_LOSS_UTIL_H_ #include #include @@ -47,4 +47,4 @@ inline float LogSumExp(float log_prob_1, float log_prob_2) { } // namespace experimental } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_CTC_LOSS_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_CTC_LOSS_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/kernels/top_n.h b/tensorflow/lite/experimental/kernels/top_n.h similarity index 98% rename from tensorflow/contrib/lite/experimental/kernels/top_n.h rename to tensorflow/lite/experimental/kernels/top_n.h index cd2a2f1c80..4e2581cc71 100644 --- a/tensorflow/contrib/lite/experimental/kernels/top_n.h +++ b/tensorflow/lite/experimental/kernels/top_n.h @@ -38,8 +38,8 @@ limitations under the License. // Copied from tensorflow/core/lib/gtl/top_n.h // TODO(b/111524997): Remove this file. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_TOP_N_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_TOP_N_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_TOP_N_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_TOP_N_H_ #include #include @@ -47,7 +47,7 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" namespace tflite { namespace gtl { @@ -338,4 +338,4 @@ void TopN::Reset() { } // namespace gtl } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_KERNELS_TOP_N_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_KERNELS_TOP_N_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/BUILD b/tensorflow/lite/experimental/micro/BUILD similarity index 71% rename from tensorflow/contrib/lite/experimental/micro/BUILD rename to tensorflow/lite/experimental/micro/BUILD index df1036bc8b..e11159868e 100644 --- a/tensorflow/contrib/lite/experimental/micro/BUILD +++ b/tensorflow/lite/experimental/micro/BUILD @@ -5,7 +5,7 @@ package( licenses(["notice"]) # Apache 2.0 load( - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test.bzl", + "//tensorflow/lite/experimental/micro/testing:micro_test.bzl", "tflite_micro_cc_test", ) @@ -25,10 +25,10 @@ cc_library( "simple_tensor_allocator.h", ], deps = [ - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/core/api", - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/core/api", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -49,7 +49,7 @@ tflite_micro_cc_test( ], deps = [ ":micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", + "//tensorflow/lite/experimental/micro/testing:micro_test", ], ) @@ -60,7 +60,7 @@ tflite_micro_cc_test( ], deps = [ ":micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", + "//tensorflow/lite/experimental/micro/testing:micro_test", ], ) @@ -71,6 +71,6 @@ tflite_micro_cc_test( ], deps = [ ":micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", + "//tensorflow/lite/experimental/micro/testing:micro_test", ], ) diff --git a/tensorflow/contrib/lite/experimental/micro/README.md b/tensorflow/lite/experimental/micro/README.md similarity index 82% rename from tensorflow/contrib/lite/experimental/micro/README.md rename to tensorflow/lite/experimental/micro/README.md index 833f2e06c8..673daed74c 100644 --- a/tensorflow/contrib/lite/experimental/micro/README.md +++ b/tensorflow/lite/experimental/micro/README.md @@ -20,7 +20,7 @@ To meet those goals, we've made some tradeoffs: - **Interpreted**: Code generation is a popular pattern for embedded code, because it gives standalone code that's easy to modify and step through, but we've chosen to go with an interpreted approach. In our internal microcontroller work we've found that using an extremely stripped-down interpreter with almost no dependencies gives us a lot of the same advantages, but is easier to maintain. For example, when new updates come out for the underlying library, you can just merge your local modifications in a single step, rather than having to regenerate new code and then patch in any changes you subsequently made. The coarse granularity of the interpreted primitives means that each operation call typically takes hundreds of thousands of instruction cycles at least, so we don't see noticeable performance gains from avoiding what's essentially a single switch statement at the interpreter level to call each operation. We're still working on improving the packaging though, for example we're considering having the ability to snapshot all the source files and headers used for a particular model, being able to compile the code and data together as a library, and then access it through a minimal set of C interface calls which hide the underlying complexity. -- **Flatbuffers**: We represent our models using [the standard flatbuffer schema used by the rest of TensorFlow Lite](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/schema/schema.fbs), with the difference that we always keep it in read-only program memory (typically flash) rather than relying on having a file system to read it from. This is a good fit because flatbuffer's serialized format is designed to be mapped into memory without requiring any extra memory allocations or modifications to access it. All of the functions to read model values work directly on the serialized bytes, and large sections of data like weights are directly accessible as sequential C-style arrays of their data type, with no strides or unpacking needed. We do get a lot of value from using flatbuffers, but there is a cost in complexity. The flat buffer library code is all inline [inside the main headers](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/schema/schema_generated.h), but it isn't straightforward to inspect their implementations, and the model data structures aren't easy to comprehend from the debugger. The header for the schema itself also has to be periodically updated when new information is added to the file format, though we try to handle that transparently for most developers by checking in a pre-generated version. +- **Flatbuffers**: We represent our models using [the standard flatbuffer schema used by the rest of TensorFlow Lite](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/schema/schema.fbs), with the difference that we always keep it in read-only program memory (typically flash) rather than relying on having a file system to read it from. This is a good fit because flatbuffer's serialized format is designed to be mapped into memory without requiring any extra memory allocations or modifications to access it. All of the functions to read model values work directly on the serialized bytes, and large sections of data like weights are directly accessible as sequential C-style arrays of their data type, with no strides or unpacking needed. We do get a lot of value from using flatbuffers, but there is a cost in complexity. The flat buffer library code is all inline [inside the main headers](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/schema/schema_generated.h), but it isn't straightforward to inspect their implementations, and the model data structures aren't easy to comprehend from the debugger. The header for the schema itself also has to be periodically updated when new information is added to the file format, though we try to handle that transparently for most developers by checking in a pre-generated version. - **Code Duplication**: Some of the code in this prototype largely duplicates the logic in other parts of the TensorFlow Lite code base, for example the operator wrappers. We've tried to keep share as much as we can between the two interpreters, but there are some assumptions built into the original runtime that make this difficult. We'll be working on modularizing the main interpreter so that we can move to an entirely shared system. @@ -33,8 +33,8 @@ Building requires a Linux or OS X machine. - Open a terminal - Download the TensorFlow source with `git clone https://github.com/tensorflow` - Enter the source root directory by running `cd tensorflow` - - Download the dependencies by running `tensorflow/contrib/lite/experimental/micro/tools/make/download_dependencies.sh`. This may take a few minutes - - Build and test the library with `make -f tensorflow/contrib/lite/experimental/micro/tools/make/Makefile test` + - Download the dependencies by running `tensorflow/lite/experimental/micro/tools/make/download_dependencies.sh`. This may take a few minutes + - Build and test the library with `make -f tensorflow/lite/experimental/micro/tools/make/Makefile test` You should see a series of compilation steps, followed by `~~~ALL TESTS PASSED~~~` for the various tests of the code that it will run. If there's an @@ -43,7 +43,7 @@ error, you should get an informative message from make about what went wrong. These tests are all built as simple binaries with few dependencies, so you can run them manually. For example, here's how to run the depthwise convolution test, and its output: ``` -tensorflow/contrib/lite/experimental/micro/tools/make/gen/linux_x86_64/bin/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv_test +tensorflow/lite/experimental/micro/tools/make/gen/linux_x86_64/bin/tensorflow/lite/experimental/micro/kernels/depthwise_conv_test Testing SimpleTest Testing SimpleTestQuantized @@ -53,7 +53,7 @@ Testing SimpleTestReluQuantized ~ALL TESTS PASSED~~~ ``` -Looking at the [depthwise_conv_test.cc](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv_test.cc) code, you'll see a sequence that looks like this: +Looking at the [depthwise_conv_test.cc](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/experimental/micro/kernels/depthwise_conv_test.cc) code, you'll see a sequence that looks like this: ``` ... @@ -82,15 +82,15 @@ The goal of this library is to enable machine learning on resource-constrained m It's fairly easy to [buy and wire up a physical board](https://github.com/google/stm32_bare_lib#wiring-up-your-blue-pill), but even if you don't have an actual device, the [Renode project](https://renode.io/) makes it easy to run a faithful emulation on your desktop machine. You'll need [Docker](https://www.docker.com/) installed, but once you have that set up, try running the following command: -`make -f tensorflow/contrib/lite/experimental/micro/tools/make/Makefile TARGET=bluepill test` +`make -f tensorflow/lite/experimental/micro/tools/make/Makefile TARGET=bluepill test` You should see a similar set of outputs as you did in the previous section, with the addition of some extra Docker logging messages. These are because we're using Docker to run the Renode micro controller emulation tool, and the tests themselves are being run on a simulated STM32F103 device. The communication channels between an embedded device and the host are quite limited, so the test harness looks at the output of the debug log to see if tests have passed, just as it did in the previous section. This makes it a very flexible way to run cross-platform tests, even when a platform has no operating system facilities, as long as it can output debugging text logs. To understand what's happening here, try running the same depthwise convolution test, but through the emulated device test harness, with the following command: ``` -tensorflow/contrib/lite/experimental/micro/testing/test_bluepill_binary.sh \ -tensorflow/contrib/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv_test \ +tensorflow/lite/experimental/micro/testing/test_bluepill_binary.sh \ +tensorflow/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/tensorflow/lite/experimental/micro/kernels/depthwise_conv_test \ '~~~ALL TESTS PASSED~~~' ``` @@ -117,7 +117,7 @@ LOGS: 03:27:32.4839 [DEBUG] cpu.uartSemihosting: [+41µs host +0s virt 0s virt from start] ~~~ALL TESTS PASSED~~~ 03:27:32.4839 [DEBUG] cpu.uartSemihosting: [+5µs host +0s virt 0s virt from start] ... -tensorflow/contrib/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv_test: PASS +tensorflow/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/tensorflow/lite/experimental/micro/kernels/depthwise_conv_test: PASS ``` There's a lot of output here, but you should be able to see that the same tests diff --git a/tensorflow/contrib/lite/experimental/micro/compatibility.h b/tensorflow/lite/experimental/micro/compatibility.h similarity index 86% rename from tensorflow/contrib/lite/experimental/micro/compatibility.h rename to tensorflow/lite/experimental/micro/compatibility.h index 4f0fd9f312..3fa91644bd 100644 --- a/tensorflow/contrib/lite/experimental/micro/compatibility.h +++ b/tensorflow/lite/experimental/micro/compatibility.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_CONTRIB_LITE_EXPERIMENTAL_MICRO_COMPATIBILITY_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_COMPATIBILITY_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_COMPATIBILITY_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_COMPATIBILITY_H_ // C++ will automatically create class-specific delete operators for virtual // objects, which by default call the global delete function. For embedded @@ -29,4 +29,4 @@ limitations under the License. #define TF_LITE_REMOVE_VIRTUAL_DELETE #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_COMPATIBILITY_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_COMPATIBILITY_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/BUILD b/tensorflow/lite/experimental/micro/examples/micro_speech/BUILD similarity index 58% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/BUILD rename to tensorflow/lite/experimental/micro/examples/micro_speech/BUILD index 08fa277c34..69022b611e 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/BUILD +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/BUILD @@ -6,7 +6,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 load( - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test.bzl", + "//tensorflow/lite/experimental/micro/testing:micro_test.bzl", "tflite_micro_cc_test", ) @@ -22,12 +22,12 @@ tflite_micro_cc_test( "yes_features_data.h", ], deps = [ - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - "//tensorflow/contrib/lite/experimental/micro/kernels:all_ops_resolver", - "//tensorflow/contrib/lite/experimental/micro/kernels:micro_ops", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/experimental/micro:micro_framework", + "//tensorflow/lite/experimental/micro/kernels:all_ops_resolver", + "//tensorflow/lite/experimental/micro/kernels:micro_ops", + "//tensorflow/lite/experimental/micro/testing:micro_test", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -47,8 +47,8 @@ tflite_micro_cc_test( "yes_power_spectrum_data.h", ], deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/experimental/micro:micro_framework", - "//tensorflow/contrib/lite/experimental/micro/testing:micro_test", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/experimental/micro:micro_framework", + "//tensorflow/lite/experimental/micro/testing:micro_test", ], ) diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/README.md b/tensorflow/lite/experimental/micro/examples/micro_speech/README.md similarity index 88% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/README.md rename to tensorflow/lite/experimental/micro/examples/micro_speech/README.md index 959306d8ce..500eed33ba 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/README.md +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/README.md @@ -14,33 +14,33 @@ This examples shows how you can use TensorFlow Lite to run a 20 kilobyte neural To compile and test this example on a desktop Linux or MacOS machine, download [the TensorFlow source code](https://github.com/tensorflow/tensorflow), `cd` into the source directory from a terminal, and then retrieve the support libraries you need by running: ``` -tensorflow/contrib/lite/experimental/micro/tools/make/download_dependencies.sh +tensorflow/lite/experimental/micro/tools/make/download_dependencies.sh ``` This will take a few minutes, and downloads frameworks the code uses like [CMSIS](https://developer.arm.com/embedded/cmsis) and [flatbuffers](https://google.github.io/flatbuffers/). Once that process has finished, run: ``` -make -f tensorflow/contrib/lite/experimental/micro/tools/make/Makefile test_micro_speech +make -f tensorflow/lite/experimental/micro/tools/make/Makefile test_micro_speech ``` You should see a series of files get compiled, followed by some logging output from a test, which should conclude with "~~~ALL TESTS PASSED~~~". If you see this, it means that a small program has been built and run that loads a trained TensorFlow model, runs some example inputs through it, and got the expected outputs. This particular test runs spectrograms generated from recordings of people saying "Yes" and "No", and checks that the network correctly identifies them. -To understand how TensorFlow Lite does this, you can look at the `TestInvoke()` function in [micro_speech_test.cc](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc). It's a fairly small amount of code, creating an interpreter, getting a handle to a model that's been compiled into the program, and then invoking the interpreter with the model and sample inputs. +To understand how TensorFlow Lite does this, you can look at the `TestInvoke()` function in [micro_speech_test.cc](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc). It's a fairly small amount of code, creating an interpreter, getting a handle to a model that's been compiled into the program, and then invoking the interpreter with the model and sample inputs. ## Getting Started on a Microcontroller Once you have downloaded the dependencies and got the x86/Linux build working, you can try building a version for the STM32F103 'bluepill' device. The following command will build the test and then run it on an emulator, assuming you have Docker installed: ``` -make -f tensorflow/contrib/lite/experimental/micro/tools/make/Makefile TARGET=bluepill test_micro_speech +make -f tensorflow/lite/experimental/micro/tools/make/Makefile TARGET=bluepill test_micro_speech ``` If you have a real device [(see here for how to set one up)](https://github.com/google/stm32_bare_lib/tree/master/README.md) you can then convert the ELF file into a a `.bin` format executable to load onto it by running: ``` arm-none-eabi-objcopy \ -tensorflow/contrib/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/micro_speech_test \ -tensorflow/contrib/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/micro_speech_test.bin \ +tensorflow/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/micro_speech_test \ +tensorflow/lite/experimental/micro/tools/make/gen/bluepill_cortex-m3/bin/micro_speech_test.bin \ --output binary ``` @@ -89,7 +89,7 @@ bazel run tensorflow/examples/speech_commands:freeze -- \ The next step is to create a TensorFlow Lite file from the frozen graph: ``` -bazel run tensorflow/contrib/lite/toco:toco -- \ +bazel run tensorflow/lite/toco:toco -- \ --input_file=/tmp/tiny_conv.pb --output_file=/tmp/tiny_conv.tflite \ --input_shapes=1,49,43,1 --input_arrays=Reshape_1 --output_arrays='labels_softmax' \ --inference_type=QUANTIZED_UINT8 --mean_values=0 --std_values=2 \ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc similarity index 88% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc index 0f4731fd4b..4e54ff670e 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.h" -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h" -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h" -#include "tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h" -#include "tensorflow/contrib/lite/experimental/micro/micro_interpreter.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.h" +#include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h" +#include "tensorflow/lite/experimental/micro/micro_error_reporter.h" +#include "tensorflow/lite/experimental/micro/micro_interpreter.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/version.h" TF_LITE_MICRO_TESTS_BEGIN diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc index e949913aa3..6eaa5c2fed 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc @@ -15,7 +15,7 @@ limitations under the License. // See the header for documentation on the meaning of this data. -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h" const int g_no_30ms_sample_data_size = 480; const int16_t g_no_30ms_sample_data[480] = { diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h b/tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h similarity index 80% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h index 5299930659..ff6b874089 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h @@ -21,12 +21,12 @@ limitations under the License. // preprocessing pipeline, to ensure that the expected spectrogram slice is // produced given this input. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_30MS_SAMPLE_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_30MS_SAMPLE_DATA_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_30MS_SAMPLE_DATA_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_30MS_SAMPLE_DATA_H_ #include extern const int g_no_30ms_sample_data_size; extern const int16_t g_no_30ms_sample_data[]; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_30MS_SAMPLE_DATA_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_30MS_SAMPLE_DATA_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.cc similarity index 99% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.cc index 3615deb26c..e98c84f7ed 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.h" /* File automatically created by * tensorflow/examples/speech_commands/wav_to_features.py \ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.h b/tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.h similarity index 74% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.h index b53d0a202b..e2ee0c46cf 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.h @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_FEATURES_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_FEATURES_DATA_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_FEATURES_DATA_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_FEATURES_DATA_H_ extern const int g_no_f9643d42_nohash_4_width; extern const int g_no_f9643d42_nohash_4_height; extern const unsigned char g_no_f9643d42_nohash_4_data[]; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_FEATURES_DATA_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_FEATURES_DATA_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc similarity index 90% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc index 72e40197d6..c4fc5c33bb 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc @@ -15,7 +15,7 @@ limitations under the License. // See the header for documentation on the meaning of this data. -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h" const uint8_t g_no_power_spectrum_data[g_no_power_spectrum_data_size] = { 255, 7, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h b/tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h similarity index 78% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h index c19566bfb6..fa39d3c70d 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h @@ -18,12 +18,12 @@ limitations under the License. // This is the expected result of running the sample data in // no_30ms_sample_data.cc through through the preprocessing pipeline. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_POWER_SPECTRUM_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_POWER_SPECTRUM_DATA_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_POWER_SPECTRUM_DATA_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_POWER_SPECTRUM_DATA_H_ #include constexpr int g_no_power_spectrum_data_size = 43; extern const uint8_t g_no_power_spectrum_data[]; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_POWER_SPECTRUM_DATA_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_NO_POWER_SPECTRUM_DATA_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.cc similarity index 98% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.cc index 6fe4d21de7..12f9e22038 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.cc @@ -24,7 +24,7 @@ limitations under the License. // functions used here, for example replacing the DFT with an FFT, so this // version shouldn't be used where performance is critical. -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.h" #include diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.h b/tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.h similarity index 68% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.h index 571eb5921b..dede2a8642 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.h @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_PREPROCESSOR_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_PREPROCESSOR_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_PREPROCESSOR_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_PREPROCESSOR_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/experimental/micro/micro_error_reporter.h" TfLiteStatus Preprocess(tflite::ErrorReporter* error_reporter, const int16_t* input, int input_size, int output_size, uint8_t* output); -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_PREPROCESSOR_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_PREPROCESSOR_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc similarity index 76% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc index 1809ba8daf..e8b49f67e3 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h" -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h" -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h" -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h" -#include "tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h" +#include "tensorflow/lite/experimental/micro/micro_error_reporter.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" TF_LITE_MICRO_TESTS_BEGIN diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc similarity index 99% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc index f0769a1237..62e4359859 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc @@ -17,7 +17,7 @@ limitations under the License. // xxd -i tiny_conv.tflite > tiny_conv_model_data.cc // See the README for a full description of the creation process. -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h" const unsigned char g_tiny_conv_model_data[] = { 0x18, 0x00, 0x00, 0x00, 0x54, 0x46, 0x4c, 0x33, 0x00, 0x00, 0x0e, 0x00, diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h b/tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h similarity index 78% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h index 2953cc852d..a465dbfabf 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.h @@ -18,10 +18,10 @@ limitations under the License. // don't have a file system. It was created using the command: // xxd -i tiny_conv.tflite > tiny_conv_model_data.cc -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_TINY_CONV_MODEL_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_TINY_CONV_MODEL_DATA_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_TINY_CONV_MODEL_DATA_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_TINY_CONV_MODEL_DATA_H_ extern const unsigned char g_tiny_conv_model_data[]; extern const int g_tiny_conv_model_data_len; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_TINY_CONV_MODEL_DATA_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_TINY_CONV_MODEL_DATA_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc index 4087637207..f089ef82f3 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc @@ -15,7 +15,7 @@ limitations under the License. // See the header for documentation on the meaning of this data. -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h" const int g_yes_30ms_sample_data_size = 480; const int16_t g_yes_30ms_sample_data[480] = { diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h similarity index 80% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h index cb757e84ba..daaeb514a8 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.h @@ -21,12 +21,12 @@ limitations under the License. // preprocessing pipeline, to ensure that the expected spectrogram slice is // produced given this input. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_30MS_SAMPLE_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_30MS_SAMPLE_DATA_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_30MS_SAMPLE_DATA_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_30MS_SAMPLE_DATA_H_ #include extern const int g_yes_30ms_sample_data_size; extern const int16_t g_yes_30ms_sample_data[]; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_30MS_SAMPLE_DATA_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_30MS_SAMPLE_DATA_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.cc similarity index 99% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.cc index 3ad29e53c8..2eb737fb8e 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.h" /* File automatically created by * tensorflow/examples/speech_commands/wav_to_features.py \ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.h b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.h similarity index 74% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.h index 33ac230862..39a3bb914c 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.h @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_FEATURES_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_FEATURES_DATA_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_FEATURES_DATA_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_FEATURES_DATA_H_ extern const int g_yes_f2e59fea_nohash_1_width; extern const int g_yes_f2e59fea_nohash_1_height; extern const unsigned char g_yes_f2e59fea_nohash_1_data[]; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_FEATURES_DATA_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_FEATURES_DATA_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc similarity index 90% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc rename to tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc index a6e1d874fa..9a34a2045a 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc @@ -15,7 +15,7 @@ limitations under the License. // See the header for documentation on the meaning of this data. -#include "tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h" +#include "tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h" const uint8_t g_yes_power_spectrum_data[g_yes_power_spectrum_data_size] = { 8, 89, 8, 0, 0, 0, 0, 0, 0, 0, 0, 4, 13, 1, 6, 23, 20, 6, 4, 0, 0, 0, diff --git a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h similarity index 77% rename from tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h rename to tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h index b02853f2ea..5c8c00ac11 100644 --- a/tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h +++ b/tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.h @@ -18,12 +18,12 @@ limitations under the License. // This is the expected result of running the sample data in // yes_30ms_sample_data.cc through through the preprocessing pipeline. -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_POWER_SPECTRUM_DATA_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_POWER_SPECTRUM_DATA_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_POWER_SPECTRUM_DATA_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_POWER_SPECTRUM_DATA_H_ #include constexpr int g_yes_power_spectrum_data_size = 43; extern const uint8_t g_yes_power_spectrum_data[]; -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_POWER_SPECTRUM_DATA_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_EXAMPLES_MICRO_SPEECH_YES_POWER_SPECTRUM_DATA_H_ diff --git a/tensorflow/lite/experimental/micro/kernels/BUILD b/tensorflow/lite/experimental/micro/kernels/BUILD new file mode 100644 index 0000000000..a54fd41760 --- /dev/null +++ b/tensorflow/lite/experimental/micro/kernels/BUILD @@ -0,0 +1,107 @@ +package(default_visibility = [ + "//visibility:public", +]) + +licenses(["notice"]) # Apache 2.0 + +load("//tensorflow/lite:build_def.bzl", "tflite_copts") +load( + "//tensorflow/lite/experimental/micro/testing:micro_test.bzl", + "tflite_micro_cc_test", +) + +cc_library( + name = "micro_ops", + srcs = [ + "depthwise_conv.cc", + "fully_connected.cc", + "softmax.cc", + ], + hdrs = [ + ], + copts = tflite_copts(), + deps = [ + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/experimental/micro:micro_framework", + "//tensorflow/lite/kernels:kernel_util", + "//tensorflow/lite/kernels:op_macros", + "//tensorflow/lite/kernels:padding", + "//tensorflow/lite/kernels/internal:quantization_util", + "//tensorflow/lite/kernels/internal:reference_base", + "//tensorflow/lite/kernels/internal:tensor", + ], +) + +cc_library( + name = "all_ops_resolver", + srcs = [ + "all_ops_resolver.cc", + ], + hdrs = [ + "all_ops_resolver.h", + ], + copts = tflite_copts(), + deps = [ + ":micro_ops", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/experimental/micro:micro_framework", + ], +) + +cc_library( + name = "test_utils", + srcs = [ + ], + hdrs = [ + "test_utils.h", + ], + copts = tflite_copts(), + deps = [ + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/core/api", + "//tensorflow/lite/experimental/micro:micro_framework", + "//tensorflow/lite/experimental/micro/testing:micro_test", + ], +) + +tflite_micro_cc_test( + name = "depthwise_conv_test", + srcs = [ + "depthwise_conv_test.cc", + ], + deps = [ + ":all_ops_resolver", + ":test_utils", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/experimental/micro:micro_framework", + "//tensorflow/lite/experimental/micro/testing:micro_test", + ], +) + +tflite_micro_cc_test( + name = "fully_connected_test", + srcs = [ + "fully_connected_test.cc", + ], + deps = [ + ":all_ops_resolver", + ":test_utils", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/experimental/micro:micro_framework", + "//tensorflow/lite/experimental/micro/testing:micro_test", + ], +) + +tflite_micro_cc_test( + name = "softmax_test", + srcs = [ + "softmax_test.cc", + ], + deps = [ + ":all_ops_resolver", + ":test_utils", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/experimental/micro:micro_framework", + "//tensorflow/lite/experimental/micro/testing:micro_test", + ], +) diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.cc b/tensorflow/lite/experimental/micro/kernels/all_ops_resolver.cc similarity index 95% rename from tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.cc rename to tensorflow/lite/experimental/micro/kernels/all_ops_resolver.cc index bd0a37badb..b733949e45 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.cc +++ b/tensorflow/lite/experimental/micro/kernels/all_ops_resolver.cc @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h" +#include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h b/tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h similarity index 70% rename from tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h rename to tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h index f836064a3f..b9ba8c8826 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h +++ b/tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h @@ -9,11 +9,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_CONTRIB_LITE_EXPERIMENTAL_MICRO_KERNELS_ALL_OPS_RESOLVER_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_KERNELS_ALL_OPS_RESOLVER_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_KERNELS_ALL_OPS_RESOLVER_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_KERNELS_ALL_OPS_RESOLVER_H_ -#include "tensorflow/contrib/lite/experimental/micro/compatibility.h" -#include "tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.h" +#include "tensorflow/lite/experimental/micro/compatibility.h" +#include "tensorflow/lite/experimental/micro/micro_mutable_op_resolver.h" namespace tflite { namespace ops { @@ -31,4 +31,4 @@ class AllOpsResolver : public MicroMutableOpResolver { } // namespace ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_KERNELS_ALL_OPS_RESOLVER_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_KERNELS_ALL_OPS_RESOLVER_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv.cc b/tensorflow/lite/experimental/micro/kernels/depthwise_conv.cc similarity index 93% rename from tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv.cc rename to tensorflow/lite/experimental/micro/kernels/depthwise_conv.cc index 4f17263181..ce821a9478 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv.cc +++ b/tensorflow/lite/experimental/micro/kernels/depthwise_conv.cc @@ -13,16 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/padding.h" - -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_float.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_uint8.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/padding.h" + +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_float.h" +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv_test.cc b/tensorflow/lite/experimental/micro/kernels/depthwise_conv_test.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv_test.cc rename to tensorflow/lite/experimental/micro/kernels/depthwise_conv_test.cc index 169899c471..f70437a4b9 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/depthwise_conv_test.cc +++ b/tensorflow/lite/experimental/micro/kernels/depthwise_conv_test.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/test_utils.h" -#include "tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h" +#include "tensorflow/lite/experimental/micro/kernels/test_utils.h" +#include "tensorflow/lite/experimental/micro/simple_tensor_allocator.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/fully_connected.cc b/tensorflow/lite/experimental/micro/kernels/fully_connected.cc similarity index 93% rename from tensorflow/contrib/lite/experimental/micro/kernels/fully_connected.cc rename to tensorflow/lite/experimental/micro/kernels/fully_connected.cc index 1e9e54cafb..a344c4ffbe 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/fully_connected.cc +++ b/tensorflow/lite/experimental/micro/kernels/fully_connected.cc @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/reference/fully_connected.h" -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/internal/reference/fully_connected.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/fully_connected_test.cc b/tensorflow/lite/experimental/micro/kernels/fully_connected_test.cc similarity index 98% rename from tensorflow/contrib/lite/experimental/micro/kernels/fully_connected_test.cc rename to tensorflow/lite/experimental/micro/kernels/fully_connected_test.cc index b42bf4c3bc..300f8aaf78 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/fully_connected_test.cc +++ b/tensorflow/lite/experimental/micro/kernels/fully_connected_test.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/test_utils.h" -#include "tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h" +#include "tensorflow/lite/experimental/micro/kernels/test_utils.h" +#include "tensorflow/lite/experimental/micro/simple_tensor_allocator.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/softmax.cc b/tensorflow/lite/experimental/micro/kernels/softmax.cc similarity index 93% rename from tensorflow/contrib/lite/experimental/micro/kernels/softmax.cc rename to tensorflow/lite/experimental/micro/kernels/softmax.cc index a4019a067c..6d2d8b470f 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/softmax.cc +++ b/tensorflow/lite/experimental/micro/kernels/softmax.cc @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/reference/softmax.h" -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/internal/reference/softmax.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/softmax_test.cc b/tensorflow/lite/experimental/micro/kernels/softmax_test.cc similarity index 94% rename from tensorflow/contrib/lite/experimental/micro/kernels/softmax_test.cc rename to tensorflow/lite/experimental/micro/kernels/softmax_test.cc index 694456d8ac..7253b3be8c 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/softmax_test.cc +++ b/tensorflow/lite/experimental/micro/kernels/softmax_test.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/all_ops_resolver.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/test_utils.h" -#include "tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/experimental/micro/kernels/all_ops_resolver.h" +#include "tensorflow/lite/experimental/micro/kernels/test_utils.h" +#include "tensorflow/lite/experimental/micro/simple_tensor_allocator.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/experimental/micro/kernels/test_utils.h b/tensorflow/lite/experimental/micro/kernels/test_utils.h similarity index 91% rename from tensorflow/contrib/lite/experimental/micro/kernels/test_utils.h rename to tensorflow/lite/experimental/micro/kernels/test_utils.h index 789a48ece8..4207c60981 100644 --- a/tensorflow/contrib/lite/experimental/micro/kernels/test_utils.h +++ b/tensorflow/lite/experimental/micro/kernels/test_utils.h @@ -12,18 +12,18 @@ 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_CONTRIB_LITE_EXPERIMENTAL_MICRO_KERNELS_TEST_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_KERNELS_TEST_UTILS_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_KERNELS_TEST_UTILS_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_KERNELS_TEST_UTILS_H_ #include #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/experimental/micro/kernels/test_utils.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/experimental/micro/kernels/test_utils.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" namespace tflite { namespace testing { @@ -167,4 +167,4 @@ inline TfLiteTensor CreateQuantized32Tensor(std::initializer_list data, } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_KERNELS_TEST_UTILS_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_KERNELS_TEST_UTILS_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/micro_error_reporter.cc b/tensorflow/lite/experimental/micro/micro_error_reporter.cc similarity index 96% rename from tensorflow/contrib/lite/experimental/micro/micro_error_reporter.cc rename to tensorflow/lite/experimental/micro/micro_error_reporter.cc index de11c2af52..6bfe541f80 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_error_reporter.cc +++ b/tensorflow/lite/experimental/micro/micro_error_reporter.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h" +#include "tensorflow/lite/experimental/micro/micro_error_reporter.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h b/tensorflow/lite/experimental/micro/micro_error_reporter.h similarity index 82% rename from tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h rename to tensorflow/lite/experimental/micro/micro_error_reporter.h index 21a014bee0..0ab853ec2a 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h +++ b/tensorflow/lite/experimental/micro/micro_error_reporter.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_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_ERROR_REPORTER_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_ERROR_REPORTER_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_ERROR_REPORTER_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_ERROR_REPORTER_H_ -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/experimental/micro/compatibility.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/experimental/micro/compatibility.h" #ifdef TF_LITE_MCU_DEBUG_LOG // These functions should be supplied by the micro target library @@ -51,4 +51,4 @@ class MicroErrorReporter : public ErrorReporter { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_ERROR_REPORTER_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_ERROR_REPORTER_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/micro_error_reporter_test.cc b/tensorflow/lite/experimental/micro/micro_error_reporter_test.cc similarity index 93% rename from tensorflow/contrib/lite/experimental/micro/micro_error_reporter_test.cc rename to tensorflow/lite/experimental/micro/micro_error_reporter_test.cc index ef3c32050c..ca89de9739 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_error_reporter_test.cc +++ b/tensorflow/lite/experimental/micro/micro_error_reporter_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h" +#include "tensorflow/lite/experimental/micro/micro_error_reporter.h" int main(int argc, char** argv) { tflite::MicroErrorReporter micro_error_reporter; diff --git a/tensorflow/contrib/lite/experimental/micro/micro_interpreter.cc b/tensorflow/lite/experimental/micro/micro_interpreter.cc similarity index 98% rename from tensorflow/contrib/lite/experimental/micro/micro_interpreter.cc rename to tensorflow/lite/experimental/micro/micro_interpreter.cc index 5ece5edc31..e0460c5d3e 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_interpreter.cc +++ b/tensorflow/lite/experimental/micro/micro_interpreter.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/micro_interpreter.h" +#include "tensorflow/lite/experimental/micro/micro_interpreter.h" -#include "tensorflow/contrib/lite/core/api/flatbuffer_conversions.h" -#include "tensorflow/contrib/lite/experimental/micro/compatibility.h" +#include "tensorflow/lite/core/api/flatbuffer_conversions.h" +#include "tensorflow/lite/experimental/micro/compatibility.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/experimental/micro/micro_interpreter.h b/tensorflow/lite/experimental/micro/micro_interpreter.h similarity index 81% rename from tensorflow/contrib/lite/experimental/micro/micro_interpreter.h rename to tensorflow/lite/experimental/micro/micro_interpreter.h index a88514cde8..6450dcce96 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_interpreter.h +++ b/tensorflow/lite/experimental/micro/micro_interpreter.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_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_INTERPRETER_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_INTERPRETER_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_INTERPRETER_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_INTERPRETER_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/core/api/op_resolver.h" -#include "tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/core/api/op_resolver.h" +#include "tensorflow/lite/experimental/micro/simple_tensor_allocator.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { @@ -68,4 +68,4 @@ class MicroInterpreter { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_INTERPRETER_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_INTERPRETER_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/micro_interpreter_test.cc b/tensorflow/lite/experimental/micro/micro_interpreter_test.cc similarity index 98% rename from tensorflow/contrib/lite/experimental/micro/micro_interpreter_test.cc rename to tensorflow/lite/experimental/micro/micro_interpreter_test.cc index 251e5f7203..0c0c71f079 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_interpreter_test.cc +++ b/tensorflow/lite/experimental/micro/micro_interpreter_test.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/micro_interpreter.h" +#include "tensorflow/lite/experimental/micro/micro_interpreter.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.cc b/tensorflow/lite/experimental/micro/micro_mutable_op_resolver.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.cc rename to tensorflow/lite/experimental/micro/micro_mutable_op_resolver.cc index 40c21c6448..1e8b5c0e57 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.cc +++ b/tensorflow/lite/experimental/micro/micro_mutable_op_resolver.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.h" +#include "tensorflow/lite/experimental/micro/micro_mutable_op_resolver.h" namespace tflite { diff --git a/tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.h b/tensorflow/lite/experimental/micro/micro_mutable_op_resolver.h similarity index 79% rename from tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.h rename to tensorflow/lite/experimental/micro/micro_mutable_op_resolver.h index f3750a2484..f613203909 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.h +++ b/tensorflow/lite/experimental/micro/micro_mutable_op_resolver.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_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_MUTABLE_OP_RESOLVER_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_MUTABLE_OP_RESOLVER_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_MUTABLE_OP_RESOLVER_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_MUTABLE_OP_RESOLVER_H_ -#include "tensorflow/contrib/lite/core/api/op_resolver.h" -#include "tensorflow/contrib/lite/experimental/micro/compatibility.h" +#include "tensorflow/lite/core/api/op_resolver.h" +#include "tensorflow/lite/experimental/micro/compatibility.h" #ifndef TFLITE_REGISTRATIONS_MAX #define TFLITE_REGISTRATIONS_MAX (128) @@ -43,4 +43,4 @@ class MicroMutableOpResolver : public OpResolver { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_MICRO_MUTABLE_OP_RESOLVER_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_MICRO_MUTABLE_OP_RESOLVER_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver_test.cc b/tensorflow/lite/experimental/micro/micro_mutable_op_resolver_test.cc similarity index 94% rename from tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver_test.cc rename to tensorflow/lite/experimental/micro/micro_mutable_op_resolver_test.cc index 5420a33e87..f551830865 100644 --- a/tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver_test.cc +++ b/tensorflow/lite/experimental/micro/micro_mutable_op_resolver_test.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/micro_mutable_op_resolver.h" +#include "tensorflow/lite/experimental/micro/micro_mutable_op_resolver.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.cc b/tensorflow/lite/experimental/micro/simple_tensor_allocator.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.cc rename to tensorflow/lite/experimental/micro/simple_tensor_allocator.cc index 555e53afef..6ce14edea5 100644 --- a/tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.cc +++ b/tensorflow/lite/experimental/micro/simple_tensor_allocator.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h" +#include "tensorflow/lite/experimental/micro/simple_tensor_allocator.h" -#include "tensorflow/contrib/lite/core/api/flatbuffer_conversions.h" +#include "tensorflow/lite/core/api/flatbuffer_conversions.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h b/tensorflow/lite/experimental/micro/simple_tensor_allocator.h similarity index 78% rename from tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h rename to tensorflow/lite/experimental/micro/simple_tensor_allocator.h index 56fb293675..3530ecdfe2 100644 --- a/tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator.h +++ b/tensorflow/lite/experimental/micro/simple_tensor_allocator.h @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_SIMPLE_TENSOR_ALLOCATOR_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_SIMPLE_TENSOR_ALLOCATOR_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_SIMPLE_TENSOR_ALLOCATOR_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_SIMPLE_TENSOR_ALLOCATOR_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { @@ -48,4 +48,4 @@ class SimpleTensorAllocator { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_SIMPLE_TENSOR_ALLOCATOR_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_SIMPLE_TENSOR_ALLOCATOR_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator_test.cc b/tensorflow/lite/experimental/micro/simple_tensor_allocator_test.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator_test.cc rename to tensorflow/lite/experimental/micro/simple_tensor_allocator_test.cc index ab19394502..b82017c7fe 100644 --- a/tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator_test.cc +++ b/tensorflow/lite/experimental/micro/simple_tensor_allocator_test.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/micro/micro_interpreter.h" +#include "tensorflow/lite/experimental/micro/micro_interpreter.h" -#include "tensorflow/contrib/lite/experimental/micro/testing/micro_test.h" +#include "tensorflow/lite/experimental/micro/testing/micro_test.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/experimental/micro/testing/BUILD b/tensorflow/lite/experimental/micro/testing/BUILD similarity index 77% rename from tensorflow/contrib/lite/experimental/micro/testing/BUILD rename to tensorflow/lite/experimental/micro/testing/BUILD index 0d23be5712..5a31a709ca 100644 --- a/tensorflow/contrib/lite/experimental/micro/testing/BUILD +++ b/tensorflow/lite/experimental/micro/testing/BUILD @@ -12,6 +12,6 @@ cc_library( "micro_test.h", ], deps = [ - "//tensorflow/contrib/lite/experimental/micro:micro_framework", + "//tensorflow/lite/experimental/micro:micro_framework", ], ) diff --git a/tensorflow/contrib/lite/experimental/micro/testing/Dockerfile.bluepill b/tensorflow/lite/experimental/micro/testing/Dockerfile.bluepill similarity index 100% rename from tensorflow/contrib/lite/experimental/micro/testing/Dockerfile.bluepill rename to tensorflow/lite/experimental/micro/testing/Dockerfile.bluepill diff --git a/tensorflow/contrib/lite/experimental/micro/testing/bluepill.resc b/tensorflow/lite/experimental/micro/testing/bluepill.resc similarity index 100% rename from tensorflow/contrib/lite/experimental/micro/testing/bluepill.resc rename to tensorflow/lite/experimental/micro/testing/bluepill.resc diff --git a/tensorflow/contrib/lite/experimental/micro/testing/bluepill.robot b/tensorflow/lite/experimental/micro/testing/bluepill.robot similarity index 100% rename from tensorflow/contrib/lite/experimental/micro/testing/bluepill.robot rename to tensorflow/lite/experimental/micro/testing/bluepill.robot diff --git a/tensorflow/contrib/lite/experimental/micro/testing/micro_test.bzl b/tensorflow/lite/experimental/micro/testing/micro_test.bzl similarity index 96% rename from tensorflow/contrib/lite/experimental/micro/testing/micro_test.bzl rename to tensorflow/lite/experimental/micro/testing/micro_test.bzl index 916e3eeac3..7a7ba15ca5 100644 --- a/tensorflow/contrib/lite/experimental/micro/testing/micro_test.bzl +++ b/tensorflow/lite/experimental/micro/testing/micro_test.bzl @@ -51,7 +51,7 @@ def tflite_micro_cc_test( name = name, size = "medium", srcs = [ - "//tensorflow/contrib/lite/experimental/micro/testing:test_linux_binary.sh", + "//tensorflow/lite/experimental/micro/testing:test_linux_binary.sh", ], args = [ native.package_name() + "/" + name + "_binary", diff --git a/tensorflow/contrib/lite/experimental/micro/testing/micro_test.h b/tensorflow/lite/experimental/micro/testing/micro_test.h similarity index 96% rename from tensorflow/contrib/lite/experimental/micro/testing/micro_test.h rename to tensorflow/lite/experimental/micro/testing/micro_test.h index 3b6554dea6..10bab05fae 100644 --- a/tensorflow/contrib/lite/experimental/micro/testing/micro_test.h +++ b/tensorflow/lite/experimental/micro/testing/micro_test.h @@ -51,10 +51,10 @@ limitations under the License. // all on systems that struggle to run more conventional approaches, so use with // caution! -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_TESTING_MICRO_TEST_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_TESTING_MICRO_TEST_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICRO_TESTING_MICRO_TEST_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICRO_TESTING_MICRO_TEST_H_ -#include "tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h" +#include "tensorflow/lite/experimental/micro/micro_error_reporter.h" namespace micro_test { extern int tests_passed; @@ -153,4 +153,4 @@ extern tflite::ErrorReporter* reporter; } \ } while (false) -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICRO_TESTING_MICRO_TEST_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICRO_TESTING_MICRO_TEST_H_ diff --git a/tensorflow/contrib/lite/experimental/micro/testing/test_bluepill_binary.sh b/tensorflow/lite/experimental/micro/testing/test_bluepill_binary.sh similarity index 83% rename from tensorflow/contrib/lite/experimental/micro/testing/test_bluepill_binary.sh rename to tensorflow/lite/experimental/micro/testing/test_bluepill_binary.sh index a470dc52f8..e288c6cf56 100755 --- a/tensorflow/contrib/lite/experimental/micro/testing/test_bluepill_binary.sh +++ b/tensorflow/lite/experimental/micro/testing/test_bluepill_binary.sh @@ -27,8 +27,8 @@ declare -r MICRO_LOG_FILENAME=${MICRO_LOG_PATH}/logs.txt mkdir -p ${MICRO_LOG_PATH} docker build -t renode_bluepill \ - -f ${ROOT_DIR}/tensorflow/contrib/lite/experimental/micro/testing/Dockerfile.bluepill \ - ${ROOT_DIR}/tensorflow/contrib/lite/experimental/micro/testing/ + -f ${ROOT_DIR}/tensorflow/lite/experimental/micro/testing/Dockerfile.bluepill \ + ${ROOT_DIR}/tensorflow/lite/experimental/micro/testing/ exit_code=0 # running in `if` to avoid setting +e @@ -37,10 +37,10 @@ if ! docker run \ -v ${ROOT_DIR}:/workspace \ -v /tmp:/tmp \ -e BIN=/workspace/$1 \ - -e SCRIPT=/workspace/tensorflow/contrib/lite/experimental/micro/testing/bluepill.resc \ + -e SCRIPT=/workspace/tensorflow/lite/experimental/micro/testing/bluepill.resc \ -e EXPECTED="$2" \ -it renode_bluepill \ - /bin/bash -c "/opt/renode/tests/test.sh /workspace/tensorflow/contrib/lite/experimental/micro/testing/bluepill.robot 2>&1 >${MICRO_LOG_FILENAME}" + /bin/bash -c "/opt/renode/tests/test.sh /workspace/tensorflow/lite/experimental/micro/testing/bluepill.robot 2>&1 >${MICRO_LOG_FILENAME}" then exit_code=1 fi diff --git a/tensorflow/contrib/lite/experimental/micro/testing/test_linux_binary.sh b/tensorflow/lite/experimental/micro/testing/test_linux_binary.sh similarity index 100% rename from tensorflow/contrib/lite/experimental/micro/testing/test_linux_binary.sh rename to tensorflow/lite/experimental/micro/testing/test_linux_binary.sh diff --git a/tensorflow/contrib/lite/experimental/micro/tools/make/Makefile b/tensorflow/lite/experimental/micro/tools/make/Makefile similarity index 73% rename from tensorflow/contrib/lite/experimental/micro/tools/make/Makefile rename to tensorflow/lite/experimental/micro/tools/make/Makefile index 93e470675c..5492003e5a 100644 --- a/tensorflow/contrib/lite/experimental/micro/tools/make/Makefile +++ b/tensorflow/lite/experimental/micro/tools/make/Makefile @@ -1,4 +1,4 @@ -MAKEFILE_DIR := tensorflow/contrib/lite/experimental/micro/tools/make +MAKEFILE_DIR := tensorflow/lite/experimental/micro/tools/make # Try to figure out the host system HOST_OS := @@ -17,7 +17,7 @@ endif HOST_ARCH := $(shell if [[ $(shell uname -m) =~ i[345678]86 ]]; then echo x86_32; else echo $(shell uname -m); fi) # Override these on the make command line to target a specific architecture. For example: -# make -f tensorflow/contrib/lite/Makefile TARGET=rpi TARGET_ARCH=armv7l +# make -f tensorflow/lite/Makefile TARGET=rpi TARGET_ARCH=armv7l TARGET := $(HOST_OS) TARGET_ARCH := $(HOST_ARCH) @@ -33,7 +33,7 @@ INCLUDES := \ # override local versions in the source tree. INCLUDES += -I/usr/local/include -TEST_SCRIPT := tensorflow/contrib/lite/experimental/micro/testing/test_linux_binary.sh +TEST_SCRIPT := tensorflow/lite/experimental/micro/testing/test_linux_binary.sh MICROLITE_LIBS := -lm @@ -54,33 +54,33 @@ MICROLITE_LIB_NAME := libtensorflow-microlite.a # Test binary for the microcontroller speech model. MICRO_SPEECH_TEST_SRCS := \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_features_data.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_features_data.cc +tensorflow/lite/experimental/micro/examples/micro_speech/micro_speech_test.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/tiny_conv_model_data.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/no_features_data.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/yes_features_data.cc # Test binary for the microcontroller speech model. PREPROCESSOR_TEST_SRCS := \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/preprocessor.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc \ -tensorflow/contrib/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc +tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor_test.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/preprocessor.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/no_30ms_sample_data.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/yes_30ms_sample_data.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/no_power_spectrum_data.cc \ +tensorflow/lite/experimental/micro/examples/micro_speech/yes_power_spectrum_data.cc MICROLITE_TEST_SRCS := \ -$(wildcard tensorflow/contrib/lite/experimental/micro/*test.cc) \ -$(wildcard tensorflow/contrib/lite/experimental/micro/kernels/*test.cc) +$(wildcard tensorflow/lite/experimental/micro/*test.cc) \ +$(wildcard tensorflow/lite/experimental/micro/kernels/*test.cc) MICROLITE_CC_BASE_SRCS := \ -$(wildcard tensorflow/contrib/lite/experimental/micro/*.cc) \ -$(wildcard tensorflow/contrib/lite/experimental/micro/kernels/*.cc) \ -tensorflow/contrib/lite/c/c_api_internal.c \ -tensorflow/contrib/lite/core/api/error_reporter.cc \ -tensorflow/contrib/lite/core/api/flatbuffer_conversions.cc \ -tensorflow/contrib/lite/core/api/op_resolver.cc \ -tensorflow/contrib/lite/kernels/kernel_util.cc \ -tensorflow/contrib/lite/kernels/internal/quantization_util.cc +$(wildcard tensorflow/lite/experimental/micro/*.cc) \ +$(wildcard tensorflow/lite/experimental/micro/kernels/*.cc) \ +tensorflow/lite/c/c_api_internal.c \ +tensorflow/lite/core/api/error_reporter.cc \ +tensorflow/lite/core/api/flatbuffer_conversions.cc \ +tensorflow/lite/core/api/op_resolver.cc \ +tensorflow/lite/kernels/kernel_util.cc \ +tensorflow/lite/kernels/internal/quantization_util.cc MICROLITE_CC_SRCS := $(filter-out $(MICROLITE_TEST_SRCS), $(MICROLITE_CC_BASE_SRCS)) # These target-specific makefiles should modify or replace options like @@ -138,11 +138,11 @@ all: $(MICROLITE_LIB_PATH) $(MICRO_SPEECH_TEST_BINARY) $(PREPROCESSOR_TEST_BINAR microlite: $(MICROLITE_LIB_PATH) # Hack for generating schema file bypassing flatbuffer parsing -tensorflow/contrib/lite/schema/schema_generated.h: - @cp -u tensorflow/contrib/lite/schema/schema_generated.h.OPENSOURCE tensorflow/contrib/lite/schema/schema_generated.h +tensorflow/lite/schema/schema_generated.h: + @cp -u tensorflow/lite/schema/schema_generated.h.OPENSOURCE tensorflow/lite/schema/schema_generated.h # Gathers together all the objects we've compiled into a single '.a' archive. -$(MICROLITE_LIB_PATH): tensorflow/contrib/lite/schema/schema_generated.h $(MICROLITE_LIB_OBJS) +$(MICROLITE_LIB_PATH): tensorflow/lite/schema/schema_generated.h $(MICROLITE_LIB_OBJS) @mkdir -p $(dir $@) $(AR) $(ARFLAGS) $(MICROLITE_LIB_PATH) $(MICROLITE_LIB_OBJS) diff --git a/tensorflow/contrib/lite/experimental/micro/tools/make/download_dependencies.sh b/tensorflow/lite/experimental/micro/tools/make/download_dependencies.sh similarity index 97% rename from tensorflow/contrib/lite/experimental/micro/tools/make/download_dependencies.sh rename to tensorflow/lite/experimental/micro/tools/make/download_dependencies.sh index 62402efddd..dd87d0d8da 100755 --- a/tensorflow/contrib/lite/experimental/micro/tools/make/download_dependencies.sh +++ b/tensorflow/lite/experimental/micro/tools/make/download_dependencies.sh @@ -19,7 +19,7 @@ set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd "$SCRIPT_DIR/../../../../../../.." -DOWNLOADS_DIR=tensorflow/contrib/lite/experimental/micro/tools/make/downloads +DOWNLOADS_DIR=tensorflow/lite/experimental/micro/tools/make/downloads BZL_FILE_PATH=tensorflow/workspace.bzl # Ensure it is being run from repo root diff --git a/tensorflow/contrib/lite/experimental/micro/tools/make/targets/apollo3evb/_main.c b/tensorflow/lite/experimental/micro/tools/make/targets/apollo3evb/_main.c similarity index 100% rename from tensorflow/contrib/lite/experimental/micro/tools/make/targets/apollo3evb/_main.c rename to tensorflow/lite/experimental/micro/tools/make/targets/apollo3evb/_main.c diff --git a/tensorflow/contrib/lite/experimental/micro/tools/make/targets/apollo3evb/apollo3evb.ld b/tensorflow/lite/experimental/micro/tools/make/targets/apollo3evb/apollo3evb.ld similarity index 100% rename from tensorflow/contrib/lite/experimental/micro/tools/make/targets/apollo3evb/apollo3evb.ld rename to tensorflow/lite/experimental/micro/tools/make/targets/apollo3evb/apollo3evb.ld diff --git a/tensorflow/contrib/lite/experimental/micro/tools/make/targets/apollo3evb_makefile.inc b/tensorflow/lite/experimental/micro/tools/make/targets/apollo3evb_makefile.inc similarity index 93% rename from tensorflow/contrib/lite/experimental/micro/tools/make/targets/apollo3evb_makefile.inc rename to tensorflow/lite/experimental/micro/tools/make/targets/apollo3evb_makefile.inc index 86c5af69a9..f722204fea 100644 --- a/tensorflow/contrib/lite/experimental/micro/tools/make/targets/apollo3evb_makefile.inc +++ b/tensorflow/lite/experimental/micro/tools/make/targets/apollo3evb_makefile.inc @@ -86,11 +86,11 @@ ifeq ($(TARGET), apollo3evb) $(MAKEFILE_DIR)/targets/apollo3evb/am_util_id.c \ $(MAKEFILE_DIR)/targets/apollo3evb/am_util_stdio.c - TEST_SCRIPT := tensorflow/contrib/lite/experimental/log_test/test_apollo3evb_binary.sh + TEST_SCRIPT := tensorflow/lite/experimental/log_test/test_apollo3evb_binary.sh # These are tests that don't currently work on the blue pill. EXCLUDED_TESTS := \ - tensorflow/contrib/lite/experimental/micro/micro_interpreter_test.cc \ - tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator_test.cc + tensorflow/lite/experimental/micro/micro_interpreter_test.cc \ + tensorflow/lite/experimental/micro/simple_tensor_allocator_test.cc MICROLITE_TEST_SRCS := $(filter-out $(EXCLUDED_TESTS), $(MICROLITE_TEST_SRCS)) # These are microcontroller-specific rules for converting the ELF output diff --git a/tensorflow/contrib/lite/experimental/micro/tools/make/targets/bluepill_makefile.inc b/tensorflow/lite/experimental/micro/tools/make/targets/bluepill_makefile.inc similarity index 87% rename from tensorflow/contrib/lite/experimental/micro/tools/make/targets/bluepill_makefile.inc rename to tensorflow/lite/experimental/micro/tools/make/targets/bluepill_makefile.inc index 022a8422dc..5e3105a109 100644 --- a/tensorflow/contrib/lite/experimental/micro/tools/make/targets/bluepill_makefile.inc +++ b/tensorflow/lite/experimental/micro/tools/make/targets/bluepill_makefile.inc @@ -47,11 +47,11 @@ ifeq ($(TARGET), bluepill) MICROLITE_CC_SRCS += \ $(wildcard $(MAKEFILE_DIR)/downloads/stm32_bare_lib/source/*.c) \ $(wildcard $(MAKEFILE_DIR)/downloads/stm32_bare_lib/source/*.cc) - TEST_SCRIPT := tensorflow/contrib/lite/experimental/micro/testing/test_bluepill_binary.sh + TEST_SCRIPT := tensorflow/lite/experimental/micro/testing/test_bluepill_binary.sh # These are tests that don't currently work on the blue pill. EXCLUDED_TESTS := \ - tensorflow/contrib/lite/experimental/micro/micro_interpreter_test.cc \ - tensorflow/contrib/lite/experimental/micro/simple_tensor_allocator_test.cc + tensorflow/lite/experimental/micro/micro_interpreter_test.cc \ + tensorflow/lite/experimental/micro/simple_tensor_allocator_test.cc MICROLITE_TEST_SRCS := $(filter-out $(EXCLUDED_TESTS), $(MICROLITE_TEST_SRCS)) # These are microcontroller-specific rules for converting the ELF output diff --git a/tensorflow/contrib/lite/experimental/microfrontend/BUILD b/tensorflow/lite/experimental/microfrontend/BUILD similarity index 81% rename from tensorflow/contrib/lite/experimental/microfrontend/BUILD rename to tensorflow/lite/experimental/microfrontend/BUILD index 5005d0bbae..2f881e3aca 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/BUILD +++ b/tensorflow/lite/experimental/microfrontend/BUILD @@ -20,10 +20,10 @@ cc_library( name = "audio_microfrontend", srcs = ["audio_microfrontend.cc"], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/experimental/microfrontend/lib:frontend", - "//tensorflow/contrib/lite/kernels:kernel_util", - "//tensorflow/contrib/lite/kernels/internal:reference", + "//tensorflow/lite:framework", + "//tensorflow/lite/experimental/microfrontend/lib:frontend", + "//tensorflow/lite/kernels:kernel_util", + "//tensorflow/lite/kernels/internal:reference", "@flatbuffers", ], ) @@ -35,8 +35,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":audio_microfrontend", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -48,15 +48,15 @@ tf_custom_op_library( "ops/audio_microfrontend_op.cc", ], deps = [ - "//tensorflow/contrib/lite/experimental/microfrontend/lib:frontend", + "//tensorflow/lite/experimental/microfrontend/lib:frontend", ], ) tf_gen_op_libs( op_lib_names = ["audio_microfrontend_op"], deps = [ - "//tensorflow/contrib/lite/experimental/microfrontend/lib:frontend", "//tensorflow/core:lib", + "//tensorflow/lite/experimental/microfrontend/lib:frontend", ], ) diff --git a/tensorflow/contrib/lite/experimental/microfrontend/audio_microfrontend.cc b/tensorflow/lite/experimental/microfrontend/audio_microfrontend.cc similarity index 95% rename from tensorflow/contrib/lite/experimental/microfrontend/audio_microfrontend.cc rename to tensorflow/lite/experimental/microfrontend/audio_microfrontend.cc index 8819d070b8..4367fe74a4 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/audio_microfrontend.cc +++ b/tensorflow/lite/experimental/microfrontend/audio_microfrontend.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_util.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/audio_microfrontend_test.cc b/tensorflow/lite/experimental/microfrontend/audio_microfrontend_test.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/microfrontend/audio_microfrontend_test.cc rename to tensorflow/lite/experimental/microfrontend/audio_microfrontend_test.cc index 9da58d9606..a9119d0183 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/audio_microfrontend_test.cc +++ b/tensorflow/lite/experimental/microfrontend/audio_microfrontend_test.cc @@ -20,9 +20,9 @@ limitations under the License. #include #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/BUILD b/tensorflow/lite/experimental/microfrontend/lib/BUILD similarity index 100% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/BUILD rename to tensorflow/lite/experimental/microfrontend/lib/BUILD diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/README b/tensorflow/lite/experimental/microfrontend/lib/README similarity index 100% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/README rename to tensorflow/lite/experimental/microfrontend/lib/README diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h b/tensorflow/lite/experimental/microfrontend/lib/bits.h similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h rename to tensorflow/lite/experimental/microfrontend/lib/bits.h index f81bc2b023..bf15466a3d 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h +++ b/tensorflow/lite/experimental/microfrontend/lib/bits.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_BITS_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_BITS_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_BITS_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_BITS_H_ #ifdef __cplusplus #include @@ -99,4 +99,4 @@ static inline int MostSignificantBit64(uint64_t n) { } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_BITS_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_BITS_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft.c b/tensorflow/lite/experimental/microfrontend/lib/fft.c similarity index 96% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/fft.c rename to tensorflow/lite/experimental/microfrontend/lib/fft.c index 1ecbb30b51..c1dd62fb7d 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft.c +++ b/tensorflow/lite/experimental/microfrontend/lib/fft.c @@ -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/contrib/lite/experimental/microfrontend/lib/fft.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft.h" #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h b/tensorflow/lite/experimental/microfrontend/lib/fft.h similarity index 84% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h rename to tensorflow/lite/experimental/microfrontend/lib/fft.h index e7644bf2a7..aaffa69deb 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h +++ b/tensorflow/lite/experimental/microfrontend/lib/fft.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_H_ #include #include @@ -47,4 +47,4 @@ void FftReset(struct FftState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_io.c b/tensorflow/lite/experimental/microfrontend/lib/fft_io.c similarity index 95% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/fft_io.c rename to tensorflow/lite/experimental/microfrontend/lib/fft_io.c index cc1ce209d8..b01a8848e9 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_io.c +++ b/tensorflow/lite/experimental/microfrontend/lib/fft_io.c @@ -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/contrib/lite/experimental/microfrontend/lib/fft_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft_io.h" void FftWriteMemmapPreamble(FILE* fp, const struct FftState* state) { fprintf(fp, "static int16_t fft_input[%zu];\n", state->fft_size); diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_io.h b/tensorflow/lite/experimental/microfrontend/lib/fft_io.h similarity index 76% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/fft_io.h rename to tensorflow/lite/experimental/microfrontend/lib/fft_io.h index 4d10c3a92a..7a59af6826 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_io.h +++ b/tensorflow/lite/experimental/microfrontend/lib/fft_io.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_IO_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_IO_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_IO_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_IO_H_ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft.h" #ifdef __cplusplus extern "C" { @@ -31,4 +31,4 @@ void FftWriteMemmap(FILE* fp, const struct FftState* state, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_IO_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_IO_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_test.cc b/tensorflow/lite/experimental/microfrontend/lib/fft_test.cc similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/fft_test.cc rename to tensorflow/lite/experimental/microfrontend/lib/fft_test.cc index b8684a0b5c..7c1ee2d852 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_test.cc +++ b/tensorflow/lite/experimental/microfrontend/lib/fft_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.c b/tensorflow/lite/experimental/microfrontend/lib/fft_util.c similarity index 96% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.c rename to tensorflow/lite/experimental/microfrontend/lib/fft_util.c index 55494422f3..40cb9f8735 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.c +++ b/tensorflow/lite/experimental/microfrontend/lib/fft_util.c @@ -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/contrib/lite/experimental/microfrontend/lib/fft_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft_util.h" #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.h b/tensorflow/lite/experimental/microfrontend/lib/fft_util.h similarity index 76% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.h rename to tensorflow/lite/experimental/microfrontend/lib/fft_util.h index 4935e87fc1..6a471301c3 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.h +++ b/tensorflow/lite/experimental/microfrontend/lib/fft_util.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_UTIL_H_ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft.h" #ifdef __cplusplus extern "C" { @@ -31,4 +31,4 @@ void FftFreeStateContents(struct FftState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FFT_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.c b/tensorflow/lite/experimental/microfrontend/lib/filterbank.c similarity index 96% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.c rename to tensorflow/lite/experimental/microfrontend/lib/filterbank.c index 944eb1a737..22cfaf78ab 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.c +++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank.c @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank.h" #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h" +#include "tensorflow/lite/experimental/microfrontend/lib/bits.h" void FilterbankConvertFftComplexToEnergy(struct FilterbankState* state, struct complex_int16_t* fft_output, diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h b/tensorflow/lite/experimental/microfrontend/lib/filterbank.h similarity index 86% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h rename to tensorflow/lite/experimental/microfrontend/lib/filterbank.h index 0dd9c3fa65..1e6d3885f2 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h +++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_H_ #include #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft.h" #define kFilterbankBits 12 @@ -60,4 +60,4 @@ void FilterbankReset(struct FilterbankState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_io.c b/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.c similarity index 97% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_io.c rename to tensorflow/lite/experimental/microfrontend/lib/filterbank_io.c index 672ddd530f..2dbb4b3bf0 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_io.c +++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.c @@ -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/contrib/lite/experimental/microfrontend/lib/filterbank_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank_io.h" static void PrintArray(FILE* fp, const char* name, const int16_t* values, size_t size) { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_io.h b/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.h similarity index 75% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_io.h rename to tensorflow/lite/experimental/microfrontend/lib/filterbank_io.h index 1ddc314df2..5fc9684589 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_io.h +++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank_io.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_IO_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_IO_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_IO_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_IO_H_ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank.h" #ifdef __cplusplus extern "C" { @@ -32,4 +32,4 @@ void FilterbankWriteMemmap(FILE* fp, const struct FilterbankState* state, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_IO_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_IO_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_test.cc b/tensorflow/lite/experimental/microfrontend/lib/filterbank_test.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_test.cc rename to tensorflow/lite/experimental/microfrontend/lib/filterbank_test.cc index 88d8de4b8f..808d527186 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_test.cc +++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank_util.h" #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.c b/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.c similarity index 99% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.c rename to tensorflow/lite/experimental/microfrontend/lib/filterbank_util.c index 53b5e45073..ce8b4acc0f 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.c +++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.c @@ -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/contrib/lite/experimental/microfrontend/lib/filterbank_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.h b/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.h similarity index 81% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.h rename to tensorflow/lite/experimental/microfrontend/lib/filterbank_util.h index 9ec9bc9302..781d102479 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.h +++ b/tensorflow/lite/experimental/microfrontend/lib/filterbank_util.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_UTIL_H_ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank.h" #ifdef __cplusplus extern "C" { @@ -47,4 +47,4 @@ void FilterbankFreeStateContents(struct FilterbankState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FILTERBANK_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.c b/tensorflow/lite/experimental/microfrontend/lib/frontend.c similarity index 94% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.c rename to tensorflow/lite/experimental/microfrontend/lib/frontend.c index de7a60b56f..7a618d9af5 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.c +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend.c @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h" +#include "tensorflow/lite/experimental/microfrontend/lib/bits.h" struct FrontendOutput FrontendProcessSamples(struct FrontendState* state, const int16_t* samples, diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h b/tensorflow/lite/experimental/microfrontend/lib/frontend.h similarity index 73% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h rename to tensorflow/lite/experimental/microfrontend/lib/frontend.h index 71ae81024c..883df5fd3d 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend.h @@ -12,18 +12,18 @@ 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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_H_ #include #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/window.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction.h" +#include "tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window.h" #ifdef __cplusplus extern "C" { @@ -61,4 +61,4 @@ void FrontendReset(struct FrontendState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.c b/tensorflow/lite/experimental/microfrontend/lib/frontend_io.c similarity index 83% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.c rename to tensorflow/lite/experimental/microfrontend/lib/frontend_io.c index 40bcf24749..b422d078a6 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.c +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_io.c @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_io.h" #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft_io.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_io.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_io.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/window_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window_io.h" int WriteFrontendStateMemmap(const char* header, const char* source, const struct FrontendState* state) { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.h b/tensorflow/lite/experimental/microfrontend/lib/frontend_io.h similarity index 73% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.h rename to tensorflow/lite/experimental/microfrontend/lib/frontend_io.h index 4f45577cae..0d59eda7d0 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.h +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_io.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_IO_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_IO_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_IO_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_IO_H_ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" #ifdef __cplusplus extern "C" { @@ -28,4 +28,4 @@ int WriteFrontendStateMemmap(const char* header, const char* source, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_IO_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_IO_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_main.c b/tensorflow/lite/experimental/microfrontend/lib/frontend_main.c similarity index 93% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_main.c rename to tensorflow/lite/experimental/microfrontend/lib/frontend_main.c index 46caebeec9..4a8411b621 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_main.c +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_main.c @@ -14,8 +14,8 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_util.h" int main(int argc, char** argv) { struct FrontendConfig frontend_config; diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_memmap_generator.c b/tensorflow/lite/experimental/microfrontend/lib/frontend_memmap_generator.c similarity index 86% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_memmap_generator.c rename to tensorflow/lite/experimental/microfrontend/lib/frontend_memmap_generator.c index a4c59b0ccc..766b7f2ad5 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_memmap_generator.c +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_memmap_generator.c @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_io.h" int main(int argc, char** argv) { if (argc != 3) { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_memmap_main.c b/tensorflow/lite/experimental/microfrontend/lib/frontend_memmap_main.c similarity index 96% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_memmap_main.c rename to tensorflow/lite/experimental/microfrontend/lib/frontend_memmap_main.c index a4264922b9..cf39e93a78 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_memmap_main.c +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_memmap_main.c @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" #include "memmap.h" int main(int argc, char** argv) { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_test.cc b/tensorflow/lite/experimental/microfrontend/lib/frontend_test.cc similarity index 96% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_test.cc rename to tensorflow/lite/experimental/microfrontend/lib/frontend_test.cc index f06e2565c2..993e866cc0 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_test.cc +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.c b/tensorflow/lite/experimental/microfrontend/lib/frontend_util.c similarity index 95% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.c rename to tensorflow/lite/experimental/microfrontend/lib/frontend_util.c index ae2d9ae6c4..94c15adcaf 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.c +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_util.c @@ -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/contrib/lite/experimental/microfrontend/lib/frontend_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_util.h" #include #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h" +#include "tensorflow/lite/experimental/microfrontend/lib/bits.h" void FrontendFillConfigWithDefaults(struct FrontendConfig* config) { WindowFillConfigWithDefaults(&config->window); diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h b/tensorflow/lite/experimental/microfrontend/lib/frontend_util.h similarity index 62% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h rename to tensorflow/lite/experimental/microfrontend/lib/frontend_util.h index a958b610ea..895ce6cd2b 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h +++ b/tensorflow/lite/experimental/microfrontend/lib/frontend_util.h @@ -12,16 +12,16 @@ 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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_UTIL_H_ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/fft_util.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/filterbank_util.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/fft_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/filterbank_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window_util.h" #ifdef __cplusplus extern "C" { @@ -49,4 +49,4 @@ void FrontendFreeStateContents(struct FrontendState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_FRONTEND_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_lut.c b/tensorflow/lite/experimental/microfrontend/lib/log_lut.c similarity index 95% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_lut.c rename to tensorflow/lite/experimental/microfrontend/lib/log_lut.c index f8d3210233..f59618e028 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_lut.c +++ b/tensorflow/lite/experimental/microfrontend/lib/log_lut.c @@ -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/contrib/lite/experimental/microfrontend/lib/log_lut.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_lut.h" const uint16_t kLogLut[] #ifndef _MSC_VER __attribute__((aligned(4))) diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_lut.h b/tensorflow/lite/experimental/microfrontend/lib/log_lut.h similarity index 82% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_lut.h rename to tensorflow/lite/experimental/microfrontend/lib/log_lut.h index 53dd1fa405..b2448a3228 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_lut.h +++ b/tensorflow/lite/experimental/microfrontend/lib/log_lut.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_LUT_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_LUT_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_LUT_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_LUT_H_ #include @@ -37,4 +37,4 @@ extern const uint16_t kLogLut[]; } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_LUT_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_LUT_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.c b/tensorflow/lite/experimental/microfrontend/lib/log_scale.c similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.c rename to tensorflow/lite/experimental/microfrontend/lib/log_scale.c index 4b12461871..54f370e7d9 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.c +++ b/tensorflow/lite/experimental/microfrontend/lib/log_scale.c @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_lut.h" +#include "tensorflow/lite/experimental/microfrontend/lib/bits.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_lut.h" #define kuint16max 0x0000FFFF diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h b/tensorflow/lite/experimental/microfrontend/lib/log_scale.h similarity index 82% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h rename to tensorflow/lite/experimental/microfrontend/lib/log_scale.h index 8fd6099933..a383f32f5b 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h +++ b/tensorflow/lite/experimental/microfrontend/lib/log_scale.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_H_ #include #include @@ -36,4 +36,4 @@ uint16_t* LogScaleApply(struct LogScaleState* state, uint32_t* signal, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_io.c b/tensorflow/lite/experimental/microfrontend/lib/log_scale_io.c similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_io.c rename to tensorflow/lite/experimental/microfrontend/lib/log_scale_io.c index f59cde951c..a04760de58 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_io.c +++ b/tensorflow/lite/experimental/microfrontend/lib/log_scale_io.c @@ -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/contrib/lite/experimental/microfrontend/lib/log_scale_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale_io.h" void LogScaleWriteMemmap(FILE* fp, const struct LogScaleState* state, const char* variable) { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_io.h b/tensorflow/lite/experimental/microfrontend/lib/log_scale_io.h similarity index 73% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_io.h rename to tensorflow/lite/experimental/microfrontend/lib/log_scale_io.h index 5444303b24..9d447ac901 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_io.h +++ b/tensorflow/lite/experimental/microfrontend/lib/log_scale_io.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_IO_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_IO_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_IO_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_IO_H_ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale.h" #ifdef __cplusplus extern "C" { @@ -30,4 +30,4 @@ void LogScaleWriteMemmap(FILE* fp, const struct LogScaleState* state, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_IO_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_IO_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_test.cc b/tensorflow/lite/experimental/microfrontend/lib/log_scale_test.cc similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_test.cc rename to tensorflow/lite/experimental/microfrontend/lib/log_scale_test.cc index 312d7ea740..91ca657e54 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_test.cc +++ b/tensorflow/lite/experimental/microfrontend/lib/log_scale_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.c b/tensorflow/lite/experimental/microfrontend/lib/log_scale_util.c similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.c rename to tensorflow/lite/experimental/microfrontend/lib/log_scale_util.c index 8a025fbf72..0e3dd1d1e9 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.c +++ b/tensorflow/lite/experimental/microfrontend/lib/log_scale_util.c @@ -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/contrib/lite/experimental/microfrontend/lib/log_scale_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale_util.h" void LogScaleFillConfigWithDefaults(struct LogScaleConfig* config) { config->enable_log = 1; diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.h b/tensorflow/lite/experimental/microfrontend/lib/log_scale_util.h similarity index 79% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.h rename to tensorflow/lite/experimental/microfrontend/lib/log_scale_util.h index 33b21f30b1..11f7d9eeb9 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale_util.h +++ b/tensorflow/lite/experimental/microfrontend/lib/log_scale_util.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_UTIL_H_ #include #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/log_scale.h" +#include "tensorflow/lite/experimental/microfrontend/lib/log_scale.h" #ifdef __cplusplus extern "C" { @@ -42,4 +42,4 @@ int LogScalePopulateState(const struct LogScaleConfig* config, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_LOG_SCALE_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.c b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction.c similarity index 95% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.c rename to tensorflow/lite/experimental/microfrontend/lib/noise_reduction.c index 92f8b58d74..b6fcb5e940 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.c +++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction.c @@ -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/contrib/lite/experimental/microfrontend/lib/noise_reduction.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction.h" #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.h b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction.h similarity index 83% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.h rename to tensorflow/lite/experimental/microfrontend/lib/noise_reduction.h index cc2cf2d9b7..46d3f52e60 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.h +++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_H_ #define kNoiseReductionBits 14 @@ -43,4 +43,4 @@ void NoiseReductionReset(struct NoiseReductionState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.c b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.c similarity index 94% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.c rename to tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.c index 1cba410436..19c32b3275 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.c +++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.c @@ -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/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.h" void NoiseReductionWriteMemmapPreamble( FILE* fp, const struct NoiseReductionState* state) { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.h b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.h similarity index 75% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.h rename to tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.h index afeedfce99..ded52118f0 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_io.h +++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_io.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_IO_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_IO_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_IO_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_IO_H_ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction.h" #ifdef __cplusplus extern "C" { @@ -33,4 +33,4 @@ void NoiseReductionWriteMemmap(FILE* fp, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_IO_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_IO_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_test.cc b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_test.cc similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_test.cc rename to tensorflow/lite/experimental/microfrontend/lib/noise_reduction_test.cc index f4cf486227..1614056487 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_test.cc +++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.c b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.c similarity index 95% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.c rename to tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.c index 46f475352e..a6c9234eb8 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.c +++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.c @@ -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/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.h" #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.h b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.h similarity index 82% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.h rename to tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.h index 207b8a679d..fa55539143 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction_util.h +++ b/tensorflow/lite/experimental/microfrontend/lib/noise_reduction_util.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_UTIL_H_ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/noise_reduction.h" +#include "tensorflow/lite/experimental/microfrontend/lib/noise_reduction.h" #ifdef __cplusplus extern "C" { @@ -47,4 +47,4 @@ void NoiseReductionFreeStateContents(struct NoiseReductionState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_NOISE_REDUCTION_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.c b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.c similarity index 92% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.c rename to tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.c index 551d552e8f..b49eb30137 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.c +++ b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.c @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.h" +#include "tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/bits.h" +#include "tensorflow/lite/experimental/microfrontend/lib/bits.h" int16_t WideDynamicFunction(const uint32_t x, const int16_t* lut) { if (x <= 2) { diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.h b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.h similarity index 82% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.h rename to tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.h index cab74f49db..8155791322 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.h +++ b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_H_ #include #include @@ -43,4 +43,4 @@ void PcanGainControlApply(struct PcanGainControlState* state, uint32_t* signal); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_test.cc b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_test.cc similarity index 91% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_test.cc rename to tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_test.cc index bbc36d6eac..830db89edd 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_test.cc +++ b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.h" +#include "tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.c b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.c similarity index 97% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.c rename to tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.c index 4226b390bc..dbe44c494a 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.c +++ b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.c @@ -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/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.h b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.h similarity index 84% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.h rename to tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.h index 79c0b1da69..d4bfaa2ed7 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control_util.h +++ b/tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control_util.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_UTIL_H_ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/pcan_gain_control.h" +#include "tensorflow/lite/experimental/microfrontend/lib/pcan_gain_control.h" #define kWideDynamicFunctionBits 32 #define kWideDynamicFunctionLUTSize (4 * kWideDynamicFunctionBits - 3) @@ -54,4 +54,4 @@ void PcanGainControlFreeStateContents(struct PcanGainControlState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_PCAN_GAIN_CONTROL_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/window.c b/tensorflow/lite/experimental/microfrontend/lib/window.c similarity index 97% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/window.c rename to tensorflow/lite/experimental/microfrontend/lib/window.c index 0fdc040a7a..517b60487b 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/window.c +++ b/tensorflow/lite/experimental/microfrontend/lib/window.c @@ -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/contrib/lite/experimental/microfrontend/lib/window.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window.h" #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/window.h b/tensorflow/lite/experimental/microfrontend/lib/window.h similarity index 85% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/window.h rename to tensorflow/lite/experimental/microfrontend/lib/window.h index 90291e5c72..bad8151412 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/window.h +++ b/tensorflow/lite/experimental/microfrontend/lib/window.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_H_ #include #include @@ -46,4 +46,4 @@ void WindowReset(struct WindowState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_io.c b/tensorflow/lite/experimental/microfrontend/lib/window_io.c similarity index 95% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/window_io.c rename to tensorflow/lite/experimental/microfrontend/lib/window_io.c index f1fee7c1ed..ed4ac5eb11 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_io.c +++ b/tensorflow/lite/experimental/microfrontend/lib/window_io.c @@ -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/contrib/lite/experimental/microfrontend/lib/window_io.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window_io.h" void WindowWriteMemmapPreamble(FILE* fp, const struct WindowState* state) { fprintf(fp, "static int16_t window_coefficients[] = {\n"); diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_io.h b/tensorflow/lite/experimental/microfrontend/lib/window_io.h similarity index 75% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/window_io.h rename to tensorflow/lite/experimental/microfrontend/lib/window_io.h index 2bab9064c1..a76b2dc3e8 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_io.h +++ b/tensorflow/lite/experimental/microfrontend/lib/window_io.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_IO_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_IO_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_IO_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_IO_H_ #include -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/window.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window.h" #ifdef __cplusplus extern "C" { @@ -31,4 +31,4 @@ void WindowWriteMemmap(FILE* fp, const struct WindowState* state, } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_IO_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_IO_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_test.cc b/tensorflow/lite/experimental/microfrontend/lib/window_test.cc similarity index 97% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/window_test.cc rename to tensorflow/lite/experimental/microfrontend/lib/window_test.cc index a6c0879faa..8c6c19188d 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_test.cc +++ b/tensorflow/lite/experimental/microfrontend/lib/window_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/window.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.c b/tensorflow/lite/experimental/microfrontend/lib/window_util.c similarity index 96% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.c rename to tensorflow/lite/experimental/microfrontend/lib/window_util.c index 3adde0fb0a..2445c343be 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.c +++ b/tensorflow/lite/experimental/microfrontend/lib/window_util.c @@ -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/contrib/lite/experimental/microfrontend/lib/window_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window_util.h" #include #include diff --git a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.h b/tensorflow/lite/experimental/microfrontend/lib/window_util.h similarity index 80% rename from tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.h rename to tensorflow/lite/experimental/microfrontend/lib/window_util.h index 52dc8f38cc..68e4de9eb5 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/lib/window_util.h +++ b/tensorflow/lite/experimental/microfrontend/lib/window_util.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_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_UTIL_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_UTIL_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_UTIL_H_ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/window.h" +#include "tensorflow/lite/experimental/microfrontend/lib/window.h" #ifdef __cplusplus extern "C" { @@ -42,4 +42,4 @@ void WindowFreeStateContents(struct WindowState* state); } // extern "C" #endif -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_UTIL_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_MICROFRONTEND_LIB_WINDOW_UTIL_H_ diff --git a/tensorflow/contrib/lite/experimental/microfrontend/ops/audio_microfrontend_op.cc b/tensorflow/lite/experimental/microfrontend/ops/audio_microfrontend_op.cc similarity index 98% rename from tensorflow/contrib/lite/experimental/microfrontend/ops/audio_microfrontend_op.cc rename to tensorflow/lite/experimental/microfrontend/ops/audio_microfrontend_op.cc index 83b9528ab5..51094a976d 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/ops/audio_microfrontend_op.cc +++ b/tensorflow/lite/experimental/microfrontend/ops/audio_microfrontend_op.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend.h" -#include "tensorflow/contrib/lite/experimental/microfrontend/lib/frontend_util.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend.h" +#include "tensorflow/lite/experimental/microfrontend/lib/frontend_util.h" #include "tensorflow/core/framework/op.h" #include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/shape_inference.h" diff --git a/tensorflow/contrib/lite/experimental/microfrontend/python/kernel_tests/audio_microfrontend_op_test.py b/tensorflow/lite/experimental/microfrontend/python/kernel_tests/audio_microfrontend_op_test.py similarity index 98% rename from tensorflow/contrib/lite/experimental/microfrontend/python/kernel_tests/audio_microfrontend_op_test.py rename to tensorflow/lite/experimental/microfrontend/python/kernel_tests/audio_microfrontend_op_test.py index e1661d6608..020d40bc13 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/python/kernel_tests/audio_microfrontend_op_test.py +++ b/tensorflow/lite/experimental/microfrontend/python/kernel_tests/audio_microfrontend_op_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import tensorflow as tf -from tensorflow.contrib.lite.experimental.microfrontend.python.ops import audio_microfrontend_op as frontend_op +from tensorflow.lite.experimental.microfrontend.python.ops import audio_microfrontend_op as frontend_op SAMPLE_RATE = 1000 WINDOW_SIZE = 25 diff --git a/tensorflow/contrib/lite/experimental/microfrontend/python/ops/audio_microfrontend_op.py b/tensorflow/lite/experimental/microfrontend/python/ops/audio_microfrontend_op.py similarity index 98% rename from tensorflow/contrib/lite/experimental/microfrontend/python/ops/audio_microfrontend_op.py rename to tensorflow/lite/experimental/microfrontend/python/ops/audio_microfrontend_op.py index c6e5e34760..3d49482f4e 100644 --- a/tensorflow/contrib/lite/experimental/microfrontend/python/ops/audio_microfrontend_op.py +++ b/tensorflow/lite/experimental/microfrontend/python/ops/audio_microfrontend_op.py @@ -20,7 +20,7 @@ from __future__ import print_function import tensorflow as tf -from tensorflow.contrib.lite.experimental.microfrontend.ops import gen_audio_microfrontend_op +from tensorflow.lite.experimental.microfrontend.ops import gen_audio_microfrontend_op from tensorflow.contrib.util import loader from tensorflow.python.platform import resource_loader diff --git a/tensorflow/contrib/lite/experimental/writer/BUILD b/tensorflow/lite/experimental/writer/BUILD similarity index 61% rename from tensorflow/contrib/lite/experimental/writer/BUILD rename to tensorflow/lite/experimental/writer/BUILD index 82d39c00ab..506c668cf2 100644 --- a/tensorflow/contrib/lite/experimental/writer/BUILD +++ b/tensorflow/lite/experimental/writer/BUILD @@ -8,7 +8,7 @@ cc_binary( name = "option_writer_generator", srcs = ["option_writer_generator.cc"], deps = [ - "//tensorflow/contrib/lite/schema:schema_fbs_with_reflection", + "//tensorflow/lite/schema:schema_fbs_with_reflection", "@flatbuffers", ], ) @@ -27,11 +27,11 @@ cc_library( ], textual_hdrs = ["option_writer_generated.h"], deps = [ - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/schema:schema_fbs_with_reflection", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/schema:schema_fbs_with_reflection", ], ) @@ -40,8 +40,8 @@ cc_binary( srcs = ["writer.cc"], deps = [ ":writer_lib", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", ], ) @@ -51,9 +51,9 @@ cc_test( srcs = ["writer_lib_test.cc"], deps = [ ":writer_lib", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/experimental/writer/enum_mapping.h b/tensorflow/lite/experimental/writer/enum_mapping.h similarity index 91% rename from tensorflow/contrib/lite/experimental/writer/enum_mapping.h rename to tensorflow/lite/experimental/writer/enum_mapping.h index 8bc464fd71..cb6ec3e0d7 100644 --- a/tensorflow/contrib/lite/experimental/writer/enum_mapping.h +++ b/tensorflow/lite/experimental/writer/enum_mapping.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_CONTRIB_LITE_EXPERIMENTAL_WRITER_ENUM_MAPPING_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_WRITER_ENUM_MAPPING_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_WRITER_ENUM_MAPPING_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_WRITER_ENUM_MAPPING_H_ -#include "tensorflow/contrib/lite/builtin_op_data.h" -#include "tensorflow/contrib/lite/schema/reflection/schema_generated.h" +#include "tensorflow/lite/builtin_op_data.h" +#include "tensorflow/lite/schema/reflection/schema_generated.h" // TODO(aselle): Ideally extract this from the schema. @@ -113,4 +113,4 @@ inline LSHProjectionType LSHProjectionTypeToSchema( } } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_WRITER_ENUM_MAPPING_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_WRITER_ENUM_MAPPING_H_ diff --git a/tensorflow/contrib/lite/experimental/writer/option_writer_generator.cc b/tensorflow/lite/experimental/writer/option_writer_generator.cc similarity index 99% rename from tensorflow/contrib/lite/experimental/writer/option_writer_generator.cc rename to tensorflow/lite/experimental/writer/option_writer_generator.cc index dc32817b86..036809e94a 100644 --- a/tensorflow/contrib/lite/experimental/writer/option_writer_generator.cc +++ b/tensorflow/lite/experimental/writer/option_writer_generator.cc @@ -17,12 +17,12 @@ limitations under the License. #include #include #include "flatbuffers/minireflect.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/schema/reflection/schema_generated.h" +#include "tensorflow/lite/schema/reflection/schema_generated.h" namespace tflite { namespace { // This is generated by grepping -// cat third_party/tensorflow/contrib/lite/builtin_op_data.h +// cat third_party/tensorflow/lite/builtin_op_data.h //| grep "^} TfLite" | sed 's/^} TfLite\(.*\)Params;/\1Params/g' | grep -v "^}" static const char* param_structs[] = {"TfLiteConvParams", "TfLitePoolParams", diff --git a/tensorflow/contrib/lite/experimental/writer/writer.cc b/tensorflow/lite/experimental/writer/writer.cc similarity index 89% rename from tensorflow/contrib/lite/experimental/writer/writer.cc rename to tensorflow/lite/experimental/writer/writer.cc index 20ede214fb..c1de033367 100644 --- a/tensorflow/contrib/lite/experimental/writer/writer.cc +++ b/tensorflow/lite/experimental/writer/writer.cc @@ -20,9 +20,9 @@ limitations under the License. #include -#include "tensorflow/contrib/lite/experimental/writer/writer_lib.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/experimental/writer/writer_lib.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" int main(int argc, char* argv[]) { if (argc != 3) { diff --git a/tensorflow/contrib/lite/experimental/writer/writer_lib.cc b/tensorflow/lite/experimental/writer/writer_lib.cc similarity index 95% rename from tensorflow/contrib/lite/experimental/writer/writer_lib.cc rename to tensorflow/lite/experimental/writer/writer_lib.cc index 555a9cc4b0..a0ce4b716d 100644 --- a/tensorflow/contrib/lite/experimental/writer/writer_lib.cc +++ b/tensorflow/lite/experimental/writer/writer_lib.cc @@ -12,16 +12,16 @@ 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/contrib/lite/experimental/writer/writer_lib.h" +#include "tensorflow/lite/experimental/writer/writer_lib.h" #include #include #include -#include "tensorflow/contrib/lite/builtin_op_data.h" -#include "tensorflow/contrib/lite/context_util.h" -#include "tensorflow/contrib/lite/experimental/writer/enum_mapping.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/schema/reflection/schema_generated.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/builtin_op_data.h" +#include "tensorflow/lite/context_util.h" +#include "tensorflow/lite/experimental/writer/enum_mapping.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/schema/reflection/schema_generated.h" +#include "tensorflow/lite/version.h" namespace tflite { template @@ -33,7 +33,7 @@ using FlatBufferBuilder = flatbuffers::FlatBufferBuilder; std::pair> CreateBuiltinUnion( FlatBufferBuilder* fbb, enum BuiltinOperator op, void* builtin_op_data) { switch (op) { -#include "tensorflow/contrib/lite/experimental/writer/option_writer_generated.h" +#include "tensorflow/lite/experimental/writer/option_writer_generated.h" } return std::make_pair(BuiltinOptions_NONE, Offset()); } diff --git a/tensorflow/contrib/lite/experimental/writer/writer_lib.h b/tensorflow/lite/experimental/writer/writer_lib.h similarity index 88% rename from tensorflow/contrib/lite/experimental/writer/writer_lib.h rename to tensorflow/lite/experimental/writer/writer_lib.h index a5f14697cf..08c0436932 100644 --- a/tensorflow/contrib/lite/experimental/writer/writer_lib.h +++ b/tensorflow/lite/experimental/writer/writer_lib.h @@ -16,7 +16,7 @@ limitations under the License. // // Usage: // From command line: -// bazel run third_party/tensorflow/contrib/lite/experimental/writer:writer +// bazel run third_party/tensorflow/lite/experimental/writer:writer // -- foo.tflite foo.out.tflite // // From C++ @@ -24,16 +24,16 @@ limitations under the License. // // Build Interpreter however // // ... // InterpreterWriter(interpreter.get()).Write("output.tflite"); -#ifndef TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_WRITER_WRITER_LIB_H_ -#define TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_WRITER_WRITER_LIB_H_ +#ifndef TENSORFLOW_LITE_EXPERIMENTAL_WRITER_WRITER_LIB_H_ +#define TENSORFLOW_LITE_EXPERIMENTAL_WRITER_WRITER_LIB_H_ #include #include -#include "tensorflow/contrib/lite/builtin_op_data.h" -#include "tensorflow/contrib/lite/context_util.h" -#include "tensorflow/contrib/lite/experimental/writer/enum_mapping.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/schema/reflection/schema_generated.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/builtin_op_data.h" +#include "tensorflow/lite/context_util.h" +#include "tensorflow/lite/experimental/writer/enum_mapping.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/schema/reflection/schema_generated.h" +#include "tensorflow/lite/version.h" namespace tflite { @@ -128,4 +128,4 @@ class InterpreterWriter { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_EXPERIMENTAL_WRITER_WRITER_LIB_H_ +#endif // TENSORFLOW_LITE_EXPERIMENTAL_WRITER_WRITER_LIB_H_ diff --git a/tensorflow/contrib/lite/experimental/writer/writer_lib_test.cc b/tensorflow/lite/experimental/writer/writer_lib_test.cc similarity index 89% rename from tensorflow/contrib/lite/experimental/writer/writer_lib_test.cc rename to tensorflow/lite/experimental/writer/writer_lib_test.cc index 49194a76c8..e04c678a50 100644 --- a/tensorflow/contrib/lite/experimental/writer/writer_lib_test.cc +++ b/tensorflow/lite/experimental/writer/writer_lib_test.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/experimental/writer/writer_lib.h" +#include "tensorflow/lite/experimental/writer/writer_lib.h" #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { // Make an interpreter that has no tensors and no nodes diff --git a/tensorflow/contrib/lite/g3doc/_book.yaml b/tensorflow/lite/g3doc/_book.yaml similarity index 95% rename from tensorflow/contrib/lite/g3doc/_book.yaml rename to tensorflow/lite/g3doc/_book.yaml index 1d916d0583..c322b63d65 100644 --- a/tensorflow/contrib/lite/g3doc/_book.yaml +++ b/tensorflow/lite/g3doc/_book.yaml @@ -57,7 +57,7 @@ upper_tabs: - title: Post-training quantization path: /lite/performance/post_training_quantization - title: Post-training quantization example - path: https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/tutorials/post_training_quant.ipynb + path: https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/tutorials/post_training_quant.ipynb status: external - title: TF Mobile @@ -81,4 +81,4 @@ upper_tabs: skip_translation: true contents: - title: API - path: /api_docs/python/tf/contrib/lite + path: /api_docs/python/tf/lite diff --git a/tensorflow/contrib/lite/g3doc/_index.yaml b/tensorflow/lite/g3doc/_index.yaml similarity index 99% rename from tensorflow/contrib/lite/g3doc/_index.yaml rename to tensorflow/lite/g3doc/_index.yaml index 44ee6ba750..43b5e3cfc0 100644 --- a/tensorflow/contrib/lite/g3doc/_index.yaml +++ b/tensorflow/lite/g3doc/_index.yaml @@ -211,8 +211,8 @@ landing_page: path: https://www.youtube.com/watch?v=FAMfy7izB6A - heading: TensorFlow Lite on GitHub image_path: /ecosystem/images/github-card-16x9.png - path: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite + path: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite buttons: - label: View on GitHub - path: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite + path: https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite - classname: devsite-landing-row-item-hidden diff --git a/tensorflow/contrib/lite/g3doc/_project.yaml b/tensorflow/lite/g3doc/_project.yaml similarity index 100% rename from tensorflow/contrib/lite/g3doc/_project.yaml rename to tensorflow/lite/g3doc/_project.yaml diff --git a/tensorflow/contrib/lite/g3doc/apis.md b/tensorflow/lite/g3doc/apis.md similarity index 99% rename from tensorflow/contrib/lite/g3doc/apis.md rename to tensorflow/lite/g3doc/apis.md index 69616c7b8a..e9fa24bff1 100644 --- a/tensorflow/contrib/lite/g3doc/apis.md +++ b/tensorflow/lite/g3doc/apis.md @@ -347,7 +347,7 @@ interpreter.runForMultipleInputsOutputs(inputs, map_of_indices_to_outputs); where each entry in `inputs` corresponds to an input tensor and `map_of_indices_to_outputs` maps indices of output tensors to the corresponding output data. In both cases the tensor indices should correspond to -the values given to the [TensorFlow Lite Optimized Converter](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/toco/g3doc/cmdline_examples.md) +the values given to the [TensorFlow Lite Optimized Converter](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/toco/g3doc/cmdline_examples.md) when the model was created. Be aware that the order of tensors in `input` must match the order given to the `TensorFlow Lite Optimized Converter`. diff --git a/tensorflow/contrib/lite/g3doc/convert/cmdline_examples.md b/tensorflow/lite/g3doc/convert/cmdline_examples.md similarity index 99% rename from tensorflow/contrib/lite/g3doc/convert/cmdline_examples.md rename to tensorflow/lite/g3doc/convert/cmdline_examples.md index 44fb4f19ae..341f7120fc 100644 --- a/tensorflow/contrib/lite/g3doc/convert/cmdline_examples.md +++ b/tensorflow/lite/g3doc/convert/cmdline_examples.md @@ -18,7 +18,7 @@ There are two approaches to running the converter in the command line. [clone the TensorFlow repository](https://www.tensorflow.org/install/source) and use `bazel`. * Example: `bazel run - //tensorflow/contrib/lite/python:tflite_convert -- + //tensorflow/lite/python:tflite_convert -- --output_file=...` ### Converting models prior to TensorFlow 1.9 diff --git a/tensorflow/contrib/lite/g3doc/convert/cmdline_reference.md b/tensorflow/lite/g3doc/convert/cmdline_reference.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/convert/cmdline_reference.md rename to tensorflow/lite/g3doc/convert/cmdline_reference.md diff --git a/tensorflow/contrib/lite/g3doc/convert/index.md b/tensorflow/lite/g3doc/convert/index.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/convert/index.md rename to tensorflow/lite/g3doc/convert/index.md diff --git a/tensorflow/contrib/lite/g3doc/convert/python_api.md b/tensorflow/lite/g3doc/convert/python_api.md similarity index 87% rename from tensorflow/contrib/lite/g3doc/convert/python_api.md rename to tensorflow/lite/g3doc/convert/python_api.md index 9dcb79187e..e859c12ad9 100644 --- a/tensorflow/contrib/lite/g3doc/convert/python_api.md +++ b/tensorflow/lite/g3doc/convert/python_api.md @@ -16,8 +16,8 @@ be targeted to devices with mobile. ## API The API for converting TensorFlow models to TensorFlow Lite as of TensorFlow 1.9 -is `tf.contrib.lite.TFLiteConverter`. The API for calling the Python intepreter -is `tf.contrib.lite.Interpreter`. +is `tf.lite.TFLiteConverter`. The API for calling the Python intepreter +is `tf.lite.Interpreter`. Note: Reference "Additional Instructions" sections for converting TensorFlow models to TensorFlow Lite @@ -52,7 +52,7 @@ out = tf.identity(val, name="out") with tf.Session() as sess: sess.run(tf.global_variables_initializer()) - converter = tf.contrib.lite.TFLiteConverter.from_session(sess, [img], [out]) + converter = tf.lite.TFLiteConverter.from_session(sess, [img], [out]) tflite_model = converter.convert() open("converted_model.tflite", "wb").write(tflite_model) ``` @@ -75,7 +75,7 @@ graph_def_file = "/path/to/Downloads/mobilenet_v1_1.0_224/frozen_graph.pb" input_arrays = ["input"] output_arrays = ["MobilenetV1/Predictions/Softmax"] -converter = tf.contrib.lite.TFLiteConverter.from_frozen_graph( +converter = tf.lite.TFLiteConverter.from_frozen_graph( graph_def_file, input_arrays, output_arrays) tflite_model = converter.convert() open("converted_model.tflite", "wb").write(tflite_model) @@ -89,7 +89,7 @@ FlatBuffer. ```python import tensorflow as tf -converter = tf.contrib.lite.TFLiteConverter.from_saved_model(saved_model_dir) +converter = tf.lite.TFLiteConverter.from_saved_model(saved_model_dir) tflite_model = converter.convert() open("converted_model.tflite", "wb").write(tflite_model) ``` @@ -97,7 +97,7 @@ open("converted_model.tflite", "wb").write(tflite_model) For more complex SavedModels, the optional parameters that can be passed into `TFLiteConverter.from_saved_model()` are `input_arrays`, `input_shapes`, `output_arrays`, `tag_set` and `signature_key`. Details of each parameter are -available by running `help(tf.contrib.lite.TFLiteConverter)`. +available by running `help(tf.lite.TFLiteConverter)`. ### Exporting a tf.keras File @@ -108,7 +108,7 @@ Lite FlatBuffer. This example requires ```python import tensorflow as tf -converter = tf.contrib.lite.TFLiteConverter.from_keras_model_file("keras_model.h5") +converter = tf.lite.TFLiteConverter.from_keras_model_file("keras_model.h5") tflite_model = converter.convert() open("converted_model.tflite", "wb").write(tflite_model) ``` @@ -140,7 +140,7 @@ keras_file = "keras_model.h5" tf.keras.models.save_model(model, keras_file) # Convert to TensorFlow Lite model. -converter = tf.contrib.lite.TFLiteConverter.from_keras_model_file(keras_file) +converter = tf.lite.TFLiteConverter.from_keras_model_file(keras_file) tflite_model = converter.convert() open("converted_model.tflite", "wb").write(tflite_model) ``` @@ -149,8 +149,8 @@ open("converted_model.tflite", "wb").write(tflite_model) For models where the default value of the attributes is not sufficient, the attribute's values should be set before calling `convert()`. In order to call -any constants use `tf.contrib.lite.constants.` as seen below with -`QUANTIZED_UINT8`. Run `help(tf.contrib.lite.TFLiteConverter)` in the Python +any constants use `tf.lite.constants.` as seen below with +`QUANTIZED_UINT8`. Run `help(tf.lite.TFLiteConverter)` in the Python terminal for detailed documentation on the attributes. Although the examples are demonstrated on GraphDefs containing only constants. @@ -170,8 +170,8 @@ val = img + const out = tf.fake_quant_with_min_max_args(val, min=0., max=1., name="output") with tf.Session() as sess: - converter = tf.contrib.lite.TFLiteConverter.from_session(sess, [img], [out]) - converter.inference_type = tf.contrib.lite.constants.QUANTIZED_UINT8 + converter = tf.lite.TFLiteConverter.from_session(sess, [img], [out]) + converter.inference_type = tf.lite.constants.QUANTIZED_UINT8 input_arrays = converter.get_input_arrays() converter.quantized_input_stats = {input_arrays[0] : (0., 1.)} # mean, std_dev tflite_model = converter.convert() @@ -185,7 +185,7 @@ with tf.Session() as sess: The following example shows how to use the TensorFlow Lite Python interpreter when provided a TensorFlow Lite FlatBuffer file. The example also demonstrates how to run inference on random input data. Run -`help(tf.contrib.lite.Interpreter)` in the Python terminal to get detailed +`help(tf.lite.Interpreter)` in the Python terminal to get detailed documentation on the interpreter. ```python @@ -193,7 +193,7 @@ import numpy as np import tensorflow as tf # Load TFLite model and allocate tensors. -interpreter = tf.contrib.lite.Interpreter(model_path="converted_model.tflite") +interpreter = tf.lite.Interpreter(model_path="converted_model.tflite") interpreter.allocate_tensors() # Get input and output tensors. @@ -227,11 +227,11 @@ val = img + const out = tf.identity(val, name="out") with tf.Session() as sess: - converter = tf.contrib.lite.TFLiteConverter.from_session(sess, [img], [out]) + converter = tf.lite.TFLiteConverter.from_session(sess, [img], [out]) tflite_model = converter.convert() # Load TFLite model and allocate tensors. -interpreter = tf.contrib.lite.Interpreter(model_content=tflite_model) +interpreter = tf.lite.Interpreter(model_content=tflite_model) interpreter.allocate_tensors() ``` @@ -254,5 +254,5 @@ identically to `TFLiteConverter`. ### Converting models prior to TensorFlow 1.9 To convert TensorFlow models to TensorFlow Lite in TensorFlow 1.7 and TensorFlow -1.8, use the `toco_convert` function. Run `help(tf.contrib.lite.toco_convert)` +1.8, use the `toco_convert` function. Run `help(tf.lite.toco_convert)` to get details about accepted parameters. diff --git a/tensorflow/contrib/lite/g3doc/custom_operators.md b/tensorflow/lite/g3doc/custom_operators.md similarity index 98% rename from tensorflow/contrib/lite/g3doc/custom_operators.md rename to tensorflow/lite/g3doc/custom_operators.md index ee6150b60e..4a22d6a675 100644 --- a/tensorflow/contrib/lite/g3doc/custom_operators.md +++ b/tensorflow/lite/g3doc/custom_operators.md @@ -103,7 +103,7 @@ operations instead of a single operator. pre-allocating the memory using temporary tensors. You may need to use OpData struct to reference the tensor indices in other functions. See example in the - [kernel for convolution](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/kernels/conv.cc). + [kernel for convolution](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/kernels/conv.cc). A sample code snippet is below ``` @@ -164,7 +164,7 @@ for node in frozen_graph_def.node: tf.TensorShape([10]), ]) node.attr['_output_quantized'].b = False -tflite_model = tf.contrib.lite.toco_convert( +tflite_model = tf.lite.toco_convert( frozen_graph_def,...) ``` diff --git a/tensorflow/contrib/lite/g3doc/demo_android.md b/tensorflow/lite/g3doc/demo_android.md similarity index 90% rename from tensorflow/contrib/lite/g3doc/demo_android.md rename to tensorflow/lite/g3doc/demo_android.md index c38b928684..772598d5cf 100644 --- a/tensorflow/contrib/lite/g3doc/demo_android.md +++ b/tensorflow/lite/g3doc/demo_android.md @@ -2,7 +2,7 @@ # Android Demo App An example Android application using TensorFLow Lite is available -[on GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/java/demo). +[on GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/java/demo). The demo is a sample camera app that classifies images continuously using either a quantized Mobilenet model or a floating point Inception-v3 model. To run the demo, a device running Android 5.0 ( API 21) or higher is required. @@ -41,23 +41,23 @@ app: [Android Studio](https://developer.android.com/studio/index.html). * Make sure the Android SDK version is greater than 26 and NDK version is greater than 14 (in the Android Studio settings). -* Import the `tensorflow/contrib/lite/java/demo` directory as a new +* Import the `tensorflow/lite/java/demo` directory as a new Android Studio project. * Install all the Gradle extensions it requests. Now you can build and run the demo app. -The build process downloads the quantized [Mobilenet TensorFlow Lite model](https://storage.googleapis.com/download.tensorflow.org/models/tflite/mobilenet_v1_224_android_quant_2017_11_08.zip), and unzips it into the assets directory: `tensorflow/contrib/lite/java/demo/app/src/main/assets/`. +The build process downloads the quantized [Mobilenet TensorFlow Lite model](https://storage.googleapis.com/download.tensorflow.org/models/tflite/mobilenet_v1_224_android_quant_2017_11_08.zip), and unzips it into the assets directory: `tensorflow/lite/java/demo/app/src/main/assets/`. Some additional details are available on the -[TF Lite Android App page](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/java/demo/README.md). +[TF Lite Android App page](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/java/demo/README.md). ### Using other models To use a different model: * Download the floating point [Inception-v3 model](https://storage.googleapis.com/download.tensorflow.org/models/tflite/inception_v3_slim_2016_android_2017_11_10.zip). * Unzip and copy `inceptionv3_non_slim_2015.tflite` to the assets directory. -* Change the chosen classifier in [Camera2BasicFragment.java](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/Camera2BasicFragment.java)
+* Change the chosen classifier in [Camera2BasicFragment.java](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/Camera2BasicFragment.java)
from: `classifier = new ImageClassifierQuantizedMobileNet(getActivity());`
to: `classifier = new ImageClassifierFloatInception(getActivity());`. @@ -114,14 +114,14 @@ android_ndk_repository( ``` Some additional details are available on the -[TF Lite Android App page](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/java/demo/README.md). +[TF Lite Android App page](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/java/demo/README.md). ### Build the source code To build the demo app, run `bazel`: ``` -bazel build --cxxopt=--std=c++11 //tensorflow/contrib/lite/java/demo/app/src/main:TfLiteCameraDemo +bazel build --cxxopt=--std=c++11 //tensorflow/lite/java/demo/app/src/main:TfLiteCameraDemo ``` Caution: Because of an bazel bug, we only support building the Android demo app diff --git a/tensorflow/contrib/lite/g3doc/demo_ios.md b/tensorflow/lite/g3doc/demo_ios.md similarity index 95% rename from tensorflow/contrib/lite/g3doc/demo_ios.md rename to tensorflow/lite/g3doc/demo_ios.md index 7579ad84a0..fbf1dd6392 100644 --- a/tensorflow/contrib/lite/g3doc/demo_ios.md +++ b/tensorflow/lite/g3doc/demo_ios.md @@ -38,11 +38,11 @@ instructions walk you through building and running the demo on an iOS device. 2. Download the model files used by the demo app (this is done from inside the cloned directory): - sh tensorflow/contrib/lite/examples/ios/download_models.sh + sh tensorflow/lite/examples/ios/download_models.sh 3. Install the pod to generate the workspace file: - cd tensorflow/contrib/lite/examples/ios/camera + cd tensorflow/lite/examples/ios/camera pod install If you have installed this pod before and that command doesn't work, try diff --git a/tensorflow/contrib/lite/g3doc/devguide.md b/tensorflow/lite/g3doc/devguide.md similarity index 93% rename from tensorflow/contrib/lite/g3doc/devguide.md rename to tensorflow/lite/g3doc/devguide.md index 0eed516000..270cb8ce37 100644 --- a/tensorflow/contrib/lite/g3doc/devguide.md +++ b/tensorflow/lite/g3doc/devguide.md @@ -35,7 +35,7 @@ by suggesting contextually relevant messages. The model is built specifically fo memory constrained devices, such as watches and phones, and has been successfully used in Smart Replies on Android Wear. Currently, this model is Android-specific. -These pre-trained models are [available for download](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/g3doc/models.md) +These pre-trained models are [available for download](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/g3doc/models.md) ### Re-train Inception-V3 or MobileNet for a custom data set @@ -63,7 +63,7 @@ framework. See to create .pb file for the custom model. TensorFlow Lite currently supports a subset of TensorFlow operators. Refer to the -[TensorFlow Lite & TensorFlow Compatibility Guide](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/g3doc/tf_ops_compatibility.md) +[TensorFlow Lite & TensorFlow Compatibility Guide](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/g3doc/tf_ops_compatibility.md) for supported operators and their usage. This set of operators will continue to grow in future Tensorflow Lite releases. @@ -151,7 +151,7 @@ inference in the `freeze_graph` step. It is also possible to use the Tensorflow Optimizing Converter with protobufs from either Python or from the command line (see the -[toco_from_protos.py](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/toco/python/toco_from_protos.py) +[toco_from_protos.py](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/toco/python/toco_from_protos.py) example). This allows you to integrate the conversion step into the model design workflow, ensuring the model is easily convertible to a mobile inference graph. For example: @@ -164,25 +164,25 @@ val = img + tf.constant([1., 2., 3.]) + tf.constant([1., 4., 4.]) out = tf.identity(val, name="out") with tf.Session() as sess: - tflite_model = tf.contrib.lite.toco_convert(sess.graph_def, [img], [out]) + tflite_model = tf.lite.toco_convert(sess.graph_def, [img], [out]) open("converteds_model.tflite", "wb").write(tflite_model) ``` For usage, see the Tensorflow Optimizing Converter -[command-line examples](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/toco/g3doc/cmdline_examples.md). +[command-line examples](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/toco/g3doc/cmdline_examples.md). Refer to the -[Ops compatibility guide](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/g3doc/tf_ops_compatibility.md) +[Ops compatibility guide](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/g3doc/tf_ops_compatibility.md) for troubleshooting help, and if that doesn't help, please [file an issue](https://github.com/tensorflow/tensorflow/issues). The [development repo](https://github.com/tensorflow/tensorflow) contains a tool to visualize TensorFlow Lite models after conversion. To build the -[visualize.py](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/tools/visualize.py) +[visualize.py](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/tools/visualize.py) tool: ```sh -bazel run tensorflow/contrib/lite/tools:visualize -- model.tflite model_viz.html +bazel run tensorflow/lite/tools:visualize -- model.tflite model_viz.html ``` This generates an interactive HTML page listing subgraphs, operations, and a @@ -201,7 +201,7 @@ provides the ability to load a graph, set up inputs, and run the model to calculate outputs. The open source Android demo app uses the JNI interface and is available -[on GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/java/demo/app). +[on GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/java/demo/app). You can also download a [prebuilt APK](http://download.tensorflow.org/deps/tflite/TfLiteCameraDemo.apk). See the Android demo guide for details. @@ -212,7 +212,7 @@ installing TensorFlow on Android and setting up `bazel` and Android Studio. ### iOS To integrate a TensorFlow model in an iOS app, see the -[TensorFlow Lite for iOS](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/g3doc/ios.md) +[TensorFlow Lite for iOS](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/g3doc/ios.md) guide and iOS demo guide. #### Core ML support @@ -227,6 +227,6 @@ devices. To use the converter, refer to the ### Raspberry Pi Compile Tensorflow Lite for a Raspberry Pi by following the -[RPi build instructions](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/g3doc/rpi.md) +[RPi build instructions](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/g3doc/rpi.md) This compiles a static library file (`.a`) used to build your app. There are plans for Python bindings and a demo app. diff --git a/tensorflow/contrib/lite/g3doc/images/convert/sample_after.png b/tensorflow/lite/g3doc/images/convert/sample_after.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/convert/sample_after.png rename to tensorflow/lite/g3doc/images/convert/sample_after.png diff --git a/tensorflow/contrib/lite/g3doc/images/convert/sample_before.png b/tensorflow/lite/g3doc/images/convert/sample_before.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/convert/sample_before.png rename to tensorflow/lite/g3doc/images/convert/sample_before.png diff --git a/tensorflow/contrib/lite/g3doc/images/convert/workflow.svg b/tensorflow/lite/g3doc/images/convert/workflow.svg similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/convert/workflow.svg rename to tensorflow/lite/g3doc/images/convert/workflow.svg diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/assistant_logo.png b/tensorflow/lite/g3doc/images/landing-page/assistant_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/assistant_logo.png rename to tensorflow/lite/g3doc/images/landing-page/assistant_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/detect_crop_disease_in_africa.png b/tensorflow/lite/g3doc/images/landing-page/detect_crop_disease_in_africa.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/detect_crop_disease_in_africa.png rename to tensorflow/lite/g3doc/images/landing-page/detect_crop_disease_in_africa.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/fishbrain_logo.png b/tensorflow/lite/g3doc/images/landing-page/fishbrain_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/fishbrain_logo.png rename to tensorflow/lite/g3doc/images/landing-page/fishbrain_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/fishbrain_logo_big.png b/tensorflow/lite/g3doc/images/landing-page/fishbrain_logo_big.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/fishbrain_logo_big.png rename to tensorflow/lite/g3doc/images/landing-page/fishbrain_logo_big.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/gboard_logo.png b/tensorflow/lite/g3doc/images/landing-page/gboard_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/gboard_logo.png rename to tensorflow/lite/g3doc/images/landing-page/gboard_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/gmail_logo.png b/tensorflow/lite/g3doc/images/landing-page/gmail_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/gmail_logo.png rename to tensorflow/lite/g3doc/images/landing-page/gmail_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/loseit_logo.png b/tensorflow/lite/g3doc/images/landing-page/loseit_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/loseit_logo.png rename to tensorflow/lite/g3doc/images/landing-page/loseit_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/loseit_logo_big.png b/tensorflow/lite/g3doc/images/landing-page/loseit_logo_big.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/loseit_logo_big.png rename to tensorflow/lite/g3doc/images/landing-page/loseit_logo_big.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/nest_logo.png b/tensorflow/lite/g3doc/images/landing-page/nest_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/nest_logo.png rename to tensorflow/lite/g3doc/images/landing-page/nest_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/photos_logo.png b/tensorflow/lite/g3doc/images/landing-page/photos_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/photos_logo.png rename to tensorflow/lite/g3doc/images/landing-page/photos_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/shazam_logo.png b/tensorflow/lite/g3doc/images/landing-page/shazam_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/shazam_logo.png rename to tensorflow/lite/g3doc/images/landing-page/shazam_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/landing-page/vsco_logo.png b/tensorflow/lite/g3doc/images/landing-page/vsco_logo.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/landing-page/vsco_logo.png rename to tensorflow/lite/g3doc/images/landing-page/vsco_logo.png diff --git a/tensorflow/contrib/lite/g3doc/images/performance/model_size_vs_accuracy.png b/tensorflow/lite/g3doc/images/performance/model_size_vs_accuracy.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/performance/model_size_vs_accuracy.png rename to tensorflow/lite/g3doc/images/performance/model_size_vs_accuracy.png diff --git a/tensorflow/contrib/lite/g3doc/images/performance/model_size_vs_latency.png b/tensorflow/lite/g3doc/images/performance/model_size_vs_latency.png similarity index 100% rename from tensorflow/contrib/lite/g3doc/images/performance/model_size_vs_latency.png rename to tensorflow/lite/g3doc/images/performance/model_size_vs_latency.png diff --git a/tensorflow/contrib/lite/g3doc/ios.md b/tensorflow/lite/g3doc/ios.md similarity index 78% rename from tensorflow/contrib/lite/g3doc/ios.md rename to tensorflow/lite/g3doc/ios.md index 3b9fcca811..c195b6abf4 100644 --- a/tensorflow/contrib/lite/g3doc/ios.md +++ b/tensorflow/lite/g3doc/ios.md @@ -41,24 +41,24 @@ brew link libtool Then you need to run a shell script to download the dependencies you need: ```bash -tensorflow/contrib/lite/tools/make/download_dependencies.sh +tensorflow/lite/tools/make/download_dependencies.sh ``` This will fetch copies of libraries and data from the web and install them in -`tensorflow/contrib/lite/downloads`. +`tensorflow/lite/downloads`. With all of the dependencies set up, you can now build the library for all five supported architectures on iOS: ```bash -tensorflow/contrib/lite/tools/make/build_ios_universal_lib.sh +tensorflow/lite/tools/make/build_ios_universal_lib.sh ``` -Under the hood this uses a makefile in `tensorflow/contrib/lite` to build the +Under the hood this uses a makefile in `tensorflow/lite` to build the different versions of the library, followed by a call to `lipo` to bundle them into a universal file containing armv7, armv7s, arm64, i386, and x86_64 architectures. The resulting library is in -`tensorflow/contrib/lite/tools/make/gen/lib/libtensorflow-lite.a`. +`tensorflow/lite/tools/make/gen/lib/libtensorflow-lite.a`. If you get an error such as `no such file or directory: 'x86_64'` when running `build_ios_universal_lib.sh`: open Xcode > Preferences > Locations, and ensure @@ -68,19 +68,19 @@ a value is selected in the "Command Line Tools" dropdown. You'll need to update various settings in your app to link against TensorFlow Lite. You can view them in the example project at -`tensorflow/contrib/lite/examples/ios/simple/simple.xcodeproj` but here's a full +`tensorflow/lite/examples/ios/simple/simple.xcodeproj` but here's a full rundown: - You'll need to add the library at - `tensorflow/contrib/lite/gen/lib/libtensorflow-lite.a` to your linking build - stage, and in Search Paths add `tensorflow/contrib/lite/gen/lib` to the + `tensorflow/lite/gen/lib/libtensorflow-lite.a` to your linking build + stage, and in Search Paths add `tensorflow/lite/gen/lib` to the Library Search Paths setting. - The _Header Search_ paths needs to contain: - the root folder of tensorflow, - - `tensorflow/contrib/lite/downloads` - - `tensorflow/contrib/lite/downloads/flatbuffers/include` + - `tensorflow/lite/downloads` + - `tensorflow/lite/downloads/flatbuffers/include` - C++11 support (or later) should be enabled by setting `C++ Language Dialect` to `GNU++11` (or `GNU++14`), and `C++ Standard Library` to `libc++`. diff --git a/tensorflow/contrib/lite/g3doc/models.md b/tensorflow/lite/g3doc/models.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/models.md rename to tensorflow/lite/g3doc/models.md diff --git a/tensorflow/contrib/lite/g3doc/ops_versioning.md b/tensorflow/lite/g3doc/ops_versioning.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/ops_versioning.md rename to tensorflow/lite/g3doc/ops_versioning.md diff --git a/tensorflow/contrib/lite/g3doc/overview.md b/tensorflow/lite/g3doc/overview.md similarity index 97% rename from tensorflow/contrib/lite/g3doc/overview.md rename to tensorflow/lite/g3doc/overview.md index 9d035a6921..2d747a9b59 100644 --- a/tensorflow/contrib/lite/g3doc/overview.md +++ b/tensorflow/lite/g3doc/overview.md @@ -12,7 +12,7 @@ optimizing the kernels for mobile apps, pre-fused activations, and quantized kernels that allow smaller and faster (fixed-point math) models. Most of our TensorFlow Lite documentation is [on -GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite) +GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite) for the time being. ## What does TensorFlow Lite contain? @@ -118,7 +118,7 @@ TensorFlow Lite provides: to all first-party and third-party apps. Also see the complete list of - [TensorFlow Lite's supported models](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/g3doc/models.md), + [TensorFlow Lite's supported models](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/g3doc/models.md), including the model sizes, performance numbers, and downloadable model files. - Quantized versions of the MobileNet model, which runs faster than the @@ -136,7 +136,7 @@ We recommend you try out TensorFlow Lite with the pre-tested models indicated above. If you have an existing model, you will need to test whether your model is compatible with both the converter and the supported operator set. To test your model, see the -[documentation on GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite). +[documentation on GitHub](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite). ### Retrain Inception-V3 or MobileNet for a custom data set @@ -198,5 +198,5 @@ possible performance for a particular model on a particular device. ## Next Steps -The TensorFlow Lite [GitHub repository](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite). +The TensorFlow Lite [GitHub repository](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite). contains additional docs, code samples, and demo applications. diff --git a/tensorflow/contrib/lite/g3doc/performance/benchmarks.md b/tensorflow/lite/g3doc/performance/benchmarks.md similarity index 93% rename from tensorflow/contrib/lite/g3doc/performance/benchmarks.md rename to tensorflow/lite/g3doc/performance/benchmarks.md index 28cb6aba6e..5a1e5586be 100644 --- a/tensorflow/contrib/lite/g3doc/performance/benchmarks.md +++ b/tensorflow/lite/g3doc/performance/benchmarks.md @@ -5,17 +5,17 @@ This document lists TensorFlow Lite performance benchmarks when running well known models on some Android and iOS devices. These performance benchmark numbers were generated with the -[Android TFLite benchmark binary](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark) -and the [iOS benchmark app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark/ios). +[Android TFLite benchmark binary](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark) +and the [iOS benchmark app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark/ios). # Android performance benchmarks For Android benchmarks, the CPU affinity is set to use big cores on the device to -reduce variance (see [details](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark#reducing-variance-between-runs-on-android)). +reduce variance (see [details](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark#reducing-variance-between-runs-on-android)). It assumes that models were download and unzipped to the `/data/local/tmp/tflite_models` directory. The benchmark binary is built -using [these instructions](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark#on-android) +using [these instructions](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark#on-android) and assumed in the `/data/local/tmp` directory. To run the benchmark: @@ -117,7 +117,7 @@ Pixel xl | 0c | # iOS benchmarks To run iOS benchmarks, the [benchmark -app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark/ios) +app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark/ios) was modified to include the appropriate model and `benchmark_params.json` was modified to set `num_threads` to 1. diff --git a/tensorflow/contrib/lite/g3doc/performance/best_practices.md b/tensorflow/lite/g3doc/performance/best_practices.md similarity index 84% rename from tensorflow/contrib/lite/g3doc/performance/best_practices.md rename to tensorflow/lite/g3doc/performance/best_practices.md index 180e51e5f6..b76414cebe 100644 --- a/tensorflow/contrib/lite/g3doc/performance/best_practices.md +++ b/tensorflow/lite/g3doc/performance/best_practices.md @@ -18,7 +18,7 @@ You can retrain the listed models on your own dataset by using transfer learning ## Profile your model -Once you have selected a candidate model that is right for your task, it is a good practice to profile and benchmark your model. Tensorflow Lite [benchmarking tool](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark) has a built-in profiler that shows per operator profiling statistics. This can help in understanding performance bottlenecks and which operators dominate the computation time. +Once you have selected a candidate model that is right for your task, it is a good practice to profile and benchmark your model. Tensorflow Lite [benchmarking tool](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark) has a built-in profiler that shows per operator profiling statistics. This can help in understanding performance bottlenecks and which operators dominate the computation time. ## Profile and optimize operators in the graph If a particular operator appears frequently in the model and based on profiling you find the operator consuming the most amount of time, you can look into optimizing the operator. @@ -28,17 +28,17 @@ If a particular operator appears frequently in the model and based on profiling If your model uses floating point weights or activations then it may be possible to reduce the size of model up to ~4x by using quantization and other model optimizations. Check out our [model optimization toolkit](model_optimization.md) for details about optimizing your model. ## Tweak the number of threads -Tensorflow Lite supports multi-threaded kernels for many operators. You can increase the number of threads and speed up execution of operators. Increasing the number of threads will however make your model use more resources and power. For some applications latency may be more important than energy efficiency. You can increase the number of threads by setting the number of [interpreter](https://github.com/tensorflow/tensorflow/blob/1084594657a5d139102ac794f84d1427a710e39a/tensorflow/contrib/lite/interpreter.h#L337) threads. Multi-threaded execution however comes at the cost of increased performance variability depending on what else is been executed concurrently. This is particularly the case for mobile apps. For example, isolated tests may show 2x speed up vs single-threaded but if another app is executing at the same time may result in worst performance than single-threaded. +Tensorflow Lite supports multi-threaded kernels for many operators. You can increase the number of threads and speed up execution of operators. Increasing the number of threads will however make your model use more resources and power. For some applications latency may be more important than energy efficiency. You can increase the number of threads by setting the number of [interpreter](https://github.com/tensorflow/tensorflow/blob/1084594657a5d139102ac794f84d1427a710e39a/tensorflow/lite/interpreter.h#L337) threads. Multi-threaded execution however comes at the cost of increased performance variability depending on what else is been executed concurrently. This is particularly the case for mobile apps. For example, isolated tests may show 2x speed up vs single-threaded but if another app is executing at the same time may result in worst performance than single-threaded. ## Eliminate redundant copies -If your application is not careful, there can be redundant copies when feeding the input to the model and reading output from the model. Make sure to eliminate redundant copies. If you are using higher level APIs like Java API, make sure to carefully check the documentation for performance caveats. For example, the Java API is a lot faster if ByteBuffers are used as [inputs](https://github.com/tensorflow/tensorflow/blob/6305a6d83552ba6a472cd72398b60d9241467f1f/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/Interpreter.java#L151). +If your application is not careful, there can be redundant copies when feeding the input to the model and reading output from the model. Make sure to eliminate redundant copies. If you are using higher level APIs like Java API, make sure to carefully check the documentation for performance caveats. For example, the Java API is a lot faster if ByteBuffers are used as [inputs](https://github.com/tensorflow/tensorflow/blob/6305a6d83552ba6a472cd72398b60d9241467f1f/tensorflow/lite/java/src/main/java/org/tensorflow/lite/Interpreter.java#L151). ## Profile your application with platform specific tools Platform specific tools like [Android profiler](https://developer.android.com/studio/profile/android-profiler) and [Instruments](https://help.apple.com/instruments/mac/current/) provide a wealth of profiling information that can be used to debug your app. Sometimes the performance bug may be not in the model but in parts of application code that interact with the model. Make sure to familiarize yourself with platform specific profiling tools and best practices for your platform. ## Evaluate whether your model benefits from using hardware accelerators available on the device Tensorflow Lite is working on adding support for accelerators like GPU and provides acceleration through [Neural Networks API](https://developer.android.com/ndk/guides/neuralnetworks/) on Android. -You can utilize these hardware accelerator backends to improve the speed and efficiency of your model. To enable Neural Networks API call [UseNNAPI](https://github.com/tensorflow/tensorflow/blob/6305a6d83552ba6a472cd72398b60d9241467f1f/tensorflow/contrib/lite/interpreter.h#L334) on the interpreter instance. +You can utilize these hardware accelerator backends to improve the speed and efficiency of your model. To enable Neural Networks API call [UseNNAPI](https://github.com/tensorflow/tensorflow/blob/6305a6d83552ba6a472cd72398b60d9241467f1f/tensorflow/lite/interpreter.h#L334) on the interpreter instance. ## Need more help The Tensorflow team is happy to help diagnose and address specific performance issues you may be facing. Please file an issue on [GitHub](https://github.com/tensorflow/tensorflow/issues) with details of the issue. diff --git a/tensorflow/contrib/lite/g3doc/performance/model_optimization.md b/tensorflow/lite/g3doc/performance/model_optimization.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/performance/model_optimization.md rename to tensorflow/lite/g3doc/performance/model_optimization.md diff --git a/tensorflow/contrib/lite/g3doc/performance/post_training_quantization.md b/tensorflow/lite/g3doc/performance/post_training_quantization.md similarity index 91% rename from tensorflow/contrib/lite/g3doc/performance/post_training_quantization.md rename to tensorflow/lite/g3doc/performance/post_training_quantization.md index d95cab94aa..cf4d70b2de 100644 --- a/tensorflow/contrib/lite/g3doc/performance/post_training_quantization.md +++ b/tensorflow/lite/g3doc/performance/post_training_quantization.md @@ -7,7 +7,7 @@ is enabled as an option in [TensorFlow Lite model converter](../convert): ``` import tensorflow as tf -converter = tf.contrib.lite.TocoConverter.from_saved_model(saved_model_dir) +converter = tf.lite.TocoConverter.from_saved_model(saved_model_dir) converter.post_training_quantize = True tflite_quantized_model = converter.convert() open("quantized_model.tflite", "wb").write(tflite_quantized_model) @@ -33,8 +33,8 @@ Hybrid ops are available for the most compute-intensive operators in a network: Since weights are quantized post-training, there could be an accuracy loss, particularly for smaller networks. Pre-trained fully quantized models are provided for specific networks in -the [TensorFlow Lite model repository](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/g3doc/models.md#image-classification-quantized-models){:.external}. It is important to check the accuracy of the quantized model to verify that any degradation -in accuracy is within acceptable limits. There is a tool to evaluate [TensorFlow Lite model accuracy](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/tools/accuracy/README.md){:.external}. +the [TensorFlow Lite model repository](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/g3doc/models.md#image-classification-quantized-models){:.external}. It is important to check the accuracy of the quantized model to verify that any degradation +in accuracy is within acceptable limits. There is a tool to evaluate [TensorFlow Lite model accuracy](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/tools/accuracy/README.md){:.external}. If the accuracy drop is too high, consider using [quantization aware training](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/quantize/README.md){:.external}. diff --git a/tensorflow/contrib/lite/g3doc/rpi.md b/tensorflow/lite/g3doc/rpi.md similarity index 78% rename from tensorflow/contrib/lite/g3doc/rpi.md rename to tensorflow/lite/g3doc/rpi.md index 41a1892b6f..708d9e328c 100644 --- a/tensorflow/contrib/lite/g3doc/rpi.md +++ b/tensorflow/lite/g3doc/rpi.md @@ -23,18 +23,18 @@ Clone this Tensorflow repository, Run this script at the root of the repository > The Tensorflow repository is in `/tensorflow` if you are using `tensorflow/tensorflow:nightly-devel` docker image, just try it. ```bash -./tensorflow/contrib/lite/tools/make/download_dependencies.sh +./tensorflow/lite/tools/make/download_dependencies.sh ``` Note that you only need to do this once. You should then be able to compile: ```bash -./tensorflow/contrib/lite/tools/make/build_rpi_lib.sh +./tensorflow/lite/tools/make/build_rpi_lib.sh ``` This should compile a static library in: -`tensorflow/contrib/lite/gen/lib/rpi_armv7/libtensorflow-lite.a`. +`tensorflow/lite/gen/lib/rpi_armv7/libtensorflow-lite.a`. ## Native compiling This has been tested on Raspberry Pi 3b, Raspbian GNU/Linux 9.1 (stretch), gcc version 6.3.0 20170516 (Raspbian 6.3.0-18+rpi1). @@ -48,14 +48,14 @@ sudo apt-get install build-essential First, clone the TensorFlow repository. Run this at the root of the repository: ```bash -./tensorflow/contrib/lite/tools/make/download_dependencies.sh +./tensorflow/lite/tools/make/download_dependencies.sh ``` Note that you only need to do this once. You should then be able to compile: ```bash -./tensorflow/contrib/lite/tools/make/build_rpi_lib.sh +./tensorflow/lite/tools/make/build_rpi_lib.sh ``` This should compile a static library in: -`tensorflow/contrib/lite/tools/make/gen/lib/rpi_armv7/libtensorflow-lite.a`. +`tensorflow/lite/tools/make/gen/lib/rpi_armv7/libtensorflow-lite.a`. diff --git a/tensorflow/contrib/lite/g3doc/tf_ops_compatibility.md b/tensorflow/lite/g3doc/tf_ops_compatibility.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/tf_ops_compatibility.md rename to tensorflow/lite/g3doc/tf_ops_compatibility.md diff --git a/tensorflow/contrib/lite/g3doc/tfmobile/android_build.md b/tensorflow/lite/g3doc/tfmobile/android_build.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/tfmobile/android_build.md rename to tensorflow/lite/g3doc/tfmobile/android_build.md diff --git a/tensorflow/contrib/lite/g3doc/tfmobile/index.md b/tensorflow/lite/g3doc/tfmobile/index.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/tfmobile/index.md rename to tensorflow/lite/g3doc/tfmobile/index.md diff --git a/tensorflow/contrib/lite/g3doc/tfmobile/ios_build.md b/tensorflow/lite/g3doc/tfmobile/ios_build.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/tfmobile/ios_build.md rename to tensorflow/lite/g3doc/tfmobile/ios_build.md diff --git a/tensorflow/contrib/lite/g3doc/tfmobile/linking_libs.md b/tensorflow/lite/g3doc/tfmobile/linking_libs.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/tfmobile/linking_libs.md rename to tensorflow/lite/g3doc/tfmobile/linking_libs.md diff --git a/tensorflow/contrib/lite/g3doc/tfmobile/optimizing.md b/tensorflow/lite/g3doc/tfmobile/optimizing.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/tfmobile/optimizing.md rename to tensorflow/lite/g3doc/tfmobile/optimizing.md diff --git a/tensorflow/contrib/lite/g3doc/tfmobile/prepare_models.md b/tensorflow/lite/g3doc/tfmobile/prepare_models.md similarity index 100% rename from tensorflow/contrib/lite/g3doc/tfmobile/prepare_models.md rename to tensorflow/lite/g3doc/tfmobile/prepare_models.md diff --git a/tensorflow/contrib/lite/graph_info.cc b/tensorflow/lite/graph_info.cc similarity index 99% rename from tensorflow/contrib/lite/graph_info.cc rename to tensorflow/lite/graph_info.cc index e60ed2c246..cdbe66a3a4 100644 --- a/tensorflow/contrib/lite/graph_info.cc +++ b/tensorflow/lite/graph_info.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/contrib/lite/graph_info.h" +#include "tensorflow/lite/graph_info.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/graph_info.h b/tensorflow/lite/graph_info.h similarity index 93% rename from tensorflow/contrib/lite/graph_info.h rename to tensorflow/lite/graph_info.h index 8ee83827bb..ff7ce669ac 100644 --- a/tensorflow/contrib/lite/graph_info.h +++ b/tensorflow/lite/graph_info.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_CONTRIB_LITE_GRAPH_INFO_H_ -#define TENSORFLOW_CONTRIB_LITE_GRAPH_INFO_H_ +#ifndef TENSORFLOW_LITE_GRAPH_INFO_H_ +#define TENSORFLOW_LITE_GRAPH_INFO_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { @@ -79,4 +79,4 @@ TfLiteStatus PartitionGraphIntoIndependentSubgraphs( } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_GRAPH_INFO_H_ +#endif // TENSORFLOW_LITE_GRAPH_INFO_H_ diff --git a/tensorflow/contrib/lite/graph_info_test.cc b/tensorflow/lite/graph_info_test.cc similarity index 99% rename from tensorflow/contrib/lite/graph_info_test.cc rename to tensorflow/lite/graph_info_test.cc index 89a8f36b41..5ecc3774e1 100644 --- a/tensorflow/contrib/lite/graph_info_test.cc +++ b/tensorflow/lite/graph_info_test.cc @@ -16,8 +16,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/graph_info.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/graph_info.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/interpreter.cc b/tensorflow/lite/interpreter.cc similarity index 98% rename from tensorflow/contrib/lite/interpreter.cc rename to tensorflow/lite/interpreter.cc index c72e7bf33e..9d5d2772be 100644 --- a/tensorflow/contrib/lite/interpreter.cc +++ b/tensorflow/lite/interpreter.cc @@ -13,23 +13,23 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/interpreter.h" +#include "tensorflow/lite/interpreter.h" #include #include #include #include -#include "tensorflow/contrib/lite/arena_planner.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/context_util.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/graph_info.h" -#include "tensorflow/contrib/lite/memory_planner.h" -#include "tensorflow/contrib/lite/nnapi_delegate.h" -#include "tensorflow/contrib/lite/profiling/profiler.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/util.h" +#include "tensorflow/lite/arena_planner.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/context_util.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/graph_info.h" +#include "tensorflow/lite/memory_planner.h" +#include "tensorflow/lite/nnapi_delegate.h" +#include "tensorflow/lite/profiling/profiler.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/interpreter.h b/tensorflow/lite/interpreter.h similarity index 98% rename from tensorflow/contrib/lite/interpreter.h rename to tensorflow/lite/interpreter.h index cbd042fa92..6bb47726c0 100644 --- a/tensorflow/contrib/lite/interpreter.h +++ b/tensorflow/lite/interpreter.h @@ -14,20 +14,20 @@ limitations under the License. ==============================================================================*/ // Main abstraction controlling the tflite interpreter. // See context.h for the API for defining operations (TfLiteRegistration). -#ifndef TENSORFLOW_CONTRIB_LITE_INTERPRETER_H_ -#define TENSORFLOW_CONTRIB_LITE_INTERPRETER_H_ +#ifndef TENSORFLOW_LITE_INTERPRETER_H_ +#define TENSORFLOW_LITE_INTERPRETER_H_ #include #include #include #include -#include "tensorflow/contrib/lite/allocation.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/memory_planner.h" -#include "tensorflow/contrib/lite/profiling/profiler.h" -#include "tensorflow/contrib/lite/stderr_reporter.h" +#include "tensorflow/lite/allocation.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/memory_planner.h" +#include "tensorflow/lite/profiling/profiler.h" +#include "tensorflow/lite/stderr_reporter.h" namespace tflite { @@ -692,4 +692,4 @@ class Interpreter { }; } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_INTERPRETER_H_ +#endif // TENSORFLOW_LITE_INTERPRETER_H_ diff --git a/tensorflow/contrib/lite/interpreter_test.cc b/tensorflow/lite/interpreter_test.cc similarity index 99% rename from tensorflow/contrib/lite/interpreter_test.cc rename to tensorflow/lite/interpreter_test.cc index 6c71d5a8d7..a37603b695 100644 --- a/tensorflow/contrib/lite/interpreter_test.cc +++ b/tensorflow/lite/interpreter_test.cc @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/interpreter.h" +#include "tensorflow/lite/interpreter.h" #include -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { diff --git a/tensorflow/contrib/lite/java/AndroidManifest.xml b/tensorflow/lite/java/AndroidManifest.xml similarity index 100% rename from tensorflow/contrib/lite/java/AndroidManifest.xml rename to tensorflow/lite/java/AndroidManifest.xml diff --git a/tensorflow/contrib/lite/java/BUILD b/tensorflow/lite/java/BUILD similarity index 88% rename from tensorflow/contrib/lite/java/BUILD rename to tensorflow/lite/java/BUILD index c34f6ccfa0..e6f47a9773 100644 --- a/tensorflow/contrib/lite/java/BUILD +++ b/tensorflow/lite/java/BUILD @@ -2,14 +2,14 @@ # TensorFlow Lite Java API. package(default_visibility = [ - "//tensorflow/contrib/lite/java/ovic:__pkg__", + "//tensorflow/lite/java/ovic:__pkg__", ]) licenses(["notice"]) # Apache 2.0 load("//tensorflow/java:build_defs.bzl", "JAVACOPTS") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_jni_binary") -load("//tensorflow/contrib/lite/java:aar_with_jni.bzl", "aar_with_jni") +load("//tensorflow/lite:build_def.bzl", "tflite_jni_binary") +load("//tensorflow/lite/java:aar_with_jni.bzl", "aar_with_jni") JAVA_SRCS = glob([ "src/main/java/org/tensorflow/lite/*.java", @@ -18,7 +18,7 @@ JAVA_SRCS = glob([ # Building tensorflow-lite.aar including 4 variants of .so # To build an aar for release, run below command: # bazel build --cxxopt='--std=c++11' -c opt --fat_apk_cpu=x86,x86_64,arm64-v8a,armeabi-v7a \ -# tensorflow/contrib/lite/java:tensorflow-lite +# tensorflow/lite/java:tensorflow-lite aar_with_jni( name = "tensorflow-lite", android_library = ":tensorflowlite", @@ -143,7 +143,7 @@ java_test( data = [ "src/testdata/add.bin", "src/testdata/mobilenet.tflite.bin", - "//tensorflow/contrib/lite:testdata/multi_add_flex.bin", + "//tensorflow/lite:testdata/multi_add_flex.bin", ], javacopts = JAVACOPTS, tags = ["no_oss"], @@ -151,7 +151,7 @@ java_test( visibility = ["//visibility:private"], deps = [ ":tensorflowlitelib", - "//tensorflow/contrib/lite/java/src/test/native:libtensorflowlite_test_jni.so", + "//tensorflow/lite/java/src/test/native:libtensorflowlite_test_jni.so", "@com_google_truth", "@junit", ], @@ -162,7 +162,7 @@ java_test( size = "small", srcs = ["src/test/java/org/tensorflow/lite/InterpreterFlexTest.java"], data = [ - "//tensorflow/contrib/lite:testdata/multi_add_flex.bin", + "//tensorflow/lite:testdata/multi_add_flex.bin", ], javacopts = JAVACOPTS, tags = ["no_oss"], @@ -215,7 +215,7 @@ cc_library( tflite_jni_binary( name = "libtensorflowlite_jni.so", deps = [ - "//tensorflow/contrib/lite/java/src/main/native", + "//tensorflow/lite/java/src/main/native", ], ) @@ -223,8 +223,8 @@ tflite_jni_binary( tflite_jni_binary( name = "libtensorflowlite_flex_jni.so", deps = [ - "//tensorflow/contrib/lite/delegates/flex:delegate", - "//tensorflow/contrib/lite/java/src/main/native", - "//tensorflow/contrib/lite/java/src/main/native:init_tensorflow", + "//tensorflow/lite/delegates/flex:delegate", + "//tensorflow/lite/java/src/main/native", + "//tensorflow/lite/java/src/main/native:init_tensorflow", ], ) diff --git a/tensorflow/contrib/lite/java/aar_with_jni.bzl b/tensorflow/lite/java/aar_with_jni.bzl similarity index 100% rename from tensorflow/contrib/lite/java/aar_with_jni.bzl rename to tensorflow/lite/java/aar_with_jni.bzl diff --git a/tensorflow/contrib/lite/java/build_aar_for_release.sh b/tensorflow/lite/java/build_aar_for_release.sh similarity index 98% rename from tensorflow/contrib/lite/java/build_aar_for_release.sh rename to tensorflow/lite/java/build_aar_for_release.sh index fbcb1e7db9..54be643fc7 100755 --- a/tensorflow/contrib/lite/java/build_aar_for_release.sh +++ b/tensorflow/lite/java/build_aar_for_release.sh @@ -22,7 +22,7 @@ trap "rm -rf $TMPDIR" EXIT VERSION=1.0 BUILDER=bazel -BASEDIR=tensorflow/contrib/lite +BASEDIR=tensorflow/lite CROSSTOOL="//external:android/crosstool" HOST_CROSSTOOL="@bazel_tools//tools/cpp:toolchain" diff --git a/tensorflow/contrib/lite/java/demo/.gitignore b/tensorflow/lite/java/demo/.gitignore similarity index 100% rename from tensorflow/contrib/lite/java/demo/.gitignore rename to tensorflow/lite/java/demo/.gitignore diff --git a/tensorflow/contrib/lite/java/demo/README.md b/tensorflow/lite/java/demo/README.md similarity index 93% rename from tensorflow/contrib/lite/java/demo/README.md rename to tensorflow/lite/java/demo/README.md index c04b2a6194..b5bfe39ce7 100644 --- a/tensorflow/contrib/lite/java/demo/README.md +++ b/tensorflow/lite/java/demo/README.md @@ -42,12 +42,12 @@ code to merge. ```shell bazel build -c opt --cxxopt='--std=c++11' \ - //tensorflow/contrib/lite/java/demo/app/src/main:TfLiteCameraDemo + //tensorflow/lite/java/demo/app/src/main:TfLiteCameraDemo ``` 3. Install the demo on a [debug-enabled device](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/examples/android#install): ```shell - adb install bazel-bin/tensorflow/contrib/lite/java/demo/app/src/main/TfLiteCameraDemo.apk + adb install bazel-bin/tensorflow/lite/java/demo/app/src/main/TfLiteCameraDemo.apk ``` diff --git a/tensorflow/contrib/lite/java/demo/app/build.gradle b/tensorflow/lite/java/demo/app/build.gradle similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/build.gradle rename to tensorflow/lite/java/demo/app/build.gradle diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/AndroidManifest.xml b/tensorflow/lite/java/demo/app/src/main/AndroidManifest.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/AndroidManifest.xml rename to tensorflow/lite/java/demo/app/src/main/AndroidManifest.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/BUILD b/tensorflow/lite/java/demo/app/src/main/BUILD similarity index 78% rename from tensorflow/contrib/lite/java/demo/app/src/main/BUILD rename to tensorflow/lite/java/demo/app/src/main/BUILD index 5ad738389e..df8a024a57 100644 --- a/tensorflow/contrib/lite/java/demo/app/src/main/BUILD +++ b/tensorflow/lite/java/demo/app/src/main/BUILD @@ -9,7 +9,7 @@ android_binary( srcs = glob(["java/**/*.java"]), aapt_version = "aapt", assets = [ - "//tensorflow/contrib/lite/java/demo/app/src/main/assets:labels_mobilenet_quant_v1_224.txt", + "//tensorflow/lite/java/demo/app/src/main/assets:labels_mobilenet_quant_v1_224.txt", "@tflite_mobilenet//:mobilenet_quant_v1_224.tflite", ], assets_dir = "", @@ -24,8 +24,8 @@ android_binary( # use the target in that case. tags = ["manual"], deps = [ - "//tensorflow/contrib/lite/java:tensorflowlite", - "//tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", + "//tensorflow/lite/java:tensorflowlite", + "//tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", "@androidsdk//com.android.support:support-v13-25.2.0", "@androidsdk//com.android.support:support-v4-25.2.0", ], diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/assets/BUILD b/tensorflow/lite/java/demo/app/src/main/assets/BUILD similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/assets/BUILD rename to tensorflow/lite/java/demo/app/src/main/assets/BUILD diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/assets/labels_imagenet_slim.txt b/tensorflow/lite/java/demo/app/src/main/assets/labels_imagenet_slim.txt similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/assets/labels_imagenet_slim.txt rename to tensorflow/lite/java/demo/app/src/main/assets/labels_imagenet_slim.txt diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/assets/labels_mobilenet_quant_v1_224.txt b/tensorflow/lite/java/demo/app/src/main/assets/labels_mobilenet_quant_v1_224.txt similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/assets/labels_mobilenet_quant_v1_224.txt rename to tensorflow/lite/java/demo/app/src/main/assets/labels_mobilenet_quant_v1_224.txt diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/AutoFitTextureView.java b/tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/AutoFitTextureView.java similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/AutoFitTextureView.java rename to tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/AutoFitTextureView.java diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/Camera2BasicFragment.java b/tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/Camera2BasicFragment.java similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/Camera2BasicFragment.java rename to tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/Camera2BasicFragment.java diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/CameraActivity.java b/tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/CameraActivity.java similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/CameraActivity.java rename to tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/CameraActivity.java diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifier.java b/tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifier.java similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifier.java rename to tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifier.java diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierFloatInception.java b/tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierFloatInception.java similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierFloatInception.java rename to tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierFloatInception.java diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierQuantizedMobileNet.java b/tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierQuantizedMobileNet.java similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierQuantizedMobileNet.java rename to tensorflow/lite/java/demo/app/src/main/java/com/example/android/tflitecamerademo/ImageClassifierQuantizedMobileNet.java diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-hdpi/ic_action_info.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-hdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-hdpi/ic_action_info.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-hdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-hdpi/ic_launcher.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-hdpi/ic_launcher.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-hdpi/tile.9.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-hdpi/tile.9.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-hdpi/tile.9.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-hdpi/tile.9.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-mdpi/ic_action_info.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-mdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-mdpi/ic_action_info.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-mdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-mdpi/ic_launcher.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-mdpi/ic_launcher.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_action_info.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_action_info.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_launcher.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_launcher.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_action_info.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_action_info.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_action_info.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_action_info.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_launcher.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xxhdpi/logo.png b/tensorflow/lite/java/demo/app/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/drawable-xxhdpi/logo.png rename to tensorflow/lite/java/demo/app/src/main/res/drawable-xxhdpi/logo.png diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout-land/fragment_camera2_basic.xml b/tensorflow/lite/java/demo/app/src/main/res/layout-land/fragment_camera2_basic.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/layout-land/fragment_camera2_basic.xml rename to tensorflow/lite/java/demo/app/src/main/res/layout-land/fragment_camera2_basic.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml b/tensorflow/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml rename to tensorflow/lite/java/demo/app/src/main/res/layout-v26/fragment_camera2_basic.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout/activity_camera.xml b/tensorflow/lite/java/demo/app/src/main/res/layout/activity_camera.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/layout/activity_camera.xml rename to tensorflow/lite/java/demo/app/src/main/res/layout/activity_camera.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml b/tensorflow/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml rename to tensorflow/lite/java/demo/app/src/main/res/layout/fragment_camera2_basic.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values-sw600dp/template-dimens.xml b/tensorflow/lite/java/demo/app/src/main/res/values-sw600dp/template-dimens.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values-sw600dp/template-dimens.xml rename to tensorflow/lite/java/demo/app/src/main/res/values-sw600dp/template-dimens.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values-sw600dp/template-styles.xml b/tensorflow/lite/java/demo/app/src/main/res/values-sw600dp/template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values-sw600dp/template-styles.xml rename to tensorflow/lite/java/demo/app/src/main/res/values-sw600dp/template-styles.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values-v11/template-styles.xml b/tensorflow/lite/java/demo/app/src/main/res/values-v11/template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values-v11/template-styles.xml rename to tensorflow/lite/java/demo/app/src/main/res/values-v11/template-styles.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values-v21/base-colors.xml b/tensorflow/lite/java/demo/app/src/main/res/values-v21/base-colors.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values-v21/base-colors.xml rename to tensorflow/lite/java/demo/app/src/main/res/values-v21/base-colors.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values-v21/base-template-styles.xml b/tensorflow/lite/java/demo/app/src/main/res/values-v21/base-template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values-v21/base-template-styles.xml rename to tensorflow/lite/java/demo/app/src/main/res/values-v21/base-template-styles.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/base-strings.xml b/tensorflow/lite/java/demo/app/src/main/res/values/base-strings.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values/base-strings.xml rename to tensorflow/lite/java/demo/app/src/main/res/values/base-strings.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/colors.xml b/tensorflow/lite/java/demo/app/src/main/res/values/colors.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values/colors.xml rename to tensorflow/lite/java/demo/app/src/main/res/values/colors.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/strings.xml b/tensorflow/lite/java/demo/app/src/main/res/values/strings.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values/strings.xml rename to tensorflow/lite/java/demo/app/src/main/res/values/strings.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/styles.xml b/tensorflow/lite/java/demo/app/src/main/res/values/styles.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values/styles.xml rename to tensorflow/lite/java/demo/app/src/main/res/values/styles.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/template-dimens.xml b/tensorflow/lite/java/demo/app/src/main/res/values/template-dimens.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values/template-dimens.xml rename to tensorflow/lite/java/demo/app/src/main/res/values/template-dimens.xml diff --git a/tensorflow/contrib/lite/java/demo/app/src/main/res/values/template-styles.xml b/tensorflow/lite/java/demo/app/src/main/res/values/template-styles.xml similarity index 100% rename from tensorflow/contrib/lite/java/demo/app/src/main/res/values/template-styles.xml rename to tensorflow/lite/java/demo/app/src/main/res/values/template-styles.xml diff --git a/tensorflow/contrib/lite/java/demo/build.gradle b/tensorflow/lite/java/demo/build.gradle similarity index 100% rename from tensorflow/contrib/lite/java/demo/build.gradle rename to tensorflow/lite/java/demo/build.gradle diff --git a/tensorflow/contrib/lite/java/demo/gradle.properties b/tensorflow/lite/java/demo/gradle.properties similarity index 100% rename from tensorflow/contrib/lite/java/demo/gradle.properties rename to tensorflow/lite/java/demo/gradle.properties diff --git a/tensorflow/contrib/lite/java/demo/gradle/wrapper/gradle-wrapper.jar b/tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tensorflow/contrib/lite/java/demo/gradle/wrapper/gradle-wrapper.jar rename to tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.jar diff --git a/tensorflow/contrib/lite/java/demo/gradle/wrapper/gradle-wrapper.properties b/tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tensorflow/contrib/lite/java/demo/gradle/wrapper/gradle-wrapper.properties rename to tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.properties diff --git a/tensorflow/contrib/lite/java/demo/gradlew b/tensorflow/lite/java/demo/gradlew similarity index 100% rename from tensorflow/contrib/lite/java/demo/gradlew rename to tensorflow/lite/java/demo/gradlew diff --git a/tensorflow/contrib/lite/java/demo/gradlew.bat b/tensorflow/lite/java/demo/gradlew.bat similarity index 100% rename from tensorflow/contrib/lite/java/demo/gradlew.bat rename to tensorflow/lite/java/demo/gradlew.bat diff --git a/tensorflow/contrib/lite/java/demo/settings.gradle b/tensorflow/lite/java/demo/settings.gradle similarity index 100% rename from tensorflow/contrib/lite/java/demo/settings.gradle rename to tensorflow/lite/java/demo/settings.gradle diff --git a/tensorflow/contrib/lite/java/ovic/BUILD b/tensorflow/lite/java/ovic/BUILD similarity index 63% rename from tensorflow/contrib/lite/java/ovic/BUILD rename to tensorflow/lite/java/ovic/BUILD index 552468faf4..774320871e 100644 --- a/tensorflow/contrib/lite/java/ovic/BUILD +++ b/tensorflow/lite/java/ovic/BUILD @@ -15,15 +15,15 @@ java_test( size = "medium", srcs = ["src/test/java/org/tensorflow/ovic/OvicClassifierTest.java"], data = [ - "//tensorflow/contrib/lite/java/ovic/src/testdata:labels.txt", - "//tensorflow/contrib/lite/java/ovic/src/testdata:ovic_testdata", + "//tensorflow/lite/java/ovic/src/testdata:labels.txt", + "//tensorflow/lite/java/ovic/src/testdata:ovic_testdata", ], javacopts = JAVACOPTS, tags = ["no_oss"], test_class = "org.tensorflow.ovic.OvicClassifierTest", visibility = ["//visibility:public"], deps = [ - "//tensorflow/contrib/lite/java/ovic:ovicbenchmarkerlib_java", + "//tensorflow/lite/java/ovic:ovicbenchmarkerlib_java", "@com_google_truth", "@junit", ], @@ -33,13 +33,13 @@ java_binary( name = "ovic_validator", srcs = ["src/main/java/org/tensorflow/ovic/OvicValidator.java"], data = [ - "//tensorflow/contrib/lite/java/ovic/src/testdata:labels.txt", + "//tensorflow/lite/java/ovic/src/testdata:labels.txt", ], main_class = "org.tensorflow.ovic.OvicValidator", tags = ["no_oss"], deps = [ - "//tensorflow/contrib/lite/java/ovic:ovicbenchmarkerlib_java", - "//tensorflow/contrib/lite/java/ovic:ovicdetectionbenchmarkerlib_java", + "//tensorflow/lite/java/ovic:ovicbenchmarkerlib_java", + "//tensorflow/lite/java/ovic:ovicdetectionbenchmarkerlib_java", ], ) @@ -51,11 +51,11 @@ android_library( "src/main/java/org/tensorflow/ovic/OvicClassifier.java", "src/main/java/org/tensorflow/ovic/OvicClassifierBenchmarker.java", ], - manifest = "//tensorflow/contrib/lite/java:AndroidManifest.xml", + manifest = "//tensorflow/lite/java:AndroidManifest.xml", tags = ["no_oss"], deps = [ - "//tensorflow/contrib/lite/java:tensorflowlite", - "//tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", + "//tensorflow/lite/java:tensorflowlite", + "//tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", "@org_checkerframework_qual", ], ) @@ -69,10 +69,10 @@ java_library( javacopts = JAVACOPTS, tags = ["no_oss"], deps = [ - "//tensorflow/contrib/lite/java:libtensorflowlite_jni.so", - "//tensorflow/contrib/lite/java:tensorflowlite_java", - "//tensorflow/contrib/lite/java/src/main/native", - "//tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", + "//tensorflow/lite/java:libtensorflowlite_jni.so", + "//tensorflow/lite/java:tensorflowlite_java", + "//tensorflow/lite/java/src/main/native", + "//tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", "@org_checkerframework_qual", ], ) @@ -83,15 +83,15 @@ java_test( size = "medium", srcs = ["src/test/java/org/tensorflow/ovic/OvicDetectorTest.java"], data = [ - "//tensorflow/contrib/lite/java/ovic/src/testdata:coco_labels.txt", - "//tensorflow/contrib/lite/java/ovic/src/testdata:ovic_testdata", + "//tensorflow/lite/java/ovic/src/testdata:coco_labels.txt", + "//tensorflow/lite/java/ovic/src/testdata:ovic_testdata", ], javacopts = JAVACOPTS, tags = ["no_oss"], test_class = "org.tensorflow.ovic.OvicDetectorTest", visibility = ["//visibility:public"], deps = [ - "//tensorflow/contrib/lite/java/ovic:ovicdetectionbenchmarkerlib_java", + "//tensorflow/lite/java/ovic:ovicdetectionbenchmarkerlib_java", "@com_google_truth", "@junit", ], @@ -106,10 +106,10 @@ android_library( "src/main/java/org/tensorflow/ovic/OvicDetector.java", "src/main/java/org/tensorflow/ovic/OvicDetectorBenchmarker.java", ], - manifest = "//tensorflow/contrib/lite/java:AndroidManifest.xml", + manifest = "//tensorflow/lite/java:AndroidManifest.xml", deps = [ - "//tensorflow/contrib/lite/java:tensorflowlite", - "//tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", + "//tensorflow/lite/java:tensorflowlite", + "//tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", "@org_checkerframework_qual", ], ) @@ -123,10 +123,10 @@ java_library( ], javacopts = JAVACOPTS, deps = [ - "//tensorflow/contrib/lite/java:libtensorflowlite_jni.so", - "//tensorflow/contrib/lite/java:tensorflowlite_java", - "//tensorflow/contrib/lite/java/src/main/native", - "//tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", + "//tensorflow/lite/java:libtensorflowlite_jni.so", + "//tensorflow/lite/java:tensorflowlite_java", + "//tensorflow/lite/java/src/main/native", + "//tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite:testhelper", "@org_checkerframework_qual", ], ) diff --git a/tensorflow/contrib/lite/java/ovic/README.md b/tensorflow/lite/java/ovic/README.md similarity index 87% rename from tensorflow/contrib/lite/java/ovic/README.md rename to tensorflow/lite/java/ovic/README.md index 489ed3df40..9e3ceb7e18 100644 --- a/tensorflow/contrib/lite/java/ovic/README.md +++ b/tensorflow/lite/java/ovic/README.md @@ -17,7 +17,7 @@ We are releasing an benchmarker Apk that would allow developers to measure laten The test data (models and images) should be downloaded automatically for you by Bazel. In case they are not, you can manually install them as below. -Note: all commands should be called from your tensorflow installation folder (under this folder you should find `tensorflow/contrib/lite`). +Note: all commands should be called from your tensorflow installation folder (under this folder you should find `tensorflow/lite`). * Download the [testdata package](https://storage.googleapis.com/download.tensorflow.org/data/ovic_2018_10_23.zip): @@ -29,7 +29,7 @@ curl -L https://storage.googleapis.com/download.tensorflow.org/data/ovic_2018_10 * Unzip the package into the testdata folder: ```sh -unzip -j /tmp/ovic.zip -d tensorflow/contrib/lite/java/ovic/src/testdata/ +unzip -j /tmp/ovic.zip -d tensorflow/lite/java/ovic/src/testdata/ ``` ### Run tests @@ -37,9 +37,9 @@ unzip -j /tmp/ovic.zip -d tensorflow/contrib/lite/java/ovic/src/testdata/ You can run test with Bazel as below. This helps to ensure that the installation is correct. ```sh -bazel test --cxxopt=--std=c++11 //tensorflow/contrib/lite/java/ovic:OvicClassifierTest --cxxopt=-Wno-all --test_output=all +bazel test --cxxopt=--std=c++11 //tensorflow/lite/java/ovic:OvicClassifierTest --cxxopt=-Wno-all --test_output=all -bazel test --cxxopt=--std=c++11 //tensorflow/contrib/lite/java/ovic:OvicDetectorTest --cxxopt=-Wno-all --test_output=all +bazel test --cxxopt=--std=c++11 //tensorflow/lite/java/ovic:OvicDetectorTest --cxxopt=-Wno-all --test_output=all ``` ### Test your submissions @@ -51,8 +51,8 @@ Once you have a submission that follows the instructions from the [competition s You can call the validator binary below to verify that your model fits the format requirements. This often helps you to catch size mismatches (e.g. output for classification should be [1, 1001] instead of [1,1,1,1001]). Let say the submission file is located at `/path/to/my_model.lite`, then call: ```sh -bazel build --cxxopt=--std=c++11 //tensorflow/contrib/lite/java/ovic:ovic_validator --cxxopt=-Wno-all -bazel-bin/tensorflow/contrib/lite/java/ovic/ovic_validator /path/to/my_model.lite classify +bazel build --cxxopt=--std=c++11 //tensorflow/lite/java/ovic:ovic_validator --cxxopt=-Wno-all +bazel-bin/tensorflow/lite/java/ovic/ovic_validator /path/to/my_model.lite classify ``` Successful validation should print the following message to terminal: @@ -72,14 +72,14 @@ You can go a step further to verify that the model produces results as expected. * Move your submission to the testdata folder: ```sh -cp /path/to/my_model.lite tensorflow/contrib/lite/java/ovic/src/testdata/ +cp /path/to/my_model.lite tensorflow/lite/java/ovic/src/testdata/ ``` * Resize the test image to the resolutions that are expected by your submission: -The test images can be found at `tensorflow/contrib/lite/java/ovic/src/testdata/test_image_*.jpg`. You may reuse these images if your image resolutions are 128x128 or 224x224. +The test images can be found at `tensorflow/lite/java/ovic/src/testdata/test_image_*.jpg`. You may reuse these images if your image resolutions are 128x128 or 224x224. -* Add your model and test image to the BUILD rule at `tensorflow/contrib/lite/java/ovic/src/testdata/BUILD`: +* Add your model and test image to the BUILD rule at `tensorflow/lite/java/ovic/src/testdata/BUILD`: ```JSON filegroup( @@ -113,7 +113,7 @@ We provide two ways to measure the on-device latency of your submission. The fir Make sure that you have followed instructions in [Test your submissions](#test-your-submissions) to add your model to the testdata folder and to the corresponding build rules. -Modify `tensorflow/contrib/lite/java/ovic/demo/app/OvicBenchmarkerActivity.java`: +Modify `tensorflow/lite/java/ovic/demo/app/OvicBenchmarkerActivity.java`: * Add your model to the benchmarker apk by changing `MODEL_PATH` and `TEST_IMAGE_PATH` below to your submission and test image. @@ -140,8 +140,8 @@ Note: You'll need ROOT access to the phone to change processor affinity. * Build and install the app. ``` -bazel build -c opt --cxxopt=--std=c++11 --cxxopt=-Wno-all //tensorflow/contrib/lite/java/ovic/demo/app:ovic_benchmarker_binary -adb install -r bazel-bin/tensorflow/contrib/lite/java/ovic/demo/app/ovic_benchmarker_binary.apk +bazel build -c opt --cxxopt=--std=c++11 --cxxopt=-Wno-all //tensorflow/lite/java/ovic/demo/app:ovic_benchmarker_binary +adb install -r bazel-bin/tensorflow/lite/java/ovic/demo/app/ovic_benchmarker_binary.apk ``` Start the app and pick a task by clicking either the `CLF` button for classification or the `DET` button for detection. The button should turn bright green, signaling that the experiment is running. The benchmarking results will be displayed after about the `WALL_TIME` you specified above. For example: diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/AndroidManifest.xml b/tensorflow/lite/java/ovic/demo/app/AndroidManifest.xml similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/AndroidManifest.xml rename to tensorflow/lite/java/ovic/demo/app/AndroidManifest.xml diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/BUILD b/tensorflow/lite/java/ovic/demo/app/BUILD similarity index 62% rename from tensorflow/contrib/lite/java/ovic/demo/app/BUILD rename to tensorflow/lite/java/ovic/demo/app/BUILD index a30c707483..b3548deaf5 100644 --- a/tensorflow/contrib/lite/java/ovic/demo/app/BUILD +++ b/tensorflow/lite/java/ovic/demo/app/BUILD @@ -10,9 +10,9 @@ android_binary( ], aapt_version = "aapt", assets = [ - "//tensorflow/contrib/lite/java/ovic/src/testdata:coco_labels.txt", - "//tensorflow/contrib/lite/java/ovic/src/testdata:labels.txt", - "//tensorflow/contrib/lite/java/ovic/src/testdata:ovic_testdata", + "//tensorflow/lite/java/ovic/src/testdata:coco_labels.txt", + "//tensorflow/lite/java/ovic/src/testdata:labels.txt", + "//tensorflow/lite/java/ovic/src/testdata:ovic_testdata", ], assets_dir = "", custom_package = "ovic.demo.app", @@ -24,9 +24,9 @@ android_binary( resource_files = glob(["res/**"]), tags = ["manual"], deps = [ - "//tensorflow/contrib/lite/java:tensorflowlite", - "//tensorflow/contrib/lite/java/ovic:ovicbenchmarkerlib", - "//tensorflow/contrib/lite/java/ovic:ovicdetectionbenchmarkerlib", + "//tensorflow/lite/java:tensorflowlite", + "//tensorflow/lite/java/ovic:ovicbenchmarkerlib", + "//tensorflow/lite/java/ovic:ovicdetectionbenchmarkerlib", "@androidsdk//com.android.support:support-v13-25.2.0", "@androidsdk//com.android.support:support-v4-25.2.0", ], diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/OvicBenchmarkerActivity.java b/tensorflow/lite/java/ovic/demo/app/OvicBenchmarkerActivity.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/OvicBenchmarkerActivity.java rename to tensorflow/lite/java/ovic/demo/app/OvicBenchmarkerActivity.java diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/build.gradle b/tensorflow/lite/java/ovic/demo/app/build.gradle similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/build.gradle rename to tensorflow/lite/java/ovic/demo/app/build.gradle diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/res/drawable-mdpi/ic_launcher.png b/tensorflow/lite/java/ovic/demo/app/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/res/drawable-mdpi/ic_launcher.png rename to tensorflow/lite/java/ovic/demo/app/res/drawable-mdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/res/drawable-xhdpi/ic_launcher.png b/tensorflow/lite/java/ovic/demo/app/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/res/drawable-xhdpi/ic_launcher.png rename to tensorflow/lite/java/ovic/demo/app/res/drawable-xhdpi/ic_launcher.png diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/res/drawable/start_button_color.xml b/tensorflow/lite/java/ovic/demo/app/res/drawable/start_button_color.xml similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/res/drawable/start_button_color.xml rename to tensorflow/lite/java/ovic/demo/app/res/drawable/start_button_color.xml diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/res/layout/activity_main.xml b/tensorflow/lite/java/ovic/demo/app/res/layout/activity_main.xml similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/res/layout/activity_main.xml rename to tensorflow/lite/java/ovic/demo/app/res/layout/activity_main.xml diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/res/values/dimens.xml b/tensorflow/lite/java/ovic/demo/app/res/values/dimens.xml similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/res/values/dimens.xml rename to tensorflow/lite/java/ovic/demo/app/res/values/dimens.xml diff --git a/tensorflow/contrib/lite/java/ovic/demo/app/res/values/strings.xml b/tensorflow/lite/java/ovic/demo/app/res/values/strings.xml similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/app/res/values/strings.xml rename to tensorflow/lite/java/ovic/demo/app/res/values/strings.xml diff --git a/tensorflow/contrib/lite/java/ovic/demo/build.gradle b/tensorflow/lite/java/ovic/demo/build.gradle similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/build.gradle rename to tensorflow/lite/java/ovic/demo/build.gradle diff --git a/tensorflow/contrib/lite/java/ovic/demo/gradle.properties b/tensorflow/lite/java/ovic/demo/gradle.properties similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/gradle.properties rename to tensorflow/lite/java/ovic/demo/gradle.properties diff --git a/tensorflow/contrib/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar b/tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar rename to tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar diff --git a/tensorflow/contrib/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.properties b/tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.properties rename to tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.properties diff --git a/tensorflow/contrib/lite/java/ovic/demo/gradlew b/tensorflow/lite/java/ovic/demo/gradlew similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/gradlew rename to tensorflow/lite/java/ovic/demo/gradlew diff --git a/tensorflow/contrib/lite/java/ovic/demo/gradlew.bat b/tensorflow/lite/java/ovic/demo/gradlew.bat similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/gradlew.bat rename to tensorflow/lite/java/ovic/demo/gradlew.bat diff --git a/tensorflow/contrib/lite/java/ovic/demo/settings.gradle b/tensorflow/lite/java/ovic/demo/settings.gradle similarity index 100% rename from tensorflow/contrib/lite/java/ovic/demo/settings.gradle rename to tensorflow/lite/java/ovic/demo/settings.gradle diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/BoundingBox.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/BoundingBox.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/BoundingBox.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/BoundingBox.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicBenchmarker.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicBenchmarker.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicBenchmarker.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicBenchmarker.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassificationResult.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassificationResult.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassificationResult.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassificationResult.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifier.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifier.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifier.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifier.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifierBenchmarker.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifierBenchmarker.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifierBenchmarker.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicClassifierBenchmarker.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectionResult.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectionResult.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectionResult.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectionResult.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetector.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetector.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetector.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetector.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectorBenchmarker.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectorBenchmarker.java similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectorBenchmarker.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicDetectorBenchmarker.java diff --git a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicValidator.java b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicValidator.java similarity index 98% rename from tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicValidator.java rename to tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicValidator.java index 5756380abb..0a7aee0432 100644 --- a/tensorflow/contrib/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicValidator.java +++ b/tensorflow/lite/java/ovic/src/main/java/org/tensorflow/ovic/OvicValidator.java @@ -47,7 +47,7 @@ public class OvicValidator { final boolean isDetection = taskString.equals("detect"); // Label file for detection is never used, so the same label file is used for both tasks. final String labelPath = - "tensorflow/contrib/lite/java/ovic/src/testdata/labels.txt"; + "tensorflow/lite/java/ovic/src/testdata/labels.txt"; try { MappedByteBuffer model = loadModelFile(modelFile); diff --git a/tensorflow/contrib/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicClassifierTest.java b/tensorflow/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicClassifierTest.java similarity index 98% rename from tensorflow/contrib/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicClassifierTest.java rename to tensorflow/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicClassifierTest.java index 99e874ca78..c309c5bd55 100644 --- a/tensorflow/contrib/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicClassifierTest.java +++ b/tensorflow/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicClassifierTest.java @@ -45,7 +45,7 @@ public final class OvicClassifierTest { private ByteBuffer lowResTestImage = null; private OvicClassificationResult testResult = null; private static final String LABELS_PATH = - "tensorflow/contrib/lite/java/ovic/src/testdata/labels.txt"; + "tensorflow/lite/java/ovic/src/testdata/labels.txt"; private static final String QUANTIZED_MODEL_PATH = "external/tflite_ovic_testdata/quantized_model.lite"; private static final String LOW_RES_MODEL_PATH = diff --git a/tensorflow/contrib/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicDetectorTest.java b/tensorflow/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicDetectorTest.java similarity index 98% rename from tensorflow/contrib/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicDetectorTest.java rename to tensorflow/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicDetectorTest.java index 489d7a0f2b..709f8fb5c3 100644 --- a/tensorflow/contrib/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicDetectorTest.java +++ b/tensorflow/lite/java/ovic/src/test/java/org/tensorflow/ovic/OvicDetectorTest.java @@ -41,7 +41,7 @@ public final class OvicDetectorTest { private ByteBuffer testImage = null; private static final String LABELS_PATH = - "tensorflow/contrib/lite/java/ovic/src/testdata/coco_labels.txt"; + "tensorflow/lite/java/ovic/src/testdata/coco_labels.txt"; private static final String MODEL_PATH = "external/tflite_ovic_testdata/quantized_detect.lite"; private static final String TEST_IMAGE_PATH = diff --git a/tensorflow/contrib/lite/java/ovic/src/testdata/BUILD b/tensorflow/lite/java/ovic/src/testdata/BUILD similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/testdata/BUILD rename to tensorflow/lite/java/ovic/src/testdata/BUILD diff --git a/tensorflow/contrib/lite/java/ovic/src/testdata/coco_labels.txt b/tensorflow/lite/java/ovic/src/testdata/coco_labels.txt similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/testdata/coco_labels.txt rename to tensorflow/lite/java/ovic/src/testdata/coco_labels.txt diff --git a/tensorflow/contrib/lite/java/ovic/src/testdata/labels.txt b/tensorflow/lite/java/ovic/src/testdata/labels.txt similarity index 100% rename from tensorflow/contrib/lite/java/ovic/src/testdata/labels.txt rename to tensorflow/lite/java/ovic/src/testdata/labels.txt diff --git a/tensorflow/contrib/lite/java/proguard.flags b/tensorflow/lite/java/proguard.flags similarity index 100% rename from tensorflow/contrib/lite/java/proguard.flags rename to tensorflow/lite/java/proguard.flags diff --git a/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/DataType.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/DataType.java similarity index 100% rename from tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/DataType.java rename to tensorflow/lite/java/src/main/java/org/tensorflow/lite/DataType.java diff --git a/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/Delegate.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/Delegate.java similarity index 100% rename from tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/Delegate.java rename to tensorflow/lite/java/src/main/java/org/tensorflow/lite/Delegate.java diff --git a/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/Interpreter.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/Interpreter.java similarity index 100% rename from tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/Interpreter.java rename to tensorflow/lite/java/src/main/java/org/tensorflow/lite/Interpreter.java diff --git a/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java similarity index 100% rename from tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java rename to tensorflow/lite/java/src/main/java/org/tensorflow/lite/NativeInterpreterWrapper.java diff --git a/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/Tensor.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/Tensor.java similarity index 100% rename from tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/Tensor.java rename to tensorflow/lite/java/src/main/java/org/tensorflow/lite/Tensor.java diff --git a/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/TensorFlowLite.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/TensorFlowLite.java similarity index 100% rename from tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/TensorFlowLite.java rename to tensorflow/lite/java/src/main/java/org/tensorflow/lite/TensorFlowLite.java diff --git a/tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/package-info.java b/tensorflow/lite/java/src/main/java/org/tensorflow/lite/package-info.java similarity index 100% rename from tensorflow/contrib/lite/java/src/main/java/org/tensorflow/lite/package-info.java rename to tensorflow/lite/java/src/main/java/org/tensorflow/lite/package-info.java diff --git a/tensorflow/contrib/lite/java/src/main/native/BUILD b/tensorflow/lite/java/src/main/native/BUILD similarity index 90% rename from tensorflow/contrib/lite/java/src/main/native/BUILD rename to tensorflow/lite/java/src/main/native/BUILD index f91345f369..2abba24345 100644 --- a/tensorflow/contrib/lite/java/src/main/native/BUILD +++ b/tensorflow/lite/java/src/main/native/BUILD @@ -4,7 +4,7 @@ package(default_visibility = ["//visibility:public"]) -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") licenses(["notice"]) # Apache 2.0 @@ -40,9 +40,9 @@ cc_library( "-ldl", ], deps = [ - "//tensorflow/contrib/lite:context", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", + "//tensorflow/lite:context", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", ], alwayslink = 1, ) @@ -99,7 +99,7 @@ cc_library( "-ldl", ], deps = [ - "//tensorflow/contrib/lite/testing:init_tensorflow", + "//tensorflow/lite/testing:init_tensorflow", ], alwayslink = 1, ) @@ -115,7 +115,7 @@ cc_library( copts = tflite_copts(), deps = [ ":native_framework_only", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:builtin_ops", ], alwayslink = 1, ) diff --git a/tensorflow/contrib/lite/java/src/main/native/builtin_ops_jni.cc b/tensorflow/lite/java/src/main/native/builtin_ops_jni.cc similarity index 95% rename from tensorflow/contrib/lite/java/src/main/native/builtin_ops_jni.cc rename to tensorflow/lite/java/src/main/native/builtin_ops_jni.cc index cce356370f..95bc0a4fa8 100644 --- a/tensorflow/contrib/lite/java/src/main/native/builtin_ops_jni.cc +++ b/tensorflow/lite/java/src/main/native/builtin_ops_jni.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/register.h" +#include "tensorflow/lite/kernels/register.h" namespace tflite { diff --git a/tensorflow/contrib/lite/java/src/main/native/exception_jni.cc b/tensorflow/lite/java/src/main/native/exception_jni.cc similarity index 96% rename from tensorflow/contrib/lite/java/src/main/native/exception_jni.cc rename to tensorflow/lite/java/src/main/native/exception_jni.cc index 18d177f1a6..5406c7197f 100644 --- a/tensorflow/contrib/lite/java/src/main/native/exception_jni.cc +++ b/tensorflow/lite/java/src/main/native/exception_jni.cc @@ -17,7 +17,7 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/java/src/main/native/exception_jni.h" +#include "tensorflow/lite/java/src/main/native/exception_jni.h" const char kIllegalArgumentException[] = "java/lang/IllegalArgumentException"; const char kIllegalStateException[] = "java/lang/IllegalStateException"; diff --git a/tensorflow/contrib/lite/java/src/main/native/exception_jni.h b/tensorflow/lite/java/src/main/native/exception_jni.h similarity index 84% rename from tensorflow/contrib/lite/java/src/main/native/exception_jni.h rename to tensorflow/lite/java/src/main/native/exception_jni.h index 2a4bbdbead..ebd91e875b 100644 --- a/tensorflow/contrib/lite/java/src/main/native/exception_jni.h +++ b/tensorflow/lite/java/src/main/native/exception_jni.h @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_EXCEPTION_JNI_H_ -#define TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_EXCEPTION_JNI_H_ +#ifndef TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_EXCEPTION_JNI_H_ +#define TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_EXCEPTION_JNI_H_ #include -#include "tensorflow/contrib/lite/error_reporter.h" +#include "tensorflow/lite/error_reporter.h" #ifdef __cplusplus extern "C" { @@ -47,4 +47,4 @@ class BufferErrorReporter : public tflite::ErrorReporter { #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_EXCEPTION_JNI_H_ +#endif // TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_EXCEPTION_JNI_H_ diff --git a/tensorflow/contrib/lite/java/src/main/native/init_tensorflow_jni.cc b/tensorflow/lite/java/src/main/native/init_tensorflow_jni.cc similarity index 85% rename from tensorflow/contrib/lite/java/src/main/native/init_tensorflow_jni.cc rename to tensorflow/lite/java/src/main/native/init_tensorflow_jni.cc index 74aa384df3..1fa9d1f50e 100644 --- a/tensorflow/contrib/lite/java/src/main/native/init_tensorflow_jni.cc +++ b/tensorflow/lite/java/src/main/native/init_tensorflow_jni.cc @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/java/src/main/native/init_tensorflow_jni.h" -#include "tensorflow/contrib/lite/testing/init_tensorflow.h" +#include "tensorflow/lite/java/src/main/native/init_tensorflow_jni.h" +#include "tensorflow/lite/testing/init_tensorflow.h" JNIEXPORT void JNICALL Java_org_tensorflow_lite_TensorFlowLite_initTensorFlow( JNIEnv* env, jclass clazz) { diff --git a/tensorflow/contrib/lite/java/src/main/native/init_tensorflow_jni.h b/tensorflow/lite/java/src/main/native/init_tensorflow_jni.h similarity index 81% rename from tensorflow/contrib/lite/java/src/main/native/init_tensorflow_jni.h rename to tensorflow/lite/java/src/main/native/init_tensorflow_jni.h index 4689eb05fe..1454d6d463 100644 --- a/tensorflow/contrib/lite/java/src/main/native/init_tensorflow_jni.h +++ b/tensorflow/lite/java/src/main/native/init_tensorflow_jni.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_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_INIT_TENSORFLOW_JNI_H_ -#define TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_INIT_TENSORFLOW_JNI_H_ +#ifndef TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_INIT_TENSORFLOW_JNI_H_ +#define TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_INIT_TENSORFLOW_JNI_H_ #include @@ -33,4 +33,4 @@ JNIEXPORT void JNICALL Java_org_tensorflow_lite_TensorFlowLite_initTensorFlow( } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_INIT_TENSORFLOW_JNI_H_ +#endif // TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_INIT_TENSORFLOW_JNI_H_ diff --git a/tensorflow/contrib/lite/java/src/main/native/nativeinterpreterwrapper_jni.cc b/tensorflow/lite/java/src/main/native/nativeinterpreterwrapper_jni.cc similarity index 99% rename from tensorflow/contrib/lite/java/src/main/native/nativeinterpreterwrapper_jni.cc rename to tensorflow/lite/java/src/main/native/nativeinterpreterwrapper_jni.cc index 83c6c9cb45..100eb81510 100644 --- a/tensorflow/contrib/lite/java/src/main/native/nativeinterpreterwrapper_jni.cc +++ b/tensorflow/lite/java/src/main/native/nativeinterpreterwrapper_jni.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/java/src/main/native/nativeinterpreterwrapper_jni.h" +#include "tensorflow/lite/java/src/main/native/nativeinterpreterwrapper_jni.h" namespace { tflite::Interpreter* convertLongToInterpreter(JNIEnv* env, jlong handle) { diff --git a/tensorflow/contrib/lite/java/src/main/native/nativeinterpreterwrapper_jni.h b/tensorflow/lite/java/src/main/native/nativeinterpreterwrapper_jni.h similarity index 93% rename from tensorflow/contrib/lite/java/src/main/native/nativeinterpreterwrapper_jni.h rename to tensorflow/lite/java/src/main/native/nativeinterpreterwrapper_jni.h index 5086bf8c28..e184b8f1a7 100644 --- a/tensorflow/contrib/lite/java/src/main/native/nativeinterpreterwrapper_jni.h +++ b/tensorflow/lite/java/src/main/native/nativeinterpreterwrapper_jni.h @@ -13,18 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_NATIVEINTERPRETERWRAPPER_JNI_H_ -#define TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_NATIVEINTERPRETERWRAPPER_JNI_H_ +#ifndef TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_NATIVEINTERPRETERWRAPPER_JNI_H_ +#define TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_NATIVEINTERPRETERWRAPPER_JNI_H_ #include #include #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/java/src/main/native/exception_jni.h" -#include "tensorflow/contrib/lite/java/src/main/native/tensor_jni.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/java/src/main/native/exception_jni.h" +#include "tensorflow/lite/java/src/main/native/tensor_jni.h" +#include "tensorflow/lite/model.h" namespace tflite { // This is to be provided at link-time by a library. @@ -245,4 +245,4 @@ JNIEXPORT void JNICALL Java_org_tensorflow_lite_NativeInterpreterWrapper_delete( #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_NATIVEINTERPRETERWRAPPER_JNI_H_ +#endif // TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_NATIVEINTERPRETERWRAPPER_JNI_H_ diff --git a/tensorflow/contrib/lite/java/src/main/native/tensor_jni.cc b/tensorflow/lite/java/src/main/native/tensor_jni.cc similarity index 98% rename from tensorflow/contrib/lite/java/src/main/native/tensor_jni.cc rename to tensorflow/lite/java/src/main/native/tensor_jni.cc index d3378f5f14..1d813d50da 100644 --- a/tensorflow/contrib/lite/java/src/main/native/tensor_jni.cc +++ b/tensorflow/lite/java/src/main/native/tensor_jni.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/java/src/main/native/tensor_jni.h" +#include "tensorflow/lite/java/src/main/native/tensor_jni.h" #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/java/src/main/native/exception_jni.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/java/src/main/native/exception_jni.h" namespace { diff --git a/tensorflow/contrib/lite/java/src/main/native/tensor_jni.h b/tensorflow/lite/java/src/main/native/tensor_jni.h similarity index 93% rename from tensorflow/contrib/lite/java/src/main/native/tensor_jni.h rename to tensorflow/lite/java/src/main/native/tensor_jni.h index c5e9690e9a..ec0442e93f 100644 --- a/tensorflow/contrib/lite/java/src/main/native/tensor_jni.h +++ b/tensorflow/lite/java/src/main/native/tensor_jni.h @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_ -#define TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_ +#ifndef TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_ +#define TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" #ifdef __cplusplus extern "C" { @@ -109,4 +109,4 @@ Java_org_tensorflow_lite_Tensor_writeMultiDimensionalArray(JNIEnv* env, #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_ +#endif // TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_ diff --git a/tensorflow/contrib/lite/java/src/main/native/tensorflow_lite_jni.cc b/tensorflow/lite/java/src/main/native/tensorflow_lite_jni.cc similarity index 88% rename from tensorflow/contrib/lite/java/src/main/native/tensorflow_lite_jni.cc rename to tensorflow/lite/java/src/main/native/tensorflow_lite_jni.cc index 2e7f2f5692..2b8cf4201c 100644 --- a/tensorflow/contrib/lite/java/src/main/native/tensorflow_lite_jni.cc +++ b/tensorflow/lite/java/src/main/native/tensorflow_lite_jni.cc @@ -15,8 +15,8 @@ limitations under the License. #include -#include "tensorflow/contrib/lite/java/src/main/native/tensorflow_lite_jni.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/java/src/main/native/tensorflow_lite_jni.h" +#include "tensorflow/lite/version.h" JNIEXPORT jstring JNICALL Java_org_tensorflow_lite_TensorFlowLite_version(JNIEnv* env, jclass /*clazz*/) { diff --git a/tensorflow/contrib/lite/java/src/main/native/tensorflow_lite_jni.h b/tensorflow/lite/java/src/main/native/tensorflow_lite_jni.h similarity index 81% rename from tensorflow/contrib/lite/java/src/main/native/tensorflow_lite_jni.h rename to tensorflow/lite/java/src/main/native/tensorflow_lite_jni.h index 5e2a7ded1b..de3e703110 100644 --- a/tensorflow/contrib/lite/java/src/main/native/tensorflow_lite_jni.h +++ b/tensorflow/lite/java/src/main/native/tensorflow_lite_jni.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_LITE_JNI_H_ -#define TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_LITE_JNI_H_ +#ifndef TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_LITE_JNI_H_ +#define TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_LITE_JNI_H_ #include @@ -33,4 +33,4 @@ Java_org_tensorflow_lite_TensorFlowLite_version(JNIEnv*, jclass); #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_LITE_JNI_H_ +#endif // TENSORFLOW_LITE_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_LITE_JNI_H_ diff --git a/tensorflow/contrib/lite/java/src/main/native/version_script.lds b/tensorflow/lite/java/src/main/native/version_script.lds similarity index 100% rename from tensorflow/contrib/lite/java/src/main/native/version_script.lds rename to tensorflow/lite/java/src/main/native/version_script.lds diff --git a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/DataTypeTest.java b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/DataTypeTest.java similarity index 100% rename from tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/DataTypeTest.java rename to tensorflow/lite/java/src/test/java/org/tensorflow/lite/DataTypeTest.java diff --git a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/InterpreterFlexTest.java b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/InterpreterFlexTest.java similarity index 96% rename from tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/InterpreterFlexTest.java rename to tensorflow/lite/java/src/test/java/org/tensorflow/lite/InterpreterFlexTest.java index 3b3d9f0e7f..b22399a4a4 100644 --- a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/InterpreterFlexTest.java +++ b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/InterpreterFlexTest.java @@ -30,7 +30,7 @@ import org.junit.runners.JUnit4; public final class InterpreterFlexTest { private static final File FLEX_MODEL_FILE = - new File("tensorflow/contrib/lite/testdata/multi_add_flex.bin"); + new File("tensorflow/lite/testdata/multi_add_flex.bin"); /** Smoke test validating that flex model loading works when the flex delegate is linked. */ @Test diff --git a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/InterpreterTest.java b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/InterpreterTest.java similarity index 98% rename from tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/InterpreterTest.java rename to tensorflow/lite/java/src/test/java/org/tensorflow/lite/InterpreterTest.java index d5e0347402..612229d172 100644 --- a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/InterpreterTest.java +++ b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/InterpreterTest.java @@ -38,13 +38,13 @@ import org.junit.runners.JUnit4; public final class InterpreterTest { private static final File MODEL_FILE = - new File("tensorflow/contrib/lite/java/src/testdata/add.bin"); + new File("tensorflow/lite/java/src/testdata/add.bin"); private static final File MOBILENET_MODEL_FILE = - new File("tensorflow/contrib/lite/java/src/testdata/mobilenet.tflite.bin"); + new File("tensorflow/lite/java/src/testdata/mobilenet.tflite.bin"); private static final File FLEX_MODEL_FILE = - new File("tensorflow/contrib/lite/testdata/multi_add_flex.bin"); + new File("tensorflow/lite/testdata/multi_add_flex.bin"); @Test public void testInterpreter() throws Exception { diff --git a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/NativeInterpreterWrapperTest.java b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/NativeInterpreterWrapperTest.java similarity index 97% rename from tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/NativeInterpreterWrapperTest.java rename to tensorflow/lite/java/src/test/java/org/tensorflow/lite/NativeInterpreterWrapperTest.java index 270bd6703a..07d334c33b 100644 --- a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/NativeInterpreterWrapperTest.java +++ b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/NativeInterpreterWrapperTest.java @@ -32,28 +32,28 @@ import org.junit.runners.JUnit4; public final class NativeInterpreterWrapperTest { private static final String FLOAT_MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/add.bin"; + "tensorflow/lite/java/src/testdata/add.bin"; private static final String INT_MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/int32.bin"; + "tensorflow/lite/java/src/testdata/int32.bin"; private static final String LONG_MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/int64.bin"; + "tensorflow/lite/java/src/testdata/int64.bin"; private static final String BYTE_MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/uint8.bin"; + "tensorflow/lite/java/src/testdata/uint8.bin"; private static final String QUANTIZED_MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/quantized.bin"; + "tensorflow/lite/java/src/testdata/quantized.bin"; private static final String INVALID_MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/invalid_model.bin"; + "tensorflow/lite/java/src/testdata/invalid_model.bin"; private static final String MODEL_WITH_CUSTOM_OP_PATH = - "tensorflow/contrib/lite/java/src/testdata/with_custom_op.lite"; + "tensorflow/lite/java/src/testdata/with_custom_op.lite"; private static final String NONEXISTING_MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/nonexisting_model.bin"; + "tensorflow/lite/java/src/testdata/nonexisting_model.bin"; @Test public void testConstructor() { diff --git a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/TensorFlowLiteTest.java b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/TensorFlowLiteTest.java similarity index 100% rename from tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/TensorFlowLiteTest.java rename to tensorflow/lite/java/src/test/java/org/tensorflow/lite/TensorFlowLiteTest.java diff --git a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/TensorTest.java b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/TensorTest.java similarity index 99% rename from tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/TensorTest.java rename to tensorflow/lite/java/src/test/java/org/tensorflow/lite/TensorTest.java index 56a38ea3e2..35ff4328b8 100644 --- a/tensorflow/contrib/lite/java/src/test/java/org/tensorflow/lite/TensorTest.java +++ b/tensorflow/lite/java/src/test/java/org/tensorflow/lite/TensorTest.java @@ -33,7 +33,7 @@ import org.junit.runners.JUnit4; public final class TensorTest { private static final String MODEL_PATH = - "tensorflow/contrib/lite/java/src/testdata/add.bin"; + "tensorflow/lite/java/src/testdata/add.bin"; private NativeInterpreterWrapper wrapper; private Tensor tensor; diff --git a/tensorflow/contrib/lite/java/src/test/native/BUILD b/tensorflow/lite/java/src/test/native/BUILD similarity index 70% rename from tensorflow/contrib/lite/java/src/test/native/BUILD rename to tensorflow/lite/java/src/test/native/BUILD index 17a10587dc..27fc95f1f7 100644 --- a/tensorflow/contrib/lite/java/src/test/native/BUILD +++ b/tensorflow/lite/java/src/test/native/BUILD @@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_jni_binary") +load("//tensorflow/lite:build_def.bzl", "tflite_jni_binary") cc_library( name = "native", @@ -17,11 +17,11 @@ cc_library( # For non-Android toolchains, generate jni.h and jni_md.h. "//tensorflow:android": [], "//conditions:default": [ - "//tensorflow/contrib/lite/java/src/main/native:jni.h", - "//tensorflow/contrib/lite/java/src/main/native:jni_md.h", + "//tensorflow/lite/java/src/main/native:jni.h", + "//tensorflow/lite/java/src/main/native:jni_md.h", ], }), - deps = ["//tensorflow/contrib/lite/c:c_api_internal"], + deps = ["//tensorflow/lite/c:c_api_internal"], ) tflite_jni_binary( diff --git a/tensorflow/contrib/lite/java/src/test/native/interpreter_test_jni.cc b/tensorflow/lite/java/src/test/native/interpreter_test_jni.cc similarity index 98% rename from tensorflow/contrib/lite/java/src/test/native/interpreter_test_jni.cc rename to tensorflow/lite/java/src/test/native/interpreter_test_jni.cc index 6aad4973f7..954b1144f2 100644 --- a/tensorflow/contrib/lite/java/src/test/native/interpreter_test_jni.cc +++ b/tensorflow/lite/java/src/test/native/interpreter_test_jni.cc @@ -14,7 +14,7 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" #ifdef __cplusplus extern "C" { diff --git a/tensorflow/contrib/lite/java/src/testdata/add.bin b/tensorflow/lite/java/src/testdata/add.bin similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/add.bin rename to tensorflow/lite/java/src/testdata/add.bin diff --git a/tensorflow/contrib/lite/java/src/testdata/float32.bin b/tensorflow/lite/java/src/testdata/float32.bin similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/float32.bin rename to tensorflow/lite/java/src/testdata/float32.bin diff --git a/tensorflow/contrib/lite/java/src/testdata/int32.bin b/tensorflow/lite/java/src/testdata/int32.bin similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/int32.bin rename to tensorflow/lite/java/src/testdata/int32.bin diff --git a/tensorflow/contrib/lite/java/src/testdata/int64.bin b/tensorflow/lite/java/src/testdata/int64.bin similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/int64.bin rename to tensorflow/lite/java/src/testdata/int64.bin diff --git a/tensorflow/contrib/lite/java/src/testdata/invalid_model.bin b/tensorflow/lite/java/src/testdata/invalid_model.bin similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/invalid_model.bin rename to tensorflow/lite/java/src/testdata/invalid_model.bin diff --git a/tensorflow/contrib/lite/java/src/testdata/quantized.bin b/tensorflow/lite/java/src/testdata/quantized.bin similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/quantized.bin rename to tensorflow/lite/java/src/testdata/quantized.bin diff --git a/tensorflow/contrib/lite/java/src/testdata/uint8.bin b/tensorflow/lite/java/src/testdata/uint8.bin similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/uint8.bin rename to tensorflow/lite/java/src/testdata/uint8.bin diff --git a/tensorflow/contrib/lite/java/src/testdata/with_custom_op.lite b/tensorflow/lite/java/src/testdata/with_custom_op.lite similarity index 100% rename from tensorflow/contrib/lite/java/src/testdata/with_custom_op.lite rename to tensorflow/lite/java/src/testdata/with_custom_op.lite diff --git a/tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite/BUILD b/tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite/BUILD similarity index 85% rename from tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite/BUILD rename to tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite/BUILD index af1d99ef41..88641c86ed 100644 --- a/tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite/BUILD +++ b/tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite/BUILD @@ -15,6 +15,6 @@ android_library( ], ), deps = [ - "//tensorflow/contrib/lite/java:tensorflowlite_java", + "//tensorflow/lite/java:tensorflowlite_java", ], ) diff --git a/tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite/TestHelper.java b/tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite/TestHelper.java similarity index 100% rename from tensorflow/contrib/lite/java/src/testhelper/java/org/tensorflow/lite/TestHelper.java rename to tensorflow/lite/java/src/testhelper/java/org/tensorflow/lite/TestHelper.java diff --git a/tensorflow/contrib/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD similarity index 68% rename from tensorflow/contrib/lite/kernels/BUILD rename to tensorflow/lite/kernels/BUILD index 363e7ed2e8..010ba83466 100644 --- a/tensorflow/contrib/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -4,8 +4,8 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_opts_nortti_if_android") # Suppress warnings that are introduced by Eigen Tensor. @@ -31,8 +31,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -44,12 +44,12 @@ cc_library( hdrs = ["test_util.h"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels/internal:tensor_utils", - "//tensorflow/contrib/lite/testing:util", "//tensorflow/core:tflite_portable_logging", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels/internal:tensor_utils", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -65,9 +65,9 @@ cc_library( copts = tflite_copts() + EXTRA_EIGEN_COPTS, deps = [ ":op_macros", - "//tensorflow/contrib/lite:arena_planner", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels/internal:optimized", + "//tensorflow/lite:arena_planner", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels/internal:optimized", ], ) @@ -82,7 +82,7 @@ cc_library( copts = tflite_copts(), deps = [ ":op_macros", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", "@gemmlowp", ], ) @@ -93,7 +93,7 @@ cc_library( "activation_functor.h", ], deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -113,9 +113,9 @@ cc_library( "kernel_util.h", ], deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels/internal:round", - "//tensorflow/contrib/lite/kernels/internal:types", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels/internal:round", + "//tensorflow/lite/kernels/internal:types", ], ) @@ -129,7 +129,7 @@ tf_cc_test( ], deps = [ ":kernel_util", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -144,7 +144,7 @@ tf_cc_test( ], deps = [ ":test_util", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -154,7 +154,7 @@ cc_library( srcs = [], hdrs = ["padding.h"], deps = [ - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -243,18 +243,18 @@ cc_library( ":lstm_eval", ":op_macros", ":padding", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:gemm_support", - "//tensorflow/contrib/lite/kernels/internal:audio_utils", - "//tensorflow/contrib/lite/kernels/internal:kernel_utils", - "//tensorflow/contrib/lite/kernels/internal:optimized", - "//tensorflow/contrib/lite/kernels/internal:optimized_base", - "//tensorflow/contrib/lite/kernels/internal:quantization_util", - "//tensorflow/contrib/lite/kernels/internal:reference_base", - "//tensorflow/contrib/lite/kernels/internal:tensor", - "//tensorflow/contrib/lite/kernels/internal:tensor_utils", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:gemm_support", + "//tensorflow/lite/kernels/internal:audio_utils", + "//tensorflow/lite/kernels/internal:kernel_utils", + "//tensorflow/lite/kernels/internal:optimized", + "//tensorflow/lite/kernels/internal:optimized_base", + "//tensorflow/lite/kernels/internal:quantization_util", + "//tensorflow/lite/kernels/internal:reference_base", + "//tensorflow/lite/kernels/internal:tensor", + "//tensorflow/lite/kernels/internal:tensor_utils", "@farmhash_archive//:farmhash", "@flatbuffers", ], @@ -266,9 +266,9 @@ cc_library( hdrs = ["lstm_eval.h"], deps = [ ":op_macros", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels/internal:kernel_utils", - "//tensorflow/contrib/lite/kernels/internal:tensor_utils", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels/internal:kernel_utils", + "//tensorflow/lite/kernels/internal:tensor_utils", ], ) @@ -278,9 +278,9 @@ cc_library( hdrs = ["register.h"], deps = [ ":builtin_op_kernels", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:util", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite:framework", + "//tensorflow/lite:util", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -294,8 +294,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -311,8 +311,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -328,8 +328,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -345,8 +345,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -362,8 +362,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -376,8 +376,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -389,8 +389,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -405,8 +405,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -421,8 +421,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -437,8 +437,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -453,10 +453,10 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", - "//tensorflow/contrib/lite/kernels/internal:reference", - "//tensorflow/contrib/lite/kernels/internal:reference_base", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", + "//tensorflow/lite/kernels/internal:reference", + "//tensorflow/lite/kernels/internal:reference_base", "@com_google_googletest//:gtest", ], ) @@ -471,8 +471,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -487,8 +487,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -503,8 +503,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -516,8 +516,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -529,8 +529,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -543,8 +543,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -560,8 +560,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -574,8 +574,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -590,9 +590,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -607,8 +607,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -623,8 +623,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -639,8 +639,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -655,8 +655,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -671,8 +671,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -684,8 +684,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -700,8 +700,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -716,8 +716,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -732,8 +732,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -748,8 +748,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -761,8 +761,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -777,8 +777,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -790,8 +790,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -806,9 +806,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -823,9 +823,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -837,8 +837,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -850,8 +850,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -863,8 +863,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -876,8 +876,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -889,8 +889,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -902,9 +902,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", - "//tensorflow/contrib/lite/kernels/internal:tensor_utils", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", + "//tensorflow/lite/kernels/internal:tensor_utils", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -917,8 +917,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -930,8 +930,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -943,9 +943,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", - "//tensorflow/contrib/lite/kernels/internal:reference_base", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", + "//tensorflow/lite/kernels/internal:reference_base", "@com_google_googletest//:gtest", ], ) @@ -960,9 +960,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", - "//tensorflow/contrib/lite/kernels/internal:reference_base", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", + "//tensorflow/lite/kernels/internal:reference_base", "@com_google_googletest//:gtest", ], ) @@ -974,8 +974,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -987,9 +987,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1001,8 +1001,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -1015,8 +1015,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1028,9 +1028,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1042,8 +1042,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1058,8 +1058,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1074,8 +1074,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1090,8 +1090,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1106,9 +1106,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1125,8 +1125,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1141,8 +1141,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1159,8 +1159,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1177,8 +1177,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1193,8 +1193,8 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -1210,9 +1210,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1227,9 +1227,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1244,9 +1244,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1261,9 +1261,9 @@ tf_cc_test( ], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1275,9 +1275,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1289,8 +1289,8 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1302,9 +1302,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1316,9 +1316,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1330,9 +1330,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1344,9 +1344,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1358,9 +1358,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -1372,9 +1372,9 @@ tf_cc_test( tags = ["tflite_not_portable_ios"], deps = [ ":builtin_ops", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/kernels/activation_functor.h b/tensorflow/lite/kernels/activation_functor.h similarity index 86% rename from tensorflow/contrib/lite/kernels/activation_functor.h rename to tensorflow/lite/kernels/activation_functor.h index e075dc7054..60e93c185a 100644 --- a/tensorflow/contrib/lite/kernels/activation_functor.h +++ b/tensorflow/lite/kernels/activation_functor.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_CONTRIB_LITE_KERNELS_ACTIVATION_FUNCTOR_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_ACTIVATION_FUNCTOR_H_ +#ifndef TENSORFLOW_LITE_KERNELS_ACTIVATION_FUNCTOR_H_ +#define TENSORFLOW_LITE_KERNELS_ACTIVATION_FUNCTOR_H_ #include #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" namespace tflite { @@ -55,4 +55,4 @@ class ActivationFunctor { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_ACTIVATION_FUNCTOR_H_ +#endif // TENSORFLOW_LITE_KERNELS_ACTIVATION_FUNCTOR_H_ diff --git a/tensorflow/contrib/lite/kernels/activations.cc b/tensorflow/lite/kernels/activations.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/activations.cc rename to tensorflow/lite/kernels/activations.cc index 9aed4f09b8..9c525d9640 100644 --- a/tensorflow/contrib/lite/kernels/activations.cc +++ b/tensorflow/lite/kernels/activations.cc @@ -19,14 +19,14 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/activations_test.cc b/tensorflow/lite/kernels/activations_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/activations_test.cc rename to tensorflow/lite/kernels/activations_test.cc index 9fa47e190a..fff4121dc0 100644 --- a/tensorflow/contrib/lite/kernels/activations_test.cc +++ b/tensorflow/lite/kernels/activations_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/add.cc b/tensorflow/lite/kernels/add.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/add.cc rename to tensorflow/lite/kernels/add.cc index b4393e8097..f4bfd8d324 100644 --- a/tensorflow/contrib/lite/kernels/add.cc +++ b/tensorflow/lite/kernels/add.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/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/add_test.cc b/tensorflow/lite/kernels/add_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/add_test.cc rename to tensorflow/lite/kernels/add_test.cc index 261dd36ef0..1d33adf199 100644 --- a/tensorflow/contrib/lite/kernels/add_test.cc +++ b/tensorflow/lite/kernels/add_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/arg_min_max.cc b/tensorflow/lite/kernels/arg_min_max.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/arg_min_max.cc rename to tensorflow/lite/kernels/arg_min_max.cc index 531f4e1f1b..eea2de27f7 100644 --- a/tensorflow/contrib/lite/kernels/arg_min_max.cc +++ b/tensorflow/lite/kernels/arg_min_max.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/arg_min_max_test.cc b/tensorflow/lite/kernels/arg_min_max_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/arg_min_max_test.cc rename to tensorflow/lite/kernels/arg_min_max_test.cc index c8181efc36..dcdff74cc6 100644 --- a/tensorflow/contrib/lite/kernels/arg_min_max_test.cc +++ b/tensorflow/lite/kernels/arg_min_max_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/audio_spectrogram.cc b/tensorflow/lite/kernels/audio_spectrogram.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/audio_spectrogram.cc rename to tensorflow/lite/kernels/audio_spectrogram.cc index 0d2d5e775f..5a995b31ca 100644 --- a/tensorflow/contrib/lite/kernels/audio_spectrogram.cc +++ b/tensorflow/lite/kernels/audio_spectrogram.cc @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/spectrogram.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/spectrogram.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" #include "flatbuffers/flexbuffers.h" // TF:flatbuffers diff --git a/tensorflow/contrib/lite/kernels/audio_spectrogram_test.cc b/tensorflow/lite/kernels/audio_spectrogram_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/audio_spectrogram_test.cc rename to tensorflow/lite/kernels/audio_spectrogram_test.cc index 7e4ff6fc16..527af2767b 100644 --- a/tensorflow/contrib/lite/kernels/audio_spectrogram_test.cc +++ b/tensorflow/lite/kernels/audio_spectrogram_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/basic_rnn.cc b/tensorflow/lite/kernels/basic_rnn.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/basic_rnn.cc rename to tensorflow/lite/kernels/basic_rnn.cc index 7ec92ad401..7c66ce1992 100644 --- a/tensorflow/contrib/lite/kernels/basic_rnn.cc +++ b/tensorflow/lite/kernels/basic_rnn.cc @@ -15,12 +15,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/basic_rnn_test.cc b/tensorflow/lite/kernels/basic_rnn_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/basic_rnn_test.cc rename to tensorflow/lite/kernels/basic_rnn_test.cc index d179735404..240057d18a 100644 --- a/tensorflow/contrib/lite/kernels/basic_rnn_test.cc +++ b/tensorflow/lite/kernels/basic_rnn_test.cc @@ -21,10 +21,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/batch_to_space_nd.cc b/tensorflow/lite/kernels/batch_to_space_nd.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/batch_to_space_nd.cc rename to tensorflow/lite/kernels/batch_to_space_nd.cc index fe2865dfb9..34fdf34f70 100644 --- a/tensorflow/contrib/lite/kernels/batch_to_space_nd.cc +++ b/tensorflow/lite/kernels/batch_to_space_nd.cc @@ -14,13 +14,13 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/batch_to_space_nd_test.cc b/tensorflow/lite/kernels/batch_to_space_nd_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/batch_to_space_nd_test.cc rename to tensorflow/lite/kernels/batch_to_space_nd_test.cc index 95b025c1b3..a3e06d4c89 100644 --- a/tensorflow/contrib/lite/kernels/batch_to_space_nd_test.cc +++ b/tensorflow/lite/kernels/batch_to_space_nd_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/bidirectional_sequence_lstm.cc b/tensorflow/lite/kernels/bidirectional_sequence_lstm.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/bidirectional_sequence_lstm.cc rename to tensorflow/lite/kernels/bidirectional_sequence_lstm.cc index f8660fbaa2..2c345bba69 100644 --- a/tensorflow/contrib/lite/kernels/bidirectional_sequence_lstm.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_lstm.cc @@ -20,14 +20,14 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/lstm_eval.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/lstm_eval.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/bidirectional_sequence_lstm_test.cc b/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/bidirectional_sequence_lstm_test.cc rename to tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc index db98d6c49d..b865322682 100644 --- a/tensorflow/contrib/lite/kernels/bidirectional_sequence_lstm_test.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc @@ -21,11 +21,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/bidirectional_sequence_rnn.cc b/tensorflow/lite/kernels/bidirectional_sequence_rnn.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/bidirectional_sequence_rnn.cc rename to tensorflow/lite/kernels/bidirectional_sequence_rnn.cc index 8b281b174e..5194c24630 100644 --- a/tensorflow/contrib/lite/kernels/bidirectional_sequence_rnn.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_rnn.cc @@ -19,12 +19,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/bidirectional_sequence_rnn_test.cc b/tensorflow/lite/kernels/bidirectional_sequence_rnn_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/bidirectional_sequence_rnn_test.cc rename to tensorflow/lite/kernels/bidirectional_sequence_rnn_test.cc index d0d04428c9..5bad8e02c2 100644 --- a/tensorflow/contrib/lite/kernels/bidirectional_sequence_rnn_test.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_rnn_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/cast.cc b/tensorflow/lite/kernels/cast.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/cast.cc rename to tensorflow/lite/kernels/cast.cc index a7972140ac..ac6c85b969 100644 --- a/tensorflow/contrib/lite/kernels/cast.cc +++ b/tensorflow/lite/kernels/cast.cc @@ -15,13 +15,13 @@ limitations under the License. #include #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/cast_test.cc b/tensorflow/lite/kernels/cast_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/cast_test.cc rename to tensorflow/lite/kernels/cast_test.cc index 954f998206..acdc331a7e 100644 --- a/tensorflow/contrib/lite/kernels/cast_test.cc +++ b/tensorflow/lite/kernels/cast_test.cc @@ -15,10 +15,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/comparisons.cc b/tensorflow/lite/kernels/comparisons.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/comparisons.cc rename to tensorflow/lite/kernels/comparisons.cc index 3926af5b97..125397c509 100644 --- a/tensorflow/contrib/lite/kernels/comparisons.cc +++ b/tensorflow/lite/kernels/comparisons.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/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/comparisons_test.cc b/tensorflow/lite/kernels/comparisons_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/comparisons_test.cc rename to tensorflow/lite/kernels/comparisons_test.cc index 04c8bf2e30..3c278c1f9e 100644 --- a/tensorflow/contrib/lite/kernels/comparisons_test.cc +++ b/tensorflow/lite/kernels/comparisons_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/concatenation.cc b/tensorflow/lite/kernels/concatenation.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/concatenation.cc rename to tensorflow/lite/kernels/concatenation.cc index 7ad3399ffd..a8dd160c8d 100644 --- a/tensorflow/contrib/lite/kernels/concatenation.cc +++ b/tensorflow/lite/kernels/concatenation.cc @@ -19,13 +19,13 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/concatenation_test.cc b/tensorflow/lite/kernels/concatenation_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/concatenation_test.cc rename to tensorflow/lite/kernels/concatenation_test.cc index 467ff6f7e1..422380a03e 100644 --- a/tensorflow/contrib/lite/kernels/concatenation_test.cc +++ b/tensorflow/lite/kernels/concatenation_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/conv.cc b/tensorflow/lite/kernels/conv.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/conv.cc rename to tensorflow/lite/kernels/conv.cc index 6695282a92..0c14b9eb65 100644 --- a/tensorflow/contrib/lite/kernels/conv.cc +++ b/tensorflow/lite/kernels/conv.cc @@ -20,20 +20,20 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/eigen_support.h" -#include "tensorflow/contrib/lite/kernels/gemm_support.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/kernels/padding.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/eigen_support.h" +#include "tensorflow/lite/kernels/gemm_support.h" +#include "tensorflow/lite/kernels/internal/optimized/cblas_conv.h" +#include "tensorflow/lite/kernels/internal/optimized/multithreaded_conv.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/padding.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/conv_test.cc b/tensorflow/lite/kernels/conv_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/conv_test.cc rename to tensorflow/lite/kernels/conv_test.cc index f7e6f083ed..eebf9f9de4 100644 --- a/tensorflow/contrib/lite/kernels/conv_test.cc +++ b/tensorflow/lite/kernels/conv_test.cc @@ -16,10 +16,10 @@ limitations under the License. #include #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/depthwise_conv.cc b/tensorflow/lite/kernels/depthwise_conv.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/depthwise_conv.cc rename to tensorflow/lite/kernels/depthwise_conv.cc index 19958844a1..3f4ae5087b 100644 --- a/tensorflow/contrib/lite/kernels/depthwise_conv.cc +++ b/tensorflow/lite/kernels/depthwise_conv.cc @@ -19,17 +19,17 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_float.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_float.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_uint8.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/kernels/padding.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_float.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_float.h" +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/padding.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/depthwise_conv_test.cc b/tensorflow/lite/kernels/depthwise_conv_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/depthwise_conv_test.cc rename to tensorflow/lite/kernels/depthwise_conv_test.cc index 4a33a0319d..d924e6f700 100644 --- a/tensorflow/contrib/lite/kernels/depthwise_conv_test.cc +++ b/tensorflow/lite/kernels/depthwise_conv_test.cc @@ -15,10 +15,10 @@ limitations under the License. #include #include #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/dequantize.cc b/tensorflow/lite/kernels/dequantize.cc similarity index 90% rename from tensorflow/contrib/lite/kernels/dequantize.cc rename to tensorflow/lite/kernels/dequantize.cc index 59bf64e0af..b2825bb9ea 100644 --- a/tensorflow/contrib/lite/kernels/dequantize.cc +++ b/tensorflow/lite/kernels/dequantize.cc @@ -15,12 +15,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/dequantize_test.cc b/tensorflow/lite/kernels/dequantize_test.cc similarity index 90% rename from tensorflow/contrib/lite/kernels/dequantize_test.cc rename to tensorflow/lite/kernels/dequantize_test.cc index fcd7420617..55265d93e5 100644 --- a/tensorflow/contrib/lite/kernels/dequantize_test.cc +++ b/tensorflow/lite/kernels/dequantize_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/detection_postprocess.cc b/tensorflow/lite/kernels/detection_postprocess.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/detection_postprocess.cc rename to tensorflow/lite/kernels/detection_postprocess.cc index b24231eb06..84e2a0efb2 100644 --- a/tensorflow/contrib/lite/kernels/detection_postprocess.cc +++ b/tensorflow/lite/kernels/detection_postprocess.cc @@ -16,13 +16,13 @@ limitations under the License. #include #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/detection_postprocess_test.cc b/tensorflow/lite/kernels/detection_postprocess_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/detection_postprocess_test.cc rename to tensorflow/lite/kernels/detection_postprocess_test.cc index 4d7ddd64be..d7ffaf1d82 100644 --- a/tensorflow/contrib/lite/kernels/detection_postprocess_test.cc +++ b/tensorflow/lite/kernels/detection_postprocess_test.cc @@ -18,10 +18,10 @@ limitations under the License. #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/div.cc b/tensorflow/lite/kernels/div.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/div.cc rename to tensorflow/lite/kernels/div.cc index 8d4bb51006..fb40953123 100644 --- a/tensorflow/contrib/lite/kernels/div.cc +++ b/tensorflow/lite/kernels/div.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/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/div_test.cc b/tensorflow/lite/kernels/div_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/div_test.cc rename to tensorflow/lite/kernels/div_test.cc index 97aa2fe04e..68a8855dd1 100644 --- a/tensorflow/contrib/lite/kernels/div_test.cc +++ b/tensorflow/lite/kernels/div_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/eigen_support.cc b/tensorflow/lite/kernels/eigen_support.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/eigen_support.cc rename to tensorflow/lite/kernels/eigen_support.cc index e542ad0765..44e0086ad8 100644 --- a/tensorflow/contrib/lite/kernels/eigen_support.cc +++ b/tensorflow/lite/kernels/eigen_support.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/eigen_support.h" +#include "tensorflow/lite/kernels/eigen_support.h" #include -#include "tensorflow/contrib/lite/arena_planner.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/eigen_spatial_convolutions.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/arena_planner.h" +#include "tensorflow/lite/kernels/internal/optimized/eigen_spatial_convolutions.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace eigen_support { diff --git a/tensorflow/contrib/lite/kernels/eigen_support.h b/tensorflow/lite/kernels/eigen_support.h similarity index 85% rename from tensorflow/contrib/lite/kernels/eigen_support.h rename to tensorflow/lite/kernels/eigen_support.h index feb1543f7b..c24ae6896a 100644 --- a/tensorflow/contrib/lite/kernels/eigen_support.h +++ b/tensorflow/lite/kernels/eigen_support.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_CONTRIB_LITE_KERNELS_EIGEN_SUPPORT_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_EIGEN_SUPPORT_H_ +#ifndef TENSORFLOW_LITE_KERNELS_EIGEN_SUPPORT_H_ +#define TENSORFLOW_LITE_KERNELS_EIGEN_SUPPORT_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace EigenForTFLite { struct ThreadPoolDevice; @@ -38,4 +38,4 @@ const EigenForTFLite::ThreadPoolDevice* GetThreadPoolDevice( } // namespace eigen_support } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_EIGEN_SUPPORT_H_ +#endif // TENSORFLOW_LITE_KERNELS_EIGEN_SUPPORT_H_ diff --git a/tensorflow/contrib/lite/kernels/elementwise.cc b/tensorflow/lite/kernels/elementwise.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/elementwise.cc rename to tensorflow/lite/kernels/elementwise.cc index 8c624b3208..416a69eb0e 100644 --- a/tensorflow/contrib/lite/kernels/elementwise.cc +++ b/tensorflow/lite/kernels/elementwise.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/elementwise_test.cc b/tensorflow/lite/kernels/elementwise_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/elementwise_test.cc rename to tensorflow/lite/kernels/elementwise_test.cc index 5dd89a0eae..52df8dc3cc 100644 --- a/tensorflow/contrib/lite/kernels/elementwise_test.cc +++ b/tensorflow/lite/kernels/elementwise_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/embedding_lookup.cc b/tensorflow/lite/kernels/embedding_lookup.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/embedding_lookup.cc rename to tensorflow/lite/kernels/embedding_lookup.cc index 1d0c71ad48..fad32607b4 100644 --- a/tensorflow/contrib/lite/kernels/embedding_lookup.cc +++ b/tensorflow/lite/kernels/embedding_lookup.cc @@ -37,10 +37,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/embedding_lookup_sparse.cc b/tensorflow/lite/kernels/embedding_lookup_sparse.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/embedding_lookup_sparse.cc rename to tensorflow/lite/kernels/embedding_lookup_sparse.cc index 0b076941ea..72bfe5b4f5 100644 --- a/tensorflow/contrib/lite/kernels/embedding_lookup_sparse.cc +++ b/tensorflow/lite/kernels/embedding_lookup_sparse.cc @@ -65,11 +65,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/embedding_lookup_sparse_test.cc b/tensorflow/lite/kernels/embedding_lookup_sparse_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/embedding_lookup_sparse_test.cc rename to tensorflow/lite/kernels/embedding_lookup_sparse_test.cc index ef2b542225..0c555fdd7d 100644 --- a/tensorflow/contrib/lite/kernels/embedding_lookup_sparse_test.cc +++ b/tensorflow/lite/kernels/embedding_lookup_sparse_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/embedding_lookup_test.cc b/tensorflow/lite/kernels/embedding_lookup_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/embedding_lookup_test.cc rename to tensorflow/lite/kernels/embedding_lookup_test.cc index 4a88d168c6..8ea98a5f0d 100644 --- a/tensorflow/contrib/lite/kernels/embedding_lookup_test.cc +++ b/tensorflow/lite/kernels/embedding_lookup_test.cc @@ -20,10 +20,10 @@ License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/exp.cc b/tensorflow/lite/kernels/exp.cc similarity index 88% rename from tensorflow/contrib/lite/kernels/exp.cc rename to tensorflow/lite/kernels/exp.cc index 673e7be90a..607b398ebd 100644 --- a/tensorflow/contrib/lite/kernels/exp.cc +++ b/tensorflow/lite/kernels/exp.cc @@ -14,12 +14,12 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/exp_test.cc b/tensorflow/lite/kernels/exp_test.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/exp_test.cc rename to tensorflow/lite/kernels/exp_test.cc index eed67369a1..fa71fe351a 100644 --- a/tensorflow/contrib/lite/kernels/exp_test.cc +++ b/tensorflow/lite/kernels/exp_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/expand_dims.cc b/tensorflow/lite/kernels/expand_dims.cc similarity index 90% rename from tensorflow/contrib/lite/kernels/expand_dims.cc rename to tensorflow/lite/kernels/expand_dims.cc index fa1140b19c..dd2479f34e 100644 --- a/tensorflow/contrib/lite/kernels/expand_dims.cc +++ b/tensorflow/lite/kernels/expand_dims.cc @@ -15,12 +15,12 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { namespace builtin { diff --git a/tensorflow/contrib/lite/kernels/expand_dims_test.cc b/tensorflow/lite/kernels/expand_dims_test.cc similarity index 90% rename from tensorflow/contrib/lite/kernels/expand_dims_test.cc rename to tensorflow/lite/kernels/expand_dims_test.cc index a3bc1813db..ea0c6c0fc8 100644 --- a/tensorflow/contrib/lite/kernels/expand_dims_test.cc +++ b/tensorflow/lite/kernels/expand_dims_test.cc @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/fake_quant.cc b/tensorflow/lite/kernels/fake_quant.cc similarity index 89% rename from tensorflow/contrib/lite/kernels/fake_quant.cc rename to tensorflow/lite/kernels/fake_quant.cc index b51af72fe6..9c799a7ec2 100644 --- a/tensorflow/contrib/lite/kernels/fake_quant.cc +++ b/tensorflow/lite/kernels/fake_quant.cc @@ -14,12 +14,12 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/fake_quant_test.cc b/tensorflow/lite/kernels/fake_quant_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/fake_quant_test.cc rename to tensorflow/lite/kernels/fake_quant_test.cc index 11a02f7ed7..ce14703421 100644 --- a/tensorflow/contrib/lite/kernels/fake_quant_test.cc +++ b/tensorflow/lite/kernels/fake_quant_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/floor.cc b/tensorflow/lite/kernels/floor.cc similarity index 88% rename from tensorflow/contrib/lite/kernels/floor.cc rename to tensorflow/lite/kernels/floor.cc index 59ff77f35b..aa117e3cac 100644 --- a/tensorflow/contrib/lite/kernels/floor.cc +++ b/tensorflow/lite/kernels/floor.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/floor_div.cc b/tensorflow/lite/kernels/floor_div.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/floor_div.cc rename to tensorflow/lite/kernels/floor_div.cc index 5d62cd2755..9d404af5b0 100644 --- a/tensorflow/contrib/lite/kernels/floor_div.cc +++ b/tensorflow/lite/kernels/floor_div.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/floor_div_test.cc b/tensorflow/lite/kernels/floor_div_test.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/floor_div_test.cc rename to tensorflow/lite/kernels/floor_div_test.cc index eea69b61ac..8816260d9b 100644 --- a/tensorflow/contrib/lite/kernels/floor_div_test.cc +++ b/tensorflow/lite/kernels/floor_div_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/floor_mod.cc b/tensorflow/lite/kernels/floor_mod.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/floor_mod.cc rename to tensorflow/lite/kernels/floor_mod.cc index b6bf054443..a1ac231736 100644 --- a/tensorflow/contrib/lite/kernels/floor_mod.cc +++ b/tensorflow/lite/kernels/floor_mod.cc @@ -14,11 +14,11 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" // TODO(b/117523611): We should factor out a binary_op and put binary ops there. namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/floor_mod_test.cc b/tensorflow/lite/kernels/floor_mod_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/floor_mod_test.cc rename to tensorflow/lite/kernels/floor_mod_test.cc index c581a53936..9d75f5ce2e 100644 --- a/tensorflow/contrib/lite/kernels/floor_mod_test.cc +++ b/tensorflow/lite/kernels/floor_mod_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/floor_test.cc b/tensorflow/lite/kernels/floor_test.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/floor_test.cc rename to tensorflow/lite/kernels/floor_test.cc index b71e0400b6..9bcbdba8a4 100644 --- a/tensorflow/contrib/lite/kernels/floor_test.cc +++ b/tensorflow/lite/kernels/floor_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/fully_connected.cc b/tensorflow/lite/kernels/fully_connected.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/fully_connected.cc rename to tensorflow/lite/kernels/fully_connected.cc index cac556db33..63cca1cf54 100644 --- a/tensorflow/contrib/lite/kernels/fully_connected.cc +++ b/tensorflow/lite/kernels/fully_connected.cc @@ -20,17 +20,17 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/gemm_support.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/gemm_support.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/fully_connected_test.cc b/tensorflow/lite/kernels/fully_connected_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/fully_connected_test.cc rename to tensorflow/lite/kernels/fully_connected_test.cc index 08b4320946..3351a30b12 100644 --- a/tensorflow/contrib/lite/kernels/fully_connected_test.cc +++ b/tensorflow/lite/kernels/fully_connected_test.cc @@ -21,11 +21,11 @@ limitations under the License. #include #include #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/gather.cc b/tensorflow/lite/kernels/gather.cc similarity index 92% rename from tensorflow/contrib/lite/kernels/gather.cc rename to tensorflow/lite/kernels/gather.cc index b5afeb1a7b..11b2a6622a 100644 --- a/tensorflow/contrib/lite/kernels/gather.cc +++ b/tensorflow/lite/kernels/gather.cc @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/gather_test.cc b/tensorflow/lite/kernels/gather_test.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/gather_test.cc rename to tensorflow/lite/kernels/gather_test.cc index 1b48884e09..ca2dd0d48d 100644 --- a/tensorflow/contrib/lite/kernels/gather_test.cc +++ b/tensorflow/lite/kernels/gather_test.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/gemm_support.cc b/tensorflow/lite/kernels/gemm_support.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/gemm_support.cc rename to tensorflow/lite/kernels/gemm_support.cc index ed334af2da..cc224cb884 100644 --- a/tensorflow/contrib/lite/kernels/gemm_support.cc +++ b/tensorflow/lite/kernels/gemm_support.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/gemm_support.h" +#include "tensorflow/lite/kernels/gemm_support.h" #include -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace gemm_support { diff --git a/tensorflow/contrib/lite/kernels/gemm_support.h b/tensorflow/lite/kernels/gemm_support.h similarity index 89% rename from tensorflow/contrib/lite/kernels/gemm_support.h rename to tensorflow/lite/kernels/gemm_support.h index 43cd2b3055..1feb638952 100644 --- a/tensorflow/contrib/lite/kernels/gemm_support.h +++ b/tensorflow/lite/kernels/gemm_support.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_CONTRIB_LITE_KERNELS_GEMM_SUPPORT_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_GEMM_SUPPORT_H_ +#ifndef TENSORFLOW_LITE_KERNELS_GEMM_SUPPORT_H_ +#define TENSORFLOW_LITE_KERNELS_GEMM_SUPPORT_H_ #include "public/gemmlowp.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { namespace gemm_support { @@ -48,4 +48,4 @@ void DecrementUsageCounter(TfLiteContext* context); } // namespace gemm_support } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_GEMM_SUPPORT_H_ +#endif // TENSORFLOW_LITE_KERNELS_GEMM_SUPPORT_H_ diff --git a/tensorflow/contrib/lite/kernels/hashtable_lookup.cc b/tensorflow/lite/kernels/hashtable_lookup.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/hashtable_lookup.cc rename to tensorflow/lite/kernels/hashtable_lookup.cc index c0b3c3c0c5..b6ae7a3d1a 100644 --- a/tensorflow/contrib/lite/kernels/hashtable_lookup.cc +++ b/tensorflow/lite/kernels/hashtable_lookup.cc @@ -39,11 +39,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/hashtable_lookup_test.cc b/tensorflow/lite/kernels/hashtable_lookup_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/hashtable_lookup_test.cc rename to tensorflow/lite/kernels/hashtable_lookup_test.cc index ba0ed5ce06..d2ca76a206 100644 --- a/tensorflow/contrib/lite/kernels/hashtable_lookup_test.cc +++ b/tensorflow/lite/kernels/hashtable_lookup_test.cc @@ -19,11 +19,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/internal/BUILD b/tensorflow/lite/kernels/internal/BUILD similarity index 89% rename from tensorflow/contrib/lite/kernels/internal/BUILD rename to tensorflow/lite/kernels/internal/BUILD index 9f8f224094..32f61e0280 100644 --- a/tensorflow/contrib/lite/kernels/internal/BUILD +++ b/tensorflow/lite/kernels/internal/BUILD @@ -4,8 +4,8 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") tflite_deps_intel = [ "@arm_neon_2_x86_sse", @@ -44,7 +44,7 @@ cc_library( "types.h", ], deps = [ - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/kernels:op_macros", "@com_google_absl//absl/base:core_headers", ], ) @@ -58,7 +58,7 @@ cc_library( "types.h", ], deps = [ - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/kernels:op_macros", "@com_google_absl//absl/base:core_headers", ], ) @@ -181,7 +181,7 @@ cc_library( ":tensor_utils", "//third_party/eigen3", "@gemmlowp", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ] + select({ ":haswell": tflite_deps_intel, ":ios_x86_64": tflite_deps_intel, @@ -217,7 +217,7 @@ cc_library( ":round", "//third_party/eigen3", "@gemmlowp", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ] + select({ ":haswell": tflite_deps_intel, ":ios_x86_64": tflite_deps_intel, @@ -247,7 +247,7 @@ cc_library( ":optimized_base", ":tensor", ":types", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", "//third_party/eigen3", ], ) @@ -281,7 +281,7 @@ cc_library( deps = [ ":round", ":types", - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/kernels:op_macros", ], ) @@ -326,8 +326,8 @@ cc_library( ":strided_slice_logic", ":types", "@gemmlowp", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:op_macros", ] + select({ ":haswell": tflite_deps_intel, ":ios_x86_64": tflite_deps_intel, @@ -360,8 +360,8 @@ cc_library( ":legacy_types", ":types", "@gemmlowp", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:op_macros", ] + select({ ":haswell": tflite_deps_intel, ":ios_x86_64": tflite_deps_intel, @@ -383,7 +383,7 @@ cc_library( ], deps = [ ":types", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -396,7 +396,7 @@ cc_library( ], deps = [ ":types", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -410,9 +410,9 @@ cc_library( ], deps = [ ":round", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:activation_functor", - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:activation_functor", + "//tensorflow/lite/kernels:op_macros", ], ) @@ -435,9 +435,9 @@ cc_library( ":cpu_check", ":round", ":types", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:activation_functor", - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:activation_functor", + "//tensorflow/lite/kernels:op_macros", "@arm_neon_2_x86_sse", "@gemmlowp", ], @@ -449,7 +449,7 @@ cc_library( hdrs = ["kernel_utils.h"], deps = [ ":tensor_utils", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", ], ) @@ -492,9 +492,9 @@ cc_library( copts = NEON_FLAGS_IF_APPLICABLE, deps = [ "@com_google_absl//absl/base:core_headers", - "//tensorflow/contrib/lite/c:c_api_internal", + "//tensorflow/lite/c:c_api_internal", "@arm_neon_2_x86_sse", - "//tensorflow/contrib/lite/kernels:op_macros", + "//tensorflow/lite/kernels:op_macros", "@gemmlowp", ] + select({ ":arm": [ @@ -548,7 +548,7 @@ cc_library( hdrs = ["test_util.h"], deps = [ ":types", - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:string", ], ) @@ -569,8 +569,8 @@ cc_test( ], deps = [ ":tensor_utils", - "//tensorflow/contrib/lite/c:c_api_internal", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite/c:c_api_internal", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest_main", ], ) @@ -648,7 +648,7 @@ cc_test( ":quantization_util", ":reference_base", ":test_util", - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:string", "@com_google_googletest//:gtest_main", ], ) @@ -668,7 +668,7 @@ cc_test( ":quantization_util", ":reference_base", ":test_util", - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:string", "@com_google_googletest//:gtest_main", ], ) @@ -680,7 +680,7 @@ cc_test( deps = [ ":optimized_base", ":reference_base", - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:string", "@com_google_googletest//:gtest_main", ], ) diff --git a/tensorflow/contrib/lite/kernels/internal/batch_to_space_nd_test.cc b/tensorflow/lite/kernels/internal/batch_to_space_nd_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/internal/batch_to_space_nd_test.cc rename to tensorflow/lite/kernels/internal/batch_to_space_nd_test.cc index 5a2901ac8c..5fc2c93ba0 100644 --- a/tensorflow/contrib/lite/kernels/internal/batch_to_space_nd_test.cc +++ b/tensorflow/lite/kernels/internal/batch_to_space_nd_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/contrib/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include diff --git a/tensorflow/contrib/lite/kernels/internal/common.h b/tensorflow/lite/kernels/internal/common.h similarity index 97% rename from tensorflow/contrib/lite/kernels/internal/common.h rename to tensorflow/lite/kernels/internal/common.h index e67fee11b8..e31f47d2ce 100644 --- a/tensorflow/contrib/lite/kernels/internal/common.h +++ b/tensorflow/lite/kernels/internal/common.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_CONTRIB_LITE_KERNELS_INTERNAL_COMMON_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_COMMON_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_COMMON_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_COMMON_H_ #ifndef ALLOW_SLOW_GENERIC_DEPTHWISECONV_FALLBACK #ifdef GEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK @@ -46,7 +46,7 @@ limitations under the License. #endif #include "fixedpoint/fixedpoint.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { @@ -266,4 +266,4 @@ inline void NdArrayDescsForElementwiseBroadcast( } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_COMMON_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_COMMON_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/compatibility.h b/tensorflow/lite/kernels/internal/compatibility.h similarity index 92% rename from tensorflow/contrib/lite/kernels/internal/compatibility.h rename to tensorflow/lite/kernels/internal/compatibility.h index 7c176e0fa1..bfd021ac48 100644 --- a/tensorflow/contrib/lite/kernels/internal/compatibility.h +++ b/tensorflow/lite/kernels/internal/compatibility.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_CONTRIB_LITE_KERNELS_INTERNAL_COMPATIBILITY_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_COMPATIBILITY_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_COMPATIBILITY_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_COMPATIBILITY_H_ #include -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/op_macros.h" #ifndef TFLITE_DCHECK #define TFLITE_DCHECK(condition) (condition) ? (void)0 : TFLITE_ASSERT_FALSE @@ -107,4 +107,4 @@ using uint32 = std::uint32_t; #define TFLITE_DEPRECATED(message) #endif -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_COMPATIBILITY_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_COMPATIBILITY_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/depthwiseconv_float_test.cc b/tensorflow/lite/kernels/internal/depthwiseconv_float_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/internal/depthwiseconv_float_test.cc rename to tensorflow/lite/kernels/internal/depthwiseconv_float_test.cc index 41862a21a6..3602b9ffd8 100644 --- a/tensorflow/contrib/lite/kernels/internal/depthwiseconv_float_test.cc +++ b/tensorflow/lite/kernels/internal/depthwiseconv_float_test.cc @@ -17,13 +17,13 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/test_util.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/test_util.h" +#include "tensorflow/lite/kernels/internal/types.h" #define ALLOW_SLOW_GENERIC_DEPTHWISECONV_FALLBACK -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_float.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_float.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_float.h" +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_float.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/internal/depthwiseconv_quantized_test.cc b/tensorflow/lite/kernels/internal/depthwiseconv_quantized_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/internal/depthwiseconv_quantized_test.cc rename to tensorflow/lite/kernels/internal/depthwiseconv_quantized_test.cc index fd04137150..3682499d49 100644 --- a/tensorflow/contrib/lite/kernels/internal/depthwiseconv_quantized_test.cc +++ b/tensorflow/lite/kernels/internal/depthwiseconv_quantized_test.cc @@ -22,13 +22,13 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/test_util.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/test_util.h" +#include "tensorflow/lite/kernels/internal/types.h" #define ALLOW_SLOW_GENERIC_DEPTHWISECONV_FALLBACK -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_uint8.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h" +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/internal/kernel_utils.cc b/tensorflow/lite/kernels/internal/kernel_utils.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/kernel_utils.cc rename to tensorflow/lite/kernels/internal/kernel_utils.cc index 7875b23979..0836a3b662 100644 --- a/tensorflow/contrib/lite/kernels/internal/kernel_utils.cc +++ b/tensorflow/lite/kernels/internal/kernel_utils.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" namespace tflite { namespace kernel_utils { diff --git a/tensorflow/contrib/lite/kernels/internal/kernel_utils.h b/tensorflow/lite/kernels/internal/kernel_utils.h similarity index 94% rename from tensorflow/contrib/lite/kernels/internal/kernel_utils.h rename to tensorflow/lite/kernels/internal/kernel_utils.h index 0387d753e5..ebb91678fe 100644 --- a/tensorflow/contrib/lite/kernels/internal/kernel_utils.h +++ b/tensorflow/lite/kernels/internal/kernel_utils.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_CONTRIB_LITE_KERNELS_INTERNAL_KERNEL_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_KERNEL_UTILS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_KERNEL_UTILS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_KERNEL_UTILS_H_ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" namespace tflite { namespace kernel_utils { @@ -86,4 +86,4 @@ void RnnBatchStep( } // namespace kernel_utils } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_KERNEL_UTILS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_KERNEL_UTILS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/legacy_types.h b/tensorflow/lite/kernels/internal/legacy_types.h similarity index 74% rename from tensorflow/contrib/lite/kernels/internal/legacy_types.h rename to tensorflow/lite/kernels/internal/legacy_types.h index 2e4d3137f5..c19a1adb90 100644 --- a/tensorflow/contrib/lite/kernels/internal/legacy_types.h +++ b/tensorflow/lite/kernels/internal/legacy_types.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_CONTRIB_LITE_KERNELS_INTERNAL_LEGACY_TYPES_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_LEGACY_TYPES_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_LEGACY_TYPES_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_LEGACY_TYPES_H_ -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { @@ -23,4 +23,4 @@ namespace tflite { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_LEGACY_TYPES_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_LEGACY_TYPES_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/log_quantized_test.cc b/tensorflow/lite/kernels/internal/log_quantized_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/internal/log_quantized_test.cc rename to tensorflow/lite/kernels/internal/log_quantized_test.cc index 8963abb9af..8c39350ab1 100644 --- a/tensorflow/contrib/lite/kernels/internal/log_quantized_test.cc +++ b/tensorflow/lite/kernels/internal/log_quantized_test.cc @@ -27,9 +27,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/string.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/internal/logsoftmax_quantized_test.cc b/tensorflow/lite/kernels/internal/logsoftmax_quantized_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/internal/logsoftmax_quantized_test.cc rename to tensorflow/lite/kernels/internal/logsoftmax_quantized_test.cc index 2252ca1bcc..889a726f3a 100644 --- a/tensorflow/contrib/lite/kernels/internal/logsoftmax_quantized_test.cc +++ b/tensorflow/lite/kernels/internal/logsoftmax_quantized_test.cc @@ -23,11 +23,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/test_util.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/test_util.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/internal/mfcc.cc b/tensorflow/lite/kernels/internal/mfcc.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/internal/mfcc.cc rename to tensorflow/lite/kernels/internal/mfcc.cc index eafe0c7afe..fddd4c46b6 100644 --- a/tensorflow/contrib/lite/kernels/internal/mfcc.cc +++ b/tensorflow/lite/kernels/internal/mfcc.cc @@ -15,7 +15,7 @@ limitations under the License. #include -#include "tensorflow/contrib/lite/kernels/internal/mfcc.h" +#include "tensorflow/lite/kernels/internal/mfcc.h" namespace tflite { namespace internal { diff --git a/tensorflow/contrib/lite/kernels/internal/mfcc.h b/tensorflow/lite/kernels/internal/mfcc.h similarity index 88% rename from tensorflow/contrib/lite/kernels/internal/mfcc.h rename to tensorflow/lite/kernels/internal/mfcc.h index d8500ecdcf..8dae91efde 100644 --- a/tensorflow/contrib/lite/kernels/internal/mfcc.h +++ b/tensorflow/lite/kernels/internal/mfcc.h @@ -15,13 +15,13 @@ limitations under the License. // Basic class for computing MFCCs from spectrogram slices. -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_H_ #include -#include "tensorflow/contrib/lite/kernels/internal/mfcc_dct.h" -#include "tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.h" +#include "tensorflow/lite/kernels/internal/mfcc_dct.h" +#include "tensorflow/lite/kernels/internal/mfcc_mel_filterbank.h" namespace tflite { namespace internal { @@ -75,4 +75,4 @@ class Mfcc { } // namespace internal } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/mfcc_dct.cc b/tensorflow/lite/kernels/internal/mfcc_dct.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/internal/mfcc_dct.cc rename to tensorflow/lite/kernels/internal/mfcc_dct.cc index b0b7d181bd..c249fdb020 100644 --- a/tensorflow/contrib/lite/kernels/internal/mfcc_dct.cc +++ b/tensorflow/lite/kernels/internal/mfcc_dct.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/mfcc_dct.h" +#include "tensorflow/lite/kernels/internal/mfcc_dct.h" #include diff --git a/tensorflow/contrib/lite/kernels/internal/mfcc_dct.h b/tensorflow/lite/kernels/internal/mfcc_dct.h similarity index 86% rename from tensorflow/contrib/lite/kernels/internal/mfcc_dct.h rename to tensorflow/lite/kernels/internal/mfcc_dct.h index a53f5cbd9b..f2947b506b 100644 --- a/tensorflow/contrib/lite/kernels/internal/mfcc_dct.h +++ b/tensorflow/lite/kernels/internal/mfcc_dct.h @@ -15,8 +15,8 @@ limitations under the License. // Basic minimal DCT class for MFCC speech processing. -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_DCT_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_DCT_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_DCT_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_DCT_H_ #include @@ -40,4 +40,4 @@ class MfccDct { } // namespace internal } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_DCT_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_DCT_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.cc b/tensorflow/lite/kernels/internal/mfcc_mel_filterbank.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.cc rename to tensorflow/lite/kernels/internal/mfcc_mel_filterbank.cc index c3deb33d91..9748da3986 100644 --- a/tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.cc +++ b/tensorflow/lite/kernels/internal/mfcc_mel_filterbank.cc @@ -28,7 +28,7 @@ limitations under the License. // channels may end up with no contributing FFT bins. The resulting mel // spectrum output will have some channels that are always zero. -#include "tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.h" +#include "tensorflow/lite/kernels/internal/mfcc_mel_filterbank.h" #include diff --git a/tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.h b/tensorflow/lite/kernels/internal/mfcc_mel_filterbank.h similarity index 91% rename from tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.h rename to tensorflow/lite/kernels/internal/mfcc_mel_filterbank.h index c1db28243e..53d05bff5f 100644 --- a/tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.h +++ b/tensorflow/lite/kernels/internal/mfcc_mel_filterbank.h @@ -15,8 +15,8 @@ limitations under the License. // Basic class for applying a mel-scale mapping to a power spectrum. -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_MEL_FILTERBANK_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_MEL_FILTERBANK_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_MEL_FILTERBANK_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_MEL_FILTERBANK_H_ #include @@ -60,4 +60,4 @@ class MfccMelFilterbank { } // namespace internal } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_MFCC_MEL_FILTERBANK_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_MFCC_MEL_FILTERBANK_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h b/tensorflow/lite/kernels/internal/optimized/cblas_conv.h similarity index 90% rename from tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h rename to tensorflow/lite/kernels/internal/optimized/cblas_conv.h index 2d96da65c3..5377205050 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/cblas_conv.h +++ b/tensorflow/lite/kernels/internal/optimized/cblas_conv.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_CONV_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_CONV_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_CONV_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_CONV_H_ // The Conv implementation based on CBLAS interface. This is only used on iOS // for now, utilizing Apple's Accelerate framework. @@ -22,11 +22,11 @@ limitations under the License. #if TFLITE_USE_APPLE_ACCELERATE_FOR_CONV #include #else -#include "tensorflow/contrib/lite/kernels/internal/optimized/cblas_reference.h" +#include "tensorflow/lite/kernels/internal/optimized/cblas_reference.h" #endif -#include "tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/optimized/multithreaded_conv.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" namespace tflite { namespace cblas_ops { @@ -106,4 +106,4 @@ inline void Conv(const ConvParams& params, const RuntimeShape& input_shape, } // namespace cblas_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_CONV_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_CONV_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/cblas_reference.h b/tensorflow/lite/kernels/internal/optimized/cblas_reference.h similarity index 89% rename from tensorflow/contrib/lite/kernels/internal/optimized/cblas_reference.h rename to tensorflow/lite/kernels/internal/optimized/cblas_reference.h index 6acc513805..fa07578612 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/cblas_reference.h +++ b/tensorflow/lite/kernels/internal/optimized/cblas_reference.h @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_REFERENCE_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_REFERENCE_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_REFERENCE_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_REFERENCE_H_ -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" // The reference implementation for a small subset of CBLAS interface. // This is only used for testing CBLAS implementation, and should never be used @@ -66,4 +66,4 @@ void cblas_sgemm(const enum CBLAS_ORDER order, } // namespace cblas_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_REFERENCE_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CBLAS_REFERENCE_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/cpu_check.h b/tensorflow/lite/kernels/internal/optimized/cpu_check.h similarity index 89% rename from tensorflow/contrib/lite/kernels/internal/optimized/cpu_check.h rename to tensorflow/lite/kernels/internal/optimized/cpu_check.h index 934308ef29..ac4ea7d6da 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/cpu_check.h +++ b/tensorflow/lite/kernels/internal/optimized/cpu_check.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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CPU_CHECK_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CPU_CHECK_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CPU_CHECK_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CPU_CHECK_H_ namespace tflite { @@ -58,4 +58,4 @@ inline bool TestCPUFeatureNeon() { return false; } : Portable##funcname(__VA_ARGS__) #endif -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_CPU_CHECK_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_CPU_CHECK_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_float.h b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_float.h similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_float.h rename to tensorflow/lite/kernels/internal/optimized/depthwiseconv_float.h index 4e21805048..25b66d4b55 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_float.h +++ b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_float.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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ #include "public/gemmlowp.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace optimized_ops { @@ -1068,4 +1068,4 @@ inline void DepthwiseConv( } // namespace optimized_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_FLOAT_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h rename to tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h index 3c8d447c6d..5317cea884 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h +++ b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ #include "fixedpoint/fixedpoint.h" #include "public/gemmlowp.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace optimized_ops { @@ -1994,4 +1994,4 @@ inline void DepthwiseConv( } // namespace optimized_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h rename to tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h index f437487fc2..3f2ed0b1f0 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h +++ b/tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_3X3_FILTER_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_3X3_FILTER_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_3X3_FILTER_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_3X3_FILTER_H_ #include "fixedpoint/fixedpoint.h" #include "public/gemmlowp.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace optimized_ops { @@ -3446,4 +3446,4 @@ inline void DepthwiseConv3x3Filter( } // namespace optimized_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_3X3_FILTER_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_DEPTHWISECONV_UINT8_3X3_FILTER_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/eigen_spatial_convolutions.h b/tensorflow/lite/kernels/internal/optimized/eigen_spatial_convolutions.h similarity index 95% rename from tensorflow/contrib/lite/kernels/internal/optimized/eigen_spatial_convolutions.h rename to tensorflow/lite/kernels/internal/optimized/eigen_spatial_convolutions.h index ce3cde7699..29e3f534a3 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/eigen_spatial_convolutions.h +++ b/tensorflow/lite/kernels/internal/optimized/eigen_spatial_convolutions.h @@ -16,8 +16,8 @@ limitations under the License. // Copied from tensorflow/core/kernels/eigen_spatial_convolutions.h. // TODO(petewarden) - move this to a common location in Eigen itself. -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_SPATIAL_CONVOLUTIONS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_SPATIAL_CONVOLUTIONS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_SPATIAL_CONVOLUTIONS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_SPATIAL_CONVOLUTIONS_H_ #define EIGEN_USE_CUSTOM_THREAD_POOL #define EIGEN_USE_THREADS @@ -32,9 +32,9 @@ limitations under the License. #define TFLITE_REDUCE_INSTANTIATIONS_OPEN_SOURCE #define Eigen EigenForTFLite #if defined(TFLITE_REDUCE_INSTANTIATIONS_GOOGLE) -#include "tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h" +#include "tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h" #elif defined(TFLITE_REDUCE_INSTANTIATIONS_OPEN_SOURCE) -#include "tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h" +#include "tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h" #else #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" #endif @@ -226,4 +226,4 @@ EIGEN_DEVICE_FUNC // clang-format on -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_SPATIAL_CONVOLUTIONS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_SPATIAL_CONVOLUTIONS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h b/tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h similarity index 95% rename from tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h rename to tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h index 6443f425b7..f71ddbf322 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.h +++ b/tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_google.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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_GOOGLE_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_GOOGLE_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_GOOGLE_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_GOOGLE_H_ #define EIGEN_USE_CUSTOM_THREAD_POOL #define EIGEN_USE_THREADS @@ -140,4 +140,4 @@ limitations under the License. #include "third_party/eigen3/unsupported/Eigen/CXX11/src/Tensor/TensorIO.h" #include "Eigen/src/Core/util/ReenableStupidWarnings.h" -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_GOOGLE_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_GOOGLE_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h b/tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h similarity index 95% rename from tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h rename to tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h index d34708b8fd..5e83b7b846 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h +++ b/tensorflow/lite/kernels/internal/optimized/eigen_tensor_reduced_instantiations_oss.h @@ -19,8 +19,8 @@ limitations under the License. // clang-format off -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_OSS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_OSS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_OSS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_OSS_H_ #include "Eigen/Core" @@ -164,4 +164,4 @@ typedef unsigned __int64 uint64_t; #include "Eigen/src/Core/util/ReenableStupidWarnings.h" -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_OSS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_EIGEN_TENSOR_REDUCED_INSTANTIATIONS_OSS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/legacy_optimized_ops.h b/tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/optimized/legacy_optimized_ops.h rename to tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h index 4218be20a4..5485d907c2 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/legacy_optimized_ops.h +++ b/tensorflow/lite/kernels/internal/optimized/legacy_optimized_ops.h @@ -12,18 +12,18 @@ 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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_LEGACY_OPTIMIZED_OPS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_LEGACY_OPTIMIZED_OPS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_LEGACY_OPTIMIZED_OPS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_LEGACY_OPTIMIZED_OPS_H_ #include #include -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_float.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/legacy_reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_float.h" +#include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/legacy_reference_ops.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace optimized_ops { @@ -1869,4 +1869,4 @@ void TensorFlowMaximum(const T* input1_data, const Dims<4>& input1_dims, } // namespace optimized_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_LEGACY_OPTIMIZED_OPS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_LEGACY_OPTIMIZED_OPS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h b/tensorflow/lite/kernels/internal/optimized/multithreaded_conv.h similarity index 92% rename from tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h rename to tensorflow/lite/kernels/internal/optimized/multithreaded_conv.h index 4139cf4eba..12dfd1abb6 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/multithreaded_conv.h +++ b/tensorflow/lite/kernels/internal/optimized/multithreaded_conv.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_MULTITHREADED_CONV_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_MULTITHREADED_CONV_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_MULTITHREADED_CONV_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_MULTITHREADED_CONV_H_ #include #include @@ -26,11 +26,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/eigen_spatial_convolutions.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/optimized/eigen_spatial_convolutions.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace multithreaded_ops { @@ -174,4 +174,4 @@ inline void Conv(const Eigen::ThreadPoolDevice& device, } // namespace multithreaded_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_MULTITHREADED_CONV_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_MULTITHREADED_CONV_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/neon_tensor_utils.cc b/tensorflow/lite/kernels/internal/optimized/neon_tensor_utils.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/internal/optimized/neon_tensor_utils.cc rename to tensorflow/lite/kernels/internal/optimized/neon_tensor_utils.cc index 36c15dbc57..cf40ebb241 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/neon_tensor_utils.cc +++ b/tensorflow/lite/kernels/internal/optimized/neon_tensor_utils.cc @@ -15,12 +15,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/tensor_utils_impl.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/optimized/tensor_utils_impl.h" +#include "tensorflow/lite/kernels/internal/round.h" #ifdef USE_NEON diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/neon_tensor_utils.h b/tensorflow/lite/kernels/internal/optimized/neon_tensor_utils.h similarity index 93% rename from tensorflow/contrib/lite/kernels/internal/optimized/neon_tensor_utils.h rename to tensorflow/lite/kernels/internal/optimized/neon_tensor_utils.h index 630a6bbf29..903f4c8013 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/neon_tensor_utils.h +++ b/tensorflow/lite/kernels/internal/optimized/neon_tensor_utils.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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ // TODO(ghodrat): Remove this header file and the dependency to internal data // structure. -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/cpu_check.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/tensor_utils_impl.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" +#include "tensorflow/lite/kernels/internal/optimized/tensor_utils_impl.h" namespace tflite { namespace tensor_utils { @@ -153,4 +153,4 @@ void MeanStddevNormalization(const float* input_vector, float* output_vector, } // namespace tensor_utils } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_NEON_TENSOR_UTILS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h b/tensorflow/lite/kernels/internal/optimized/optimized_ops.h similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h rename to tensorflow/lite/kernels/internal/optimized/optimized_ops.h index 7d2f53fbe6..6f7031b36d 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h +++ b/tensorflow/lite/kernels/internal/optimized/optimized_ops.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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_OPTIMIZED_OPS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_OPTIMIZED_OPS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_OPTIMIZED_OPS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_OPTIMIZED_OPS_H_ #include #include @@ -29,13 +29,13 @@ limitations under the License. #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor" #include "fixedpoint/fixedpoint.h" #include "public/gemmlowp.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" -#include "tensorflow/contrib/lite/kernels/internal/strided_slice_logic.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/internal/strided_slice_logic.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace optimized_ops { @@ -5990,4 +5990,4 @@ inline void ResizeNearestNeighbor( #pragma GCC diagnostic pop #endif -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_OPTIMIZED_OPS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_OPTIMIZED_OPS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/tensor_utils_impl.h b/tensorflow/lite/kernels/internal/optimized/tensor_utils_impl.h similarity index 96% rename from tensorflow/contrib/lite/kernels/internal/optimized/tensor_utils_impl.h rename to tensorflow/lite/kernels/internal/optimized/tensor_utils_impl.h index f87760a6c3..8f52ef131d 100644 --- a/tensorflow/contrib/lite/kernels/internal/optimized/tensor_utils_impl.h +++ b/tensorflow/lite/kernels/internal/optimized/tensor_utils_impl.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_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ // TODO(ghodrat): Remove this header file and the dependency to internal data // structure. -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" #if defined(_MSC_VER) #define __restrict__ __restrict @@ -183,4 +183,4 @@ void PortableMeanStddevNormalization(const float* input_vector, } // namespace tensor_utils } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_TENSOR_UTILS_IMPL_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/quantization_util.cc b/tensorflow/lite/kernels/internal/quantization_util.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/internal/quantization_util.cc rename to tensorflow/lite/kernels/internal/quantization_util.cc index 544ef16ce1..0279d2a922 100644 --- a/tensorflow/contrib/lite/kernels/internal/quantization_util.cc +++ b/tensorflow/lite/kernels/internal/quantization_util.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/round.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/internal/quantization_util.h b/tensorflow/lite/kernels/internal/quantization_util.h similarity index 96% rename from tensorflow/contrib/lite/kernels/internal/quantization_util.h rename to tensorflow/lite/kernels/internal/quantization_util.h index d74a1bac97..bf313f39cd 100644 --- a/tensorflow/contrib/lite/kernels/internal/quantization_util.h +++ b/tensorflow/lite/kernels/internal/quantization_util.h @@ -12,16 +12,16 @@ 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_CONTRIB_LITE_KERNELS_INTERNAL_QUANTIZATION_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_QUANTIZATION_UTIL_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_QUANTIZATION_UTIL_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_QUANTIZATION_UTIL_H_ #include #include #include -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { @@ -277,4 +277,4 @@ bool CheckedLog2(const float x, int* log2_result); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_QUANTIZATION_UTIL_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_QUANTIZATION_UTIL_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/quantization_util_test.cc b/tensorflow/lite/kernels/internal/quantization_util_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/quantization_util_test.cc rename to tensorflow/lite/kernels/internal/quantization_util_test.cc index 25ea72b886..2f8f771379 100644 --- a/tensorflow/contrib/lite/kernels/internal/quantization_util_test.cc +++ b/tensorflow/lite/kernels/internal/quantization_util_test.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" #include #include diff --git a/tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_float.h b/tensorflow/lite/kernels/internal/reference/depthwiseconv_float.h similarity index 90% rename from tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_float.h rename to tensorflow/lite/kernels/internal/reference/depthwiseconv_float.h index 11224270a4..0cecb16b48 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_float.h +++ b/tensorflow/lite/kernels/internal/reference/depthwiseconv_float.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_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_FLOAT_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_FLOAT_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_FLOAT_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_FLOAT_H_ -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace reference_ops { @@ -97,4 +97,4 @@ inline void DepthwiseConv( } // end namespace reference_ops } // end namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_FLOAT_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_FLOAT_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_uint8.h b/tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h similarity index 91% rename from tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_uint8.h rename to tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h index eab28e6c84..002444b681 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_uint8.h +++ b/tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_UINT8_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_UINT8_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_UINT8_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_UINT8_H_ #include #include "fixedpoint/fixedpoint.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace reference_ops { @@ -109,4 +109,4 @@ inline void DepthwiseConv( } // end namespace reference_ops } // end namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_UINT8_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DEPTHWISECONV_UINT8_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/reference/fully_connected.h b/tensorflow/lite/kernels/internal/reference/fully_connected.h similarity index 96% rename from tensorflow/contrib/lite/kernels/internal/reference/fully_connected.h rename to tensorflow/lite/kernels/internal/reference/fully_connected.h index 3c7fd29256..8495452220 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/fully_connected.h +++ b/tensorflow/lite/kernels/internal/reference/fully_connected.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_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_FULLY_CONNECTED_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_FULLY_CONNECTED_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_FULLY_CONNECTED_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_FULLY_CONNECTED_H_ #include "fixedpoint/fixedpoint.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace reference_ops { @@ -323,4 +323,4 @@ inline void ShuffledFullyConnected( } // namespace reference_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_FULLY_CONNECTED_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_FULLY_CONNECTED_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/reference/legacy_reference_ops.h b/tensorflow/lite/kernels/internal/reference/legacy_reference_ops.h similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/reference/legacy_reference_ops.h rename to tensorflow/lite/kernels/internal/reference/legacy_reference_ops.h index c8b64cfd96..bee3ec7775 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/legacy_reference_ops.h +++ b/tensorflow/lite/kernels/internal/reference/legacy_reference_ops.h @@ -12,17 +12,17 @@ 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_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_LEGACY_REFERENCE_OPS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_LEGACY_REFERENCE_OPS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_LEGACY_REFERENCE_OPS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_LEGACY_REFERENCE_OPS_H_ #include #include -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/legacy_types.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_float.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/depthwiseconv_uint8.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/legacy_types.h" +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_float.h" +#include "tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" namespace tflite { @@ -2122,4 +2122,4 @@ inline void Slice(const T* input_data, const Dims<4>& input_dims, } // namespace reference_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_LEGACY_REFERENCE_OPS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_LEGACY_REFERENCE_OPS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/reference/portable_tensor_utils.cc b/tensorflow/lite/kernels/internal/reference/portable_tensor_utils.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/internal/reference/portable_tensor_utils.cc rename to tensorflow/lite/kernels/internal/reference/portable_tensor_utils.cc index 70d25c4bd9..d692063a96 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/portable_tensor_utils.cc +++ b/tensorflow/lite/kernels/internal/reference/portable_tensor_utils.cc @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/op_macros.h" #if defined(_MSC_VER) #define __restrict__ __restrict diff --git a/tensorflow/contrib/lite/kernels/internal/reference/portable_tensor_utils.h b/tensorflow/lite/kernels/internal/reference/portable_tensor_utils.h similarity index 97% rename from tensorflow/contrib/lite/kernels/internal/reference/portable_tensor_utils.h rename to tensorflow/lite/kernels/internal/reference/portable_tensor_utils.h index 714b1164ee..a06ebc1600 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/portable_tensor_utils.h +++ b/tensorflow/lite/kernels/internal/reference/portable_tensor_utils.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_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_PORTABLE_TENSOR_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_PORTABLE_TENSOR_UTILS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_PORTABLE_TENSOR_UTILS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_PORTABLE_TENSOR_UTILS_H_ // TODO(ghodrat): Remove this header file and the dependency to internal data // structure. -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" #if defined(_MSC_VER) #define __restrict__ __restrict @@ -265,4 +265,4 @@ void MeanStddevNormalization(const float* input_vector, float* output_vector, } // namespace tensor_utils } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_PORTABLE_TENSOR_UTILS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_PORTABLE_TENSOR_UTILS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h b/tensorflow/lite/kernels/internal/reference/reference_ops.h similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h rename to tensorflow/lite/kernels/internal/reference/reference_ops.h index 6bee1439a9..e5e43ad6c8 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h +++ b/tensorflow/lite/kernels/internal/reference/reference_ops.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_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_REFERENCE_OPS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_REFERENCE_OPS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_REFERENCE_OPS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_REFERENCE_OPS_H_ #include #include @@ -26,13 +26,13 @@ limitations under the License. #include "fixedpoint/fixedpoint.h" #include "public/gemmlowp.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/fully_connected.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/softmax.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" -#include "tensorflow/contrib/lite/kernels/internal/strided_slice_logic.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/fully_connected.h" +#include "tensorflow/lite/kernels/internal/reference/softmax.h" +#include "tensorflow/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/internal/strided_slice_logic.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { @@ -4467,4 +4467,4 @@ inline void ResizeNearestNeighbor( } // namespace reference_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_REFERENCE_OPS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_REFERENCE_OPS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/reference/softmax.h b/tensorflow/lite/kernels/internal/reference/softmax.h similarity index 92% rename from tensorflow/contrib/lite/kernels/internal/reference/softmax.h rename to tensorflow/lite/kernels/internal/reference/softmax.h index 7d44296134..51de6b51aa 100644 --- a/tensorflow/contrib/lite/kernels/internal/reference/softmax.h +++ b/tensorflow/lite/kernels/internal/reference/softmax.h @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_SOFTMAX_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_SOFTMAX_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_SOFTMAX_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_SOFTMAX_H_ #include "fixedpoint/fixedpoint.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/round.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace reference_ops { @@ -176,4 +176,4 @@ inline void Softmax(const float* in, const int input_size, const int batch_size, } // namespace reference_ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_REFERENCE_SOFTMAX_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_SOFTMAX_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/resize_bilinear_test.cc b/tensorflow/lite/kernels/internal/resize_bilinear_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/internal/resize_bilinear_test.cc rename to tensorflow/lite/kernels/internal/resize_bilinear_test.cc index 15df31f75a..1c5ac1992f 100644 --- a/tensorflow/contrib/lite/kernels/internal/resize_bilinear_test.cc +++ b/tensorflow/lite/kernels/internal/resize_bilinear_test.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/test_util.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/test_util.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/internal/resize_nearest_neighbor_test.cc b/tensorflow/lite/kernels/internal/resize_nearest_neighbor_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/internal/resize_nearest_neighbor_test.cc rename to tensorflow/lite/kernels/internal/resize_nearest_neighbor_test.cc index a26410e78c..102ee04e6a 100644 --- a/tensorflow/contrib/lite/kernels/internal/resize_nearest_neighbor_test.cc +++ b/tensorflow/lite/kernels/internal/resize_nearest_neighbor_test.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/test_util.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/test_util.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/internal/round.h b/tensorflow/lite/kernels/internal/round.h similarity index 86% rename from tensorflow/contrib/lite/kernels/internal/round.h rename to tensorflow/lite/kernels/internal/round.h index f299d0bd87..cb494bfd53 100644 --- a/tensorflow/contrib/lite/kernels/internal/round.h +++ b/tensorflow/lite/kernels/internal/round.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_CONTRIB_LITE_KERNELS_INTERNAL_ROUND_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_ROUND_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_ROUND_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_ROUND_H_ #include @@ -36,4 +36,4 @@ inline T TfLiteRound(const T x) { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_ROUND_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_ROUND_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/softmax_quantized_test.cc b/tensorflow/lite/kernels/internal/softmax_quantized_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/internal/softmax_quantized_test.cc rename to tensorflow/lite/kernels/internal/softmax_quantized_test.cc index 831fb3c243..743ce0355c 100644 --- a/tensorflow/contrib/lite/kernels/internal/softmax_quantized_test.cc +++ b/tensorflow/lite/kernels/internal/softmax_quantized_test.cc @@ -23,11 +23,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/test_util.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/test_util.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/internal/spectrogram.cc b/tensorflow/lite/kernels/internal/spectrogram.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/spectrogram.cc rename to tensorflow/lite/kernels/internal/spectrogram.cc index 20abcb7258..58769ad8cc 100644 --- a/tensorflow/contrib/lite/kernels/internal/spectrogram.cc +++ b/tensorflow/lite/kernels/internal/spectrogram.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/spectrogram.h" +#include "tensorflow/lite/kernels/internal/spectrogram.h" #include #include diff --git a/tensorflow/contrib/lite/kernels/internal/spectrogram.h b/tensorflow/lite/kernels/internal/spectrogram.h similarity index 95% rename from tensorflow/contrib/lite/kernels/internal/spectrogram.h rename to tensorflow/lite/kernels/internal/spectrogram.h index b77a68f7df..b885b9d7d2 100644 --- a/tensorflow/contrib/lite/kernels/internal/spectrogram.h +++ b/tensorflow/lite/kernels/internal/spectrogram.h @@ -28,8 +28,8 @@ limitations under the License. // window = hann(window_length_samples, 'periodic'); // S = abs(spectrogram(audio, window, overlap_samples)).^2; -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ #include #include @@ -107,4 +107,4 @@ class Spectrogram { } // namespace internal } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_SPECTROGRAM_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/strided_slice_logic.h b/tensorflow/lite/kernels/internal/strided_slice_logic.h similarity index 94% rename from tensorflow/contrib/lite/kernels/internal/strided_slice_logic.h rename to tensorflow/lite/kernels/internal/strided_slice_logic.h index af5db1064c..e7fd5ca931 100644 --- a/tensorflow/contrib/lite/kernels/internal/strided_slice_logic.h +++ b/tensorflow/lite/kernels/internal/strided_slice_logic.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_STRIDED_SLICE_LOGIC_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_STRIDED_SLICE_LOGIC_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_STRIDED_SLICE_LOGIC_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_STRIDED_SLICE_LOGIC_H_ #include #include -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace strided_slice { @@ -195,4 +195,4 @@ inline tflite::StridedSliceParams BuildStridedSliceParams( } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_STRIDED_SLICE_LOGIC_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_STRIDED_SLICE_LOGIC_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/tensor.h b/tensorflow/lite/kernels/internal/tensor.h similarity index 91% rename from tensorflow/contrib/lite/kernels/internal/tensor.h rename to tensorflow/lite/kernels/internal/tensor.h index 689cea03e7..b806753d88 100644 --- a/tensorflow/contrib/lite/kernels/internal/tensor.h +++ b/tensorflow/lite/kernels/internal/tensor.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_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_H_ #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { @@ -111,4 +111,4 @@ class VectorOfQuantizedTensors : public VectorOfTensors { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h b/tensorflow/lite/kernels/internal/tensor_ctypes.h similarity index 89% rename from tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h rename to tensorflow/lite/kernels/internal/tensor_ctypes.h index 9f5b33d217..d24dca9bfb 100644 --- a/tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h +++ b/tensorflow/lite/kernels/internal/tensor_ctypes.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_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_CTYPES_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_CTYPES_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_CTYPES_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_CTYPES_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { @@ -99,4 +99,4 @@ inline RuntimeShape GetTensorShape(const TfLiteTensor* tensor) { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_CTYPES_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_CTYPES_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/tensor_test.cc b/tensorflow/lite/kernels/internal/tensor_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/internal/tensor_test.cc rename to tensorflow/lite/kernels/internal/tensor_test.cc index 2ed73ba82d..7bfe280d6f 100644 --- a/tensorflow/contrib/lite/kernels/internal/tensor_test.cc +++ b/tensorflow/lite/kernels/internal/tensor_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/contrib/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor.h" #include #include diff --git a/tensorflow/contrib/lite/kernels/internal/tensor_utils.cc b/tensorflow/lite/kernels/internal/tensor_utils.cc similarity index 74% rename from tensorflow/contrib/lite/kernels/internal/tensor_utils.cc rename to tensorflow/lite/kernels/internal/tensor_utils.cc index f4181b18a8..701e5a66aa 100644 --- a/tensorflow/contrib/lite/kernels/internal/tensor_utils.cc +++ b/tensorflow/lite/kernels/internal/tensor_utils.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/internal/common.h" #ifndef USE_NEON #if defined(__ARM_NEON__) || defined(__ARM_NEON) @@ -22,7 +22,7 @@ limitations under the License. #endif // USE_NEON #ifdef USE_NEON -#include "tensorflow/contrib/lite/kernels/internal/optimized/neon_tensor_utils.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_tensor_utils.h" #else -#include "tensorflow/contrib/lite/kernels/internal/reference/portable_tensor_utils.h" +#include "tensorflow/lite/kernels/internal/reference/portable_tensor_utils.h" #endif // USE_NEON diff --git a/tensorflow/contrib/lite/kernels/internal/tensor_utils.h b/tensorflow/lite/kernels/internal/tensor_utils.h similarity index 96% rename from tensorflow/contrib/lite/kernels/internal/tensor_utils.h rename to tensorflow/lite/kernels/internal/tensor_utils.h index b0fe5adf65..71ae69522f 100644 --- a/tensorflow/contrib/lite/kernels/internal/tensor_utils.h +++ b/tensorflow/lite/kernels/internal/tensor_utils.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_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_UTILS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_UTILS_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_UTILS_H_ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" #if defined(_MSC_VER) #define __restrict__ __restrict @@ -165,4 +165,4 @@ void MeanStddevNormalization(const float* input_vector, float* output_vector, } // namespace tensor_utils } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TENSOR_UTILS_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_TENSOR_UTILS_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/tensor_utils_test.cc b/tensorflow/lite/kernels/internal/tensor_utils_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/internal/tensor_utils_test.cc rename to tensorflow/lite/kernels/internal/tensor_utils_test.cc index 6458af714b..29866d0664 100644 --- a/tensorflow/contrib/lite/kernels/internal/tensor_utils_test.cc +++ b/tensorflow/lite/kernels/internal/tensor_utils_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/kernels/test_util.h" namespace tflite { namespace tensor_utils { diff --git a/tensorflow/contrib/lite/kernels/internal/test_util.cc b/tensorflow/lite/kernels/internal/test_util.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/internal/test_util.cc rename to tensorflow/lite/kernels/internal/test_util.cc index 390d57a010..4462775ddb 100644 --- a/tensorflow/contrib/lite/kernels/internal/test_util.cc +++ b/tensorflow/lite/kernels/internal/test_util.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/contrib/lite/kernels/internal/test_util.h" +#include "tensorflow/lite/kernels/internal/test_util.h" #include #include diff --git a/tensorflow/contrib/lite/kernels/internal/test_util.h b/tensorflow/lite/kernels/internal/test_util.h similarity index 93% rename from tensorflow/contrib/lite/kernels/internal/test_util.h rename to tensorflow/lite/kernels/internal/test_util.h index e4a383bedf..766a627c99 100644 --- a/tensorflow/contrib/lite/kernels/internal/test_util.h +++ b/tensorflow/lite/kernels/internal/test_util.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_CONTRIB_LITE_KERNELS_INTERNAL_TEST_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TEST_UTIL_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_TEST_UTIL_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_TEST_UTIL_H_ #include #include @@ -22,7 +22,7 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { @@ -100,4 +100,4 @@ void FillRandomSkyscraper(std::vector* vec, int depth, } } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TEST_UTIL_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_TEST_UTIL_H_ diff --git a/tensorflow/contrib/lite/kernels/internal/types.h b/tensorflow/lite/kernels/internal/types.h similarity index 98% rename from tensorflow/contrib/lite/kernels/internal/types.h rename to tensorflow/lite/kernels/internal/types.h index 694c1797da..04b95ddc63 100644 --- a/tensorflow/contrib/lite/kernels/internal/types.h +++ b/tensorflow/lite/kernels/internal/types.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TYPES_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TYPES_H_ +#ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_TYPES_H_ +#define TENSORFLOW_LITE_KERNELS_INTERNAL_TYPES_H_ #include #include -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" namespace tflite { @@ -86,7 +86,7 @@ enum class FullyConnectedWeightsFormat : uint8 { // bytes before using them in signed arithmetic, see this file for more // explanations on the 'signed int8 trick' in matrix multiplication kernels: // - // tensorflow/contrib/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc + // tensorflow/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc // kShuffled4x16Int8, }; @@ -1033,4 +1033,4 @@ inline void GetActivationParams(const P& params, float* min, float* max) { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_INTERNAL_TYPES_H_ +#endif // TENSORFLOW_LITE_KERNELS_INTERNAL_TYPES_H_ diff --git a/tensorflow/contrib/lite/kernels/kernel_util.cc b/tensorflow/lite/kernels/kernel_util.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/kernel_util.cc rename to tensorflow/lite/kernels/kernel_util.cc index 503ef28459..2ac3fbe4f5 100644 --- a/tensorflow/contrib/lite/kernels/kernel_util.cc +++ b/tensorflow/lite/kernels/kernel_util.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/kernel_util.h" #include #include #include -#include "tensorflow/contrib/lite/kernels/internal/round.h" +#include "tensorflow/lite/kernels/internal/round.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/kernel_util.h b/tensorflow/lite/kernels/kernel_util.h similarity index 95% rename from tensorflow/contrib/lite/kernels/kernel_util.h rename to tensorflow/lite/kernels/kernel_util.h index e9a5fd7a40..3cc00588d6 100644 --- a/tensorflow/contrib/lite/kernels/kernel_util.h +++ b/tensorflow/lite/kernels/kernel_util.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_CONTRIB_LITE_KERNELS_KERNEL_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_KERNEL_UTIL_H_ +#ifndef TENSORFLOW_LITE_KERNELS_KERNEL_UTIL_H_ +#define TENSORFLOW_LITE_KERNELS_KERNEL_UTIL_H_ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { @@ -135,4 +135,4 @@ TfLiteStatus CalculateShapeForBroadcast(TfLiteContext* context, TfLiteIntArray** output_shape); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_KERNEL_UTIL_H_ +#endif // TENSORFLOW_LITE_KERNELS_KERNEL_UTIL_H_ diff --git a/tensorflow/contrib/lite/kernels/kernel_util_test.cc b/tensorflow/lite/kernels/kernel_util_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/kernel_util_test.cc rename to tensorflow/lite/kernels/kernel_util_test.cc index bf6f249acc..70eb183658 100644 --- a/tensorflow/contrib/lite/kernels/kernel_util_test.cc +++ b/tensorflow/lite/kernels/kernel_util_test.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/kernel_util.h" #include #include -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/l2norm.cc b/tensorflow/lite/kernels/l2norm.cc similarity index 90% rename from tensorflow/contrib/lite/kernels/l2norm.cc rename to tensorflow/lite/kernels/l2norm.cc index e02d7df9ef..19a4824e93 100644 --- a/tensorflow/contrib/lite/kernels/l2norm.cc +++ b/tensorflow/lite/kernels/l2norm.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/l2norm_test.cc b/tensorflow/lite/kernels/l2norm_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/l2norm_test.cc rename to tensorflow/lite/kernels/l2norm_test.cc index 070ed60040..50108a5a26 100644 --- a/tensorflow/contrib/lite/kernels/l2norm_test.cc +++ b/tensorflow/lite/kernels/l2norm_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/layer_norm_lstm.cc b/tensorflow/lite/kernels/layer_norm_lstm.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/layer_norm_lstm.cc rename to tensorflow/lite/kernels/layer_norm_lstm.cc index 48dd03e7ae..5b0046a7b3 100644 --- a/tensorflow/contrib/lite/kernels/layer_norm_lstm.cc +++ b/tensorflow/lite/kernels/layer_norm_lstm.cc @@ -17,9 +17,9 @@ limitations under the License. // deviation to the activation of the LSTM layers. Please see // https://arxiv.org/abs/1607.06450 for details. #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/layer_norm_lstm_test.cc b/tensorflow/lite/kernels/layer_norm_lstm_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/layer_norm_lstm_test.cc rename to tensorflow/lite/kernels/layer_norm_lstm_test.cc index 1535f750f9..e89bce50c3 100644 --- a/tensorflow/contrib/lite/kernels/layer_norm_lstm_test.cc +++ b/tensorflow/lite/kernels/layer_norm_lstm_test.cc @@ -20,10 +20,10 @@ limitations under the License. #include #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/local_response_norm.cc b/tensorflow/lite/kernels/local_response_norm.cc similarity index 89% rename from tensorflow/contrib/lite/kernels/local_response_norm.cc rename to tensorflow/lite/kernels/local_response_norm.cc index 334d2a2788..5cbf5d9eae 100644 --- a/tensorflow/contrib/lite/kernels/local_response_norm.cc +++ b/tensorflow/lite/kernels/local_response_norm.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/local_response_norm_test.cc b/tensorflow/lite/kernels/local_response_norm_test.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/local_response_norm_test.cc rename to tensorflow/lite/kernels/local_response_norm_test.cc index d75ce258a0..bd644e07f4 100644 --- a/tensorflow/contrib/lite/kernels/local_response_norm_test.cc +++ b/tensorflow/lite/kernels/local_response_norm_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/log_softmax_test.cc b/tensorflow/lite/kernels/log_softmax_test.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/log_softmax_test.cc rename to tensorflow/lite/kernels/log_softmax_test.cc index 1acc966cdc..fb126295e6 100644 --- a/tensorflow/contrib/lite/kernels/log_softmax_test.cc +++ b/tensorflow/lite/kernels/log_softmax_test.cc @@ -20,11 +20,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/logical.cc b/tensorflow/lite/kernels/logical.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/logical.cc rename to tensorflow/lite/kernels/logical.cc index f770cb35d1..582bcff64a 100644 --- a/tensorflow/contrib/lite/kernels/logical.cc +++ b/tensorflow/lite/kernels/logical.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/logical_test.cc b/tensorflow/lite/kernels/logical_test.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/logical_test.cc rename to tensorflow/lite/kernels/logical_test.cc index 206cbde98f..b316164527 100644 --- a/tensorflow/contrib/lite/kernels/logical_test.cc +++ b/tensorflow/lite/kernels/logical_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/lsh_projection.cc b/tensorflow/lite/kernels/lsh_projection.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/lsh_projection.cc rename to tensorflow/lite/kernels/lsh_projection.cc index 9fa1c5f100..f68ff4d634 100644 --- a/tensorflow/contrib/lite/kernels/lsh_projection.cc +++ b/tensorflow/lite/kernels/lsh_projection.cc @@ -59,10 +59,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/lsh_projection_test.cc b/tensorflow/lite/kernels/lsh_projection_test.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/lsh_projection_test.cc rename to tensorflow/lite/kernels/lsh_projection_test.cc index 414d728dfc..cb2724a6cc 100644 --- a/tensorflow/contrib/lite/kernels/lsh_projection_test.cc +++ b/tensorflow/lite/kernels/lsh_projection_test.cc @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/lstm.cc b/tensorflow/lite/kernels/lstm.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/lstm.cc rename to tensorflow/lite/kernels/lstm.cc index 3666122e94..b57e2883b0 100644 --- a/tensorflow/contrib/lite/kernels/lstm.cc +++ b/tensorflow/lite/kernels/lstm.cc @@ -20,17 +20,17 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/gemm_support.h" -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/lstm_eval.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/gemm_support.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/lstm_eval.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/lstm_eval.cc b/tensorflow/lite/kernels/lstm_eval.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/lstm_eval.cc rename to tensorflow/lite/kernels/lstm_eval.cc index f2ba7b46d9..f179ecb195 100644 --- a/tensorflow/contrib/lite/kernels/lstm_eval.cc +++ b/tensorflow/lite/kernels/lstm_eval.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/lstm_eval.h" +#include "tensorflow/lite/kernels/lstm_eval.h" #include -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/lstm_eval.h b/tensorflow/lite/kernels/lstm_eval.h similarity index 93% rename from tensorflow/contrib/lite/kernels/lstm_eval.h rename to tensorflow/lite/kernels/lstm_eval.h index 8d8b97aead..c8a4d284f3 100644 --- a/tensorflow/contrib/lite/kernels/lstm_eval.h +++ b/tensorflow/lite/kernels/lstm_eval.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_CONTRIB_LITE_KERNELS_LSTM_EVAL_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_LSTM_EVAL_H_ +#ifndef TENSORFLOW_LITE_KERNELS_LSTM_EVAL_H_ +#define TENSORFLOW_LITE_KERNELS_LSTM_EVAL_H_ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { namespace ops { @@ -78,4 +78,4 @@ TfLiteStatus EvalHybrid( } // namespace builtin } // namespace ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_LSTM_EVAL_H_ +#endif // TENSORFLOW_LITE_KERNELS_LSTM_EVAL_H_ diff --git a/tensorflow/contrib/lite/kernels/lstm_test.cc b/tensorflow/lite/kernels/lstm_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/lstm_test.cc rename to tensorflow/lite/kernels/lstm_test.cc index f8947db724..03ad2e899d 100644 --- a/tensorflow/contrib/lite/kernels/lstm_test.cc +++ b/tensorflow/lite/kernels/lstm_test.cc @@ -22,10 +22,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/maximum_minimum.cc b/tensorflow/lite/kernels/maximum_minimum.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/maximum_minimum.cc rename to tensorflow/lite/kernels/maximum_minimum.cc index 7cb01465ee..3bcaabf675 100644 --- a/tensorflow/contrib/lite/kernels/maximum_minimum.cc +++ b/tensorflow/lite/kernels/maximum_minimum.cc @@ -14,12 +14,12 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/maximum_minimum_test.cc b/tensorflow/lite/kernels/maximum_minimum_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/maximum_minimum_test.cc rename to tensorflow/lite/kernels/maximum_minimum_test.cc index fd4d5367c5..acb74e09d3 100644 --- a/tensorflow/contrib/lite/kernels/maximum_minimum_test.cc +++ b/tensorflow/lite/kernels/maximum_minimum_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/mfcc.cc b/tensorflow/lite/kernels/mfcc.cc similarity index 89% rename from tensorflow/contrib/lite/kernels/mfcc.cc rename to tensorflow/lite/kernels/mfcc.cc index 5153ce5634..f5b0212728 100644 --- a/tensorflow/contrib/lite/kernels/mfcc.cc +++ b/tensorflow/lite/kernels/mfcc.cc @@ -12,17 +12,17 @@ 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/contrib/lite/kernels/internal/mfcc.h" +#include "tensorflow/lite/kernels/internal/mfcc.h" #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/mfcc_dct.h" -#include "tensorflow/contrib/lite/kernels/internal/mfcc_mel_filterbank.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/mfcc_dct.h" +#include "tensorflow/lite/kernels/internal/mfcc_mel_filterbank.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/mfcc_test.cc b/tensorflow/lite/kernels/mfcc_test.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/mfcc_test.cc rename to tensorflow/lite/kernels/mfcc_test.cc index fe69223222..ade5bf53d1 100644 --- a/tensorflow/contrib/lite/kernels/mfcc_test.cc +++ b/tensorflow/lite/kernels/mfcc_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/mul.cc b/tensorflow/lite/kernels/mul.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/mul.cc rename to tensorflow/lite/kernels/mul.cc index e0aac8a842..b405dee47e 100644 --- a/tensorflow/contrib/lite/kernels/mul.cc +++ b/tensorflow/lite/kernels/mul.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/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/mul_test.cc b/tensorflow/lite/kernels/mul_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/mul_test.cc rename to tensorflow/lite/kernels/mul_test.cc index 0f9c0c2eee..200cc26dad 100644 --- a/tensorflow/contrib/lite/kernels/mul_test.cc +++ b/tensorflow/lite/kernels/mul_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/neg.cc b/tensorflow/lite/kernels/neg.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/neg.cc rename to tensorflow/lite/kernels/neg.cc index 0ddd0644f5..e9a1aa2325 100644 --- a/tensorflow/contrib/lite/kernels/neg.cc +++ b/tensorflow/lite/kernels/neg.cc @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/neg_test.cc b/tensorflow/lite/kernels/neg_test.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/neg_test.cc rename to tensorflow/lite/kernels/neg_test.cc index 3d3594c60b..d461ede3c4 100644 --- a/tensorflow/contrib/lite/kernels/neg_test.cc +++ b/tensorflow/lite/kernels/neg_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/one_hot.cc b/tensorflow/lite/kernels/one_hot.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/one_hot.cc rename to tensorflow/lite/kernels/one_hot.cc index 910aed6f14..2ac12fe930 100644 --- a/tensorflow/contrib/lite/kernels/one_hot.cc +++ b/tensorflow/lite/kernels/one_hot.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/one_hot_test.cc b/tensorflow/lite/kernels/one_hot_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/one_hot_test.cc rename to tensorflow/lite/kernels/one_hot_test.cc index 6b604ec7a7..85438327e7 100644 --- a/tensorflow/contrib/lite/kernels/one_hot_test.cc +++ b/tensorflow/lite/kernels/one_hot_test.cc @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/op_macros.h b/tensorflow/lite/kernels/op_macros.h similarity index 88% rename from tensorflow/contrib/lite/kernels/op_macros.h rename to tensorflow/lite/kernels/op_macros.h index d0c5630649..1a54a378b0 100644 --- a/tensorflow/contrib/lite/kernels/op_macros.h +++ b/tensorflow/lite/kernels/op_macros.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_CONTRIB_LITE_KERNELS_OP_MACROS_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_OP_MACROS_H_ +#ifndef TENSORFLOW_LITE_KERNELS_OP_MACROS_H_ +#define TENSORFLOW_LITE_KERNELS_OP_MACROS_H_ // If we're on a platform without standard IO functions, fall back to a // non-portable function. #ifdef TF_LITE_MCU_DEBUG_LOG -#include "tensorflow/contrib/lite/experimental/micro/micro_error_reporter.h" +#include "tensorflow/lite/experimental/micro/micro_error_reporter.h" #define DEBUG_LOG(x) \ do { \ @@ -67,4 +67,4 @@ inline void InfiniteLoop() { if ((x) != (y)) TF_LITE_FATAL(#x " didn't equal " #y); \ } while (0) -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_OP_MACROS_H_ +#endif // TENSORFLOW_LITE_KERNELS_OP_MACROS_H_ diff --git a/tensorflow/contrib/lite/kernels/optional_tensor_test.cc b/tensorflow/lite/kernels/optional_tensor_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/optional_tensor_test.cc rename to tensorflow/lite/kernels/optional_tensor_test.cc index 90a915bb02..a09f860158 100644 --- a/tensorflow/contrib/lite/kernels/optional_tensor_test.cc +++ b/tensorflow/lite/kernels/optional_tensor_test.cc @@ -20,10 +20,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/pack.cc b/tensorflow/lite/kernels/pack.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/pack.cc rename to tensorflow/lite/kernels/pack.cc index c368582ef7..309d96d802 100644 --- a/tensorflow/contrib/lite/kernels/pack.cc +++ b/tensorflow/lite/kernels/pack.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/pack_test.cc b/tensorflow/lite/kernels/pack_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/pack_test.cc rename to tensorflow/lite/kernels/pack_test.cc index c70dbd2764..a47e9ff40d 100644 --- a/tensorflow/contrib/lite/kernels/pack_test.cc +++ b/tensorflow/lite/kernels/pack_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/pad.cc b/tensorflow/lite/kernels/pad.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/pad.cc rename to tensorflow/lite/kernels/pad.cc index a3cefe99cc..8e6ed6e741 100644 --- a/tensorflow/contrib/lite/kernels/pad.cc +++ b/tensorflow/lite/kernels/pad.cc @@ -14,13 +14,13 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/pad_test.cc b/tensorflow/lite/kernels/pad_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/pad_test.cc rename to tensorflow/lite/kernels/pad_test.cc index 9c55767f69..109e4b7519 100644 --- a/tensorflow/contrib/lite/kernels/pad_test.cc +++ b/tensorflow/lite/kernels/pad_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/padding.h b/tensorflow/lite/kernels/padding.h similarity index 90% rename from tensorflow/contrib/lite/kernels/padding.h rename to tensorflow/lite/kernels/padding.h index 42b6b45d3b..30aa4f1bd3 100644 --- a/tensorflow/contrib/lite/kernels/padding.h +++ b/tensorflow/lite/kernels/padding.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_CONTRIB_LITE_KERNELS_PADDING_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_PADDING_H_ +#ifndef TENSORFLOW_LITE_KERNELS_PADDING_H_ +#define TENSORFLOW_LITE_KERNELS_PADDING_H_ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/builtin_op_data.h" namespace tflite { @@ -55,4 +55,4 @@ inline TfLitePaddingValues ComputePaddingHeightWidth( } } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_PADDING_H_ +#endif // TENSORFLOW_LITE_KERNELS_PADDING_H_ diff --git a/tensorflow/contrib/lite/kernels/pooling.cc b/tensorflow/lite/kernels/pooling.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/pooling.cc rename to tensorflow/lite/kernels/pooling.cc index 6451142391..694a36ffbc 100644 --- a/tensorflow/contrib/lite/kernels/pooling.cc +++ b/tensorflow/lite/kernels/pooling.cc @@ -19,14 +19,14 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/kernels/padding.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/padding.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/pooling_test.cc b/tensorflow/lite/kernels/pooling_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/pooling_test.cc rename to tensorflow/lite/kernels/pooling_test.cc index 01c91b2ba9..80eef02509 100644 --- a/tensorflow/contrib/lite/kernels/pooling_test.cc +++ b/tensorflow/lite/kernels/pooling_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/pow.cc b/tensorflow/lite/kernels/pow.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/pow.cc rename to tensorflow/lite/kernels/pow.cc index 1e96cc80b1..9f84e1cc5e 100644 --- a/tensorflow/contrib/lite/kernels/pow.cc +++ b/tensorflow/lite/kernels/pow.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/pow_test.cc b/tensorflow/lite/kernels/pow_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/pow_test.cc rename to tensorflow/lite/kernels/pow_test.cc index 74b3aef5bd..60d674e977 100644 --- a/tensorflow/contrib/lite/kernels/pow_test.cc +++ b/tensorflow/lite/kernels/pow_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/range.cc b/tensorflow/lite/kernels/range.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/range.cc rename to tensorflow/lite/kernels/range.cc index 241b405745..eefe5db1ec 100644 --- a/tensorflow/contrib/lite/kernels/range.cc +++ b/tensorflow/lite/kernels/range.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/range_test.cc b/tensorflow/lite/kernels/range_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/range_test.cc rename to tensorflow/lite/kernels/range_test.cc index 8faa092fb2..e1d4aaba43 100644 --- a/tensorflow/contrib/lite/kernels/range_test.cc +++ b/tensorflow/lite/kernels/range_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/reduce.cc b/tensorflow/lite/kernels/reduce.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/reduce.cc rename to tensorflow/lite/kernels/reduce.cc index 4732a37a65..ed2d475f6d 100644 --- a/tensorflow/contrib/lite/kernels/reduce.cc +++ b/tensorflow/lite/kernels/reduce.cc @@ -15,13 +15,13 @@ limitations under the License. #include #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/reduce_test.cc b/tensorflow/lite/kernels/reduce_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/reduce_test.cc rename to tensorflow/lite/kernels/reduce_test.cc index fb2ec58ab2..c1526bddb7 100644 --- a/tensorflow/contrib/lite/kernels/reduce_test.cc +++ b/tensorflow/lite/kernels/reduce_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/register.cc b/tensorflow/lite/kernels/register.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/register.cc rename to tensorflow/lite/kernels/register.cc index 92eddf7d79..c683453767 100644 --- a/tensorflow/contrib/lite/kernels/register.cc +++ b/tensorflow/lite/kernels/register.cc @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/util.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/register.h b/tensorflow/lite/kernels/register.h similarity index 78% rename from tensorflow/contrib/lite/kernels/register.h rename to tensorflow/lite/kernels/register.h index 61856ab9de..eb5ce667d4 100644 --- a/tensorflow/contrib/lite/kernels/register.h +++ b/tensorflow/lite/kernels/register.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_KERNELS_REGISTER_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_REGISTER_H_ +#ifndef TENSORFLOW_LITE_KERNELS_REGISTER_H_ +#define TENSORFLOW_LITE_KERNELS_REGISTER_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/mutable_op_resolver.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/mutable_op_resolver.h" namespace tflite { namespace ops { @@ -37,4 +37,4 @@ class BuiltinOpResolver : public MutableOpResolver { } // namespace ops } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_REGISTER_H_ +#endif // TENSORFLOW_LITE_KERNELS_REGISTER_H_ diff --git a/tensorflow/contrib/lite/kernels/relu1.cc b/tensorflow/lite/kernels/relu1.cc similarity index 92% rename from tensorflow/contrib/lite/kernels/relu1.cc rename to tensorflow/lite/kernels/relu1.cc index abafee2d57..5a55631405 100644 --- a/tensorflow/contrib/lite/kernels/relu1.cc +++ b/tensorflow/lite/kernels/relu1.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/relu1_test.cc b/tensorflow/lite/kernels/relu1_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/relu1_test.cc rename to tensorflow/lite/kernels/relu1_test.cc index b1d25a9f50..f52d10b0b7 100644 --- a/tensorflow/contrib/lite/kernels/relu1_test.cc +++ b/tensorflow/lite/kernels/relu1_test.cc @@ -14,8 +14,8 @@ limitations under the License. ==============================================================================*/ #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/reshape.cc b/tensorflow/lite/kernels/reshape.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/reshape.cc rename to tensorflow/lite/kernels/reshape.cc index f41147b2d6..9fcf33f9dd 100644 --- a/tensorflow/contrib/lite/kernels/reshape.cc +++ b/tensorflow/lite/kernels/reshape.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/reshape_test.cc b/tensorflow/lite/kernels/reshape_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/reshape_test.cc rename to tensorflow/lite/kernels/reshape_test.cc index cf60954880..217fe3ac59 100644 --- a/tensorflow/contrib/lite/kernels/reshape_test.cc +++ b/tensorflow/lite/kernels/reshape_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/resize_bilinear.cc b/tensorflow/lite/kernels/resize_bilinear.cc similarity index 92% rename from tensorflow/contrib/lite/kernels/resize_bilinear.cc rename to tensorflow/lite/kernels/resize_bilinear.cc index fb045d15f3..d42cb18866 100644 --- a/tensorflow/contrib/lite/kernels/resize_bilinear.cc +++ b/tensorflow/lite/kernels/resize_bilinear.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/resize_bilinear_test.cc b/tensorflow/lite/kernels/resize_bilinear_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/resize_bilinear_test.cc rename to tensorflow/lite/kernels/resize_bilinear_test.cc index f4289105f7..530bb32b94 100644 --- a/tensorflow/contrib/lite/kernels/resize_bilinear_test.cc +++ b/tensorflow/lite/kernels/resize_bilinear_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/resize_nearest_neighbor.cc b/tensorflow/lite/kernels/resize_nearest_neighbor.cc similarity index 92% rename from tensorflow/contrib/lite/kernels/resize_nearest_neighbor.cc rename to tensorflow/lite/kernels/resize_nearest_neighbor.cc index 95c920f95c..a48d8004f8 100644 --- a/tensorflow/contrib/lite/kernels/resize_nearest_neighbor.cc +++ b/tensorflow/lite/kernels/resize_nearest_neighbor.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/resize_nearest_neighbor_test.cc b/tensorflow/lite/kernels/resize_nearest_neighbor_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/resize_nearest_neighbor_test.cc rename to tensorflow/lite/kernels/resize_nearest_neighbor_test.cc index b2154ff72c..03e2effd84 100644 --- a/tensorflow/contrib/lite/kernels/resize_nearest_neighbor_test.cc +++ b/tensorflow/lite/kernels/resize_nearest_neighbor_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/select.cc b/tensorflow/lite/kernels/select.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/select.cc rename to tensorflow/lite/kernels/select.cc index 4780a86ee5..4687ab4417 100644 --- a/tensorflow/contrib/lite/kernels/select.cc +++ b/tensorflow/lite/kernels/select.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/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/select_test.cc b/tensorflow/lite/kernels/select_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/select_test.cc rename to tensorflow/lite/kernels/select_test.cc index 5b2e61cd29..5111300e47 100644 --- a/tensorflow/contrib/lite/kernels/select_test.cc +++ b/tensorflow/lite/kernels/select_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/shape.cc b/tensorflow/lite/kernels/shape.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/shape.cc rename to tensorflow/lite/kernels/shape.cc index 66d4c9e5c1..934f0846b9 100644 --- a/tensorflow/contrib/lite/kernels/shape.cc +++ b/tensorflow/lite/kernels/shape.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/shape_test.cc b/tensorflow/lite/kernels/shape_test.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/shape_test.cc rename to tensorflow/lite/kernels/shape_test.cc index 27b48f4e99..0c13ff45b0 100644 --- a/tensorflow/contrib/lite/kernels/shape_test.cc +++ b/tensorflow/lite/kernels/shape_test.cc @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/skip_gram.cc b/tensorflow/lite/kernels/skip_gram.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/skip_gram.cc rename to tensorflow/lite/kernels/skip_gram.cc index de80a4016e..f20719ecaf 100644 --- a/tensorflow/contrib/lite/kernels/skip_gram.cc +++ b/tensorflow/lite/kernels/skip_gram.cc @@ -33,11 +33,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/skip_gram_test.cc b/tensorflow/lite/kernels/skip_gram_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/skip_gram_test.cc rename to tensorflow/lite/kernels/skip_gram_test.cc index 185b64cb44..d4430b8a34 100644 --- a/tensorflow/contrib/lite/kernels/skip_gram_test.cc +++ b/tensorflow/lite/kernels/skip_gram_test.cc @@ -16,11 +16,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/slice.cc b/tensorflow/lite/kernels/slice.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/slice.cc rename to tensorflow/lite/kernels/slice.cc index ccfee41b9c..35e8b06214 100644 --- a/tensorflow/contrib/lite/kernels/slice.cc +++ b/tensorflow/lite/kernels/slice.cc @@ -16,12 +16,12 @@ limitations under the License. #include #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/slice_test.cc b/tensorflow/lite/kernels/slice_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/slice_test.cc rename to tensorflow/lite/kernels/slice_test.cc index 4828f88f36..563329ddb1 100644 --- a/tensorflow/contrib/lite/kernels/slice_test.cc +++ b/tensorflow/lite/kernels/slice_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/softmax_test.cc b/tensorflow/lite/kernels/softmax_test.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/softmax_test.cc rename to tensorflow/lite/kernels/softmax_test.cc index bd66980226..eb9d7c1d9d 100644 --- a/tensorflow/contrib/lite/kernels/softmax_test.cc +++ b/tensorflow/lite/kernels/softmax_test.cc @@ -20,11 +20,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/space_to_batch_nd.cc b/tensorflow/lite/kernels/space_to_batch_nd.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/space_to_batch_nd.cc rename to tensorflow/lite/kernels/space_to_batch_nd.cc index 3a10d2e60c..1c61b2ef30 100644 --- a/tensorflow/contrib/lite/kernels/space_to_batch_nd.cc +++ b/tensorflow/lite/kernels/space_to_batch_nd.cc @@ -14,13 +14,13 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/space_to_batch_nd_test.cc b/tensorflow/lite/kernels/space_to_batch_nd_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/space_to_batch_nd_test.cc rename to tensorflow/lite/kernels/space_to_batch_nd_test.cc index 5756573629..4d55ba56b7 100644 --- a/tensorflow/contrib/lite/kernels/space_to_batch_nd_test.cc +++ b/tensorflow/lite/kernels/space_to_batch_nd_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/space_to_depth.cc b/tensorflow/lite/kernels/space_to_depth.cc similarity index 91% rename from tensorflow/contrib/lite/kernels/space_to_depth.cc rename to tensorflow/lite/kernels/space_to_depth.cc index 64c56c017b..79e28bf47d 100644 --- a/tensorflow/contrib/lite/kernels/space_to_depth.cc +++ b/tensorflow/lite/kernels/space_to_depth.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/space_to_depth_test.cc b/tensorflow/lite/kernels/space_to_depth_test.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/space_to_depth_test.cc rename to tensorflow/lite/kernels/space_to_depth_test.cc index 997f354861..5744669b6d 100644 --- a/tensorflow/contrib/lite/kernels/space_to_depth_test.cc +++ b/tensorflow/lite/kernels/space_to_depth_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/sparse_output_fully_connected.cc b/tensorflow/lite/kernels/sparse_output_fully_connected.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/sparse_output_fully_connected.cc rename to tensorflow/lite/kernels/sparse_output_fully_connected.cc index 66daf5e84a..73d850f0e2 100644 --- a/tensorflow/contrib/lite/kernels/sparse_output_fully_connected.cc +++ b/tensorflow/lite/kernels/sparse_output_fully_connected.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ // SparseOutputFullyConnected is a fully connected layer that uses a single // row in the weights and bias via a lookup. -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/sparse_output_fully_connected_test.cc b/tensorflow/lite/kernels/sparse_output_fully_connected_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/sparse_output_fully_connected_test.cc rename to tensorflow/lite/kernels/sparse_output_fully_connected_test.cc index 365986a5c1..c25a32bde0 100644 --- a/tensorflow/contrib/lite/kernels/sparse_output_fully_connected_test.cc +++ b/tensorflow/lite/kernels/sparse_output_fully_connected_test.cc @@ -19,8 +19,8 @@ limitations under the License. #include #include "flatbuffers/flexbuffers.h" // TF:flatbuffers -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/sparse_to_dense.cc b/tensorflow/lite/kernels/sparse_to_dense.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/sparse_to_dense.cc rename to tensorflow/lite/kernels/sparse_to_dense.cc index 349fa0bd28..de4d863fac 100644 --- a/tensorflow/contrib/lite/kernels/sparse_to_dense.cc +++ b/tensorflow/lite/kernels/sparse_to_dense.cc @@ -19,13 +19,13 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/kernels/padding.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/padding.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/sparse_to_dense_test.cc b/tensorflow/lite/kernels/sparse_to_dense_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/sparse_to_dense_test.cc rename to tensorflow/lite/kernels/sparse_to_dense_test.cc index a51ec17afc..ee135c220e 100644 --- a/tensorflow/contrib/lite/kernels/sparse_to_dense_test.cc +++ b/tensorflow/lite/kernels/sparse_to_dense_test.cc @@ -15,10 +15,10 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/split.cc b/tensorflow/lite/kernels/split.cc similarity index 92% rename from tensorflow/contrib/lite/kernels/split.cc rename to tensorflow/lite/kernels/split.cc index dab887bf9c..7902ed2a46 100644 --- a/tensorflow/contrib/lite/kernels/split.cc +++ b/tensorflow/lite/kernels/split.cc @@ -14,13 +14,13 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/split_test.cc b/tensorflow/lite/kernels/split_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/split_test.cc rename to tensorflow/lite/kernels/split_test.cc index 61a0759c64..f3d9ea3bf4 100644 --- a/tensorflow/contrib/lite/kernels/split_test.cc +++ b/tensorflow/lite/kernels/split_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/squeeze.cc b/tensorflow/lite/kernels/squeeze.cc similarity index 92% rename from tensorflow/contrib/lite/kernels/squeeze.cc rename to tensorflow/lite/kernels/squeeze.cc index 080c51cd18..8be0c6b9de 100644 --- a/tensorflow/contrib/lite/kernels/squeeze.cc +++ b/tensorflow/lite/kernels/squeeze.cc @@ -14,11 +14,11 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/squeeze_test.cc b/tensorflow/lite/kernels/squeeze_test.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/squeeze_test.cc rename to tensorflow/lite/kernels/squeeze_test.cc index a8aab88357..4a02a8ee7e 100644 --- a/tensorflow/contrib/lite/kernels/squeeze_test.cc +++ b/tensorflow/lite/kernels/squeeze_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/strided_slice.cc b/tensorflow/lite/kernels/strided_slice.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/strided_slice.cc rename to tensorflow/lite/kernels/strided_slice.cc index 06b36dd196..c797a98e9f 100644 --- a/tensorflow/contrib/lite/kernels/strided_slice.cc +++ b/tensorflow/lite/kernels/strided_slice.cc @@ -15,12 +15,12 @@ limitations under the License. #include #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/strided_slice_test.cc b/tensorflow/lite/kernels/strided_slice_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/strided_slice_test.cc rename to tensorflow/lite/kernels/strided_slice_test.cc index c5d4f9affb..122e01b99e 100644 --- a/tensorflow/contrib/lite/kernels/strided_slice_test.cc +++ b/tensorflow/lite/kernels/strided_slice_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/sub.cc b/tensorflow/lite/kernels/sub.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/sub.cc rename to tensorflow/lite/kernels/sub.cc index 1be0c83f17..06a3b3499a 100644 --- a/tensorflow/contrib/lite/kernels/sub.cc +++ b/tensorflow/lite/kernels/sub.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/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/sub_test.cc b/tensorflow/lite/kernels/sub_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/sub_test.cc rename to tensorflow/lite/kernels/sub_test.cc index 5978c574d3..f0b9447ff6 100644 --- a/tensorflow/contrib/lite/kernels/sub_test.cc +++ b/tensorflow/lite/kernels/sub_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/svdf.cc b/tensorflow/lite/kernels/svdf.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/svdf.cc rename to tensorflow/lite/kernels/svdf.cc index 7e6d81239c..f07937140e 100644 --- a/tensorflow/contrib/lite/kernels/svdf.cc +++ b/tensorflow/lite/kernels/svdf.cc @@ -23,12 +23,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/svdf_test.cc b/tensorflow/lite/kernels/svdf_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/svdf_test.cc rename to tensorflow/lite/kernels/svdf_test.cc index 6d60dc63f4..8accaa465c 100644 --- a/tensorflow/contrib/lite/kernels/svdf_test.cc +++ b/tensorflow/lite/kernels/svdf_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/test_util.cc b/tensorflow/lite/kernels/test_util.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/test_util.cc rename to tensorflow/lite/kernels/test_util.cc index 0c0df133e2..6b2a1f89c3 100644 --- a/tensorflow/contrib/lite/kernels/test_util.cc +++ b/tensorflow/lite/kernels/test_util.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/test_util.h" +#include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/version.h" #include "tensorflow/core/platform/logging.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/test_util.h b/tensorflow/lite/kernels/test_util.h similarity index 96% rename from tensorflow/contrib/lite/kernels/test_util.h rename to tensorflow/lite/kernels/test_util.h index 43d00129cc..f6444ccf79 100644 --- a/tensorflow/contrib/lite/kernels/test_util.h +++ b/tensorflow/lite/kernels/test_util.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_CONTRIB_LITE_KERNELS_TEST_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_KERNELS_TEST_UTIL_H_ +#ifndef TENSORFLOW_LITE_KERNELS_TEST_UTIL_H_ +#define TENSORFLOW_LITE_KERNELS_TEST_UTIL_H_ #include #include @@ -21,12 +21,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/testing/util.h" #include "tensorflow/core/platform/logging.h" namespace tflite { @@ -278,7 +278,7 @@ class SingleOpModel { private: // TODO(gavinbelson): sync this method with - // //tensorflow/contrib/lite/kernels/internal/quantization_util.h?l=31 + // //tensorflow/lite/kernels/internal/quantization_util.h?l=31 template std::pair QuantizationParams(float f_min, float f_max) { // These are required by many quantized operations. @@ -403,4 +403,4 @@ template <> std::vector SingleOpModel::ExtractVector(int index); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_KERNELS_TEST_UTIL_H_ +#endif // TENSORFLOW_LITE_KERNELS_TEST_UTIL_H_ diff --git a/tensorflow/contrib/lite/kernels/test_util_test.cc b/tensorflow/lite/kernels/test_util_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/test_util_test.cc rename to tensorflow/lite/kernels/test_util_test.cc index 2365803472..7abb7011f9 100644 --- a/tensorflow/contrib/lite/kernels/test_util_test.cc +++ b/tensorflow/lite/kernels/test_util_test.cc @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/kernels/test_util.h" +#include "tensorflow/lite/kernels/test_util.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/tile.cc b/tensorflow/lite/kernels/tile.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/tile.cc rename to tensorflow/lite/kernels/tile.cc index 49421eb870..def709b2cc 100644 --- a/tensorflow/contrib/lite/kernels/tile.cc +++ b/tensorflow/lite/kernels/tile.cc @@ -14,12 +14,12 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { namespace builtin { diff --git a/tensorflow/contrib/lite/kernels/tile_test.cc b/tensorflow/lite/kernels/tile_test.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/tile_test.cc rename to tensorflow/lite/kernels/tile_test.cc index e73ca7b750..d12a7c19a3 100644 --- a/tensorflow/contrib/lite/kernels/tile_test.cc +++ b/tensorflow/lite/kernels/tile_test.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/topk_v2.cc b/tensorflow/lite/kernels/topk_v2.cc similarity index 96% rename from tensorflow/contrib/lite/kernels/topk_v2.cc rename to tensorflow/lite/kernels/topk_v2.cc index 6c38b6739e..444b01e7b2 100644 --- a/tensorflow/contrib/lite/kernels/topk_v2.cc +++ b/tensorflow/lite/kernels/topk_v2.cc @@ -14,11 +14,11 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { namespace builtin { diff --git a/tensorflow/contrib/lite/kernels/topk_v2_test.cc b/tensorflow/lite/kernels/topk_v2_test.cc similarity index 94% rename from tensorflow/contrib/lite/kernels/topk_v2_test.cc rename to tensorflow/lite/kernels/topk_v2_test.cc index 16106fdafe..108b812366 100644 --- a/tensorflow/contrib/lite/kernels/topk_v2_test.cc +++ b/tensorflow/lite/kernels/topk_v2_test.cc @@ -14,11 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/transpose.cc b/tensorflow/lite/kernels/transpose.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/transpose.cc rename to tensorflow/lite/kernels/transpose.cc index e42a30420b..7a6d320674 100644 --- a/tensorflow/contrib/lite/kernels/transpose.cc +++ b/tensorflow/lite/kernels/transpose.cc @@ -14,12 +14,12 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/transpose_conv.cc b/tensorflow/lite/kernels/transpose_conv.cc similarity index 95% rename from tensorflow/contrib/lite/kernels/transpose_conv.cc rename to tensorflow/lite/kernels/transpose_conv.cc index f8c858d645..59eee51068 100644 --- a/tensorflow/contrib/lite/kernels/transpose_conv.cc +++ b/tensorflow/lite/kernels/transpose_conv.cc @@ -19,14 +19,14 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/eigen_support.h" -#include "tensorflow/contrib/lite/kernels/internal/optimized/optimized_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" -#include "tensorflow/contrib/lite/kernels/padding.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/eigen_support.h" +#include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/padding.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/transpose_conv_test.cc b/tensorflow/lite/kernels/transpose_conv_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/transpose_conv_test.cc rename to tensorflow/lite/kernels/transpose_conv_test.cc index 07fca344d6..0520d84a30 100644 --- a/tensorflow/contrib/lite/kernels/transpose_conv_test.cc +++ b/tensorflow/lite/kernels/transpose_conv_test.cc @@ -15,10 +15,10 @@ limitations under the License. #include #include #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { diff --git a/tensorflow/contrib/lite/kernels/transpose_test.cc b/tensorflow/lite/kernels/transpose_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/transpose_test.cc rename to tensorflow/lite/kernels/transpose_test.cc index 79ef0a7c56..3ebaf3ca27 100644 --- a/tensorflow/contrib/lite/kernels/transpose_test.cc +++ b/tensorflow/lite/kernels/transpose_test.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/unidirectional_sequence_lstm.cc b/tensorflow/lite/kernels/unidirectional_sequence_lstm.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/unidirectional_sequence_lstm.cc rename to tensorflow/lite/kernels/unidirectional_sequence_lstm.cc index bd6d4d1f88..497777b9af 100644 --- a/tensorflow/contrib/lite/kernels/unidirectional_sequence_lstm.cc +++ b/tensorflow/lite/kernels/unidirectional_sequence_lstm.cc @@ -20,14 +20,14 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/lstm_eval.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/lstm_eval.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/unidirectional_sequence_lstm_test.cc b/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc similarity index 99% rename from tensorflow/contrib/lite/kernels/unidirectional_sequence_lstm_test.cc rename to tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc index 1de14dd60d..ae7dd6b2be 100644 --- a/tensorflow/contrib/lite/kernels/unidirectional_sequence_lstm_test.cc +++ b/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/unidirectional_sequence_rnn.cc b/tensorflow/lite/kernels/unidirectional_sequence_rnn.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/unidirectional_sequence_rnn.cc rename to tensorflow/lite/kernels/unidirectional_sequence_rnn.cc index 550a0bc02a..4c0fe00272 100644 --- a/tensorflow/contrib/lite/kernels/unidirectional_sequence_rnn.cc +++ b/tensorflow/lite/kernels/unidirectional_sequence_rnn.cc @@ -19,12 +19,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/activation_functor.h" -#include "tensorflow/contrib/lite/kernels/internal/kernel_utils.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/op_macros.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/activation_functor.h" +#include "tensorflow/lite/kernels/internal/kernel_utils.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/unidirectional_sequence_rnn_test.cc b/tensorflow/lite/kernels/unidirectional_sequence_rnn_test.cc similarity index 98% rename from tensorflow/contrib/lite/kernels/unidirectional_sequence_rnn_test.cc rename to tensorflow/lite/kernels/unidirectional_sequence_rnn_test.cc index 6b48e3fff7..a2f82ac67b 100644 --- a/tensorflow/contrib/lite/kernels/unidirectional_sequence_rnn_test.cc +++ b/tensorflow/lite/kernels/unidirectional_sequence_rnn_test.cc @@ -19,10 +19,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/unpack.cc b/tensorflow/lite/kernels/unpack.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/unpack.cc rename to tensorflow/lite/kernels/unpack.cc index a7d3a9bc76..1caffe14f9 100644 --- a/tensorflow/contrib/lite/kernels/unpack.cc +++ b/tensorflow/lite/kernels/unpack.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/unpack_test.cc b/tensorflow/lite/kernels/unpack_test.cc similarity index 97% rename from tensorflow/contrib/lite/kernels/unpack_test.cc rename to tensorflow/lite/kernels/unpack_test.cc index 4efc92a0fd..9b60cce549 100644 --- a/tensorflow/contrib/lite/kernels/unpack_test.cc +++ b/tensorflow/lite/kernels/unpack_test.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/kernels/zeros_like.cc b/tensorflow/lite/kernels/zeros_like.cc similarity index 93% rename from tensorflow/contrib/lite/kernels/zeros_like.cc rename to tensorflow/lite/kernels/zeros_like.cc index cce5240a9b..a187306fa2 100644 --- a/tensorflow/contrib/lite/kernels/zeros_like.cc +++ b/tensorflow/lite/kernels/zeros_like.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/kernels/zeros_like_test.cc b/tensorflow/lite/kernels/zeros_like_test.cc similarity index 92% rename from tensorflow/contrib/lite/kernels/zeros_like_test.cc rename to tensorflow/lite/kernels/zeros_like_test.cc index d3382d1d5b..0a1d9afe33 100644 --- a/tensorflow/contrib/lite/kernels/zeros_like_test.cc +++ b/tensorflow/lite/kernels/zeros_like_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/lib_package/BUILD b/tensorflow/lite/lib_package/BUILD similarity index 100% rename from tensorflow/contrib/lite/lib_package/BUILD rename to tensorflow/lite/lib_package/BUILD diff --git a/tensorflow/contrib/lite/lib_package/concat_licenses.sh b/tensorflow/lite/lib_package/concat_licenses.sh similarity index 100% rename from tensorflow/contrib/lite/lib_package/concat_licenses.sh rename to tensorflow/lite/lib_package/concat_licenses.sh diff --git a/tensorflow/contrib/lite/lib_package/create_ios_frameworks.sh b/tensorflow/lite/lib_package/create_ios_frameworks.sh similarity index 87% rename from tensorflow/contrib/lite/lib_package/create_ios_frameworks.sh rename to tensorflow/lite/lib_package/create_ios_frameworks.sh index 6195426d6d..fa466ed5bc 100755 --- a/tensorflow/contrib/lite/lib_package/create_ios_frameworks.sh +++ b/tensorflow/lite/lib_package/create_ios_frameworks.sh @@ -32,13 +32,13 @@ mkdir -p $FW_DIR_TFLITE_HDRS echo "Headers, populating: TensorFlow Lite" cd $TFLITE_DIR/../../.. -find tensorflow/contrib/lite -name '*.h' \ - -not -path 'tensorflow/contrib/lite/tools/*' \ - -not -path 'tensorflow/contrib/lite/examples/*' \ - -not -path 'tensorflow/contrib/lite/gen/*' \ - -not -path 'tensorflow/contrib/lite/toco/*' \ - -not -path 'tensorflow/contrib/lite/nnapi/*' \ - -not -path 'tensorflow/contrib/lite/java/*' \ +find tensorflow/lite -name '*.h' \ + -not -path 'tensorflow/lite/tools/*' \ + -not -path 'tensorflow/lite/examples/*' \ + -not -path 'tensorflow/lite/gen/*' \ + -not -path 'tensorflow/lite/toco/*' \ + -not -path 'tensorflow/lite/nnapi/*' \ + -not -path 'tensorflow/lite/java/*' \ | tar -cf $FW_DIR_TFLITE_HDRS/tmp.tar -T - cd $FW_DIR_TFLITE_HDRS tar xf tmp.tar diff --git a/tensorflow/contrib/lite/memory_planner.h b/tensorflow/lite/memory_planner.h similarity index 88% rename from tensorflow/contrib/lite/memory_planner.h rename to tensorflow/lite/memory_planner.h index 2d4707f849..fa2a44a1c8 100644 --- a/tensorflow/contrib/lite/memory_planner.h +++ b/tensorflow/lite/memory_planner.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_CONTRIB_LITE_MEMORY_PLANNER_H_ -#define TENSORFLOW_CONTRIB_LITE_MEMORY_PLANNER_H_ +#ifndef TENSORFLOW_LITE_MEMORY_PLANNER_H_ +#define TENSORFLOW_LITE_MEMORY_PLANNER_H_ -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { @@ -42,4 +42,4 @@ class MemoryPlanner { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_MEMORY_PLANNER_H_ +#endif // TENSORFLOW_LITE_MEMORY_PLANNER_H_ diff --git a/tensorflow/contrib/lite/mmap_allocation.cc b/tensorflow/lite/mmap_allocation.cc similarity index 94% rename from tensorflow/contrib/lite/mmap_allocation.cc rename to tensorflow/lite/mmap_allocation.cc index 92934d1fd1..11e5995699 100644 --- a/tensorflow/contrib/lite/mmap_allocation.cc +++ b/tensorflow/lite/mmap_allocation.cc @@ -19,8 +19,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/allocation.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" +#include "tensorflow/lite/allocation.h" +#include "tensorflow/lite/core/api/error_reporter.h" namespace tflite { diff --git a/tensorflow/contrib/lite/mmap_allocation_disabled.cc b/tensorflow/lite/mmap_allocation_disabled.cc similarity index 96% rename from tensorflow/contrib/lite/mmap_allocation_disabled.cc rename to tensorflow/lite/mmap_allocation_disabled.cc index f3d4cf1a25..efb0991b59 100644 --- a/tensorflow/contrib/lite/mmap_allocation_disabled.cc +++ b/tensorflow/lite/mmap_allocation_disabled.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/allocation.h" +#include "tensorflow/lite/allocation.h" #include diff --git a/tensorflow/contrib/lite/model.cc b/tensorflow/lite/model.cc similarity index 97% rename from tensorflow/contrib/lite/model.cc rename to tensorflow/lite/model.cc index a8a010be1a..3970940435 100644 --- a/tensorflow/contrib/lite/model.cc +++ b/tensorflow/lite/model.cc @@ -19,15 +19,15 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/allocation.h" -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/core/api/flatbuffer_conversions.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/allocation.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/core/api/flatbuffer_conversions.h" +#include "tensorflow/lite/model.h" #ifndef TFLITE_MCU -#include "tensorflow/contrib/lite/nnapi_delegate.h" +#include "tensorflow/lite/nnapi_delegate.h" #endif -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/version.h" namespace tflite { diff --git a/tensorflow/contrib/lite/model.h b/tensorflow/lite/model.h similarity index 95% rename from tensorflow/contrib/lite/model.h rename to tensorflow/lite/model.h index 9505824dcc..01e7c68205 100644 --- a/tensorflow/contrib/lite/model.h +++ b/tensorflow/lite/model.h @@ -31,15 +31,15 @@ limitations under the License. // OpResolver must be defined to provide your kernel implementations to the // interpreter. This is environment specific and may consist of just the builtin // ops, or some custom operators you defined to extend tflite. -#ifndef TENSORFLOW_CONTRIB_LITE_MODEL_H_ -#define TENSORFLOW_CONTRIB_LITE_MODEL_H_ +#ifndef TENSORFLOW_LITE_MODEL_H_ +#define TENSORFLOW_LITE_MODEL_H_ #include -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/core/api/op_resolver.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/mutable_op_resolver.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/core/api/op_resolver.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/mutable_op_resolver.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { @@ -186,4 +186,4 @@ class InterpreterBuilder { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_MODEL_H_ +#endif // TENSORFLOW_LITE_MODEL_H_ diff --git a/tensorflow/contrib/lite/model_flex_test.cc b/tensorflow/lite/model_flex_test.cc similarity index 86% rename from tensorflow/contrib/lite/model_flex_test.cc rename to tensorflow/lite/model_flex_test.cc index 52e76bee49..88b3c886b2 100644 --- a/tensorflow/contrib/lite/model_flex_test.cc +++ b/tensorflow/lite/model_flex_test.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/model.h" #include -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { @@ -24,7 +24,7 @@ namespace tflite { // appropriate delegate is linked into the client. TEST(FlexModel, WithFlexDelegate) { auto model = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/multi_add_flex.bin"); + "tensorflow/lite/testdata/multi_add_flex.bin"); ASSERT_TRUE(model); std::unique_ptr interpreter; diff --git a/tensorflow/contrib/lite/model_test.cc b/tensorflow/lite/model_test.cc similarity index 91% rename from tensorflow/contrib/lite/model_test.cc rename to tensorflow/lite/model_test.cc index b969bea5dc..e677ea94a7 100644 --- a/tensorflow/contrib/lite/model_test.cc +++ b/tensorflow/lite/model_test.cc @@ -20,12 +20,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/model.h" #include -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/testing/util.h" // Comparison for TfLiteRegistration. Since TfLiteRegistration is a C object, // we must declare this in global namespace, so argument-dependent operator @@ -75,7 +75,7 @@ TEST(BasicFlatBufferModel, TestNonExistantFiles) { // Make sure a model with nothing in it loads properly. TEST(BasicFlatBufferModel, TestEmptyModelsAndNullDestination) { auto model = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/empty_model.bin"); + "tensorflow/lite/testdata/empty_model.bin"); ASSERT_TRUE(model); // Now try to build it into a model. std::unique_ptr interpreter; @@ -89,14 +89,14 @@ TEST(BasicFlatBufferModel, TestEmptyModelsAndNullDestination) { // TODO(aselle): Replace this test when multiple subgraphs are supported. TEST(BasicFlatBufferModel, TestZeroAndMultipleSubgraphs) { auto m1 = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/0_subgraphs.bin"); + "tensorflow/lite/testdata/0_subgraphs.bin"); ASSERT_TRUE(m1); std::unique_ptr interpreter1; ASSERT_NE(InterpreterBuilder(*m1, TrivialResolver())(&interpreter1), kTfLiteOk); auto m2 = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/2_subgraphs.bin"); + "tensorflow/lite/testdata/2_subgraphs.bin"); ASSERT_TRUE(m2); std::unique_ptr interpreter2; ASSERT_NE(InterpreterBuilder(*m2, TrivialResolver())(&interpreter2), @@ -106,7 +106,7 @@ TEST(BasicFlatBufferModel, TestZeroAndMultipleSubgraphs) { // Test what happens if we cannot bind any of the ops. TEST(BasicFlatBufferModel, TestModelWithoutNullRegistrations) { auto model = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/test_model.bin"); + "tensorflow/lite/testdata/test_model.bin"); ASSERT_TRUE(model); // Check that we get an error code and interpreter pointer is reset. std::unique_ptr interpreter(new Interpreter); @@ -118,7 +118,7 @@ TEST(BasicFlatBufferModel, TestModelWithoutNullRegistrations) { // Make sure model is read to interpreter propelrly TEST(BasicFlatBufferModel, TestModelInInterpreter) { auto model = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/test_model.bin"); + "tensorflow/lite/testdata/test_model.bin"); ASSERT_TRUE(model); // Check that we get an error code and interpreter pointer is reset. std::unique_ptr interpreter(new Interpreter); @@ -198,7 +198,7 @@ TEST(BasicFlatBufferModel, TestModelInInterpreter) { // not linked into the target. TEST(FlexModel, FailureWithoutFlexDelegate) { auto model = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/multi_add_flex.bin"); + "tensorflow/lite/testdata/multi_add_flex.bin"); ASSERT_TRUE(model); // Note that creation will succeed when using the BuiltinOpResolver, but @@ -219,7 +219,7 @@ TEST(FlexModel, FailureWithoutFlexDelegate) { // buffer. But the buffer is provided to be only 1 element. TEST(BasicFlatBufferModel, TestBrokenMmap) { ASSERT_FALSE(FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/test_model_broken.bin")); + "tensorflow/lite/testdata/test_model_broken.bin")); } TEST(BasicFlatBufferModel, TestNullModel) { @@ -247,20 +247,20 @@ class FakeVerifier : public tflite::TfLiteVerifier { TEST(BasicFlatBufferModel, TestWithTrueVerifier) { FakeVerifier verifier(true); ASSERT_TRUE(FlatBufferModel::VerifyAndBuildFromFile( - "tensorflow/contrib/lite/testdata/test_model.bin", + "tensorflow/lite/testdata/test_model.bin", &verifier)); } TEST(BasicFlatBufferModel, TestWithFalseVerifier) { FakeVerifier verifier(false); ASSERT_FALSE(FlatBufferModel::VerifyAndBuildFromFile( - "tensorflow/contrib/lite/testdata/test_model.bin", + "tensorflow/lite/testdata/test_model.bin", &verifier)); } TEST(BasicFlatBufferModel, TestWithNullVerifier) { ASSERT_TRUE(FlatBufferModel::VerifyAndBuildFromFile( - "tensorflow/contrib/lite/testdata/test_model.bin", nullptr)); + "tensorflow/lite/testdata/test_model.bin", nullptr)); } // This makes sure the ErrorReporter is marshalled from FlatBufferModel to @@ -268,7 +268,7 @@ TEST(BasicFlatBufferModel, TestWithNullVerifier) { TEST(BasicFlatBufferModel, TestCustomErrorReporter) { TestErrorReporter reporter; auto model = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/empty_model.bin", + "tensorflow/lite/testdata/empty_model.bin", &reporter); ASSERT_TRUE(model); @@ -283,7 +283,7 @@ TEST(BasicFlatBufferModel, TestCustomErrorReporter) { // the Interpreter. TEST(BasicFlatBufferModel, TestNullErrorReporter) { auto model = FlatBufferModel::BuildFromFile( - "tensorflow/contrib/lite/testdata/empty_model.bin", nullptr); + "tensorflow/lite/testdata/empty_model.bin", nullptr); ASSERT_TRUE(model); std::unique_ptr interpreter; @@ -296,7 +296,7 @@ TEST(BasicFlatBufferModel, TestNullErrorReporter) { TEST(BasicFlatBufferModel, TestBuildFromModel) { TestErrorReporter reporter; FileCopyAllocation model_allocation( - "tensorflow/contrib/lite/testdata/test_model.bin", &reporter); + "tensorflow/lite/testdata/test_model.bin", &reporter); ASSERT_TRUE(model_allocation.valid()); ::flatbuffers::Verifier verifier( reinterpret_cast(model_allocation.base()), diff --git a/tensorflow/contrib/lite/models/BUILD b/tensorflow/lite/models/BUILD similarity index 74% rename from tensorflow/contrib/lite/models/BUILD rename to tensorflow/lite/models/BUILD index efa47b06fa..8730160e40 100644 --- a/tensorflow/contrib/lite/models/BUILD +++ b/tensorflow/lite/models/BUILD @@ -7,7 +7,7 @@ licenses(["notice"]) # Apache 2.0 exports_files(["LICENSE"]) -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") exports_files(glob([ "testdata/*", diff --git a/tensorflow/contrib/lite/models/smartreply/BUILD b/tensorflow/lite/models/smartreply/BUILD similarity index 60% rename from tensorflow/contrib/lite/models/smartreply/BUILD rename to tensorflow/lite/models/smartreply/BUILD index 9d88c396ba..078b8e6bc6 100644 --- a/tensorflow/contrib/lite/models/smartreply/BUILD +++ b/tensorflow/lite/models/smartreply/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts", "gen_selected_ops") +load("//tensorflow/lite:build_def.bzl", "tflite_copts", "gen_selected_ops") licenses(["notice"]) # Apache 2.0 @@ -19,9 +19,9 @@ cc_library( ], copts = tflite_copts(), deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", "@com_google_absl//absl/strings", "@com_googlesource_code_re2//:re2", "@farmhash_archive//:farmhash", @@ -35,9 +35,9 @@ cc_library( copts = tflite_copts(), deps = [ ":custom_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", "@com_google_absl//absl/strings", "@com_googlesource_code_re2//:re2", ], @@ -50,9 +50,9 @@ cc_test( tags = ["no_oss"], deps = [ ":custom_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", "@farmhash_archive//:farmhash", ], @@ -65,10 +65,10 @@ cc_test( tags = ["no_oss"], deps = [ ":custom_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) @@ -80,10 +80,10 @@ cc_test( tags = ["no_oss"], deps = [ ":custom_ops", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/kernels:test_util", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:test_util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/AndroidManifest.xml b/tensorflow/lite/models/smartreply/demo/app/src/main/AndroidManifest.xml similarity index 100% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/AndroidManifest.xml rename to tensorflow/lite/models/smartreply/demo/app/src/main/AndroidManifest.xml diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/BUILD b/tensorflow/lite/models/smartreply/demo/app/src/main/BUILD similarity index 88% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/BUILD rename to tensorflow/lite/models/smartreply/demo/app/src/main/BUILD index 2e5033dab1..b14af4cb20 100644 --- a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/BUILD +++ b/tensorflow/lite/models/smartreply/demo/app/src/main/BUILD @@ -5,7 +5,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 load( - "//tensorflow/contrib/lite:build_def.bzl", + "//tensorflow/lite:build_def.bzl", "tflite_copts", "tflite_jni_binary", ) @@ -61,8 +61,8 @@ cc_library( "-ldl", ], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/models/smartreply:predictor_lib", + "//tensorflow/lite:framework", + "//tensorflow/lite/models/smartreply:predictor_lib", ], alwayslink = 1, ) diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/assets/BUILD b/tensorflow/lite/models/smartreply/demo/app/src/main/assets/BUILD similarity index 100% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/assets/BUILD rename to tensorflow/lite/models/smartreply/demo/app/src/main/assets/BUILD diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/assets/backoff_response.txt b/tensorflow/lite/models/smartreply/demo/app/src/main/assets/backoff_response.txt similarity index 100% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/assets/backoff_response.txt rename to tensorflow/lite/models/smartreply/demo/app/src/main/assets/backoff_response.txt diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/MainActivity.java b/tensorflow/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/MainActivity.java similarity index 100% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/MainActivity.java rename to tensorflow/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/MainActivity.java diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReply.java b/tensorflow/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReply.java similarity index 100% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReply.java rename to tensorflow/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReply.java diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReplyClient.java b/tensorflow/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReplyClient.java similarity index 100% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReplyClient.java rename to tensorflow/lite/models/smartreply/demo/app/src/main/java/com/example/android/smartreply/SmartReplyClient.java diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/res/layout/main_activity.xml b/tensorflow/lite/models/smartreply/demo/app/src/main/res/layout/main_activity.xml similarity index 100% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/res/layout/main_activity.xml rename to tensorflow/lite/models/smartreply/demo/app/src/main/res/layout/main_activity.xml diff --git a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/smartreply_jni.cc b/tensorflow/lite/models/smartreply/demo/app/src/main/smartreply_jni.cc similarity index 97% rename from tensorflow/contrib/lite/models/smartreply/demo/app/src/main/smartreply_jni.cc rename to tensorflow/lite/models/smartreply/demo/app/src/main/smartreply_jni.cc index f158cc511a..9b5df36c37 100644 --- a/tensorflow/contrib/lite/models/smartreply/demo/app/src/main/smartreply_jni.cc +++ b/tensorflow/lite/models/smartreply/demo/app/src/main/smartreply_jni.cc @@ -17,8 +17,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/models/smartreply/predictor.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/models/smartreply/predictor.h" const char kIllegalStateException[] = "java/lang/IllegalStateException"; diff --git a/tensorflow/contrib/lite/models/smartreply/g3doc/README.md b/tensorflow/lite/models/smartreply/g3doc/README.md similarity index 98% rename from tensorflow/contrib/lite/models/smartreply/g3doc/README.md rename to tensorflow/lite/models/smartreply/g3doc/README.md index a6d75648b3..1b8ff15196 100644 --- a/tensorflow/contrib/lite/models/smartreply/g3doc/README.md +++ b/tensorflow/lite/models/smartreply/g3doc/README.md @@ -38,7 +38,7 @@ The On-Device Smart Reply model is aimed towards improving the messaging experience for day-to-day conversational chat messages. We recommend using this model for similar use cases. Some sample messages on which the model does well are provided in this [tsv -file](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/testdata/smartreply_samples.tsv) +file](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/testdata/smartreply_samples.tsv) for reference. The file format is: ``` @@ -143,4 +143,4 @@ Following are the ops supported for using On-Device Smart Reply model: ## Further Information * Open source code - [here](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/smartreply/). + [here](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/smartreply/). diff --git a/tensorflow/contrib/lite/models/smartreply/ops/extract_feature.cc b/tensorflow/lite/models/smartreply/ops/extract_feature.cc similarity index 95% rename from tensorflow/contrib/lite/models/smartreply/ops/extract_feature.cc rename to tensorflow/lite/models/smartreply/ops/extract_feature.cc index 29c8ad2286..f9d2922945 100644 --- a/tensorflow/contrib/lite/models/smartreply/ops/extract_feature.cc +++ b/tensorflow/lite/models/smartreply/ops/extract_feature.cc @@ -24,9 +24,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/string_util.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/models/smartreply/ops/extract_feature_test.cc b/tensorflow/lite/models/smartreply/ops/extract_feature_test.cc similarity index 93% rename from tensorflow/contrib/lite/models/smartreply/ops/extract_feature_test.cc rename to tensorflow/lite/models/smartreply/ops/extract_feature_test.cc index 9b8676bab6..efe59eeb46 100644 --- a/tensorflow/contrib/lite/models/smartreply/ops/extract_feature_test.cc +++ b/tensorflow/lite/models/smartreply/ops/extract_feature_test.cc @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" #include namespace tflite { diff --git a/tensorflow/contrib/lite/models/smartreply/ops/normalize.cc b/tensorflow/lite/models/smartreply/ops/normalize.cc similarity index 95% rename from tensorflow/contrib/lite/models/smartreply/ops/normalize.cc rename to tensorflow/lite/models/smartreply/ops/normalize.cc index c55ac9f52f..8480260f27 100644 --- a/tensorflow/contrib/lite/models/smartreply/ops/normalize.cc +++ b/tensorflow/lite/models/smartreply/ops/normalize.cc @@ -28,9 +28,9 @@ limitations under the License. #include "absl/strings/str_cat.h" #include "absl/strings/strip.h" #include "re2/re2.h" -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/models/smartreply/ops/normalize_test.cc b/tensorflow/lite/models/smartreply/ops/normalize_test.cc similarity index 90% rename from tensorflow/contrib/lite/models/smartreply/ops/normalize_test.cc rename to tensorflow/lite/models/smartreply/ops/normalize_test.cc index 4d35dba9a6..8c5131565d 100644 --- a/tensorflow/contrib/lite/models/smartreply/ops/normalize_test.cc +++ b/tensorflow/lite/models/smartreply/ops/normalize_test.cc @@ -16,11 +16,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_util.h" namespace tflite { diff --git a/tensorflow/contrib/lite/models/smartreply/ops/predict.cc b/tensorflow/lite/models/smartreply/ops/predict.cc similarity index 99% rename from tensorflow/contrib/lite/models/smartreply/ops/predict.cc rename to tensorflow/lite/models/smartreply/ops/predict.cc index 7b23adb990..bb2ed4a315 100644 --- a/tensorflow/contrib/lite/models/smartreply/ops/predict.cc +++ b/tensorflow/lite/models/smartreply/ops/predict.cc @@ -31,7 +31,7 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/context.h" +#include "tensorflow/lite/context.h" namespace tflite { namespace ops { diff --git a/tensorflow/contrib/lite/models/smartreply/ops/predict_test.cc b/tensorflow/lite/models/smartreply/ops/predict_test.cc similarity index 95% rename from tensorflow/contrib/lite/models/smartreply/ops/predict_test.cc rename to tensorflow/lite/models/smartreply/ops/predict_test.cc index e97c58cbd1..ca64dcaad4 100644 --- a/tensorflow/contrib/lite/models/smartreply/ops/predict_test.cc +++ b/tensorflow/lite/models/smartreply/ops/predict_test.cc @@ -16,11 +16,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_util.h" namespace tflite { diff --git a/tensorflow/contrib/lite/models/smartreply/predictor.cc b/tensorflow/lite/models/smartreply/predictor.cc similarity index 92% rename from tensorflow/contrib/lite/models/smartreply/predictor.cc rename to tensorflow/lite/models/smartreply/predictor.cc index 5d6c47dce8..7db2502977 100644 --- a/tensorflow/contrib/lite/models/smartreply/predictor.cc +++ b/tensorflow/lite/models/smartreply/predictor.cc @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/models/smartreply/predictor.h" +#include "tensorflow/lite/models/smartreply/predictor.h" #include "absl/strings/str_split.h" #include "re2/re2.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/op_resolver.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/op_resolver.h" +#include "tensorflow/lite/string_util.h" void RegisterSelectedOps(::tflite::MutableOpResolver* resolver); diff --git a/tensorflow/contrib/lite/models/smartreply/predictor.h b/tensorflow/lite/models/smartreply/predictor.h similarity index 91% rename from tensorflow/contrib/lite/models/smartreply/predictor.h rename to tensorflow/lite/models/smartreply/predictor.h index 3151192d92..6b8f9298a3 100644 --- a/tensorflow/contrib/lite/models/smartreply/predictor.h +++ b/tensorflow/lite/models/smartreply/predictor.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_MODELS_SMARTREPLY_PREDICTOR_H_ -#define TENSORFLOW_CONTRIB_LITE_MODELS_SMARTREPLY_PREDICTOR_H_ +#ifndef TENSORFLOW_LITE_MODELS_SMARTREPLY_PREDICTOR_H_ +#define TENSORFLOW_LITE_MODELS_SMARTREPLY_PREDICTOR_H_ #include #include -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/model.h" namespace tflite { namespace custom { @@ -77,4 +77,4 @@ struct SmartReplyConfig { } // namespace custom } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_MODELS_SMARTREPLY_PREDICTOR_H_ +#endif // TENSORFLOW_LITE_MODELS_SMARTREPLY_PREDICTOR_H_ diff --git a/tensorflow/contrib/lite/models/smartreply/predictor_test.cc b/tensorflow/lite/models/smartreply/predictor_test.cc similarity index 94% rename from tensorflow/contrib/lite/models/smartreply/predictor_test.cc rename to tensorflow/lite/models/smartreply/predictor_test.cc index c7e08814fd..7eba26993e 100644 --- a/tensorflow/contrib/lite/models/smartreply/predictor_test.cc +++ b/tensorflow/lite/models/smartreply/predictor_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/models/smartreply/predictor.h" +#include "tensorflow/lite/models/smartreply/predictor.h" #include #include @@ -22,8 +22,8 @@ limitations under the License. #include #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" -//#include "tensorflow/contrib/lite/models/test_utils.h" -#include "tensorflow/contrib/lite/string_util.h" +//#include "tensorflow/lite/models/test_utils.h" +#include "tensorflow/lite/string_util.h" #include "tensorflow/core/platform/test.h" namespace tflite { @@ -36,7 +36,7 @@ const char kSamples[] = "smartreply_samples.tsv"; string TestDataPath() { return string(absl::StrCat(tensorflow::testing::TensorFlowSrcRoot(), "/", - "contrib/lite/models/testdata/")); + "lite/models/testdata/")); } MATCHER_P(IncludeAnyResponesIn, expected_response, "contains the response") { diff --git a/tensorflow/contrib/lite/models/speech_test.cc b/tensorflow/lite/models/speech_test.cc similarity index 96% rename from tensorflow/contrib/lite/models/speech_test.cc rename to tensorflow/lite/models/speech_test.cc index 8ecf0b6154..17b7e8f28e 100644 --- a/tensorflow/contrib/lite/models/speech_test.cc +++ b/tensorflow/lite/models/speech_test.cc @@ -21,14 +21,14 @@ limitations under the License. #include "testing/base/public/googletest.h" #include -#include "tensorflow/contrib/lite/testing/parse_testdata.h" -#include "tensorflow/contrib/lite/testing/split.h" -#include "tensorflow/contrib/lite/testing/tflite_driver.h" +#include "tensorflow/lite/testing/parse_testdata.h" +#include "tensorflow/lite/testing/split.h" +#include "tensorflow/lite/testing/tflite_driver.h" namespace tflite { namespace { -const char kDataPath[] = "third_party/tensorflow/contrib/lite/models/testdata/"; +const char kDataPath[] = "third_party/tensorflow/lite/models/testdata/"; bool Init(const string& in_file_name, testing::TfLiteDriver* driver, std::ifstream* in_file) { diff --git a/tensorflow/contrib/lite/models/testdata/g3doc/README.md b/tensorflow/lite/models/testdata/g3doc/README.md similarity index 93% rename from tensorflow/contrib/lite/models/testdata/g3doc/README.md rename to tensorflow/lite/models/testdata/g3doc/README.md index 1c47e00aae..2a4f1c143a 100644 --- a/tensorflow/contrib/lite/models/testdata/g3doc/README.md +++ b/tensorflow/lite/models/testdata/g3doc/README.md @@ -118,26 +118,26 @@ model](https://storage.googleapis.com/download.tensorflow.org/models/tflite/spee ### Test benches [Speech hotword model -test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/speech_hotword_model_test.cc) +test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/speech_hotword_model_test.cc) [Speaker-id model -test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/speech_speakerid_model_test.cc) +test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/speech_speakerid_model_test.cc) [TTS model -test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/speech_tts_model_test.cc) +test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/speech_tts_model_test.cc) [ASR AM model -test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/speech_asr_am_model_test.cc) +test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/speech_asr_am_model_test.cc) [ASR LM model -test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/speech_asr_lm_model_test.cc) +test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/speech_asr_lm_model_test.cc) [Endpointer model -test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/models/speech_endpointer_model_test.cc) +test](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/models/speech_endpointer_model_test.cc) ## Android Support The models have been tested on Android phones, using the following tests: -[Hotword] (https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/android/BUILD?rcl=172930882&l=25) +[Hotword] (https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/android/BUILD?rcl=172930882&l=25) -[Speaker-id] (https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/android/BUILD?rcl=172930882&l=36) +[Speaker-id] (https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/android/BUILD?rcl=172930882&l=36) diff --git a/tensorflow/contrib/lite/models/testdata/g3doc/asr_am.svg b/tensorflow/lite/models/testdata/g3doc/asr_am.svg similarity index 100% rename from tensorflow/contrib/lite/models/testdata/g3doc/asr_am.svg rename to tensorflow/lite/models/testdata/g3doc/asr_am.svg diff --git a/tensorflow/contrib/lite/models/testdata/g3doc/asr_lm.svg b/tensorflow/lite/models/testdata/g3doc/asr_lm.svg similarity index 100% rename from tensorflow/contrib/lite/models/testdata/g3doc/asr_lm.svg rename to tensorflow/lite/models/testdata/g3doc/asr_lm.svg diff --git a/tensorflow/contrib/lite/models/testdata/g3doc/endpointer.svg b/tensorflow/lite/models/testdata/g3doc/endpointer.svg similarity index 100% rename from tensorflow/contrib/lite/models/testdata/g3doc/endpointer.svg rename to tensorflow/lite/models/testdata/g3doc/endpointer.svg diff --git a/tensorflow/contrib/lite/models/testdata/g3doc/hotword.svg b/tensorflow/lite/models/testdata/g3doc/hotword.svg similarity index 100% rename from tensorflow/contrib/lite/models/testdata/g3doc/hotword.svg rename to tensorflow/lite/models/testdata/g3doc/hotword.svg diff --git a/tensorflow/contrib/lite/models/testdata/g3doc/speakerid.svg b/tensorflow/lite/models/testdata/g3doc/speakerid.svg similarity index 100% rename from tensorflow/contrib/lite/models/testdata/g3doc/speakerid.svg rename to tensorflow/lite/models/testdata/g3doc/speakerid.svg diff --git a/tensorflow/contrib/lite/models/testdata/g3doc/tts.svg b/tensorflow/lite/models/testdata/g3doc/tts.svg similarity index 100% rename from tensorflow/contrib/lite/models/testdata/g3doc/tts.svg rename to tensorflow/lite/models/testdata/g3doc/tts.svg diff --git a/tensorflow/contrib/lite/models/testdata/smartreply_samples.tsv b/tensorflow/lite/models/testdata/smartreply_samples.tsv similarity index 100% rename from tensorflow/contrib/lite/models/testdata/smartreply_samples.tsv rename to tensorflow/lite/models/testdata/smartreply_samples.tsv diff --git a/tensorflow/contrib/lite/models/testdata/speech_asr_lm_model.test_spec b/tensorflow/lite/models/testdata/speech_asr_lm_model.test_spec similarity index 100% rename from tensorflow/contrib/lite/models/testdata/speech_asr_lm_model.test_spec rename to tensorflow/lite/models/testdata/speech_asr_lm_model.test_spec diff --git a/tensorflow/contrib/lite/mutable_op_resolver.cc b/tensorflow/lite/mutable_op_resolver.cc similarity index 97% rename from tensorflow/contrib/lite/mutable_op_resolver.cc rename to tensorflow/lite/mutable_op_resolver.cc index a36404399b..36c512dcaa 100644 --- a/tensorflow/contrib/lite/mutable_op_resolver.cc +++ b/tensorflow/lite/mutable_op_resolver.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/mutable_op_resolver.h" +#include "tensorflow/lite/mutable_op_resolver.h" namespace tflite { diff --git a/tensorflow/contrib/lite/mutable_op_resolver.h b/tensorflow/lite/mutable_op_resolver.h similarity index 91% rename from tensorflow/contrib/lite/mutable_op_resolver.h rename to tensorflow/lite/mutable_op_resolver.h index efd6cfac2a..b570059549 100644 --- a/tensorflow/contrib/lite/mutable_op_resolver.h +++ b/tensorflow/lite/mutable_op_resolver.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_CONTRIB_LITE_MUTABLE_OP_RESOLVER_H_ -#define TENSORFLOW_CONTRIB_LITE_MUTABLE_OP_RESOLVER_H_ +#ifndef TENSORFLOW_LITE_MUTABLE_OP_RESOLVER_H_ +#define TENSORFLOW_LITE_MUTABLE_OP_RESOLVER_H_ #include -#include "tensorflow/contrib/lite/core/api/op_resolver.h" -#include "tensorflow/contrib/lite/util.h" +#include "tensorflow/lite/core/api/op_resolver.h" +#include "tensorflow/lite/util.h" namespace tflite { @@ -78,4 +78,4 @@ class MutableOpResolver : public OpResolver { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_MUTABLE_OP_RESOLVER_H_ +#endif // TENSORFLOW_LITE_MUTABLE_OP_RESOLVER_H_ diff --git a/tensorflow/contrib/lite/mutable_op_resolver_test.cc b/tensorflow/lite/mutable_op_resolver_test.cc similarity index 98% rename from tensorflow/contrib/lite/mutable_op_resolver_test.cc rename to tensorflow/lite/mutable_op_resolver_test.cc index b70c703839..64fc68a16c 100644 --- a/tensorflow/contrib/lite/mutable_op_resolver_test.cc +++ b/tensorflow/lite/mutable_op_resolver_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/mutable_op_resolver.h" +#include "tensorflow/lite/mutable_op_resolver.h" #include -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/nnapi/BUILD b/tensorflow/lite/nnapi/BUILD similarity index 100% rename from tensorflow/contrib/lite/nnapi/BUILD rename to tensorflow/lite/nnapi/BUILD diff --git a/tensorflow/contrib/lite/nnapi/NeuralNetworksShim.h b/tensorflow/lite/nnapi/NeuralNetworksShim.h similarity index 99% rename from tensorflow/contrib/lite/nnapi/NeuralNetworksShim.h rename to tensorflow/lite/nnapi/NeuralNetworksShim.h index eccf4aefb6..c39502f4ac 100644 --- a/tensorflow/contrib/lite/nnapi/NeuralNetworksShim.h +++ b/tensorflow/lite/nnapi/NeuralNetworksShim.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_CONTRIB_LITE_NNAPI_NEURALNETWORKSSHIM_H_ -#define TENSORFLOW_CONTRIB_LITE_NNAPI_NEURALNETWORKSSHIM_H_ +#ifndef TENSORFLOW_LITE_NNAPI_NEURALNETWORKSSHIM_H_ +#define TENSORFLOW_LITE_NNAPI_NEURALNETWORKSSHIM_H_ #include #include @@ -1009,4 +1009,4 @@ inline void ANeuralNetworksEvent_free(ANeuralNetworksEvent* event) { /**/ -#endif // TENSORFLOW_CONTRIB_LITE_NNAPI_NEURALNETWORKSSHIM_H_ +#endif // TENSORFLOW_LITE_NNAPI_NEURALNETWORKSSHIM_H_ diff --git a/tensorflow/contrib/lite/nnapi/README.md b/tensorflow/lite/nnapi/README.md similarity index 100% rename from tensorflow/contrib/lite/nnapi/README.md rename to tensorflow/lite/nnapi/README.md diff --git a/tensorflow/contrib/lite/nnapi_delegate.cc b/tensorflow/lite/nnapi_delegate.cc similarity index 99% rename from tensorflow/contrib/lite/nnapi_delegate.cc rename to tensorflow/lite/nnapi_delegate.cc index 9cca229332..950bdb3942 100644 --- a/tensorflow/contrib/lite/nnapi_delegate.cc +++ b/tensorflow/lite/nnapi_delegate.cc @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/nnapi_delegate.h" +#include "tensorflow/lite/nnapi_delegate.h" #include #include #include #include -#include "tensorflow/contrib/lite/c/builtin_op_data.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/nnapi/NeuralNetworksShim.h" +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/nnapi/NeuralNetworksShim.h" #ifdef __ANDROID__ #include diff --git a/tensorflow/contrib/lite/nnapi_delegate.h b/tensorflow/lite/nnapi_delegate.h similarity index 86% rename from tensorflow/contrib/lite/nnapi_delegate.h rename to tensorflow/lite/nnapi_delegate.h index 22359d557e..63b408c141 100644 --- a/tensorflow/contrib/lite/nnapi_delegate.h +++ b/tensorflow/lite/nnapi_delegate.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_NNAPI_DELEGATE_H_ -#define TENSORFLOW_CONTRIB_LITE_NNAPI_DELEGATE_H_ +#ifndef TENSORFLOW_LITE_NNAPI_DELEGATE_H_ +#define TENSORFLOW_LITE_NNAPI_DELEGATE_H_ -#include "tensorflow/contrib/lite/allocation.h" -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/interpreter.h" +#include "tensorflow/lite/allocation.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/interpreter.h" class ANeuralNetworksModel; class ANeuralNetworksMemory; @@ -77,4 +77,4 @@ class NNAPIDelegate { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_NNAPI_DELEGATE_H_ +#endif // TENSORFLOW_LITE_NNAPI_DELEGATE_H_ diff --git a/tensorflow/contrib/lite/nnapi_delegate_disabled.cc b/tensorflow/lite/nnapi_delegate_disabled.cc similarity index 96% rename from tensorflow/contrib/lite/nnapi_delegate_disabled.cc rename to tensorflow/lite/nnapi_delegate_disabled.cc index e3536d3db6..44dc21f1b6 100644 --- a/tensorflow/contrib/lite/nnapi_delegate_disabled.cc +++ b/tensorflow/lite/nnapi_delegate_disabled.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/contrib/lite/nnapi_delegate.h" +#include "tensorflow/lite/nnapi_delegate.h" #include diff --git a/tensorflow/contrib/lite/op_resolver.h b/tensorflow/lite/op_resolver.h similarity index 73% rename from tensorflow/contrib/lite/op_resolver.h rename to tensorflow/lite/op_resolver.h index e93134cbde..96490d44b9 100644 --- a/tensorflow/contrib/lite/op_resolver.h +++ b/tensorflow/lite/op_resolver.h @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ // Compatibility shim for moved header location. -#ifndef TENSORFLOW_CONTRIB_LITE_OP_RESOLVER_H_ -#define TENSORFLOW_CONTRIB_LITE_OP_RESOLVER_H_ +#ifndef TENSORFLOW_LITE_OP_RESOLVER_H_ +#define TENSORFLOW_LITE_OP_RESOLVER_H_ -#include "tensorflow/contrib/lite/core/api/op_resolver.h" -#include "tensorflow/contrib/lite/mutable_op_resolver.h" +#include "tensorflow/lite/core/api/op_resolver.h" +#include "tensorflow/lite/mutable_op_resolver.h" -#endif // TENSORFLOW_CONTRIB_LITE_OP_RESOLVER_H_ +#endif // TENSORFLOW_LITE_OP_RESOLVER_H_ diff --git a/tensorflow/contrib/lite/optional_debug_tools.cc b/tensorflow/lite/optional_debug_tools.cc similarity index 98% rename from tensorflow/contrib/lite/optional_debug_tools.cc rename to tensorflow/lite/optional_debug_tools.cc index 64ba2d8baa..020d1d8de5 100644 --- a/tensorflow/contrib/lite/optional_debug_tools.cc +++ b/tensorflow/lite/optional_debug_tools.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/contrib/lite/optional_debug_tools.h" +#include "tensorflow/lite/optional_debug_tools.h" namespace tflite { diff --git a/tensorflow/contrib/lite/optional_debug_tools.h b/tensorflow/lite/optional_debug_tools.h similarity index 80% rename from tensorflow/contrib/lite/optional_debug_tools.h rename to tensorflow/lite/optional_debug_tools.h index 82a6e114a6..fb2f78e5ae 100644 --- a/tensorflow/contrib/lite/optional_debug_tools.h +++ b/tensorflow/lite/optional_debug_tools.h @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ // Optional debugging functionality. For small sized binaries, these are not // needed. -#ifndef TENSORFLOW_CONTRIB_LITE_OPTIONAL_DEBUG_TOOLS_H_ -#define TENSORFLOW_CONTRIB_LITE_OPTIONAL_DEBUG_TOOLS_H_ +#ifndef TENSORFLOW_LITE_OPTIONAL_DEBUG_TOOLS_H_ +#define TENSORFLOW_LITE_OPTIONAL_DEBUG_TOOLS_H_ -#include "tensorflow/contrib/lite/interpreter.h" +#include "tensorflow/lite/interpreter.h" namespace tflite { @@ -26,4 +26,4 @@ void PrintInterpreterState(Interpreter* interpreter); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_OPTIONAL_DEBUG_TOOLS_H_ +#endif // TENSORFLOW_LITE_OPTIONAL_DEBUG_TOOLS_H_ diff --git a/tensorflow/contrib/lite/profiling/BUILD b/tensorflow/lite/profiling/BUILD similarity index 71% rename from tensorflow/contrib/lite/profiling/BUILD rename to tensorflow/lite/profiling/BUILD index 1172722f7a..c7a8e4f06a 100644 --- a/tensorflow/contrib/lite/profiling/BUILD +++ b/tensorflow/lite/profiling/BUILD @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") common_copts = [ "-Wall", @@ -22,7 +22,7 @@ cc_test( defines = ["TFLITE_PROFILING_ENABLED"], deps = [ ":profiler", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -48,9 +48,9 @@ cc_library( copts = common_copts, deps = [ ":profiler", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/schema:schema_fbs", "//tensorflow/core:stats_calculator_portable", + "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -61,12 +61,12 @@ cc_test( tags = ["no_oss"], deps = [ ":profile_summarizer", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/kernels:kernel_util", - "//tensorflow/contrib/lite/kernels:test_util", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/kernels:kernel_util", + "//tensorflow/lite/kernels:test_util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -78,7 +78,7 @@ cc_test( defines = ["TFLITE_PROFILING_ENABLED"], deps = [ ":profile_buffer", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/contrib/lite/profiling/profile_buffer.h b/tensorflow/lite/profiling/profile_buffer.h similarity index 95% rename from tensorflow/contrib/lite/profiling/profile_buffer.h rename to tensorflow/lite/profiling/profile_buffer.h index 65d86dce47..247ebb37c5 100644 --- a/tensorflow/contrib/lite/profiling/profile_buffer.h +++ b/tensorflow/lite/profiling/profile_buffer.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_BUFFER_H_ -#define TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_BUFFER_H_ +#ifndef TENSORFLOW_LITE_PROFILING_PROFILE_BUFFER_H_ +#define TENSORFLOW_LITE_PROFILING_PROFILE_BUFFER_H_ #include #include -#include "tensorflow/contrib/lite/profiling/time.h" +#include "tensorflow/lite/profiling/time.h" namespace tflite { namespace profiling { @@ -143,4 +143,4 @@ class ProfileBuffer { } // namespace profiling } // namespace tflite #endif // TFLITE_PROFILING_ENABLED -#endif // TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_BUFFER_H_ +#endif // TENSORFLOW_LITE_PROFILING_PROFILE_BUFFER_H_ diff --git a/tensorflow/contrib/lite/profiling/profile_buffer_test.cc b/tensorflow/lite/profiling/profile_buffer_test.cc similarity index 96% rename from tensorflow/contrib/lite/profiling/profile_buffer_test.cc rename to tensorflow/lite/profiling/profile_buffer_test.cc index b8784cca45..6642a15884 100644 --- a/tensorflow/contrib/lite/profiling/profile_buffer_test.cc +++ b/tensorflow/lite/profiling/profile_buffer_test.cc @@ -17,8 +17,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/profiling/profile_buffer.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/profiling/profile_buffer.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace profiling { diff --git a/tensorflow/contrib/lite/profiling/profile_summarizer.cc b/tensorflow/lite/profiling/profile_summarizer.cc similarity index 97% rename from tensorflow/contrib/lite/profiling/profile_summarizer.cc rename to tensorflow/lite/profiling/profile_summarizer.cc index 720bd717b9..64b1bd7ad7 100644 --- a/tensorflow/contrib/lite/profiling/profile_summarizer.cc +++ b/tensorflow/lite/profiling/profile_summarizer.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/profiling/profile_summarizer.h" +#include "tensorflow/lite/profiling/profile_summarizer.h" #include -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace profiling { diff --git a/tensorflow/contrib/lite/profiling/profile_summarizer.h b/tensorflow/lite/profiling/profile_summarizer.h similarity index 84% rename from tensorflow/contrib/lite/profiling/profile_summarizer.h rename to tensorflow/lite/profiling/profile_summarizer.h index a529ff8742..d4f5da7be9 100644 --- a/tensorflow/contrib/lite/profiling/profile_summarizer.h +++ b/tensorflow/lite/profiling/profile_summarizer.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_SUMMARIZER_H_ -#define TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_SUMMARIZER_H_ +#ifndef TENSORFLOW_LITE_PROFILING_PROFILE_SUMMARIZER_H_ +#define TENSORFLOW_LITE_PROFILING_PROFILE_SUMMARIZER_H_ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/profiling/profiler.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/profiling/profiler.h" #include "tensorflow/core/util/stats_calculator.h" namespace tflite { @@ -52,4 +52,4 @@ class ProfileSummarizer { } // namespace profiling } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILE_SUMMARIZER_H_ +#endif // TENSORFLOW_LITE_PROFILING_PROFILE_SUMMARIZER_H_ diff --git a/tensorflow/contrib/lite/profiling/profile_summarizer_test.cc b/tensorflow/lite/profiling/profile_summarizer_test.cc similarity index 93% rename from tensorflow/contrib/lite/profiling/profile_summarizer_test.cc rename to tensorflow/lite/profiling/profile_summarizer_test.cc index 465c294962..bbb64b832a 100644 --- a/tensorflow/contrib/lite/profiling/profile_summarizer_test.cc +++ b/tensorflow/lite/profiling/profile_summarizer_test.cc @@ -18,13 +18,13 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/kernels/kernel_util.h" -#include "tensorflow/contrib/lite/kernels/test_util.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/profiling/profile_summarizer.h" -#include "tensorflow/contrib/lite/testing/util.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/profiling/profile_summarizer.h" +#include "tensorflow/lite/testing/util.h" +#include "tensorflow/lite/version.h" namespace tflite { namespace profiling { diff --git a/tensorflow/contrib/lite/profiling/profiler.h b/tensorflow/lite/profiling/profiler.h similarity index 95% rename from tensorflow/contrib/lite/profiling/profiler.h rename to tensorflow/lite/profiling/profiler.h index 8c3e4dc76d..89c05cba37 100644 --- a/tensorflow/contrib/lite/profiling/profiler.h +++ b/tensorflow/lite/profiling/profiler.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_CONTRIB_LITE_PROFILING_PROFILER_H_ -#define TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILER_H_ +#ifndef TENSORFLOW_LITE_PROFILING_PROFILER_H_ +#define TENSORFLOW_LITE_PROFILING_PROFILER_H_ #include -#include "tensorflow/contrib/lite/profiling/profile_buffer.h" +#include "tensorflow/lite/profiling/profile_buffer.h" #ifdef TFLITE_PROFILING_ENABLED @@ -176,4 +176,4 @@ class Profiler { #endif // TFLITE_PROFILING_ENABLED -#endif // TENSORFLOW_CONTRIB_LITE_PROFILING_PROFILER_H_ +#endif // TENSORFLOW_LITE_PROFILING_PROFILER_H_ diff --git a/tensorflow/contrib/lite/profiling/profiler_test.cc b/tensorflow/lite/profiling/profiler_test.cc similarity index 97% rename from tensorflow/contrib/lite/profiling/profiler_test.cc rename to tensorflow/lite/profiling/profiler_test.cc index cf56eed2a4..82d053729c 100644 --- a/tensorflow/contrib/lite/profiling/profiler_test.cc +++ b/tensorflow/lite/profiling/profiler_test.cc @@ -20,8 +20,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/profiling/profiler.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/profiling/profiler.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace profiling { diff --git a/tensorflow/contrib/lite/profiling/time.cc b/tensorflow/lite/profiling/time.cc similarity index 96% rename from tensorflow/contrib/lite/profiling/time.cc rename to tensorflow/lite/profiling/time.cc index 875ddb02bc..3e7db03d9d 100644 --- a/tensorflow/contrib/lite/profiling/time.cc +++ b/tensorflow/lite/profiling/time.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/contrib/lite/profiling/time.h" +#include "tensorflow/lite/profiling/time.h" #if defined(_MSC_VER) #include // NOLINT(build/c++11) diff --git a/tensorflow/contrib/lite/profiling/time.h b/tensorflow/lite/profiling/time.h similarity index 84% rename from tensorflow/contrib/lite/profiling/time.h rename to tensorflow/lite/profiling/time.h index cc2ec319b8..66233a480f 100644 --- a/tensorflow/contrib/lite/profiling/time.h +++ b/tensorflow/lite/profiling/time.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_CONTRIB_LITE_PROFILING_TIME_H_ -#define TENSORFLOW_CONTRIB_LITE_PROFILING_TIME_H_ +#ifndef TENSORFLOW_LITE_PROFILING_TIME_H_ +#define TENSORFLOW_LITE_PROFILING_TIME_H_ #include @@ -24,4 +24,4 @@ uint64_t NowMicros(); } // namespace time } // namespace profiling } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_PROFILING_TIME_H_ +#endif // TENSORFLOW_LITE_PROFILING_TIME_H_ diff --git a/tensorflow/lite/python/BUILD b/tensorflow/lite/python/BUILD new file mode 100644 index 0000000000..017dd72f78 --- /dev/null +++ b/tensorflow/lite/python/BUILD @@ -0,0 +1,189 @@ +licenses(["notice"]) # Apache 2.0 + +package(default_visibility = ["//tensorflow:internal"]) + +load("//tensorflow:tensorflow.bzl", "py_test") + +filegroup( + name = "interpreter_test_data", + srcs = glob(["**/testdata/*"]), + visibility = ["//tensorflow:__subpackages__"], +) + +py_library( + name = "interpreter", + srcs = [ + "interpreter.py", + ], + srcs_version = "PY2AND3", + visibility = ["//visibility:public"], + deps = [ + "//tensorflow/lite/python/interpreter_wrapper:tensorflow_wrap_interpreter_wrapper", + "//tensorflow/python:util", + "//third_party/py/numpy", + ], +) + +py_test( + name = "interpreter_test", + srcs = ["interpreter_test.py"], + data = [":interpreter_test_data"], + srcs_version = "PY2AND3", + tags = ["no_oss"], + deps = [ + ":interpreter", + "//tensorflow/python:client_testlib", + "//tensorflow/python:framework_test_lib", + "//tensorflow/python:platform", + "//third_party/py/numpy", + ], +) + +py_binary( + name = "tflite_convert", + srcs = ["tflite_convert.py"], + srcs_version = "PY2AND3", + visibility = ["//visibility:public"], + deps = [ + ":lite", + ], +) + +py_library( + name = "lite", + srcs = ["lite.py"], + srcs_version = "PY2AND3", + visibility = ["//visibility:public"], + deps = [ + ":convert", + ":convert_saved_model", + ":interpreter", + ":lite_constants", + ":op_hint", + "//tensorflow/python:graph_util", + "//tensorflow/python/keras", + "//tensorflow/python/saved_model:constants", + "//tensorflow/python/saved_model:loader", + ], +) + +py_test( + name = "lite_test", + srcs = ["lite_test.py"], + data = ["@tflite_mobilenet_ssd_quant_protobuf//:tflite_graph.pb"], + srcs_version = "PY2AND3", + tags = [ + "no_oss", + "no_windows", + ], + deps = [ + ":lite", + "//tensorflow/python:client_testlib", + "//tensorflow/python:framework_test_lib", + ], +) + +py_library( + name = "lite_constants", + srcs = ["lite_constants.py"], + srcs_version = "PY2AND3", + deps = [ + "//tensorflow/lite/toco:toco_flags_proto_py", + ], +) + +py_library( + name = "convert", + srcs = ["convert.py"], + srcs_version = "PY2AND3", + visibility = ["//visibility:public"], + deps = [ + ":lite_constants", + "//tensorflow/lite/toco:model_flags_proto_py", + "//tensorflow/lite/toco:toco_flags_proto_py", + "//tensorflow/lite/toco/python:tensorflow_wrap_toco", + "//tensorflow/lite/toco/python:toco_from_protos", + "//tensorflow/python:platform", + ], +) + +py_library( + name = "op_hint", + srcs = ["op_hint.py"], + srcs_version = "PY2AND3", + visibility = ["//visibility:public"], + deps = [ + "//tensorflow/contrib/framework:framework_py", + "//tensorflow/contrib/graph_editor:graph_editor_py", + "//tensorflow/core:protos_all_py", + "//tensorflow/python:framework", + "//tensorflow/python:platform", + "//tensorflow/python:util", + ], +) + +py_test( + name = "convert_test", + srcs = ["convert_test.py"], + srcs_version = "PY2AND3", + deps = [ + ":convert", + ":interpreter", + ":op_hint", + "//tensorflow/python:array_ops", + "//tensorflow/python:client_testlib", + "//tensorflow/python:dtypes", + "//tensorflow/python:platform_test", + "//tensorflow/python:session", + ], +) + +py_library( + name = "convert_saved_model", + srcs = ["convert_saved_model.py"], + srcs_version = "PY2AND3", + visibility = [ + "//tensorflow/contrib/lite:__subpackages__", + "//tensorflow/lite:__subpackages__", + ], + deps = [ + ":convert", + "//tensorflow/python:graph_util", + "//tensorflow/python:platform", + "//tensorflow/python/saved_model", + ], +) + +py_binary( + name = "create_custom_op", + srcs = ["create_custom_op.py"], + srcs_version = "PY2AND3", + visibility = ["//visibility:public"], + deps = [ + "//tensorflow/contrib/framework:framework_py", + "//tensorflow/core:protos_all_py", + "//tensorflow/python:platform", + "@absl_py//absl/flags", + ], +) + +py_test( + name = "convert_saved_model_test", + srcs = ["convert_saved_model_test.py"], + srcs_version = "PY2AND3", + tags = [ + "no_windows", + ], + visibility = ["//visibility:public"], + deps = [ + ":convert_saved_model", + "//tensorflow/python:client_testlib", + "//tensorflow/python:layers", + "//tensorflow/python:nn", + "//tensorflow/python:platform_test", + "//tensorflow/python:session", + "//tensorflow/python/keras", + "//tensorflow/python/ops/losses", + "//tensorflow/python/saved_model", + ], +) diff --git a/tensorflow/contrib/lite/python/convert.py b/tensorflow/lite/python/convert.py similarity index 98% rename from tensorflow/contrib/lite/python/convert.py rename to tensorflow/lite/python/convert.py index f36248f327..f06d0ba1a0 100644 --- a/tensorflow/contrib/lite/python/convert.py +++ b/tensorflow/lite/python/convert.py @@ -25,9 +25,9 @@ import platform as _platform import subprocess as _subprocess import tempfile as _tempfile -from tensorflow.contrib.lite.python import lite_constants -from tensorflow.contrib.lite.toco import model_flags_pb2 as _model_flags_pb2 -from tensorflow.contrib.lite.toco import toco_flags_pb2 as _toco_flags_pb2 +from tensorflow.lite.python import lite_constants +from tensorflow.lite.toco import model_flags_pb2 as _model_flags_pb2 +from tensorflow.lite.toco import toco_flags_pb2 as _toco_flags_pb2 from tensorflow.python.platform import resource_loader as _resource_loader from tensorflow.python.util import deprecation from tensorflow.python.util.lazy_loader import LazyLoader @@ -37,7 +37,7 @@ from tensorflow.python.util.tf_export import tf_export as _tf_export # break dependencies. _toco_python = LazyLoader( "tensorflow_wrap_toco", globals(), - "tensorflow.contrib.lite.toco.python." + "tensorflow.lite.toco.python." "tensorflow_wrap_toco") del LazyLoader @@ -97,7 +97,7 @@ def toco_convert_protos(model_flags_str, toco_flags_str, input_data_str): """Convert `input_data_str` according to model and toco parameters. Unless you know what you are doing consider using - the more friendly `tf.contrib.lite.toco_convert`. + the more friendly `tf.lite.toco_convert`. Args: model_flags_str: Serialized proto describing model properties, see diff --git a/tensorflow/contrib/lite/python/convert_saved_model.py b/tensorflow/lite/python/convert_saved_model.py similarity index 99% rename from tensorflow/contrib/lite/python/convert_saved_model.py rename to tensorflow/lite/python/convert_saved_model.py index d18b60d0ea..3f54d2559c 100644 --- a/tensorflow/contrib/lite/python/convert_saved_model.py +++ b/tensorflow/lite/python/convert_saved_model.py @@ -18,7 +18,7 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.contrib.lite.python.convert import tensor_name +from tensorflow.lite.python.convert import tensor_name from tensorflow.core.framework import types_pb2 from tensorflow.python.client import session from tensorflow.python.framework import graph_util as tf_graph_util diff --git a/tensorflow/contrib/lite/python/convert_saved_model_test.py b/tensorflow/lite/python/convert_saved_model_test.py similarity index 99% rename from tensorflow/contrib/lite/python/convert_saved_model_test.py rename to tensorflow/lite/python/convert_saved_model_test.py index 66586e01fb..dff582f1a1 100644 --- a/tensorflow/contrib/lite/python/convert_saved_model_test.py +++ b/tensorflow/lite/python/convert_saved_model_test.py @@ -24,7 +24,7 @@ from __future__ import division from __future__ import print_function import os -from tensorflow.contrib.lite.python import convert_saved_model +from tensorflow.lite.python import convert_saved_model from tensorflow.python.client import session from tensorflow.python.framework import dtypes from tensorflow.python.framework import ops diff --git a/tensorflow/contrib/lite/python/convert_test.py b/tensorflow/lite/python/convert_test.py similarity index 98% rename from tensorflow/contrib/lite/python/convert_test.py rename to tensorflow/lite/python/convert_test.py index b403ba3735..7a0bce921b 100644 --- a/tensorflow/contrib/lite/python/convert_test.py +++ b/tensorflow/lite/python/convert_test.py @@ -19,10 +19,10 @@ from __future__ import print_function import numpy as np -from tensorflow.contrib.lite.python import convert -from tensorflow.contrib.lite.python import lite_constants -from tensorflow.contrib.lite.python import op_hint -from tensorflow.contrib.lite.python.interpreter import Interpreter +from tensorflow.lite.python import convert +from tensorflow.lite.python import lite_constants +from tensorflow.lite.python import op_hint +from tensorflow.lite.python.interpreter import Interpreter from tensorflow.python.client import session from tensorflow.python.framework import dtypes from tensorflow.python.framework import test_util diff --git a/tensorflow/contrib/lite/python/create_custom_op.py b/tensorflow/lite/python/create_custom_op.py similarity index 98% rename from tensorflow/contrib/lite/python/create_custom_op.py rename to tensorflow/lite/python/create_custom_op.py index 830f95358c..344cd28d16 100644 --- a/tensorflow/contrib/lite/python/create_custom_op.py +++ b/tensorflow/lite/python/create_custom_op.py @@ -19,7 +19,7 @@ portions of a TensorFlow GraphDef to be executed by custom code. Example: -bazel run tensorflow/contrib/lite/python:create_custom_op -- \ +bazel run tensorflow/lite/python:create_custom_op -- \ --input_graph=/tmp/input.pb \ --output_graph=/tmp/output.pb \ --inputs=concat,concat_1 \ diff --git a/tensorflow/contrib/lite/python/interpreter.py b/tensorflow/lite/python/interpreter.py similarity index 99% rename from tensorflow/contrib/lite/python/interpreter.py rename to tensorflow/lite/python/interpreter.py index 74ee82a062..a6183d13b5 100644 --- a/tensorflow/contrib/lite/python/interpreter.py +++ b/tensorflow/lite/python/interpreter.py @@ -28,7 +28,7 @@ from tensorflow.python.util.tf_export import tf_export as _tf_export # pylint: disable=g-inconsistent-quotes _interpreter_wrapper = LazyLoader( "_interpreter_wrapper", globals(), - "tensorflow.contrib.lite.python.interpreter_wrapper." + "tensorflow.lite.python.interpreter_wrapper." "tensorflow_wrap_interpreter_wrapper") # pylint: enable=g-inconsistent-quotes diff --git a/tensorflow/contrib/lite/python/interpreter_test.py b/tensorflow/lite/python/interpreter_test.py similarity index 98% rename from tensorflow/contrib/lite/python/interpreter_test.py rename to tensorflow/lite/python/interpreter_test.py index e77d52ca99..7ec56a21c9 100644 --- a/tensorflow/contrib/lite/python/interpreter_test.py +++ b/tensorflow/lite/python/interpreter_test.py @@ -21,7 +21,7 @@ import io import numpy as np import six -from tensorflow.contrib.lite.python import interpreter as interpreter_wrapper +from tensorflow.lite.python import interpreter as interpreter_wrapper from tensorflow.python.framework import test_util from tensorflow.python.platform import resource_loader from tensorflow.python.platform import test diff --git a/tensorflow/contrib/lite/python/interpreter_wrapper/BUILD b/tensorflow/lite/python/interpreter_wrapper/BUILD similarity index 86% rename from tensorflow/contrib/lite/python/interpreter_wrapper/BUILD rename to tensorflow/lite/python/interpreter_wrapper/BUILD index 69ee95c320..767a9fc476 100644 --- a/tensorflow/contrib/lite/python/interpreter_wrapper/BUILD +++ b/tensorflow/lite/python/interpreter_wrapper/BUILD @@ -11,8 +11,8 @@ cc_library( srcs = ["interpreter_wrapper.cc"], hdrs = ["interpreter_wrapper.h"], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", "//third_party/py/numpy:headers", "//third_party/python_runtime:headers", "@com_google_absl//absl/memory", diff --git a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.cc b/tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.cc similarity index 98% rename from tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.cc rename to tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.cc index 1e2384b6d2..e71752fe63 100644 --- a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.cc +++ b/tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.cc @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h" +#include "tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.h" #include #include #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" // Disallow Numpy 1.7 deprecated symbols. #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION diff --git a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h b/tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.h similarity index 93% rename from tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h rename to tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.h index b98046fe8a..ffb0278025 100644 --- a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h +++ b/tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.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_CONTRIB_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ -#define TENSORFLOW_CONTRIB_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ +#ifndef TENSORFLOW_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ +#define TENSORFLOW_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ #include #include @@ -104,4 +104,4 @@ class InterpreterWrapper { } // namespace interpreter_wrapper } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ +#endif // TENSORFLOW_LITE_PYTHON_INTERPRETER_WRAPPER_INTERPRETER_WRAPPER_H_ diff --git a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.i b/tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.i similarity index 88% rename from tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.i rename to tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.i index afb2092eac..f52ef1eeca 100644 --- a/tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.i +++ b/tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.i @@ -18,13 +18,13 @@ limitations under the License. %{ #define SWIG_FILE_WITH_INIT -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.h" %} -%include "tensorflow/contrib/lite/python/interpreter_wrapper/interpreter_wrapper.h" +%include "tensorflow/lite/python/interpreter_wrapper/interpreter_wrapper.h" namespace tflite { namespace interpreter_wrapper { diff --git a/tensorflow/contrib/lite/python/lite.py b/tensorflow/lite/python/lite.py similarity index 94% rename from tensorflow/contrib/lite/python/lite.py rename to tensorflow/lite/python/lite.py index 01bd0e74f3..5810553da2 100644 --- a/tensorflow/contrib/lite/python/lite.py +++ b/tensorflow/lite/python/lite.py @@ -39,21 +39,21 @@ from six import PY3 from google.protobuf import text_format as _text_format from google.protobuf.message import DecodeError -from tensorflow.contrib.lite.python import lite_constants as constants -from tensorflow.contrib.lite.python.convert import build_toco_convert_protos # pylint: disable=unused-import -from tensorflow.contrib.lite.python.convert import ConverterError # pylint: disable=unused-import -from tensorflow.contrib.lite.python.convert import OpsSet -from tensorflow.contrib.lite.python.convert import tensor_name as _tensor_name -from tensorflow.contrib.lite.python.convert import toco_convert # pylint: disable=unused-import -from tensorflow.contrib.lite.python.convert import toco_convert_graph_def as _toco_convert_graph_def -from tensorflow.contrib.lite.python.convert import toco_convert_impl as _toco_convert_impl -from tensorflow.contrib.lite.python.convert import toco_convert_protos # pylint: disable=unused-import -from tensorflow.contrib.lite.python.convert_saved_model import freeze_saved_model as _freeze_saved_model -from tensorflow.contrib.lite.python.convert_saved_model import get_tensors_from_tensor_names as _get_tensors_from_tensor_names -from tensorflow.contrib.lite.python.convert_saved_model import set_tensor_shapes as _set_tensor_shapes -from tensorflow.contrib.lite.python.interpreter import Interpreter # pylint: disable=unused-import -from tensorflow.contrib.lite.python.op_hint import convert_op_hints_to_stubs # pylint: disable=unused-import -from tensorflow.contrib.lite.python.op_hint import OpHint # pylint: disable=unused-import +from tensorflow.lite.python import lite_constants as constants +from tensorflow.lite.python.convert import build_toco_convert_protos # pylint: disable=unused-import +from tensorflow.lite.python.convert import ConverterError # pylint: disable=unused-import +from tensorflow.lite.python.convert import OpsSet +from tensorflow.lite.python.convert import tensor_name as _tensor_name +from tensorflow.lite.python.convert import toco_convert # pylint: disable=unused-import +from tensorflow.lite.python.convert import toco_convert_graph_def as _toco_convert_graph_def +from tensorflow.lite.python.convert import toco_convert_impl as _toco_convert_impl +from tensorflow.lite.python.convert import toco_convert_protos # pylint: disable=unused-import +from tensorflow.lite.python.convert_saved_model import freeze_saved_model as _freeze_saved_model +from tensorflow.lite.python.convert_saved_model import get_tensors_from_tensor_names as _get_tensors_from_tensor_names +from tensorflow.lite.python.convert_saved_model import set_tensor_shapes as _set_tensor_shapes +from tensorflow.lite.python.interpreter import Interpreter # pylint: disable=unused-import +from tensorflow.lite.python.op_hint import convert_op_hints_to_stubs # pylint: disable=unused-import +from tensorflow.lite.python.op_hint import OpHint # pylint: disable=unused-import from tensorflow.core.framework import graph_pb2 as _graph_pb2 from tensorflow.python import keras as _keras from tensorflow.python.client import session as _session diff --git a/tensorflow/contrib/lite/python/lite_constants.py b/tensorflow/lite/python/lite_constants.py similarity index 94% rename from tensorflow/contrib/lite/python/lite_constants.py rename to tensorflow/lite/python/lite_constants.py index eebe0a58bb..fdefc5e6cf 100644 --- a/tensorflow/contrib/lite/python/lite_constants.py +++ b/tensorflow/lite/python/lite_constants.py @@ -18,8 +18,8 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function -from tensorflow.contrib.lite.toco import toco_flags_pb2 as _toco_flags_pb2 -from tensorflow.contrib.lite.toco import types_pb2 as _types_pb2 +from tensorflow.lite.toco import toco_flags_pb2 as _toco_flags_pb2 +from tensorflow.lite.toco import types_pb2 as _types_pb2 from tensorflow.python.util.all_util import remove_undocumented from tensorflow.python.util.tf_export import tf_export as _tf_export diff --git a/tensorflow/contrib/lite/python/lite_test.py b/tensorflow/lite/python/lite_test.py similarity index 99% rename from tensorflow/contrib/lite/python/lite_test.py rename to tensorflow/lite/python/lite_test.py index 00a3d6f9b3..5a5697db92 100644 --- a/tensorflow/contrib/lite/python/lite_test.py +++ b/tensorflow/lite/python/lite_test.py @@ -22,9 +22,9 @@ import os import tempfile import numpy as np -from tensorflow.contrib.lite.python import lite -from tensorflow.contrib.lite.python import lite_constants -from tensorflow.contrib.lite.python.interpreter import Interpreter +from tensorflow.lite.python import lite +from tensorflow.lite.python import lite_constants +from tensorflow.lite.python.interpreter import Interpreter from tensorflow.python import keras from tensorflow.python.client import session from tensorflow.python.framework import constant_op diff --git a/tensorflow/contrib/lite/python/op_hint.py b/tensorflow/lite/python/op_hint.py similarity index 99% rename from tensorflow/contrib/lite/python/op_hint.py rename to tensorflow/lite/python/op_hint.py index 9f43e6e52b..3afce1baf2 100644 --- a/tensorflow/contrib/lite/python/op_hint.py +++ b/tensorflow/lite/python/op_hint.py @@ -24,7 +24,7 @@ accelerated tflite op. Example: def tflite_cool_activation(input): # A cool activation function. - custom = tf.contrib.lite.OpHint("cool_activation") + custom = tf.lite.OpHint("cool_activation") input, = custom.add_inputs(input) output = tf.sigmoid(input) * input output, = custom.add_outputs(output) @@ -35,8 +35,8 @@ Example: session = tf.Session() - graphdef_to_convert = tf.contrib.lite.convert_op_hints_to_stubs(session) - tflite_graph = tf.contrib.lite.toco_convert(graphdef_to_convert, + graphdef_to_convert = tf.lite.convert_op_hints_to_stubs(session) + tflite_graph = tf.lite.toco_convert(graphdef_to_convert, [image], [output]) [image], [output]) with open("/tmp/graph.fb", "wb") as fp: diff --git a/tensorflow/contrib/lite/python/tflite_convert.py b/tensorflow/lite/python/tflite_convert.py similarity index 98% rename from tensorflow/contrib/lite/python/tflite_convert.py rename to tensorflow/lite/python/tflite_convert.py index 551424c4b4..00ea6d722e 100644 --- a/tensorflow/contrib/lite/python/tflite_convert.py +++ b/tensorflow/lite/python/tflite_convert.py @@ -22,10 +22,10 @@ import argparse import os import sys -from tensorflow.contrib.lite.python import lite -from tensorflow.contrib.lite.python import lite_constants -from tensorflow.contrib.lite.toco import toco_flags_pb2 as _toco_flags_pb2 -from tensorflow.contrib.lite.toco import types_pb2 as _types_pb2 +from tensorflow.lite.python import lite +from tensorflow.lite.python import lite_constants +from tensorflow.lite.toco import toco_flags_pb2 as _toco_flags_pb2 +from tensorflow.lite.toco import types_pb2 as _types_pb2 from tensorflow.python.platform import app diff --git a/tensorflow/contrib/lite/schema/BUILD b/tensorflow/lite/schema/BUILD similarity index 96% rename from tensorflow/contrib/lite/schema/BUILD rename to tensorflow/lite/schema/BUILD index d892466c7a..69d5458c6e 100644 --- a/tensorflow/contrib/lite/schema/BUILD +++ b/tensorflow/lite/schema/BUILD @@ -5,7 +5,7 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 load("//tensorflow:tensorflow.bzl", "py_test") -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") py_binary( name = "upgrade_schema", diff --git a/tensorflow/contrib/lite/schema/builtin_ops_header/BUILD b/tensorflow/lite/schema/builtin_ops_header/BUILD similarity index 86% rename from tensorflow/contrib/lite/schema/builtin_ops_header/BUILD rename to tensorflow/lite/schema/builtin_ops_header/BUILD index 4a627761da..8a01541d57 100644 --- a/tensorflow/contrib/lite/schema/builtin_ops_header/BUILD +++ b/tensorflow/lite/schema/builtin_ops_header/BUILD @@ -9,7 +9,7 @@ cc_library( srcs = ["generator.cc"], hdrs = ["generator.h"], deps = [ - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -35,7 +35,7 @@ cc_test( name = "consistency_test", srcs = ["consistency_test.cc"], data = [ - "//tensorflow/contrib/lite:builtin_ops.h", + "//tensorflow/lite:builtin_ops.h", ], tags = ["no_oss"], deps = [ diff --git a/tensorflow/contrib/lite/schema/builtin_ops_header/README.md b/tensorflow/lite/schema/builtin_ops_header/README.md similarity index 65% rename from tensorflow/contrib/lite/schema/builtin_ops_header/README.md rename to tensorflow/lite/schema/builtin_ops_header/README.md index f20d4f664e..e34a30b818 100644 --- a/tensorflow/contrib/lite/schema/builtin_ops_header/README.md +++ b/tensorflow/lite/schema/builtin_ops_header/README.md @@ -7,6 +7,6 @@ Whenever you add a new builtin op, please execute: ```sh bazel run \ - //tensorflow/contrib/lite/schema/builtin_ops_header:generate > \ - tensorflow/contrib/lite/builtin_ops.h + //tensorflow/lite/schema/builtin_ops_header:generate > \ + tensorflow/lite/builtin_ops.h ``` diff --git a/tensorflow/contrib/lite/schema/builtin_ops_header/consistency_test.cc b/tensorflow/lite/schema/builtin_ops_header/consistency_test.cc similarity index 93% rename from tensorflow/contrib/lite/schema/builtin_ops_header/consistency_test.cc rename to tensorflow/lite/schema/builtin_ops_header/consistency_test.cc index d55c125c11..f62dcda2e8 100644 --- a/tensorflow/contrib/lite/schema/builtin_ops_header/consistency_test.cc +++ b/tensorflow/lite/schema/builtin_ops_header/consistency_test.cc @@ -15,12 +15,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/schema/builtin_ops_header/generator.h" +#include "tensorflow/lite/schema/builtin_ops_header/generator.h" namespace { const char* kHeaderFileName = - "tensorflow/contrib/lite/builtin_ops.h"; + "tensorflow/lite/builtin_ops.h"; // The test ensures that `builtin_ops.h` is consistent with the FlatBuffer // schema definition. When the schema is modified, it's required to run the diff --git a/tensorflow/contrib/lite/schema/builtin_ops_header/generate.cc b/tensorflow/lite/schema/builtin_ops_header/generate.cc similarity index 92% rename from tensorflow/contrib/lite/schema/builtin_ops_header/generate.cc rename to tensorflow/lite/schema/builtin_ops_header/generate.cc index 72a28987b8..125dcd485b 100644 --- a/tensorflow/contrib/lite/schema/builtin_ops_header/generate.cc +++ b/tensorflow/lite/schema/builtin_ops_header/generate.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/schema/builtin_ops_header/generator.h" +#include "tensorflow/lite/schema/builtin_ops_header/generator.h" // This executable is used to generate builtin_ops.h in TensorFlow Lite. // Please see README.md for more details. diff --git a/tensorflow/contrib/lite/schema/builtin_ops_header/generator.cc b/tensorflow/lite/schema/builtin_ops_header/generator.cc similarity index 92% rename from tensorflow/contrib/lite/schema/builtin_ops_header/generator.cc rename to tensorflow/lite/schema/builtin_ops_header/generator.cc index 9dc8daa227..e2967aee0f 100644 --- a/tensorflow/contrib/lite/schema/builtin_ops_header/generator.cc +++ b/tensorflow/lite/schema/builtin_ops_header/generator.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/schema/builtin_ops_header/generator.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/schema/builtin_ops_header/generator.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace builtin_ops_header { @@ -35,8 +35,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_BUILTIN_OPS_H_ -#define TENSORFLOW_CONTRIB_LITE_BUILTIN_OPS_H_ +#ifndef TENSORFLOW_LITE_BUILTIN_OPS_H_ +#define TENSORFLOW_LITE_BUILTIN_OPS_H_ // DO NOT EDIT MANUALLY: This file is automatically generated by // `schema/builtin_ops_header/generator.cc`. @@ -56,7 +56,7 @@ const char* kFileFooter = #ifdef __cplusplus } // extern "C" #endif // __cplusplus -#endif // TENSORFLOW_CONTRIB_LITE_BUILTIN_OPS_H_ +#endif // TENSORFLOW_LITE_BUILTIN_OPS_H_ )"; } // anonymous namespace diff --git a/tensorflow/contrib/lite/schema/builtin_ops_header/generator.h b/tensorflow/lite/schema/builtin_ops_header/generator.h similarity index 86% rename from tensorflow/contrib/lite/schema/builtin_ops_header/generator.h rename to tensorflow/lite/schema/builtin_ops_header/generator.h index 3241ff83d5..8c9383a992 100644 --- a/tensorflow/contrib/lite/schema/builtin_ops_header/generator.h +++ b/tensorflow/lite/schema/builtin_ops_header/generator.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ // An utility library to generate pure C header for builtin ops definition. -#ifndef TENSORFLOW_CONTRIB_LITE_SCHEMA_BUILTIN_OPS_HEADER_GENERATOR_H_ -#define TENSORFLOW_CONTRIB_LITE_SCHEMA_BUILTIN_OPS_HEADER_GENERATOR_H_ +#ifndef TENSORFLOW_LITE_SCHEMA_BUILTIN_OPS_HEADER_GENERATOR_H_ +#define TENSORFLOW_LITE_SCHEMA_BUILTIN_OPS_HEADER_GENERATOR_H_ #include @@ -35,4 +35,4 @@ bool GenerateHeader(std::ostream& os); } // namespace builtin_ops_header } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_SCHEMA_BUILTIN_OPS_HEADER_GENERATOR_H_ +#endif // TENSORFLOW_LITE_SCHEMA_BUILTIN_OPS_HEADER_GENERATOR_H_ diff --git a/tensorflow/contrib/lite/schema/builtin_ops_header/generator_test.cc b/tensorflow/lite/schema/builtin_ops_header/generator_test.cc similarity index 96% rename from tensorflow/contrib/lite/schema/builtin_ops_header/generator_test.cc rename to tensorflow/lite/schema/builtin_ops_header/generator_test.cc index a7dc8e1b04..c508c981bb 100644 --- a/tensorflow/contrib/lite/schema/builtin_ops_header/generator_test.cc +++ b/tensorflow/lite/schema/builtin_ops_header/generator_test.cc @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/schema/builtin_ops_header/generator.h" +#include "tensorflow/lite/schema/builtin_ops_header/generator.h" #include #include diff --git a/tensorflow/contrib/lite/schema/flatbuffer_compatibility_test.cc b/tensorflow/lite/schema/flatbuffer_compatibility_test.cc similarity index 96% rename from tensorflow/contrib/lite/schema/flatbuffer_compatibility_test.cc rename to tensorflow/lite/schema/flatbuffer_compatibility_test.cc index 22b4616ccb..86177aeb12 100644 --- a/tensorflow/contrib/lite/schema/flatbuffer_compatibility_test.cc +++ b/tensorflow/lite/schema/flatbuffer_compatibility_test.cc @@ -62,9 +62,9 @@ TEST(SchemaTest, TestCompatibility) { // TODO(aselle): Need a reliable way to load files. std::string base_contents, current_contents; const char *base_filename = - TFLITE_TF_PREFIX "contrib/lite/schema/schema_v3.fbs"; + TFLITE_TF_PREFIX "lite/schema/schema_v3.fbs"; const char *current_filename = - TFLITE_TF_PREFIX "contrib/lite/schema/schema.fbs"; + TFLITE_TF_PREFIX "lite/schema/schema.fbs"; ASSERT_TRUE(LoadFileRaw(base_filename, &base_contents)); ASSERT_TRUE(LoadFileRaw(current_filename, ¤t_contents)); diff --git a/tensorflow/contrib/lite/schema/schema.fbs b/tensorflow/lite/schema/schema.fbs similarity index 100% rename from tensorflow/contrib/lite/schema/schema.fbs rename to tensorflow/lite/schema/schema.fbs diff --git a/tensorflow/contrib/lite/schema/schema_generated.h b/tensorflow/lite/schema/schema_generated.h similarity index 100% rename from tensorflow/contrib/lite/schema/schema_generated.h rename to tensorflow/lite/schema/schema_generated.h diff --git a/tensorflow/contrib/lite/schema/schema_v0.fbs b/tensorflow/lite/schema/schema_v0.fbs similarity index 100% rename from tensorflow/contrib/lite/schema/schema_v0.fbs rename to tensorflow/lite/schema/schema_v0.fbs diff --git a/tensorflow/contrib/lite/schema/schema_v1.fbs b/tensorflow/lite/schema/schema_v1.fbs similarity index 100% rename from tensorflow/contrib/lite/schema/schema_v1.fbs rename to tensorflow/lite/schema/schema_v1.fbs diff --git a/tensorflow/contrib/lite/schema/schema_v2.fbs b/tensorflow/lite/schema/schema_v2.fbs similarity index 100% rename from tensorflow/contrib/lite/schema/schema_v2.fbs rename to tensorflow/lite/schema/schema_v2.fbs diff --git a/tensorflow/contrib/lite/schema/schema_v3.fbs b/tensorflow/lite/schema/schema_v3.fbs similarity index 100% rename from tensorflow/contrib/lite/schema/schema_v3.fbs rename to tensorflow/lite/schema/schema_v3.fbs diff --git a/tensorflow/contrib/lite/schema/upgrade_schema.py b/tensorflow/lite/schema/upgrade_schema.py similarity index 97% rename from tensorflow/contrib/lite/schema/upgrade_schema.py rename to tensorflow/lite/schema/upgrade_schema.py index a2ddf62950..d9220ba10c 100644 --- a/tensorflow/contrib/lite/schema/upgrade_schema.py +++ b/tensorflow/lite/schema/upgrade_schema.py @@ -16,11 +16,11 @@ Usage examples: -bazel run tensorflow/contrib/lite/schema/upgrade_schema -- in.json out.json -bazel run tensorflow/contrib/lite/schema/upgrade_schema -- in.bin out.bin -bazel run tensorflow/contrib/lite/schema/upgrade_schema -- in.bin out.json -bazel run tensorflow/contrib/lite/schema/upgrade_schema -- in.json out.bin -bazel run tensorflow/contrib/lite/schema/upgrade_schema -- in.tflite out.tflite +bazel run tensorflow/lite/schema/upgrade_schema -- in.json out.json +bazel run tensorflow/lite/schema/upgrade_schema -- in.bin out.bin +bazel run tensorflow/lite/schema/upgrade_schema -- in.bin out.json +bazel run tensorflow/lite/schema/upgrade_schema -- in.json out.bin +bazel run tensorflow/lite/schema/upgrade_schema -- in.tflite out.tflite """ from __future__ import absolute_import from __future__ import division diff --git a/tensorflow/contrib/lite/schema/upgrade_schema_test.py b/tensorflow/lite/schema/upgrade_schema_test.py similarity index 99% rename from tensorflow/contrib/lite/schema/upgrade_schema_test.py rename to tensorflow/lite/schema/upgrade_schema_test.py index b5002e6f75..922968c65a 100644 --- a/tensorflow/contrib/lite/schema/upgrade_schema_test.py +++ b/tensorflow/lite/schema/upgrade_schema_test.py @@ -20,7 +20,7 @@ from __future__ import print_function import json import tempfile -from tensorflow.contrib.lite.schema import upgrade_schema as upgrade_schema_lib +from tensorflow.lite.schema import upgrade_schema as upgrade_schema_lib from tensorflow.python.framework import test_util from tensorflow.python.platform import test as test_lib diff --git a/tensorflow/contrib/lite/simple_memory_arena.cc b/tensorflow/lite/simple_memory_arena.cc similarity index 98% rename from tensorflow/contrib/lite/simple_memory_arena.cc rename to tensorflow/lite/simple_memory_arena.cc index cd0f1f7c17..88bdf50c9b 100644 --- a/tensorflow/contrib/lite/simple_memory_arena.cc +++ b/tensorflow/lite/simple_memory_arena.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/simple_memory_arena.h" +#include "tensorflow/lite/simple_memory_arena.h" #include #include diff --git a/tensorflow/contrib/lite/simple_memory_arena.h b/tensorflow/lite/simple_memory_arena.h similarity index 92% rename from tensorflow/contrib/lite/simple_memory_arena.h rename to tensorflow/lite/simple_memory_arena.h index 45d0d8735e..42203c0c0a 100644 --- a/tensorflow/contrib/lite/simple_memory_arena.h +++ b/tensorflow/lite/simple_memory_arena.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_CONTRIB_LITE_SIMPLE_MEMORY_ARENA_H_ -#define TENSORFLOW_CONTRIB_LITE_SIMPLE_MEMORY_ARENA_H_ +#ifndef TENSORFLOW_LITE_SIMPLE_MEMORY_ARENA_H_ +#define TENSORFLOW_LITE_SIMPLE_MEMORY_ARENA_H_ #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { @@ -86,4 +86,4 @@ class SimpleMemoryArena { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_SIMPLE_MEMORY_ARENA_H_ +#endif // TENSORFLOW_LITE_SIMPLE_MEMORY_ARENA_H_ diff --git a/tensorflow/contrib/lite/simple_memory_arena_test.cc b/tensorflow/lite/simple_memory_arena_test.cc similarity index 97% rename from tensorflow/contrib/lite/simple_memory_arena_test.cc rename to tensorflow/lite/simple_memory_arena_test.cc index 60d4d5e768..caf13db2c1 100644 --- a/tensorflow/contrib/lite/simple_memory_arena_test.cc +++ b/tensorflow/lite/simple_memory_arena_test.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/simple_memory_arena.h" +#include "tensorflow/lite/simple_memory_arena.h" #include #include -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/special_rules.bzl b/tensorflow/lite/special_rules.bzl similarity index 59% rename from tensorflow/contrib/lite/special_rules.bzl rename to tensorflow/lite/special_rules.bzl index 54083c4918..e10af3d240 100644 --- a/tensorflow/contrib/lite/special_rules.bzl +++ b/tensorflow/lite/special_rules.bzl @@ -1,6 +1,6 @@ """External versions of build rules that differ outside of Google.""" def tflite_portable_test_suite(**kwargs): - """This is a no-op outside of Google.""" - _ignore = [kwargs] - pass + """This is a no-op outside of Google.""" + _ignore = [kwargs] + pass diff --git a/tensorflow/contrib/lite/stderr_reporter.cc b/tensorflow/lite/stderr_reporter.cc similarity index 96% rename from tensorflow/contrib/lite/stderr_reporter.cc rename to tensorflow/lite/stderr_reporter.cc index e29a6345fd..09eb1d254a 100644 --- a/tensorflow/contrib/lite/stderr_reporter.cc +++ b/tensorflow/lite/stderr_reporter.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/contrib/lite/stderr_reporter.h" +#include "tensorflow/lite/stderr_reporter.h" #include #include diff --git a/tensorflow/contrib/lite/stderr_reporter.h b/tensorflow/lite/stderr_reporter.h similarity index 78% rename from tensorflow/contrib/lite/stderr_reporter.h rename to tensorflow/lite/stderr_reporter.h index c6f4ffbdff..7582b421ee 100644 --- a/tensorflow/contrib/lite/stderr_reporter.h +++ b/tensorflow/lite/stderr_reporter.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_CONTRIB_LITE_STDERR_REPORTER_H_ -#define TENSORFLOW_CONTRIB_LITE_STDERR_REPORTER_H_ +#ifndef TENSORFLOW_LITE_STDERR_REPORTER_H_ +#define TENSORFLOW_LITE_STDERR_REPORTER_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/core/api/error_reporter.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/core/api/error_reporter.h" namespace tflite { @@ -31,4 +31,4 @@ ErrorReporter* DefaultErrorReporter(); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_STDERR_REPORTER_H_ +#endif // TENSORFLOW_LITE_STDERR_REPORTER_H_ diff --git a/tensorflow/contrib/lite/string.h b/tensorflow/lite/string.h similarity index 86% rename from tensorflow/contrib/lite/string.h rename to tensorflow/lite/string.h index af3fadfcb3..65142b11de 100644 --- a/tensorflow/contrib/lite/string.h +++ b/tensorflow/lite/string.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ // Abstract string. We don't want even absl at this level. -#ifndef TENSORFLOW_CONTRIB_LITE_STRING_H_ -#define TENSORFLOW_CONTRIB_LITE_STRING_H_ +#ifndef TENSORFLOW_LITE_STRING_H_ +#define TENSORFLOW_LITE_STRING_H_ #include @@ -26,4 +26,4 @@ using std::string; } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_STRING_H_ +#endif // TENSORFLOW_LITE_STRING_H_ diff --git a/tensorflow/contrib/lite/string_util.cc b/tensorflow/lite/string_util.cc similarity index 97% rename from tensorflow/contrib/lite/string_util.cc rename to tensorflow/lite/string_util.cc index fc236ef47a..1b33f5bcba 100644 --- a/tensorflow/contrib/lite/string_util.cc +++ b/tensorflow/lite/string_util.cc @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/string_util.h" #include #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/string_util.h b/tensorflow/lite/string_util.h similarity index 93% rename from tensorflow/contrib/lite/string_util.h rename to tensorflow/lite/string_util.h index 2cfbf71951..c9b74482f7 100644 --- a/tensorflow/contrib/lite/string_util.h +++ b/tensorflow/lite/string_util.h @@ -37,13 +37,13 @@ limitations under the License. // # described above. // buf.WriteToTensor(tensor) -#ifndef TENSORFLOW_CONTRIB_LITE_STRING_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_STRING_UTIL_H_ +#ifndef TENSORFLOW_LITE_STRING_UTIL_H_ +#define TENSORFLOW_LITE_STRING_UTIL_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/string.h" namespace tflite { @@ -98,4 +98,4 @@ StringRef GetString(const char* raw_buffer, int string_index); StringRef GetString(const TfLiteTensor* tensor, int string_index); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_STRING_UTIL_H_ +#endif // TENSORFLOW_LITE_STRING_UTIL_H_ diff --git a/tensorflow/contrib/lite/string_util_test.cc b/tensorflow/lite/string_util_test.cc similarity index 94% rename from tensorflow/contrib/lite/string_util_test.cc rename to tensorflow/lite/string_util_test.cc index 943167125b..377cdd77eb 100644 --- a/tensorflow/contrib/lite/string_util_test.cc +++ b/tensorflow/lite/string_util_test.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/contrib/lite/string_util.h" +#include "tensorflow/lite/string_util.h" #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { diff --git a/tensorflow/contrib/lite/testdata/0_subgraphs.bin b/tensorflow/lite/testdata/0_subgraphs.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/0_subgraphs.bin rename to tensorflow/lite/testdata/0_subgraphs.bin diff --git a/tensorflow/contrib/lite/testdata/2_subgraphs.bin b/tensorflow/lite/testdata/2_subgraphs.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/2_subgraphs.bin rename to tensorflow/lite/testdata/2_subgraphs.bin diff --git a/tensorflow/contrib/lite/testdata/add.bin b/tensorflow/lite/testdata/add.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/add.bin rename to tensorflow/lite/testdata/add.bin diff --git a/tensorflow/contrib/lite/testdata/add.json b/tensorflow/lite/testdata/add.json similarity index 100% rename from tensorflow/contrib/lite/testdata/add.json rename to tensorflow/lite/testdata/add.json diff --git a/tensorflow/contrib/lite/testdata/add_quantized.bin b/tensorflow/lite/testdata/add_quantized.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/add_quantized.bin rename to tensorflow/lite/testdata/add_quantized.bin diff --git a/tensorflow/contrib/lite/testdata/add_quantized.json b/tensorflow/lite/testdata/add_quantized.json similarity index 100% rename from tensorflow/contrib/lite/testdata/add_quantized.json rename to tensorflow/lite/testdata/add_quantized.json diff --git a/tensorflow/contrib/lite/testdata/empty_model.bin b/tensorflow/lite/testdata/empty_model.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/empty_model.bin rename to tensorflow/lite/testdata/empty_model.bin diff --git a/tensorflow/contrib/lite/testdata/multi_add.bin b/tensorflow/lite/testdata/multi_add.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/multi_add.bin rename to tensorflow/lite/testdata/multi_add.bin diff --git a/tensorflow/contrib/lite/testdata/multi_add.json b/tensorflow/lite/testdata/multi_add.json similarity index 100% rename from tensorflow/contrib/lite/testdata/multi_add.json rename to tensorflow/lite/testdata/multi_add.json diff --git a/tensorflow/contrib/lite/testdata/multi_add.pb b/tensorflow/lite/testdata/multi_add.pb similarity index 100% rename from tensorflow/contrib/lite/testdata/multi_add.pb rename to tensorflow/lite/testdata/multi_add.pb diff --git a/tensorflow/contrib/lite/testdata/multi_add_flex.bin b/tensorflow/lite/testdata/multi_add_flex.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/multi_add_flex.bin rename to tensorflow/lite/testdata/multi_add_flex.bin diff --git a/tensorflow/contrib/lite/testdata/no_subgraphs.bin b/tensorflow/lite/testdata/no_subgraphs.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/no_subgraphs.bin rename to tensorflow/lite/testdata/no_subgraphs.bin diff --git a/tensorflow/contrib/lite/testdata/test_model.bin b/tensorflow/lite/testdata/test_model.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/test_model.bin rename to tensorflow/lite/testdata/test_model.bin diff --git a/tensorflow/contrib/lite/testdata/test_model_broken.bin b/tensorflow/lite/testdata/test_model_broken.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/test_model_broken.bin rename to tensorflow/lite/testdata/test_model_broken.bin diff --git a/tensorflow/contrib/lite/testdata/test_model_broken.json b/tensorflow/lite/testdata/test_model_broken.json similarity index 100% rename from tensorflow/contrib/lite/testdata/test_model_broken.json rename to tensorflow/lite/testdata/test_model_broken.json diff --git a/tensorflow/contrib/lite/testdata/two_subgraphs.bin b/tensorflow/lite/testdata/two_subgraphs.bin similarity index 100% rename from tensorflow/contrib/lite/testdata/two_subgraphs.bin rename to tensorflow/lite/testdata/two_subgraphs.bin diff --git a/tensorflow/contrib/lite/testing/BUILD b/tensorflow/lite/testing/BUILD similarity index 80% rename from tensorflow/contrib/lite/testing/BUILD rename to tensorflow/lite/testing/BUILD index 891d44d2b6..a8f8086cc9 100644 --- a/tensorflow/contrib/lite/testing/BUILD +++ b/tensorflow/lite/testing/BUILD @@ -5,11 +5,11 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 load( - "//tensorflow/contrib/lite:build_def.bzl", + "//tensorflow/lite:build_def.bzl", "gen_zip_test", "generated_test_models_all", ) -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") load( "//tensorflow:tensorflow.bzl", "tf_cc_test", @@ -46,9 +46,9 @@ load( ":util", "@com_google_googletest//:gtest", "@com_googlesource_code_re2//:re2", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", ] + select({ "//conditions:default": [ "//tensorflow/core:framework_internal", @@ -73,7 +73,7 @@ py_binary( name = "generate_examples", srcs = ["generate_examples.py"], data = [ - "//tensorflow/contrib/lite/toco", + "//tensorflow/lite/toco", ], srcs_version = "PY2AND3", deps = [ @@ -99,7 +99,7 @@ cc_library( ":message", ":split", ":test_runner", - "//tensorflow/contrib/lite:framework", + "//tensorflow/lite:framework", ], ) @@ -124,7 +124,7 @@ cc_library( srcs = ["split.cc"], hdrs = ["split.h"], deps = [ - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:string", ], ) @@ -141,7 +141,7 @@ cc_test( cc_library( name = "join", hdrs = ["join.h"], - deps = ["//tensorflow/contrib/lite:string"], + deps = ["//tensorflow/lite:string"], ) cc_test( @@ -161,10 +161,10 @@ cc_library( deps = [ ":split", ":test_runner", - "//tensorflow/contrib/lite:builtin_op_data", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/delegates/flex:delegate", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:builtin_op_data", + "//tensorflow/lite:framework", + "//tensorflow/lite/delegates/flex:delegate", + "//tensorflow/lite/kernels:builtin_ops", ], ) @@ -172,7 +172,7 @@ tf_cc_test( name = "tflite_driver_test", size = "small", srcs = ["tflite_driver_test.cc"], - data = ["//tensorflow/contrib/lite:testdata/multi_add.bin"], + data = ["//tensorflow/lite:testdata/multi_add.bin"], tags = [ "tflite_not_portable_android", "tflite_not_portable_ios", @@ -188,7 +188,7 @@ cc_library( srcs = ["tokenize.cc"], hdrs = ["tokenize.h"], deps = [ - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:string", ], ) @@ -205,7 +205,7 @@ cc_library( name = "test_runner", hdrs = ["test_runner.h"], deps = [ - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:string", ], ) @@ -213,9 +213,9 @@ cc_library( name = "util", hdrs = ["util.h"], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string", - "//tensorflow/contrib/lite/core/api", + "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/core/api", ], ) @@ -234,7 +234,7 @@ cc_binary( deps = [ ":parse_testdata_lib", ":tflite_driver", - "//tensorflow/contrib/lite/nnapi:nnapi_lib", + "//tensorflow/lite/nnapi:nnapi_lib", ], ) @@ -258,7 +258,7 @@ cc_test( name = "tf_driver_test", size = "small", srcs = ["tf_driver_test.cc"], - data = ["//tensorflow/contrib/lite:testdata/multi_add.pb"], + data = ["//tensorflow/lite:testdata/multi_add.pb"], tags = [ "no_oss", "tflite_not_portable", @@ -277,8 +277,8 @@ cc_library( ":join", ":split", ":tf_driver", - "//tensorflow/contrib/lite:string", "//tensorflow/core:framework", + "//tensorflow/lite:string", ], ) @@ -305,9 +305,9 @@ cc_library( "init_tensorflow.h", ], visibility = [ - "//tensorflow/contrib/lite/java/src/main/native:__subpackages__", - "//tensorflow/contrib/lite/testing:__subpackages__", - "//tensorflow/contrib/lite/tools/benchmark:__subpackages__", + "//tensorflow/lite/java/src/main/native:__subpackages__", + "//tensorflow/lite/testing:__subpackages__", + "//tensorflow/lite/tools/benchmark:__subpackages__", ], deps = select({ "//conditions:default": [ @@ -327,8 +327,8 @@ cc_library( ":generate_testspec", ":parse_testdata_lib", ":tflite_driver", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:framework", + "//tensorflow/lite:string", ], ) @@ -354,16 +354,16 @@ tf_cc_test( size = "medium", srcs = ["tflite_diff_example_test.cc"], args = [ - "--tensorflow_model=third_party/tensorflow/contrib/lite/testdata/multi_add.pb", - "--tflite_model=third_party/tensorflow/contrib/lite/testdata/multi_add.bin", + "--tensorflow_model=third_party/tensorflow/lite/testdata/multi_add.pb", + "--tflite_model=third_party/tensorflow/lite/testdata/multi_add.bin", "--input_layer=a,b,c,d", "--input_layer_type=float,float,float,float", "--input_layer_shape=1,3,4,3:1,3,4,3:1,3,4,3:1,3,4,3", "--output_layer=x,y", ], data = [ - "//tensorflow/contrib/lite:testdata/multi_add.bin", - "//tensorflow/contrib/lite:testdata/multi_add.pb", + "//tensorflow/lite:testdata/multi_add.bin", + "//tensorflow/lite:testdata/multi_add.pb", ], tags = [ "no_cuda_on_cpu_tap", diff --git a/tensorflow/contrib/lite/testing/generate_examples.py b/tensorflow/lite/testing/generate_examples.py similarity index 99% rename from tensorflow/contrib/lite/testing/generate_examples.py rename to tensorflow/lite/testing/generate_examples.py index 408b540bf1..77f1b2b40f 100644 --- a/tensorflow/contrib/lite/testing/generate_examples.py +++ b/tensorflow/lite/testing/generate_examples.py @@ -19,7 +19,7 @@ Usage: generate_examples -bazel run //tensorflow/contrib/lite/testing:generate_examples +bazel run //tensorflow/lite/testing:generate_examples To more easily debug failures use (or override) the --save_graphdefs flag to place text proto graphdefs into the generated zip files. @@ -51,7 +51,7 @@ os.environ["CUDA_VISIBLE_DEVICES"] = "-1" import tensorflow as tf from google.protobuf import text_format # TODO(aselle): switch to TensorFlow's resource_loader -from tensorflow.contrib.lite.testing import generate_examples_report as report_lib +from tensorflow.lite.testing import generate_examples_report as report_lib from tensorflow.python.framework import graph_util as tf_graph_util from tensorflow.python.ops import rnn diff --git a/tensorflow/contrib/lite/testing/generate_examples_report.py b/tensorflow/lite/testing/generate_examples_report.py similarity index 100% rename from tensorflow/contrib/lite/testing/generate_examples_report.py rename to tensorflow/lite/testing/generate_examples_report.py diff --git a/tensorflow/contrib/lite/testing/generate_testspec.cc b/tensorflow/lite/testing/generate_testspec.cc similarity index 95% rename from tensorflow/contrib/lite/testing/generate_testspec.cc rename to tensorflow/lite/testing/generate_testspec.cc index 62cbeccd33..74e4d25498 100644 --- a/tensorflow/contrib/lite/testing/generate_testspec.cc +++ b/tensorflow/lite/testing/generate_testspec.cc @@ -15,10 +15,10 @@ limitations under the License. #include -#include "tensorflow/contrib/lite/testing/generate_testspec.h" -#include "tensorflow/contrib/lite/testing/join.h" -#include "tensorflow/contrib/lite/testing/split.h" -#include "tensorflow/contrib/lite/testing/tf_driver.h" +#include "tensorflow/lite/testing/generate_testspec.h" +#include "tensorflow/lite/testing/join.h" +#include "tensorflow/lite/testing/split.h" +#include "tensorflow/lite/testing/tf_driver.h" #include "tensorflow/core/framework/types.h" namespace tflite { diff --git a/tensorflow/contrib/lite/testing/generate_testspec.h b/tensorflow/lite/testing/generate_testspec.h similarity index 91% rename from tensorflow/contrib/lite/testing/generate_testspec.h rename to tensorflow/lite/testing/generate_testspec.h index b3d0db31c0..bda636f2c8 100644 --- a/tensorflow/contrib/lite/testing/generate_testspec.h +++ b/tensorflow/lite/testing/generate_testspec.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_CONTRIB_LITE_TESTING_GENERATE_TESTSPEC_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_GENERATE_TESTSPEC_H_ +#ifndef TENSORFLOW_LITE_TESTING_GENERATE_TESTSPEC_H_ +#define TENSORFLOW_LITE_TESTING_GENERATE_TESTSPEC_H_ #include #include #include -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace testing { @@ -65,4 +65,4 @@ std::vector GenerateRandomTensor(const std::vector& shape, } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_GENERATE_TESTSPEC_H_ +#endif // TENSORFLOW_LITE_TESTING_GENERATE_TESTSPEC_H_ diff --git a/tensorflow/contrib/lite/testing/generate_testspec_test.cc b/tensorflow/lite/testing/generate_testspec_test.cc similarity index 96% rename from tensorflow/contrib/lite/testing/generate_testspec_test.cc rename to tensorflow/lite/testing/generate_testspec_test.cc index 2a97b757a4..4450da289d 100644 --- a/tensorflow/contrib/lite/testing/generate_testspec_test.cc +++ b/tensorflow/lite/testing/generate_testspec_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/contrib/lite/testing/generate_testspec.h" +#include "tensorflow/lite/testing/generate_testspec.h" #include #include diff --git a/tensorflow/contrib/lite/testing/generated_examples_zip_test.cc b/tensorflow/lite/testing/generated_examples_zip_test.cc similarity index 98% rename from tensorflow/contrib/lite/testing/generated_examples_zip_test.cc rename to tensorflow/lite/testing/generated_examples_zip_test.cc index 1ec471365e..eb2bb5ece2 100644 --- a/tensorflow/contrib/lite/testing/generated_examples_zip_test.cc +++ b/tensorflow/lite/testing/generated_examples_zip_test.cc @@ -20,9 +20,9 @@ limitations under the License. #include #include #include "re2/re2.h" -#include "tensorflow/contrib/lite/testing/parse_testdata.h" -#include "tensorflow/contrib/lite/testing/tflite_driver.h" -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/testing/parse_testdata.h" +#include "tensorflow/lite/testing/tflite_driver.h" +#include "tensorflow/lite/testing/util.h" #include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/platform/subprocess.h" diff --git a/tensorflow/contrib/lite/testing/init_tensorflow.cc b/tensorflow/lite/testing/init_tensorflow.cc similarity index 94% rename from tensorflow/contrib/lite/testing/init_tensorflow.cc rename to tensorflow/lite/testing/init_tensorflow.cc index f3dcf620a2..ed4d123744 100644 --- a/tensorflow/contrib/lite/testing/init_tensorflow.cc +++ b/tensorflow/lite/testing/init_tensorflow.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/contrib/lite/testing/init_tensorflow.h" +#include "tensorflow/lite/testing/init_tensorflow.h" #include #include diff --git a/tensorflow/contrib/lite/testing/init_tensorflow.h b/tensorflow/lite/testing/init_tensorflow.h similarity index 82% rename from tensorflow/contrib/lite/testing/init_tensorflow.h rename to tensorflow/lite/testing/init_tensorflow.h index 2cc89bbbca..0c36a24791 100644 --- a/tensorflow/contrib/lite/testing/init_tensorflow.h +++ b/tensorflow/lite/testing/init_tensorflow.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_CONTRIB_LITE_TESTING_INIT_TENSORFLOW_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_INIT_TENSORFLOW_H_ +#ifndef TENSORFLOW_LITE_TESTING_INIT_TENSORFLOW_H_ +#define TENSORFLOW_LITE_TESTING_INIT_TENSORFLOW_H_ namespace tflite { @@ -23,4 +23,4 @@ void InitTensorFlow(); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_INIT_TENSORFLOW_H_ +#endif // TENSORFLOW_LITE_TESTING_INIT_TENSORFLOW_H_ diff --git a/tensorflow/contrib/lite/testing/join.h b/tensorflow/lite/testing/join.h similarity index 89% rename from tensorflow/contrib/lite/testing/join.h rename to tensorflow/lite/testing/join.h index 4be19ad756..7d0040c488 100644 --- a/tensorflow/contrib/lite/testing/join.h +++ b/tensorflow/lite/testing/join.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TESTING_JOIN_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_JOIN_H_ +#ifndef TENSORFLOW_LITE_TESTING_JOIN_H_ +#define TENSORFLOW_LITE_TESTING_JOIN_H_ #include #include -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace testing { @@ -56,4 +56,4 @@ inline string Join(uint8_t* data, size_t len, } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_JOIN_H_ +#endif // TENSORFLOW_LITE_TESTING_JOIN_H_ diff --git a/tensorflow/contrib/lite/testing/join_test.cc b/tensorflow/lite/testing/join_test.cc similarity index 96% rename from tensorflow/contrib/lite/testing/join_test.cc rename to tensorflow/lite/testing/join_test.cc index bd04528381..a8d036c547 100644 --- a/tensorflow/contrib/lite/testing/join_test.cc +++ b/tensorflow/lite/testing/join_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/contrib/lite/testing/join.h" +#include "tensorflow/lite/testing/join.h" #include #include diff --git a/tensorflow/contrib/lite/testing/message.cc b/tensorflow/lite/testing/message.cc similarity index 96% rename from tensorflow/contrib/lite/testing/message.cc rename to tensorflow/lite/testing/message.cc index 03fae4bb86..08aac6f6aa 100644 --- a/tensorflow/contrib/lite/testing/message.cc +++ b/tensorflow/lite/testing/message.cc @@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/testing/message.h" +#include "tensorflow/lite/testing/message.h" #include -#include "tensorflow/contrib/lite/testing/tokenize.h" +#include "tensorflow/lite/testing/tokenize.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/testing/message.h b/tensorflow/lite/testing/message.h similarity index 94% rename from tensorflow/contrib/lite/testing/message.h rename to tensorflow/lite/testing/message.h index e2bc408214..e6566ab11c 100644 --- a/tensorflow/contrib/lite/testing/message.h +++ b/tensorflow/lite/testing/message.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_CONTRIB_LITE_TESTING_MESSAGE_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_MESSAGE_H_ +#ifndef TENSORFLOW_LITE_TESTING_MESSAGE_H_ +#define TENSORFLOW_LITE_TESTING_MESSAGE_H_ #include #include @@ -79,4 +79,4 @@ class Message { } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_MESSAGE_H_ +#endif // TENSORFLOW_LITE_TESTING_MESSAGE_H_ diff --git a/tensorflow/contrib/lite/testing/message_test.cc b/tensorflow/lite/testing/message_test.cc similarity index 98% rename from tensorflow/contrib/lite/testing/message_test.cc rename to tensorflow/lite/testing/message_test.cc index fb6a49bd6f..bec4915e58 100644 --- a/tensorflow/contrib/lite/testing/message_test.cc +++ b/tensorflow/lite/testing/message_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/contrib/lite/testing/message.h" +#include "tensorflow/lite/testing/message.h" #include diff --git a/tensorflow/contrib/lite/testing/model_coverage/BUILD b/tensorflow/lite/testing/model_coverage/BUILD similarity index 85% rename from tensorflow/contrib/lite/testing/model_coverage/BUILD rename to tensorflow/lite/testing/model_coverage/BUILD index c8359bab06..7e6a65997d 100644 --- a/tensorflow/contrib/lite/testing/model_coverage/BUILD +++ b/tensorflow/lite/testing/model_coverage/BUILD @@ -1,5 +1,5 @@ package(default_visibility = [ - "//tensorflow/contrib/lite:__subpackages__", + "//tensorflow/lite:__subpackages__", ]) licenses(["notice"]) # Apache 2.0 @@ -10,7 +10,7 @@ py_binary( srcs_version = "PY2AND3", tags = ["no_pip"], deps = [ - "//tensorflow/contrib/lite/python:lite", + "//tensorflow/lite/python:lite", "//tensorflow/python:platform", ], ) diff --git a/tensorflow/contrib/lite/testing/model_coverage/model_coverage_lib.py b/tensorflow/lite/testing/model_coverage/model_coverage_lib.py similarity index 98% rename from tensorflow/contrib/lite/testing/model_coverage/model_coverage_lib.py rename to tensorflow/lite/testing/model_coverage/model_coverage_lib.py index 2dc5aeb302..ce8ef0b196 100644 --- a/tensorflow/contrib/lite/testing/model_coverage/model_coverage_lib.py +++ b/tensorflow/lite/testing/model_coverage/model_coverage_lib.py @@ -20,8 +20,8 @@ from __future__ import print_function import numpy as np -from tensorflow.contrib.lite.python import convert_saved_model as _convert_saved_model -from tensorflow.contrib.lite.python import lite as _lite +from tensorflow.lite.python import convert_saved_model as _convert_saved_model +from tensorflow.lite.python import lite as _lite from tensorflow.core.framework import graph_pb2 as _graph_pb2 from tensorflow.python import keras as _keras from tensorflow.python.client import session as _session diff --git a/tensorflow/contrib/lite/testing/model_coverage/model_coverage_lib_test.py b/tensorflow/lite/testing/model_coverage/model_coverage_lib_test.py similarity index 97% rename from tensorflow/contrib/lite/testing/model_coverage/model_coverage_lib_test.py rename to tensorflow/lite/testing/model_coverage/model_coverage_lib_test.py index 98dbff4d79..6b4e7427ed 100644 --- a/tensorflow/contrib/lite/testing/model_coverage/model_coverage_lib_test.py +++ b/tensorflow/lite/testing/model_coverage/model_coverage_lib_test.py @@ -22,8 +22,8 @@ import os import tempfile import numpy as np -from tensorflow.contrib.lite.python import lite -from tensorflow.contrib.lite.testing.model_coverage import model_coverage_lib as model_coverage +from tensorflow.lite.python import lite +from tensorflow.lite.testing.model_coverage import model_coverage_lib as model_coverage from tensorflow.python import keras from tensorflow.python.client import session from tensorflow.python.framework import constant_op diff --git a/tensorflow/contrib/lite/testing/nnapi_example.cc b/tensorflow/lite/testing/nnapi_example.cc similarity index 91% rename from tensorflow/contrib/lite/testing/nnapi_example.cc rename to tensorflow/lite/testing/nnapi_example.cc index 5870782b69..22df8dbd88 100644 --- a/tensorflow/contrib/lite/testing/nnapi_example.cc +++ b/tensorflow/lite/testing/nnapi_example.cc @@ -17,7 +17,7 @@ limitations under the License. // the future. // // Usage: bazel run -c opt \ -// tensorflow/contrib/lite/nnapi:nnapi_example -- +// tensorflow/lite/nnapi:nnapi_example -- // #include #include @@ -25,9 +25,9 @@ limitations under the License. #include #include #include -#include "tensorflow/contrib/lite/nnapi/NeuralNetworksShim.h" -#include "tensorflow/contrib/lite/testing/parse_testdata.h" -#include "tensorflow/contrib/lite/testing/tflite_driver.h" +#include "tensorflow/lite/nnapi/NeuralNetworksShim.h" +#include "tensorflow/lite/testing/parse_testdata.h" +#include "tensorflow/lite/testing/tflite_driver.h" string dirname(const string& s) { return s.substr(0, s.find_last_of("/")); } diff --git a/tensorflow/contrib/lite/testing/parse_testdata.cc b/tensorflow/lite/testing/parse_testdata.cc similarity index 98% rename from tensorflow/contrib/lite/testing/parse_testdata.cc rename to tensorflow/lite/testing/parse_testdata.cc index 389688d552..bb54008794 100644 --- a/tensorflow/contrib/lite/testing/parse_testdata.cc +++ b/tensorflow/lite/testing/parse_testdata.cc @@ -16,7 +16,7 @@ limitations under the License. // Format is ASCII // TODO(aselle): Switch to protobuf, but the android team requested a simple // ASCII file. -#include "tensorflow/contrib/lite/testing/parse_testdata.h" +#include "tensorflow/lite/testing/parse_testdata.h" #include #include @@ -26,9 +26,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/error_reporter.h" -#include "tensorflow/contrib/lite/testing/message.h" -#include "tensorflow/contrib/lite/testing/split.h" +#include "tensorflow/lite/error_reporter.h" +#include "tensorflow/lite/testing/message.h" +#include "tensorflow/lite/testing/split.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/testing/parse_testdata.h b/tensorflow/lite/testing/parse_testdata.h similarity index 89% rename from tensorflow/contrib/lite/testing/parse_testdata.h rename to tensorflow/lite/testing/parse_testdata.h index 26ee825866..0f3dc32afc 100644 --- a/tensorflow/contrib/lite/testing/parse_testdata.h +++ b/tensorflow/lite/testing/parse_testdata.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_CONTRIB_LITE_TESTING_PARSE_TESTDATA_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_PARSE_TESTDATA_H_ +#ifndef TENSORFLOW_LITE_TESTING_PARSE_TESTDATA_H_ +#define TENSORFLOW_LITE_TESTING_PARSE_TESTDATA_H_ #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/testing/test_runner.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/testing/test_runner.h" namespace tflite { namespace testing { @@ -72,4 +72,4 @@ bool ParseAndRunTests(std::istream* input, TestRunner* test_runner, } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_PARSE_TESTDATA_H_ +#endif // TENSORFLOW_LITE_TESTING_PARSE_TESTDATA_H_ diff --git a/tensorflow/contrib/lite/testing/split.cc b/tensorflow/lite/testing/split.cc similarity index 96% rename from tensorflow/contrib/lite/testing/split.cc rename to tensorflow/lite/testing/split.cc index 5836f4ff04..594b0d3f8a 100644 --- a/tensorflow/contrib/lite/testing/split.cc +++ b/tensorflow/lite/testing/split.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/contrib/lite/testing/split.h" +#include "tensorflow/lite/testing/split.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/testing/split.h b/tensorflow/lite/testing/split.h similarity index 93% rename from tensorflow/contrib/lite/testing/split.h rename to tensorflow/lite/testing/split.h index 896f2949ef..c33738997c 100644 --- a/tensorflow/contrib/lite/testing/split.h +++ b/tensorflow/lite/testing/split.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_CONTRIB_LITE_TESTING_SPLIT_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_SPLIT_H_ +#ifndef TENSORFLOW_LITE_TESTING_SPLIT_H_ +#define TENSORFLOW_LITE_TESTING_SPLIT_H_ #include #include #include #include -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace testing { @@ -93,4 +93,4 @@ inline std::vector Split(const string& s, const string& delimiter) { } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_SPLIT_H_ +#endif // TENSORFLOW_LITE_TESTING_SPLIT_H_ diff --git a/tensorflow/contrib/lite/testing/split_test.cc b/tensorflow/lite/testing/split_test.cc similarity index 97% rename from tensorflow/contrib/lite/testing/split_test.cc rename to tensorflow/lite/testing/split_test.cc index 76b918cbcd..77de485d57 100644 --- a/tensorflow/contrib/lite/testing/split_test.cc +++ b/tensorflow/lite/testing/split_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/contrib/lite/testing/split.h" +#include "tensorflow/lite/testing/split.h" #include #include diff --git a/tensorflow/contrib/lite/testing/test_runner.h b/tensorflow/lite/testing/test_runner.h similarity index 95% rename from tensorflow/contrib/lite/testing/test_runner.h rename to tensorflow/lite/testing/test_runner.h index fac7d01aab..303155b072 100644 --- a/tensorflow/contrib/lite/testing/test_runner.h +++ b/tensorflow/lite/testing/test_runner.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_CONTRIB_LITE_TESTING_TEST_RUNNER_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_TEST_RUNNER_H_ +#ifndef TENSORFLOW_LITE_TESTING_TEST_RUNNER_H_ +#define TENSORFLOW_LITE_TESTING_TEST_RUNNER_H_ #include #include #include #include -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace testing { @@ -127,4 +127,4 @@ class TestRunner { } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_TEST_RUNNER_H_ +#endif // TENSORFLOW_LITE_TESTING_TEST_RUNNER_H_ diff --git a/tensorflow/contrib/lite/testing/test_runner_test.cc b/tensorflow/lite/testing/test_runner_test.cc similarity index 97% rename from tensorflow/contrib/lite/testing/test_runner_test.cc rename to tensorflow/lite/testing/test_runner_test.cc index 3f04aa20bd..39ec81582b 100644 --- a/tensorflow/contrib/lite/testing/test_runner_test.cc +++ b/tensorflow/lite/testing/test_runner_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/contrib/lite/testing/test_runner.h" +#include "tensorflow/lite/testing/test_runner.h" #include #include diff --git a/tensorflow/contrib/lite/testing/tf_driver.cc b/tensorflow/lite/testing/tf_driver.cc similarity index 97% rename from tensorflow/contrib/lite/testing/tf_driver.cc rename to tensorflow/lite/testing/tf_driver.cc index 30381ba028..36c556ba04 100644 --- a/tensorflow/contrib/lite/testing/tf_driver.cc +++ b/tensorflow/lite/testing/tf_driver.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/testing/tf_driver.h" +#include "tensorflow/lite/testing/tf_driver.h" #include #include -#include "tensorflow/contrib/lite/testing/join.h" -#include "tensorflow/contrib/lite/testing/split.h" +#include "tensorflow/lite/testing/join.h" +#include "tensorflow/lite/testing/split.h" #include "tensorflow/core/lib/gtl/array_slice.h" namespace tflite { diff --git a/tensorflow/contrib/lite/testing/tf_driver.h b/tensorflow/lite/testing/tf_driver.h similarity index 90% rename from tensorflow/contrib/lite/testing/tf_driver.h rename to tensorflow/lite/testing/tf_driver.h index b766f85c4d..f10689cb58 100644 --- a/tensorflow/contrib/lite/testing/tf_driver.h +++ b/tensorflow/lite/testing/tf_driver.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_CONTRIB_LITE_TESTING_TF_DRIVER_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_TF_DRIVER_H_ +#ifndef TENSORFLOW_LITE_TESTING_TF_DRIVER_H_ +#define TENSORFLOW_LITE_TESTING_TF_DRIVER_H_ #include #include -#include "tensorflow/contrib/lite/testing/split.h" -#include "tensorflow/contrib/lite/testing/test_runner.h" +#include "tensorflow/lite/testing/split.h" +#include "tensorflow/lite/testing/test_runner.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.h" @@ -72,4 +72,4 @@ class TfDriver : public TestRunner { } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_TF_DRIVER_H_ +#endif // TENSORFLOW_LITE_TESTING_TF_DRIVER_H_ diff --git a/tensorflow/contrib/lite/testing/tf_driver_test.cc b/tensorflow/lite/testing/tf_driver_test.cc similarity index 93% rename from tensorflow/contrib/lite/testing/tf_driver_test.cc rename to tensorflow/lite/testing/tf_driver_test.cc index c0faa4676a..d178ccf1e3 100644 --- a/tensorflow/contrib/lite/testing/tf_driver_test.cc +++ b/tensorflow/lite/testing/tf_driver_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/contrib/lite/testing/tf_driver.h" +#include "tensorflow/lite/testing/tf_driver.h" #include #include @@ -29,7 +29,7 @@ TEST(TfDriverTest, SimpleTest) { {"1,8,8,3", "1,8,8,3", "1,8,8,3", "1,8,8,3"}, {"x", "y"})); runner->LoadModel( - "third_party/tensorflow/contrib/lite/testdata/multi_add.pb"); + "third_party/tensorflow/lite/testdata/multi_add.pb"); EXPECT_TRUE(runner->IsValid()) << runner->GetErrorMessage(); ASSERT_THAT(runner->GetInputs(), ElementsAre(0, 1, 2, 3)); diff --git a/tensorflow/contrib/lite/testing/tflite_diff_example_test.cc b/tensorflow/lite/testing/tflite_diff_example_test.cc similarity index 90% rename from tensorflow/contrib/lite/testing/tflite_diff_example_test.cc rename to tensorflow/lite/testing/tflite_diff_example_test.cc index 49696ac76b..cb61cd4e94 100644 --- a/tensorflow/contrib/lite/testing/tflite_diff_example_test.cc +++ b/tensorflow/lite/testing/tflite_diff_example_test.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/testing/init_tensorflow.h" -#include "tensorflow/contrib/lite/testing/tflite_diff_flags.h" -#include "tensorflow/contrib/lite/testing/tflite_diff_util.h" +#include "tensorflow/lite/testing/init_tensorflow.h" +#include "tensorflow/lite/testing/tflite_diff_flags.h" +#include "tensorflow/lite/testing/tflite_diff_util.h" int main(int argc, char** argv) { ::tflite::InitTensorFlow(); // For Flex support. diff --git a/tensorflow/contrib/lite/testing/tflite_diff_flags.h b/tensorflow/lite/testing/tflite_diff_flags.h similarity index 92% rename from tensorflow/contrib/lite/testing/tflite_diff_flags.h rename to tensorflow/lite/testing/tflite_diff_flags.h index ad889a2f19..2fe068eb20 100644 --- a/tensorflow/contrib/lite/testing/tflite_diff_flags.h +++ b/tensorflow/lite/testing/tflite_diff_flags.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TESTING_TFLITE_DIFF_FLAGS_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_TFLITE_DIFF_FLAGS_H_ +#ifndef TENSORFLOW_LITE_TESTING_TFLITE_DIFF_FLAGS_H_ +#define TENSORFLOW_LITE_TESTING_TFLITE_DIFF_FLAGS_H_ #include -#include "tensorflow/contrib/lite/testing/split.h" -#include "tensorflow/contrib/lite/testing/tflite_diff_util.h" +#include "tensorflow/lite/testing/split.h" +#include "tensorflow/lite/testing/tflite_diff_util.h" #include "tensorflow/core/util/command_line_flags.h" namespace tflite { @@ -88,4 +88,4 @@ DiffOptions ParseTfliteDiffFlags(int* argc, char** argv) { } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_TFLITE_DIFF_FLAGS_H_ +#endif // TENSORFLOW_LITE_TESTING_TFLITE_DIFF_FLAGS_H_ diff --git a/tensorflow/contrib/lite/testing/tflite_diff_util.cc b/tensorflow/lite/testing/tflite_diff_util.cc similarity index 85% rename from tensorflow/contrib/lite/testing/tflite_diff_util.cc rename to tensorflow/lite/testing/tflite_diff_util.cc index c6ca796ac2..0142ae4217 100644 --- a/tensorflow/contrib/lite/testing/tflite_diff_util.cc +++ b/tensorflow/lite/testing/tflite_diff_util.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/testing/generate_testspec.h" -#include "tensorflow/contrib/lite/testing/parse_testdata.h" -#include "tensorflow/contrib/lite/testing/tflite_diff_util.h" -#include "tensorflow/contrib/lite/testing/tflite_driver.h" +#include "tensorflow/lite/testing/generate_testspec.h" +#include "tensorflow/lite/testing/parse_testdata.h" +#include "tensorflow/lite/testing/tflite_diff_util.h" +#include "tensorflow/lite/testing/tflite_driver.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/testing/tflite_diff_util.h b/tensorflow/lite/testing/tflite_diff_util.h similarity index 89% rename from tensorflow/contrib/lite/testing/tflite_diff_util.h rename to tensorflow/lite/testing/tflite_diff_util.h index 28b14bd143..3f9f10892d 100644 --- a/tensorflow/contrib/lite/testing/tflite_diff_util.h +++ b/tensorflow/lite/testing/tflite_diff_util.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_CONTRIB_LITE_TESTING_TFLITE_DIFF_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_TFLITE_DIFF_UTIL_H_ +#ifndef TENSORFLOW_LITE_TESTING_TFLITE_DIFF_UTIL_H_ +#define TENSORFLOW_LITE_TESTING_TFLITE_DIFF_UTIL_H_ #include -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace testing { @@ -55,4 +55,4 @@ bool RunDiffTest(const DiffOptions& options, int num_invocations); } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_TFLITE_DIFF_UTIL_H_ +#endif // TENSORFLOW_LITE_TESTING_TFLITE_DIFF_UTIL_H_ diff --git a/tensorflow/contrib/lite/testing/tflite_driver.cc b/tensorflow/lite/testing/tflite_driver.cc similarity index 97% rename from tensorflow/contrib/lite/testing/tflite_driver.cc rename to tensorflow/lite/testing/tflite_driver.cc index ef49e6f8bc..ada5d74912 100644 --- a/tensorflow/contrib/lite/testing/tflite_driver.cc +++ b/tensorflow/lite/testing/tflite_driver.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/testing/tflite_driver.h" +#include "tensorflow/lite/testing/tflite_driver.h" #include -#include "tensorflow/contrib/lite/builtin_op_data.h" -#include "tensorflow/contrib/lite/delegates/flex/delegate.h" -#include "tensorflow/contrib/lite/testing/split.h" +#include "tensorflow/lite/builtin_op_data.h" +#include "tensorflow/lite/delegates/flex/delegate.h" +#include "tensorflow/lite/testing/split.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/testing/tflite_driver.h b/tensorflow/lite/testing/tflite_driver.h similarity index 81% rename from tensorflow/contrib/lite/testing/tflite_driver.h rename to tensorflow/lite/testing/tflite_driver.h index dc2a4e5877..785baf0f00 100644 --- a/tensorflow/contrib/lite/testing/tflite_driver.h +++ b/tensorflow/lite/testing/tflite_driver.h @@ -12,16 +12,16 @@ 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_CONTRIB_LITE_TESTING_TFLITE_DRIVER_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_TFLITE_DRIVER_H_ +#ifndef TENSORFLOW_LITE_TESTING_TFLITE_DRIVER_H_ +#define TENSORFLOW_LITE_TESTING_TFLITE_DRIVER_H_ #include -#include "tensorflow/contrib/lite/delegates/flex/delegate.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/testing/test_runner.h" +#include "tensorflow/lite/delegates/flex/delegate.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/testing/test_runner.h" namespace tflite { namespace testing { @@ -64,4 +64,4 @@ class TfLiteDriver : public TestRunner { } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_TFLITE_DRIVER_H_ +#endif // TENSORFLOW_LITE_TESTING_TFLITE_DRIVER_H_ diff --git a/tensorflow/contrib/lite/testing/tflite_driver_test.cc b/tensorflow/lite/testing/tflite_driver_test.cc similarity index 93% rename from tensorflow/contrib/lite/testing/tflite_driver_test.cc rename to tensorflow/lite/testing/tflite_driver_test.cc index 37010c468f..6e953e5e19 100644 --- a/tensorflow/contrib/lite/testing/tflite_driver_test.cc +++ b/tensorflow/lite/testing/tflite_driver_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/contrib/lite/testing/tflite_driver.h" +#include "tensorflow/lite/testing/tflite_driver.h" #include #include @@ -26,7 +26,7 @@ using ::testing::ElementsAre; TEST(TfliteDriverTest, SimpleTest) { std::unique_ptr runner(new TfLiteDriver(/*use_nnapi=*/false)); - runner->SetModelBaseDir("tensorflow/contrib/lite"); + runner->SetModelBaseDir("tensorflow/lite"); runner->LoadModel("testdata/multi_add.bin"); ASSERT_TRUE(runner->IsValid()); diff --git a/tensorflow/contrib/lite/testing/tokenize.cc b/tensorflow/lite/testing/tokenize.cc similarity index 96% rename from tensorflow/contrib/lite/testing/tokenize.cc rename to tensorflow/lite/testing/tokenize.cc index 2e84ea475c..bb47535801 100644 --- a/tensorflow/contrib/lite/testing/tokenize.cc +++ b/tensorflow/lite/testing/tokenize.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/testing/tokenize.h" +#include "tensorflow/lite/testing/tokenize.h" #include #include -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/string.h" namespace tflite { namespace testing { diff --git a/tensorflow/contrib/lite/testing/tokenize.h b/tensorflow/lite/testing/tokenize.h similarity index 89% rename from tensorflow/contrib/lite/testing/tokenize.h rename to tensorflow/lite/testing/tokenize.h index 8195391851..7bd2783337 100644 --- a/tensorflow/contrib/lite/testing/tokenize.h +++ b/tensorflow/lite/testing/tokenize.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_CONTRIB_LITE_TESTING_TOKENIZE_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_TOKENIZE_H_ +#ifndef TENSORFLOW_LITE_TESTING_TOKENIZE_H_ +#define TENSORFLOW_LITE_TESTING_TOKENIZE_H_ #include #include @@ -39,4 +39,4 @@ void Tokenize(std::istream* input, TokenProcessor* processor); } // namespace testing } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_TOKENIZE_H_ +#endif // TENSORFLOW_LITE_TESTING_TOKENIZE_H_ diff --git a/tensorflow/contrib/lite/testing/tokenize_test.cc b/tensorflow/lite/testing/tokenize_test.cc similarity index 98% rename from tensorflow/contrib/lite/testing/tokenize_test.cc rename to tensorflow/lite/testing/tokenize_test.cc index 80f44aacca..302ae589d0 100644 --- a/tensorflow/contrib/lite/testing/tokenize_test.cc +++ b/tensorflow/lite/testing/tokenize_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/contrib/lite/testing/tokenize.h" +#include "tensorflow/lite/testing/tokenize.h" #include #include diff --git a/tensorflow/contrib/lite/testing/util.h b/tensorflow/lite/testing/util.h similarity index 85% rename from tensorflow/contrib/lite/testing/util.h rename to tensorflow/lite/testing/util.h index 925791d390..45751497de 100644 --- a/tensorflow/contrib/lite/testing/util.h +++ b/tensorflow/lite/testing/util.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TESTING_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_TESTING_UTIL_H_ +#ifndef TENSORFLOW_LITE_TESTING_UTIL_H_ +#define TENSORFLOW_LITE_TESTING_UTIL_H_ #include -#include "tensorflow/contrib/lite/core/api/error_reporter.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/core/api/error_reporter.h" +#include "tensorflow/lite/string.h" namespace tflite { @@ -56,4 +56,4 @@ inline void LogToStderr() { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TESTING_UTIL_H_ +#endif // TENSORFLOW_LITE_TESTING_UTIL_H_ diff --git a/tensorflow/contrib/lite/toco/BUILD b/tensorflow/lite/toco/BUILD similarity index 96% rename from tensorflow/contrib/lite/toco/BUILD rename to tensorflow/lite/toco/BUILD index 96b88b60fc..1430287444 100644 --- a/tensorflow/contrib/lite/toco/BUILD +++ b/tensorflow/lite/toco/BUILD @@ -74,8 +74,8 @@ cc_library( linkstatic = 1, visibility = ["//visibility:public"], deps = [ - "//tensorflow/contrib/lite/kernels/internal:reference_base", - "//tensorflow/contrib/lite/kernels/internal:types", + "//tensorflow/lite/kernels/internal:reference_base", + "//tensorflow/lite/kernels/internal:types", ], ) @@ -281,9 +281,9 @@ cc_library( ":runtime", ":toco_port", ":tooling_util", - "//tensorflow/contrib/lite/kernels/internal:quantization_util", - "//tensorflow/contrib/lite/kernels/internal:strided_slice_logic", "//tensorflow/core:lib", + "//tensorflow/lite/kernels/internal:quantization_util", + "//tensorflow/lite/kernels/internal:strided_slice_logic", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", ], @@ -325,13 +325,13 @@ cc_library( "@protobuf_archive//:protobuf_headers", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", - "//tensorflow/contrib/lite/toco/tensorflow_graph_matching:resolve_cluster", - "//tensorflow/contrib/lite/toco/tflite:export", - "//tensorflow/contrib/lite/toco/tflite:import", "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", + "//tensorflow/lite/toco/tensorflow_graph_matching:resolve_cluster", + "//tensorflow/lite/toco/tflite:export", + "//tensorflow/lite/toco/tflite:import", ] + select({ # Placeholder for internal darwin rule. "//conditions:default": [], @@ -373,8 +373,8 @@ cc_library( ":toco_graphviz_dump_options", ":toco_port", ":types_proto_cc", - "//tensorflow/contrib/lite/kernels/internal:types", "//tensorflow/core:lib", + "//tensorflow/lite/kernels/internal:types", "@com_google_absl//absl/strings", "@com_googlesource_code_re2//:re2", "@protobuf_archive//:protobuf_headers", diff --git a/tensorflow/contrib/lite/toco/README.md b/tensorflow/lite/toco/README.md similarity index 100% rename from tensorflow/contrib/lite/toco/README.md rename to tensorflow/lite/toco/README.md diff --git a/tensorflow/contrib/lite/toco/allocate_transient_arrays.cc b/tensorflow/lite/toco/allocate_transient_arrays.cc similarity index 98% rename from tensorflow/contrib/lite/toco/allocate_transient_arrays.cc rename to tensorflow/lite/toco/allocate_transient_arrays.cc index 18c904c6d4..3ec53c9c2d 100644 --- a/tensorflow/contrib/lite/toco/allocate_transient_arrays.cc +++ b/tensorflow/lite/toco/allocate_transient_arrays.cc @@ -20,10 +20,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/allocate_transient_arrays.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/allocate_transient_arrays.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/allocate_transient_arrays.h b/tensorflow/lite/toco/allocate_transient_arrays.h similarity index 87% rename from tensorflow/contrib/lite/toco/allocate_transient_arrays.h rename to tensorflow/lite/toco/allocate_transient_arrays.h index 59d8ada1e9..5d43d4cc3f 100644 --- a/tensorflow/contrib/lite/toco/allocate_transient_arrays.h +++ b/tensorflow/lite/toco/allocate_transient_arrays.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_CONTRIB_LITE_TOCO_ALLOCATE_TRANSIENT_ARRAYS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_ALLOCATE_TRANSIENT_ARRAYS_H_ +#ifndef TENSORFLOW_LITE_TOCO_ALLOCATE_TRANSIENT_ARRAYS_H_ +#define TENSORFLOW_LITE_TOCO_ALLOCATE_TRANSIENT_ARRAYS_H_ -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -41,4 +41,4 @@ void AllocateTransientArrays(Model* model, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_ALLOCATE_TRANSIENT_ARRAYS_H_ +#endif // TENSORFLOW_LITE_TOCO_ALLOCATE_TRANSIENT_ARRAYS_H_ diff --git a/tensorflow/contrib/lite/toco/args.h b/tensorflow/lite/toco/args.h similarity index 97% rename from tensorflow/contrib/lite/toco/args.h rename to tensorflow/lite/toco/args.h index 2699ac76e1..bbd1dd1022 100644 --- a/tensorflow/contrib/lite/toco/args.h +++ b/tensorflow/lite/toco/args.h @@ -15,20 +15,20 @@ limitations under the License. // This abstracts command line arguments in toco. // Arg is a parseable type that can register a default value, be able to // parse itself, and keep track of whether it was specified. -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_ARGS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_ARGS_H_ +#ifndef TENSORFLOW_LITE_TOCO_ARGS_H_ +#define TENSORFLOW_LITE_TOCO_ARGS_H_ #include #include #include -#include "tensorflow/contrib/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_port.h" #if defined(PLATFORM_GOOGLE) #include "strings/split.h" #include "strings/strip.h" #endif #include "absl/strings/numbers.h" #include "absl/strings/str_split.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/toco_types.h" namespace toco { @@ -254,4 +254,4 @@ struct ParsedTocoFlags { }; } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_ARGS_H_ +#endif // TENSORFLOW_LITE_TOCO_ARGS_H_ diff --git a/tensorflow/contrib/lite/toco/dump_graphviz.cc b/tensorflow/lite/toco/dump_graphviz.cc similarity index 97% rename from tensorflow/contrib/lite/toco/dump_graphviz.cc rename to tensorflow/lite/toco/dump_graphviz.cc index 30525efd23..8896893f35 100644 --- a/tensorflow/contrib/lite/toco/dump_graphviz.cc +++ b/tensorflow/lite/toco/dump_graphviz.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/contrib/lite/toco/dump_graphviz.h" +#include "tensorflow/lite/toco/dump_graphviz.h" #include #include @@ -20,11 +20,11 @@ limitations under the License. #include "absl/strings/str_replace.h" #include "absl/strings/strip.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/toco_graphviz_dump_options.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" using toco::port::AppendF; diff --git a/tensorflow/contrib/lite/toco/dump_graphviz.h b/tensorflow/lite/toco/dump_graphviz.h similarity index 78% rename from tensorflow/contrib/lite/toco/dump_graphviz.h rename to tensorflow/lite/toco/dump_graphviz.h index ea5a4031c3..9697bd6f0d 100644 --- a/tensorflow/contrib/lite/toco/dump_graphviz.h +++ b/tensorflow/lite/toco/dump_graphviz.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_CONTRIB_LITE_TOCO_DUMP_GRAPHVIZ_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_DUMP_GRAPHVIZ_H_ +#ifndef TENSORFLOW_LITE_TOCO_DUMP_GRAPHVIZ_H_ +#define TENSORFLOW_LITE_TOCO_DUMP_GRAPHVIZ_H_ #include -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -25,4 +25,4 @@ void DumpGraphviz(const Model& model, string* output_file_contents); } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_DUMP_GRAPHVIZ_H_ +#endif // TENSORFLOW_LITE_TOCO_DUMP_GRAPHVIZ_H_ diff --git a/tensorflow/contrib/lite/toco/export_tensorflow.cc b/tensorflow/lite/toco/export_tensorflow.cc similarity index 99% rename from tensorflow/contrib/lite/toco/export_tensorflow.cc rename to tensorflow/lite/toco/export_tensorflow.cc index 41a82b5720..1752745aae 100644 --- a/tensorflow/contrib/lite/toco/export_tensorflow.cc +++ b/tensorflow/lite/toco/export_tensorflow.cc @@ -22,11 +22,11 @@ limitations under the License. #include "google/protobuf/text_format.h" #include "absl/memory/memory.h" #include "absl/strings/string_view.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tensorflow_util.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tensorflow_util.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/node_def.pb.h" diff --git a/tensorflow/contrib/lite/toco/export_tensorflow.h b/tensorflow/lite/toco/export_tensorflow.h similarity index 79% rename from tensorflow/contrib/lite/toco/export_tensorflow.h rename to tensorflow/lite/toco/export_tensorflow.h index d7310bb75f..09c966ded6 100644 --- a/tensorflow/contrib/lite/toco/export_tensorflow.h +++ b/tensorflow/lite/toco/export_tensorflow.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_CONTRIB_LITE_TOCO_EXPORT_TENSORFLOW_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_EXPORT_TENSORFLOW_H_ +#ifndef TENSORFLOW_LITE_TOCO_EXPORT_TENSORFLOW_H_ +#define TENSORFLOW_LITE_TOCO_EXPORT_TENSORFLOW_H_ #include -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -26,4 +26,4 @@ void EncodeConstantArraysMinMaxByWrappingThemInFakeQuantNodes(Model* model); } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_EXPORT_TENSORFLOW_H_ +#endif // TENSORFLOW_LITE_TOCO_EXPORT_TENSORFLOW_H_ diff --git a/tensorflow/contrib/lite/toco/format_port.h b/tensorflow/lite/toco/format_port.h similarity index 92% rename from tensorflow/contrib/lite/toco/format_port.h rename to tensorflow/lite/toco/format_port.h index 44e6684571..69833d965c 100644 --- a/tensorflow/contrib/lite/toco/format_port.h +++ b/tensorflow/lite/toco/format_port.h @@ -16,10 +16,10 @@ limitations under the License. // and absl::StrAppendFormat. Unfortunately, type safety is not as good as a // a full C++ example. // TODO(aselle): When absl adds support for StrFormat, use that instead. -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_FORMAT_PORT_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_FORMAT_PORT_H_ +#ifndef TENSORFLOW_LITE_TOCO_FORMAT_PORT_H_ +#define TENSORFLOW_LITE_TOCO_FORMAT_PORT_H_ -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/toco_types.h" #include "tensorflow/core/lib/strings/stringprintf.h" namespace toco { @@ -74,4 +74,4 @@ inline string StringF(const char* fmt, Args&&... args) { } // namespace port } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_FORMAT_PORT_H_ +#endif // TENSORFLOW_LITE_TOCO_FORMAT_PORT_H_ diff --git a/tensorflow/contrib/lite/toco/g3doc/README.md b/tensorflow/lite/toco/g3doc/README.md similarity index 100% rename from tensorflow/contrib/lite/toco/g3doc/README.md rename to tensorflow/lite/toco/g3doc/README.md diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_expanddims_to_reshape.cc b/tensorflow/lite/toco/graph_transformations/convert_expanddims_to_reshape.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_expanddims_to_reshape.cc rename to tensorflow/lite/toco/graph_transformations/convert_expanddims_to_reshape.cc index 8a945ac435..e3b0de5555 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_expanddims_to_reshape.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_expanddims_to_reshape.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include "absl/strings/str_cat.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_pure_conv_to_depthwise.cc b/tensorflow/lite/toco/graph_transformations/convert_pure_conv_to_depthwise.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_pure_conv_to_depthwise.cc rename to tensorflow/lite/toco/graph_transformations/convert_pure_conv_to_depthwise.cc index a151012891..a707a906a8 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_pure_conv_to_depthwise.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_pure_conv_to_depthwise.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_reorder_axes.cc b/tensorflow/lite/toco/graph_transformations/convert_reorder_axes.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_reorder_axes.cc rename to tensorflow/lite/toco/graph_transformations/convert_reorder_axes.cc index 4a264e1cf1..b4cd463598 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_reorder_axes.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_reorder_axes.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include "absl/strings/str_cat.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_squeeze_to_reshape.cc b/tensorflow/lite/toco/graph_transformations/convert_squeeze_to_reshape.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_squeeze_to_reshape.cc rename to tensorflow/lite/toco/graph_transformations/convert_squeeze_to_reshape.cc index a0bd1ed4a4..52aaefb3d7 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_squeeze_to_reshape.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_squeeze_to_reshape.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include "absl/strings/str_cat.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_addn_to_add.cc b/tensorflow/lite/toco/graph_transformations/convert_trivial_addn_to_add.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_addn_to_add.cc rename to tensorflow/lite/toco/graph_transformations/convert_trivial_addn_to_add.cc index d7cacf77f4..130fe58a9d 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_addn_to_add.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_trivial_addn_to_add.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_pack_to_reshape.cc b/tensorflow/lite/toco/graph_transformations/convert_trivial_pack_to_reshape.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_pack_to_reshape.cc rename to tensorflow/lite/toco/graph_transformations/convert_trivial_pack_to_reshape.cc index 78779243a9..27c503f5dd 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_pack_to_reshape.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_trivial_pack_to_reshape.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include "absl/strings/str_cat.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_tile_to_concat.cc b/tensorflow/lite/toco/graph_transformations/convert_trivial_tile_to_concat.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_tile_to_concat.cc rename to tensorflow/lite/toco/graph_transformations/convert_trivial_tile_to_concat.cc index b6d712ca44..fb416cabed 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_tile_to_concat.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_trivial_tile_to_concat.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_transpose_to_reshape.cc b/tensorflow/lite/toco/graph_transformations/convert_trivial_transpose_to_reshape.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_transpose_to_reshape.cc rename to tensorflow/lite/toco/graph_transformations/convert_trivial_transpose_to_reshape.cc index e5a96d4335..ae97cef520 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/convert_trivial_transpose_to_reshape.cc +++ b/tensorflow/lite/toco/graph_transformations/convert_trivial_transpose_to_reshape.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/create_im2col_arrays.cc b/tensorflow/lite/toco/graph_transformations/create_im2col_arrays.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/create_im2col_arrays.cc rename to tensorflow/lite/toco/graph_transformations/create_im2col_arrays.cc index ebc0e9afca..8e93bc2378 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/create_im2col_arrays.cc +++ b/tensorflow/lite/toco/graph_transformations/create_im2col_arrays.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include "absl/strings/str_cat.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/dequantize.cc b/tensorflow/lite/toco/graph_transformations/dequantize.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/dequantize.cc rename to tensorflow/lite/toco/graph_transformations/dequantize.cc index 2119174950..cc5dddbb40 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/dequantize.cc +++ b/tensorflow/lite/toco/graph_transformations/dequantize.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/drop_fake_quant.cc b/tensorflow/lite/toco/graph_transformations/drop_fake_quant.cc similarity index 86% rename from tensorflow/contrib/lite/toco/graph_transformations/drop_fake_quant.cc rename to tensorflow/lite/toco/graph_transformations/drop_fake_quant.cc index 1555cf60a1..bb8679bced 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/drop_fake_quant.cc +++ b/tensorflow/lite/toco/graph_transformations/drop_fake_quant.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/drop_im2col_arrays.cc b/tensorflow/lite/toco/graph_transformations/drop_im2col_arrays.cc similarity index 88% rename from tensorflow/contrib/lite/toco/graph_transformations/drop_im2col_arrays.cc rename to tensorflow/lite/toco/graph_transformations/drop_im2col_arrays.cc index 7d66ea5dd2..c3c95afd96 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/drop_im2col_arrays.cc +++ b/tensorflow/lite/toco/graph_transformations/drop_im2col_arrays.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/ensure_bias_vectors.cc b/tensorflow/lite/toco/graph_transformations/ensure_bias_vectors.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/ensure_bias_vectors.cc rename to tensorflow/lite/toco/graph_transformations/ensure_bias_vectors.cc index 72b1dda3be..62a4b52bbb 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/ensure_bias_vectors.cc +++ b/tensorflow/lite/toco/graph_transformations/ensure_bias_vectors.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc b/tensorflow/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc rename to tensorflow/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc index 60dcd52684..918bb48999 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc +++ b/tensorflow/lite/toco/graph_transformations/ensure_uint8_weights_safe_for_fast_int8_kernels.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/fuse_activation_functions.cc b/tensorflow/lite/toco/graph_transformations/fuse_activation_functions.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/fuse_activation_functions.cc rename to tensorflow/lite/toco/graph_transformations/fuse_activation_functions.cc index 88511a7d3c..f467a95f34 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/fuse_activation_functions.cc +++ b/tensorflow/lite/toco/graph_transformations/fuse_activation_functions.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/fuse_binary_into_following_affine.cc b/tensorflow/lite/toco/graph_transformations/fuse_binary_into_following_affine.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/fuse_binary_into_following_affine.cc rename to tensorflow/lite/toco/graph_transformations/fuse_binary_into_following_affine.cc index 0de22b8ff4..6b4765b23c 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/fuse_binary_into_following_affine.cc +++ b/tensorflow/lite/toco/graph_transformations/fuse_binary_into_following_affine.cc @@ -18,10 +18,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/fuse_binary_into_preceding_affine.cc b/tensorflow/lite/toco/graph_transformations/fuse_binary_into_preceding_affine.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/fuse_binary_into_preceding_affine.cc rename to tensorflow/lite/toco/graph_transformations/fuse_binary_into_preceding_affine.cc index b8da756d85..72aaafdd97 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/fuse_binary_into_preceding_affine.cc +++ b/tensorflow/lite/toco/graph_transformations/fuse_binary_into_preceding_affine.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/fuse_broadcast_into_following_binary.cc b/tensorflow/lite/toco/graph_transformations/fuse_broadcast_into_following_binary.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/fuse_broadcast_into_following_binary.cc rename to tensorflow/lite/toco/graph_transformations/fuse_broadcast_into_following_binary.cc index 4848867b9a..ba3e277f67 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/fuse_broadcast_into_following_binary.cc +++ b/tensorflow/lite/toco/graph_transformations/fuse_broadcast_into_following_binary.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.cc b/tensorflow/lite/toco/graph_transformations/graph_transformations.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.cc rename to tensorflow/lite/toco/graph_transformations/graph_transformations.cc index 8b0bc2d865..a0260e2401 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.cc +++ b/tensorflow/lite/toco/graph_transformations/graph_transformations.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/contrib/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" #include #include @@ -21,8 +21,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h b/tensorflow/lite/toco/graph_transformations/graph_transformations.h similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h rename to tensorflow/lite/toco/graph_transformations/graph_transformations.h index a89db320ea..73a90c8239 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h +++ b/tensorflow/lite/toco/graph_transformations/graph_transformations.h @@ -12,16 +12,16 @@ 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_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_GRAPH_TRANSFORMATIONS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_GRAPH_TRANSFORMATIONS_H_ +#ifndef TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_GRAPH_TRANSFORMATIONS_H_ +#define TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_GRAPH_TRANSFORMATIONS_H_ #include #include #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/toco_port.h" namespace toco { @@ -287,4 +287,4 @@ class IdentifyDilatedConv : public GraphTransformation { } // end namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_GRAPH_TRANSFORMATIONS_H_ +#endif // TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_GRAPH_TRANSFORMATIONS_H_ diff --git a/tensorflow/contrib/lite/toco/graph_transformations/hardcode_min_max.cc b/tensorflow/lite/toco/graph_transformations/hardcode_min_max.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/hardcode_min_max.cc rename to tensorflow/lite/toco/graph_transformations/hardcode_min_max.cc index a4f8d64f4d..df50f31de8 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/hardcode_min_max.cc +++ b/tensorflow/lite/toco/graph_transformations/hardcode_min_max.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_dilated_conv.cc b/tensorflow/lite/toco/graph_transformations/identify_dilated_conv.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_dilated_conv.cc rename to tensorflow/lite/toco/graph_transformations/identify_dilated_conv.cc index 9e4a3005a1..e27f975348 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_dilated_conv.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_dilated_conv.cc @@ -15,9 +15,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_l2_normalization.cc b/tensorflow/lite/toco/graph_transformations/identify_l2_normalization.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_l2_normalization.cc rename to tensorflow/lite/toco/graph_transformations/identify_l2_normalization.cc index 78f60f52fb..dabd4bd209 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_l2_normalization.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_l2_normalization.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_l2_pool.cc b/tensorflow/lite/toco/graph_transformations/identify_l2_pool.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_l2_pool.cc rename to tensorflow/lite/toco/graph_transformations/identify_l2_pool.cc index 13664bb344..6e0a7cdc31 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_l2_pool.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_l2_pool.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_lstm.cc b/tensorflow/lite/toco/graph_transformations/identify_lstm.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_lstm.cc rename to tensorflow/lite/toco/graph_transformations/identify_lstm.cc index 7fd8f906e2..089ecee959 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_lstm.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_lstm.cc @@ -16,9 +16,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_lstm_merge_inputs.cc b/tensorflow/lite/toco/graph_transformations/identify_lstm_merge_inputs.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_lstm_merge_inputs.cc rename to tensorflow/lite/toco/graph_transformations/identify_lstm_merge_inputs.cc index 6ccce923f3..2fae01a698 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_lstm_merge_inputs.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_lstm_merge_inputs.cc @@ -18,10 +18,10 @@ limitations under the License. #include "absl/memory/memory.h" #include "absl/strings/string_view.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/lstm_utils.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_lstm_split_inputs.cc b/tensorflow/lite/toco/graph_transformations/identify_lstm_split_inputs.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_lstm_split_inputs.cc rename to tensorflow/lite/toco/graph_transformations/identify_lstm_split_inputs.cc index ad5120e2aa..c519e65463 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_lstm_split_inputs.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_lstm_split_inputs.cc @@ -18,10 +18,10 @@ limitations under the License. #include "absl/memory/memory.h" #include "absl/strings/string_view.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/lstm_utils.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_prelu.cc b/tensorflow/lite/toco/graph_transformations/identify_prelu.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_prelu.cc rename to tensorflow/lite/toco/graph_transformations/identify_prelu.cc index c11fee4dc9..1205ddc730 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_prelu.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_prelu.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" // This transformation rule tries to identify the PRelu structure generated by diff --git a/tensorflow/contrib/lite/toco/graph_transformations/identify_relu1.cc b/tensorflow/lite/toco/graph_transformations/identify_relu1.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/identify_relu1.cc rename to tensorflow/lite/toco/graph_transformations/identify_relu1.cc index 51d0629362..bcd5b0ca04 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/identify_relu1.cc +++ b/tensorflow/lite/toco/graph_transformations/identify_relu1.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.cc b/tensorflow/lite/toco/graph_transformations/lstm_utils.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.cc rename to tensorflow/lite/toco/graph_transformations/lstm_utils.cc index 910a960589..3414a7fd7f 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.cc +++ b/tensorflow/lite/toco/graph_transformations/lstm_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/contrib/lite/toco/graph_transformations/lstm_utils.h" +#include "tensorflow/lite/toco/graph_transformations/lstm_utils.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.h b/tensorflow/lite/toco/graph_transformations/lstm_utils.h similarity index 92% rename from tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.h rename to tensorflow/lite/toco/graph_transformations/lstm_utils.h index 6d8603a113..949292ee84 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.h +++ b/tensorflow/lite/toco/graph_transformations/lstm_utils.h @@ -12,20 +12,20 @@ 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_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_LSTM_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_LSTM_UTILS_H_ +#ifndef TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_LSTM_UTILS_H_ +#define TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_LSTM_UTILS_H_ #include #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { // For consistency with the parameters defined in extended LstmCell's kernel -// (tensorflow/contrib/lite/kernels/lstm.cc), +// (tensorflow/lite/kernels/lstm.cc), // use lowercase for these constants. enum ExtendedLstmCellInputs { @@ -108,4 +108,4 @@ bool GetMatchingRnnArray(Model* model, const string& back_edge_source_array, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_LSTM_UTILS_H_ +#endif // TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_LSTM_UTILS_H_ diff --git a/tensorflow/contrib/lite/toco/graph_transformations/make_initial_dequantize_operator.cc b/tensorflow/lite/toco/graph_transformations/make_initial_dequantize_operator.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/make_initial_dequantize_operator.cc rename to tensorflow/lite/toco/graph_transformations/make_initial_dequantize_operator.cc index 5bf17d5b4c..b914838b91 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/make_initial_dequantize_operator.cc +++ b/tensorflow/lite/toco/graph_transformations/make_initial_dequantize_operator.cc @@ -17,11 +17,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/merge_reshape_into_preceding_transpose.cc b/tensorflow/lite/toco/graph_transformations/merge_reshape_into_preceding_transpose.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/merge_reshape_into_preceding_transpose.cc rename to tensorflow/lite/toco/graph_transformations/merge_reshape_into_preceding_transpose.cc index 06de9b1cd8..80170fe8bc 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/merge_reshape_into_preceding_transpose.cc +++ b/tensorflow/lite/toco/graph_transformations/merge_reshape_into_preceding_transpose.cc @@ -18,11 +18,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/move_binary_operator_before_reshape.cc b/tensorflow/lite/toco/graph_transformations/move_binary_operator_before_reshape.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/move_binary_operator_before_reshape.cc rename to tensorflow/lite/toco/graph_transformations/move_binary_operator_before_reshape.cc index f0d8d924ad..0f3c4d34d6 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/move_binary_operator_before_reshape.cc +++ b/tensorflow/lite/toco/graph_transformations/move_binary_operator_before_reshape.cc @@ -14,9 +14,9 @@ ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/propagate_activation_function_into_constants.cc b/tensorflow/lite/toco/graph_transformations/propagate_activation_function_into_constants.cc similarity index 92% rename from tensorflow/contrib/lite/toco/graph_transformations/propagate_activation_function_into_constants.cc rename to tensorflow/lite/toco/graph_transformations/propagate_activation_function_into_constants.cc index 9c1ed2b732..95de60262e 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/propagate_activation_function_into_constants.cc +++ b/tensorflow/lite/toco/graph_transformations/propagate_activation_function_into_constants.cc @@ -17,11 +17,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/propagate_array_data_types.cc b/tensorflow/lite/toco/graph_transformations/propagate_array_data_types.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/propagate_array_data_types.cc rename to tensorflow/lite/toco/graph_transformations/propagate_array_data_types.cc index 47faa20a29..9a458dccb9 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/propagate_array_data_types.cc +++ b/tensorflow/lite/toco/graph_transformations/propagate_array_data_types.cc @@ -17,8 +17,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/propagate_default_min_max.cc b/tensorflow/lite/toco/graph_transformations/propagate_default_min_max.cc similarity index 92% rename from tensorflow/contrib/lite/toco/graph_transformations/propagate_default_min_max.cc rename to tensorflow/lite/toco/graph_transformations/propagate_default_min_max.cc index 3cf191436d..d31ba956af 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/propagate_default_min_max.cc +++ b/tensorflow/lite/toco/graph_transformations/propagate_default_min_max.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/propagate_fake_quant_num_bits.cc b/tensorflow/lite/toco/graph_transformations/propagate_fake_quant_num_bits.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/propagate_fake_quant_num_bits.cc rename to tensorflow/lite/toco/graph_transformations/propagate_fake_quant_num_bits.cc index d0113237ce..04a5a1c168 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/propagate_fake_quant_num_bits.cc +++ b/tensorflow/lite/toco/graph_transformations/propagate_fake_quant_num_bits.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/propagate_fixed_sizes.cc b/tensorflow/lite/toco/graph_transformations/propagate_fixed_sizes.cc similarity index 99% rename from tensorflow/contrib/lite/toco/graph_transformations/propagate_fixed_sizes.cc rename to tensorflow/lite/toco/graph_transformations/propagate_fixed_sizes.cc index 514a596f1e..78ea54e452 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/propagate_fixed_sizes.cc +++ b/tensorflow/lite/toco/graph_transformations/propagate_fixed_sizes.cc @@ -20,10 +20,10 @@ limitations under the License. #include #include "absl/strings/str_join.h" -#include "tensorflow/contrib/lite/kernels/internal/strided_slice_logic.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/kernels/internal/strided_slice_logic.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/quantization_util.cc b/tensorflow/lite/toco/graph_transformations/quantization_util.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/quantization_util.cc rename to tensorflow/lite/toco/graph_transformations/quantization_util.cc index 82146c5a66..56f83c9793 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/quantization_util.cc +++ b/tensorflow/lite/toco/graph_transformations/quantization_util.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h b/tensorflow/lite/toco/graph_transformations/quantization_util.h similarity index 85% rename from tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h rename to tensorflow/lite/toco/graph_transformations/quantization_util.h index cf093c6f17..d226aeab8b 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h +++ b/tensorflow/lite/toco/graph_transformations/quantization_util.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_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_QUANTIZATION_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_QUANTIZATION_UTIL_H_ +#ifndef TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_QUANTIZATION_UTIL_H_ +#define TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_QUANTIZATION_UTIL_H_ -#include "tensorflow/contrib/lite/kernels/internal/quantization_util.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -60,4 +60,4 @@ bool IsArrayQuantizedRangeSubset(GraphTransformation* transformation, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_QUANTIZATION_UTIL_H_ +#endif // TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_QUANTIZATION_UTIL_H_ diff --git a/tensorflow/contrib/lite/toco/graph_transformations/quantize.cc b/tensorflow/lite/toco/graph_transformations/quantize.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/quantize.cc rename to tensorflow/lite/toco/graph_transformations/quantize.cc index 0a89deadcc..e28b7288f0 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/quantize.cc +++ b/tensorflow/lite/toco/graph_transformations/quantize.cc @@ -20,11 +20,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/read_array_minmax_and_narrow_range_from_fake_quant.cc b/tensorflow/lite/toco/graph_transformations/read_array_minmax_and_narrow_range_from_fake_quant.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/read_array_minmax_and_narrow_range_from_fake_quant.cc rename to tensorflow/lite/toco/graph_transformations/read_array_minmax_and_narrow_range_from_fake_quant.cc index 0c32218ff2..4d621018dc 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/read_array_minmax_and_narrow_range_from_fake_quant.cc +++ b/tensorflow/lite/toco/graph_transformations/read_array_minmax_and_narrow_range_from_fake_quant.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_final_dequantize_op.cc b/tensorflow/lite/toco/graph_transformations/remove_final_dequantize_op.cc similarity index 90% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_final_dequantize_op.cc rename to tensorflow/lite/toco/graph_transformations/remove_final_dequantize_op.cc index fe8023ab8f..ed551d0122 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_final_dequantize_op.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_final_dequantize_op.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_tensorflow_assert.cc b/tensorflow/lite/toco/graph_transformations/remove_tensorflow_assert.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_tensorflow_assert.cc rename to tensorflow/lite/toco/graph_transformations/remove_tensorflow_assert.cc index be8c0acc7b..647146b407 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_tensorflow_assert.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_tensorflow_assert.cc @@ -16,9 +16,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_tensorflow_identity.cc b/tensorflow/lite/toco/graph_transformations/remove_tensorflow_identity.cc similarity index 83% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_tensorflow_identity.cc rename to tensorflow/lite/toco/graph_transformations/remove_tensorflow_identity.cc index 37fe5fa3d7..e0f7bc9a05 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_tensorflow_identity.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_tensorflow_identity.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_binary.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_binary.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_binary.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_binary.cc index 68c6fb65c5..8879a7cd26 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_binary.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_binary.cc @@ -18,10 +18,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_concatenation.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_concatenation.cc similarity index 83% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_concatenation.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_concatenation.cc index faaa2a828e..bfa9314a69 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_concatenation.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_concatenation.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_concatenation_input.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_concatenation_input.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_concatenation_input.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_concatenation_input.cc index ccfc181fe0..565ccb663a 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_concatenation_input.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_concatenation_input.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_fake_quant.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_fake_quant.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_fake_quant.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_fake_quant.cc index 5448a816bc..2891e41f30 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_fake_quant.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_fake_quant.cc @@ -18,10 +18,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.cc index d5983a1f12..5239d55076 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h b/tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h similarity index 86% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h rename to tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h index 663704e5ac..315edc0121 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.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_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_REMOVE_TRIVIAL_PASSTHROUGH_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_REMOVE_TRIVIAL_PASSTHROUGH_H_ +#ifndef TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_REMOVE_TRIVIAL_PASSTHROUGH_H_ +#define TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_REMOVE_TRIVIAL_PASSTHROUGH_H_ -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -55,4 +55,4 @@ bool RemoveTrivialPassthroughOp(GraphTransformation* transformation, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_GRAPH_TRANSFORMATIONS_REMOVE_TRIVIAL_PASSTHROUGH_H_ +#endif // TENSORFLOW_LITE_TOCO_GRAPH_TRANSFORMATIONS_REMOVE_TRIVIAL_PASSTHROUGH_H_ diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_quantized_activation_func.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_quantized_activation_func.cc similarity index 89% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_quantized_activation_func.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_quantized_activation_func.cc index 4133815285..56acf22f7f 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_quantized_activation_func.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_quantized_activation_func.cc @@ -17,13 +17,13 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_quantized_min_max.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_quantized_min_max.cc similarity index 87% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_quantized_min_max.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_quantized_min_max.cc index 0f0ae4af69..f1037994c9 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_quantized_min_max.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_quantized_min_max.cc @@ -17,13 +17,13 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_reshape.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_reshape.cc similarity index 92% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_reshape.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_reshape.cc index 1caf944879..7dea3c79c5 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_reshape.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_reshape.cc @@ -18,10 +18,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_slice.cc b/tensorflow/lite/toco/graph_transformations/remove_trivial_slice.cc similarity index 88% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_slice.cc rename to tensorflow/lite/toco/graph_transformations/remove_trivial_slice.cc index dcb0148d58..330e16b3af 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_slice.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_trivial_slice.cc @@ -18,10 +18,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/remove_unused_op.cc b/tensorflow/lite/toco/graph_transformations/remove_unused_op.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/remove_unused_op.cc rename to tensorflow/lite/toco/graph_transformations/remove_unused_op.cc index 3cd5d06bae..ac05afb819 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/remove_unused_op.cc +++ b/tensorflow/lite/toco/graph_transformations/remove_unused_op.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/reorder_elementwise_unary.cc b/tensorflow/lite/toco/graph_transformations/reorder_elementwise_unary.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/reorder_elementwise_unary.cc rename to tensorflow/lite/toco/graph_transformations/reorder_elementwise_unary.cc index 3c8d411089..6a4b919854 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/reorder_elementwise_unary.cc +++ b/tensorflow/lite/toco/graph_transformations/reorder_elementwise_unary.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/reorder_reshape_transpose.cc b/tensorflow/lite/toco/graph_transformations/reorder_reshape_transpose.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/reorder_reshape_transpose.cc rename to tensorflow/lite/toco/graph_transformations/reorder_reshape_transpose.cc index a2c06e71e8..fdd411c84c 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/reorder_reshape_transpose.cc +++ b/tensorflow/lite/toco/graph_transformations/reorder_reshape_transpose.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_batch_normalization.cc b/tensorflow/lite/toco/graph_transformations/resolve_batch_normalization.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_batch_normalization.cc rename to tensorflow/lite/toco/graph_transformations/resolve_batch_normalization.cc index a79779f55d..e972e5c901 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_batch_normalization.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_batch_normalization.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_batch_to_space_nd_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_batch_to_space_nd_attributes.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_batch_to_space_nd_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_batch_to_space_nd_attributes.cc index d039d7d690..7aa92de4f6 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_batch_to_space_nd_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_batch_to_space_nd_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_binary.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_binary.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_binary.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_binary.cc index 586f546a30..0e1671c61c 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_binary.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_binary.cc @@ -18,10 +18,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_concatenation.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_concatenation.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_concatenation.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_concatenation.cc index a26aa21def..98ff4ab02e 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_concatenation.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_concatenation.cc @@ -19,9 +19,9 @@ limitations under the License. #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_fake_quant.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_fake_quant.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_fake_quant.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_fake_quant.cc index 4f330fdd84..d52f7d4916 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_fake_quant.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_fake_quant.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/quantization_util.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/quantization_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_fill.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_fill.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_fill.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_fill.cc index ef234563fd..c9021019bf 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_fill.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_fill.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_gather.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_gather.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_gather.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_gather.cc index 26616374d8..1149930131 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_gather.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_gather.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_pack.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_pack.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_pack.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_pack.cc index 55fa0e22eb..168f79bebd 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_pack.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_pack.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_random_uniform.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_random_uniform.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_random_uniform.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_random_uniform.cc index db0fbba528..a8afbb7de5 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_random_uniform.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_random_uniform.cc @@ -15,9 +15,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/lib/random/philox_random.h" diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_range.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_range.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_range.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_range.cc index 198e95ab88..4cb27d97ec 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_range.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_range.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_reshape.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_reshape.cc similarity index 95% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_reshape.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_reshape.cc index ef4a896e32..9e21fa564e 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_reshape.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_reshape.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_select.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_select.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_select.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_select.cc index ab1e0bd7a0..82b2f4ab87 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_select.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_select.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_shape_or_rank.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_shape_or_rank.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_shape_or_rank.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_shape_or_rank.cc index a1756a8207..00ab858827 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_shape_or_rank.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_shape_or_rank.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_slice.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_slice.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_slice.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_slice.cc index 6b6465c2fe..503807f231 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_slice.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_slice.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_strided_slice.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_strided_slice.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_strided_slice.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_strided_slice.cc index 83cb8bec0d..0c9effee1f 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_strided_slice.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_strided_slice.cc @@ -14,10 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/kernels/internal/strided_slice_logic.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/kernels/internal/strided_slice_logic.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_tile.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_tile.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_tile.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_tile.cc index 685fec9619..7563130496 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_tile.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_tile.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_transpose.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_transpose.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_transpose.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_transpose.cc index 612d03b97e..9514848682 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_transpose.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_transpose.cc @@ -14,9 +14,9 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_unary.cc b/tensorflow/lite/toco/graph_transformations/resolve_constant_unary.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_unary.cc rename to tensorflow/lite/toco/graph_transformations/resolve_constant_unary.cc index 3034c1b1eb..43070b063c 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_constant_unary.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_constant_unary.cc @@ -20,10 +20,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_fake_quant_args_from_vars.cc b/tensorflow/lite/toco/graph_transformations/resolve_fake_quant_args_from_vars.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_fake_quant_args_from_vars.cc rename to tensorflow/lite/toco/graph_transformations/resolve_fake_quant_args_from_vars.cc index eed971c1d5..c0becaf7d3 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_fake_quant_args_from_vars.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_fake_quant_args_from_vars.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_gather_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_gather_attributes.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_gather_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_gather_attributes.cc index 69209b8dec..ffad0d0d31 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_gather_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_gather_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_multiply_by_zero.cc b/tensorflow/lite/toco/graph_transformations/resolve_multiply_by_zero.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_multiply_by_zero.cc rename to tensorflow/lite/toco/graph_transformations/resolve_multiply_by_zero.cc index e5b74e2bb1..51c724dd1a 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_multiply_by_zero.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_multiply_by_zero.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_pad_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_pad_attributes.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_pad_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_pad_attributes.cc index adc87753bc..25b823f848 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_pad_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_pad_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_padv2_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_padv2_attributes.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_padv2_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_padv2_attributes.cc index 1f0f17a37a..bcc9f5363a 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_padv2_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_padv2_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_reduce_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_reduce_attributes.cc similarity index 93% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_reduce_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_reduce_attributes.cc index c3246ab90f..ea5d33009b 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_reduce_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_reduce_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_reorder_axes.cc b/tensorflow/lite/toco/graph_transformations/resolve_reorder_axes.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_reorder_axes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_reorder_axes.cc index ee5c4810e6..f70e80b8e7 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_reorder_axes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_reorder_axes.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_reshape_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_reshape_attributes.cc similarity index 90% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_reshape_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_reshape_attributes.cc index 7b7a59264f..24a3482a6f 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_reshape_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_reshape_attributes.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_slice_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_slice_attributes.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_slice_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_slice_attributes.cc index 5a838168de..1f86b35c34 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_slice_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_slice_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_space_to_batch_nd_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_space_to_batch_nd_attributes.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_space_to_batch_nd_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_space_to_batch_nd_attributes.cc index 3804145c4f..dd1e6fccd7 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_space_to_batch_nd_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_space_to_batch_nd_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_squeeze_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_squeeze_attributes.cc similarity index 86% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_squeeze_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_squeeze_attributes.cc index c601b0774e..3f2ae471a2 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_squeeze_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_squeeze_attributes.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/remove_trivial_passthrough.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/graph_transformations/remove_trivial_passthrough.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_strided_slice_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_strided_slice_attributes.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_strided_slice_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_strided_slice_attributes.cc index f54f5b42a1..a62e082e83 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_strided_slice_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_strided_slice_attributes.cc @@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_concat.cc b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_concat.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_concat.cc rename to tensorflow/lite/toco/graph_transformations/resolve_tensorflow_concat.cc index 4927ccd95d..ce185847cd 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_concat.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_concat.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_matmul.cc b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_matmul.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_matmul.cc rename to tensorflow/lite/toco/graph_transformations/resolve_tensorflow_matmul.cc index da039da546..637ffda533 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_matmul.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_matmul.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_merge.cc b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_merge.cc similarity index 92% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_merge.cc rename to tensorflow/lite/toco/graph_transformations/resolve_tensorflow_merge.cc index 9beea3e937..9ee4e6ec6b 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_merge.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_merge.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_switch.cc b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_switch.cc similarity index 96% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_switch.cc rename to tensorflow/lite/toco/graph_transformations/resolve_tensorflow_switch.cc index e215981b42..f26efacaae 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_tensorflow_switch.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_tensorflow_switch.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/resolve_transpose_attributes.cc b/tensorflow/lite/toco/graph_transformations/resolve_transpose_attributes.cc similarity index 91% rename from tensorflow/contrib/lite/toco/graph_transformations/resolve_transpose_attributes.cc rename to tensorflow/lite/toco/graph_transformations/resolve_transpose_attributes.cc index aa7945391c..71c0a884da 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/resolve_transpose_attributes.cc +++ b/tensorflow/lite/toco/graph_transformations/resolve_transpose_attributes.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/shuffle_fc_weights.cc b/tensorflow/lite/toco/graph_transformations/shuffle_fc_weights.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/shuffle_fc_weights.cc rename to tensorflow/lite/toco/graph_transformations/shuffle_fc_weights.cc index e9f24a29ab..195ea70e34 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/shuffle_fc_weights.cc +++ b/tensorflow/lite/toco/graph_transformations/shuffle_fc_weights.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/tests/BUILD b/tensorflow/lite/toco/graph_transformations/tests/BUILD similarity index 60% rename from tensorflow/contrib/lite/toco/graph_transformations/tests/BUILD rename to tensorflow/lite/toco/graph_transformations/tests/BUILD index 6f1be298ca..2e9b213d00 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/tests/BUILD +++ b/tensorflow/lite/toco/graph_transformations/tests/BUILD @@ -12,9 +12,9 @@ tf_cc_test( srcs = ["lstm_utils_test.cc"], tags = ["no_oss"], deps = [ - "//tensorflow/contrib/lite/toco:graph_transformations", - "//tensorflow/contrib/lite/toco:model", - "//tensorflow/contrib/lite/toco:tooling_util", + "//tensorflow/lite/toco:graph_transformations", + "//tensorflow/lite/toco:model", + "//tensorflow/lite/toco:tooling_util", "@com_google_googletest//:gtest_main", ], ) @@ -24,9 +24,9 @@ tf_cc_test( srcs = ["resolve_constant_concatenation_test.cc"], tags = ["no_oss"], deps = [ - "//tensorflow/contrib/lite/toco:graph_transformations", - "//tensorflow/contrib/lite/toco:model", - "//tensorflow/contrib/lite/toco:tooling_util", + "//tensorflow/lite/toco:graph_transformations", + "//tensorflow/lite/toco:model", + "//tensorflow/lite/toco:tooling_util", "@com_google_googletest//:gtest_main", ], ) @@ -36,9 +36,9 @@ tf_cc_test( srcs = ["resolve_constant_unary_test.cc"], tags = ["no_oss"], deps = [ - "//tensorflow/contrib/lite/toco:graph_transformations", - "//tensorflow/contrib/lite/toco:model", - "//tensorflow/contrib/lite/toco:tooling_util", + "//tensorflow/lite/toco:graph_transformations", + "//tensorflow/lite/toco:model", + "//tensorflow/lite/toco:tooling_util", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest_main", ], diff --git a/tensorflow/contrib/lite/toco/graph_transformations/tests/lstm_utils_test.cc b/tensorflow/lite/toco/graph_transformations/tests/lstm_utils_test.cc similarity index 99% rename from tensorflow/contrib/lite/toco/graph_transformations/tests/lstm_utils_test.cc rename to tensorflow/lite/toco/graph_transformations/tests/lstm_utils_test.cc index 6aae0775d3..bdb27e8af2 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/tests/lstm_utils_test.cc +++ b/tensorflow/lite/toco/graph_transformations/tests/lstm_utils_test.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/lstm_utils.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/tests/resolve_constant_concatenation_test.cc b/tensorflow/lite/toco/graph_transformations/tests/resolve_constant_concatenation_test.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/tests/resolve_constant_concatenation_test.cc rename to tensorflow/lite/toco/graph_transformations/tests/resolve_constant_concatenation_test.cc index e2a6f12481..00d60b79ca 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/tests/resolve_constant_concatenation_test.cc +++ b/tensorflow/lite/toco/graph_transformations/tests/resolve_constant_concatenation_test.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/tests/resolve_constant_unary_test.cc b/tensorflow/lite/toco/graph_transformations/tests/resolve_constant_unary_test.cc similarity index 94% rename from tensorflow/contrib/lite/toco/graph_transformations/tests/resolve_constant_unary_test.cc rename to tensorflow/lite/toco/graph_transformations/tests/resolve_constant_unary_test.cc index 57d85a0435..246a13a061 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/tests/resolve_constant_unary_test.cc +++ b/tensorflow/lite/toco/graph_transformations/tests/resolve_constant_unary_test.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/unfuse_activation_functions.cc b/tensorflow/lite/toco/graph_transformations/unfuse_activation_functions.cc similarity index 92% rename from tensorflow/contrib/lite/toco/graph_transformations/unfuse_activation_functions.cc rename to tensorflow/lite/toco/graph_transformations/unfuse_activation_functions.cc index 4ada5c3fd0..3e36dd5a45 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/unfuse_activation_functions.cc +++ b/tensorflow/lite/toco/graph_transformations/unfuse_activation_functions.cc @@ -17,10 +17,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/unpartition_embedding_lookup.cc b/tensorflow/lite/toco/graph_transformations/unpartition_embedding_lookup.cc similarity index 98% rename from tensorflow/contrib/lite/toco/graph_transformations/unpartition_embedding_lookup.cc rename to tensorflow/lite/toco/graph_transformations/unpartition_embedding_lookup.cc index e19527968d..e57f175812 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/unpartition_embedding_lookup.cc +++ b/tensorflow/lite/toco/graph_transformations/unpartition_embedding_lookup.cc @@ -16,9 +16,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/graph_transformations/unroll_batch_matmul.cc b/tensorflow/lite/toco/graph_transformations/unroll_batch_matmul.cc similarity index 97% rename from tensorflow/contrib/lite/toco/graph_transformations/unroll_batch_matmul.cc rename to tensorflow/lite/toco/graph_transformations/unroll_batch_matmul.cc index 5ff39aa313..d59954fc74 100644 --- a/tensorflow/contrib/lite/toco/graph_transformations/unroll_batch_matmul.cc +++ b/tensorflow/lite/toco/graph_transformations/unroll_batch_matmul.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/import_tensorflow.cc b/tensorflow/lite/toco/import_tensorflow.cc similarity index 99% rename from tensorflow/contrib/lite/toco/import_tensorflow.cc rename to tensorflow/lite/toco/import_tensorflow.cc index c0d943039f..b13a08d05e 100644 --- a/tensorflow/contrib/lite/toco/import_tensorflow.cc +++ b/tensorflow/lite/toco/import_tensorflow.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/contrib/lite/toco/import_tensorflow.h" +#include "tensorflow/lite/toco/import_tensorflow.h" #include #include @@ -27,11 +27,11 @@ limitations under the License. #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" #include "absl/strings/strip.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.h" -#include "tensorflow/contrib/lite/toco/tensorflow_util.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.h" +#include "tensorflow/lite/toco/tensorflow_util.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/common_runtime/device_factory.h" #include "tensorflow/core/common_runtime/function.h" #include "tensorflow/core/common_runtime/process_function_library_runtime.h" diff --git a/tensorflow/contrib/lite/toco/import_tensorflow.h b/tensorflow/lite/toco/import_tensorflow.h similarity index 84% rename from tensorflow/contrib/lite/toco/import_tensorflow.h rename to tensorflow/lite/toco/import_tensorflow.h index c5ff96956a..0362c0f359 100644 --- a/tensorflow/contrib/lite/toco/import_tensorflow.h +++ b/tensorflow/lite/toco/import_tensorflow.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_IMPORT_TENSORFLOW_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_IMPORT_TENSORFLOW_H_ +#ifndef TENSORFLOW_LITE_TOCO_IMPORT_TENSORFLOW_H_ +#define TENSORFLOW_LITE_TOCO_IMPORT_TENSORFLOW_H_ #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" #include "tensorflow/core/framework/graph.pb.h" namespace toco { @@ -44,4 +44,4 @@ std::unique_ptr ImportTensorFlowGraphDef( } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_IMPORT_TENSORFLOW_H_ +#endif // TENSORFLOW_LITE_TOCO_IMPORT_TENSORFLOW_H_ diff --git a/tensorflow/contrib/lite/toco/import_tensorflow_test.cc b/tensorflow/lite/toco/import_tensorflow_test.cc similarity index 99% rename from tensorflow/contrib/lite/toco/import_tensorflow_test.cc rename to tensorflow/lite/toco/import_tensorflow_test.cc index 587148a930..3f47c3012e 100644 --- a/tensorflow/contrib/lite/toco/import_tensorflow_test.cc +++ b/tensorflow/lite/toco/import_tensorflow_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/contrib/lite/toco/import_tensorflow.h" +#include "tensorflow/lite/toco/import_tensorflow.h" #include #include diff --git a/tensorflow/contrib/lite/toco/model.h b/tensorflow/lite/toco/model.h similarity index 99% rename from tensorflow/contrib/lite/toco/model.h rename to tensorflow/lite/toco/model.h index 716dade6c8..f85e1c2878 100644 --- a/tensorflow/contrib/lite/toco/model.h +++ b/tensorflow/lite/toco/model.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_CONTRIB_LITE_TOCO_MODEL_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_MODEL_H_ +#ifndef TENSORFLOW_LITE_TOCO_MODEL_H_ +#define TENSORFLOW_LITE_TOCO_MODEL_H_ #include #include @@ -24,10 +24,10 @@ limitations under the License. #include #include "absl/types/optional.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_types.h" #include "tensorflow/core/platform/logging.h" namespace toco { @@ -2144,4 +2144,4 @@ class Model { }; } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_MODEL_H_ +#endif // TENSORFLOW_LITE_TOCO_MODEL_H_ diff --git a/tensorflow/contrib/lite/toco/model_cmdline_flags.cc b/tensorflow/lite/toco/model_cmdline_flags.cc similarity index 98% rename from tensorflow/contrib/lite/toco/model_cmdline_flags.cc rename to tensorflow/lite/toco/model_cmdline_flags.cc index b6a401aaf2..717a28bc61 100644 --- a/tensorflow/contrib/lite/toco/model_cmdline_flags.cc +++ b/tensorflow/lite/toco/model_cmdline_flags.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/contrib/lite/toco/model_cmdline_flags.h" +#include "tensorflow/lite/toco/model_cmdline_flags.h" #include #include @@ -22,9 +22,9 @@ limitations under the License. #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/strings/strip.h" -#include "tensorflow/contrib/lite/toco/args.h" -#include "tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/args.h" +#include "tensorflow/lite/toco/toco_graphviz_dump_options.h" +#include "tensorflow/lite/toco/toco_port.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/util/command_line_flags.h" diff --git a/tensorflow/contrib/lite/toco/model_cmdline_flags.h b/tensorflow/lite/toco/model_cmdline_flags.h similarity index 80% rename from tensorflow/contrib/lite/toco/model_cmdline_flags.h rename to tensorflow/lite/toco/model_cmdline_flags.h index c868d5c7d0..1642e05319 100644 --- a/tensorflow/contrib/lite/toco/model_cmdline_flags.h +++ b/tensorflow/lite/toco/model_cmdline_flags.h @@ -12,16 +12,16 @@ 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_CONTRIB_LITE_TOCO_MODEL_CMDLINE_FLAGS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_MODEL_CMDLINE_FLAGS_H_ +#ifndef TENSORFLOW_LITE_TOCO_MODEL_CMDLINE_FLAGS_H_ +#define TENSORFLOW_LITE_TOCO_MODEL_CMDLINE_FLAGS_H_ #include #include #include -#include "tensorflow/contrib/lite/toco/args.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/types.pb.h" +#include "tensorflow/lite/toco/args.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/types.pb.h" namespace toco { // Parse and remove arguments for models (in toco). Returns true if parsing @@ -40,4 +40,4 @@ ParsedModelFlags* GlobalParsedModelFlags(); } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_MODEL_CMDLINE_FLAGS_H_ +#endif // TENSORFLOW_LITE_TOCO_MODEL_CMDLINE_FLAGS_H_ diff --git a/tensorflow/contrib/lite/toco/model_flags.proto b/tensorflow/lite/toco/model_flags.proto similarity index 99% rename from tensorflow/contrib/lite/toco/model_flags.proto rename to tensorflow/lite/toco/model_flags.proto index 6c1c53658c..bcdac295d2 100644 --- a/tensorflow/contrib/lite/toco/model_flags.proto +++ b/tensorflow/lite/toco/model_flags.proto @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. syntax = "proto2"; -import "tensorflow/contrib/lite/toco/types.proto"; +import "tensorflow/lite/toco/types.proto"; package toco; diff --git a/tensorflow/contrib/lite/toco/python/BUILD b/tensorflow/lite/toco/python/BUILD similarity index 67% rename from tensorflow/contrib/lite/toco/python/BUILD rename to tensorflow/lite/toco/python/BUILD index cf97ba7084..307f397085 100644 --- a/tensorflow/contrib/lite/toco/python/BUILD +++ b/tensorflow/lite/toco/python/BUILD @@ -11,12 +11,12 @@ cc_library( srcs = ["toco_python_api.cc"], hdrs = ["toco_python_api.h"], deps = [ - "//tensorflow/contrib/lite/toco:model_flags_proto_cc", - "//tensorflow/contrib/lite/toco:toco_flags_proto_cc", - "//tensorflow/contrib/lite/toco:toco_graphviz_dump_options", - "//tensorflow/contrib/lite/toco:toco_port", - "//tensorflow/contrib/lite/toco:toco_tooling", "//tensorflow/core:lib", + "//tensorflow/lite/toco:model_flags_proto_cc", + "//tensorflow/lite/toco:toco_flags_proto_cc", + "//tensorflow/lite/toco:toco_graphviz_dump_options", + "//tensorflow/lite/toco:toco_port", + "//tensorflow/lite/toco:toco_tooling", "//third_party/python_runtime:headers", ], ) @@ -26,8 +26,8 @@ tf_py_wrap_cc( srcs = ["toco.i"], deps = [ ":toco_python_api", - "//tensorflow/contrib/lite/toco:model_flags_proto_cc", - "//tensorflow/contrib/lite/toco:toco_flags_proto_cc", + "//tensorflow/lite/toco:model_flags_proto_cc", + "//tensorflow/lite/toco:toco_flags_proto_cc", "//third_party/python_runtime:headers", "@com_google_absl//absl/strings", ], @@ -48,8 +48,8 @@ tf_py_test( srcs = ["toco_from_protos_test.py"], additional_deps = [ "//tensorflow:tensorflow_py", - "//tensorflow/contrib/lite/toco:model_flags_proto_py", - "//tensorflow/contrib/lite/toco:toco_flags_proto_py", + "//tensorflow/lite/toco:model_flags_proto_py", + "//tensorflow/lite/toco:toco_flags_proto_py", ], data = [ ":toco_from_protos", diff --git a/tensorflow/contrib/lite/toco/python/toco.i b/tensorflow/lite/toco/python/toco.i similarity index 95% rename from tensorflow/contrib/lite/toco/python/toco.i rename to tensorflow/lite/toco/python/toco.i index 0d2fbdd67b..c7dfdc35ab 100644 --- a/tensorflow/contrib/lite/toco/python/toco.i +++ b/tensorflow/lite/toco/python/toco.i @@ -16,7 +16,7 @@ limitations under the License. %include "std_string.i" %{ -#include "tensorflow/contrib/lite/toco/python/toco_python_api.h" +#include "tensorflow/lite/toco/python/toco_python_api.h" %} namespace toco { diff --git a/tensorflow/contrib/lite/toco/python/toco_from_protos.py b/tensorflow/lite/toco/python/toco_from_protos.py similarity index 96% rename from tensorflow/contrib/lite/toco/python/toco_from_protos.py rename to tensorflow/lite/toco/python/toco_from_protos.py index c0b032083b..152dd241ea 100644 --- a/tensorflow/contrib/lite/toco/python/toco_from_protos.py +++ b/tensorflow/lite/toco/python/toco_from_protos.py @@ -19,7 +19,7 @@ from __future__ import print_function import argparse import sys -from tensorflow.contrib.lite.toco.python import tensorflow_wrap_toco +from tensorflow.lite.toco.python import tensorflow_wrap_toco from tensorflow.python.platform import app FLAGS = None diff --git a/tensorflow/contrib/lite/toco/python/toco_from_protos_test.py b/tensorflow/lite/toco/python/toco_from_protos_test.py similarity index 95% rename from tensorflow/contrib/lite/toco/python/toco_from_protos_test.py rename to tensorflow/lite/toco/python/toco_from_protos_test.py index 75c1c8970c..34cfd2c59f 100644 --- a/tensorflow/contrib/lite/toco/python/toco_from_protos_test.py +++ b/tensorflow/lite/toco/python/toco_from_protos_test.py @@ -20,9 +20,9 @@ import os import tempfile import tensorflow as tf -from tensorflow.contrib.lite.toco import model_flags_pb2 -from tensorflow.contrib.lite.toco import toco_flags_pb2 -from tensorflow.contrib.lite.toco import types_pb2 +from tensorflow.lite.toco import model_flags_pb2 +from tensorflow.lite.toco import toco_flags_pb2 +from tensorflow.lite.toco import types_pb2 from tensorflow.python.platform import googletest from tensorflow.python.platform import resource_loader diff --git a/tensorflow/contrib/lite/toco/python/toco_python_api.cc b/tensorflow/lite/toco/python/toco_python_api.cc similarity index 90% rename from tensorflow/contrib/lite/toco/python/toco_python_api.cc rename to tensorflow/lite/toco/python/toco_python_api.cc index 302b7f9bd4..ce8e3c9df8 100644 --- a/tensorflow/contrib/lite/toco/python/toco_python_api.cc +++ b/tensorflow/lite/toco/python/toco_python_api.cc @@ -16,13 +16,13 @@ limitations under the License. #include #include "tensorflow/core/platform/logging.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/python/toco_python_api.h" -#include "tensorflow/contrib/lite/toco/toco_flags.pb.h" -#include "tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/toco_tooling.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/python/toco_python_api.h" +#include "tensorflow/lite/toco/toco_flags.pb.h" +#include "tensorflow/lite/toco/toco_graphviz_dump_options.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_tooling.h" +#include "tensorflow/lite/toco/toco_types.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/python/toco_python_api.h b/tensorflow/lite/toco/python/toco_python_api.h similarity index 88% rename from tensorflow/contrib/lite/toco/python/toco_python_api.h rename to tensorflow/lite/toco/python/toco_python_api.h index ee054bbed9..4ab0961e12 100644 --- a/tensorflow/contrib/lite/toco/python/toco_python_api.h +++ b/tensorflow/lite/toco/python/toco_python_api.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_CONTRIB_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_ +#ifndef TENSORFLOW_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_ +#define TENSORFLOW_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_ #include #include @@ -33,4 +33,4 @@ PyObject* TocoConvert(PyObject* model_flags_proto_txt_raw, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_ +#endif // TENSORFLOW_LITE_TOCO_PYTHON_TOCO_PYTHON_API_H_ diff --git a/tensorflow/contrib/lite/toco/runtime/common.h b/tensorflow/lite/toco/runtime/common.h similarity index 78% rename from tensorflow/contrib/lite/toco/runtime/common.h rename to tensorflow/lite/toco/runtime/common.h index 3c6828840c..1f83be8fa8 100644 --- a/tensorflow/contrib/lite/toco/runtime/common.h +++ b/tensorflow/lite/toco/runtime/common.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_CONTRIB_LITE_TOCO_RUNTIME_COMMON_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_RUNTIME_COMMON_H_ +#ifndef TENSORFLOW_LITE_TOCO_RUNTIME_COMMON_H_ +#define TENSORFLOW_LITE_TOCO_RUNTIME_COMMON_H_ #ifndef ALLOW_SLOW_GENERIC_DEPTHWISECONV_FALLBACK #ifdef GEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK @@ -21,6 +21,6 @@ limitations under the License. #endif #endif -#include "tensorflow/contrib/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/common.h" -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_RUNTIME_COMMON_H_ +#endif // TENSORFLOW_LITE_TOCO_RUNTIME_COMMON_H_ diff --git a/tensorflow/contrib/lite/toco/runtime/types.h b/tensorflow/lite/toco/runtime/types.h similarity index 72% rename from tensorflow/contrib/lite/toco/runtime/types.h rename to tensorflow/lite/toco/runtime/types.h index 207f2c1706..eac9b8af6e 100644 --- a/tensorflow/contrib/lite/toco/runtime/types.h +++ b/tensorflow/lite/toco/runtime/types.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_CONTRIB_LITE_TOCO_RUNTIME_TYPES_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_RUNTIME_TYPES_H_ +#ifndef TENSORFLOW_LITE_TOCO_RUNTIME_TYPES_H_ +#define TENSORFLOW_LITE_TOCO_RUNTIME_TYPES_H_ -#include "tensorflow/contrib/lite/kernels/internal/common.h" -#include "tensorflow/contrib/lite/kernels/internal/compatibility.h" -#include "tensorflow/contrib/lite/kernels/internal/types.h" +#include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace toco { @@ -30,4 +30,4 @@ using tflite::RequiredBufferSizeForDims; } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_RUNTIME_TYPES_H_ +#endif // TENSORFLOW_LITE_TOCO_RUNTIME_TYPES_H_ diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/BUILD b/tensorflow/lite/toco/tensorflow_graph_matching/BUILD similarity index 80% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/BUILD rename to tensorflow/lite/toco/tensorflow_graph_matching/BUILD index ea1fc2827e..56acc284cc 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/BUILD +++ b/tensorflow/lite/toco/tensorflow_graph_matching/BUILD @@ -16,7 +16,7 @@ cc_library( "cluster_utils.h", ], deps = [ - "//tensorflow/contrib/lite/toco:toco_port", + "//tensorflow/lite/toco:toco_port", ], ) @@ -30,9 +30,9 @@ cc_library( ], deps = [ ":cluster_utils", - "//tensorflow/contrib/lite/toco:model", - "//tensorflow/contrib/lite/toco:tooling_util", "//tensorflow/core:protos_all_cc", + "//tensorflow/lite/toco:model", + "//tensorflow/lite/toco:tooling_util", ], ) @@ -48,11 +48,11 @@ cc_library( deps = [ ":cluster", ":cluster_utils", - "//tensorflow/contrib/lite/toco:model", - "//tensorflow/contrib/lite/toco:toco_port", - "//tensorflow/contrib/lite/toco:tooling_util", "//tensorflow/core:lib", "//tensorflow/core:protos_all_cc", + "//tensorflow/lite/toco:model", + "//tensorflow/lite/toco:toco_port", + "//tensorflow/lite/toco:tooling_util", "@protobuf_archive//:protobuf_headers", ], ) @@ -85,7 +85,7 @@ cc_library( ":cluster", ":cluster_utils", ":resolve_svdf", - "//tensorflow/contrib/lite/toco:tooling_util", "//tensorflow/core:protos_all_cc", + "//tensorflow/lite/toco:tooling_util", ], ) diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.cc b/tensorflow/lite/toco/tensorflow_graph_matching/cluster.cc similarity index 95% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.cc rename to tensorflow/lite/toco/tensorflow_graph_matching/cluster.cc index 98a130ea39..afce05dc7a 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.cc +++ b/tensorflow/lite/toco/tensorflow_graph_matching/cluster.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/contrib/lite/toco/tensorflow_graph_matching/cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h b/tensorflow/lite/toco/tensorflow_graph_matching/cluster.h similarity index 89% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h rename to tensorflow/lite/toco/tensorflow_graph_matching/cluster.h index fda7743a27..af268ddd37 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h +++ b/tensorflow/lite/toco/tensorflow_graph_matching/cluster.h @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_H_ +#ifndef TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_H_ +#define TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_H_ #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/node_def.pb.h" @@ -98,4 +98,4 @@ class ClusterFactoryInterface { } // end namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_H_ +#endif // TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_H_ diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.cc b/tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.cc similarity index 95% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.cc rename to tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.cc index 14c3cd6487..8a010ef820 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.cc +++ b/tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/toco_types.h" namespace toco { bool StrContains(const string& x, const string& search_pattern) { diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h b/tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.h similarity index 82% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h rename to tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.h index b57bded305..9b9c4fc208 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h +++ b/tensorflow/lite/toco/tensorflow_graph_matching/cluster_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_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_UTILS_H_ +#ifndef TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_UTILS_H_ +#define TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_UTILS_H_ #include @@ -30,4 +30,4 @@ void Transpose2DTensor(const float* tensor, int row, int col, } // end namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_UTILS_H_ +#endif // TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_CLUSTER_UTILS_H_ diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.cc b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.cc similarity index 93% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.cc rename to tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.cc index 5e421ba944..7a18751207 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.cc +++ b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.cc @@ -12,16 +12,16 @@ 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/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.h" #include #include #include -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/function.pb.h" #include "tensorflow/core/framework/graph.pb.h" diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.h b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.h similarity index 86% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.h rename to tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.h index 3334552afb..d7afcced7b 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.h +++ b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.h @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_CLUSTER_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_CLUSTER_H_ +#ifndef TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_CLUSTER_H_ +#define TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_CLUSTER_H_ #include #include #include -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/node_def.pb.h" @@ -60,4 +60,4 @@ std::unique_ptr MaybeReplaceCompositeSubgraph( } // end namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_CLUSTER_H_ +#endif // TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_CLUSTER_H_ diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.cc b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.cc similarity index 96% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.cc rename to tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.cc index d6a099817c..fcd9ee45d9 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.cc +++ b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.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/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.h" #include #include @@ -22,11 +22,11 @@ limitations under the License. #include #include "google/protobuf/map.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/graph.pb.h" diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.h b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.h similarity index 85% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.h rename to tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.h index 383fd99dff..649cadfa06 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.h +++ b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.h @@ -12,16 +12,16 @@ 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_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_SVDF_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_SVDF_H_ +#ifndef TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_SVDF_H_ +#define TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_SVDF_H_ #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/node_def.pb.h" @@ -79,4 +79,4 @@ class SvdfClusterFactory : public ClusterFactoryInterface { } // end namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_SVDF_H_ +#endif // TENSORFLOW_LITE_TOCO_TENSORFLOW_GRAPH_MATCHING_RESOLVE_SVDF_H_ diff --git a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf_test.cc b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf_test.cc similarity index 96% rename from tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf_test.cc rename to tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf_test.cc index 646d048496..f66b59ccce 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf_test.cc +++ b/tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf_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/contrib/lite/toco/tensorflow_graph_matching/resolve_svdf.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/resolve_svdf.h" #include #include @@ -20,9 +20,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/cluster_utils.h" -#include "tensorflow/contrib/lite/toco/tensorflow_graph_matching/resolve_cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/cluster_utils.h" +#include "tensorflow/lite/toco/tensorflow_graph_matching/resolve_cluster.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/node_def.pb.h" diff --git a/tensorflow/contrib/lite/toco/tensorflow_util.cc b/tensorflow/lite/toco/tensorflow_util.cc similarity index 97% rename from tensorflow/contrib/lite/toco/tensorflow_util.cc rename to tensorflow/lite/toco/tensorflow_util.cc index 0e7e9c41a0..db9388b040 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_util.cc +++ b/tensorflow/lite/toco/tensorflow_util.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/contrib/lite/toco/tensorflow_util.h" +#include "tensorflow/lite/toco/tensorflow_util.h" #include #include @@ -24,8 +24,8 @@ limitations under the License. #include "google/protobuf/map.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/node_def.pb.h" #include "tensorflow/core/framework/tensor.pb.h" diff --git a/tensorflow/contrib/lite/toco/tensorflow_util.h b/tensorflow/lite/toco/tensorflow_util.h similarity index 81% rename from tensorflow/contrib/lite/toco/tensorflow_util.h rename to tensorflow/lite/toco/tensorflow_util.h index 61f9104268..010fbe88b2 100644 --- a/tensorflow/contrib/lite/toco/tensorflow_util.h +++ b/tensorflow/lite/toco/tensorflow_util.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_UTIL_H_ +#ifndef TENSORFLOW_LITE_TOCO_TENSORFLOW_UTIL_H_ +#define TENSORFLOW_LITE_TOCO_TENSORFLOW_UTIL_H_ #include #include -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/toco/model.h" #include "tensorflow/core/framework/graph.pb.h" #include "tensorflow/core/framework/tensor_shape.pb.h" @@ -29,4 +29,4 @@ void LogDumpGraphDef(int log_level, const string& message, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TENSORFLOW_UTIL_H_ +#endif // TENSORFLOW_LITE_TOCO_TENSORFLOW_UTIL_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/BUILD b/tensorflow/lite/toco/tflite/BUILD similarity index 68% rename from tensorflow/contrib/lite/toco/tflite/BUILD rename to tensorflow/lite/toco/tflite/BUILD index e97bedd203..99c4f8edeb 100644 --- a/tensorflow/contrib/lite/toco/tflite/BUILD +++ b/tensorflow/lite/toco/tflite/BUILD @@ -25,12 +25,12 @@ cc_library( ], deps = [ ":types", - "//tensorflow/contrib/lite/schema:schema_fbs", - "//tensorflow/contrib/lite/toco:graph_transformations", - "//tensorflow/contrib/lite/toco:model", "//tensorflow/core:framework", "//tensorflow/core:protos_all_cc", "//tensorflow/core:ptr_util", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/toco:graph_transformations", + "//tensorflow/lite/toco:model", "@com_google_absl//absl/memory", "@flatbuffers", ], @@ -44,9 +44,9 @@ tf_cc_test( tags = ["no_oss"], deps = [ ":operator", - "//tensorflow/contrib/lite/toco:tooling_util", "//tensorflow/core:ops", "//tensorflow/core:protos_all_cc", + "//tensorflow/lite/toco:tooling_util", "@com_google_googletest//:gtest_main", "@flatbuffers", ], @@ -61,9 +61,9 @@ cc_library( "types.h", ], deps = [ - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/schema:schema_fbs", - "//tensorflow/contrib/lite/toco:model", + "//tensorflow/lite:string_util", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/toco:model", ], ) @@ -92,11 +92,11 @@ cc_library( deps = [ ":operator", ":types", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/schema:schema_fbs", - "//tensorflow/contrib/lite/toco:model", - "//tensorflow/contrib/lite/toco:tooling_util", - "//tensorflow/contrib/lite/tools/optimize:quantize_weights", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/toco:model", + "//tensorflow/lite/toco:tooling_util", + "//tensorflow/lite/tools/optimize:quantize_weights", "@com_google_absl//absl/strings", "@flatbuffers", ], @@ -110,8 +110,8 @@ tf_cc_test( tags = ["no_oss"], deps = [ ":export", - "//tensorflow/contrib/lite/schema:schema_fbs", "//tensorflow/core:ops", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest_main", ], ) @@ -128,11 +128,11 @@ cc_library( deps = [ ":operator", ":types", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/schema:schema_fbs", - "//tensorflow/contrib/lite/toco:model", - "//tensorflow/contrib/lite/toco:tooling_util", - "//tensorflow/contrib/lite/tools:verifier", + "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/toco:model", + "//tensorflow/lite/toco:tooling_util", + "//tensorflow/lite/tools:verifier", "@flatbuffers", ], ) @@ -145,9 +145,9 @@ tf_cc_test( tags = ["no_oss"], deps = [ ":import", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/schema:schema_fbs", "//tensorflow/core:ops", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest_main", "@flatbuffers", ], diff --git a/tensorflow/contrib/lite/toco/tflite/builtin_operator.h b/tensorflow/lite/toco/tflite/builtin_operator.h similarity index 90% rename from tensorflow/contrib/lite/toco/tflite/builtin_operator.h rename to tensorflow/lite/toco/tflite/builtin_operator.h index cfe7ecd9f9..ea012ff6e7 100644 --- a/tensorflow/contrib/lite/toco/tflite/builtin_operator.h +++ b/tensorflow/lite/toco/tflite/builtin_operator.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_CONTRIB_LITE_TOCO_TFLITE_BUILTIN_OPERATOR_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_BUILTIN_OPERATOR_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_BUILTIN_OPERATOR_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_BUILTIN_OPERATOR_H_ #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/operator.h" namespace toco { @@ -71,4 +71,4 @@ class BuiltinOperator : public BaseOperator { } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_BUILTIN_OPERATOR_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_BUILTIN_OPERATOR_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/custom_operator.h b/tensorflow/lite/toco/tflite/custom_operator.h similarity index 90% rename from tensorflow/contrib/lite/toco/tflite/custom_operator.h rename to tensorflow/lite/toco/tflite/custom_operator.h index bd5713618f..2ca740bb90 100644 --- a/tensorflow/contrib/lite/toco/tflite/custom_operator.h +++ b/tensorflow/lite/toco/tflite/custom_operator.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_CONTRIB_LITE_TOCO_TFLITE_CUSTOM_OPERATOR_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_CUSTOM_OPERATOR_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_CUSTOM_OPERATOR_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_CUSTOM_OPERATOR_H_ #include "flatbuffers/flexbuffers.h" #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/operator.h" namespace toco { @@ -71,4 +71,4 @@ class CustomOperator : public BaseOperator { } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_CUSTOM_OPERATOR_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_CUSTOM_OPERATOR_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/export.cc b/tensorflow/lite/toco/tflite/export.cc similarity index 97% rename from tensorflow/contrib/lite/toco/tflite/export.cc rename to tensorflow/lite/toco/tflite/export.cc index 30efd67f8c..13630bea54 100644 --- a/tensorflow/contrib/lite/toco/tflite/export.cc +++ b/tensorflow/lite/toco/tflite/export.cc @@ -12,17 +12,17 @@ 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/contrib/lite/toco/tflite/export.h" +#include "tensorflow/lite/toco/tflite/export.h" #include "flatbuffers/flexbuffers.h" #include "absl/strings/str_join.h" -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/toco/tflite/operator.h" -#include "tensorflow/contrib/lite/toco/tflite/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" -#include "tensorflow/contrib/lite/tools/optimize/quantize_weights.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/types.h" +#include "tensorflow/lite/toco/tooling_util.h" +#include "tensorflow/lite/tools/optimize/quantize_weights.h" +#include "tensorflow/lite/version.h" namespace toco { @@ -494,7 +494,7 @@ tensorflow::Status Export( "TensorFlow. If you have a custom " "implementation for them you can disable this error with " "--allow_custom_ops, or by setting allow_custom_ops=True " - "when calling tf.contrib.lite.TFLiteConverter(). Here is a list " + "when calling tf.lite.TFLiteConverter(). Here is a list " "of builtin operators you are using: ", absl::StrJoin(builtin_ops, ", "), ". Here is a list " @@ -508,10 +508,10 @@ tensorflow::Status Export( "TensorFlow operators, you might be able to use the extended " "runtime by passing --allow_flex_ops, or by setting " "target_ops=TFLITE_BUILTINS,SELECT_TF_OPS when calling " - "tf.contrib.lite.TFLiteConverter(). Otherwise, if you have a " + "tf.lite.TFLiteConverter(). Otherwise, if you have a " "custom implementation for them you can disable this error with " "--allow_custom_ops, or by setting allow_custom_ops=True " - "when calling tf.contrib.lite.TFLiteConverter(). Here is a list " + "when calling tf.lite.TFLiteConverter(). Here is a list " "of builtin operators you are using: ", absl::StrJoin(builtin_ops, ", "), ". Here is a list " diff --git a/tensorflow/contrib/lite/toco/tflite/export.h b/tensorflow/lite/toco/tflite/export.h similarity index 95% rename from tensorflow/contrib/lite/toco/tflite/export.h rename to tensorflow/lite/toco/tflite/export.h index 0a43e01c2e..4dd76daf8d 100644 --- a/tensorflow/contrib/lite/toco/tflite/export.h +++ b/tensorflow/lite/toco/tflite/export.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_CONTRIB_LITE_TOCO_TFLITE_EXPORT_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_EXPORT_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_EXPORT_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_EXPORT_H_ -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tflite/operator.h" -#include "tensorflow/contrib/lite/util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tflite/operator.h" +#include "tensorflow/lite/util.h" namespace toco { @@ -171,4 +171,4 @@ void LoadOperatorsMap( } // namespace tflite } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_EXPORT_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_EXPORT_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/export_test.cc b/tensorflow/lite/toco/tflite/export_test.cc similarity index 98% rename from tensorflow/contrib/lite/toco/tflite/export_test.cc rename to tensorflow/lite/toco/tflite/export_test.cc index f574874064..2787cd07cf 100644 --- a/tensorflow/contrib/lite/toco/tflite/export_test.cc +++ b/tensorflow/lite/toco/tflite/export_test.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/contrib/lite/toco/tflite/export.h" +#include "tensorflow/lite/toco/tflite/export.h" #include #include -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/toco/tflite/builtin_operator.h" -#include "tensorflow/contrib/lite/toco/tflite/operator.h" -#include "tensorflow/contrib/lite/toco/tflite/types.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/toco/tflite/builtin_operator.h" +#include "tensorflow/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/types.h" #include "tensorflow/core/framework/node_def.pb.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/tflite/import.cc b/tensorflow/lite/toco/tflite/import.cc similarity index 95% rename from tensorflow/contrib/lite/toco/tflite/import.cc rename to tensorflow/lite/toco/tflite/import.cc index 1dd4915b31..88028aa144 100644 --- a/tensorflow/contrib/lite/toco/tflite/import.cc +++ b/tensorflow/lite/toco/tflite/import.cc @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/tflite/import.h" +#include "tensorflow/lite/toco/tflite/import.h" #include "flatbuffers/flexbuffers.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/toco/tflite/operator.h" -#include "tensorflow/contrib/lite/toco/tflite/types.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" -#include "tensorflow/contrib/lite/tools/verifier.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/types.h" +#include "tensorflow/lite/toco/tooling_util.h" +#include "tensorflow/lite/tools/verifier.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/tflite/import.h b/tensorflow/lite/toco/tflite/import.h similarity index 84% rename from tensorflow/contrib/lite/toco/tflite/import.h rename to tensorflow/lite/toco/tflite/import.h index 280677bae1..f5de3b53b5 100644 --- a/tensorflow/contrib/lite/toco/tflite/import.h +++ b/tensorflow/lite/toco/tflite/import.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_CONTRIB_LITE_TOCO_TFLITE_IMPORT_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_IMPORT_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_IMPORT_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_IMPORT_H_ -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -46,4 +46,4 @@ void LoadOperatorsTable(const ::tflite::Model &input_model, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_IMPORT_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_IMPORT_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/import_test.cc b/tensorflow/lite/toco/tflite/import_test.cc similarity index 98% rename from tensorflow/contrib/lite/toco/tflite/import_test.cc rename to tensorflow/lite/toco/tflite/import_test.cc index edd22f783f..93ab5141ab 100644 --- a/tensorflow/contrib/lite/toco/tflite/import_test.cc +++ b/tensorflow/lite/toco/tflite/import_test.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/tflite/import.h" +#include "tensorflow/lite/toco/tflite/import.h" #include "flatbuffers/flexbuffers.h" #include #include -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/version.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/tflite/operator.cc b/tensorflow/lite/toco/tflite/operator.cc similarity index 99% rename from tensorflow/contrib/lite/toco/tflite/operator.cc rename to tensorflow/lite/toco/tflite/operator.cc index 0f4ea5cd21..4f53ba9bf9 100644 --- a/tensorflow/contrib/lite/toco/tflite/operator.cc +++ b/tensorflow/lite/toco/tflite/operator.cc @@ -12,16 +12,16 @@ 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/contrib/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/operator.h" // TODO(ycling): Consider refactoring to extract the LSTM definition out of // graph_transformation module. -#include "tensorflow/contrib/lite/toco/graph_transformations/lstm_utils.h" -#include "tensorflow/contrib/lite/toco/tflite/builtin_operator.h" -#include "tensorflow/contrib/lite/toco/tflite/custom_operator.h" -#include "tensorflow/contrib/lite/toco/tflite/simple_operator.h" -#include "tensorflow/contrib/lite/toco/tflite/types.h" -#include "tensorflow/contrib/lite/toco/tflite/whitelisted_flex_ops.h" +#include "tensorflow/lite/toco/graph_transformations/lstm_utils.h" +#include "tensorflow/lite/toco/tflite/builtin_operator.h" +#include "tensorflow/lite/toco/tflite/custom_operator.h" +#include "tensorflow/lite/toco/tflite/simple_operator.h" +#include "tensorflow/lite/toco/tflite/types.h" +#include "tensorflow/lite/toco/tflite/whitelisted_flex_ops.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/node_def.pb.h" #include "tensorflow/core/framework/op.h" diff --git a/tensorflow/contrib/lite/toco/tflite/operator.h b/tensorflow/lite/toco/tflite/operator.h similarity index 94% rename from tensorflow/contrib/lite/toco/tflite/operator.h rename to tensorflow/lite/toco/tflite/operator.h index 6e2a41bf53..43f533cd47 100644 --- a/tensorflow/contrib/lite/toco/tflite/operator.h +++ b/tensorflow/lite/toco/tflite/operator.h @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_OPERATOR_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_OPERATOR_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_OPERATOR_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_OPERATOR_H_ #include "flatbuffers/flatbuffers.h" #include "flatbuffers/flexbuffers.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -122,4 +122,4 @@ bool ShouldExportAsFlexOp(bool allow_flex_ops, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_OPERATOR_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_OPERATOR_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/operator_test.cc b/tensorflow/lite/toco/tflite/operator_test.cc similarity index 99% rename from tensorflow/contrib/lite/toco/tflite/operator_test.cc rename to tensorflow/lite/toco/tflite/operator_test.cc index 37a0ad2d1d..8a776cbf0b 100644 --- a/tensorflow/contrib/lite/toco/tflite/operator_test.cc +++ b/tensorflow/lite/toco/tflite/operator_test.cc @@ -12,13 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/operator.h" #include "flatbuffers/flexbuffers.h" #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/framework/node_def.pb.h" diff --git a/tensorflow/contrib/lite/toco/tflite/simple_operator.h b/tensorflow/lite/toco/tflite/simple_operator.h similarity index 86% rename from tensorflow/contrib/lite/toco/tflite/simple_operator.h rename to tensorflow/lite/toco/tflite/simple_operator.h index a7f7e886f6..e3e4c8551e 100644 --- a/tensorflow/contrib/lite/toco/tflite/simple_operator.h +++ b/tensorflow/lite/toco/tflite/simple_operator.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_CONTRIB_LITE_TOCO_TFLITE_SIMPLE_OPERATOR_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_SIMPLE_OPERATOR_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_SIMPLE_OPERATOR_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_SIMPLE_OPERATOR_H_ -#include "tensorflow/contrib/lite/toco/tflite/operator.h" +#include "tensorflow/lite/toco/tflite/operator.h" namespace toco { @@ -49,4 +49,4 @@ class SimpleOperator : public BaseOperator { } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_SIMPLE_OPERATOR_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_SIMPLE_OPERATOR_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/types.cc b/tensorflow/lite/toco/tflite/types.cc similarity index 98% rename from tensorflow/contrib/lite/toco/tflite/types.cc rename to tensorflow/lite/toco/tflite/types.cc index 754f0b4b8c..f878dafc1e 100644 --- a/tensorflow/contrib/lite/toco/tflite/types.cc +++ b/tensorflow/lite/toco/tflite/types.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/tflite/types.h" -#include "tensorflow/contrib/lite/string_util.h" +#include "tensorflow/lite/toco/tflite/types.h" +#include "tensorflow/lite/string_util.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/tflite/types.h b/tensorflow/lite/toco/tflite/types.h similarity index 87% rename from tensorflow/contrib/lite/toco/tflite/types.h rename to tensorflow/lite/toco/tflite/types.h index 3923756fc9..bc2edb7429 100644 --- a/tensorflow/contrib/lite/toco/tflite/types.h +++ b/tensorflow/lite/toco/tflite/types.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_CONTRIB_LITE_TOCO_TFLITE_TYPES_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_TYPES_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_TYPES_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_TYPES_H_ -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/toco/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/toco/model.h" namespace toco { @@ -55,4 +55,4 @@ struct ActivationFunction { } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_TYPES_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_TYPES_H_ diff --git a/tensorflow/contrib/lite/toco/tflite/types_test.cc b/tensorflow/lite/toco/tflite/types_test.cc similarity index 99% rename from tensorflow/contrib/lite/toco/tflite/types_test.cc rename to tensorflow/lite/toco/tflite/types_test.cc index 8e9f30ba3a..efa2911b5b 100644 --- a/tensorflow/contrib/lite/toco/tflite/types_test.cc +++ b/tensorflow/lite/toco/tflite/types_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/contrib/lite/toco/tflite/types.h" +#include "tensorflow/lite/toco/tflite/types.h" #include diff --git a/tensorflow/contrib/lite/toco/tflite/whitelisted_flex_ops.cc b/tensorflow/lite/toco/tflite/whitelisted_flex_ops.cc similarity index 99% rename from tensorflow/contrib/lite/toco/tflite/whitelisted_flex_ops.cc rename to tensorflow/lite/toco/tflite/whitelisted_flex_ops.cc index d605a006be..221e9b8e34 100644 --- a/tensorflow/contrib/lite/toco/tflite/whitelisted_flex_ops.cc +++ b/tensorflow/lite/toco/tflite/whitelisted_flex_ops.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/contrib/lite/toco/tflite/whitelisted_flex_ops.h" +#include "tensorflow/lite/toco/tflite/whitelisted_flex_ops.h" #include diff --git a/tensorflow/contrib/lite/toco/tflite/whitelisted_flex_ops.h b/tensorflow/lite/toco/tflite/whitelisted_flex_ops.h similarity index 86% rename from tensorflow/contrib/lite/toco/tflite/whitelisted_flex_ops.h rename to tensorflow/lite/toco/tflite/whitelisted_flex_ops.h index ed2435fbe0..2559a70528 100644 --- a/tensorflow/contrib/lite/toco/tflite/whitelisted_flex_ops.h +++ b/tensorflow/lite/toco/tflite/whitelisted_flex_ops.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_CONTRIB_LITE_TOCO_TFLITE_WHITELISTED_FLEX_OPS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_WHITELISTED_FLEX_OPS_H_ +#ifndef TENSORFLOW_LITE_TOCO_TFLITE_WHITELISTED_FLEX_OPS_H_ +#define TENSORFLOW_LITE_TOCO_TFLITE_WHITELISTED_FLEX_OPS_H_ #include @@ -32,4 +32,4 @@ bool IsWhitelistedFlexOp(const std::string& tensorflow_op_name); } // namespace tflite } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TFLITE_WHITELISTED_FLEX_OPS_H_ +#endif // TENSORFLOW_LITE_TOCO_TFLITE_WHITELISTED_FLEX_OPS_H_ diff --git a/tensorflow/contrib/lite/toco/toco.cc b/tensorflow/lite/toco/toco.cc similarity index 90% rename from tensorflow/contrib/lite/toco/toco.cc rename to tensorflow/lite/toco/toco.cc index d1c4312785..9740015850 100644 --- a/tensorflow/contrib/lite/toco/toco.cc +++ b/tensorflow/lite/toco/toco.cc @@ -17,14 +17,14 @@ limitations under the License. #include #include "absl/strings/string_view.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_cmdline_flags.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/toco_cmdline_flags.h" -#include "tensorflow/contrib/lite/toco/toco_flags.pb.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/toco_tooling.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_cmdline_flags.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/toco_cmdline_flags.h" +#include "tensorflow/lite/toco/toco_flags.pb.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_tooling.h" +#include "tensorflow/lite/toco/toco_types.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/platform/logging.h" @@ -60,7 +60,7 @@ void ReadInputData(const ParsedTocoFlags& parsed_toco_flags, // Ensure savedmodel_directory is not set. QCHECK(!parsed_toco_flags.savedmodel_directory.specified()) - << "Use `tensorflow/contrib/lite/python/tflite_convert` script with " + << "Use `tensorflow/lite/python/tflite_convert` script with " << "SavedModel directories.\n"; // Checks the input file permissions and reads the contents. diff --git a/tensorflow/contrib/lite/toco/toco_cmdline_flags.cc b/tensorflow/lite/toco/toco_cmdline_flags.cc similarity index 99% rename from tensorflow/contrib/lite/toco/toco_cmdline_flags.cc rename to tensorflow/lite/toco/toco_cmdline_flags.cc index cff79776bc..57d49fc220 100644 --- a/tensorflow/contrib/lite/toco/toco_cmdline_flags.cc +++ b/tensorflow/lite/toco/toco_cmdline_flags.cc @@ -21,8 +21,8 @@ limitations under the License. #include "absl/strings/str_split.h" #include "absl/strings/strip.h" #include "absl/types/optional.h" -#include "tensorflow/contrib/lite/toco/toco_cmdline_flags.h" -#include "tensorflow/contrib/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_cmdline_flags.h" +#include "tensorflow/lite/toco/toco_port.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/util/command_line_flags.h" diff --git a/tensorflow/contrib/lite/toco/toco_cmdline_flags.h b/tensorflow/lite/toco/toco_cmdline_flags.h similarity index 79% rename from tensorflow/contrib/lite/toco/toco_cmdline_flags.h rename to tensorflow/lite/toco/toco_cmdline_flags.h index 46eb3f5728..cf57055abc 100644 --- a/tensorflow/contrib/lite/toco/toco_cmdline_flags.h +++ b/tensorflow/lite/toco/toco_cmdline_flags.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_CONTRIB_LITE_TOCO_TOCO_CMDLINE_FLAGS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_CMDLINE_FLAGS_H_ +#ifndef TENSORFLOW_LITE_TOCO_TOCO_CMDLINE_FLAGS_H_ +#define TENSORFLOW_LITE_TOCO_TOCO_CMDLINE_FLAGS_H_ #include #include -#include "tensorflow/contrib/lite/toco/args.h" -#include "tensorflow/contrib/lite/toco/toco_flags.pb.h" -#include "tensorflow/contrib/lite/toco/types.pb.h" +#include "tensorflow/lite/toco/args.h" +#include "tensorflow/lite/toco/toco_flags.pb.h" +#include "tensorflow/lite/toco/types.pb.h" namespace toco { // Parse and remove arguments handled from toco. Returns true if parsing @@ -33,4 +33,4 @@ void ReadTocoFlagsFromCommandLineFlags(const ParsedTocoFlags& parsed_toco_flags, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_CMDLINE_FLAGS_H_ +#endif // TENSORFLOW_LITE_TOCO_TOCO_CMDLINE_FLAGS_H_ diff --git a/tensorflow/contrib/lite/toco/toco_flags.proto b/tensorflow/lite/toco/toco_flags.proto similarity index 99% rename from tensorflow/contrib/lite/toco/toco_flags.proto rename to tensorflow/lite/toco/toco_flags.proto index ca3e64485e..708707be91 100644 --- a/tensorflow/contrib/lite/toco/toco_flags.proto +++ b/tensorflow/lite/toco/toco_flags.proto @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. syntax = "proto2"; -import "tensorflow/contrib/lite/toco/types.proto"; +import "tensorflow/lite/toco/types.proto"; package toco; diff --git a/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.cc b/tensorflow/lite/toco/toco_graphviz_dump_options.cc similarity index 92% rename from tensorflow/contrib/lite/toco/toco_graphviz_dump_options.cc rename to tensorflow/lite/toco/toco_graphviz_dump_options.cc index 4e98e7081d..449f0f07ce 100644 --- a/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.cc +++ b/tensorflow/lite/toco/toco_graphviz_dump_options.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/contrib/lite/toco/toco_graphviz_dump_options.h" +#include "tensorflow/lite/toco/toco_graphviz_dump_options.h" namespace toco { GraphVizDumpOptions* GraphVizDumpOptions::singleton() { diff --git a/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h b/tensorflow/lite/toco/toco_graphviz_dump_options.h similarity index 82% rename from tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h rename to tensorflow/lite/toco/toco_graphviz_dump_options.h index 7cdd55e542..00d9cd13a6 100644 --- a/tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h +++ b/tensorflow/lite/toco/toco_graphviz_dump_options.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_CONTRIB_LITE_TOCO_TOCO_GRAPHVIZ_DUMP_OPTIONS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_GRAPHVIZ_DUMP_OPTIONS_H_ +#ifndef TENSORFLOW_LITE_TOCO_TOCO_GRAPHVIZ_DUMP_OPTIONS_H_ +#define TENSORFLOW_LITE_TOCO_TOCO_GRAPHVIZ_DUMP_OPTIONS_H_ #include @@ -29,4 +29,4 @@ struct GraphVizDumpOptions { } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_GRAPHVIZ_DUMP_OPTIONS_H_ +#endif // TENSORFLOW_LITE_TOCO_TOCO_GRAPHVIZ_DUMP_OPTIONS_H_ diff --git a/tensorflow/contrib/lite/toco/toco_port.cc b/tensorflow/lite/toco/toco_port.cc similarity index 98% rename from tensorflow/contrib/lite/toco/toco_port.cc rename to tensorflow/lite/toco/toco_port.cc index 204c0d101e..0881065a23 100644 --- a/tensorflow/contrib/lite/toco/toco_port.cc +++ b/tensorflow/lite/toco/toco_port.cc @@ -14,8 +14,8 @@ limitations under the License. ==============================================================================*/ #include -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_types.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/platform/logging.h" diff --git a/tensorflow/contrib/lite/toco/toco_port.h b/tensorflow/lite/toco/toco_port.h similarity index 94% rename from tensorflow/contrib/lite/toco/toco_port.h rename to tensorflow/lite/toco/toco_port.h index 17f82b9dd7..2f39e3d6d5 100644 --- a/tensorflow/contrib/lite/toco/toco_port.h +++ b/tensorflow/lite/toco/toco_port.h @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_PORT_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_PORT_H_ +#ifndef TENSORFLOW_LITE_TOCO_TOCO_PORT_H_ +#define TENSORFLOW_LITE_TOCO_TOCO_PORT_H_ // Portability layer for toco tool. Mainly, abstract filesystem access so we // can build and use on google internal environments and on OSX. #include #include "google/protobuf/text_format.h" -#include "tensorflow/contrib/lite/toco/format_port.h" +#include "tensorflow/lite/toco/format_port.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/platform/logging.h" #include "tensorflow/core/platform/platform.h" @@ -110,4 +110,4 @@ bool ParseFromStringEitherTextOrBinary(const std::string& input_file_contents, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_PORT_H_ +#endif // TENSORFLOW_LITE_TOCO_TOCO_PORT_H_ diff --git a/tensorflow/contrib/lite/toco/toco_port_test.cc b/tensorflow/lite/toco/toco_port_test.cc similarity index 88% rename from tensorflow/contrib/lite/toco/toco_port_test.cc rename to tensorflow/lite/toco/toco_port_test.cc index 650a617aeb..f5fbb4caeb 100644 --- a/tensorflow/contrib/lite/toco/toco_port_test.cc +++ b/tensorflow/lite/toco/toco_port_test.cc @@ -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. ==============================================================================*/ -#include "tensorflow/contrib/lite/toco/toco_port.h" -#include "tensorflow/contrib/lite/toco/toco_types.h" +#include "tensorflow/lite/toco/toco_port.h" +#include "tensorflow/lite/toco/toco_types.h" #include #include @@ -23,9 +23,9 @@ namespace port { namespace { #ifdef PLATFORM_GOOGLE -#define TFLITE_PREFIX "third_party/tensorflow/contrib/lite/" +#define TFLITE_PREFIX "third_party/tensorflow/lite/" #else -#define TFLITE_PREFIX "tensorflow/contrib/lite/" +#define TFLITE_PREFIX "tensorflow/lite/" #endif TEST(TocoPortTest, Exists) { diff --git a/tensorflow/contrib/lite/toco/toco_tooling.cc b/tensorflow/lite/toco/toco_tooling.cc similarity index 96% rename from tensorflow/contrib/lite/toco/toco_tooling.cc rename to tensorflow/lite/toco/toco_tooling.cc index c4eacf836e..88ff07ad13 100644 --- a/tensorflow/contrib/lite/toco/toco_tooling.cc +++ b/tensorflow/lite/toco/toco_tooling.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/contrib/lite/toco/toco_tooling.h" +#include "tensorflow/lite/toco/toco_tooling.h" #include #include @@ -20,16 +20,16 @@ limitations under the License. #include "absl/memory/memory.h" #include "absl/strings/str_join.h" -#include "tensorflow/contrib/lite/toco/allocate_transient_arrays.h" -#include "tensorflow/contrib/lite/toco/dump_graphviz.h" -#include "tensorflow/contrib/lite/toco/export_tensorflow.h" -#include "tensorflow/contrib/lite/toco/graph_transformations/graph_transformations.h" -#include "tensorflow/contrib/lite/toco/import_tensorflow.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tflite/export.h" -#include "tensorflow/contrib/lite/toco/tflite/import.h" -#include "tensorflow/contrib/lite/toco/toco_flags.pb.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/allocate_transient_arrays.h" +#include "tensorflow/lite/toco/dump_graphviz.h" +#include "tensorflow/lite/toco/export_tensorflow.h" +#include "tensorflow/lite/toco/graph_transformations/graph_transformations.h" +#include "tensorflow/lite/toco/import_tensorflow.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/tflite/export.h" +#include "tensorflow/lite/toco/tflite/import.h" +#include "tensorflow/lite/toco/toco_flags.pb.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/platform/logging.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/toco_tooling.h b/tensorflow/lite/toco/toco_tooling.h similarity index 84% rename from tensorflow/contrib/lite/toco/toco_tooling.h rename to tensorflow/lite/toco/toco_tooling.h index 40c0e7f0a3..742e376926 100644 --- a/tensorflow/contrib/lite/toco/toco_tooling.h +++ b/tensorflow/lite/toco/toco_tooling.h @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_TOOLING_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_TOOLING_H_ +#ifndef TENSORFLOW_LITE_TOCO_TOCO_TOOLING_H_ +#define TENSORFLOW_LITE_TOCO_TOCO_TOOLING_H_ #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/toco_flags.pb.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/toco_flags.pb.h" namespace toco { @@ -50,4 +50,4 @@ inline void Export(const TocoFlags& toco_flags, const Model& model, } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_TOOLING_H_ +#endif // TENSORFLOW_LITE_TOCO_TOCO_TOOLING_H_ diff --git a/tensorflow/contrib/lite/toco/toco_types.h b/tensorflow/lite/toco/toco_types.h similarity index 88% rename from tensorflow/contrib/lite/toco/toco_types.h rename to tensorflow/lite/toco/toco_types.h index 319f1066cd..da2efd6724 100644 --- a/tensorflow/contrib/lite/toco/toco_types.h +++ b/tensorflow/lite/toco/toco_types.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_CONTRIB_LITE_TOCO_TOCO_TYPES_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_TYPES_H_ +#ifndef TENSORFLOW_LITE_TOCO_TOCO_TYPES_H_ +#define TENSORFLOW_LITE_TOCO_TOCO_TYPES_H_ #include #include "tensorflow/core/platform/platform.h" @@ -42,4 +42,4 @@ using tensorflow::uint8; } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TOCO_TYPES_H_ +#endif // TENSORFLOW_LITE_TOCO_TOCO_TYPES_H_ diff --git a/tensorflow/contrib/lite/toco/tooling_util.cc b/tensorflow/lite/toco/tooling_util.cc similarity index 99% rename from tensorflow/contrib/lite/toco/tooling_util.cc rename to tensorflow/lite/toco/tooling_util.cc index 2d6968239e..e33f7c8452 100644 --- a/tensorflow/contrib/lite/toco/tooling_util.cc +++ b/tensorflow/lite/toco/tooling_util.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/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/tooling_util.h" #include #include @@ -27,9 +27,9 @@ limitations under the License. #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" #include "re2/re2.h" -#include "tensorflow/contrib/lite/toco/dump_graphviz.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/toco_graphviz_dump_options.h" +#include "tensorflow/lite/toco/dump_graphviz.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/toco_graphviz_dump_options.h" #include "tensorflow/core/lib/core/status.h" #include "tensorflow/core/platform/logging.h" diff --git a/tensorflow/contrib/lite/toco/tooling_util.h b/tensorflow/lite/toco/tooling_util.h similarity index 96% rename from tensorflow/contrib/lite/toco/tooling_util.h rename to tensorflow/lite/toco/tooling_util.h index 5f4b8cb66a..92ce82632f 100644 --- a/tensorflow/contrib/lite/toco/tooling_util.h +++ b/tensorflow/lite/toco/tooling_util.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_CONTRIB_LITE_TOCO_TOOLING_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_TOCO_TOOLING_UTIL_H_ +#ifndef TENSORFLOW_LITE_TOCO_TOOLING_UTIL_H_ +#define TENSORFLOW_LITE_TOCO_TOOLING_UTIL_H_ #include #include @@ -28,12 +28,12 @@ limitations under the License. #if TOCO_SUPPORT_PORTABLE_PROTOS #include "third_party/protobuf/include/google/protobuf/text_format.h" #endif // TOCO_SUPPORT_PORTABLE_PROTOS -#include "tensorflow/contrib/lite/kernels/internal/types.h" -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/model_flags.pb.h" -#include "tensorflow/contrib/lite/toco/runtime/types.h" -#include "tensorflow/contrib/lite/toco/toco_flags.pb.h" -#include "tensorflow/contrib/lite/toco/types.pb.h" +#include "tensorflow/lite/kernels/internal/types.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/model_flags.pb.h" +#include "tensorflow/lite/toco/runtime/types.h" +#include "tensorflow/lite/toco/toco_flags.pb.h" +#include "tensorflow/lite/toco/types.pb.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/status.h" @@ -358,4 +358,4 @@ void CopyMinMaxAndQuantizationRelatedFields(const Array& src, Array* dst); } // namespace toco -#endif // TENSORFLOW_CONTRIB_LITE_TOCO_TOOLING_UTIL_H_ +#endif // TENSORFLOW_LITE_TOCO_TOOLING_UTIL_H_ diff --git a/tensorflow/contrib/lite/toco/tooling_util_test.cc b/tensorflow/lite/toco/tooling_util_test.cc similarity index 98% rename from tensorflow/contrib/lite/toco/tooling_util_test.cc rename to tensorflow/lite/toco/tooling_util_test.cc index eb495646a2..e3826cb8fd 100644 --- a/tensorflow/contrib/lite/toco/tooling_util_test.cc +++ b/tensorflow/lite/toco/tooling_util_test.cc @@ -16,8 +16,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/toco/model.h" -#include "tensorflow/contrib/lite/toco/tooling_util.h" +#include "tensorflow/lite/toco/model.h" +#include "tensorflow/lite/toco/tooling_util.h" #include "tensorflow/core/lib/core/status.h" namespace toco { diff --git a/tensorflow/contrib/lite/toco/types.proto b/tensorflow/lite/toco/types.proto similarity index 100% rename from tensorflow/contrib/lite/toco/types.proto rename to tensorflow/lite/toco/types.proto diff --git a/tensorflow/contrib/lite/tools/BUILD b/tensorflow/lite/tools/BUILD similarity index 60% rename from tensorflow/contrib/lite/tools/BUILD rename to tensorflow/lite/tools/BUILD index 0b26826403..93725b5de4 100644 --- a/tensorflow/contrib/lite/tools/BUILD +++ b/tensorflow/lite/tools/BUILD @@ -4,7 +4,7 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") load("//tensorflow:tensorflow.bzl", "tf_cc_binary") common_copts = ["-Wall"] @@ -13,7 +13,7 @@ py_binary( name = "visualize", srcs = ["visualize.py"], data = [ - "//tensorflow/contrib/lite/schema:schema.fbs", + "//tensorflow/lite/schema:schema.fbs", "//tensorflow/python:platform", "@flatbuffers//:flatc", ], @@ -24,9 +24,9 @@ tf_cc_binary( name = "generate_op_registrations", srcs = ["gen_op_registration_main.cc"], deps = [ - "//tensorflow/contrib/lite/tools:gen_op_registration", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", + "//tensorflow/lite/tools:gen_op_registration", "@com_google_absl//absl/strings", ], ) @@ -36,8 +36,8 @@ cc_library( srcs = ["gen_op_registration.cc"], hdrs = ["gen_op_registration.h"], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string", + "//tensorflow/lite:framework", + "//tensorflow/lite:string", "@com_googlesource_code_re2//:re2", ], ) @@ -46,11 +46,11 @@ cc_test( name = "gen_op_registration_test", srcs = ["gen_op_registration_test.cc"], data = [ - "//tensorflow/contrib/lite:testdata/0_subgraphs.bin", - "//tensorflow/contrib/lite:testdata/2_subgraphs.bin", - "//tensorflow/contrib/lite:testdata/empty_model.bin", - "//tensorflow/contrib/lite:testdata/test_model.bin", - "//tensorflow/contrib/lite:testdata/test_model_broken.bin", + "//tensorflow/lite:testdata/0_subgraphs.bin", + "//tensorflow/lite:testdata/2_subgraphs.bin", + "//tensorflow/lite:testdata/empty_model.bin", + "//tensorflow/lite:testdata/test_model.bin", + "//tensorflow/lite:testdata/test_model_broken.bin", ], tags = [ "no_oss", @@ -68,10 +68,10 @@ cc_library( srcs = ["verifier.cc"], hdrs = ["verifier.h"], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/schema:schema_fbs", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite:string_util", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -85,11 +85,11 @@ cc_test( ], deps = [ ":verifier", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:schema_fbs_version", - "//tensorflow/contrib/lite/schema:schema_fbs", - "//tensorflow/contrib/lite/testing:util", "//tensorflow/core:framework_lite", + "//tensorflow/lite:framework", + "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", "@flatbuffers", ], diff --git a/tensorflow/contrib/lite/tools/accuracy/BUILD b/tensorflow/lite/tools/accuracy/BUILD similarity index 92% rename from tensorflow/contrib/lite/tools/accuracy/BUILD rename to tensorflow/lite/tools/accuracy/BUILD index 1b60d6a60d..64475e057a 100644 --- a/tensorflow/contrib/lite/tools/accuracy/BUILD +++ b/tensorflow/lite/tools/accuracy/BUILD @@ -5,8 +5,8 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") common_linkopts = tflite_linkopts() + select({ "//conditions:default": [], @@ -22,8 +22,8 @@ cc_library( hdrs = ["utils.h"], copts = tflite_copts(), deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", ] + select( { "//tensorflow:android": [ @@ -40,9 +40,9 @@ tf_cc_test( name = "utils_test", srcs = ["utils_test.cc"], args = [ - "--test_model_file=$(location //tensorflow/contrib/lite:testdata/multi_add.bin)", + "--test_model_file=$(location //tensorflow/lite:testdata/multi_add.bin)", ], - data = ["//tensorflow/contrib/lite:testdata/multi_add.bin"], + data = ["//tensorflow/lite:testdata/multi_add.bin"], linkopts = common_linkopts, linkstatic = 1, tags = [ @@ -72,8 +72,8 @@ cc_library( copts = tflite_copts(), deps = [ ":utils", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels:builtin_ops", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels:builtin_ops", ] + select( { "//tensorflow:android": [ @@ -102,9 +102,9 @@ tf_cc_test( name = "run_tflite_model_op_test", srcs = ["run_tflite_model_op_test.cc"], args = [ - "--test_model_file=$(location //tensorflow/contrib/lite:testdata/multi_add.bin)", + "--test_model_file=$(location //tensorflow/lite:testdata/multi_add.bin)", ], - data = ["//tensorflow/contrib/lite:testdata/multi_add.bin"], + data = ["//tensorflow/lite:testdata/multi_add.bin"], linkopts = common_linkopts, linkstatic = 1, tags = [ diff --git a/tensorflow/contrib/lite/tools/accuracy/README.md b/tensorflow/lite/tools/accuracy/README.md similarity index 100% rename from tensorflow/contrib/lite/tools/accuracy/README.md rename to tensorflow/lite/tools/accuracy/README.md diff --git a/tensorflow/contrib/lite/tools/accuracy/accuracy_eval_stage.h b/tensorflow/lite/tools/accuracy/accuracy_eval_stage.h similarity index 88% rename from tensorflow/contrib/lite/tools/accuracy/accuracy_eval_stage.h rename to tensorflow/lite/tools/accuracy/accuracy_eval_stage.h index 9cb843729a..5a2ba3d2a7 100644 --- a/tensorflow/contrib/lite/tools/accuracy/accuracy_eval_stage.h +++ b/tensorflow/lite/tools/accuracy/accuracy_eval_stage.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_ACCURACY_EVAL_STAGE_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_ACCURACY_EVAL_STAGE_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_ACCURACY_EVAL_STAGE_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_ACCURACY_EVAL_STAGE_H_ #include @@ -46,4 +46,4 @@ class AccuracyEval { }; } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_ACCURACY_EVAL_STAGE_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_ACCURACY_EVAL_STAGE_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/android_required_build_flags.cc b/tensorflow/lite/tools/accuracy/android_required_build_flags.cc similarity index 100% rename from tensorflow/contrib/lite/tools/accuracy/android_required_build_flags.cc rename to tensorflow/lite/tools/accuracy/android_required_build_flags.cc diff --git a/tensorflow/contrib/lite/tools/accuracy/csv_writer.h b/tensorflow/lite/tools/accuracy/csv_writer.h similarity index 92% rename from tensorflow/contrib/lite/tools/accuracy/csv_writer.h rename to tensorflow/lite/tools/accuracy/csv_writer.h index 806b0d9418..d74a803ce1 100644 --- a/tensorflow/contrib/lite/tools/accuracy/csv_writer.h +++ b/tensorflow/lite/tools/accuracy/csv_writer.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_CSV_WRITER_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_CSV_WRITER_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_CSV_WRITER_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_CSV_WRITER_H_ #include #include @@ -76,4 +76,4 @@ class CSVWriter { }; } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_CSV_WRITER_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_CSV_WRITER_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline.cc b/tensorflow/lite/tools/accuracy/eval_pipeline.cc similarity index 95% rename from tensorflow/contrib/lite/tools/accuracy/eval_pipeline.cc rename to tensorflow/lite/tools/accuracy/eval_pipeline.cc index a03aba6a26..658824a7d0 100644 --- a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline.cc +++ b/tensorflow/lite/tools/accuracy/eval_pipeline.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/eval_pipeline.h" +#include "tensorflow/lite/tools/accuracy/eval_pipeline.h" namespace tensorflow { namespace metrics { diff --git a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline.h b/tensorflow/lite/tools/accuracy/eval_pipeline.h similarity index 89% rename from tensorflow/contrib/lite/tools/accuracy/eval_pipeline.h rename to tensorflow/lite/tools/accuracy/eval_pipeline.h index c9cfc86613..1ec21b07e8 100644 --- a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline.h +++ b/tensorflow/lite/tools/accuracy/eval_pipeline.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_H_ #include -#include "tensorflow/contrib/lite/tools/accuracy/accuracy_eval_stage.h" -#include "tensorflow/contrib/lite/tools/accuracy/stage.h" +#include "tensorflow/lite/tools/accuracy/accuracy_eval_stage.h" +#include "tensorflow/lite/tools/accuracy/stage.h" #include "tensorflow/core/public/session.h" namespace tensorflow { @@ -84,4 +84,4 @@ class EvalPipeline { }; } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.cc b/tensorflow/lite/tools/accuracy/eval_pipeline_builder.cc similarity index 97% rename from tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.cc rename to tensorflow/lite/tools/accuracy/eval_pipeline_builder.cc index 2e16437e15..1b360d31b3 100644 --- a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.cc +++ b/tensorflow/lite/tools/accuracy/eval_pipeline_builder.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.h" +#include "tensorflow/lite/tools/accuracy/eval_pipeline_builder.h" #include "absl/memory/memory.h" #include "tensorflow/cc/ops/standard_ops.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.h b/tensorflow/lite/tools/accuracy/eval_pipeline_builder.h similarity index 89% rename from tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.h rename to tensorflow/lite/tools/accuracy/eval_pipeline_builder.h index 692db022f8..18b52ac7be 100644 --- a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.h +++ b/tensorflow/lite/tools/accuracy/eval_pipeline_builder.h @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_BUILDER_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_BUILDER_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_BUILDER_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_BUILDER_H_ #include #include -#include "tensorflow/contrib/lite/tools/accuracy/accuracy_eval_stage.h" -#include "tensorflow/contrib/lite/tools/accuracy/eval_pipeline.h" -#include "tensorflow/contrib/lite/tools/accuracy/stage.h" +#include "tensorflow/lite/tools/accuracy/accuracy_eval_stage.h" +#include "tensorflow/lite/tools/accuracy/eval_pipeline.h" +#include "tensorflow/lite/tools/accuracy/stage.h" namespace tensorflow { namespace metrics { @@ -96,4 +96,4 @@ class EvalPipelineBuilder { } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_BUILDER_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_EVAL_PIPELINE_BUILDER_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder_test.cc b/tensorflow/lite/tools/accuracy/eval_pipeline_builder_test.cc similarity index 99% rename from tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder_test.cc rename to tensorflow/lite/tools/accuracy/eval_pipeline_builder_test.cc index 2d41929b79..9bf725439c 100644 --- a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder_test.cc +++ b/tensorflow/lite/tools/accuracy/eval_pipeline_builder_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.h" +#include "tensorflow/lite/tools/accuracy/eval_pipeline_builder.h" #include #include "tensorflow/cc/ops/standard_ops.h" #include "tensorflow/core/public/session.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_test.cc b/tensorflow/lite/tools/accuracy/eval_pipeline_test.cc similarity index 98% rename from tensorflow/contrib/lite/tools/accuracy/eval_pipeline_test.cc rename to tensorflow/lite/tools/accuracy/eval_pipeline_test.cc index ea0f6e19df..53cbf8ccd5 100644 --- a/tensorflow/contrib/lite/tools/accuracy/eval_pipeline_test.cc +++ b/tensorflow/lite/tools/accuracy/eval_pipeline_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/eval_pipeline.h" +#include "tensorflow/lite/tools/accuracy/eval_pipeline.h" #include #include "tensorflow/cc/ops/standard_ops.h" #include "tensorflow/core/public/session.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/file_reader_stage.cc b/tensorflow/lite/tools/accuracy/file_reader_stage.cc similarity index 93% rename from tensorflow/contrib/lite/tools/accuracy/file_reader_stage.cc rename to tensorflow/lite/tools/accuracy/file_reader_stage.cc index 61bed369f8..a106a79a4b 100644 --- a/tensorflow/contrib/lite/tools/accuracy/file_reader_stage.cc +++ b/tensorflow/lite/tools/accuracy/file_reader_stage.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/file_reader_stage.h" +#include "tensorflow/lite/tools/accuracy/file_reader_stage.h" #include "tensorflow/cc/framework/scope.h" #include "tensorflow/cc/ops/standard_ops.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/file_reader_stage.h b/tensorflow/lite/tools/accuracy/file_reader_stage.h similarity index 81% rename from tensorflow/contrib/lite/tools/accuracy/file_reader_stage.h rename to tensorflow/lite/tools/accuracy/file_reader_stage.h index 18db5837c1..19655e9697 100644 --- a/tensorflow/contrib/lite/tools/accuracy/file_reader_stage.h +++ b/tensorflow/lite/tools/accuracy/file_reader_stage.h @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_FILE_READER_STAGE_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_FILE_READER_STAGE_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_FILE_READER_STAGE_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_FILE_READER_STAGE_H_ #include -#include "tensorflow/contrib/lite/tools/accuracy/stage.h" +#include "tensorflow/lite/tools/accuracy/stage.h" namespace tensorflow { namespace metrics { @@ -34,4 +34,4 @@ class FileReaderStage : public Stage { }; } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_FILE_READER_STAGE_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_FILE_READER_STAGE_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/file_reader_stage_test.cc b/tensorflow/lite/tools/accuracy/file_reader_stage_test.cc similarity index 97% rename from tensorflow/contrib/lite/tools/accuracy/file_reader_stage_test.cc rename to tensorflow/lite/tools/accuracy/file_reader_stage_test.cc index a75f99187d..21be0a766b 100644 --- a/tensorflow/contrib/lite/tools/accuracy/file_reader_stage_test.cc +++ b/tensorflow/lite/tools/accuracy/file_reader_stage_test.cc @@ -18,7 +18,7 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/tools/accuracy/file_reader_stage.h" +#include "tensorflow/lite/tools/accuracy/file_reader_stage.h" #include "tensorflow/core/public/session.h" namespace tensorflow { diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/BUILD b/tensorflow/lite/tools/accuracy/ilsvrc/BUILD similarity index 82% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/BUILD rename to tensorflow/lite/tools/accuracy/ilsvrc/BUILD index 98e2835b2e..a4d21961a6 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/BUILD +++ b/tensorflow/lite/tools/accuracy/ilsvrc/BUILD @@ -5,8 +5,8 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:build_def.bzl", "tflite_copts", "tflite_linkopts") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") common_linkopts = tflite_linkopts() + select({ "//conditions:default": [], @@ -22,8 +22,8 @@ cc_library( hdrs = ["inception_preprocessing.h"], copts = tflite_copts(), deps = [ - "//tensorflow/contrib/lite/tools/accuracy:android_required_build_flags", - "//tensorflow/contrib/lite/tools/accuracy:stage", + "//tensorflow/lite/tools/accuracy:android_required_build_flags", + "//tensorflow/lite/tools/accuracy:stage", "//tensorflow/cc:cc_ops", "//tensorflow/cc:scope", ] + select( @@ -60,7 +60,7 @@ tf_cc_test( ], deps = [ ":inception_preprocessing", - "//tensorflow/contrib/lite/tools/accuracy:android_required_build_flags", + "//tensorflow/lite/tools/accuracy:android_required_build_flags", "@com_google_googletest//:gtest", ] + select( { @@ -83,7 +83,7 @@ cc_library( hdrs = ["imagenet_topk_eval.h"], copts = tflite_copts(), deps = [ - "//tensorflow/contrib/lite/tools/accuracy:accuracy_eval_stage", + "//tensorflow/lite/tools/accuracy:accuracy_eval_stage", ] + select( { "//tensorflow:android": [ @@ -127,12 +127,12 @@ cc_library( deps = [ ":imagenet_topk_eval", ":inception_preprocessing", - "//tensorflow/contrib/lite/tools/accuracy:android_required_build_flags", - "//tensorflow/contrib/lite/tools/accuracy:eval_pipeline", - "//tensorflow/contrib/lite/tools/accuracy:eval_pipeline_builder", - "//tensorflow/contrib/lite/tools/accuracy:file_reader_stage", - "//tensorflow/contrib/lite/tools/accuracy:run_tflite_model_stage", - "//tensorflow/contrib/lite/tools/accuracy:utils", + "//tensorflow/lite/tools/accuracy:android_required_build_flags", + "//tensorflow/lite/tools/accuracy:eval_pipeline", + "//tensorflow/lite/tools/accuracy:eval_pipeline_builder", + "//tensorflow/lite/tools/accuracy:file_reader_stage", + "//tensorflow/lite/tools/accuracy:run_tflite_model_stage", + "//tensorflow/lite/tools/accuracy:utils", "@com_google_absl//absl/memory", "//tensorflow/cc:cc_ops", "//tensorflow/cc:scope", @@ -164,8 +164,8 @@ tf_cc_binary( ":imagenet_model_evaluator", ":imagenet_topk_eval", "@com_google_absl//absl/memory", - "//tensorflow/contrib/lite/tools/accuracy:android_required_build_flags", - "//tensorflow/contrib/lite/tools/accuracy:csv_writer", + "//tensorflow/lite/tools/accuracy:android_required_build_flags", + "//tensorflow/lite/tools/accuracy:csv_writer", ] + select( { "//tensorflow:android": [ diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/README.md b/tensorflow/lite/tools/accuracy/ilsvrc/README.md similarity index 95% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/README.md rename to tensorflow/lite/tools/accuracy/ilsvrc/README.md index 362ea3ac34..ac3a1566e2 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/README.md +++ b/tensorflow/lite/tools/accuracy/ilsvrc/README.md @@ -75,14 +75,14 @@ bazel build -c opt \ --cxxopt='--std=c++11' \ --copt=-D__ANDROID_TYPES_FULL__ \ --copt=-DSUPPORT_SELECTIVE_REGISTRATION \ - //tensorflow/contrib/lite/tools/accuracy/ilsvrc:imagenet_accuracy_eval + //tensorflow/lite/tools/accuracy/ilsvrc:imagenet_accuracy_eval ``` (2) Connect your phone. Push the binary to your phone with adb push (make the directory if required): ``` -adb push bazel-bin/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval /data/local/tmp +adb push bazel-bin/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval /data/local/tmp ``` (3) Make the binary executable. @@ -136,7 +136,7 @@ adb shell /data/local/tmp/imagenet_accuracy_eval \ bazel run -c opt \ --cxxopt='--std=c++11' \ -- \ - //tensorflow/contrib/lite/tools/accuracy/ilsvrc:imagenet_accuracy_eval \ + //tensorflow/lite/tools/accuracy/ilsvrc:imagenet_accuracy_eval \ --model_file=mobilenet_quant_v1_224.tflite \ --ground_truth_images_path=${IMAGENET_IMAGES_DIR} \ --ground_truth_labels=${VALIDATION_LABELS} \ diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/clsloc_validation_blacklist.txt b/tensorflow/lite/tools/accuracy/ilsvrc/clsloc_validation_blacklist.txt similarity index 100% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/clsloc_validation_blacklist.txt rename to tensorflow/lite/tools/accuracy/ilsvrc/clsloc_validation_blacklist.txt diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/generate_validation_labels.py b/tensorflow/lite/tools/accuracy/ilsvrc/generate_validation_labels.py similarity index 100% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/generate_validation_labels.py rename to tensorflow/lite/tools/accuracy/ilsvrc/generate_validation_labels.py diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval.cc b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval.cc similarity index 96% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval.cc rename to tensorflow/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval.cc index 2a8a2b9b59..090a023c02 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval.cc +++ b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_accuracy_eval.cc @@ -17,9 +17,9 @@ limitations under the License. #include #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/tools/accuracy/csv_writer.h" -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h" -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" +#include "tensorflow/lite/tools/accuracy/csv_writer.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" #include "tensorflow/core/platform/env.h" #include "tensorflow/core/util/command_line_flags.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.cc b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.cc similarity index 95% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.cc rename to tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.cc index 63616fc3b4..9a74e221c1 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.cc +++ b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h" #include #include @@ -22,13 +22,13 @@ limitations under the License. #include "absl/memory/memory.h" #include "tensorflow/cc/framework/scope.h" -#include "tensorflow/contrib/lite/tools/accuracy/eval_pipeline.h" -#include "tensorflow/contrib/lite/tools/accuracy/eval_pipeline_builder.h" -#include "tensorflow/contrib/lite/tools/accuracy/file_reader_stage.h" -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.h" -#include "tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.h" -#include "tensorflow/contrib/lite/tools/accuracy/utils.h" +#include "tensorflow/lite/tools/accuracy/eval_pipeline.h" +#include "tensorflow/lite/tools/accuracy/eval_pipeline_builder.h" +#include "tensorflow/lite/tools/accuracy/file_reader_stage.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.h" +#include "tensorflow/lite/tools/accuracy/run_tflite_model_stage.h" +#include "tensorflow/lite/tools/accuracy/utils.h" #include "tensorflow/core/lib/core/blocking_counter.h" #include "tensorflow/core/lib/core/threadpool.h" #include "tensorflow/core/platform/init_main.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h similarity index 91% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h rename to tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h index 97e4232b35..c3c49e9a51 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h +++ b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_model_evaluator.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_IMAGENET_MODEL_EVALUATOR_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_IMAGENET_MODEL_EVALUATOR_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_IMAGENET_MODEL_EVALUATOR_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_IMAGENET_MODEL_EVALUATOR_H_ #include #include -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" -#include "tensorflow/contrib/lite/tools/accuracy/utils.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" +#include "tensorflow/lite/tools/accuracy/utils.h" #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/lib/core/status.h" @@ -121,4 +121,4 @@ class ImagenetModelEvaluator { } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_ILSVRC_IMAGENET_MODEL_EVALUATOR_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_ILSVRC_IMAGENET_MODEL_EVALUATOR_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.cc b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.cc similarity index 98% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.cc rename to tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.cc index c75baa82b1..2b086cdf70 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.cc +++ b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" #include diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h similarity index 91% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h rename to tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h index cad646a30c..e1fc445abf 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h +++ b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_IMAGENET_TOPK_EVAL_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_IMAGENET_TOPK_EVAL_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_IMAGENET_TOPK_EVAL_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_IMAGENET_TOPK_EVAL_H_ #include #include -#include "tensorflow/contrib/lite/tools/accuracy/accuracy_eval_stage.h" +#include "tensorflow/lite/tools/accuracy/accuracy_eval_stage.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/platform/mutex.h" @@ -80,4 +80,4 @@ class ImagenetTopKAccuracy : public AccuracyEval { } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_ILSVRC_IMAGENET_TOPK_EVAL_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_ILSVRC_IMAGENET_TOPK_EVAL_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval_test.cc b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval_test.cc similarity index 98% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval_test.cc rename to tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval_test.cc index ff332af5c5..61b7afc552 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval_test.cc +++ b/tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/imagenet_topk_eval.h" #include namespace tensorflow { diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.cc b/tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.cc similarity index 97% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.cc rename to tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.cc index 7512b39c32..9a889f0dd8 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.cc +++ b/tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.h" #include diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.h b/tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.h similarity index 89% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.h rename to tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.h index 15df719817..4a1d3ce476 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.h +++ b/tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.h @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_INCEPTION_PREPROCESSING_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_INCEPTION_PREPROCESSING_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_INCEPTION_PREPROCESSING_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_INCEPTION_PREPROCESSING_H_ #include -#include "tensorflow/contrib/lite/tools/accuracy/stage.h" +#include "tensorflow/lite/tools/accuracy/stage.h" #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/lib/core/status.h" @@ -72,4 +72,4 @@ class InceptionPreprocessingStage : public Stage { } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_INCEPTION_PREPROCESSING_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_INCEPTION_PREPROCESSING_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing_test.cc b/tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing_test.cc similarity index 98% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing_test.cc rename to tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing_test.cc index 3587878ba3..5d0e01d7d1 100644 --- a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing_test.cc +++ b/tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing_test.cc @@ -17,7 +17,7 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/tools/accuracy/ilsvrc/inception_preprocessing.h" +#include "tensorflow/lite/tools/accuracy/ilsvrc/inception_preprocessing.h" #include "tensorflow/core/platform/init_main.h" #include "tensorflow/core/public/session.h" #include "tensorflow/core/util/command_line_flags.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/ilsvrc/testdata/grace_hopper.jpg b/tensorflow/lite/tools/accuracy/ilsvrc/testdata/grace_hopper.jpg similarity index 100% rename from tensorflow/contrib/lite/tools/accuracy/ilsvrc/testdata/grace_hopper.jpg rename to tensorflow/lite/tools/accuracy/ilsvrc/testdata/grace_hopper.jpg diff --git a/tensorflow/contrib/lite/tools/accuracy/run_tflite_model_op.cc b/tensorflow/lite/tools/accuracy/run_tflite_model_op.cc similarity index 95% rename from tensorflow/contrib/lite/tools/accuracy/run_tflite_model_op.cc rename to tensorflow/lite/tools/accuracy/run_tflite_model_op.cc index da4258f1c1..5f413b8ee3 100644 --- a/tensorflow/contrib/lite/tools/accuracy/run_tflite_model_op.cc +++ b/tensorflow/lite/tools/accuracy/run_tflite_model_op.cc @@ -16,12 +16,12 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/op_resolver.h" -#include "tensorflow/contrib/lite/tools/accuracy/utils.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/op_resolver.h" +#include "tensorflow/lite/tools/accuracy/utils.h" #include "tensorflow/core/framework/common_shape_fns.h" #include "tensorflow/core/framework/op_kernel.h" diff --git a/tensorflow/contrib/lite/tools/accuracy/run_tflite_model_op_test.cc b/tensorflow/lite/tools/accuracy/run_tflite_model_op_test.cc similarity index 100% rename from tensorflow/contrib/lite/tools/accuracy/run_tflite_model_op_test.cc rename to tensorflow/lite/tools/accuracy/run_tflite_model_op_test.cc diff --git a/tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.cc b/tensorflow/lite/tools/accuracy/run_tflite_model_stage.cc similarity index 95% rename from tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.cc rename to tensorflow/lite/tools/accuracy/run_tflite_model_stage.cc index c96795d499..6082290c0b 100644 --- a/tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.cc +++ b/tensorflow/lite/tools/accuracy/run_tflite_model_stage.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.h" +#include "tensorflow/lite/tools/accuracy/run_tflite_model_stage.h" #include diff --git a/tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.h b/tensorflow/lite/tools/accuracy/run_tflite_model_stage.h similarity index 85% rename from tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.h rename to tensorflow/lite/tools/accuracy/run_tflite_model_stage.h index 90d12d6f42..6103449177 100644 --- a/tensorflow/contrib/lite/tools/accuracy/run_tflite_model_stage.h +++ b/tensorflow/lite/tools/accuracy/run_tflite_model_stage.h @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_RUN_TFLITE_MODEL_STAGE_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_RUN_TFLITE_MODEL_STAGE_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_RUN_TFLITE_MODEL_STAGE_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_RUN_TFLITE_MODEL_STAGE_H_ #include -#include "tensorflow/contrib/lite/tools/accuracy/stage.h" +#include "tensorflow/lite/tools/accuracy/stage.h" namespace tensorflow { namespace metrics { @@ -50,4 +50,4 @@ class RunTFLiteModelStage : public Stage { } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_RUN_TFLITE_MODEL_STAGE_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_RUN_TFLITE_MODEL_STAGE_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/stage.h b/tensorflow/lite/tools/accuracy/stage.h similarity index 90% rename from tensorflow/contrib/lite/tools/accuracy/stage.h rename to tensorflow/lite/tools/accuracy/stage.h index 8292ea2ec7..0a9e3fbd05 100644 --- a/tensorflow/contrib/lite/tools/accuracy/stage.h +++ b/tensorflow/lite/tools/accuracy/stage.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_STAGE_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_STAGE_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_STAGE_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_STAGE_H_ #include "tensorflow/cc/framework/scope.h" @@ -53,4 +53,4 @@ class Stage { } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_STAGE_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_STAGE_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/utils.cc b/tensorflow/lite/tools/accuracy/utils.cc similarity index 92% rename from tensorflow/contrib/lite/tools/accuracy/utils.cc rename to tensorflow/lite/tools/accuracy/utils.cc index f5493301fc..c19dc1ff7c 100644 --- a/tensorflow/contrib/lite/tools/accuracy/utils.cc +++ b/tensorflow/lite/tools/accuracy/utils.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/accuracy/utils.h" +#include "tensorflow/lite/tools/accuracy/utils.h" #include @@ -22,10 +22,10 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/interpreter.h" -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/op_resolver.h" +#include "tensorflow/lite/interpreter.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/op_resolver.h" namespace tensorflow { namespace metrics { diff --git a/tensorflow/contrib/lite/tools/accuracy/utils.h b/tensorflow/lite/tools/accuracy/utils.h similarity index 85% rename from tensorflow/contrib/lite/tools/accuracy/utils.h rename to tensorflow/lite/tools/accuracy/utils.h index 37cbad4d51..5b7639317e 100644 --- a/tensorflow/contrib/lite/tools/accuracy/utils.h +++ b/tensorflow/lite/tools/accuracy/utils.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_UTILS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_UTILS_H_ +#ifndef TENSORFLOW_LITE_TOOLS_ACCURACY_UTILS_H_ +#define TENSORFLOW_LITE_TOOLS_ACCURACY_UTILS_H_ #include #include -#include "tensorflow/contrib/lite/context.h" +#include "tensorflow/lite/context.h" #include "tensorflow/core/framework/tensor_shape.h" namespace tensorflow { @@ -43,4 +43,4 @@ Status ReadFileLines(const string& file_path, } // namespace utils } // namespace metrics } // namespace tensorflow -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_ACCURACY_UTILS_H_ +#endif // TENSORFLOW_LITE_TOOLS_ACCURACY_UTILS_H_ diff --git a/tensorflow/contrib/lite/tools/accuracy/utils_test.cc b/tensorflow/lite/tools/accuracy/utils_test.cc similarity index 97% rename from tensorflow/contrib/lite/tools/accuracy/utils_test.cc rename to tensorflow/lite/tools/accuracy/utils_test.cc index 727eba21b6..401872f18f 100644 --- a/tensorflow/contrib/lite/tools/accuracy/utils_test.cc +++ b/tensorflow/lite/tools/accuracy/utils_test.cc @@ -18,7 +18,7 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/tools/accuracy/utils.h" +#include "tensorflow/lite/tools/accuracy/utils.h" #include "tensorflow/core/platform/init_main.h" #include "tensorflow/core/util/command_line_flags.h" diff --git a/tensorflow/contrib/lite/tools/benchmark/BUILD b/tensorflow/lite/tools/benchmark/BUILD similarity index 71% rename from tensorflow/contrib/lite/tools/benchmark/BUILD rename to tensorflow/lite/tools/benchmark/BUILD index f990493dc5..7646bdcca9 100644 --- a/tensorflow/contrib/lite/tools/benchmark/BUILD +++ b/tensorflow/lite/tools/benchmark/BUILD @@ -4,9 +4,9 @@ package(default_visibility = [ licenses(["notice"]) # Apache 2.0 -load("//tensorflow/contrib/lite:special_rules.bzl", "tflite_portable_test_suite") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_linkopts") +load("//tensorflow/lite:special_rules.bzl", "tflite_portable_test_suite") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_linkopts") common_copts = ["-Wall"] + tflite_copts() @@ -51,8 +51,8 @@ cc_binary( deps = [ ":benchmark_tflite_model_lib", ":logging", - "//tensorflow/contrib/lite/delegates/flex:delegate", - "//tensorflow/contrib/lite/testing:init_tensorflow", + "//tensorflow/lite/delegates/flex:delegate", + "//tensorflow/lite/testing:init_tensorflow", ], ) @@ -60,9 +60,9 @@ cc_test( name = "benchmark_test", srcs = ["benchmark_test.cc"], args = [ - "--graph=$(location //tensorflow/contrib/lite:testdata/multi_add.bin)", + "--graph=$(location //tensorflow/lite:testdata/multi_add.bin)", ], - data = ["//tensorflow/contrib/lite:testdata/multi_add.bin"], + data = ["//tensorflow/lite:testdata/multi_add.bin"], tags = [ "tflite_not_portable_android", "tflite_not_portable_ios", @@ -70,7 +70,7 @@ cc_test( deps = [ ":benchmark_tflite_model_lib", ":command_line_flags", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -92,7 +92,7 @@ cc_test( visibility = ["//visibility:private"], deps = [ ":command_line_flags", - "//tensorflow/contrib/lite/testing:util", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -108,10 +108,10 @@ cc_library( deps = [ ":benchmark_model_lib", ":logging", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/profiling:profile_summarizer", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/profiling:profile_summarizer", ], ) @@ -136,13 +136,13 @@ cc_library( ":benchmark_params", ":command_line_flags", ":logging", - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite:string_util", - "//tensorflow/contrib/lite/kernels:builtin_ops", - "//tensorflow/contrib/lite/profiling:profile_summarizer", - "//tensorflow/contrib/lite/profiling:profiler", - "//tensorflow/contrib/lite/profiling:time", "//tensorflow/core:stats_calculator_portable", + "//tensorflow/lite:framework", + "//tensorflow/lite:string_util", + "//tensorflow/lite/kernels:builtin_ops", + "//tensorflow/lite/profiling:profile_summarizer", + "//tensorflow/lite/profiling:profiler", + "//tensorflow/lite/profiling:time", ], ) diff --git a/tensorflow/contrib/lite/tools/benchmark/README.md b/tensorflow/lite/tools/benchmark/README.md similarity index 96% rename from tensorflow/contrib/lite/tools/benchmark/README.md rename to tensorflow/lite/tools/benchmark/README.md index 8d997639fb..a71a2fa1c0 100644 --- a/tensorflow/contrib/lite/tools/benchmark/README.md +++ b/tensorflow/lite/tools/benchmark/README.md @@ -9,7 +9,7 @@ of runs. Aggregrate latency statistics are reported after running the benchmark. The instructions below are for running the binary on Desktop and Android, for iOS please use the -[iOS benchmark app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/benchmark/ios). +[iOS benchmark app](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/benchmark/ios). ## Parameters @@ -45,14 +45,14 @@ and the following optional parameters: bazel build -c opt \ --config=android_arm \ --cxxopt='--std=c++11' \ - tensorflow/contrib/lite/tools/benchmark:benchmark_model + tensorflow/lite/tools/benchmark:benchmark_model ``` (2) Connect your phone. Push the binary to your phone with adb push (make the directory if required): ``` -adb push bazel-bin/tensorflow/contrib/lite/tools/benchmark/benchmark_model /data/local/tmp +adb push bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model /data/local/tmp ``` (3) Make the binary executable. @@ -79,14 +79,14 @@ adb shell /data/local/tmp/benchmark_model \ (1) build the binary ``` -bazel build -c opt tensorflow/contrib/lite/tools/benchmark:benchmark_model +bazel build -c opt tensorflow/lite/tools/benchmark:benchmark_model ``` (2) Run on your compute graph, similar to the Android case but without the need of adb shell. For example: ``` -bazel-bin/tensorflow/contrib/lite/tools/benchmark/benchmark_model \ +bazel-bin/tensorflow/lite/tools/benchmark/benchmark_model \ --graph=mobilenet_quant_v1_224.tflite \ --num_threads=4 ``` @@ -126,7 +126,7 @@ bazel build -c opt \ --config=android_arm \ --cxxopt='--std=c++11' \ --copt=-DTFLITE_PROFILING_ENABLED \ - tensorflow/contrib/lite/tools/benchmark:benchmark_model + tensorflow/lite/tools/benchmark:benchmark_model ``` This compiles TFLite with profiling enabled, now you can run the benchmark binary like before. The binary will produce detailed statistics for each operation similar to those shown below: diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_main.cc b/tensorflow/lite/tools/benchmark/benchmark_main.cc similarity index 89% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_main.cc rename to tensorflow/lite/tools/benchmark/benchmark_main.cc index 372d31e838..dcf82a8b7e 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_main.cc +++ b/tensorflow/lite/tools/benchmark/benchmark_main.cc @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h" -#include "tensorflow/contrib/lite/tools/benchmark/logging.h" +#include "tensorflow/lite/tools/benchmark/benchmark_tflite_model.h" +#include "tensorflow/lite/tools/benchmark/logging.h" namespace tflite { namespace benchmark { diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_model.cc b/tensorflow/lite/tools/benchmark/benchmark_model.cc similarity index 96% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_model.cc rename to tensorflow/lite/tools/benchmark/benchmark_model.cc index f86c0445b0..05148aea65 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_model.cc +++ b/tensorflow/lite/tools/benchmark/benchmark_model.cc @@ -13,15 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_model.h" +#include "tensorflow/lite/tools/benchmark/benchmark_model.h" #include #include #include -#include "tensorflow/contrib/lite/profiling/time.h" -#include "tensorflow/contrib/lite/tools/benchmark/logging.h" +#include "tensorflow/lite/profiling/time.h" +#include "tensorflow/lite/tools/benchmark/logging.h" namespace { void SleepForSeconds(double sleep_seconds) { diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_model.h b/tensorflow/lite/tools/benchmark/benchmark_model.h similarity index 93% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_model.h rename to tensorflow/lite/tools/benchmark/benchmark_model.h index cc215a7b7f..d8a9b05010 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_model.h +++ b/tensorflow/lite/tools/benchmark/benchmark_model.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_MODEL_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_MODEL_H_ +#ifndef TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_MODEL_H_ +#define TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_MODEL_H_ #include #include @@ -23,8 +23,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_params.h" -#include "tensorflow/contrib/lite/tools/benchmark/command_line_flags.h" +#include "tensorflow/lite/tools/benchmark/benchmark_params.h" +#include "tensorflow/lite/tools/benchmark/command_line_flags.h" #include "tensorflow/core/util/stats_calculator.h" namespace tflite { @@ -160,4 +160,4 @@ class BenchmarkModel { } // namespace benchmark } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_MODEL_H_ +#endif // TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_MODEL_H_ diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_params.cc b/tensorflow/lite/tools/benchmark/benchmark_params.cc similarity index 92% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_params.cc rename to tensorflow/lite/tools/benchmark/benchmark_params.cc index 1dcf580a9d..5ab3adff55 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_params.cc +++ b/tensorflow/lite/tools/benchmark/benchmark_params.cc @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_params.h" +#include "tensorflow/lite/tools/benchmark/benchmark_params.h" #include #include #include -#include "tensorflow/contrib/lite/tools/benchmark/logging.h" +#include "tensorflow/lite/tools/benchmark/logging.h" namespace tflite { namespace benchmark { diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_params.h b/tensorflow/lite/tools/benchmark/benchmark_params.h similarity index 90% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_params.h rename to tensorflow/lite/tools/benchmark/benchmark_params.h index c98f47bb0d..594baa5b4e 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_params.h +++ b/tensorflow/lite/tools/benchmark/benchmark_params.h @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_PARAMS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_PARAMS_H_ +#ifndef TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_PARAMS_H_ +#define TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_PARAMS_H_ #include #include #include #include -#include "tensorflow/contrib/lite/tools/benchmark/logging.h" +#include "tensorflow/lite/tools/benchmark/logging.h" namespace tflite { namespace benchmark { @@ -98,4 +98,4 @@ class BenchmarkParams { } // namespace benchmark } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_PARAMS_H_ +#endif // TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_PARAMS_H_ diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_plus_flex_main.cc b/tensorflow/lite/tools/benchmark/benchmark_plus_flex_main.cc similarity index 85% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_plus_flex_main.cc rename to tensorflow/lite/tools/benchmark/benchmark_plus_flex_main.cc index b9cf6c67d2..6e72a29377 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_plus_flex_main.cc +++ b/tensorflow/lite/tools/benchmark/benchmark_plus_flex_main.cc @@ -13,9 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/testing/init_tensorflow.h" -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h" -#include "tensorflow/contrib/lite/tools/benchmark/logging.h" +#include "tensorflow/lite/testing/init_tensorflow.h" +#include "tensorflow/lite/tools/benchmark/benchmark_tflite_model.h" +#include "tensorflow/lite/tools/benchmark/logging.h" namespace tflite { namespace benchmark { diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_test.cc b/tensorflow/lite/tools/benchmark/benchmark_test.cc similarity index 92% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_test.cc rename to tensorflow/lite/tools/benchmark/benchmark_test.cc index b697bb394d..59d23d9008 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_test.cc +++ b/tensorflow/lite/tools/benchmark/benchmark_test.cc @@ -18,9 +18,9 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/testing/util.h" -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h" -#include "tensorflow/contrib/lite/tools/benchmark/command_line_flags.h" +#include "tensorflow/lite/testing/util.h" +#include "tensorflow/lite/tools/benchmark/benchmark_tflite_model.h" +#include "tensorflow/lite/tools/benchmark/command_line_flags.h" namespace { const std::string* g_model_path = nullptr; diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.cc b/tensorflow/lite/tools/benchmark/benchmark_tflite_model.cc similarity index 97% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.cc rename to tensorflow/lite/tools/benchmark/benchmark_tflite_model.cc index 2a3df7f289..e063a144b6 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.cc +++ b/tensorflow/lite/tools/benchmark/benchmark_tflite_model.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h" +#include "tensorflow/lite/tools/benchmark/benchmark_tflite_model.h" #include #include @@ -23,11 +23,11 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/kernels/register.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/op_resolver.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/tools/benchmark/logging.h" +#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/op_resolver.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/tools/benchmark/logging.h" #ifdef TFLITE_CUSTOM_OPS_HEADER void RegisterSelectedOps(::tflite::MutableOpResolver* resolver); diff --git a/tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h b/tensorflow/lite/tools/benchmark/benchmark_tflite_model.h similarity index 84% rename from tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h rename to tensorflow/lite/tools/benchmark/benchmark_tflite_model.h index 25a302b2aa..8ad3a5dbe5 100644 --- a/tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h +++ b/tensorflow/lite/tools/benchmark/benchmark_tflite_model.h @@ -13,16 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_TFLITE_MODEL_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_TFLITE_MODEL_H_ +#ifndef TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_TFLITE_MODEL_H_ +#define TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_TFLITE_MODEL_H_ #include #include #include -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/profiling/profile_summarizer.h" -#include "tensorflow/contrib/lite/tools/benchmark/benchmark_model.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/profiling/profile_summarizer.h" +#include "tensorflow/lite/tools/benchmark/benchmark_model.h" namespace tflite { namespace benchmark { @@ -79,4 +79,4 @@ class BenchmarkTfLiteModel : public BenchmarkModel { } // namespace benchmark } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_BENCHMARK_TFLITE_MODEL_H_ +#endif // TENSORFLOW_LITE_TOOLS_BENCHMARK_BENCHMARK_TFLITE_MODEL_H_ diff --git a/tensorflow/contrib/lite/tools/benchmark/command_line_flags.cc b/tensorflow/lite/tools/benchmark/command_line_flags.cc similarity index 98% rename from tensorflow/contrib/lite/tools/benchmark/command_line_flags.cc rename to tensorflow/lite/tools/benchmark/command_line_flags.cc index ff818b9dcb..002fa7dea3 100644 --- a/tensorflow/contrib/lite/tools/benchmark/command_line_flags.cc +++ b/tensorflow/lite/tools/benchmark/command_line_flags.cc @@ -10,7 +10,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/benchmark/command_line_flags.h" +#include "tensorflow/lite/tools/benchmark/command_line_flags.h" #include #include diff --git a/tensorflow/contrib/lite/tools/benchmark/command_line_flags.h b/tensorflow/lite/tools/benchmark/command_line_flags.h similarity index 95% rename from tensorflow/contrib/lite/tools/benchmark/command_line_flags.h rename to tensorflow/lite/tools/benchmark/command_line_flags.h index 6a0affd834..cc71450053 100644 --- a/tensorflow/contrib/lite/tools/benchmark/command_line_flags.h +++ b/tensorflow/lite/tools/benchmark/command_line_flags.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_COMMAND_LINE_FLAGS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_COMMAND_LINE_FLAGS_H_ +#ifndef TENSORFLOW_LITE_TOOLS_BENCHMARK_COMMAND_LINE_FLAGS_H_ +#define TENSORFLOW_LITE_TOOLS_BENCHMARK_COMMAND_LINE_FLAGS_H_ #include #include @@ -120,4 +120,4 @@ class Flags { } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_COMMAND_LINE_FLAGS_H_ +#endif // TENSORFLOW_LITE_TOOLS_BENCHMARK_COMMAND_LINE_FLAGS_H_ diff --git a/tensorflow/contrib/lite/tools/benchmark/command_line_flags_test.cc b/tensorflow/lite/tools/benchmark/command_line_flags_test.cc similarity index 97% rename from tensorflow/contrib/lite/tools/benchmark/command_line_flags_test.cc rename to tensorflow/lite/tools/benchmark/command_line_flags_test.cc index 03da805109..36eb75b06a 100644 --- a/tensorflow/contrib/lite/tools/benchmark/command_line_flags_test.cc +++ b/tensorflow/lite/tools/benchmark/command_line_flags_test.cc @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/benchmark/command_line_flags.h" +#include "tensorflow/lite/tools/benchmark/command_line_flags.h" #include #include -#include "tensorflow/contrib/lite/testing/util.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/README.md b/tensorflow/lite/tools/benchmark/ios/README.md similarity index 84% rename from tensorflow/contrib/lite/tools/benchmark/ios/README.md rename to tensorflow/lite/tools/benchmark/ios/README.md index 46144f7bf8..3dc29d9b94 100644 --- a/tensorflow/contrib/lite/tools/benchmark/ios/README.md +++ b/tensorflow/lite/tools/benchmark/ios/README.md @@ -18,15 +18,15 @@ Mobilenet_1.0_224 model ## To build/install/run - Follow instructions at -[iOS build for TFLite](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/g3doc/ios.md) +[iOS build for TFLite](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/g3doc/ios.md) to build TFLite. Running ```bash -tensorflow/contrib/lite/build_ios_universal_lib.sh +tensorflow/lite/build_ios_universal_lib.sh ``` -will also build `tensorflow/contrib/lite/gen/lib/benchmark-lib.a` . +will also build `tensorflow/lite/gen/lib/benchmark-lib.a` . - Now copy the downloaded model file to `benchmark_data` directory. @@ -37,7 +37,7 @@ and other benchmark parameters. resources that need to be copied. - Ensure that `Build Phases -> Link Binary With Library` contains the -`Accelerate framework` and `tensorflow/contrib/lite/gen/lib/benchmark-lib.a`. +`Accelerate framework` and `tensorflow/lite/gen/lib/benchmark-lib.a`. - Now try running the app. The app has a single button that runs the benchmark on the model and displays results in a text view below. diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark.xcodeproj/project.pbxproj b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark.xcodeproj/project.pbxproj similarity index 92% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark.xcodeproj/project.pbxproj rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark.xcodeproj/project.pbxproj index 8436c75281..958936a660 100644 --- a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark.xcodeproj/project.pbxproj +++ b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark.xcodeproj/project.pbxproj @@ -20,7 +20,7 @@ /* Begin PBXFileReference section */ 6FE7579920D59CE500F01636 /* benchmark_params.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = benchmark_params.json; sourceTree = ""; }; - 6FE7579C20D5A5E000F01636 /* benchmark-lib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "benchmark-lib.a"; path = "$SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/gen/lib/benchmark-lib.a"; sourceTree = ""; }; + 6FE7579C20D5A5E000F01636 /* benchmark-lib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "benchmark-lib.a"; path = "$SRCROOT/../../../../../../../tensorflow/lite/tools/make/gen/lib/benchmark-lib.a"; sourceTree = ""; }; 6FE7579E20D5A6A700F01636 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; 6FE757A020D5AB8000F01636 /* mobilenet_v1_1.0_224.tflite */ = {isa = PBXFileReference; lastKnownFileType = file; path = mobilenet_v1_1.0_224.tflite; sourceTree = ""; }; 6FE93FF820D592D8008C9FE4 /* TFLiteBenchmark.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TFLiteBenchmark.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -310,18 +310,18 @@ CODE_SIGN_STYLE = Automatic; "HEADER_SEARCH_PATHS[arch=*]" = ( $SRCROOT/../../../../../../../, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/eigen, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/gemmlowp, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/neon_2_sse, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/farmhash/src, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/flatbuffers/include, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/eigen, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/gemmlowp, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/neon_2_sse, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/farmhash/src, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/flatbuffers/include, ); INFOPLIST_FILE = TFLiteBenchmark/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - "LIBRARY_SEARCH_PATHS[arch=*]" = $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/gen/lib; + "LIBRARY_SEARCH_PATHS[arch=*]" = $SRCROOT/../../../../../../../tensorflow/lite/tools/make/gen/lib; PRODUCT_BUNDLE_IDENTIFIER = example.TFLiteBenchmark; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -336,18 +336,18 @@ CODE_SIGN_STYLE = Automatic; "HEADER_SEARCH_PATHS[arch=*]" = ( $SRCROOT/../../../../../../../, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/eigen, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/gemmlowp, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/neon_2_sse, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/farmhash/src, - $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/downloads/flatbuffers/include, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/eigen, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/gemmlowp, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/neon_2_sse, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/farmhash/src, + $SRCROOT/../../../../../../../tensorflow/lite/tools/make/downloads/flatbuffers/include, ); INFOPLIST_FILE = TFLiteBenchmark/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - "LIBRARY_SEARCH_PATHS[arch=*]" = $SRCROOT/../../../../../../../tensorflow/contrib/lite/tools/make/gen/lib; + "LIBRARY_SEARCH_PATHS[arch=*]" = $SRCROOT/../../../../../../../tensorflow/lite/tools/make/gen/lib; PRODUCT_BUNDLE_IDENTIFIER = example.TFLiteBenchmark; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.h b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.h similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.h rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.h diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.m b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.m similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.m rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/AppDelegate.m diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/Contents.json b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/Contents.json similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/Contents.json rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Assets.xcassets/Contents.json diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/LaunchScreen.storyboard b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/LaunchScreen.storyboard rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/LaunchScreen.storyboard diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/Main.storyboard b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/Main.storyboard similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/Main.storyboard rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Base.lproj/Main.storyboard diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.h b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.h similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.h rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.h diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.mm b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.mm similarity index 97% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.mm rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.mm index 356d5b0e17..590c215f51 100644 --- a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.mm +++ b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/BenchmarkViewController.mm @@ -18,8 +18,8 @@ #import #import #import -#import "tensorflow/contrib/lite/tools/benchmark/benchmark_tflite_model.h" -#import "tensorflow/contrib/lite/tools/benchmark/logging.h" +#import "tensorflow/lite/tools/benchmark/benchmark_tflite_model.h" +#import "tensorflow/lite/tools/benchmark/logging.h" namespace { NSString* FilePathForResourceName(NSString* filename) { diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Info.plist b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Info.plist similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Info.plist rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/Info.plist diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/benchmark_data/benchmark_params.json b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/benchmark_data/benchmark_params.json similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/benchmark_data/benchmark_params.json rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/benchmark_data/benchmark_params.json diff --git a/tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/main.m b/tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/main.m similarity index 100% rename from tensorflow/contrib/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/main.m rename to tensorflow/lite/tools/benchmark/ios/TFLiteBenchmark/TFLiteBenchmark/main.m diff --git a/tensorflow/contrib/lite/tools/benchmark/logging.h b/tensorflow/lite/tools/benchmark/logging.h similarity index 92% rename from tensorflow/contrib/lite/tools/benchmark/logging.h rename to tensorflow/lite/tools/benchmark/logging.h index 4045d1e731..71dd511a08 100644 --- a/tensorflow/contrib/lite/tools/benchmark/logging.h +++ b/tensorflow/lite/tools/benchmark/logging.h @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_LOGGING_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_LOGGING_H_ +#ifndef TENSORFLOW_LITE_TOOLS_BENCHMARK_LOGGING_H_ +#define TENSORFLOW_LITE_TOOLS_BENCHMARK_LOGGING_H_ // LOG and CHECK macros for benchmarks. @@ -73,4 +73,4 @@ class LoggingWrapper { #define TFLITE_BENCHMARK_CHECK_EQ(a, b) TFLITE_BENCHMARK_CHECK(a == b) -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_BENCHMARK_LOGGING_H_ +#endif // TENSORFLOW_LITE_TOOLS_BENCHMARK_LOGGING_H_ diff --git a/tensorflow/contrib/lite/tools/gen_op_registration.cc b/tensorflow/lite/tools/gen_op_registration.cc similarity index 93% rename from tensorflow/contrib/lite/tools/gen_op_registration.cc rename to tensorflow/lite/tools/gen_op_registration.cc index d80ea59170..ca66eef466 100644 --- a/tensorflow/contrib/lite/tools/gen_op_registration.cc +++ b/tensorflow/lite/tools/gen_op_registration.cc @@ -16,8 +16,8 @@ limitations under the License. #include #include "re2/re2.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/tools/gen_op_registration.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/tools/gen_op_registration.h" namespace tflite { diff --git a/tensorflow/contrib/lite/tools/gen_op_registration.h b/tensorflow/lite/tools/gen_op_registration.h similarity index 82% rename from tensorflow/contrib/lite/tools/gen_op_registration.h rename to tensorflow/lite/tools/gen_op_registration.h index 5f2ac6ca97..a616720c93 100644 --- a/tensorflow/contrib/lite/tools/gen_op_registration.h +++ b/tensorflow/lite/tools/gen_op_registration.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_CONTRIB_LITE_TOOLS_GEN_OP_REGISTRATION_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_GEN_OP_REGISTRATION_H_ +#ifndef TENSORFLOW_LITE_TOOLS_GEN_OP_REGISTRATION_H_ +#define TENSORFLOW_LITE_TOOLS_GEN_OP_REGISTRATION_H_ -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/string.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string.h" namespace tflite { @@ -36,4 +36,4 @@ void ReadOpsFromModel(const ::tflite::Model* model, } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_GEN_OP_REGISTRATION_H_ +#endif // TENSORFLOW_LITE_TOOLS_GEN_OP_REGISTRATION_H_ diff --git a/tensorflow/contrib/lite/tools/gen_op_registration_main.cc b/tensorflow/lite/tools/gen_op_registration_main.cc similarity index 98% rename from tensorflow/contrib/lite/tools/gen_op_registration_main.cc rename to tensorflow/lite/tools/gen_op_registration_main.cc index f7df80821f..090b709478 100644 --- a/tensorflow/contrib/lite/tools/gen_op_registration_main.cc +++ b/tensorflow/lite/tools/gen_op_registration_main.cc @@ -21,7 +21,7 @@ limitations under the License. #include #include "absl/strings/strip.h" -#include "tensorflow/contrib/lite/tools/gen_op_registration.h" +#include "tensorflow/lite/tools/gen_op_registration.h" #include "tensorflow/core/platform/init_main.h" #include "tensorflow/core/util/command_line_flags.h" diff --git a/tensorflow/contrib/lite/tools/gen_op_registration_test.cc b/tensorflow/lite/tools/gen_op_registration_test.cc similarity index 88% rename from tensorflow/contrib/lite/tools/gen_op_registration_test.cc rename to tensorflow/lite/tools/gen_op_registration_test.cc index 28a98d68ab..0ae91018dd 100644 --- a/tensorflow/contrib/lite/tools/gen_op_registration_test.cc +++ b/tensorflow/lite/tools/gen_op_registration_test.cc @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/gen_op_registration.h" +#include "tensorflow/lite/tools/gen_op_registration.h" #include #include @@ -43,25 +43,25 @@ TEST_F(GenOpRegistrationTest, TestNonExistantFiles) { } TEST_F(GenOpRegistrationTest, TestModels) { - ReadOps("tensorflow/contrib/lite/testdata/test_model.bin"); + ReadOps("tensorflow/lite/testdata/test_model.bin"); EXPECT_THAT(builtin_ops_, ElementsAreArray({"CONV_2D"})); EXPECT_THAT(custom_ops_, ElementsAreArray({"testing_op"})); } TEST_F(GenOpRegistrationTest, TestEmptyModels) { - ReadOps("tensorflow/contrib/lite/testdata/empty_model.bin"); + ReadOps("tensorflow/lite/testdata/empty_model.bin"); EXPECT_EQ(builtin_ops_.size(), 0); EXPECT_EQ(custom_ops_.size(), 0); } TEST_F(GenOpRegistrationTest, TestZeroSubgraphs) { - ReadOps("tensorflow/contrib/lite/testdata/0_subgraphs.bin"); + ReadOps("tensorflow/lite/testdata/0_subgraphs.bin"); EXPECT_EQ(builtin_ops_.size(), 0); EXPECT_EQ(custom_ops_.size(), 0); } TEST_F(GenOpRegistrationTest, TestBrokenMmap) { - ReadOps("tensorflow/contrib/lite/testdata/test_model_broken.bin"); + ReadOps("tensorflow/lite/testdata/test_model_broken.bin"); EXPECT_EQ(builtin_ops_.size(), 0); EXPECT_EQ(custom_ops_.size(), 0); } diff --git a/tensorflow/contrib/lite/tools/make/Makefile b/tensorflow/lite/tools/make/Makefile similarity index 77% rename from tensorflow/contrib/lite/tools/make/Makefile rename to tensorflow/lite/tools/make/Makefile index 16012a3fb1..8f12355854 100644 --- a/tensorflow/contrib/lite/tools/make/Makefile +++ b/tensorflow/lite/tools/make/Makefile @@ -20,7 +20,7 @@ endif HOST_ARCH := $(shell if [[ $(shell uname -m) =~ i[345678]86 ]]; then echo x86_32; else echo $(shell uname -m); fi) # Override these on the make command line to target a specific architecture. For example: -# make -f tensorflow/contrib/lite/Makefile TARGET=rpi TARGET_ARCH=armv7l +# make -f tensorflow/lite/Makefile TARGET=rpi TARGET_ARCH=armv7l TARGET := $(HOST_OS) TARGET_ARCH := $(HOST_ARCH) @@ -70,55 +70,55 @@ BENCHMARK_BINARY_NAME := benchmark_model # A small example program that shows how to link against the library. MINIMAL_SRCS := \ -tensorflow/contrib/lite/examples/minimal/minimal.cc +tensorflow/lite/examples/minimal/minimal.cc # What sources we want to compile, must be kept in sync with the main Bazel # build files. PROFILER_SRCS := \ - tensorflow/contrib/lite/profiling/time.cc + tensorflow/lite/profiling/time.cc PROFILE_SUMMARIZER_SRCS := \ - tensorflow/contrib/lite/profiling/profile_summarizer.cc \ + tensorflow/lite/profiling/profile_summarizer.cc \ tensorflow/core/util/stats_calculator.cc CORE_CC_ALL_SRCS := \ -$(wildcard tensorflow/contrib/lite/*.cc) \ -$(wildcard tensorflow/contrib/lite/*.c) \ -$(wildcard tensorflow/contrib/lite/c/*.c) \ -$(wildcard tensorflow/contrib/lite/core/api/*.cc) +$(wildcard tensorflow/lite/*.cc) \ +$(wildcard tensorflow/lite/*.c) \ +$(wildcard tensorflow/lite/c/*.c) \ +$(wildcard tensorflow/lite/core/api/*.cc) ifneq ($(BUILD_TYPE),micro) CORE_CC_ALL_SRCS += \ -$(wildcard tensorflow/contrib/lite/kernels/*.cc) \ -$(wildcard tensorflow/contrib/lite/kernels/internal/*.cc) \ -$(wildcard tensorflow/contrib/lite/kernels/internal/optimized/*.cc) \ -$(wildcard tensorflow/contrib/lite/kernels/internal/reference/*.cc) \ +$(wildcard tensorflow/lite/kernels/*.cc) \ +$(wildcard tensorflow/lite/kernels/internal/*.cc) \ +$(wildcard tensorflow/lite/kernels/internal/optimized/*.cc) \ +$(wildcard tensorflow/lite/kernels/internal/reference/*.cc) \ $(PROFILER_SRCS) \ -$(wildcard tensorflow/contrib/lite/kernels/*.c) \ -$(wildcard tensorflow/contrib/lite/kernels/internal/*.c) \ -$(wildcard tensorflow/contrib/lite/kernels/internal/optimized/*.c) \ -$(wildcard tensorflow/contrib/lite/kernels/internal/reference/*.c) \ -$(wildcard tensorflow/contrib/lite/tools/make/downloads/farmhash/src/farmhash.cc) \ -$(wildcard tensorflow/contrib/lite/tools/make/downloads/fft2d/fftsg.c) +$(wildcard tensorflow/lite/kernels/*.c) \ +$(wildcard tensorflow/lite/kernels/internal/*.c) \ +$(wildcard tensorflow/lite/kernels/internal/optimized/*.c) \ +$(wildcard tensorflow/lite/kernels/internal/reference/*.c) \ +$(wildcard tensorflow/lite/tools/make/downloads/farmhash/src/farmhash.cc) \ +$(wildcard tensorflow/lite/tools/make/downloads/fft2d/fftsg.c) endif # Remove any duplicates. CORE_CC_ALL_SRCS := $(sort $(CORE_CC_ALL_SRCS)) CORE_CC_EXCLUDE_SRCS := \ -$(wildcard tensorflow/contrib/lite/*test.cc) \ -$(wildcard tensorflow/contrib/lite/*/*test.cc) \ -$(wildcard tensorflow/contrib/lite/*/*/*test.cc) \ -$(wildcard tensorflow/contrib/lite/*/*/*/*test.cc) \ -$(wildcard tensorflow/contrib/lite/kernels/test_util.cc) \ +$(wildcard tensorflow/lite/*test.cc) \ +$(wildcard tensorflow/lite/*/*test.cc) \ +$(wildcard tensorflow/lite/*/*/*test.cc) \ +$(wildcard tensorflow/lite/*/*/*/*test.cc) \ +$(wildcard tensorflow/lite/kernels/test_util.cc) \ $(MINIMAL_SRCS) ifeq ($(BUILD_TYPE),micro) CORE_CC_EXCLUDE_SRCS += \ -tensorflow/contrib/lite/mmap_allocation.cc \ -tensorflow/contrib/lite/nnapi_delegate.cc +tensorflow/lite/mmap_allocation.cc \ +tensorflow/lite/nnapi_delegate.cc endif # Filter out all the excluded files. TF_LITE_CC_SRCS := $(filter-out $(CORE_CC_EXCLUDE_SRCS), $(CORE_CC_ALL_SRCS)) # Benchmark sources -BENCHMARK_SRCS_DIR := tensorflow/contrib/lite/tools/benchmark +BENCHMARK_SRCS_DIR := tensorflow/lite/tools/benchmark BENCHMARK_ALL_SRCS := $(TFLITE_CC_SRCS) \ $(wildcard $(BENCHMARK_SRCS_DIR)/*.cc) \ $(PROFILE_SUMMARIZER_SRCS) @@ -180,11 +180,11 @@ all: $(LIB_PATH) $(MINIMAL_BINARY) $(BENCHMARK_BINARY) micro: $(LIB_PATH) # Hack for generating schema file bypassing flatbuffer parsing -tensorflow/contrib/lite/schema/schema_generated.h: - @cp -u tensorflow/contrib/lite/schema/schema_generated.h.OPENSOURCE tensorflow/contrib/lite/schema/schema_generated.h +tensorflow/lite/schema/schema_generated.h: + @cp -u tensorflow/lite/schema/schema_generated.h.OPENSOURCE tensorflow/lite/schema/schema_generated.h # Gathers together all the objects we've compiled into a single '.a' archive. -$(LIB_PATH): tensorflow/contrib/lite/schema/schema_generated.h $(LIB_OBJS) +$(LIB_PATH): tensorflow/lite/schema/schema_generated.h $(LIB_OBJS) @mkdir -p $(dir $@) $(AR) $(ARFLAGS) $(LIB_PATH) $(LIB_OBJS) diff --git a/tensorflow/contrib/lite/tools/make/build_ios_universal_lib.sh b/tensorflow/lite/tools/make/build_ios_universal_lib.sh similarity index 69% rename from tensorflow/contrib/lite/tools/make/build_ios_universal_lib.sh rename to tensorflow/lite/tools/make/build_ios_universal_lib.sh index fe056945a6..477883b490 100755 --- a/tensorflow/contrib/lite/tools/make/build_ios_universal_lib.sh +++ b/tensorflow/lite/tools/make/build_ios_universal_lib.sh @@ -23,17 +23,17 @@ cd "$SCRIPT_DIR/../../../../.." make_library() { for arch in x86_64 armv7 armv7s arm64 do - make -f tensorflow/contrib/lite/tools/make/Makefile TARGET=ios TARGET_ARCH=${arch} \ + make -f tensorflow/lite/tools/make/Makefile TARGET=ios TARGET_ARCH=${arch} \ -j 8 done - mkdir -p tensorflow/contrib/lite/tools/make/gen/lib + mkdir -p tensorflow/lite/tools/make/gen/lib lipo \ - tensorflow/contrib/lite/tools/make/gen/ios_x86_64/lib/${1} \ - tensorflow/contrib/lite/tools/make/gen/ios_armv7/lib/${1} \ - tensorflow/contrib/lite/tools/make/gen/ios_armv7s/lib/${1} \ - tensorflow/contrib/lite/tools/make/gen/ios_arm64/lib/${1} \ + tensorflow/lite/tools/make/gen/ios_x86_64/lib/${1} \ + tensorflow/lite/tools/make/gen/ios_armv7/lib/${1} \ + tensorflow/lite/tools/make/gen/ios_armv7s/lib/${1} \ + tensorflow/lite/tools/make/gen/ios_arm64/lib/${1} \ -create \ - -output tensorflow/contrib/lite/tools/make/gen/lib/${1} + -output tensorflow/lite/tools/make/gen/lib/${1} } make_library libtensorflow-lite.a diff --git a/tensorflow/contrib/lite/tools/make/build_rpi_lib.sh b/tensorflow/lite/tools/make/build_rpi_lib.sh similarity index 87% rename from tensorflow/contrib/lite/tools/make/build_rpi_lib.sh rename to tensorflow/lite/tools/make/build_rpi_lib.sh index 24ecd4356d..d4047bb0eb 100755 --- a/tensorflow/contrib/lite/tools/make/build_rpi_lib.sh +++ b/tensorflow/lite/tools/make/build_rpi_lib.sh @@ -19,4 +19,4 @@ set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd "$SCRIPT_DIR/../../../../.." -CC_PREFIX=arm-linux-gnueabihf- make -j 3 -f tensorflow/contrib/lite/tools/make/Makefile TARGET=rpi TARGET_ARCH=armv7l +CC_PREFIX=arm-linux-gnueabihf- make -j 3 -f tensorflow/lite/tools/make/Makefile TARGET=rpi TARGET_ARCH=armv7l diff --git a/tensorflow/contrib/lite/tools/make/download_dependencies.sh b/tensorflow/lite/tools/make/download_dependencies.sh similarity index 98% rename from tensorflow/contrib/lite/tools/make/download_dependencies.sh rename to tensorflow/lite/tools/make/download_dependencies.sh index 3570f9a38d..aa5495329b 100755 --- a/tensorflow/contrib/lite/tools/make/download_dependencies.sh +++ b/tensorflow/lite/tools/make/download_dependencies.sh @@ -19,7 +19,7 @@ set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd "$SCRIPT_DIR/../../../../.." -DOWNLOADS_DIR=tensorflow/contrib/lite/tools/make/downloads +DOWNLOADS_DIR=tensorflow/lite/tools/make/downloads BZL_FILE_PATH=tensorflow/workspace.bzl # Ensure it is being run from repo root diff --git a/tensorflow/contrib/lite/tools/make/targets/ios_makefile.inc b/tensorflow/lite/tools/make/targets/ios_makefile.inc similarity index 100% rename from tensorflow/contrib/lite/tools/make/targets/ios_makefile.inc rename to tensorflow/lite/tools/make/targets/ios_makefile.inc diff --git a/tensorflow/contrib/lite/tools/make/targets/linux_makefile.inc b/tensorflow/lite/tools/make/targets/linux_makefile.inc similarity index 100% rename from tensorflow/contrib/lite/tools/make/targets/linux_makefile.inc rename to tensorflow/lite/tools/make/targets/linux_makefile.inc diff --git a/tensorflow/contrib/lite/tools/make/targets/riscv_makefile.inc b/tensorflow/lite/tools/make/targets/riscv_makefile.inc similarity index 100% rename from tensorflow/contrib/lite/tools/make/targets/riscv_makefile.inc rename to tensorflow/lite/tools/make/targets/riscv_makefile.inc diff --git a/tensorflow/contrib/lite/tools/make/targets/rpi_makefile.inc b/tensorflow/lite/tools/make/targets/rpi_makefile.inc similarity index 100% rename from tensorflow/contrib/lite/tools/make/targets/rpi_makefile.inc rename to tensorflow/lite/tools/make/targets/rpi_makefile.inc diff --git a/tensorflow/contrib/lite/tools/make/targets/stm32f1_makefile.inc b/tensorflow/lite/tools/make/targets/stm32f1_makefile.inc similarity index 100% rename from tensorflow/contrib/lite/tools/make/targets/stm32f1_makefile.inc rename to tensorflow/lite/tools/make/targets/stm32f1_makefile.inc diff --git a/tensorflow/contrib/lite/tools/make/targets/stm32f7_makefile.inc b/tensorflow/lite/tools/make/targets/stm32f7_makefile.inc similarity index 100% rename from tensorflow/contrib/lite/tools/make/targets/stm32f7_makefile.inc rename to tensorflow/lite/tools/make/targets/stm32f7_makefile.inc diff --git a/tensorflow/contrib/lite/tools/optimize/BUILD b/tensorflow/lite/tools/optimize/BUILD similarity index 67% rename from tensorflow/contrib/lite/tools/optimize/BUILD rename to tensorflow/lite/tools/optimize/BUILD index 51ccaedc23..0a0d5cc412 100644 --- a/tensorflow/contrib/lite/tools/optimize/BUILD +++ b/tensorflow/lite/tools/optimize/BUILD @@ -8,17 +8,17 @@ licenses(["notice"]) # Apache 2.0 exports_files(["LICENSE"]) -load("//tensorflow/contrib/lite:build_def.bzl", "tflite_copts") +load("//tensorflow/lite:build_def.bzl", "tflite_copts") cc_library( name = "quantize_weights", srcs = ["quantize_weights.cc"], hdrs = ["quantize_weights.h"], deps = [ - "//tensorflow/contrib/lite:framework", - "//tensorflow/contrib/lite/kernels/internal:tensor_utils", - "//tensorflow/contrib/lite/schema:schema_fbs", "//tensorflow/core:tflite_portable_logging", + "//tensorflow/lite:framework", + "//tensorflow/lite/kernels/internal:tensor_utils", + "//tensorflow/lite/schema:schema_fbs", "@com_google_absl//absl/memory", "@flatbuffers", ], diff --git a/tensorflow/contrib/lite/tools/optimize/g3doc/quantize_weights.md b/tensorflow/lite/tools/optimize/g3doc/quantize_weights.md similarity index 96% rename from tensorflow/contrib/lite/tools/optimize/g3doc/quantize_weights.md rename to tensorflow/lite/tools/optimize/g3doc/quantize_weights.md index 93fe576583..2517882c84 100644 --- a/tensorflow/contrib/lite/tools/optimize/g3doc/quantize_weights.md +++ b/tensorflow/lite/tools/optimize/g3doc/quantize_weights.md @@ -3,7 +3,7 @@ ## Recommended usage The Quantize Weights transformation is integrated with -[tflite_convert](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/toco/g3doc/cmdline_reference.md#transformation-flags). +[tflite_convert](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/toco/g3doc/cmdline_reference.md#transformation-flags). The recommended way of invoking this tool is by simply adding the `--post_training_quantize` flag to your original tflite_convert invocation. For diff --git a/tensorflow/contrib/lite/tools/optimize/quantize_weights.cc b/tensorflow/lite/tools/optimize/quantize_weights.cc similarity index 94% rename from tensorflow/contrib/lite/tools/optimize/quantize_weights.cc rename to tensorflow/lite/tools/optimize/quantize_weights.cc index d02d78bf53..a13774f713 100644 --- a/tensorflow/contrib/lite/tools/optimize/quantize_weights.cc +++ b/tensorflow/lite/tools/optimize/quantize_weights.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/contrib/lite/tools/optimize/quantize_weights.h" +#include "tensorflow/lite/tools/optimize/quantize_weights.h" #include #include @@ -21,10 +21,10 @@ limitations under the License. #include "flatbuffers/flexbuffers.h" #include "absl/memory/memory.h" -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" #include "tensorflow/core/platform/logging.h" namespace tflite { @@ -110,24 +110,24 @@ std::vector GetWeightInputIndices(const BuiltinOperator& op_code) { op_code == BuiltinOperator_EMBEDDING_LOOKUP) { return {1}; } else if (op_code == BuiltinOperator_SVDF) { - // https://www.tensorflow.org/code/tensorflow/contrib/lite/kernels/svdf.cc + // https://www.tensorflow.org/code/tensorflow/lite/kernels/svdf.cc return {1, 2}; } else if (op_code == BuiltinOperator_LSTM || op_code == BuiltinOperator_UNIDIRECTIONAL_SEQUENCE_LSTM) { - // https://www.tensorflow.org/code/tensorflow/contrib/lite/kernels/lstm.cc - // https://www.tensorflow.org/code/tensorflow/contrib/lite/kernels/unidirectional_sequence_lstm.cc + // https://www.tensorflow.org/code/tensorflow/lite/kernels/lstm.cc + // https://www.tensorflow.org/code/tensorflow/lite/kernels/unidirectional_sequence_lstm.cc return {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16}; } else if (op_code == BuiltinOperator_RNN || op_code == BuiltinOperator_UNIDIRECTIONAL_SEQUENCE_RNN) { - // https://www.tensorflow.org/code/tensorflow/contrib/lite/kernels/basic_rnn.cc - // https://www.tensorflow.org/code/tensorflow/contrib/lite/kernels/unidirectional_sequence_rnn.cc + // https://www.tensorflow.org/code/tensorflow/lite/kernels/basic_rnn.cc + // https://www.tensorflow.org/code/tensorflow/lite/kernels/unidirectional_sequence_rnn.cc return {1, 2}; } else if (op_code == BuiltinOperator_BIDIRECTIONAL_SEQUENCE_LSTM) { - // https://www.tensorflow.org/code/tensorflow/contrib/lite/kernels/bidirectional_sequence_lstm.cc + // https://www.tensorflow.org/code/tensorflow/lite/kernels/bidirectional_sequence_lstm.cc return {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 16, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 33}; } else if (op_code == BuiltinOperator_BIDIRECTIONAL_SEQUENCE_RNN) { - // https://www.tensorflow.org/code/tensorflow/contrib/lite/kernels/bidirectional_sequence_rnn.cc + // https://www.tensorflow.org/code/tensorflow/lite/kernels/bidirectional_sequence_rnn.cc return {1, 2, 4, 5}; } return {}; diff --git a/tensorflow/contrib/lite/tools/optimize/quantize_weights.h b/tensorflow/lite/tools/optimize/quantize_weights.h similarity index 85% rename from tensorflow/contrib/lite/tools/optimize/quantize_weights.h rename to tensorflow/lite/tools/optimize/quantize_weights.h index 706f10b87b..c2c0b0ce83 100644 --- a/tensorflow/contrib/lite/tools/optimize/quantize_weights.h +++ b/tensorflow/lite/tools/optimize/quantize_weights.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_CONTRIB_LITE_TOOLS_OPTIMIZE_QUANTIZE_WEIGHTS_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_OPTIMIZE_QUANTIZE_WEIGHTS_H_ +#ifndef TENSORFLOW_LITE_TOOLS_OPTIMIZE_QUANTIZE_WEIGHTS_H_ +#define TENSORFLOW_LITE_TOOLS_OPTIMIZE_QUANTIZE_WEIGHTS_H_ #include #include "flatbuffers/flexbuffers.h" -#include "tensorflow/contrib/lite/context.h" -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/context.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace optimize { @@ -54,4 +54,4 @@ TfLiteStatus QuantizeWeights(flatbuffers::FlatBufferBuilder* builder, } // namespace optimize } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_OPTIMIZE_QUANTIZE_WEIGHTS_H_ +#endif // TENSORFLOW_LITE_TOOLS_OPTIMIZE_QUANTIZE_WEIGHTS_H_ diff --git a/tensorflow/contrib/lite/tools/optimize/quantize_weights_test.cc b/tensorflow/lite/tools/optimize/quantize_weights_test.cc similarity index 95% rename from tensorflow/contrib/lite/tools/optimize/quantize_weights_test.cc rename to tensorflow/lite/tools/optimize/quantize_weights_test.cc index 387b3471c2..32725e5ee2 100644 --- a/tensorflow/contrib/lite/tools/optimize/quantize_weights_test.cc +++ b/tensorflow/lite/tools/optimize/quantize_weights_test.cc @@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/optimize/quantize_weights.h" +#include "tensorflow/lite/tools/optimize/quantize_weights.h" #include #include "flatbuffers/flexbuffers.h" #include #include -#include "tensorflow/contrib/lite/model.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" +#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace optimize { @@ -160,7 +160,7 @@ class QuantizeWeightsTest : public ::testing::Test { TEST_F(QuantizeWeightsTest, SimpleTestWithHybrid) { string model_path = - "third_party/tensorflow/contrib/lite/tools/optimize/testdata/" + "third_party/tensorflow/lite/tools/optimize/testdata/" "mobilenet_v1_0.25_128.tflite"; std::unique_ptr input_fb = FlatBufferModel::BuildFromFile(model_path.data()); @@ -177,7 +177,7 @@ TEST_F(QuantizeWeightsTest, SimpleTestWithHybrid) { TEST_F(QuantizeWeightsTest, SimpleTestWithoutHybrid) { string model_path = - "third_party/tensorflow/contrib/lite/tools/optimize/testdata/" + "third_party/tensorflow/lite/tools/optimize/testdata/" "mobilenet_v1_0.25_128.tflite"; std::unique_ptr input_fb = FlatBufferModel::BuildFromFile(model_path.data()); @@ -195,7 +195,7 @@ TEST_F(QuantizeWeightsTest, SimpleTestWithoutHybrid) { TEST_F(QuantizeWeightsTest, SimpleTestWithWeightsMinNumElements) { string model_path = - "third_party/tensorflow/contrib/lite/tools/optimize/testdata/" + "third_party/tensorflow/lite/tools/optimize/testdata/" "mobilenet_v1_0.25_128.tflite"; std::unique_ptr input_fb = FlatBufferModel::BuildFromFile(model_path.data()); diff --git a/tensorflow/contrib/lite/tools/verifier.cc b/tensorflow/lite/tools/verifier.cc similarity index 97% rename from tensorflow/contrib/lite/tools/verifier.cc rename to tensorflow/lite/tools/verifier.cc index 8d3a7a6242..02d6e6b23c 100644 --- a/tensorflow/contrib/lite/tools/verifier.cc +++ b/tensorflow/lite/tools/verifier.cc @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/contrib/lite/tools/verifier.h" +#include "tensorflow/lite/tools/verifier.h" #include -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/string_util.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_util.h" +#include "tensorflow/lite/version.h" namespace tflite { diff --git a/tensorflow/contrib/lite/tools/verifier.h b/tensorflow/lite/tools/verifier.h similarity index 87% rename from tensorflow/contrib/lite/tools/verifier.h rename to tensorflow/lite/tools/verifier.h index a596c650a0..50b6432d4e 100644 --- a/tensorflow/contrib/lite/tools/verifier.h +++ b/tensorflow/lite/tools/verifier.h @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#ifndef TENSORFLOW_CONTRIB_LITE_TOOLS_VERIFIER_H_ -#define TENSORFLOW_CONTRIB_LITE_TOOLS_VERIFIER_H_ +#ifndef TENSORFLOW_LITE_TOOLS_VERIFIER_H_ +#define TENSORFLOW_LITE_TOOLS_VERIFIER_H_ #include -#include "tensorflow/contrib/lite/error_reporter.h" -#include "tensorflow/contrib/lite/model.h" +#include "tensorflow/lite/error_reporter.h" +#include "tensorflow/lite/model.h" namespace tflite { @@ -49,4 +49,4 @@ bool Verify(const void* buf, size_t len, const OpResolver& resolver, } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_TOOLS_VERIFIER_H_ +#endif // TENSORFLOW_LITE_TOOLS_VERIFIER_H_ diff --git a/tensorflow/contrib/lite/tools/verifier_test.cc b/tensorflow/lite/tools/verifier_test.cc similarity index 96% rename from tensorflow/contrib/lite/tools/verifier_test.cc rename to tensorflow/lite/tools/verifier_test.cc index ad7d59ecb4..98abafad92 100644 --- a/tensorflow/contrib/lite/tools/verifier_test.cc +++ b/tensorflow/lite/tools/verifier_test.cc @@ -18,13 +18,13 @@ limitations under the License. #include "flatbuffers/flatbuffers.h" #include "flatbuffers/util.h" #include -#include "tensorflow/contrib/lite/allocation.h" -#include "tensorflow/contrib/lite/error_reporter.h" -#include "tensorflow/contrib/lite/op_resolver.h" -#include "tensorflow/contrib/lite/schema/schema_generated.h" -#include "tensorflow/contrib/lite/testing/util.h" -#include "tensorflow/contrib/lite/tools/verifier.h" -#include "tensorflow/contrib/lite/version.h" +#include "tensorflow/lite/allocation.h" +#include "tensorflow/lite/error_reporter.h" +#include "tensorflow/lite/op_resolver.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/testing/util.h" +#include "tensorflow/lite/tools/verifier.h" +#include "tensorflow/lite/version.h" #include "tensorflow/core/framework/numeric_types.h" namespace tflite { diff --git a/tensorflow/contrib/lite/tools/visualize.py b/tensorflow/lite/tools/visualize.py similarity index 99% rename from tensorflow/contrib/lite/tools/visualize.py rename to tensorflow/lite/tools/visualize.py index bf8889aa2a..431da2ef08 100644 --- a/tensorflow/contrib/lite/tools/visualize.py +++ b/tensorflow/lite/tools/visualize.py @@ -31,7 +31,7 @@ import sys from tensorflow.python.platform import resource_loader # Schema to use for flatbuffers -_SCHEMA = "third_party/tensorflow/contrib/lite/schema/schema.fbs" +_SCHEMA = "third_party/tensorflow/lite/schema/schema.fbs" # TODO(angerson): fix later when rules are simplified.. _SCHEMA = resource_loader.get_path_to_datafile("../schema/schema.fbs") diff --git a/tensorflow/contrib/lite/tutorials/BUILD b/tensorflow/lite/tutorials/BUILD similarity index 100% rename from tensorflow/contrib/lite/tutorials/BUILD rename to tensorflow/lite/tutorials/BUILD diff --git a/tensorflow/contrib/lite/tutorials/dataset.py b/tensorflow/lite/tutorials/dataset.py similarity index 100% rename from tensorflow/contrib/lite/tutorials/dataset.py rename to tensorflow/lite/tutorials/dataset.py diff --git a/tensorflow/contrib/lite/tutorials/mnist_tflite.py b/tensorflow/lite/tutorials/mnist_tflite.py similarity index 95% rename from tensorflow/contrib/lite/tutorials/mnist_tflite.py rename to tensorflow/lite/tutorials/mnist_tflite.py index 7b8bf5b5db..002365717f 100644 --- a/tensorflow/contrib/lite/tutorials/mnist_tflite.py +++ b/tensorflow/lite/tutorials/mnist_tflite.py @@ -19,7 +19,7 @@ from __future__ import division from __future__ import print_function import numpy as np import tensorflow as tf # pylint: disable=g-bad-import-order -from tensorflow.contrib.lite.tutorials import dataset +from tensorflow.lite.tutorials import dataset flags = tf.app.flags flags.DEFINE_string('data_dir', '/tmp/data_dir', @@ -69,7 +69,7 @@ def run_eval(interpreter, input_image): def main(_): - interpreter = tf.contrib.lite.Interpreter(model_path=flags.model_file) + interpreter = tf.lite.Interpreter(model_path=flags.model_file) interpreter.allocate_tensors() num_correct, total = 0, 0 for input_data in test_image_generator(): diff --git a/tensorflow/contrib/lite/tutorials/post_training_quant.ipynb b/tensorflow/lite/tutorials/post_training_quant.ipynb similarity index 95% rename from tensorflow/contrib/lite/tutorials/post_training_quant.ipynb rename to tensorflow/lite/tutorials/post_training_quant.ipynb index 80cdb2f080..3ff145d9ce 100644 --- a/tensorflow/contrib/lite/tutorials/post_training_quant.ipynb +++ b/tensorflow/lite/tutorials/post_training_quant.ipynb @@ -19,10 +19,10 @@ "source": [ "\u003ctable class=\"tfo-notebook-buttons\" align=\"left\"\u003e\n", " \u003ctd\u003e\n", - " \u003ca target=\"_blank\" href=\"https://colab.research.google.com/github/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/tutorials/post_training_quant.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" /\u003eRun in Google Colab\u003c/a\u003e\n", + " \u003ca target=\"_blank\" href=\"https://colab.research.google.com/github/tensorflow/tensorflow/blob/master/tensorflow/lite/tutorials/post_training_quant.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/colab_logo_32px.png\" /\u003eRun in Google Colab\u003c/a\u003e\n", " \u003c/td\u003e\n", " \u003ctd\u003e\n", - " \u003ca target=\"_blank\" href=\"https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/tutorials/post_training_quant.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/GitHub-Mark-32px.png\" /\u003eView source on GitHub\u003c/a\u003e\n", + " \u003ca target=\"_blank\" href=\"https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/tutorials/post_training_quant.ipynb\"\u003e\u003cimg src=\"https://www.tensorflow.org/images/GitHub-Mark-32px.png\" /\u003eView source on GitHub\u003c/a\u003e\n", " \u003c/td\u003e\n", "\u003c/table\u003e" ] @@ -252,7 +252,7 @@ "source": [ "import tensorflow as tf\n", "tf.enable_eager_execution()\n", - "converter = tf.contrib.lite.TocoConverter.from_saved_model(saved_model_dir)\n", + "converter = tf.lite.TocoConverter.from_saved_model(saved_model_dir)\n", "tflite_model = converter.convert()" ] }, @@ -386,7 +386,7 @@ "images, labels = tf.to_float(mnist_test[0])/255.0, mnist_test[1]\n", "\n", "# Note: If you change the batch size, then use \n", - "# `tf.contrib.lite.Interpreter.resize_tensor_input` to also change it for\n", + "# `tf.lite.Interpreter.resize_tensor_input` to also change it for\n", "# the interpreter.\n", "mnist_ds = tf.data.Dataset.from_tensor_slices((images, labels)).batch(1)" ] @@ -411,7 +411,7 @@ }, "outputs": [], "source": [ - "interpreter = tf.contrib.lite.Interpreter(model_path=str(tflite_model_file))\n", + "interpreter = tf.lite.Interpreter(model_path=str(tflite_model_file))\n", "interpreter.allocate_tensors()\n", "input_index = interpreter.get_input_details()[0][\"index\"]\n", "output_index = interpreter.get_output_details()[0][\"index\"]" @@ -428,7 +428,7 @@ "outputs": [], "source": [ "tf.logging.set_verbosity(tf.logging.DEBUG)\n", - "interpreter_quant = tf.contrib.lite.Interpreter(model_path=str(tflite_model_quant_file))" + "interpreter_quant = tf.lite.Interpreter(model_path=str(tflite_model_quant_file))" ] }, { @@ -592,7 +592,7 @@ "\n", "We now consider another example. Resnets with pre-activation layers (Resnet-v2) are widely used for vision applications.\n", " Pre-trained frozen graph for resnet-v2-101 is available at the\n", - " [Tensorflow Lite model repository](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/lite/g3doc/models.md).\n", + " [Tensorflow Lite model repository](https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/g3doc/models.md).\n", "\n", "We can convert the frozen graph to a TFLite flatbuffer with quantization by:\n" ] @@ -648,7 +648,7 @@ "graph_def_file = pathlib.Path(archive_path).parent/\"resnet_v2_101_299_frozen.pb\"\n", "input_arrays = [\"input\"] \n", "output_arrays = [\"output\"]\n", - "converter = tf.contrib.lite.TocoConverter.from_frozen_graph(\n", + "converter = tf.lite.TocoConverter.from_frozen_graph(\n", " str(graph_def_file), input_arrays, output_arrays, input_shapes={\"input\":[1,299,299,3]})\n", "converter.post_training_quantize = True\n", "resnet_tflite_file = graph_def_file.parent/\"resnet_v2_101_quantized.tflite\"\n", @@ -678,7 +678,7 @@ "source": [ "\n", "The model size reduces from 171 MB to 43 MB.\n", - "The accuracy of this model on imagenet can be evaluated using the scripts provided for [TFLite accuracy measurement](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/contrib/lite/tools/accuracy/ilsvrc).\n", + "The accuracy of this model on imagenet can be evaluated using the scripts provided for [TFLite accuracy measurement](https://github.com/tensorflow/tensorflow/tree/master/tensorflow/lite/tools/accuracy/ilsvrc).\n", "\n", "The optimized model top-1 accuracy is 76.8, the same as the floating point model." ] diff --git a/tensorflow/contrib/lite/util.cc b/tensorflow/lite/util.cc similarity index 97% rename from tensorflow/contrib/lite/util.cc rename to tensorflow/lite/util.cc index 6aa35b5227..866e4ebb0a 100644 --- a/tensorflow/contrib/lite/util.cc +++ b/tensorflow/lite/util.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/contrib/lite/util.h" +#include "tensorflow/lite/util.h" #include diff --git a/tensorflow/contrib/lite/util.h b/tensorflow/lite/util.h similarity index 92% rename from tensorflow/contrib/lite/util.h rename to tensorflow/lite/util.h index 31292a6f81..64a5b52e2f 100644 --- a/tensorflow/contrib/lite/util.h +++ b/tensorflow/lite/util.h @@ -18,11 +18,11 @@ limitations under the License. // Flatbuffer vectors. These functions can't live in `context.h` since it's pure // C. -#ifndef TENSORFLOW_CONTRIB_LITE_UTIL_H_ -#define TENSORFLOW_CONTRIB_LITE_UTIL_H_ +#ifndef TENSORFLOW_LITE_UTIL_H_ +#define TENSORFLOW_LITE_UTIL_H_ #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" +#include "tensorflow/lite/c/c_api_internal.h" namespace tflite { @@ -54,4 +54,4 @@ size_t CombineHashes(std::initializer_list hashes); } // namespace tflite -#endif // TENSORFLOW_CONTRIB_LITE_UTIL_H_ +#endif // TENSORFLOW_LITE_UTIL_H_ diff --git a/tensorflow/contrib/lite/util_test.cc b/tensorflow/lite/util_test.cc similarity index 94% rename from tensorflow/contrib/lite/util_test.cc rename to tensorflow/lite/util_test.cc index 25f3aded71..606d242747 100644 --- a/tensorflow/contrib/lite/util_test.cc +++ b/tensorflow/lite/util_test.cc @@ -17,8 +17,8 @@ limitations under the License. #include #include -#include "tensorflow/contrib/lite/c/c_api_internal.h" -#include "tensorflow/contrib/lite/util.h" +#include "tensorflow/lite/c/c_api_internal.h" +#include "tensorflow/lite/util.h" namespace tflite { namespace { diff --git a/tensorflow/contrib/lite/version.h b/tensorflow/lite/version.h similarity index 87% rename from tensorflow/contrib/lite/version.h rename to tensorflow/lite/version.h index efd63f4006..639d5a336a 100644 --- a/tensorflow/contrib/lite/version.h +++ b/tensorflow/lite/version.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_CONTRIB_LITE_VERSION_H_ -#define TENSORFLOW_CONTRIB_LITE_VERSION_H_ +#ifndef TENSORFLOW_LITE_VERSION_H_ +#define TENSORFLOW_LITE_VERSION_H_ // The version number of the Schema. Ideally all changes will be backward // compatible. If that ever changes, we must ensure that version is the first // entry in the new tflite root so that we can see that version is not 1. #define TFLITE_SCHEMA_VERSION (3) -#endif // TENSORFLOW_CONTRIB_LITE_VERSION_H_ +#endif // TENSORFLOW_LITE_VERSION_H_ diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index 82a0f33c87..9aa74edf21 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -7,10 +7,10 @@ visibility = [ "//engedu/ml/tf_from_scratch:__pkg__", "//tensorflow:internal", - "//tensorflow/contrib/lite/toco/python:__pkg__", + "//tensorflow/lite/toco/python:__pkg__", "//tensorflow_models:__subpackages__", # TODO(aselle): to pass open source test. - "//bazel_pip/tensorflow/contrib/lite/toco/python:__pkg__", + "//bazel_pip/tensorflow/lite/toco/python:__pkg__", ] package(default_visibility = visibility) @@ -58,7 +58,7 @@ py_library( "//tensorflow/compiler/aot/tests:__pkg__", # TODO(b/34059704): remove when fixed "//tensorflow/contrib/learn:__pkg__", # TODO(b/34059704): remove when fixed "//tensorflow/contrib/learn/python/learn/datasets:__pkg__", # TODO(b/34059704): remove when fixed - "//tensorflow/contrib/lite/toco/python:__pkg__", # TODO(b/34059704): remove when fixed + "//tensorflow/lite/toco/python:__pkg__", # TODO(b/34059704): remove when fixed "//tensorflow/python/debug:__pkg__", # TODO(b/34059704): remove when fixed "//tensorflow/python/tools:__pkg__", # TODO(b/34059704): remove when fixed "//tensorflow/tools/quantization:__pkg__", # TODO(b/34059704): remove when fixed @@ -136,8 +136,8 @@ py_library( ":util", ":weights_broadcast_ops", ":while_v2", - "//tensorflow/contrib/lite/python:lite", "//tensorflow/core:protos_all_py", + "//tensorflow/lite/python:lite", "//tensorflow/python/compat", "//tensorflow/python/data", "//tensorflow/python/distribute:estimator_training", diff --git a/tensorflow/python/tools/api/generator/api_gen.bzl b/tensorflow/python/tools/api/generator/api_gen.bzl index 168d37f44a..2e5d875a58 100644 --- a/tensorflow/python/tools/api/generator/api_gen.bzl +++ b/tensorflow/python/tools/api/generator/api_gen.bzl @@ -17,7 +17,7 @@ def gen_api_init_files( api_version = 2, compat_api_versions = [], compat_init_templates = [], - packages = ["tensorflow.python", "tensorflow.contrib.lite.python.lite"], + packages = ["tensorflow.python", "tensorflow.lite.python.lite"], package_deps = ["//tensorflow/python:no_contrib"], output_package = "tensorflow", output_dir = ""): diff --git a/tensorflow/python/tools/api/generator/output_init_files_test.py b/tensorflow/python/tools/api/generator/output_init_files_test.py index 1514b5fad2..ab154af910 100644 --- a/tensorflow/python/tools/api/generator/output_init_files_test.py +++ b/tensorflow/python/tools/api/generator/output_init_files_test.py @@ -23,7 +23,7 @@ import sys # available in sys.modules # pylint: disable=unused-import from tensorflow import python as _tf_for_api_traversal -from tensorflow.contrib.lite.python import lite as _tflite_for_api_traversal +from tensorflow.lite.python import lite as _tflite_for_api_traversal # pylint: enable=unused-import from tensorflow.python.platform import test from tensorflow.python.util import tf_decorator diff --git a/tensorflow/tools/api/golden/v1/tensorflow.lite.-interpreter.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.lite.-interpreter.pbtxt index 9a22ee1f87..ec0d9522bc 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.lite.-interpreter.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.lite.-interpreter.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.Interpreter" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt index 66bf5256f6..1fe179f6c1 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.OpHint.OpHintArgumentTracker" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.pbtxt index 8c8e55f6cf..66e692a5a3 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.lite.-op-hint.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.OpHint" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member { name: "AGGREGATE_FIRST" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.lite.-t-f-lite-converter.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.lite.-t-f-lite-converter.pbtxt index b695c6cdf6..c955b1a04a 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.lite.-t-f-lite-converter.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.lite.-t-f-lite-converter.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.TFLiteConverter" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.lite.-toco-converter.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.lite.-toco-converter.pbtxt index da46b3f031..3ef90b8bc4 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.lite.-toco-converter.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.lite.-toco-converter.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.TocoConverter" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.lite.-interpreter.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.lite.-interpreter.pbtxt index 9a22ee1f87..ec0d9522bc 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.lite.-interpreter.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.lite.-interpreter.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.Interpreter" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt index 66bf5256f6..1fe179f6c1 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.-op-hint-argument-tracker.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.OpHint.OpHintArgumentTracker" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.pbtxt index 8c8e55f6cf..66e692a5a3 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.lite.-op-hint.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.OpHint" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member { name: "AGGREGATE_FIRST" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.lite.-t-f-lite-converter.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.lite.-t-f-lite-converter.pbtxt index b695c6cdf6..c955b1a04a 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.lite.-t-f-lite-converter.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.lite.-t-f-lite-converter.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.TFLiteConverter" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.lite.-toco-converter.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.lite.-toco-converter.pbtxt index da46b3f031..3ef90b8bc4 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.lite.-toco-converter.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.lite.-toco-converter.pbtxt @@ -1,6 +1,6 @@ path: "tensorflow.lite.TocoConverter" tf_class { - is_instance: "" + is_instance: "" is_instance: "" member_method { name: "__init__" diff --git a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py index 9593c42d03..70df38ba8b 100644 --- a/tensorflow/tools/api/lib/python_object_to_proto_visitor.py +++ b/tensorflow/tools/api/lib/python_object_to_proto_visitor.py @@ -51,9 +51,9 @@ if sys.version_info.major == 3: _NORMALIZE_TYPE[""] = "" _NORMALIZE_ISINSTANCE = { "": # pylint: disable=line-too-long + "'tensorflow.lite.python.op_hint.OpHint.OpHintArgumentTracker'>": # pylint: disable=line-too-long "", + "'tensorflow.lite.python.op_hint.OpHintArgumentTracker'>", "": # pylint: disable=line-too-long "