react-native-executorch 0.5.6 → 0.5.7

package/third-party/include/executorch/runtime/core/exec_aten/util/scalar_type_util.h

@@ -197,6 +197,11 @@ ET_FORALL_SCALAR_TYPES(SPECIALIZE_CppTypeToScalarType)
   _(ANOTHER_INPUT, float, Float)                                               \
   _(ANOTHER_INPUT, double, Double)
 
+#define ET_FORALL_FLOATH_TYPES_WITH(ANOTHER_INPUT, _)                          \
+  _(ANOTHER_INPUT, float, Float)                                               \
+  _(ANOTHER_INPUT, double, Double)                                             \
+  _(ANOTHER_INPUT, ::executorch::aten::Half, Half)
+
 #define ET_FORALL_FLOAT_TYPES_WITH2(ANOTHER_INPUT1, ANOTHER_INPUT2, _)         \
   _(ANOTHER_INPUT1, ANOTHER_INPUT2, float, Float)                              \
   _(ANOTHER_INPUT1, ANOTHER_INPUT2, double, Double)
@@ -888,7 +893,7 @@ public:
     }                                                                          \
   }()
 
-#define ET_INTERNAL_SWITCH_CASE_ALL_TYPES(CTYPE_ALIAS, ...)                    \
+#define ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, ...)                    \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Byte, CTYPE_ALIAS,   \
                           __VA_ARGS__)                                         \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Char, CTYPE_ALIAS,   \
@@ -898,33 +903,50 @@ public:
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Int, CTYPE_ALIAS,    \
                           __VA_ARGS__)                                         \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Long, CTYPE_ALIAS,   \
+                          __VA_ARGS__)
+
+#define ET_INTERNAL_SWITCH_CASE_UINT_TYPES(CTYPE_ALIAS, ...)                   \
+  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::UInt16, CTYPE_ALIAS, \
                           __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Half, CTYPE_ALIAS,   \
+  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::UInt32, CTYPE_ALIAS, \
                           __VA_ARGS__)                                         \
+  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::UInt64, CTYPE_ALIAS, \
+                          __VA_ARGS__)
+
+#define ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, ...)                  \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Float, CTYPE_ALIAS,  \
                           __VA_ARGS__)                                         \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Double, CTYPE_ALIAS, \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexHalf,         \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
+                          __VA_ARGS__)
+
+#define ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, ...)                   \
+  ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, __VA_ARGS__)                  \
+  ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, __VA_ARGS__)
+
+#define ET_INTERNAL_SWITCH_CASE_COMPLEX_TYPES(CTYPE_ALIAS, ...)                \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexFloat,        \
                           CTYPE_ALIAS, __VA_ARGS__)                            \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexDouble,       \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Bool, CTYPE_ALIAS,   \
-                          __VA_ARGS__)                                         \
+                          CTYPE_ALIAS, __VA_ARGS__)
+
+#define ET_INTERNAL_SWITCH_CASE_COMPLEXH_TYPES(CTYPE_ALIAS, ...)               \
+  ET_INTERNAL_SWITCH_CASE_COMPLEX_TYPES(CTYPE_ALIAS, __VA_ARGS__)              \
+  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexHalf,         \
+                          CTYPE_ALIAS, __VA_ARGS__)
+
+#define ET_INTERNAL_SWITCH_CASE_QINT_TYPES(CTYPE_ALIAS, ...)                   \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QInt8, CTYPE_ALIAS,  \
                           __VA_ARGS__)                                         \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QUInt8, CTYPE_ALIAS, \
                           __VA_ARGS__)                                         \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QInt32, CTYPE_ALIAS, \
                           __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::BFloat16,            \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QUInt4x2,            \
                           CTYPE_ALIAS, __VA_ARGS__)                            \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QUInt2x4,            \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
+                          CTYPE_ALIAS, __VA_ARGS__)
+
+#define ET_INTERNAL_SWITCH_CASE_BITS_TYPES(CTYPE_ALIAS, ...)                   \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Bits1x8,             \
                           CTYPE_ALIAS, __VA_ARGS__)                            \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Bits2x4,             \
