react-native-executorch 0.5.6 → 0.5.7

package/third-party/include/executorch/runtime/core/portable_type/tensor_impl.h

@@ -247,6 +247,26 @@ ssize_t compute_numel(
     const ::executorch::runtime::etensor::TensorImpl::SizesType *sizes,
     ssize_t dim);
 
+/// Appropriate format specifier for the result of calling
+/// size(). Must be used instead of using zd directly to support ATen
+/// mode.
+#define ET_PRI_TENSOR_SIZE "zd"
+
+/// Appropriate format specifier for the result of calling
+/// dim(). Must be used instead of using zd directly to support ATen
+/// mode.
+#define ET_PRI_TENSOR_DIM "zd"
+
+/// Appropriate format specifier for the result of calling
+/// numel(). Must be used instead of using zd directly to support ATen
+/// mode.
+#define ET_PRI_TENSOR_NUMEL "zd"
+
+// Appropriate format specifier for elements of sizes() and
+// strides(). Must be used instead of using d directly to support ATen
+// mode.
+#define ET_PRI_SIZES_AND_STRIDES "d"
+
 } // namespace etensor
 } // namespace runtime
 } // namespace executorch

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

@@ -54,6 +54,10 @@ public:
   template <size_t N>
   /* implicit */ constexpr Span(T (&Arr)[N]) : data_(Arr), length_(N) {}
 
+  /// Construct a Span from a single element reference.
+  /* implicit */ constexpr Span(T &single_element)
+      : data_(&single_element), length_(1) {}
+
   /// @returns a pointer to the start of the underlying element buffer.
   iterator begin() const noexcept { return data_; }
 

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

@@ -12,6 +12,11 @@
 #include <executorch/runtime/core/defines.h>
 #include <executorch/runtime/platform/compiler.h>
 
