From a91be24e2dfee8d0c020e2ba56721dc3e84e0dd1 Mon Sep 17 00:00:00 2001
From: Richard Barnes <rbarnes@fb.com>
Date: Thu, 22 Jul 2021 15:38:22 -0700
Subject: [PATCH] Modernize make pointers (#61741)

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/61741

Test Plan: Sandcastle

Reviewed By: malfet

Differential Revision: D29717385

fbshipit-source-id: 4452b77981e49175f744bdaab12cd225bf75b90e
---
 torch/csrc/autograd/engine.cpp                               | 3 +--
 .../autograd/rpc_messages/propagate_gradients_req.cpp        | 5 ++---
 torch/csrc/jit/mobile/import.cpp                             | 5 ++---
 torch/lib/libshm/manager.cpp                                 | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/torch/csrc/autograd/engine.cpp b/torch/csrc/autograd/engine.cpp
index e63480f9692..97d7c60fc8c 100644
--- a/torch/csrc/autograd/engine.cpp
+++ b/torch/csrc/autograd/engine.cpp
@@ -1206,8 +1206,7 @@ auto Engine::start_device_threads() -> void {
   // types), and pre-allocate the device_ready_queues_ to ensure safe reading on it.
   device_ready_queues_ = std::vector<std::shared_ptr<ReadyQueue>>(num_devices);
   for (auto& queue : device_ready_queues_)    {
-    // NOLINTNEXTLINE(modernize-make-shared)
-    queue.reset(new ReadyQueue());
+    queue = std::make_shared<ReadyQueue>();
   }
 
   thread_pool_shared_ = std::make_shared<ThreadPoolShared>();
diff --git a/torch/csrc/distributed/autograd/rpc_messages/propagate_gradients_req.cpp b/torch/csrc/distributed/autograd/rpc_messages/propagate_gradients_req.cpp
index 929dde41a75..13f6614fc0e 100644
--- a/torch/csrc/distributed/autograd/rpc_messages/propagate_gradients_req.cpp
+++ b/torch/csrc/distributed/autograd/rpc_messages/propagate_gradients_req.cpp
@@ -80,9 +80,8 @@ std::unique_ptr<PropagateGradientsReq> PropagateGradientsReq::fromMessage(
     grads[i] = tupleElements[i].toTensor();
   }
 
-  // NOLINTNEXTLINE(modernize-make-unique)
-  return std::unique_ptr<PropagateGradientsReq>(
-      new PropagateGradientsReq(autogradMetadata, grads, retainGraph));
+  return std::make_unique<PropagateGradientsReq>(
+    autogradMetadata, grads, retainGraph);
 }
 
 const AutogradMetadata& PropagateGradientsReq::getAutogradMetadata() {
diff --git a/torch/csrc/jit/mobile/import.cpp b/torch/csrc/jit/mobile/import.cpp
index 05349fdac4e..702d0d705e2 100644
--- a/torch/csrc/jit/mobile/import.cpp
+++ b/torch/csrc/jit/mobile/import.cpp
@@ -333,9 +333,8 @@ void BytecodeDeserializer::parseMethods(
         ? at::optional<IValue>{m_tuple[2]}
         : at::nullopt;
 
-    // NOLINTNEXTLINE(modernize-make-unique)
-    auto function = std::unique_ptr<mobile::Function>(
-        new mobile::Function(c10::QualifiedName(function_name)));
+    auto function =
+        std::make_unique<mobile::Function>(c10::QualifiedName(function_name));
 
     const auto& ins_list =
         expect_field(codeTable, "instructions", BYTECODE_INDEX_INSTRUCTION)
diff --git a/torch/lib/libshm/manager.cpp b/torch/lib/libshm/manager.cpp
index a87465dd4fa..7f6ca295ef5 100644
--- a/torch/lib/libshm/manager.cpp
+++ b/torch/lib/libshm/manager.cpp
@@ -103,8 +103,7 @@ int main(int argc, char *argv[]) {
 
     std::string tempfile = tempdir->name + "/manager.sock";
 
-    // NOLINTNEXTLINE(modernize-make-unique)
-    srv_socket.reset(new ManagerServerSocket(tempfile));
+    srv_socket = std::make_unique<ManagerServerSocket>(tempfile);
     register_fd(srv_socket->socket_fd);
     print_init_message(tempfile.c_str());
     DEBUG("opened socket %s", tempfile.c_str());