c10::optional -> std::optional in pytorch/inplace_abn/src/inplace_abn_cuda.cu +20

r-barnes · facebook-github-bot · commit 380af838fd2c · 2024-05-14T08:21:29.000-07:00
Summary: `c10::optional` was switched to be `std::optional` after PyTorch moved to C++17. Let's eliminate `c10::optional`, if we can.

Reviewed By: albanD

Differential Revision: D57294273

fbshipit-source-id: 8ccf207440302ea91b4f5057224c5c57ca7f9106
diff --git a/torchtext/csrc/bert_tokenizer.cpp b/torchtext/csrc/bert_tokenizer.cpp
@@ -141,7 +141,7 @@ static void to_lower(UString& token) {
 BERTEncoder::BERTEncoder(
     const std::string& vocab_file,
     bool do_lower_case,
-    c10::optional<bool> strip_accents,
+    std::optional<bool> strip_accents,
     std::vector<std::string> never_split)
     : vocab_{_read_vocab(vocab_file)},
       do_lower_case_{do_lower_case},
@@ -153,7 +153,7 @@ BERTEncoder::BERTEncoder(
 BERTEncoder::BERTEncoder(
     Vocab vocab,
     bool do_lower_case,
-    c10::optional<bool> strip_accents,
+    std::optional<bool> strip_accents,
     std::vector<std::string> never_split)
     : vocab_{vocab},
       do_lower_case_{do_lower_case},
diff --git a/torchtext/csrc/bert_tokenizer.h b/torchtext/csrc/bert_tokenizer.h
@@ -13,7 +13,7 @@ typedef ska_ordered::order_preserving_flat_hash_map<std::string, int64_t>
 // vocabulary)
 typedef std::tuple<
     bool,
-    c10::optional<bool>,
+    std::optional<bool>,
     std::vector<std::string>,
     std::vector<std::string>>
     BERTEncoderStates;
@@ -22,12 +22,12 @@ struct BERTEncoder : torch::CustomClassHolder {
   TORCHTEXT_API BERTEncoder(
       const std::string& vocab_file,
       bool do_lower_case,
-      c10::optional<bool> strip_accents,
+      std::optional<bool> strip_accents,
       std::vector<std::string> never_split);
   BERTEncoder(
       Vocab vocab,
       bool do_lower_case,
-      c10::optional<bool> strip_accents,
+      std::optional<bool> strip_accents,
       std::vector<std::string> never_split);
   TORCHTEXT_API std::vector<std::string> Tokenize(std::string text);
   TORCHTEXT_API std::vector<int64_t> Encode(std::string text);
@@ -38,7 +38,7 @@ struct BERTEncoder : torch::CustomClassHolder {
 
   Vocab vocab_;
   bool do_lower_case_;
-  c10::optional<bool> strip_accents_ = {};
+  std::optional<bool> strip_accents_ = {};
   std::vector<std::string> never_split_;
   std::set<std::string> never_split_set_;
 
diff --git a/torchtext/csrc/register_pybindings.cpp b/torchtext/csrc/register_pybindings.cpp
@@ -116,7 +116,7 @@ PYBIND11_MODULE(_torchtext, m) {
           }));
 
   py::class_<Vocab, c10::intrusive_ptr<Vocab>>(m, "Vocab")
-      .def(py::init<StringList, c10::optional<int64_t>>())
+      .def(py::init<StringList, std::optional<int64_t>>())
       .def_readonly("itos_", &Vocab::itos_)
       .def_readonly("default_index_", &Vocab::default_index_)
       .def(
@@ -242,7 +242,7 @@ PYBIND11_MODULE(_torchtext, m) {
       .def(py::init<
            const std::string,
            bool,
-           c10::optional<bool>,
+           std::optional<bool>,
            std::vector<std::string>>())
       .def("encode", &BERTEncoder::Encode)
       .def("tokenize", &BERTEncoder::Tokenize)
diff --git a/torchtext/csrc/register_torchbindings.cpp b/torchtext/csrc/register_torchbindings.cpp
@@ -94,7 +94,7 @@ TORCH_LIBRARY_FRAGMENT(torchtext, m) {
           });
 
   m.class_<Vocab>("Vocab")
-      .def(torch::init<StringList, c10::optional<int64_t>>())
+      .def(torch::init<StringList, std::optional<int64_t>>())
       .def(
           "__contains__",
           [](const c10::intrusive_ptr<Vocab>& self, const std::string& item)
@@ -181,7 +181,7 @@ TORCH_LIBRARY_FRAGMENT(torchtext, m) {
       .def(torch::init<
            const std::string,
            bool,
-           c10::optional<bool>,
+           std::optional<bool>,
            std::vector<std::string>>())
       .def("encode", &BERTEncoder::Encode)
       .def("tokenize", &BERTEncoder::Tokenize)
diff --git a/torchtext/csrc/vectors.cpp b/torchtext/csrc/vectors.cpp
@@ -226,7 +226,7 @@ std::tuple<Vectors, std::vector<std::string>> _load_token_and_vectors_from_file(
     const std::string& file_path,
     const std::string& delimiter_str,
     int64_t num_cpus,
-    c10::optional<torch::Tensor> opt_unk_tensor) {
+    std::optional<torch::Tensor> opt_unk_tensor) {
   TORCH_CHECK(
       delimiter_str.size() == 1,
       "Only string delimeters of size 1 are supported.");
diff --git a/torchtext/csrc/vectors.h b/torchtext/csrc/vectors.h
@@ -52,6 +52,6 @@ _load_token_and_vectors_from_file(
     const std::string& file_path,
     const std::string& delimiter_str,
     const int64_t num_cpus,
-    c10::optional<torch::Tensor> opt_unk_tensor);
+    std::optional<torch::Tensor> opt_unk_tensor);
 
 } // namespace torchtext
diff --git a/torchtext/csrc/vocab.cpp b/torchtext/csrc/vocab.cpp
@@ -8,7 +8,7 @@
 #include <string>
 namespace torchtext {
 
-Vocab::Vocab(StringList tokens, const c10::optional<int64_t>& default_index)
+Vocab::Vocab(StringList tokens, const std::optional<int64_t>& default_index)
     : stoi_(MAX_VOCAB_SIZE, -1), default_index_{default_index} {
   for (auto& token : tokens) {
     // throw error if duplicate token is found
@@ -49,11 +49,11 @@ int64_t Vocab::__getitem__(const c10::string_view& token) const {
   return default_index_.value();
 }
 
-void Vocab::set_default_index(c10::optional<int64_t> index) {
+void Vocab::set_default_index(std::optional<int64_t> index) {
   default_index_ = index;
 }
 
-c10::optional<int64_t> Vocab::get_default_index() const {
+std::optional<int64_t> Vocab::get_default_index() const {
   return default_index_;
 }
 
@@ -173,7 +173,7 @@ c10::intrusive_ptr<Vocab> _deserialize_vocab(VocabStates states) {
       version_str.compare("0.0.2") >= 0,
       "Found unexpected version for serialized Vocab: " + version_str);
 
-  c10::optional<int64_t> default_index = {};
+  std::optional<int64_t> default_index = {};
   if (integers.size() > 0) {
     default_index = integers[0];
   }
diff --git a/torchtext/csrc/vocab.h b/torchtext/csrc/vocab.h
@@ -36,20 +36,20 @@ struct Vocab : torch::CustomClassHolder {
   std::vector<int32_t> stoi_;
   const std::string version_str_ = "0.0.2";
   StringList itos_;
-  c10::optional<int64_t> default_index_ = {};
+  std::optional<int64_t> default_index_ = {};
 
   // TODO: [can we remove this?] we need to keep this constructor, otherwise
   // torch binding gets compilation error: no matching constructor for
   // initialization of 'torchtext::Vocab'
   TORCHTEXT_API explicit Vocab(StringList tokens);
   TORCHTEXT_API explicit Vocab(
       StringList tokens,
-      const c10::optional<int64_t>& default_index);
+      const std::optional<int64_t>& default_index);
   TORCHTEXT_API int64_t __len__() const;
   TORCHTEXT_API int64_t __getitem__(const c10::string_view& token) const;
   TORCHTEXT_API bool __contains__(const c10::string_view& token) const;
-  TORCHTEXT_API void set_default_index(c10::optional<int64_t> index);
-  TORCHTEXT_API c10::optional<int64_t> get_default_index() const;
+  TORCHTEXT_API void set_default_index(std::optional<int64_t> index);
+  TORCHTEXT_API std::optional<int64_t> get_default_index() const;
   TORCHTEXT_API void insert_token(std::string token, const int64_t& index);
   TORCHTEXT_API void append_token(std::string token);
   TORCHTEXT_API std::string lookup_token(const int64_t& index);
