[Distributed] [9/N] Fix clang-tidy warnings in torch/csrc/distributed/rpc (pytorch#130109)

Follows pytorch#125102

Pull Request resolved: pytorch#130109
Approved by: https://github.com/ezyang

Author: cyyever

torch/csrc/distributed/c10d/ProcessGroupGloo.cpp

@@ -199,6 +199,7 @@ ReduceFunc toFunction(const ReduceOp& r) {
       TORCH_CHECK(false, "Cannot use ReduceOp.PREMUL_SUM with Gloo");
       break;
     case ReduceOp::UNUSED:
+    default:
       break;
   }
 
@@ -262,6 +263,7 @@ ReduceFunc toFunction(const ReduceOp& r) {
       TORCH_CHECK(false, "Cannot use ReduceOp.PREMUL_SUM with Gloo");
       break;
     case ReduceOp::UNUSED:
+    default:
       break;
   }
 
@@ -498,7 +500,8 @@ inline void ProcessGroupGloo::AsyncWork::recordAsyncWorkProfilingInfo(
               profilingTitle,
               c10::ArrayRef<const c10::IValue>(inputs.data(), inputs.size()));
         };
-    recordFunctionBeforeCallback_ = at::wrapPropagateTLSState(before_handler);
+    recordFunctionBeforeCallback_ =
+        at::wrapPropagateTLSState(std::move(before_handler));
     std::function<void()> end_handler = [recordingFunction]() {
       recordingFunction->end();
     };

torch/csrc/distributed/rpc/agent_utils.cpp

@@ -1,9 +1,7 @@
 #include <fmt/format.h>
 #include <torch/csrc/distributed/rpc/agent_utils.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 std::unordered_map<std::string, worker_id_t> collectNames(
     ::c10d::PrefixStore store,
@@ -197,6 +195,4 @@ int syncCallCount(
   return totalCallCount;
 }
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/init.cpp

@@ -19,9 +19,7 @@
 #include <pybind11/chrono.h>
 #include <pybind11/operators.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 namespace {
 
@@ -857,6 +855,4 @@ PyMethodDef* python_functions() {
   return methods;
 }
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/message.cpp

@@ -1,9 +1,7 @@
 #include <torch/csrc/distributed/rpc/message.h>
 #include <torch/custom_class.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 Message::Message() = default;
 
@@ -113,6 +111,4 @@ static const auto message = torch::class_<Message>("rpc", "_Message");
 
 } // namespace
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/metrics/RpcMetricsHandler.h

@@ -2,10 +2,8 @@
 #include <c10/util/Registry.h>
 #include <string>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
-// All metrics are prefixed with the following  key.
+namespace torch::distributed::rpc {
+// All metrics are prefixed with the following key.
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays)
 constexpr char kRpcMetricsKeyPrefix[] = "torch.distributed.rpc.";
 // APIs for logging time-series metrics for RPC-based distributed
@@ -39,6 +37,4 @@ C10_DECLARE_REGISTRY(
     RpcMetricsHandlerRegistry,
     torch::distributed::rpc::RpcMetricsHandler);
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/metrics/registry.cpp

@@ -1,10 +1,7 @@
 #include <torch/csrc/distributed/rpc/metrics/RpcMetricsHandler.h> // @manual
