wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-30 15:35:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Enable direct call by default. (#7408)

Browse Source 
* WIP

* Address comments.

* Linting

* Fix

* Fix

* Fix test

* Fix

* Fix single process ci

* Fix ut

* Update java/test/src/main/java/org/ray/api/test/PlasmaFreeTest.java

* Address comments

* Fix linting

* Minor update comments.

* Fix streaming CI
This commit is contained in:
Qing Wang
2020-03-13 12:25:30 +08:00
committed by GitHub
parent 6993a471f1
commit f4656d8cc3
20 changed files with 34 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ray/core_worker/lib/java/jni_init.cc
-6
View File
@@ -64,8 +64,6 @@ jfieldID java_function_arg_value;
jclass java_base_task_options_class;
jfieldID java_base_task_options_resources;
jfieldID java_base_task_options_use_direct_call;
jfieldID java_base_task_options_default_use_direct_call;
jclass java_actor_creation_options_class;
jfieldID java_actor_creation_options_max_reconstructions;
@@ -169,10 +167,6 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
java_base_task_options_class = LoadClass(env, "org/ray/api/options/BaseTaskOptions");
java_base_task_options_resources =
env->GetFieldID(java_base_task_options_class, "resources", "Ljava/util/Map;");
java_base_task_options_use_direct_call =
env->GetFieldID(java_base_task_options_class, "useDirectCall", "Z");
java_base_task_options_default_use_direct_call =
env->GetStaticFieldID(java_base_task_options_class, "DEFAULT_USE_DIRECT_CALL", "Z");
java_actor_creation_options_class =
LoadClass(env, "org/ray/api/options/ActorCreationOptions");
src/ray/core_worker/lib/java/jni_utils.h
-4
View File
@@ -108,10 +108,6 @@ extern jfieldID java_function_arg_value;
extern jclass java_base_task_options_class;
/// resources field of BaseTaskOptions class
extern jfieldID java_base_task_options_resources;
/// useDirectCall field of BaseTaskOptions class
extern jfieldID java_base_task_options_use_direct_call;
/// DEFAULT_USE_DIRECT_CALL field of BaseTaskOptions class
extern jfieldID java_base_task_options_default_use_direct_call;
/// ActorCreationOptions class
extern jclass java_actor_creation_options_class;
src/ray/core_worker/lib/java/org_ray_runtime_actor_NativeRayActor.cc
-11
View File
@@ -37,17 +37,6 @@ JNIEXPORT jint JNICALL Java_org_ray_runtime_actor_NativeRayActor_nativeGetLangua
return native_actor_handle->ActorLanguage();
}
JNIEXPORT jboolean JNICALL
Java_org_ray_runtime_actor_NativeRayActor_nativeIsDirectCallActor(
JNIEnv *env, jclass o, jlong nativeCoreWorkerPointer, jbyteArray actorId) {
auto actor_id = JavaByteArrayToId<ray::ActorID>(env, actorId);
ray::ActorHandle *native_actor_handle = nullptr;
auto status = GetCoreWorker(nativeCoreWorkerPointer)
.GetActorHandle(actor_id, &native_actor_handle);
THROW_EXCEPTION_AND_RETURN_IF_NOT_OK(env, status, false);
return native_actor_handle->IsDirectCallActor();
}
JNIEXPORT jobject JNICALL
Java_org_ray_runtime_actor_NativeRayActor_nativeGetActorCreationTaskFunctionDescriptor(
JNIEnv *env, jclass o, jlong nativeCoreWorkerPointer, jbyteArray actorId) {
src/ray/core_worker/lib/java/org_ray_runtime_actor_NativeRayActor.h
-9
View File
@@ -29,15 +29,6 @@ extern "C" {
JNIEXPORT jint JNICALL Java_org_ray_runtime_actor_NativeRayActor_nativeGetLanguage(
JNIEnv *, jclass, jlong, jbyteArray);
/*
* Class: org_ray_runtime_actor_NativeRayActor
* Method: nativeIsDirectCallActor
* Signature: (J[B)Z
*/
JNIEXPORT jboolean JNICALL
Java_org_ray_runtime_actor_NativeRayActor_nativeIsDirectCallActor(JNIEnv *, jclass, jlong,
jbyteArray);
/*
* Class: org_ray_runtime_actor_NativeRayActor
* Method: nativeGetActorCreationTaskFunctionDescriptor
src/ray/core_worker/lib/java/org_ray_runtime_task_NativeTaskSubmitter.cc
+2 -14
View File
@@ -90,34 +90,25 @@ inline std::unordered_map<std::string, double> ToResources(JNIEnv *env,
inline ray::TaskOptions ToTaskOptions(JNIEnv *env, jint numReturns, jobject callOptions) {
std::unordered_map<std::string, double> resources;
bool use_direct_call;
if (callOptions) {
jobject java_resources =
env->GetObjectField(callOptions, java_base_task_options_resources);
resources = ToResources(env, java_resources);
use_direct_call =
env->GetBooleanField(callOptions, java_base_task_options_use_direct_call);
} else {
use_direct_call = env->GetStaticBooleanField(
java_base_task_options_class, java_base_task_options_default_use_direct_call);
}
ray::TaskOptions task_options{numReturns, use_direct_call, resources};
ray::TaskOptions task_options{numReturns, /*use_direct_call=*/true, resources};
return task_options;
}
inline ray::ActorCreationOptions ToActorCreationOptions(JNIEnv *env,
jobject actorCreationOptions) {
uint64_t max_reconstructions = 0;
bool use_direct_call;
std::unordered_map<std::string, double> resources;
std::vector<std::string> dynamic_worker_options;
uint64_t max_concurrency = 1;
if (actorCreationOptions) {
max_reconstructions = static_cast<uint64_t>(env->GetIntField(
actorCreationOptions, java_actor_creation_options_max_reconstructions));
use_direct_call = env->GetBooleanField(actorCreationOptions,
java_base_task_options_use_direct_call);
jobject java_resources =
env->GetObjectField(actorCreationOptions, java_base_task_options_resources);
resources = ToResources(env, java_resources);
@@ -129,14 +120,11 @@ inline ray::ActorCreationOptions ToActorCreationOptions(JNIEnv *env,
}
max_concurrency = static_cast<uint64_t>(env->GetIntField(
actorCreationOptions, java_actor_creation_options_max_concurrency));
} else {
use_direct_call = env->GetStaticBooleanField(
java_base_task_options_class, java_base_task_options_default_use_direct_call);
}
ray::ActorCreationOptions actor_creation_options{
static_cast<uint64_t>(max_reconstructions),
use_direct_call,
/*use_direct_call=*/true,
static_cast<int>(max_concurrency),
resources,
resources,