From c65e87b328f49c070f631bc74a0b4cacc390b28e Mon Sep 17 00:00:00 2001
From: cyyever <cyyever@outlook.com>
Date: Wed, 12 Jun 2024 10:34:23 +0800
Subject: [PATCH] Change #include <c10/util/Optional.h> to #include <optional>
 (#7241)

---
 torch_xla/csrc/convert_ops.h            | 3 ++-
 torch_xla/csrc/helpers.h                | 2 +-
 torch_xla/csrc/init_python_bindings.cpp | 2 +-
 torch_xla/csrc/ops/cast.h               | 5 +++--
 torch_xla/csrc/ops/cumprod.h            | 5 +++--
 torch_xla/csrc/ops/cumsum.h             | 5 +++--
 torch_xla/csrc/ops/log_softmax.h        | 5 +++--
 torch_xla/csrc/ops/logsumexp.h          | 4 +---
 torch_xla/csrc/ops/mean.h               | 4 ++--
 torch_xla/csrc/ops/prod.h               | 5 +++--
 torch_xla/csrc/ops/softmax.h            | 5 +++--
 torch_xla/csrc/ops/sum.h                | 5 +++--
 torch_xla/csrc/torch_util.h             | 3 ++-
 13 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/torch_xla/csrc/convert_ops.h b/torch_xla/csrc/convert_ops.h
index 71c72d1062f..88680fd6aad 100644
--- a/torch_xla/csrc/convert_ops.h
+++ b/torch_xla/csrc/convert_ops.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_CONVERT_OPS_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "torch_xla/csrc/device.h"
 #include "xla/client/xla_builder.h"
diff --git a/torch_xla/csrc/helpers.h b/torch_xla/csrc/helpers.h
index c1609cca88b..309e7a50202 100644
--- a/torch_xla/csrc/helpers.h
+++ b/torch_xla/csrc/helpers.h
@@ -2,11 +2,11 @@
 #define XLA_TORCH_XLA_CSRC_HELPERS_H_
 
 #include <c10/core/Scalar.h>
-#include <c10/util/Optional.h>
 #include <torch/csrc/lazy/core/shape.h>
 #include <torch/csrc/lazy/core/util.h>
 
 #include <functional>
+#include <optional>
 #include <tuple>
 #include <vector>
 
diff --git a/torch_xla/csrc/init_python_bindings.cpp b/torch_xla/csrc/init_python_bindings.cpp
index 67276268a36..153915459cb 100644
--- a/torch_xla/csrc/init_python_bindings.cpp
+++ b/torch_xla/csrc/init_python_bindings.cpp
@@ -1,7 +1,6 @@
 #include <ATen/dlpack.h>
 #include <Python.h>
 #include <c10/core/Device.h>
-#include <c10/util/Optional.h>
 #include <google/protobuf/text_format.h>
 #include <torch/csrc/autograd/utils/wrap_outputs.h>
 #include <torch/csrc/autograd/variable.h>
@@ -13,6 +12,7 @@
 
 #include <cstring>
 #include <fstream>
+#include <optional>
 #include <sstream>
 #include <string>
 #include <thread>
diff --git a/torch_xla/csrc/ops/cast.h b/torch_xla/csrc/ops/cast.h
index b2322c80fa7..73490cdf1da 100644
--- a/torch_xla/csrc/ops/cast.h
+++ b/torch_xla/csrc/ops/cast.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_CAST_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "torch_xla/csrc/ir.h"
 
@@ -34,4 +35,4 @@ class Cast : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_CAST_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_CAST_H_
diff --git a/torch_xla/csrc/ops/cumprod.h b/torch_xla/csrc/ops/cumprod.h
index 2ffb2d35811..c650505e2f5 100644
--- a/torch_xla/csrc/ops/cumprod.h
+++ b/torch_xla/csrc/ops/cumprod.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_CUMPROD_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "torch_xla/csrc/ir.h"
 
@@ -30,4 +31,4 @@ class CumProd : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_CUMPROD_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_CUMPROD_H_
diff --git a/torch_xla/csrc/ops/cumsum.h b/torch_xla/csrc/ops/cumsum.h
index 2282a52193c..76832378f61 100644
--- a/torch_xla/csrc/ops/cumsum.h
+++ b/torch_xla/csrc/ops/cumsum.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_CUMSUM_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "torch_xla/csrc/ir.h"
 
@@ -30,4 +31,4 @@ class CumSum : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_CUMSUM_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_CUMSUM_H_
diff --git a/torch_xla/csrc/ops/log_softmax.h b/torch_xla/csrc/ops/log_softmax.h
index 33a0cb522a6..068080721ba 100644
--- a/torch_xla/csrc/ops/log_softmax.h
+++ b/torch_xla/csrc/ops/log_softmax.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_LOG_SOFTMAX_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "torch_xla/csrc/ir.h"
 
@@ -31,4 +32,4 @@ class LogSoftmax : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_LOG_SOFTMAX_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_LOG_SOFTMAX_H_
diff --git a/torch_xla/csrc/ops/logsumexp.h b/torch_xla/csrc/ops/logsumexp.h
index cc9d797382c..d5f6d3940fa 100644
--- a/torch_xla/csrc/ops/logsumexp.h
+++ b/torch_xla/csrc/ops/logsumexp.h
@@ -1,8 +1,6 @@
 #ifndef XLA_TORCH_XLA_CSRC_OPS_LOGSUMEXP_H_
 #define XLA_TORCH_XLA_CSRC_OPS_LOGSUMEXP_H_
 
-#include <c10/util/Optional.h>
-
 #include <vector>
 
 #include "torch_xla/csrc/ir.h"
@@ -31,4 +29,4 @@ class Logsumexp : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_LOGSUMEXP_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_LOGSUMEXP_H_
diff --git a/torch_xla/csrc/ops/mean.h b/torch_xla/csrc/ops/mean.h
index cdf69ad86e2..3612b6b65cd 100644
--- a/torch_xla/csrc/ops/mean.h
+++ b/torch_xla/csrc/ops/mean.h
@@ -2,8 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_MEAN_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
 
+#include <optional>
 #include <vector>
 
 #include "torch_xla/csrc/ir.h"
@@ -36,4 +36,4 @@ class Mean : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_MEAN_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_MEAN_H_
diff --git a/torch_xla/csrc/ops/prod.h b/torch_xla/csrc/ops/prod.h
index c22e2ec66a7..3fbff25929f 100644
--- a/torch_xla/csrc/ops/prod.h
+++ b/torch_xla/csrc/ops/prod.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_PROD_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "absl/types/span.h"
 #include "torch_xla/csrc/ir.h"
@@ -34,4 +35,4 @@ class Prod : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_PROD_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_PROD_H_
diff --git a/torch_xla/csrc/ops/softmax.h b/torch_xla/csrc/ops/softmax.h
index a9fa951fd9d..10fea7be9dc 100644
--- a/torch_xla/csrc/ops/softmax.h
+++ b/torch_xla/csrc/ops/softmax.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_SOFTMAX_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "torch_xla/csrc/ir.h"
 
@@ -30,4 +31,4 @@ class Softmax : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_SOFTMAX_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_SOFTMAX_H_
diff --git a/torch_xla/csrc/ops/sum.h b/torch_xla/csrc/ops/sum.h
index d66960342b4..638baa63834 100644
--- a/torch_xla/csrc/ops/sum.h
+++ b/torch_xla/csrc/ops/sum.h
@@ -2,7 +2,8 @@
 #define XLA_TORCH_XLA_CSRC_OPS_SUM_H_
 
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
+
+#include <optional>
 
 #include "absl/types/span.h"
 #include "torch_xla/csrc/ir.h"
@@ -34,4 +35,4 @@ class Sum : public XlaNode {
 
 }  // namespace torch_xla
 
-#endif  // XLA_TORCH_XLA_CSRC_OPS_SUM_H_
\ No newline at end of file
+#endif  // XLA_TORCH_XLA_CSRC_OPS_SUM_H_
diff --git a/torch_xla/csrc/torch_util.h b/torch_xla/csrc/torch_util.h
index 567fa0550b0..82b73cadfd5 100644
--- a/torch_xla/csrc/torch_util.h
+++ b/torch_xla/csrc/torch_util.h
@@ -4,12 +4,13 @@
 #include <ATen/ATen.h>
 #include <ATen/FunctionalTensorWrapper.h>
 #include <c10/core/ScalarType.h>
-#include <c10/util/Optional.h>
 #include <torch/csrc/lazy/core/dynamic_ir.h>
 #include <torch/csrc/lazy/core/hash.h>
 #include <torch/csrc/lazy/core/tensor.h>
 #include <torch/csrc/lazy/core/util.h>
 
+#include <optional>
+
 #include "torch_xla/csrc/runtime/debug_macros.h"
 #include "xla/shape.h"