-namespace torch {
-namespace distributed {
-namespace rpc {
+
+namespace torch::distributed::rpc {
 C10_DEFINE_REGISTRY(
     RpcMetricsHandlerRegistry,
     torch::distributed::rpc::RpcMetricsHandler);
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/profiler/remote_profiler_manager.cpp

@@ -4,9 +4,7 @@
 #include <torch/csrc/jit/serialization/pickle.h>
 #include <torch/csrc/utils/byte_order.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 const std::string REMOTE_PROFILING_KEY_PREFIX = "#remote_op: ";
 constexpr int kAutoIncrementBits = 48;
 /*static */ thread_local std::optional<std::string>
@@ -28,7 +26,7 @@ void RemoteProfilerManager::setCurrentKey(std::string key) {
 }
 
 bool RemoteProfilerManager::isCurrentKeySet() const {
-  return currentThreadLocalKey_ ? true : false;
+  return currentThreadLocalKey_.has_value();
 }
 
 void RemoteProfilerManager::unsetCurrentKey() {
@@ -85,6 +83,4 @@ RemoteProfilerManager::RemoteProfilerManager() {
       static_cast<int64_t>(RpcAgent::getCurrentRpcAgent()->getWorkerInfo().id_);
   currentLocalId_ = workerId << kAutoIncrementBits;
 }
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/profiler/remote_profiler_manager.h

@@ -5,9 +5,7 @@
 #include <optional>
 #include <unordered_map>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 extern const std::string REMOTE_PROFILING_KEY_PREFIX;
 
 class TORCH_API RemoteProfilerManager {
@@ -54,6 +52,4 @@ class TORCH_API RemoteProfilerManager {
   std::mutex mutex_;
   local_id_t currentLocalId_;
 };
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/profiler/server_process_global_profiler.cpp

@@ -1,10 +1,6 @@
 #include <torch/csrc/distributed/rpc/profiler/server_process_global_profiler.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
-namespace profiler {
-namespace processglobal {
+namespace torch::distributed::rpc::profiler::processglobal {
 
 using namespace torch::autograd::profiler;
 
@@ -58,8 +54,4 @@ std::vector<thread_event_lists> disableServer() {
   return statePtr->results();
 }
 
-} // namespace processglobal
-} // namespace profiler
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc::profiler::processglobal

torch/csrc/distributed/rpc/profiler/server_process_global_profiler.h

@@ -1,14 +1,11 @@
 #pragma once
 
 #include <shared_mutex>
+#include <utility>
 
 #include <torch/csrc/autograd/profiler.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
-namespace profiler {
-namespace processglobal {
+namespace torch::distributed::rpc::profiler::processglobal {
 
 using namespace torch::autograd::profiler;
 
@@ -27,7 +24,7 @@ using namespace torch::autograd::profiler;
 // threads.
 class State {
  public:
-  explicit State(const ProfilerConfig& config) : config_(config) {}
+  explicit State(ProfilerConfig config) : config_(std::move(config)) {}
   ~State() = default;
 
   const ProfilerConfig& config() const {
@@ -104,7 +101,9 @@ class StateStackEntry {
   }
 
  private:
+  // NOLINTNEXTLINE(cppcoreguidelines-avoid-const-or-ref-data-members)
   const std::shared_ptr<StateStackEntry> prevPtr_{nullptr};
+  // NOLINTNEXTLINE(cppcoreguidelines-avoid-const-or-ref-data-members)
   const std::shared_ptr<State> statePtr_{nullptr};
 };
 
@@ -127,8 +126,4 @@ TORCH_API void enableServer(const ProfilerConfig& new_config);
 // This enables all RPC threads running server-side request callbacks.
 TORCH_API std::vector<thread_event_lists> disableServer();
 
-} // namespace processglobal
-} // namespace profiler
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc::profiler::processglobal

torch/csrc/distributed/rpc/py_rref.cpp

@@ -9,9 +9,7 @@
 #include <torch/csrc/jit/python/module_python.h>
 #include <torch/csrc/jit/python/pybind_utils.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 /////////////////////  Pickle/Unpickle Helplers ////////////////////////////
 
@@ -363,6 +361,4 @@ void PyRRef::backward(
   }
 }
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/python_call.cpp

@@ -1,8 +1,6 @@
 #include <torch/csrc/distributed/rpc/python_call.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 PythonCall::PythonCall(SerializedPyObj&& serializedPyObj, bool isAsyncExecution)
     : serializedPyObj_(std::move(serializedPyObj)),
@@ -44,6 +42,4 @@ const SerializedPyObj& PythonCall::serializedPyObj() const {
   return serializedPyObj_;
 }
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/python_call.h

@@ -3,9 +3,7 @@
 #include <torch/csrc/distributed/rpc/rpc_command_base.h>
 #include <torch/csrc/distributed/rpc/types.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 // RPC call representing calling a Python function over RPC.
 class TORCH_API PythonCall final : public RpcCommandBase {
@@ -27,6 +25,4 @@ class TORCH_API PythonCall final : public RpcCommandBase {
   const bool isAsyncExecution_;
 };
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/python_functions.cpp

@@ -18,9 +18,7 @@
 #include <torch/csrc/utils/python_compat.h>
 #include <exception>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 namespace {
 
@@ -421,6 +419,4 @@ PyRRef pyRemoteTorchscript(
   return PyRRef(rrefPtr);
 }
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/python_functions.h

@@ -5,9 +5,7 @@
 #include <torch/csrc/jit/python/pybind_utils.h>
 #include <torch/csrc/utils/pybind.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 // Converts an internal ivalue::Future of Message into a user-facing
 // ivalue::Future of py::object type by creating a new ivalue::Future and call
@@ -65,6 +63,4 @@ PyRRef pyRemoteTorchscript(
     const py::args& args,
     const py::kwargs& kwargs);
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/python_remote_call.cpp

@@ -2,9 +2,7 @@
 #include <torch/csrc/distributed/rpc/rpc_agent.h>
 #include <torch/csrc/jit/serialization/pickle.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 PythonRemoteCall::PythonRemoteCall(
     SerializedPyObj&& serializedPyObj,
@@ -64,6 +62,4 @@ std::unique_ptr<PythonRemoteCall> PythonRemoteCall::fromMessage(
       isAsyncExecution);
 }
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/python_remote_call.h

@@ -6,9 +6,7 @@
 #include <torch/csrc/jit/serialization/pickler.h>
 #include <vector>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 class TORCH_API PythonRemoteCall : public RpcCommandBase {
  public:
@@ -44,6 +42,4 @@ class TORCH_API PythonRemoteCall : public RpcCommandBase {
   const bool isAsyncExecution_;
 };
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc

torch/csrc/distributed/rpc/python_resp.cpp

@@ -1,8 +1,6 @@
 #include <torch/csrc/distributed/rpc/python_resp.h>
 
-namespace torch {
-namespace distributed {
-namespace rpc {
+namespace torch::distributed::rpc {
 
 PythonResp::PythonResp(SerializedPyObj&& serializedPyObj)
     : serializedPyObj_(std::move(serializedPyObj)) {}
@@ -27,6 +25,4 @@ const SerializedPyObj& PythonResp::serializedPyObj() const {
   return serializedPyObj_;
 }
 
-} // namespace rpc
-} // namespace distributed
-} // namespace torch
+} // namespace torch::distributed::rpc