@@ -936,21 +958,17 @@ public:
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Bits16, CTYPE_ALIAS, \
                           __VA_ARGS__)
 
-#define ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, ...)                   \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Byte, CTYPE_ALIAS,   \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Char, CTYPE_ALIAS,   \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Short, CTYPE_ALIAS,  \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Int, CTYPE_ALIAS,    \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Long, CTYPE_ALIAS,   \
+#define ET_INTERNAL_SWITCH_CASE_ALL_TYPES(CTYPE_ALIAS, ...)                    \
+  ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, __VA_ARGS__)                 \
+  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Half, CTYPE_ALIAS,   \
                           __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Float, CTYPE_ALIAS,  \
+  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::BFloat16,            \
+                          CTYPE_ALIAS, __VA_ARGS__)                            \
+  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Bool, CTYPE_ALIAS,   \
                           __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Double, CTYPE_ALIAS, \
-                          __VA_ARGS__)
+  ET_INTERNAL_SWITCH_CASE_COMPLEXH_TYPES(CTYPE_ALIAS, __VA_ARGS__)             \
+  ET_INTERNAL_SWITCH_CASE_QINT_TYPES(CTYPE_ALIAS, __VA_ARGS__)                 \
+  ET_INTERNAL_SWITCH_CASE_BITS_TYPES(CTYPE_ALIAS, __VA_ARGS__)
 
 #define ET_INTERNAL_SWITCH_CASE_REAL_TYPES_AND(ADDITIONAL, CTYPE_ALIAS, ...)   \
   ET_INTERNAL_SWITCH_CASE_REAL_TYPES(CTYPE_ALIAS, __VA_ARGS__)                 \
@@ -975,29 +993,11 @@ public:
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ADDITIONAL3,         \
                           CTYPE_ALIAS, __VA_ARGS__)
 
-#define ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, ...)                    \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Byte, CTYPE_ALIAS,   \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Char, CTYPE_ALIAS,   \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Short, CTYPE_ALIAS,  \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Int, CTYPE_ALIAS,    \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Long, CTYPE_ALIAS,   \
-                          __VA_ARGS__)
-
 #define ET_INTERNAL_SWITCH_CASE_INT_TYPES_AND(ADDITIONAL, CTYPE_ALIAS, ...)    \
   ET_INTERNAL_SWITCH_CASE_INT_TYPES(CTYPE_ALIAS, __VA_ARGS__)                  \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ADDITIONAL,          \
                           CTYPE_ALIAS, __VA_ARGS__)
 
-#define ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, ...)                  \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Double, CTYPE_ALIAS, \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Float, CTYPE_ALIAS,  \
-                          __VA_ARGS__)
-
 #define ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES_AND(ADDITIONAL, CTYPE_ALIAS, ...)  \
   ET_INTERNAL_SWITCH_CASE_FLOAT_TYPES(CTYPE_ALIAS, __VA_ARGS__)                \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ADDITIONAL,          \
@@ -1017,32 +1017,6 @@ public:
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ADDITIONAL3,         \
                           CTYPE_ALIAS, __VA_ARGS__)
 
-#define ET_INTERNAL_SWITCH_CASE_QINT_TYPES(CTYPE_ALIAS, ...)                   \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QInt8, CTYPE_ALIAS,  \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QUInt8, CTYPE_ALIAS, \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QInt32, CTYPE_ALIAS, \
-                          __VA_ARGS__)                                         \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QUInt4x2,            \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::QUInt2x4,            \
-                          CTYPE_ALIAS, __VA_ARGS__)
-
-#define ET_INTERNAL_SWITCH_CASE_COMPLEX_TYPES(CTYPE_ALIAS, ...)                \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexFloat,        \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexDouble,       \
-                          CTYPE_ALIAS, __VA_ARGS__)
-
-#define ET_INTERNAL_SWITCH_CASE_COMPLEXH_TYPES(CTYPE_ALIAS, ...)               \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexHalf,         \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexFloat,        \
-                          CTYPE_ALIAS, __VA_ARGS__)                            \
-  ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::ComplexDouble,       \
-                          CTYPE_ALIAS, __VA_ARGS__)
-
 #define ET_INTERNAL_SWITCH_CASE_SCALAR_OBJ_TYPES(CTYPE_ALIAS, ...)             \
   ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::Bool, CTYPE_ALIAS,   \
                           __VA_ARGS__)                                         \
