Merge branch 'pytorch:main' into main

Author: jakmro

kernels/quantized/cpu/op_quantize.cpp

@@ -281,7 +281,7 @@ Tensor& quantize_per_channel_out(
   check_quantize_per_tensor_args(input, quant_min, quant_max, dtype, out);
 
   // a list contains all dimensions except axis
-  int64_t dims[input.dim() - 1];
+  int64_t dims[kTensorDimensionLimit];
   for (int64_t i = 0; i < input.dim() - 1; i++) {
     if (i < axis) {
       dims[i] = i;

runtime/core/evalue.h

@@ -242,12 +242,13 @@ struct EValue {
   // Template constructor that allows construction from types that can be
   // dereferenced to produce a type that EValue can be implicitly constructed
   // from.
-  template <typename T>
-  /*implicit*/ EValue(
-      T&& value,
-      typename std::enable_if<std::is_convertible<
-          decltype(*std::forward<T>(value)),
-          EValue>::value>::type* = 0) {
+  template <
+      typename T,
+      typename = typename std::enable_if<std::is_convertible<
+          decltype(*std::forward<T>(std::declval<T>())), // declval to simulate
+                                                         // forwarding
+          EValue>::value>::type>
+  /*implicit*/ EValue(T&& value) {
     ET_CHECK_MSG(value != nullptr, "Pointer is null.");
     // Note that this ctor does not initialize this->tag directly; it is set by
     // moving in the new value.

runtime/core/exec_aten/exec_aten.h

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <executorch/runtime/core/tensor_shape_dynamism.h> // @manual
+#include <executorch/runtime/platform/compiler.h>
 #ifdef USE_ATEN_LIB
 #include <ATen/Tensor.h> // @manual
 #include <c10/core/Device.h>

runtime/core/portable_type/tensor_impl.cpp

@@ -110,8 +110,11 @@ Error TensorImpl::internal_resize_contiguous(ArrayRef<SizesType> new_sizes) {
           numel_bound_);
 
       if (strides_ && dim_order_) {
-        ET_CHECK_OK_OR_RETURN_ERROR(
-            dim_order_to_stride(new_sizes.data(), dim_order_, dim_, strides_));
+        auto error =
+            dim_order_to_stride(new_sizes.data(), dim_order_, dim_, strides_);
+        if (error != Error::Ok) {
+          return error;
+        }
       }
       numel_ = new_numel;
       std::copy(new_sizes.begin(), new_sizes.end(), sizes_);

runtime/executor/memory_manager.h

@@ -67,18 +67,16 @@ class MemoryManager final {
    * TODO(T162089316): Remove this once all users migrate to the new ctor.
    */
   ET_DEPRECATED MemoryManager(
-      // We would normally use ET_UNUSED here, but GCC older than 9.3 has a
-      // bug that triggers a syntax error when using [[maybe_unused]] on the
-      // first parameter of a constructor:
-      // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81429
-      __attribute__((unused)) MemoryAllocator* constant_allocator,
+      MemoryAllocator* constant_allocator,
       HierarchicalAllocator* non_constant_allocator,
       MemoryAllocator* runtime_allocator,
       MemoryAllocator* temporary_allocator)
       : MemoryManager(
             /*method_allocator=*/runtime_allocator,
             /*planned_memory=*/non_constant_allocator,
-            /*temp_allocator=*/temporary_allocator) {}
+            /*temp_allocator=*/temporary_allocator) {
+    (void)constant_allocator; // Suppress unused variable warning
+  }
 
   /**
    * Returns the allocator that the runtime will use to allocate internal

runtime/executor/program.cpp

@@ -86,7 +86,11 @@ Result<executorch_flatbuffer::ExecutionPlan*> get_execution_plan(
     } else if (eh.error() == Error::NotFound) {
       // No header; the program consumes the whole file, and there are no
       // segments.
-      program_size = ET_UNWRAP(loader->size());
+      auto result = loader->size();
+      if (!result.ok()) {
+        return result.error();
+      }
+      program_size = result.get();
     } else {
       ET_LOG(Error, "Extended header may be corrupt");
       return eh.error();