+// X11 headers via volk define None, so we need to undef it
+#if defined(__linux__)
+#undef None
+#endif
+
 namespace executorch {
 namespace runtime {
 
@@ -38,6 +43,20 @@ enum class Tag : uint32_t {
 #undef DEFINE_TAG
 };
 
+#if ET_ENABLE_ENUM_STRINGS
+inline const char *tag_to_string(Tag tag) {
+  switch (tag) {
+#define CASE_TAG(x)                                                            \
+  case Tag::x:                                                                 \
+    return #x;
+    EXECUTORCH_FORALL_TAGS(CASE_TAG)
+#undef CASE_TAG
+  default:
+    return "Unknown";
+  }
+}
+#endif // ET_ENABLE_ENUM_STRINGS
+
 /**
  * Convert a tag value to a string representation. If ET_ENABLE_ENUM_STRINGS is
  * set (it is on by default), this will return a string name (for example,

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

@@ -14,7 +14,7 @@
 #include <executorch/runtime/core/span.h>
 
 namespace executorch {
-namespace runtime {
+namespace ET_RUNTIME_NAMESPACE {
 
 /**
  * Describes the layout of a tensor.
@@ -75,5 +75,5 @@ private:
   const size_t nbytes_;
 };
 
-} // namespace runtime
+} // namespace ET_RUNTIME_NAMESPACE
 } // namespace executorch

package/third-party/include/executorch/runtime/executor/method.h

@@ -32,7 +32,7 @@ struct EValue;
 } // namespace executorch_flatbuffer
 
 namespace executorch {
-namespace runtime {
+namespace ET_RUNTIME_NAMESPACE {
 
 // Forward declare NamedData. This is a public header and must not include
 // internal data types.
@@ -187,6 +187,18 @@ public:
    */
   ET_NODISCARD Error get_inputs(EValue *input_evalues, size_t length);
 
+  /**
+   *
+   * Retrieves the attribute tensor associated with the given name.
+   *
+   * @param[in] name The name of the attribute tensor to retrieve.
+   *
+   * @returns Result containing the attribute tensor on success, non-Ok on
+   * failure.
+   */
+  ET_NODISCARD Result<executorch::aten::Tensor>
+  get_attribute(std::string_view name);
+
   /**
    * Execute the method.
    *
@@ -371,14 +383,14 @@ private:
   void log_outputs();
 };
 
-} // 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::Method;
+using ::executorch::ET_RUNTIME_NAMESPACE::Method;
 } // namespace executor
 } // namespace torch
 

package/third-party/include/executorch/runtime/executor/method_meta.h

@@ -20,7 +20,11 @@ struct ExecutionPlan;
 } // namespace executorch_flatbuffer
 
 namespace executorch {
-namespace runtime {
+namespace ET_RUNTIME_NAMESPACE {
+namespace testing {
+// Provides test access to private Program methods.
+class TensorInfoTestFriend;
+} // namespace testing
 
 /**
  * Metadata about a specific tensor of an ExecuTorch Program.
@@ -62,13 +66,20 @@ public:
    */
   size_t nbytes() const;
 
+  /**
+   * Returns the fully qualified name of the Tensor might be empty if the tensor
+   * is nameless.
+   */
+  std::string_view name() const;
+
 private:
   // Let MethodMeta create TensorInfo.
   friend class MethodMeta;
+  friend class testing::TensorInfoTestFriend;
 
   TensorInfo(Span<const int32_t> sizes, Span<const uint8_t> dim_order,
              executorch::aten::ScalarType scalar_type,
-             const bool is_memory_planned);
+             const bool is_memory_planned, std::string_view name);
 
   /**
    * The sizes of the tensor.
@@ -86,6 +97,9 @@ private:
    */
   Span<const uint8_t> dim_order_;
 
+  /// The fully qualified name of the Tensor.
+  std::string_view name_;
+
   /// The scalar type of the tensor.
   executorch::aten::ScalarType scalar_type_;
 
@@ -168,6 +182,21 @@ public:
    */
   Result<TensorInfo> output_tensor_meta(size_t index) const;
 
+  /**
+   * Get the number of attribute tensors in this method.
+   *
+   * @returns The number of attribute tensors.
+   */
+  size_t num_attributes() const;
+
+  /**
+   * Get metadata about the specified attribute tensor.
+   *
+   * @param[in] index The index of the attribute tensor to look up.
+   * @returns The metadata on success, or an error on failure.
+   */
+  Result<TensorInfo> attribute_tensor_meta(size_t index) const;
+
   /**
    * Get the number of memory-planned buffers this method requires.
    *
@@ -238,14 +267,14 @@ private:
   const executorch_flatbuffer::ExecutionPlan *s_plan_;
 };
 
-} // 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::MethodMeta;
-using ::executorch::runtime::TensorInfo;
+using ::executorch::ET_RUNTIME_NAMESPACE::MethodMeta;
+using ::executorch::ET_RUNTIME_NAMESPACE::TensorInfo;
 } // namespace executor
 } // namespace torch

package/third-party/include/executorch/runtime/executor/program.h

@@ -36,8 +36,7 @@ struct Program;
 } // namespace executorch_flatbuffer
 
 namespace executorch {
-namespace runtime {
-
+namespace ET_RUNTIME_NAMESPACE {
 namespace testing {
 // Provides test access to private Program methods.
 class ProgramTestFriend;
@@ -304,14 +303,14 @@ private:
   std::optional<internal::PteDataMap> pte_data_map_;
 };
 
-} // 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::Program;
+using ::executorch::ET_RUNTIME_NAMESPACE::Program;
 } // namespace executor
 } // namespace torch
 

package/third-party/include/executorch/runtime/executor/pte_data_map.h

@@ -45,7 +45,7 @@ using FlatbufferDataSegment =
 #endif
 
 namespace executorch {
-namespace runtime {
+namespace ET_RUNTIME_NAMESPACE {
 namespace internal {
 
 /**
@@ -76,8 +76,8 @@ public:
    * tensor-specific metadata.
    */
   ET_NODISCARD
-  Result<const TensorLayout>
-  get_metadata(ET_UNUSED const char *key) const override {
+  Result<const TensorLayout> get_tensor_layout(
+      ET_UNUSED executorch::aten::string_view key) const override {
     return Error::NotImplemented;
   }
 
@@ -89,12 +89,13 @@ public:
    * @return error if the key is not present or data cannot be loaded.
    */
   ET_NODISCARD
-  Result<FreeableBuffer> get_data(const char *key) const override;
+  Result<FreeableBuffer>
+  get_data(executorch::aten::string_view key) const override;
 
   /**
    * The PteDataMap currently does not implement load_into.
    */
-  ET_NODISCARD Error load_data_into(ET_UNUSED const char *key,
+  ET_NODISCARD Error load_data_into(ET_UNUSED executorch::aten::string_view key,
                                     ET_UNUSED void *buffer,
                                     ET_UNUSED size_t size) const override {
     return Error::NotImplemented;
@@ -103,12 +104,12 @@ public:
   /**
    * @returns The number of keys in the map.
    */
-  ET_NODISCARD Result<size_t> get_num_keys() const override;
+  ET_NODISCARD Result<uint32_t> get_num_keys() const override;
 
   /**
    * @returns The key at the specified index, error if index out of bounds.
    */
-  ET_NODISCARD Result<const char *> get_key(size_t index) const override;
+  ET_NODISCARD Result<const char *> get_key(uint32_t index) const override;
 
   // Moveable, to be compatible with Result.
   PteDataMap(PteDataMap &&) noexcept = default;
@@ -140,5 +141,5 @@ private:
 };
 
 } // namespace internal
-} // namespace runtime
+} // namespace ET_RUNTIME_NAMESPACE
 } // namespace executorch

