[1/N] Change #include <c10/util/Optional.h> to #include <optional> (pytorch#128301)

Fixes #ISSUE_NUMBER

Pull Request resolved: pytorch#128301
Approved by: https://github.com/ezyang, https://github.com/r-barnes

Author: cyyever

aten/src/ATen/CPUGeneratorImpl.h

@@ -3,7 +3,7 @@
 #include <ATen/core/Generator.h>
 #include <ATen/core/MT19937RNGEngine.h>
 #include <c10/core/GeneratorImpl.h>
-#include <c10/util/Optional.h>
+#include <optional>
 
 namespace at {
 

aten/src/ATen/InferSize.h

@@ -4,7 +4,7 @@
 #include <c10/core/ScalarType.h>
 #include <c10/core/SymIntArrayRef.h>
 #include <c10/util/DimVector.h>
-#include <c10/util/Optional.h>
+#include <optional>
 #include <sstream>
 #include <vector>
 

aten/src/ATen/SavedTensorHooks.cpp

@@ -32,7 +32,7 @@ void SavedTensorDefaultHooks::disable(const std::string& message) {
 }
 
 void SavedTensorDefaultHooks::enable() {
-  tls.disabled_error_message = c10::nullopt;
+  tls.disabled_error_message = std::nullopt;
 }
 
 /* static */ bool SavedTensorDefaultHooks::set_tracing(bool is_tracing) {

aten/src/ATen/SavedTensorHooks.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <c10/macros/Export.h>
-#include <c10/util/Optional.h>
 #include <c10/util/python_stub.h>
+#include <optional>
 #include <stack>
 #include <string>
 

aten/src/ATen/TensorIndexing.h

@@ -5,8 +5,8 @@
 #include <ATen/core/Tensor.h>
 #include <ATen/core/TensorBody.h>
 #include <c10/core/SymInt.h>
-#include <c10/util/Optional.h>
 #include <c10/util/irange.h>
+#include <optional>
 
 #ifndef AT_PER_OPERATOR_HEADERS
 #include <ATen/Functions.h>

aten/src/ATen/native/BatchLinearAlgebra.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/util/Optional.h>
+#include <optional>
 #include <c10/util/string_view.h>
 #include <ATen/Config.h>
 #include <ATen/native/DispatchStub.h>

aten/src/ATen/record_function.h

@@ -3,8 +3,8 @@
 #include <ATen/core/ivalue.h>
 #include <ATen/core/operator_name.h>
 #include <c10/macros/Export.h>
-#include <c10/util/Optional.h>
 #include <c10/util/SmallVector.h>
+#include <optional>
 
 #include <array>
 #include <functional>

c10/core/ConstantSymNodeImpl.h

@@ -3,8 +3,8 @@
 #include <c10/core/SymNodeImpl.h>
 #include <c10/macros/Export.h>
 #include <c10/util/Exception.h>
-#include <c10/util/Optional.h>
 #include <cstdint>
+#include <optional>
 #include <string>
 #include <variant>
 
@@ -73,14 +73,14 @@ class C10_API ConstantSymNodeImpl : public SymNodeImpl {
     if constexpr (is_int_()) {
       return ::std::get<int64_t>(value_);
     } else {
-      return c10::nullopt;
+      return std::nullopt;
     }
   }
   std::optional<bool> constant_bool() override {
     if constexpr (is_bool_()) {
       return ::std::get<bool>(value_);
     } else {
-      return c10::nullopt;
+      return std::nullopt;
     }
   }
   bool is_constant() override {

c10/core/ScalarTypeToTypeMeta.h

@@ -30,7 +30,7 @@ inline ScalarType typeMetaToScalarType(caffe2::TypeMeta dtype) {
 inline optional<at::ScalarType> optTypeMetaToScalarType(
     optional<caffe2::TypeMeta> type_meta) {
   if (!type_meta.has_value()) {
-    return c10::nullopt;
+    return std::nullopt;
   }
   return type_meta->toScalarType();
 }

c10/core/SymBool.h

@@ -3,9 +3,9 @@
 #include <c10/core/SymNodeImpl.h>
 #include <c10/macros/Export.h>
 #include <c10/util/Exception.h>
-#include <c10/util/Optional.h>
 #include <c10/util/intrusive_ptr.h>
 #include <cstdint>
+#include <optional>
 #include <ostream>
 #include <utility>
 
@@ -68,7 +68,7 @@ class C10_API SymBool {
 
   std::optional<bool> maybe_as_bool() const {
     if (!is_heap_allocated()) {
-      return c10::make_optional(data_);
+      return std::make_optional(data_);
     }
     return toSymNodeImplUnowned()->constant_bool();
   }