From 3323ad9d592bff721f6c6ed755f3aafca82937b2 Mon Sep 17 00:00:00 2001 From: chaokunyang Date: Wed, 5 Aug 2020 02:19:15 +0800 Subject: [PATCH] [HOTFIX] Fix master build with missing placement group argument (#9868) * fix common task submit default placement group * fix java_function --- python/ray/cross_language.py | 5 ++++- .../lib/java/io_ray_runtime_task_NativeTaskSubmitter.cc | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/python/ray/cross_language.py b/python/ray/cross_language.py index c9620c7b5..ebd893f57 100644 --- a/python/ray/cross_language.py +++ b/python/ray/cross_language.py @@ -68,7 +68,10 @@ def java_function(class_name, function_name): None, # resources, None, # num_return_vals, None, # max_calls, - None) # max_retries) + None, # max_retries + placement_group_id=None, + # TODO(ekl) set default to -1 once we support -1 as "any index" + placement_group_bundle_index=0) def java_actor_class(class_name): diff --git a/src/ray/core_worker/lib/java/io_ray_runtime_task_NativeTaskSubmitter.cc b/src/ray/core_worker/lib/java/io_ray_runtime_task_NativeTaskSubmitter.cc index 6c1218e6e..c57598859 100644 --- a/src/ray/core_worker/lib/java/io_ray_runtime_task_NativeTaskSubmitter.cc +++ b/src/ray/core_worker/lib/java/io_ray_runtime_task_NativeTaskSubmitter.cc @@ -197,9 +197,11 @@ JNIEXPORT jobject JNICALL Java_io_ray_runtime_task_NativeTaskSubmitter_nativeSub std::vector return_ids; // TODO (kfstorm): Allow setting `max_retries` via `CallOptions`. - ray::CoreWorkerProcess::GetCoreWorker().SubmitTask(ray_function, task_args, - task_options, &return_ids, - /*max_retries=*/0); + ray::CoreWorkerProcess::GetCoreWorker().SubmitTask( + ray_function, task_args, task_options, &return_ids, + /*max_retries=*/0, + /*placement_options=*/ + std::pair(ray::PlacementGroupID::Nil(), 0)); // This is to avoid creating an empty java list and boost performance. if (return_ids.empty()) {