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

Remove use of ObjectID transport flag (#7699)

Browse Source
This commit is contained in:
Edward Oakes
2020-05-17 11:29:49 -05:00
committed by GitHub
parent acffdb2349
commit 16f48078d9
40 changed files with 135 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/src/ray/runtime/abstract_ray_runtime.cc
+1 -2
View File
@@ -30,8 +30,7 @@ void AbstractRayRuntime::Put(std::shared_ptr<msgpack::sbuffer> data,
ObjectID AbstractRayRuntime::Put(std::shared_ptr<msgpack::sbuffer> data) {
ObjectID object_id =
ObjectID::ForPut(worker_->GetCurrentTaskID(), worker_->GetNextPutIndex(),
static_cast<uint8_t>(TaskTransportType::RAYLET));
ObjectID::ForPut(worker_->GetCurrentTaskID(), worker_->GetNextPutIndex());
Put(data, object_id);
return object_id;
}
cpp/src/ray/runtime/task/local_mode_task_submitter.cc
+3 -4
View File
@@ -39,8 +39,8 @@ ObjectID LocalModeTaskSubmitter::Submit(const InvocationSpec &invocation, TaskTy
} else if (type == TaskType::ACTOR_TASK) {
const TaskID actor_creation_task_id =
TaskID::ForActorCreationTask(invocation.actor_id);
const ObjectID actor_creation_dummy_object_id = ObjectID::ForTaskReturn(
actor_creation_task_id, 1, static_cast<int>(ray::TaskTransportType::RAYLET));
const ObjectID actor_creation_dummy_object_id =
ObjectID::ForTaskReturn(actor_creation_task_id, 1);
builder.SetActorTaskSpec(invocation.actor_id, actor_creation_dummy_object_id,
ObjectID(), invocation.actor_counter);
} else {
@@ -52,8 +52,7 @@ ObjectID LocalModeTaskSubmitter::Submit(const InvocationSpec &invocation, TaskTy
/// TODO(Guyang Song): Use both 'AddByRefArg' and 'AddByValueArg' to distinguish
builder.AddByValueArg(::ray::RayObject(buffer, nullptr, std::vector<ObjectID>()));
auto task_specification = builder.Build();
ObjectID return_object_id =
task_specification.ReturnId(0, ray::TaskTransportType::RAYLET);
ObjectID return_object_id = task_specification.ReturnId(0);
std::shared_ptr<msgpack::sbuffer> actor;
std::shared_ptr<absl::Mutex> mutex;
cpp/src/ray/runtime/task/task_executor.cc
+2 -2
View File
@@ -40,7 +40,7 @@ void TaskExecutor::Invoke(const TaskSpecification &task_spec,
data = (*exec_function)(dynamic_library_base_addr,
std::stoul(typed_descriptor->FunctionOffset()), args);
}
runtime->Put(std::move(data), task_spec.ReturnId(0, ray::TaskTransportType::RAYLET));
runtime->Put(std::move(data), task_spec.ReturnId(0));
}
} // namespace api
} // namespace ray
} // namespace ray