mirror of
https://github.com/wassname/ray.git
synced 2026-06-28 23:57:45 +08:00
Remove legacy Ray code. (#3121)
* Remove legacy Ray code. * Fix cmake and simplify monitor. * Fix linting * Updates * Fix * Implement some methods. * Remove more plasma manager references. * Fix * Linting * Fix * Fix * Make sure class IDs are strings. * Some path fixes * Fix * Path fixes and update arrow * Fixes. * linting * Fixes * Java fixes * Some java fixes * TaskLanguage -> Language * Minor * Fix python test and remove unused method signature. * Fix java tests * Fix jenkins tests * Remove commented out code.
This commit is contained in:
committed by
Philipp Moritz
parent
055daf17a0
commit
658c14282c
@@ -165,12 +165,12 @@ public class RayConfig {
|
||||
// library path
|
||||
this.libraryPath = new ImmutableList.Builder<String>().add(
|
||||
rayHome + "/build/src/plasma",
|
||||
rayHome + "/build/src/local_scheduler"
|
||||
rayHome + "/build/src/ray/raylet"
|
||||
).addAll(customLibraryPath).build();
|
||||
|
||||
redisServerExecutablePath = rayHome +
|
||||
"/build/src/common/thirdparty/redis/src/redis-server";
|
||||
redisModulePath = rayHome + "/build/src/common/redis_module/libray_redis_module.so";
|
||||
"/build/src/ray/thirdparty/redis/src/redis-server";
|
||||
redisModulePath = rayHome + "/build/src/ray/gcs/redis_module/libray_redis_module.so";
|
||||
plasmaStoreExecutablePath = rayHome + "/build/src/plasma/plasma_store_server";
|
||||
rayletExecutablePath = rayHome + "/build/src/ray/raylet/raylet";
|
||||
|
||||
|
||||
+5
-5
@@ -2,13 +2,13 @@
|
||||
|
||||
package org.ray.runtime.generated;
|
||||
|
||||
public final class TaskLanguage {
|
||||
private TaskLanguage() { }
|
||||
public final class Language {
|
||||
private Language() { }
|
||||
public static final int PYTHON = 0;
|
||||
public static final int JAVA = 1;
|
||||
public static final int CPP = 1;
|
||||
public static final int JAVA = 2;
|
||||
|
||||
public static final String[] names = { "PYTHON", "JAVA", };
|
||||
public static final String[] names = { "PYTHON", "CPP", "JAVA", };
|
||||
|
||||
public static String name(int e) { return names[e]; }
|
||||
}
|
||||
|
||||
@@ -13,9 +13,9 @@ import org.ray.api.WaitResult;
|
||||
import org.ray.api.id.UniqueId;
|
||||
import org.ray.runtime.functionmanager.FunctionDescriptor;
|
||||
import org.ray.runtime.generated.Arg;
|
||||
import org.ray.runtime.generated.Language;
|
||||
import org.ray.runtime.generated.ResourcePair;
|
||||
import org.ray.runtime.generated.TaskInfo;
|
||||
import org.ray.runtime.generated.TaskLanguage;
|
||||
import org.ray.runtime.task.FunctionArg;
|
||||
import org.ray.runtime.task.TaskSpec;
|
||||
import org.ray.runtime.util.UniqueIdUtil;
|
||||
@@ -229,7 +229,7 @@ public class RayletClientImpl implements RayletClient {
|
||||
actorIdOffset, actorHandleIdOffset, actorCounter,
|
||||
false, functionIdOffset,
|
||||
argsOffset, returnsOffset, requiredResourcesOffset,
|
||||
requiredPlacementResourcesOffset, TaskLanguage.JAVA,
|
||||
requiredPlacementResourcesOffset, Language.JAVA,
|
||||
functionDescriptorOffset);
|
||||
fbb.finish(root);
|
||||
ByteBuffer buffer = fbb.dataBuffer();
|
||||
@@ -256,8 +256,8 @@ public class RayletClientImpl implements RayletClient {
|
||||
/// 1) pushd $Dir/java/runtime/target/classes
|
||||
/// 2) javah -classpath .:$Dir/java/api/target/classes org.ray.runtime.raylet.RayletClientImpl
|
||||
/// 3) clang-format -i org_ray_runtime_raylet_RayletClientImpl.h
|
||||
/// 4) cp org_ray_runtime_raylet_RayletClientImpl.h $Dir/src/local_scheduler/lib/java/
|
||||
/// 5) vim $Dir/src/local_scheduler/lib/java/org_ray_runtime_raylet_RayletClientImpl.cc
|
||||
/// 4) cp org_ray_runtime_raylet_RayletClientImpl.h $Dir/src/ray/raylet/lib/java/
|
||||
/// 5) vim $Dir/src/ray/raylet/lib/java/org_ray_runtime_raylet_RayletClientImpl.cc
|
||||
/// 6) popd
|
||||
|
||||
private static native long nativeInit(String localSchedulerSocket, byte[] workerId,
|
||||
|
||||
Reference in New Issue
Block a user