Update

[ghstack-poisoned]
pytorch · kurtamohler · Mar 4, 2025 · Mar 7, 2025 · Mar 7, 2025 · Mar 7, 2025
commit c688b9cb15ab6f851f2af1d9860fb98edce9a291
diff --git a/aten/src/ATen/native/AutogradComposite.cpp b/aten/src/ATen/native/AutogradComposite.cpp
@@ -93,7 +93,7 @@ bool _has_same_storage_numel(const at::Tensor& base, const at::Tensor& other) {
   return base.storage().sym_nbytes() / base.itemsize() == other.storage().sym_nbytes() / other.itemsize();
 }
 
-Tensor _lazy_clone(Tensor const& self, optional<c10::Device> device_opt) {
+Tensor _lazy_clone(Tensor const& self, std::optional<c10::Device> device_opt) {
   c10::StorageImpl* self_storage = self.storage().unsafeGetStorageImpl();
   c10::intrusive_ptr<c10::StorageImpl> storage = nullptr;
 

diff --git a/c10/core/impl/COW.cpp b/c10/core/impl/COW.cpp
@@ -6,6 +6,7 @@
 #include <c10/core/alignment.h>
 #include <c10/core/impl/COWDeleter.h>
 #include <c10/util/Exception.h>
+#include <c10/util/Optional.h>
 #include <c10/util/ParallelGuard.h>
 #include <c10/util/UniqueVoidPtr.h>
 
@@ -75,7 +76,7 @@ static void check_clone_between_devices(
       "'.");
 }
 
-static c10::optional<at::DataPtr> lazy_clone_storage_data_ptr(
+static std::optional<at::DataPtr> lazy_clone_storage_data_ptr(
     StorageImpl& storage) {
   const at::DataPtr& data_ptr = storage.data_ptr();
 
@@ -126,15 +127,15 @@ static c10::optional<at::DataPtr> lazy_clone_storage_data_ptr(
   } else {
     // Case 3) There is a context and it's not copy-on-write. Nothing
     // we can do here.
-    return c10::nullopt;
+    return std::nullopt;
   }
 
   TORCH_INTERNAL_ASSERT(new_data_ptr_opt.has_value());
   return new_data_ptr_opt;
 }
 
 c10::intrusive_ptr<StorageImpl> lazy_clone_storage(StorageImpl& storage) {
-  c10::optional<at::DataPtr> new_data_ptr_opt =
+  std::optional<at::DataPtr> new_data_ptr_opt =
       lazy_clone_storage_data_ptr(storage);
   if (!new_data_ptr_opt.has_value()) {
     return nullptr;
@@ -154,7 +155,7 @@ c10::intrusive_ptr<StorageImpl> lazy_clone_storage(
     StorageImpl& storage,
     c10::Device device,
     c10::Allocator& allocator) {
-  c10::optional<at::DataPtr> new_data_ptr_opt =
+  std::optional<at::DataPtr> new_data_ptr_opt =
       lazy_clone_storage_data_ptr(storage);
   if (!new_data_ptr_opt.has_value()) {
     return nullptr;

diff --git a/c10/core/impl/COW.h b/c10/core/impl/COW.h
@@ -3,7 +3,6 @@
 #include <c10/core/Allocator.h>
 #include <c10/core/Device.h>
 #include <c10/macros/Macros.h>
-#include <c10/util/Optional.h>
 #include <c10/util/intrusive_ptr.h>
 
 namespace c10 {