@@ -1158,13 +1132,7 @@ public:
       TYPE, CONTEXT, NAME,                                                     \
       ET_INTERNAL_SWITCH_CASE_REAL_TYPES_AND3(Half, Bool, BFloat16,            \
                                               CTYPE_ALIAS, __VA_ARGS__)        \
-          ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::UInt16,      \
-                                  CTYPE_ALIAS, __VA_ARGS__)                    \
-              ET_INTERNAL_SWITCH_CASE(::executorch::aten::ScalarType::UInt32,  \
-                                      CTYPE_ALIAS, __VA_ARGS__)                \
-                  ET_INTERNAL_SWITCH_CASE(                                     \
-                      ::executorch::aten::ScalarType::UInt64, CTYPE_ALIAS,     \
-                      __VA_ARGS__))
+          ET_INTERNAL_SWITCH_CASE_UINT_TYPES(CTYPE_ALIAS, __VA_ARGS__))
 
 #define ET_SWITCH_INT_TYPES(TYPE, CONTEXT, NAME, CTYPE_ALIAS, ...)             \
   ET_INTERNAL_SWITCH(                                                          \

package/third-party/include/executorch/runtime/core/exec_aten/util/tensor_util.h

@@ -17,6 +17,7 @@
 
 #include <limits>
 
+#include <c10/util/irange.h>
 #include <executorch/runtime/core/array_ref.h>
 #include <executorch/runtime/core/error.h>
 #include <executorch/runtime/core/exec_aten/exec_aten.h>
@@ -228,7 +229,7 @@
         a_strides = a__.strides();                                             \
     const ::executorch::aten::ArrayRef<executorch::aten::StridesType>          \
         b_strides = b__.strides();                                             \
-    for (size_t i = 0; i < a__.dim(); i++) {                                   \
+    for (const auto i : c10::irange(a__.dim())) {                              \
       ET_CHECK_MSG(a_strides[i] == b_strides[i],                               \
                    "a.strides()[%zu] shall equal to b.strides()[%zu], "        \
                    "but now is %d and %d.",                                    \
@@ -253,7 +254,7 @@
         b_strides = b__.strides();                                             \
     const ::executorch::aten::ArrayRef<executorch::aten::StridesType>          \
         c_strides = c__.strides();                                             \
-    for (size_t i = 0; i < a__.dim(); i++) {                                   \
+    for (const auto i : c10::irange(a__.dim())) {                              \
       ET_CHECK_MSG(a_strides[i] == b_strides[i] &&                             \
                        b_strides[i] == c_strides[i],                           \
                    "a_strides[%zu], b_strides[%zu] and c_strides[%zu] "        \
@@ -334,8 +335,7 @@
                " could not be extracted: wrong type or out of range");
 
 namespace executorch {
-namespace runtime {
-
+namespace ET_RUNTIME_NAMESPACE {
 //
 // Utility functions for checking tensor attributes
 //
@@ -379,10 +379,10 @@ inline ssize_t nonempty_size(const executorch::aten::Tensor &tensor,
 
 inline bool tensor_can_cast_to(executorch::aten::Tensor a,
                                executorch::aten::ScalarType dtype) {
-  ET_CHECK_OR_RETURN_FALSE(torch::executor::canCast(a.scalar_type(), dtype),
+  ET_CHECK_OR_RETURN_FALSE(::torch::executor::canCast(a.scalar_type(), dtype),
                            "Tensor of dtype %s cannot cast to dtype %s",
-                           torch::executor::toString(a.scalar_type()),
-                           torch::executor::toString(dtype));
+                           ::torch::executor::toString(a.scalar_type()),
+                           ::torch::executor::toString(dtype));
 
   return true;
 }
@@ -391,7 +391,7 @@ inline bool tensor_is_bool_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(t.scalar_type() ==
                                executorch::aten::ScalarType::Bool,
                            "Expected to find bool type, but tensor has type %s",
-                           torch::executor::toString(t.scalar_type()));
+                           ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
@@ -400,8 +400,8 @@ inline bool tensor_is_type(executorch::aten::Tensor t,
                            executorch::aten::ScalarType dtype) {
   ET_CHECK_OR_RETURN_FALSE(t.scalar_type() == dtype,
                            "Expected to find %s type, but tensor has type %s",
-                           torch::executor::toString(dtype),
-                           torch::executor::toString(t.scalar_type()));
+                           ::torch::executor::toString(dtype),
+                           ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
@@ -412,8 +412,8 @@ inline bool tensor_is_type(executorch::aten::Tensor t,
   ET_LOG_MSG_AND_RETURN_IF_FALSE(
       t.scalar_type() == dtype || t.scalar_type() == dtype2,
       "Expected to find %s or %s type, but tensor has type %s",
-      torch::executor::toString(dtype), torch::executor::toString(dtype2),
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(dtype), ::torch::executor::toString(dtype2),
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
@@ -426,9 +426,9 @@ inline bool tensor_is_type(executorch::aten::Tensor t,
       t.scalar_type() == dtype || t.scalar_type() == dtype2 ||
           t.scalar_type() == dtype3,
       "Expected to find %s, %s, or %s type, but tensor has type %s",
-      torch::executor::toString(dtype), torch::executor::toString(dtype2),
-      torch::executor::toString(dtype3),
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(dtype), ::torch::executor::toString(dtype2),
+      ::torch::executor::toString(dtype3),
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
@@ -436,36 +436,36 @@ inline bool tensor_is_type(executorch::aten::Tensor t,
 inline bool tensor_is_integral_type(executorch::aten::Tensor t,
                                     bool includeBool = false) {
   ET_CHECK_OR_RETURN_FALSE(
-      torch::executor::isIntegralType(t.scalar_type(), includeBool),
+      ::torch::executor::isIntegralType(t.scalar_type(), includeBool),
       "Expected to find a integral type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
 
 inline bool tensor_is_floating_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
-      torch::executor::isFloatingType(t.scalar_type()),
+      ::torch::executor::isFloatingType(t.scalar_type()),
       "Expected to find a floating type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
 
 inline bool tensor_is_real_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
-      torch::executor::isRealType(t.scalar_type()),
+      ::torch::executor::isRealType(t.scalar_type()),
       "Expected to find a real type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
 
 inline bool tensor_is_realh_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
-      torch::executor::isRealHType(t.scalar_type()),
+      ::torch::executor::isRealHType(t.scalar_type()),
       "Expected to find a real type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
@@ -474,16 +474,16 @@ inline bool tensor_is_realhbf16_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
       executorch::runtime::isRealHBF16Type(t.scalar_type()),
       "Expected to find a real type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
 
 inline bool tensor_is_realhb_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
-      torch::executor::isRealHBType(t.scalar_type()),
+      ::torch::executor::isRealHBType(t.scalar_type()),
       "Expected to find a real type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
@@ -492,25 +492,25 @@ inline bool tensor_is_realhbbf16_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
       executorch::runtime::isRealHBBF16Type(t.scalar_type()),
       "Expected to find a real type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
 
 inline bool tensor_is_complex_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
-      torch::executor::isComplexType(t.scalar_type()),
+      ::torch::executor::isComplexType(t.scalar_type()),
       "Expected to find a complex type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
 
 inline bool tensor_is_bits_type(executorch::aten::Tensor t) {
   ET_CHECK_OR_RETURN_FALSE(
-      torch::executor::isBitsType(t.scalar_type()),
+      ::torch::executor::isBitsType(t.scalar_type()),
       "Expected to find a bits type, but tensor has type %s",
-      torch::executor::toString(t.scalar_type()));
+      ::torch::executor::toString(t.scalar_type()));
 
   return true;
 }
@@ -519,8 +519,8 @@ inline bool tensors_have_same_dtype(executorch::aten::Tensor a,
                                     executorch::aten::Tensor b) {
   ET_CHECK_OR_RETURN_FALSE(a.scalar_type() == b.scalar_type(),
                            ET_TENSOR_CHECK_PREFIX__ ": dtype={%s, %s}",
-                           torch::executor::toString(a.scalar_type()),
-                           torch::executor::toString(b.scalar_type()));
+                           ::torch::executor::toString(a.scalar_type()),
+                           ::torch::executor::toString(b.scalar_type()));
   return true;
 }
 
@@ -530,9 +530,9 @@ inline bool tensors_have_same_dtype(executorch::aten::Tensor a,
   ET_CHECK_OR_RETURN_FALSE(a.scalar_type() == b.scalar_type() &&
                                b.scalar_type() == c.scalar_type(),
                            ET_TENSOR_CHECK_PREFIX__ ": dtype={%s, %s, %s}",
-                           torch::executor::toString(a.scalar_type()),
-                           torch::executor::toString(b.scalar_type()),
-                           torch::executor::toString(c.scalar_type()));
+                           ::torch::executor::toString(a.scalar_type()),
+                           ::torch::executor::toString(b.scalar_type()),
+                           ::torch::executor::toString(c.scalar_type()));
   return true;
 }
 
@@ -827,7 +827,7 @@ inline size_t getTrailingDims(const executorch::aten::Tensor &tensor,
 inline size_t coordinateToIndex(const executorch::aten::Tensor &tensor,
                                 const size_t *const coordinate) {
   size_t index = 0;
-  for (int d = 0; d < tensor.dim(); ++d) {
+  for (const auto d : c10::irange(tensor.dim())) {
     index += coordinate[d] * getTrailingDims(tensor, d);
   }
   return index;
@@ -858,7 +858,7 @@ inline size_t coordinateToIndexWithTrailingDimsMemo(
     const executorch::aten::Tensor &tensor, const size_t *const coordinate,
     const size_t trailing_dims_memo[kTensorDimensionLimit]) {
   size_t index = 0;
-  for (int d = 0; d < tensor.dim(); ++d) {
+  for (const auto d : c10::irange(tensor.dim())) {
     index += coordinate[d] * trailing_dims_memo[d];
   }
   return index;
@@ -878,7 +878,7 @@ inline size_t coordinateToIndexWithTrailingDimsMemo(
 inline void indexToCoordinate(const executorch::aten::Tensor &tensor,
                               size_t index, size_t *coordinate) {
   ET_CHECK(index < static_cast<size_t>(tensor.numel()));
-  for (auto i = 0; i < tensor.dim(); ++i) {
+  for (const auto i : c10::irange(tensor.dim())) {
     auto dim = tensor.dim() - 1 - i;
     size_t dim_size = tensor.size(dim);
     coordinate[dim] = index % dim_size;
@@ -1058,7 +1058,7 @@ resize_tensor(executorch::aten::Tensor t,
   std::array<executorch::aten::SizesType, kTensorDimensionLimit>
       new_sizes_casted{};
   size_t new_sizes_ndim = new_sizes.size();
-  for (size_t i = 0; i < new_sizes_ndim; ++i) {
+  for (const auto i : c10::irange(new_sizes_ndim)) {
     new_sizes_casted[i] =
         static_cast<executorch::aten::SizesType>(new_sizes[i]);
   }
@@ -1185,66 +1185,67 @@ calculate_linear_index(const executorch::aten::SizesType *coordinate,
                        const executorch::aten::StridesType *strides,
                        const size_t ndim) {
   size_t index = 0;
-  for (size_t i = 0; i < ndim; i++) {
+  for (const auto i : c10::irange(ndim)) {
     index += coordinate[i] * strides[i];
   }
   return index;
 }
 
-} // namespace runtime
+} // namespace ET_RUNTIME_NAMESPACE
 } // namespace executorch
 
 namespace torch {
 namespace executor {
 // TODO(T197294990): Remove these deprecated aliases once all users have moved
 // to the new `::executorch` namespaces.
-using ::executorch::runtime::calculate_linear_index;
-using ::executorch::runtime::coordinateToIndex;
-using ::executorch::runtime::dim_is_valid;
-using ::executorch::runtime::extract_scalar_tensor;
-using ::executorch::runtime::get_dim_order;
-using ::executorch::runtime::getLeadingDims;
-using ::executorch::runtime::getTrailingDims;
-using ::executorch::runtime::indexToCoordinate;
+using ::executorch::ET_RUNTIME_NAMESPACE::calculate_linear_index;
+using ::executorch::ET_RUNTIME_NAMESPACE::coordinateToIndex;
+using ::executorch::ET_RUNTIME_NAMESPACE::dim_is_valid;
+using ::executorch::ET_RUNTIME_NAMESPACE::extract_scalar_tensor;
+using ::executorch::ET_RUNTIME_NAMESPACE::get_dim_order;
+using ::executorch::ET_RUNTIME_NAMESPACE::getLeadingDims;
+using ::executorch::ET_RUNTIME_NAMESPACE::getTrailingDims;
+using ::executorch::ET_RUNTIME_NAMESPACE::indexToCoordinate;
+using ::executorch::ET_RUNTIME_NAMESPACE::nonempty_size;
+using ::executorch::ET_RUNTIME_NAMESPACE::nonzero_dim;
+using ::executorch::ET_RUNTIME_NAMESPACE::resize;
+using ::executorch::ET_RUNTIME_NAMESPACE::resize_tensor;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_can_cast_to;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_dim_has_index;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_has_dim;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_has_expected_size;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_has_non_empty_dim;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_has_rank_greater_or_equal_to;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_has_rank_smaller_or_equal_to;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_has_valid_dim_order;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_bits_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_bool_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_complex_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_contiguous;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_default_dim_order;
+using ::executorch::ET_RUNTIME_NAMESPACE::
+    tensor_is_default_or_channels_last_dim_order;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_floating_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_integral_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_rank;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_real_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_realh_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_realhb_type;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensor_is_scalar;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensors_have_same_dim_order;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensors_have_same_dtype;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensors_have_same_rank;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensors_have_same_shape;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensors_have_same_shape_and_dtype;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensors_have_same_size_at_dims;
+using ::executorch::ET_RUNTIME_NAMESPACE::tensors_have_same_strides;
 using ::executorch::runtime::kTensorDimensionLimit;
-using ::executorch::runtime::nonempty_size;
-using ::executorch::runtime::nonzero_dim;
-using ::executorch::runtime::resize;
-using ::executorch::runtime::resize_tensor;
-using ::executorch::runtime::tensor_can_cast_to;
-using ::executorch::runtime::tensor_dim_has_index;
-using ::executorch::runtime::tensor_has_dim;
-using ::executorch::runtime::tensor_has_expected_size;
-using ::executorch::runtime::tensor_has_non_empty_dim;
-using ::executorch::runtime::tensor_has_rank_greater_or_equal_to;
-using ::executorch::runtime::tensor_has_rank_smaller_or_equal_to;
-using ::executorch::runtime::tensor_has_valid_dim_order;
-using ::executorch::runtime::tensor_is_bits_type;
-using ::executorch::runtime::tensor_is_bool_type;
-using ::executorch::runtime::tensor_is_complex_type;
-using ::executorch::runtime::tensor_is_contiguous;
-using ::executorch::runtime::tensor_is_default_dim_order;
-using ::executorch::runtime::tensor_is_default_or_channels_last_dim_order;
-using ::executorch::runtime::tensor_is_floating_type;
-using ::executorch::runtime::tensor_is_integral_type;
-using ::executorch::runtime::tensor_is_rank;
-using ::executorch::runtime::tensor_is_real_type;
-using ::executorch::runtime::tensor_is_realh_type;
-using ::executorch::runtime::tensor_is_realhb_type;
-using ::executorch::runtime::tensor_is_scalar;
-using ::executorch::runtime::tensors_have_same_dim_order;
-using ::executorch::runtime::tensors_have_same_dtype;
-using ::executorch::runtime::tensors_have_same_rank;
-using ::executorch::runtime::tensors_have_same_shape;
-using ::executorch::runtime::tensors_have_same_shape_and_dtype;
-using ::executorch::runtime::tensors_have_same_size_at_dims;
-using ::executorch::runtime::tensors_have_same_strides;
 namespace internal {
-using ::executorch::runtime::internal::copy_tensor_data;
-using ::executorch::runtime::internal::reset_data_ptr;
-using ::executorch::runtime::internal::resize_tensor_impl;
-using ::executorch::runtime::internal::set_tensor_data;
-using ::executorch::runtime::internal::share_tensor_data;
+using ::executorch::ET_RUNTIME_NAMESPACE::internal::copy_tensor_data;
+using ::executorch::ET_RUNTIME_NAMESPACE::internal::reset_data_ptr;
+using ::executorch::ET_RUNTIME_NAMESPACE::internal::resize_tensor_impl;
+using ::executorch::ET_RUNTIME_NAMESPACE::internal::set_tensor_data;
+using ::executorch::ET_RUNTIME_NAMESPACE::internal::share_tensor_data;
 } // namespace internal
 } // namespace executor
 } // namespace torch

package/third-party/include/executorch/runtime/core/function_ref.h

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+//===- llvm/ADT/STLFunctionalExtras.h - Extras for <functional> -*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file contains some extension to <functional>.
+//
+// No library is required when using these functions.
+//
+//===----------------------------------------------------------------------===//
+//     Extra additions to <functional>
+//===----------------------------------------------------------------------===//
+
+/// An efficient, type-erasing, non-owning reference to a callable. This is
+/// intended for use as the type of a function parameter that is not used
+/// after the function in question returns.
+///
+/// This class does not own the callable, so it is not in general safe to store
+/// a FunctionRef.
+
+// torch::executor: modified from llvm::function_ref
+// - renamed to FunctionRef
+// - removed LLVM_GSL_POINTER and LLVM_LIFETIME_BOUND macro uses
+// - use namespaced internal::remove_cvref_t
+
+#pragma once
+
+#include <cstdint>
+#include <type_traits>
+#include <utility>
+
+namespace executorch::runtime {
+
+//===----------------------------------------------------------------------===//
+//     Features from C++20
+//===----------------------------------------------------------------------===//
+
+namespace internal {
+
+template <typename T> struct remove_cvref {
+  using type =
+      typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+};
+
+template <typename T> using remove_cvref_t = typename remove_cvref<T>::type;
+
+} // namespace internal
+
+template <typename Fn> class FunctionRef;
+
+template <typename Ret, typename... Params> class FunctionRef<Ret(Params...)> {
+  Ret (*callback)(intptr_t callable, Params... params) = nullptr;
+  intptr_t callable;
+
+  template <typename Callable>
+  static Ret callback_fn(intptr_t callable, Params... params) {
+    return (*reinterpret_cast<Callable *>(callable))(
+        std::forward<Params>(params)...);
+  }
+
+public:
+  FunctionRef() = default;
+  FunctionRef(std::nullptr_t) {}
+
+  template <typename Callable>
+  FunctionRef(
+      Callable &&callable,
+      // This is not the copy-constructor.
+      std::enable_if_t<!std::is_same<internal::remove_cvref_t<Callable>,
+                                     FunctionRef>::value> * = nullptr,
+      // Functor must be callable and return a suitable type.
+      std::enable_if_t<std::is_void<Ret>::value ||
+                       std::is_convertible<decltype(std::declval<Callable>()(
+                                               std::declval<Params>()...)),
+                                           Ret>::value> * = nullptr)
+      : callback(callback_fn<std::remove_reference_t<Callable>>),
+        callable(reinterpret_cast<intptr_t>(&callable)) {}
+
+  Ret operator()(Params... params) const {
+    return callback(callable, std::forward<Params>(params)...);
+  }
+
+  explicit operator bool() const { return callback; }
+
+  bool operator==(const FunctionRef<Ret(Params...)> &Other) const {
+    return callable == Other.callable;
+  }
+};
+} // namespace executorch::runtime