From ee23af58d883610fdf75dac0efd69fa8785457ec Mon Sep 17 00:00:00 2001 From: chendongsheng Date: Mon, 21 Dec 2020 15:17:14 +0800 Subject: [PATCH] fixed codex --- mindspore/ccsrc/ps/core/abstract_node.cc | 8 ++++---- mindspore/ccsrc/ps/core/abstract_node.h | 2 +- mindspore/ccsrc/ps/core/node_info.h | 1 - mindspore/ccsrc/ps/core/node_manager.cc | 1 - mindspore/ccsrc/ps/core/scheduler_node.cc | 1 - mindspore/ccsrc/ps/core/scheduler_node.h | 1 - mindspore/ccsrc/ps/core/tcp_client.cc | 1 - mindspore/ccsrc/ps/core/tcp_client.h | 1 - mindspore/ccsrc/ps/core/tcp_server.cc | 1 - tests/ut/cpp/ps/core/cluster_config_test.cc | 1 - tests/ut/cpp/ps/core/common_util_test.cc | 12 ++++++------ tests/ut/cpp/ps/core/tcp_client_tests.cc | 3 +-- 12 files changed, 12 insertions(+), 21 deletions(-) diff --git a/mindspore/ccsrc/ps/core/abstract_node.cc b/mindspore/ccsrc/ps/core/abstract_node.cc index ea26b10edf..d7d973efc5 100644 --- a/mindspore/ccsrc/ps/core/abstract_node.cc +++ b/mindspore/ccsrc/ps/core/abstract_node.cc @@ -149,13 +149,13 @@ bool AbstractNode::Send(const enum NodeRole &node_role, const uint32_t &rank_id, } bool AbstractNode::Send(const NodeRole &node_role, const std::vector &rank_ids, - const std::vector &data, std::vector *comm_message_resp, + const std::vector &data, std::vector *comm_message_resp, const uint32_t &timeout) { MS_EXCEPTION_IF_NULL(comm_message_resp); uint64_t request_id = ++next_request_id_; message_tracker_[request_id] = std::make_pair(data.size(), 0); - if (rank_ids.size() != data.size() || rank_ids.size() != (*comm_message_resp).size()) { + if (rank_ids.size() != data.size()) { MS_LOG(EXCEPTION) << "The number of rank ids, data, comm_message_resp should be equal!"; } @@ -165,7 +165,7 @@ bool AbstractNode::Send(const NodeRole &node_role, const std::vector & receive_messages_mutex_.lock(); auto res = receive_messages_[request_id]; for (size_t it = 0; it < len; ++it) { - comm_message_resp->at(it) = &res[rank_ids.at(it)]; + (*comm_message_resp).push_back(res[rank_ids.at(it)]); } receive_messages_.erase(request_id); receive_messages_mutex_.unlock(); @@ -394,7 +394,7 @@ void AbstractNode::ProcessSendDataResp(const CommMessage &message) { const uint64_t request_id = message_meta.request_id(); auto it = receive_messages_.find(request_id); if (it != receive_messages_.end()) { - it->second.insert(std::make_pair(rank_id, message)); + it->second[rank_id] = message; } else { std::unordered_map res; res.insert(std::make_pair(rank_id, message)); diff --git a/mindspore/ccsrc/ps/core/abstract_node.h b/mindspore/ccsrc/ps/core/abstract_node.h index 725508dff3..6b2fe52153 100644 --- a/mindspore/ccsrc/ps/core/abstract_node.h +++ b/mindspore/ccsrc/ps/core/abstract_node.h @@ -44,7 +44,7 @@ class AbstractNode : public Node { virtual bool Send(const enum NodeRole &node_role, const uint32_t &rank_id, const std::string &message, CommMessage *comm_message_resp, const uint32_t &timeout = kCommTimeoutInSeconds); virtual bool Send(const NodeRole &node_role, const std::vector &rank_ids, - const std::vector &data, std::vector *comm_message_resp, + const std::vector &data, std::vector *comm_message_resp, const uint32_t &timeout = kCommTimeoutInSeconds); bool Wait(uint64_t request_id, const uint32_t &timeout = kCommTimeoutInSeconds); diff --git a/mindspore/ccsrc/ps/core/node_info.h b/mindspore/ccsrc/ps/core/node_info.h index 8d9609ce53..6c4076b75f 100644 --- a/mindspore/ccsrc/ps/core/node_info.h +++ b/mindspore/ccsrc/ps/core/node_info.h @@ -25,7 +25,6 @@ namespace mindspore { namespace ps { namespace core { - enum NodeEvent { CLUSTER_TIMEOUT = 0, NODE_TIMEOUT = 1 }; struct NodeInfo { diff --git a/mindspore/ccsrc/ps/core/node_manager.cc b/mindspore/ccsrc/ps/core/node_manager.cc index 89362246bd..76ced579af 100644 --- a/mindspore/ccsrc/ps/core/node_manager.cc +++ b/mindspore/ccsrc/ps/core/node_manager.cc @@ -46,7 +46,6 @@ int NodeManager::NextRankId(const RegisterMessage ®ister_message) { nodes_info_[node_id] = node_info; MS_LOG(INFO) << "The server node id:" << node_id << ",node ip: " << node_info.ip_ << ",node port:" << port << " assign rank id:" << rank_id; - } else if (register_message.role() == NodeRole::WORKER) { rank_id = ++next_worker_rank_id_; NodeInfo node_info; diff --git a/mindspore/ccsrc/ps/core/scheduler_node.cc b/mindspore/ccsrc/ps/core/scheduler_node.cc index 8aa0be94da..270e540378 100644 --- a/mindspore/ccsrc/ps/core/scheduler_node.cc +++ b/mindspore/ccsrc/ps/core/scheduler_node.cc @@ -19,7 +19,6 @@ namespace mindspore { namespace ps { namespace core { - SchedulerNode::~SchedulerNode() { MS_LOG(INFO) << "Stop scheduler node!"; if (!is_already_stopped_) { diff --git a/mindspore/ccsrc/ps/core/scheduler_node.h b/mindspore/ccsrc/ps/core/scheduler_node.h index 86488ea9ac..f7fe022a80 100644 --- a/mindspore/ccsrc/ps/core/scheduler_node.h +++ b/mindspore/ccsrc/ps/core/scheduler_node.h @@ -38,7 +38,6 @@ namespace mindspore { namespace ps { namespace core { - class SchedulerNode : public Node { public: SchedulerNode() : server_(nullptr), scheduler_thread_(nullptr), update_state_thread_(nullptr) {} diff --git a/mindspore/ccsrc/ps/core/tcp_client.cc b/mindspore/ccsrc/ps/core/tcp_client.cc index d6a6e560b0..5393daa11d 100644 --- a/mindspore/ccsrc/ps/core/tcp_client.cc +++ b/mindspore/ccsrc/ps/core/tcp_client.cc @@ -280,7 +280,6 @@ void TcpClient::StartTimer(const uint32_t &time) { void TcpClient::set_timer_callback(const OnTimer &timer) { on_timer_callback_ = timer; } const event_base &TcpClient::eventbase() { return *event_base_; } - } // namespace core } // namespace ps } // namespace mindspore diff --git a/mindspore/ccsrc/ps/core/tcp_client.h b/mindspore/ccsrc/ps/core/tcp_client.h index d18a6b48b6..0aa8193cfe 100644 --- a/mindspore/ccsrc/ps/core/tcp_client.h +++ b/mindspore/ccsrc/ps/core/tcp_client.h @@ -97,7 +97,6 @@ class TcpClient { std::atomic is_stop_; std::atomic is_connected_; }; - } // namespace core } // namespace ps } // namespace mindspore diff --git a/mindspore/ccsrc/ps/core/tcp_server.cc b/mindspore/ccsrc/ps/core/tcp_server.cc index af33b2e7d5..798d2070dd 100644 --- a/mindspore/ccsrc/ps/core/tcp_server.cc +++ b/mindspore/ccsrc/ps/core/tcp_server.cc @@ -368,7 +368,6 @@ int TcpServer::ConnectionNum() const { return connections_.size(); } const std::map &TcpServer::Connections() const { return connections_; } void TcpServer::SetMessageCallback(const OnServerReceiveMessage &cb) { message_callback_ = cb; } - } // namespace core } // namespace ps } // namespace mindspore diff --git a/tests/ut/cpp/ps/core/cluster_config_test.cc b/tests/ut/cpp/ps/core/cluster_config_test.cc index 2fafa70357..0136d359f8 100644 --- a/tests/ut/cpp/ps/core/cluster_config_test.cc +++ b/tests/ut/cpp/ps/core/cluster_config_test.cc @@ -40,7 +40,6 @@ TEST_F(TestClusterConfig, HeartbeatInterval) { EXPECT_STREQ(ClusterConfig::scheduler_host().c_str(), "127.0.0.1"); EXPECT_TRUE(ClusterConfig::scheduler_port() == 8080); } - } // namespace core } // namespace ps } // namespace mindspore \ No newline at end of file diff --git a/tests/ut/cpp/ps/core/common_util_test.cc b/tests/ut/cpp/ps/core/common_util_test.cc index 0f42acb81b..ea67fc5856 100644 --- a/tests/ut/cpp/ps/core/common_util_test.cc +++ b/tests/ut/cpp/ps/core/common_util_test.cc @@ -41,12 +41,12 @@ TEST_F(TestCommUtil, GetAvailableInterfaceAndIP) { } TEST_F(TestCommUtil, ValidateRankId) { -ClusterConfig::Init(3, 2, std::make_unique("127.0.0.1"), 9999); -EXPECT_TRUE(CommUtil::ValidateRankId(NodeRole::WORKER, 2)); -EXPECT_FALSE(CommUtil::ValidateRankId(NodeRole::WORKER, 3)); -EXPECT_TRUE(CommUtil::ValidateRankId(NodeRole::SERVER, 1)); -EXPECT_FALSE(CommUtil::ValidateRankId(NodeRole::SERVER, 2)); + ClusterConfig::Init(3, 2, std::make_unique("127.0.0.1"), 9999); + EXPECT_TRUE(CommUtil::ValidateRankId(NodeRole::WORKER, 2)); + EXPECT_FALSE(CommUtil::ValidateRankId(NodeRole::WORKER, 3)); + EXPECT_TRUE(CommUtil::ValidateRankId(NodeRole::SERVER, 1)); + EXPECT_FALSE(CommUtil::ValidateRankId(NodeRole::SERVER, 2)); } -} // namespace comm +} // namespace core } // namespace ps } // namespace mindspore \ No newline at end of file diff --git a/tests/ut/cpp/ps/core/tcp_client_tests.cc b/tests/ut/cpp/ps/core/tcp_client_tests.cc index badfd6b287..dcbfddc922 100644 --- a/tests/ut/cpp/ps/core/tcp_client_tests.cc +++ b/tests/ut/cpp/ps/core/tcp_client_tests.cc @@ -42,7 +42,6 @@ TEST_F(TestTcpClient, InitClientPortErrorNoException) { EXPECT_NO_THROW(client->Init()); } - -} // namespace comm +} // namespace core } // namespace ps } // namespace mindspore \ No newline at end of file