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

Change TaskSpec to allow multiple object IDs per argument. (#1204)

Browse Source 
* Implement object ID bags

* linting

* fix tests

* fix linting

* fix comments
This commit is contained in:
Philipp Moritz
2017-11-10 16:33:34 -08:00
committed by Robert Nishihara
parent 07f0532b9b
commit e798a652bc
11 changed files with 120 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/local_scheduler/local_scheduler_algorithm.cc
+9 -6
View File
@@ -583,8 +583,9 @@ void fetch_missing_dependencies(
int64_t num_args = TaskSpec_num_args(task);
int num_missing_dependencies = 0;
for (int64_t i = 0; i < num_args; ++i) {
if (TaskSpec_arg_by_ref(task, i)) {
ObjectID obj_id = TaskSpec_arg_id(task, i);
int count = TaskSpec_arg_id_count(task, i);
for (int j = 0; j < count; ++j) {
ObjectID obj_id = TaskSpec_arg_id(task, i, j);
if (algorithm_state->local_objects.count(obj_id) == 0) {
/* If the entry is not yet available locally, record the dependency. */
fetch_missing_dependency(state, algorithm_state, task_entry_it,
@@ -609,8 +610,9 @@ void fetch_missing_dependencies(
bool can_run(SchedulingAlgorithmState *algorithm_state, TaskSpec *task) {
int64_t num_args = TaskSpec_num_args(task);
for (int i = 0; i < num_args; ++i) {
if (TaskSpec_arg_by_ref(task, i)) {
ObjectID obj_id = TaskSpec_arg_id(task, i);
int count = TaskSpec_arg_id_count(task, i);
for (int j = 0; j < count; ++j) {
ObjectID obj_id = TaskSpec_arg_id(task, i, j);
if (algorithm_state->local_objects.count(obj_id) == 0) {
/* The object is not present locally, so this task cannot be scheduled
* right now. */
@@ -1443,8 +1445,9 @@ void handle_object_removed(LocalSchedulerState *state,
it != algorithm_state->waiting_task_queue->end(); ++it) {
int64_t num_args = TaskSpec_num_args(it->spec);
for (int64_t i = 0; i < num_args; ++i) {
if (TaskSpec_arg_by_ref(it->spec, i)) {
ObjectID arg_id = TaskSpec_arg_id(it->spec, i);
int count = TaskSpec_arg_id_count(it->spec, i);
for (int j = 0; j < count; ++j) {
ObjectID arg_id = TaskSpec_arg_id(it->spec, i, j);
if (ObjectID_equal(arg_id, removed_object_id)) {
fetch_missing_dependency(state, algorithm_state, it,
removed_object_id.to_plasma_id(), i);