package/third-party/include/executorch/runtime/executor/tensor_parser.h

@@ -21,7 +21,7 @@
 #include <executorch/schema/program_generated.h>
 
 namespace executorch {
-namespace runtime {
+namespace ET_RUNTIME_NAMESPACE {
 namespace deserialization {
 
 /// Data structure to hold key and data buffer for external data used
@@ -54,7 +54,7 @@ validateTensorLayout(const executorch_flatbuffer::Tensor *s_tensor,
 // list of optionals: list of optional Tensor, list of optional float etc, so we
 // just use a template to avoid boilerplate.
 template <typename T>
-ET_NODISCARD Result<BoxedEvalueList<executorch::aten::optional<T>>>
+ET_NODISCARD Result<BoxedEvalueList<std::optional<T>>>
 parseListOptionalType(const flatbuffers::Vector<int32_t> *value_indices,
                       EValue *values, size_t values_len,
                       MemoryManager *memory_manager) {
@@ -65,8 +65,8 @@ parseListOptionalType(const flatbuffers::Vector<int32_t> *value_indices,
   }
 
   auto *optional_tensor_list =
-      memory_manager->method_allocator()
-          ->allocateList<executorch::aten::optional<T>>(value_indices->size());
+      memory_manager->method_allocator()->allocateList<std::optional<T>>(
+          value_indices->size());
   if (optional_tensor_list == nullptr) {
     return Error::MemoryAllocationFailed;
   }
@@ -83,7 +83,7 @@ parseListOptionalType(const flatbuffers::Vector<int32_t> *value_indices,
     // copy assignment is not defined if its non trivial.
     if (index == -1) {
       new (&optional_tensor_list[output_idx])
-          executorch::aten::optional<T>(executorch::aten::nullopt);
+          std::optional<T>(executorch::aten::nullopt);
       // no value to point to. BoxedEvalueList for optional tensor will convert
       // this to nullopt.
       // TODO(T161156879): do something less hacky here.
@@ -93,13 +93,13 @@ parseListOptionalType(const flatbuffers::Vector<int32_t> *value_indices,
           index >= 0 && static_cast<size_t>(index) < values_len, InvalidProgram,
           "Invalid value index %" PRId32 " for ListOptional", index);
       new (&optional_tensor_list[output_idx])
-          executorch::aten::optional<T>(values[index].toOptional<T>());
+          std::optional<T>(values[index].toOptional<T>());
       evalp_list[output_idx] = &values[static_cast<size_t>(index)];
     }
     output_idx++;
   }
-  return BoxedEvalueList<executorch::aten::optional<T>>(
-      evalp_list, optional_tensor_list, value_indices->size());
+  return BoxedEvalueList<std::optional<T>>(evalp_list, optional_tensor_list,
+                                           value_indices->size());
 }
 
 /**
@@ -135,7 +135,7 @@ getTensorDataPtr(const executorch_flatbuffer::Tensor *s_tensor,
                  Span<NamedData> external_constants = {});
 
 } // namespace deserialization
-} // namespace runtime
+} // namespace ET_RUNTIME_NAMESPACE
 } // namespace executorch
 
 namespace torch {
@@ -143,10 +143,11 @@ namespace executor {
 namespace deserialization {
 // TODO(T197294990): Remove these deprecated aliases once all users have moved
 // to the new `::executorch` namespaces.
-using ::executorch::runtime::deserialization::getTensorDataPtr;
-using ::executorch::runtime::deserialization::parseListOptionalType;
-using ::executorch::runtime::deserialization::parseTensor;
-using ::executorch::runtime::deserialization::parseTensorList;
+using ::executorch::ET_RUNTIME_NAMESPACE::deserialization::getTensorDataPtr;
+using ::executorch::ET_RUNTIME_NAMESPACE::deserialization::
+    parseListOptionalType;
+using ::executorch::ET_RUNTIME_NAMESPACE::deserialization::parseTensor;
+using ::executorch::ET_RUNTIME_NAMESPACE::deserialization::parseTensorList;
 } // namespace deserialization
 } // namespace executor
 } // namespace torch

package/third-party/include/executorch/runtime/kernel/kernel_runtime_context.h

@@ -15,7 +15,7 @@
 #include <executorch/runtime/platform/compiler.h>
 
 namespace executorch {
-namespace runtime {
+namespace ET_RUNTIME_NAMESPACE {
 
 /**
  * Runtime state and functionality for kernel implementations.
@@ -98,7 +98,7 @@ private:
   Error failure_state_ = Error::Ok;
 };
 
-} // namespace runtime
+} // namespace ET_RUNTIME_NAMESPACE
 } // namespace executorch
 
 // TODO(T197294990): Remove these deprecated aliases once all users have moved
@@ -106,15 +106,15 @@ private:
 namespace torch {
 namespace executor {
 /// DEPRECATED: Use ::executorch::runtime::KernelRuntimeContext instead.
-using ::executorch::runtime::KernelRuntimeContext;
+using ::executorch::ET_RUNTIME_NAMESPACE::KernelRuntimeContext;
 /// DEPRECATED: Use ::executorch::runtime::KernelRuntimeContext instead.
-using RuntimeContext = ::executorch::runtime::KernelRuntimeContext;
+using RuntimeContext = ::executorch::ET_RUNTIME_NAMESPACE::KernelRuntimeContext;
 } // namespace executor
 } // namespace torch
 namespace executorch {
 namespace aten {
 /// DEPRECATED: Use ::executorch::runtime::KernelRuntimeContext instead.
-using RuntimeContext = ::executorch::runtime::KernelRuntimeContext;
+using RuntimeContext = ::executorch::ET_RUNTIME_NAMESPACE::KernelRuntimeContext;
 } // namespace aten
 } // namespace executorch
 // DEPRECATED: The executorch::aten:: namespace is deprecated. Use

package/third-party/include/executorch/runtime/kernel/operator_registry.h

@@ -37,7 +37,7 @@
   }
 
 namespace executorch {
-namespace runtime {
+namespace ET_RUNTIME_NAMESPACE {
 
 class KernelRuntimeContext; // Forward declaration
 using OpFunction = void (*)(KernelRuntimeContext &, EValue **);
@@ -117,7 +117,7 @@ public:
    * for all input tensor dtypes and dim orders if the specialized kernel is not
    * registered.
    */
-  KernelKey() : is_fallback_(true) {}
+  KernelKey() = default;
 
   /**
    * Creates a specialized (non-fallback) kernel key that matches a specific
@@ -125,23 +125,23 @@ public:
    * expected format of `kernel_key_data`.
    */
   /* implicit */ KernelKey(const char *kernel_key_data)
-      : kernel_key_data_(kernel_key_data), is_fallback_(false) {}
+      : kernel_key_data_(kernel_key_data) {}
 
   bool operator==(const KernelKey &other) const { return this->equals(other); }
 
   bool operator!=(const KernelKey &other) const { return !this->equals(other); }
 
   bool equals(const KernelKey &other) const {
-    if (is_fallback_ != other.is_fallback_) {
+    if (is_fallback() != other.is_fallback()) {
       return false;
     }
-    if (is_fallback_) {
+    if (is_fallback()) {
       return true;
     }
     return strcmp(kernel_key_data_, other.kernel_key_data_) == 0;
   }
 
-  bool is_fallback() const { return is_fallback_; }
+  bool is_fallback() const { return kernel_key_data_ == nullptr; }
 
   const char *data() const { return kernel_key_data_; }
 
@@ -154,7 +154,6 @@ public:
 
 private:
   const char *kernel_key_data_ = nullptr;
-  bool is_fallback_;
 };
 
 /**
@@ -241,37 +240,40 @@ ET_NODISCARD inline Error register_kernel(const Kernel &kernel) {
   return register_kernels({&kernel, 1});
 };
 
-} // 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::Kernel;
-using ::executorch::runtime::KernelKey;
-using ::executorch::runtime::KernelRuntimeContext;
-using ::executorch::runtime::OpFunction;
-using ::executorch::runtime::TensorMeta;
-using KernelRuntimeContext = ::executorch::runtime::KernelRuntimeContext;
+using ::executorch::ET_RUNTIME_NAMESPACE::Kernel;
+using ::executorch::ET_RUNTIME_NAMESPACE::KernelKey;
+using ::executorch::ET_RUNTIME_NAMESPACE::KernelRuntimeContext;
+using ::executorch::ET_RUNTIME_NAMESPACE::OpFunction;
+using ::executorch::ET_RUNTIME_NAMESPACE::TensorMeta;
+using KernelRuntimeContext =
+    ::executorch::ET_RUNTIME_NAMESPACE::KernelRuntimeContext;
 
 inline ::executorch::runtime::Error register_kernels(ArrayRef<Kernel> kernels) {
-  return ::executorch::runtime::register_kernels(
+  return ::executorch::ET_RUNTIME_NAMESPACE::register_kernels(
       {kernels.data(), kernels.size()});
 }
 inline OpFunction getOpsFn(const char *name,
                            ArrayRef<TensorMeta> meta_list = {}) {
-  auto result = ::executorch::runtime::get_op_function_from_registry(
-      name, {meta_list.data(), meta_list.size()});
+  auto result =
+      ::executorch::ET_RUNTIME_NAMESPACE::get_op_function_from_registry(
+          name, {meta_list.data(), meta_list.size()});
   ET_CHECK(result.ok()); // get_op_function_from_registry() logs details.
   return *result;
 }
 inline bool hasOpsFn(const char *name, ArrayRef<TensorMeta> meta_list = {}) {
-  return ::executorch::runtime::registry_has_op_function(
+  return ::executorch::ET_RUNTIME_NAMESPACE::registry_has_op_function(
       name, {meta_list.data(), meta_list.size()});
 }
 inline ArrayRef<Kernel> get_kernels() {
-  Span<const Kernel> kernels = ::executorch::runtime::get_registered_kernels();
+  Span<const Kernel> kernels =
+      ::executorch::ET_RUNTIME_NAMESPACE::get_registered_kernels();
   return ArrayRef<Kernel>(kernels.data(), kernels.size());
 }
 } // namespace executor

package/third-party/include/executorch/runtime/platform/compiler.h

@@ -171,6 +171,14 @@
 using ssize_t = ptrdiff_t;
 #endif
 
+#ifdef __EXCEPTIONS
+#define ET_HAS_EXCEPTIONS 1
+#elif defined(_MSC_VER) && defined(_HAS_EXCEPTIONS) && _HAS_EXCEPTIONS
+#define ET_HAS_EXCEPTIONS 1
+#else
+#define ET_HAS_EXCEPTIONS 0
+#endif
+
 // DEPRECATED: Use the non-underscore-prefixed versions instead.
 // TODO(T199005537): Remove these once all users have stopped using them.
 #define __ET_DEPRECATED ET_DEPRECATED