wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-20 12:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix redefinition of flatbuffer types (#2189)

Browse Source
This commit is contained in:
songqing
2018-06-05 00:08:05 -07:00
committed by Robert Nishihara
parent b56c8ed8dc
commit 451cdb43f6
4 changed files with 133 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/raylet/node_manager.cc
+26 -14
View File
@@ -6,28 +6,40 @@
namespace {
namespace local_scheduler_protocol = ray::local_scheduler::protocol;
#define RAY_CHECK_ENUM(x, y) \
static_assert(static_cast<int>(x) == static_cast<int>(y), "protocol mismatch")
// Check consistency between client and server protocol.
RAY_CHECK_ENUM(protocol::MessageType_SubmitTask, MessageType_SubmitTask);
RAY_CHECK_ENUM(protocol::MessageType_TaskDone, MessageType_TaskDone);
RAY_CHECK_ENUM(protocol::MessageType_EventLogMessage, MessageType_EventLogMessage);
RAY_CHECK_ENUM(protocol::MessageType_SubmitTask,
local_scheduler_protocol::MessageType_SubmitTask);
RAY_CHECK_ENUM(protocol::MessageType_TaskDone,
local_scheduler_protocol::MessageType_TaskDone);
RAY_CHECK_ENUM(protocol::MessageType_EventLogMessage,
local_scheduler_protocol::MessageType_EventLogMessage);
RAY_CHECK_ENUM(protocol::MessageType_RegisterClientRequest,
MessageType_RegisterClientRequest);
local_scheduler_protocol::MessageType_RegisterClientRequest);
RAY_CHECK_ENUM(protocol::MessageType_RegisterClientReply,
MessageType_RegisterClientReply);
RAY_CHECK_ENUM(protocol::MessageType_DisconnectClient, MessageType_DisconnectClient);
RAY_CHECK_ENUM(protocol::MessageType_GetTask, MessageType_GetTask);
RAY_CHECK_ENUM(protocol::MessageType_ExecuteTask, MessageType_ExecuteTask);
RAY_CHECK_ENUM(protocol::MessageType_ReconstructObject, MessageType_ReconstructObject);
RAY_CHECK_ENUM(protocol::MessageType_NotifyUnblocked, MessageType_NotifyUnblocked);
RAY_CHECK_ENUM(protocol::MessageType_PutObject, MessageType_PutObject);
local_scheduler_protocol::MessageType_RegisterClientReply);
RAY_CHECK_ENUM(protocol::MessageType_DisconnectClient,
local_scheduler_protocol::MessageType_DisconnectClient);
RAY_CHECK_ENUM(protocol::MessageType_GetTask,
local_scheduler_protocol::MessageType_GetTask);
RAY_CHECK_ENUM(protocol::MessageType_ExecuteTask,
local_scheduler_protocol::MessageType_ExecuteTask);
RAY_CHECK_ENUM(protocol::MessageType_ReconstructObject,
local_scheduler_protocol::MessageType_ReconstructObject);
RAY_CHECK_ENUM(protocol::MessageType_NotifyUnblocked,
local_scheduler_protocol::MessageType_NotifyUnblocked);
RAY_CHECK_ENUM(protocol::MessageType_PutObject,
local_scheduler_protocol::MessageType_PutObject);
RAY_CHECK_ENUM(protocol::MessageType_GetActorFrontierRequest,
MessageType_GetActorFrontierRequest);
local_scheduler_protocol::MessageType_GetActorFrontierRequest);
RAY_CHECK_ENUM(protocol::MessageType_GetActorFrontierReply,
MessageType_GetActorFrontierReply);
RAY_CHECK_ENUM(protocol::MessageType_SetActorFrontier, MessageType_SetActorFrontier);
local_scheduler_protocol::MessageType_GetActorFrontierReply);
RAY_CHECK_ENUM(protocol::MessageType_SetActorFrontier,
local_scheduler_protocol::MessageType_SetActorFrontier);
/// A helper function to determine whether a given actor task has already been executed
/// according to the given actor registry. Returns true if the task is a duplicate.