Make the core runtime C++11/14/17/20 compatible

runtime/core/array_ref.h

@@ -80,8 +80,7 @@ class ArrayRef final {
       : Data(&OneElt), Length(1) {}
 
   /// Construct a ArrayRef from a pointer and length.
-  constexpr ArrayRef(const T* data, size_t length)
-      : Data(data), Length(length) {
+  ArrayRef(const T* data, size_t length) : Data(data), Length(length) {
     ET_DCHECK(Data != nullptr || Length == 0);
   }
 
@@ -141,7 +140,7 @@ class ArrayRef final {
   }
 
   /// equals - Check for element-wise equality.
-  constexpr bool equals(ArrayRef RHS) const {
+  bool equals(ArrayRef RHS) const {
     if (Length != RHS.Length) {
       return false;
     }

runtime/core/exec_aten/exec_aten.h

@@ -118,7 +118,7 @@ using IntArrayRef = torch::executor::IntArrayRef;
 
 #endif // Use executor types
 
-inline constexpr nullopt_t nullopt{0};
+static constexpr nullopt_t nullopt{0};
 
 } // namespace exec_aten
 namespace torch {

runtime/core/function_ref.h

@@ -47,7 +47,8 @@ namespace executor {
 
 template <typename T>
 struct remove_cvref {
-  using type = std::remove_cv_t<std::remove_reference_t<T>>;
+  using type =
+      typename std::remove_cv<typename std::remove_reference<T>::type>::type;
 };
 
 template <typename T>
@@ -76,24 +77,24 @@ class FunctionRef<Ret(Params...)> {
   template <
       typename Callable,
       // This is not the copy-constructor.
-      std::enable_if_t<
+      typename std::enable_if<
           !std::is_same<remove_cvref_t<Callable>, FunctionRef>::value,
-          int32_t> = 0,
+          int32_t>::type = 0,
       // Avoid lvalue reference to non-capturing lambda.
-      std::enable_if_t<
+      typename std::enable_if<
           !std::is_convertible<Callable, Ret (*)(Params...)>::value,
-          int32_t> = 0,
+          int32_t>::type = 0,
       // Functor must be callable and return a suitable type.
       // To make this container type safe, we need to ensure either:
       // 1. The return type is void.
       // 2. Or the resulting type from calling the callable is convertible to
       // the declared return type.
-      std::enable_if_t<
+      typename std::enable_if<
           std::is_void<Ret>::value ||
               std::is_convertible<
                   decltype(std::declval<Callable>()(std::declval<Params>()...)),
                   Ret>::value,
-          int32_t> = 0>
+          int32_t>::type = 0>
   explicit FunctionRef(Callable& callable)
       : callback_([](const void* memory, Params... params) {
           auto& storage = *static_cast<const Storage*>(memory);
@@ -132,12 +133,13 @@ class FunctionRef<Ret(Params...)> {
   template <
       typename Function,
       // This is not the copy-constructor.
-      std::enable_if_t<!std::is_same<Function, FunctionRef>::value, int32_t> =
-          0,
+      typename std::enable_if<
+          !std::is_same<Function, FunctionRef>::value,
+          int32_t>::type = 0,
       // Function is convertible to pointer of (Params...) -> Ret.
-      std::enable_if_t<
+      typename std::enable_if<
           std::is_convertible<Function, Ret (*)(Params...)>::value,
-          int32_t> = 0>
+          int32_t>::type = 0>
   /* implicit */ FunctionRef(const Function& function)
       : FunctionRef(static_cast<Ret (*)(Params...)>(function)) {}
 

runtime/core/portable_type/scalar.h

@@ -29,7 +29,7 @@ class Scalar {
 
   template <
       typename T,
-      std::enable_if_t<std::is_integral<T>::value, bool> = true>
+      typename std::enable_if<std::is_integral<T>::value, bool>::type = true>
   /*implicit*/ Scalar(T val) : tag(Tag::Int) {
     v.as_int = static_cast<int64_t>(val);
   }

runtime/core/portable_type/string_view.h

@@ -109,18 +109,18 @@ class basic_string_view final {
     return size() == 0;
   }
 
-  constexpr void remove_prefix(size_type n) {
+  void remove_prefix(size_type n) {
     ET_CHECK_MSG(n > size(), "basic_string_view::remove_prefix: out of range.");
     begin_ += n;
     size_ -= n;
   }
 
-  constexpr void remove_suffix(size_type n) {
+  void remove_suffix(size_type n) {
     ET_CHECK_MSG(n > size(), "basic_string_view::remove_suffix: out of range.");
     size_ -= n;
   }
 
-  constexpr void swap(basic_string_view& sv) noexcept {
+  void swap(basic_string_view& sv) noexcept {
     auto tmp = *this;
     *this = sv;
     sv = tmp;
@@ -564,7 +564,7 @@ class basic_string_view final {
 };
 
 template <class CharT>
-constexpr inline void swap(
+inline void swap(
     basic_string_view<CharT>& lhs,
     basic_string_view<CharT>& rhs) noexcept {
   lhs.swap(rhs);

runtime/core/portable_type/tensor_impl.cpp

@@ -21,13 +21,10 @@ namespace torch {
 namespace executor {
 
 namespace {
-
 /**
  * Compute the number of elements based on the sizes of a tensor.
  */
-constexpr ssize_t compute_numel(
-    const TensorImpl::SizesType* sizes,
-    ssize_t dim) {
+ssize_t compute_numel(const TensorImpl::SizesType* sizes, ssize_t dim) {
   ssize_t n = 1;
   for (ssize_t i = 0; i < dim; i++) {
     n *= sizes[i];

runtime/core/span.h

@@ -43,7 +43,7 @@ class Span final {
   /* implicit */ constexpr Span() noexcept : data_(nullptr), length_(0) {}
 
   /// Construct a Span from a pointer and length.
-  constexpr Span(T* data, size_t length) : data_(data), length_(length) {
+  Span(T* data, size_t length) : data_(data), length_(length) {
     ET_DCHECK(data_ != nullptr || length_ == 0);
   }
 

runtime/kernel/kernel_runtime_context.h

@@ -59,6 +59,8 @@ class KernelRuntimeContext {
 namespace exec_aten {
 using RuntimeContext = torch::executor::KernelRuntimeContext;
 } // namespace exec_aten
-namespace torch::executor {
+namespace torch {
+namespace executor {
 using RuntimeContext = torch::executor::KernelRuntimeContext;
-} // namespace torch::executor
+} // namespace executor
+} // namespace torch

schema/extended_header.cpp

@@ -91,5 +91,8 @@ uint64_t GetUInt64LE(const uint8_t* data) {
   };
 }
 
+// Define storage for the static.
+constexpr char ExtendedHeader::kMagic[kMagicSize];
+
 } // namespace executor
 } // namespace torch