Move tensorflow/lite/experimental/lrt to tensorflow/lite/experimental…

…/litert PiperOrigin-RevId: 689239882
GesuBackups · Oct 24, 2024 · 1ab2aac · 1ab2aac
1 parent 2519c13
commit 1ab2aac
Show file tree

Hide file tree

Showing 199 changed files with 1,208 additions and 1,186 deletions.
diff --git a/tensorflow/compiler/mlir/lite/BUILD b/tensorflow/compiler/mlir/lite/BUILD
@@ -27,8 +27,7 @@ package_group(
         "//third_party/iree/...",
         "//third_party/odml/infra/...",
         "//tensorflow/compiler/mlir/...",
-        "//tensorflow/lite/experimental/lrt/...",
-        "//tensorflow/lite/python/...",
+        "//tensorflow/lite/...",
         "//waymo/accelerator/alpine/tools/...",
         "//waymo/ml/compiler/mlir/...",
         # Allow visibility from the mlir language server.

diff --git a/tensorflow/lite/experimental/lrt/BUILD → tensorflow/lite/experimental/litert/BUILD b/tensorflow/lite/experimental/lrt/BUILD → tensorflow/lite/experimental/litert/BUILD
@@ -14,5 +14,5 @@
 
 package(
     # copybara:uncomment default_applicable_licenses = ["//tensorflow:license"],
-    default_visibility = ["//tensorflow/lite/experimental/lrt:__subpackages__"],
+    default_visibility = ["//tensorflow/lite/experimental/litert:__subpackages__"],
 )
diff --git a/.../lite/experimental/lrt/build_common/BUILD → ...te/experimental/litert/build_common/BUILD b/.../lite/experimental/lrt/build_common/BUILD → ...te/experimental/litert/build_common/BUILD
@@ -14,7 +14,7 @@
 
 package(
     # copybara:uncomment default_applicable_licenses = ["//tensorflow:license"],
-    default_visibility = ["//tensorflow/lite/experimental/lrt:__subpackages__"],
+    default_visibility = ["//tensorflow/lite/experimental/litert:__subpackages__"],
 )
 
 exports_files(srcs = ["export_litert_only.lds"])
diff --git a/...l/lrt/build_common/export_litert_only.lds → ...itert/build_common/export_litert_only.lds b/...l/lrt/build_common/export_litert_only.lds → ...itert/build_common/export_litert_only.lds
diff --git a/...al/lrt/build_common/litert_build_defs.bzl → ...litert/build_common/litert_build_defs.bzl b/...al/lrt/build_common/litert_build_defs.bzl → ...litert/build_common/litert_build_defs.bzl
@@ -64,7 +64,7 @@ _SYS_ELF_INTERPRETER_LINKOPT_X86_64 = make_linkopt("--dynamic-linker={}".format(
 ####################################################################################################
 # Symbol Hiding
 
-_EXPORT_LRT_ONLY_SCRIPT = "//tensorflow/lite/experimental/lrt/build_common:export_litert_only.lds"
+_EXPORT_LRT_ONLY_SCRIPT = "//tensorflow/lite/experimental/litert/build_common:export_litert_only.lds"
 _EXPORT_LRT_ONLY_LINKOPT = _make_script_linkopt(_EXPORT_LRT_ONLY_SCRIPT)
 
 ####################################################################################################

diff --git a/tensorflow/lite/experimental/lrt/c/BUILD → tensorflow/lite/experimental/litert/c/BUILD b/tensorflow/lite/experimental/lrt/c/BUILD → tensorflow/lite/experimental/litert/c/BUILD
@@ -14,7 +14,7 @@
 
 package(
     # copybara:uncomment default_applicable_licenses = ["//tensorflow:license"],
-    default_visibility = ["//tensorflow/lite/experimental/lrt:__subpackages__"],
+    default_visibility = ["//tensorflow/lite/experimental/litert:__subpackages__"],
 )
 
 cc_library(
@@ -74,7 +74,7 @@ cc_library(
     deps = [
         ":litert_c_api",
         ":litert_logging",
-        "//tensorflow/lite/experimental/lrt/core:tensor_buffer",
+        "//tensorflow/lite/experimental/litert/core:tensor_buffer",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/types:span",
@@ -93,7 +93,7 @@ cc_test(
     deps = [
         ":litert_c_api",
         ":litert_tensor_buffer",
-        "//tensorflow/lite/experimental/lrt/core:tensor_buffer",
+        "//tensorflow/lite/experimental/litert/core:tensor_buffer",
         "@com_google_googletest//:gtest_main",
     ],
 )

diff --git a/...w/lite/experimental/lrt/c/litert_common.h → ...ite/experimental/litert/c/litert_common.h b/...w/lite/experimental/lrt/c/litert_common.h → ...ite/experimental/litert/c/litert_common.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_COMMON_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_COMMON_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_COMMON_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_COMMON_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,4 +83,4 @@ typedef enum {
 }
 #endif  // __cplusplus
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_COMMON_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_COMMON_H_
diff --git a/...rimental/lrt/c/litert_dispatch_delegate.h → ...ental/litert/c/litert_dispatch_delegate.h b/...rimental/lrt/c/litert_dispatch_delegate.h → ...ental/litert/c/litert_dispatch_delegate.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_DISPATCH_DELEGATE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_DISPATCH_DELEGATE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_DISPATCH_DELEGATE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_DISPATCH_DELEGATE_H_
 
 #include <cstddef>
 
@@ -79,4 +79,4 @@ tflite::TfLiteOpaqueDelegateUniquePtr DispatchDelegateCreatePtr(
 }  // namespace litert
 #endif
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_DISPATCH_DELEGATE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_DISPATCH_DELEGATE_H_
diff --git a/...w/lite/experimental/lrt/c/litert_event.cc → ...ite/experimental/litert/c/litert_event.cc b/...w/lite/experimental/lrt/c/litert_event.cc → ...ite/experimental/litert/c/litert_event.cc
@@ -12,19 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/lite/experimental/lrt/c/litert_event.h"
+#include "tensorflow/lite/experimental/litert/c/litert_event.h"
 
 #include <fcntl.h>
 #include <poll.h>
 #include <unistd.h>
 
-#include <cerrno>
-#include <cstddef>
 #include <cstdint>
-#include <cstring>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
-#include "tensorflow/lite/experimental/lrt/core/event.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/core/event.h"
 
 #if LITERT_HAS_SYNC_FENCE_SUPPORT
 LiteRtStatus LiteRtEventCreateFromSyncFenceFd(int sync_fence_fd, bool owns_fd,

diff --git a/...ow/lite/experimental/lrt/c/litert_event.h → ...lite/experimental/litert/c/litert_event.h b/...ow/lite/experimental/lrt/c/litert_event.h → ...lite/experimental/litert/c/litert_event.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_EVENT_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_EVENT_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_EVENT_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_EVENT_H_
 
 #include <stdint.h>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,4 +41,4 @@ void LiteRtEventDestroy(LiteRtEvent event);
 }
 #endif  // __cplusplus
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_EVENT_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_EVENT_H_
diff --git a/...lite/experimental/lrt/c/litert_logging.cc → ...e/experimental/litert/c/litert_logging.cc b/...lite/experimental/lrt/c/litert_logging.cc → ...e/experimental/litert/c/litert_logging.cc
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/lite/experimental/lrt/c/litert_logging.h"
+#include "tensorflow/lite/experimental/litert/c/litert_logging.h"
 
 #include <cstdarg>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
 #include "tensorflow/lite/logger.h"
 #include "tensorflow/lite/minimal_logging.h"
 

diff --git a/.../lite/experimental/lrt/c/litert_logging.h → ...te/experimental/litert/c/litert_logging.h b/.../lite/experimental/lrt/c/litert_logging.h → ...te/experimental/litert/c/litert_logging.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_LOGGING_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_LOGGING_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_LOGGING_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_LOGGING_H_
 
 #include <stdarg.h>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -84,4 +84,4 @@ LiteRtStatus LiteRtDefaultLoggerLog(LiteRtLogSeverity severity,
 #define LITERT_LOG(severity, format, ...) \
   LITERT_LOGGER_LOG(LiteRtGetDefaultLogger(), severity, format, ##__VA_ARGS__);
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_LOGGING_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_LOGGING_H_
diff --git a/...experimental/lrt/c/litert_logging_test.cc → ...erimental/litert/c/litert_logging_test.cc b/...experimental/lrt/c/litert_logging_test.cc → ...erimental/litert/c/litert_logging_test.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/lite/experimental/lrt/c/litert_logging.h"
+#include "tensorflow/lite/experimental/litert/c/litert_logging.h"
 
 #include <gtest/gtest.h>  // NOLINT: Need when ANDROID_API_LEVEL >= 26
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
 
 TEST(Layout, Creation) {
   LiteRtLogger logger;

diff --git a/...ow/lite/experimental/lrt/c/litert_model.h → ...lite/experimental/litert/c/litert_model.h b/...ow/lite/experimental/lrt/c/litert_model.h → ...lite/experimental/litert/c/litert_model.h
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_MODEL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_MODEL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_MODEL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_MODEL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "tensorflow/lite/core/c/c_api_types.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_op_code.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_op_code.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -194,4 +194,4 @@ LiteRtStatus PushOp(LiteRtOpList op_list, LiteRtOp op);
 }
 #endif  // __cplusplus
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_MODEL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_MODEL_H_
diff --git a/.../lite/experimental/lrt/c/litert_op_code.h → ...te/experimental/litert/c/litert_op_code.h b/.../lite/experimental/lrt/c/litert_op_code.h → ...te/experimental/litert/c/litert_op_code.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_OP_CODE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_OP_CODE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_OP_CODE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_OP_CODE_H_
 
 #include "tensorflow/lite/builtin_ops.h"
 
@@ -242,4 +242,4 @@ typedef enum {
 }
 #endif  // __cplusplus
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_OP_CODE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_OP_CODE_H_
diff --git a/.../lite/experimental/lrt/c/litert_options.h → ...te/experimental/litert/c/litert_options.h b/.../lite/experimental/lrt/c/litert_options.h → ...te/experimental/litert/c/litert_options.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_OPTIONS_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_OPTIONS_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_OPTIONS_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_OPTIONS_H_
 
 #include <cstdint>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -160,4 +160,4 @@ LiteRtStatus LiteRtReshapeGetNewShapeOption(LiteRtOp op, int32_t** new_shape,
 }
 #endif  // __cplusplus
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_OPTIONS_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_OPTIONS_H_
diff --git a/.../lite/experimental/lrt/c/litert_support.h → ...te/experimental/litert/c/litert_support.h b/.../lite/experimental/lrt/c/litert_support.h → ...te/experimental/litert/c/litert_support.h
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_SUPPORT_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_SUPPORT_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_SUPPORT_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_SUPPORT_H_
 
 #include <alloca.h>
 #include <stdio.h>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"  // IWYU pragma: keep
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"  // IWYU pragma: keep
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,4 +60,4 @@ extern "C" {
 }  // extern "C"
 #endif
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_SUPPORT_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_SUPPORT_H_
diff --git a/...xperimental/lrt/c/litert_tensor_buffer.cc → ...rimental/litert/c/litert_tensor_buffer.cc b/...xperimental/lrt/c/litert_tensor_buffer.cc → ...rimental/litert/c/litert_tensor_buffer.cc
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/lite/experimental/lrt/c/litert_tensor_buffer.h"
+#include "tensorflow/lite/experimental/litert/c/litert_tensor_buffer.h"
 
 #include <cstddef>
 #include <cstdint>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/span.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_event.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_logging.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_model.h"
-#include "tensorflow/lite/experimental/lrt/core/tensor_buffer.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_event.h"
+#include "tensorflow/lite/experimental/litert/c/litert_logging.h"
+#include "tensorflow/lite/experimental/litert/c/litert_model.h"
+#include "tensorflow/lite/experimental/litert/core/tensor_buffer.h"
 
 LiteRtStatus LiteRtCreateTensorBufferFromHostMemory(
     const LiteRtRankedTensorType* tensor_type, void* host_buffer_addr,

diff --git a/...experimental/lrt/c/litert_tensor_buffer.h → ...erimental/litert/c/litert_tensor_buffer.h b/...experimental/lrt/c/litert_tensor_buffer.h → ...erimental/litert/c/litert_tensor_buffer.h
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_TENSOR_BUFFER_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_TENSOR_BUFFER_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_TENSOR_BUFFER_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_TENSOR_BUFFER_H_
 
 #include <memory.h>
 #include <stddef.h>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_event.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_model.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_event.h"
+#include "tensorflow/lite/experimental/litert/c/litert_model.h"
 
 #if LITERT_HAS_AHWB_SUPPORT
 #include <android/hardware_buffer.h>
@@ -179,4 +179,4 @@ void LiteRtDestroyTensorBuffer(LiteRtTensorBuffer buffer);
 }
 #endif  // __cplusplus
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_TENSOR_BUFFER_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_TENSOR_BUFFER_H_
diff --git a/...rt/c/litert_tensor_buffer_requirements.cc → ...rt/c/litert_tensor_buffer_requirements.cc b/...rt/c/litert_tensor_buffer_requirements.cc → ...rt/c/litert_tensor_buffer_requirements.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "tensorflow/lite/experimental/lrt/c/litert_tensor_buffer_requirements.h"
+#include "tensorflow/lite/experimental/litert/c/litert_tensor_buffer_requirements.h"
 
 #include <cstddef>
 #include <vector>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_tensor_buffer.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_tensor_buffer.h"
 
 class LiteRtTensorBufferRequirementsT {
  public:

diff --git a/...lrt/c/litert_tensor_buffer_requirements.h → ...ert/c/litert_tensor_buffer_requirements.h b/...lrt/c/litert_tensor_buffer_requirements.h → ...ert/c/litert_tensor_buffer_requirements.h
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_TENSOR_BUFFER_REQUIREMENTS_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_TENSOR_BUFFER_REQUIREMENTS_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_TENSOR_BUFFER_REQUIREMENTS_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_TENSOR_BUFFER_REQUIREMENTS_H_
 
 #include <cstddef>
 
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_tensor_buffer.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_tensor_buffer.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,4 +48,4 @@ void LiteRtDestroyTensorBufferRequirements(
 }
 #endif  // __cplusplus
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LRT_C_LITERT_TENSOR_BUFFER_REQUIREMENTS_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_LITERT_C_LITERT_TENSOR_BUFFER_REQUIREMENTS_H_
diff --git a/...litert_tensor_buffer_requirements_test.cc → ...litert_tensor_buffer_requirements_test.cc b/...litert_tensor_buffer_requirements_test.cc → ...litert_tensor_buffer_requirements_test.cc
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "tensorflow/lite/experimental/litert/c/litert_tensor_buffer_requirements.h"
+
 #include <cstring>
 
 #include <gtest/gtest.h>  // NOLINT: Need when ANDROID_API_LEVEL >= 26
-#include "tensorflow/lite/experimental/lrt/c/litert_common.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_tensor_buffer.h"
-#include "tensorflow/lite/experimental/lrt/c/litert_tensor_buffer_requirements.h"
+#include "tensorflow/lite/experimental/litert/c/litert_common.h"
+#include "tensorflow/lite/experimental/litert/c/litert_tensor_buffer.h"
 
 namespace {