Update

[ghstack-poisoned]

Author: swolchok

runtime/core/exec_aten/util/dim_order_util.h

@@ -260,35 +260,6 @@ ET_NODISCARD inline Error stride_to_dim_order(
   return Error::Ok;
 }
 
-/**
- * Print a string representation of an ArrayRef of tensor sizes into a
- * user-provided string buffer. If the user buffer is too small, the string
- * will be truncated. The output is of the format (1,2,3,4).
- *
- * Note that we cannot use ArrayRef here due to a circular dependency (see
- * above comments).
- */
-template <class SizesType>
-inline void sizes_to_string(
-    char* output,
-    size_t output_size,
-    SizesType* sizes,
-    size_t rank) {
-  auto remaining_size = output_size;
-  for (auto i = 0; remaining_size > 0 && i < rank; i++) {
-    snprintf(
-        output,
-        remaining_size,
-        "%s%zd",
-        i == 0 ? "(" : ",",
-        static_cast<size_t>(sizes[i]));
-    auto len = strlen(output);
-    output += len;
-    remaining_size -= len;
-  }
-  snprintf(output, remaining_size, ")");
-}
-
 } // namespace runtime
 } // namespace executorch
 

runtime/core/exec_aten/util/tensor_shape_to_c_string.cpp

@@ -1,5 +1,3 @@
-#include "tensor_util.h"
-
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  * All rights reserved.
@@ -8,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <executorch/runtime/core/exec_aten/util/tensor_util.h>
+#include <executorch/runtime/core/exec_aten/util/tensor_shape_to_c_string.h>
 
 #include <executorch/runtime/platform/assert.h>
 

runtime/core/portable_type/targets.bzl

@@ -32,8 +32,9 @@ def define_common_targets():
             ":scalar_type",
             "//executorch/runtime/core:core",
             "//executorch/runtime/core:tensor_shape_dynamism",
-            "//executorch/runtime/core/exec_aten/util:scalar_type_util",
             "//executorch/runtime/core/exec_aten/util:dim_order_util",
+            "//executorch/runtime/core/exec_aten/util:scalar_type_util",
+            "//executorch/runtime/core/exec_aten/util:tensor_shape_to_c_string",
             "//executorch/runtime/core:tag",
         ],
     )

runtime/core/portable_type/tensor_impl.cpp

@@ -13,6 +13,7 @@
 
 #include <executorch/runtime/core/exec_aten/util/dim_order_util.h>
 #include <executorch/runtime/core/exec_aten/util/scalar_type_util.h>
+#include <executorch/runtime/core/exec_aten/util/tensor_shape_to_c_string.h>
 #include <executorch/runtime/core/portable_type/qint_types.h>
 #include <executorch/runtime/core/portable_type/scalar_type.h>
 #include <executorch/runtime/platform/assert.h>
@@ -95,18 +96,12 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
     case TensorShapeDynamism::STATIC:
       if (!std::equal(sizes_, sizes_ + dim_, new_sizes.begin())) {
 #ifdef ET_LOG_ENABLED
-        std::array<char, 16> old_sizes_str, new_sizes_str;
-
-        executorch::runtime::sizes_to_string(
-            old_sizes_str.data(),
-            old_sizes_str.size(),
-            sizes().data(),
-            sizes().size());
-        executorch::runtime::sizes_to_string(
-            new_sizes_str.data(),
-            new_sizes_str.size(),
-            new_sizes.data(),
-            new_sizes.size());
+        auto old_sizes_str = executorch::runtime::tensor_shape_to_c_string(
+            executorch::runtime::Span<const executorch::aten::SizesType>(
+                sizes().data(), sizes().size()));
+        auto new_sizes_str = executorch::runtime::tensor_shape_to_c_string(
+            executorch::runtime::Span<const executorch::aten::SizesType>(
+                new_sizes.data(), new_sizes.size()));
 #endif
 
         ET_CHECK_OR_RETURN_ERROR(