undo internal change

Author: JacobSzwejbka

backends/aoti/common_shims.cpp

@@ -7,19 +7,20 @@
  */
 
 #include <executorch/backends/aoti/common_shims.h>
-#include <executorch/extension/tensor/tensor_ptr.h>
 #include <executorch/runtime/platform/log.h>
 #include <cstdint>
 
 namespace executorch {
 namespace backends {
 namespace aoti {
 
+namespace internal {
 // Global storage for tensor metadata
 AOTI_SHIM_EXPORT std::unordered_map<Tensor*, std::vector<int64_t>>
     tensor_to_sizes;
 AOTI_SHIM_EXPORT std::unordered_map<Tensor*, std::vector<int64_t>>
     tensor_to_strides;
+} // namespace internal
 
 extern "C" {
 
@@ -51,10 +52,10 @@ AOTITorchError aoti_torch_get_storage_offset(
 }
 
 AOTITorchError aoti_torch_get_strides(Tensor* tensor, int64_t** ret_strides) {
-  auto it = tensor_to_strides.find(tensor);
+  auto it = internal::tensor_to_strides.find(tensor);
   bool needs_update = false;
 
-  if (it == tensor_to_strides.end()) {
+  if (it == internal::tensor_to_strides.end()) {
     needs_update = true;
   } else {
     // CRITICAL: Multimodal models reuse tensors with different shapes across
@@ -75,7 +76,7 @@ AOTITorchError aoti_torch_get_strides(Tensor* tensor, int64_t** ret_strides) {
     for (int i = 0; i < tensor->dim(); i++) {
       strides[i] = tensor_strides[i];
     }
-    it = tensor_to_strides.insert_or_assign(tensor, std::move(strides)).first;
+    it = internal::tensor_to_strides.insert_or_assign(tensor, std::move(strides)).first;
   }
 
   // For 0D tensors, data() returns nullptr on empty vectors, but we need to
@@ -97,10 +98,10 @@ AOTITorchError aoti_torch_get_dtype(Tensor* tensor, int32_t* ret_dtype) {
 }
 
 AOTITorchError aoti_torch_get_sizes(Tensor* tensor, int64_t** ret_sizes) {
-  auto it = tensor_to_sizes.find(tensor);
+  auto it = internal::tensor_to_sizes.find(tensor);
   bool needs_update = false;
 
-  if (it == tensor_to_sizes.end()) {
+  if (it == internal::tensor_to_sizes.end()) {
     needs_update = true;
   } else {
     // CRITICAL: Multimodal models reuse tensors with different shapes across
@@ -121,7 +122,7 @@ AOTITorchError aoti_torch_get_sizes(Tensor* tensor, int64_t** ret_sizes) {
     for (int i = 0; i < tensor->dim(); i++) {
       sizes[i] = tensor_sizes[i];
     }
-    it = tensor_to_sizes.insert_or_assign(tensor, std::move(sizes)).first;
+    it = internal::tensor_to_sizes.insert_or_assign(tensor, std::move(sizes)).first;
   }
 
   // For 0D tensors, data() returns nullptr on empty vectors, but we need to
@@ -194,8 +195,8 @@ size_t aoti_torch_dtype_element_size(int32_t dtype) {
 
 // Cleanup functions
 void cleanup_tensor_metadata() {
-  tensor_to_sizes.clear();
-  tensor_to_strides.clear();
+  internal::tensor_to_sizes.clear();
+  internal::tensor_to_strides.clear();
 }
 
 void aoti_torch_warn(