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

[Java] Rename group id and package name. (#7864)

Browse Source 
* Initial

* Change streaming's

* Fix

* Fix

* Fix org_ray

* Fix cpp file name

* Fix streaming

* Fix

* Fix

* Fix testlistening

* Fix missing sth in python

* Fix

* Fix

* Fix SPI

* Fix

* Fix complation

* Fix

* Fix CI

* Fix checkstyle

Fix checkstyle

* Fix streaming tests

* Fix streaming CI

* Fix streaming checkstyle.

* Fix build

* Fix bazel dep

* Fix

* Fix ray checkstyle

* Fix streaming checkstyle

* Fix bazel checkstyle
This commit is contained in:
Qing Wang
2020-04-12 17:59:34 +08:00
committed by GitHub
parent 3061067039
commit 98bfcd53bc
358 changed files with 1717 additions and 1740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/runtime/src/main/java/org/ray/runtime/AbstractRayRuntime.java → java/runtime/src/main/java/io/ray/runtime/AbstractRayRuntime.java
+32 -32
View File
@@ -1,41 +1,41 @@
package org.ray.runtime;
package io.ray.runtime;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import io.ray.api.BaseActor;
import io.ray.api.RayActor;
import io.ray.api.RayObject;
import io.ray.api.RayPyActor;
import io.ray.api.WaitResult;
import io.ray.api.exception.RayException;
import io.ray.api.function.PyActorClass;
import io.ray.api.function.PyActorMethod;
import io.ray.api.function.PyRemoteFunction;
import io.ray.api.function.RayFunc;
import io.ray.api.id.ObjectId;
import io.ray.api.options.ActorCreationOptions;
import io.ray.api.options.CallOptions;
import io.ray.api.runtimecontext.RuntimeContext;
import io.ray.runtime.config.RayConfig;
import io.ray.runtime.context.RuntimeContextImpl;
import io.ray.runtime.context.WorkerContext;
import io.ray.runtime.functionmanager.FunctionDescriptor;
import io.ray.runtime.functionmanager.FunctionManager;
import io.ray.runtime.functionmanager.PyFunctionDescriptor;
import io.ray.runtime.functionmanager.RayFunction;
import io.ray.runtime.gcs.GcsClient;
import io.ray.runtime.generated.Common;
import io.ray.runtime.generated.Common.Language;
import io.ray.runtime.object.ObjectStore;
import io.ray.runtime.object.RayObjectImpl;
import io.ray.runtime.task.ArgumentsBuilder;
import io.ray.runtime.task.FunctionArg;
import io.ray.runtime.task.TaskExecutor;
import io.ray.runtime.task.TaskSubmitter;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Callable;
import org.ray.api.BaseActor;
import org.ray.api.RayActor;
import org.ray.api.RayObject;
import org.ray.api.RayPyActor;
import org.ray.api.WaitResult;
import org.ray.api.exception.RayException;
import org.ray.api.function.PyActorClass;
import org.ray.api.function.PyActorMethod;
import org.ray.api.function.PyRemoteFunction;
import org.ray.api.function.RayFunc;
import org.ray.api.id.ObjectId;
import org.ray.api.options.ActorCreationOptions;
import org.ray.api.options.CallOptions;
import org.ray.api.runtimecontext.RuntimeContext;
import org.ray.runtime.config.RayConfig;
import org.ray.runtime.context.RuntimeContextImpl;
import org.ray.runtime.context.WorkerContext;
import org.ray.runtime.functionmanager.FunctionDescriptor;
import org.ray.runtime.functionmanager.FunctionManager;
import org.ray.runtime.functionmanager.PyFunctionDescriptor;
import org.ray.runtime.functionmanager.RayFunction;
import org.ray.runtime.gcs.GcsClient;
import org.ray.runtime.generated.Common.Language;
import org.ray.runtime.generated.Common.WorkerType;
import org.ray.runtime.object.ObjectStore;
import org.ray.runtime.object.RayObjectImpl;
import org.ray.runtime.task.ArgumentsBuilder;
import org.ray.runtime.task.FunctionArg;
import org.ray.runtime.task.TaskExecutor;
import org.ray.runtime.task.TaskSubmitter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,7 +63,7 @@ public abstract class AbstractRayRuntime implements RayRuntimeInternal {
public AbstractRayRuntime(RayConfig rayConfig) {
this.rayConfig = rayConfig;
setIsContextSet(rayConfig.workerMode == WorkerType.DRIVER);
setIsContextSet(rayConfig.workerMode == Common.WorkerType.DRIVER);
functionManager = new FunctionManager(rayConfig.jobResourcePath);
runtimeContext = new RuntimeContextImpl(this);
}
java/runtime/src/main/java/org/ray/runtime/DefaultRayRuntimeFactory.java → java/runtime/src/main/java/io/ray/runtime/DefaultRayRuntimeFactory.java
+5 -5
View File
@@ -1,9 +1,9 @@
package org.ray.runtime;
package io.ray.runtime;
import org.ray.api.runtime.RayRuntime;
import org.ray.api.runtime.RayRuntimeFactory;
import org.ray.runtime.config.RayConfig;
import org.ray.runtime.config.RunMode;
import io.ray.api.runtime.RayRuntime;
import io.ray.api.runtime.RayRuntimeFactory;
import io.ray.runtime.config.RayConfig;
import io.ray.runtime.config.RunMode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/RayDevRuntime.java → java/runtime/src/main/java/io/ray/runtime/RayDevRuntime.java
+9 -9
View File
@@ -1,15 +1,15 @@
package org.ray.runtime;
package io.ray.runtime;
import com.google.common.base.Preconditions;
import io.ray.api.BaseActor;
import io.ray.api.id.JobId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.config.RayConfig;
import io.ray.runtime.context.LocalModeWorkerContext;
import io.ray.runtime.object.LocalModeObjectStore;
import io.ray.runtime.task.LocalModeTaskExecutor;
import io.ray.runtime.task.LocalModeTaskSubmitter;
import java.util.concurrent.atomic.AtomicInteger;
import org.ray.api.BaseActor;
import org.ray.api.id.JobId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.config.RayConfig;
import org.ray.runtime.context.LocalModeWorkerContext;
import org.ray.runtime.object.LocalModeObjectStore;
import org.ray.runtime.task.LocalModeTaskExecutor;
import org.ray.runtime.task.LocalModeTaskSubmitter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/RayNativeRuntime.java → java/runtime/src/main/java/io/ray/runtime/RayNativeRuntime.java
+16 -16
View File
@@ -1,25 +1,25 @@
package org.ray.runtime;
package io.ray.runtime;
import com.google.common.base.Preconditions;
import io.ray.api.BaseActor;
import io.ray.api.id.JobId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.config.RayConfig;
import io.ray.runtime.context.NativeWorkerContext;
import io.ray.runtime.gcs.GcsClient;
import io.ray.runtime.gcs.GcsClientOptions;
import io.ray.runtime.gcs.RedisClient;
import io.ray.runtime.generated.Common.WorkerType;
import io.ray.runtime.object.NativeObjectStore;
import io.ray.runtime.runner.RunManager;
import io.ray.runtime.task.NativeTaskExecutor;
import io.ray.runtime.task.NativeTaskSubmitter;
import io.ray.runtime.task.TaskExecutor;
import io.ray.runtime.util.JniUtils;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.ray.api.BaseActor;
import org.ray.api.id.JobId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.config.RayConfig;
import org.ray.runtime.context.NativeWorkerContext;
import org.ray.runtime.gcs.GcsClient;
import org.ray.runtime.gcs.GcsClientOptions;
import org.ray.runtime.gcs.RedisClient;
import org.ray.runtime.generated.Common.WorkerType;
import org.ray.runtime.object.NativeObjectStore;
import org.ray.runtime.runner.RunManager;
import org.ray.runtime.task.NativeTaskExecutor;
import org.ray.runtime.task.NativeTaskSubmitter;
import org.ray.runtime.task.TaskExecutor;
import org.ray.runtime.util.JniUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/RayRuntimeInternal.java → java/runtime/src/main/java/io/ray/runtime/RayRuntimeInternal.java
+7 -7
View File
@@ -1,11 +1,11 @@
package org.ray.runtime;
package io.ray.runtime;
import org.ray.api.runtime.RayRuntime;
import org.ray.runtime.config.RayConfig;
import org.ray.runtime.context.WorkerContext;
import org.ray.runtime.functionmanager.FunctionManager;
import org.ray.runtime.gcs.GcsClient;
import org.ray.runtime.object.ObjectStore;
import io.ray.api.runtime.RayRuntime;
import io.ray.runtime.config.RayConfig;
import io.ray.runtime.context.WorkerContext;
import io.ray.runtime.functionmanager.FunctionManager;
import io.ray.runtime.gcs.GcsClient;
import io.ray.runtime.object.ObjectStore;
/**
* This interface is required to make {@link RayRuntimeProxy} work.
java/runtime/src/main/java/org/ray/runtime/RayRuntimeProxy.java → java/runtime/src/main/java/io/ray/runtime/RayRuntimeProxy.java
+4 -4
View File
@@ -1,11 +1,11 @@
package org.ray.runtime;
package io.ray.runtime;
import io.ray.api.exception.RayException;
import io.ray.api.runtime.RayRuntime;
import io.ray.runtime.config.RunMode;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.ray.api.exception.RayException;
import org.ray.api.runtime.RayRuntime;
import org.ray.runtime.config.RunMode;
/**
* Protect a ray runtime with context checks for all methods of {@link RayRuntime} (except {@link
java/runtime/src/main/java/org/ray/runtime/actor/LocalModeRayActor.java → java/runtime/src/main/java/io/ray/runtime/actor/LocalModeRayActor.java
+4 -4
View File
@@ -1,13 +1,13 @@
package org.ray.runtime.actor;
package io.ray.runtime.actor;
import io.ray.api.RayActor;
import io.ray.api.id.ActorId;
import io.ray.api.id.ObjectId;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.concurrent.atomic.AtomicReference;
import org.ray.api.RayActor;
import org.ray.api.id.ActorId;
import org.ray.api.id.ObjectId;
/**
* Implementation of actor handle for local mode.
java/runtime/src/main/java/org/ray/runtime/actor/NativeRayActor.java → java/runtime/src/main/java/io/ray/runtime/actor/NativeRayActor.java
+4 -4
View File
@@ -1,14 +1,14 @@
package org.ray.runtime.actor;
package io.ray.runtime.actor;
import com.google.common.base.Preconditions;
import io.ray.api.BaseActor;
import io.ray.api.id.ActorId;
import io.ray.runtime.generated.Common.Language;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import org.ray.api.BaseActor;
import org.ray.api.id.ActorId;
import org.ray.runtime.generated.Common.Language;
/**
* Abstract and language-independent implementation of actor handle for cluster mode. This is a
java/runtime/src/main/java/org/ray/runtime/actor/NativeRayActorSerializer.java → java/runtime/src/main/java/io/ray/runtime/actor/NativeRayActorSerializer.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.actor;
package io.ray.runtime.actor;
import java.io.IOException;
import org.nustaq.serialization.FSTBasicObjectSerializer;
java/runtime/src/main/java/org/ray/runtime/actor/NativeRayJavaActor.java → java/runtime/src/main/java/io/ray/runtime/actor/NativeRayJavaActor.java
+3 -3
View File
@@ -1,10 +1,10 @@
package org.ray.runtime.actor;
package io.ray.runtime.actor;
import com.google.common.base.Preconditions;
import io.ray.api.RayActor;
import io.ray.runtime.generated.Common.Language;
import java.io.IOException;
import java.io.ObjectInput;
import org.ray.api.RayActor;
import org.ray.runtime.generated.Common.Language;
/**
* Java implementation of actor handle for cluster mode.
java/runtime/src/main/java/org/ray/runtime/actor/NativeRayPyActor.java → java/runtime/src/main/java/io/ray/runtime/actor/NativeRayPyActor.java
+3 -3
View File
@@ -1,10 +1,10 @@
package org.ray.runtime.actor;
package io.ray.runtime.actor;
import com.google.common.base.Preconditions;
import io.ray.api.RayPyActor;
import io.ray.runtime.generated.Common.Language;
import java.io.IOException;
import java.io.ObjectInput;
import org.ray.api.RayPyActor;
import org.ray.runtime.generated.Common.Language;
/**
* Python actor handle implementation for cluster mode.
java/runtime/src/main/java/org/ray/runtime/config/RayConfig.java → java/runtime/src/main/java/io/ray/runtime/config/RayConfig.java
+5 -5
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.config;
package io.ray.runtime.config;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@@ -7,6 +7,10 @@ import com.typesafe.config.Config;
import com.typesafe.config.ConfigException;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigValue;
import io.ray.api.id.JobId;
import io.ray.runtime.generated.Common.WorkerType;
import io.ray.runtime.util.NetworkUtil;
import io.ray.runtime.util.ResourceUtil;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -14,10 +18,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import org.ray.api.id.JobId;
import org.ray.runtime.generated.Common.WorkerType;
import org.ray.runtime.util.NetworkUtil;
import org.ray.runtime.util.ResourceUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/config/RunMode.java → java/runtime/src/main/java/io/ray/runtime/config/RunMode.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.config;
package io.ray.runtime.config;
public enum RunMode {
java/runtime/src/main/java/org/ray/runtime/context/LocalModeWorkerContext.java → java/runtime/src/main/java/io/ray/runtime/context/LocalModeWorkerContext.java
+8 -8
View File
@@ -1,13 +1,13 @@
package org.ray.runtime.context;
package io.ray.runtime.context;
import com.google.common.base.Preconditions;
import org.ray.api.id.ActorId;
import org.ray.api.id.JobId;
import org.ray.api.id.TaskId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.generated.Common.TaskSpec;
import org.ray.runtime.generated.Common.TaskType;
import org.ray.runtime.task.LocalModeTaskSubmitter;
import io.ray.api.id.ActorId;
import io.ray.api.id.JobId;
import io.ray.api.id.TaskId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.generated.Common.TaskSpec;
import io.ray.runtime.generated.Common.TaskType;
import io.ray.runtime.task.LocalModeTaskSubmitter;
/**
* Worker context for local mode.
java/runtime/src/main/java/org/ray/runtime/context/NativeWorkerContext.java → java/runtime/src/main/java/io/ray/runtime/context/NativeWorkerContext.java
+6 -6
View File
@@ -1,11 +1,11 @@
package org.ray.runtime.context;
package io.ray.runtime.context;
import io.ray.api.id.ActorId;
import io.ray.api.id.JobId;
import io.ray.api.id.TaskId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.generated.Common.TaskType;
import java.nio.ByteBuffer;
import org.ray.api.id.ActorId;
import org.ray.api.id.JobId;
import org.ray.api.id.TaskId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.generated.Common.TaskType;
/**
* Worker context for cluster mode. This is a wrapper class for worker context of core worker.
java/runtime/src/main/java/org/ray/runtime/context/RuntimeContextImpl.java → java/runtime/src/main/java/io/ray/runtime/context/RuntimeContextImpl.java
+8 -8
View File
@@ -1,14 +1,14 @@
package org.ray.runtime.context;
package io.ray.runtime.context;
import com.google.common.base.Preconditions;
import io.ray.api.id.ActorId;
import io.ray.api.id.JobId;
import io.ray.api.runtimecontext.NodeInfo;
import io.ray.api.runtimecontext.RuntimeContext;
import io.ray.runtime.RayRuntimeInternal;
import io.ray.runtime.config.RunMode;
import io.ray.runtime.generated.Common.TaskType;
import java.util.List;
import org.ray.api.id.ActorId;
import org.ray.api.id.JobId;
import org.ray.api.runtimecontext.NodeInfo;
import org.ray.api.runtimecontext.RuntimeContext;
import org.ray.runtime.RayRuntimeInternal;
import org.ray.runtime.config.RunMode;
import org.ray.runtime.generated.Common.TaskType;
public class RuntimeContextImpl implements RuntimeContext {
java/runtime/src/main/java/org/ray/runtime/context/WorkerContext.java → java/runtime/src/main/java/io/ray/runtime/context/WorkerContext.java
+6 -7
View File
@@ -1,11 +1,10 @@
package org.ray.runtime.context;
package io.ray.runtime.context;
import org.ray.api.id.ActorId;
import org.ray.api.id.JobId;
import org.ray.api.id.TaskId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.generated.Common.TaskType;
import org.ray.runtime.serializer.Serializer;
import io.ray.api.id.ActorId;
import io.ray.api.id.JobId;
import io.ray.api.id.TaskId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.generated.Common.TaskType;
/**
* The context of worker.
java/runtime/src/main/java/org/ray/runtime/functionmanager/FunctionDescriptor.java → java/runtime/src/main/java/io/ray/runtime/functionmanager/FunctionDescriptor.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.ray.runtime.functionmanager;
package io.ray.runtime.functionmanager;
import io.ray.runtime.generated.Common.Language;
import java.util.List;
import org.ray.runtime.generated.Common.Language;
/**
* Base interface of a Ray task's function descriptor.
java/runtime/src/main/java/org/ray/runtime/functionmanager/FunctionManager.java → java/runtime/src/main/java/io/ray/runtime/functionmanager/FunctionManager.java
+4 -4
View File
@@ -1,6 +1,9 @@
package org.ray.runtime.functionmanager;
package io.ray.runtime.functionmanager;
import com.google.common.base.Strings;
import io.ray.api.function.RayFunc;
import io.ray.api.id.JobId;
import io.ray.runtime.util.LambdaUtils;
import java.io.File;
import java.lang.invoke.SerializedLambda;
import java.lang.reflect.Constructor;
@@ -25,9 +28,6 @@ import org.apache.commons.io.filefilter.RegexFileFilter;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.objectweb.asm.Type;
import org.ray.api.function.RayFunc;
import org.ray.api.id.JobId;
import org.ray.runtime.util.LambdaUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/functionmanager/JavaFunctionDescriptor.java → java/runtime/src/main/java/io/ray/runtime/functionmanager/JavaFunctionDescriptor.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.ray.runtime.functionmanager;
package io.ray.runtime.functionmanager;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import io.ray.runtime.generated.Common.Language;
import java.util.List;
import org.ray.runtime.generated.Common.Language;
/**
* Represents metadata of Java function.
java/runtime/src/main/java/org/ray/runtime/functionmanager/PyFunctionDescriptor.java → java/runtime/src/main/java/io/ray/runtime/functionmanager/PyFunctionDescriptor.java
+2 -2
View File
@@ -1,8 +1,8 @@
package org.ray.runtime.functionmanager;
package io.ray.runtime.functionmanager;
import io.ray.runtime.generated.Common.Language;
import java.util.Arrays;
import java.util.List;
import org.ray.runtime.generated.Common.Language;
/**
* Represents metadata of a Python function.
java/runtime/src/main/java/org/ray/runtime/functionmanager/RayFunction.java → java/runtime/src/main/java/io/ray/runtime/functionmanager/RayFunction.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.functionmanager;
package io.ray.runtime.functionmanager;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
java/runtime/src/main/java/org/ray/runtime/gcs/GcsClient.java → java/runtime/src/main/java/io/ray/runtime/gcs/GcsClient.java
+13 -13
View File
@@ -1,25 +1,25 @@
package org.ray.runtime.gcs;
package io.ray.runtime.gcs;
import com.google.common.base.Preconditions;
import com.google.protobuf.InvalidProtocolBufferException;
import io.ray.api.Checkpointable.Checkpoint;
import io.ray.api.id.ActorId;
import io.ray.api.id.BaseId;
import io.ray.api.id.JobId;
import io.ray.api.id.TaskId;
import io.ray.api.id.UniqueId;
import io.ray.api.runtimecontext.NodeInfo;
import io.ray.runtime.generated.Gcs;
import io.ray.runtime.generated.Gcs.ActorCheckpointIdData;
import io.ray.runtime.generated.Gcs.GcsNodeInfo;
import io.ray.runtime.generated.Gcs.TablePrefix;
import io.ray.runtime.util.IdUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.commons.lang3.ArrayUtils;
import org.ray.api.Checkpointable.Checkpoint;
import org.ray.api.id.ActorId;
import org.ray.api.id.BaseId;
import org.ray.api.id.JobId;
import org.ray.api.id.TaskId;
import org.ray.api.id.UniqueId;
import org.ray.api.runtimecontext.NodeInfo;
import org.ray.runtime.generated.Gcs;
import org.ray.runtime.generated.Gcs.ActorCheckpointIdData;
import org.ray.runtime.generated.Gcs.GcsNodeInfo;
import org.ray.runtime.generated.Gcs.TablePrefix;
import org.ray.runtime.util.IdUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/gcs/GcsClientOptions.java → java/runtime/src/main/java/io/ray/runtime/gcs/GcsClientOptions.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.ray.runtime.gcs;
package io.ray.runtime.gcs;
import org.ray.runtime.config.RayConfig;
import io.ray.runtime.config.RayConfig;
/**
* Options to create GCS Client.
java/runtime/src/main/java/org/ray/runtime/gcs/RedisClient.java → java/runtime/src/main/java/io/ray/runtime/gcs/RedisClient.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.gcs;
package io.ray.runtime.gcs;
import com.google.common.base.Strings;
import java.util.List;
java/runtime/src/main/java/org/ray/runtime/object/LocalModeObjectStore.java → java/runtime/src/main/java/io/ray/runtime/object/LocalModeObjectStore.java
+3 -3
View File
@@ -1,14 +1,14 @@
package org.ray.runtime.object;
package io.ray.runtime.object;
import com.google.common.base.Preconditions;
import io.ray.api.id.ObjectId;
import io.ray.runtime.context.WorkerContext;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.ray.api.id.ObjectId;
import org.ray.runtime.context.WorkerContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/object/NativeObjectStore.java → java/runtime/src/main/java/io/ray/runtime/object/NativeObjectStore.java
+4 -4
View File
@@ -1,10 +1,10 @@
package org.ray.runtime.object;
package io.ray.runtime.object;
import io.ray.api.id.BaseId;
import io.ray.api.id.ObjectId;
import io.ray.runtime.context.WorkerContext;
import java.util.List;
import java.util.stream.Collectors;
import org.ray.api.id.BaseId;
import org.ray.api.id.ObjectId;
import org.ray.runtime.context.WorkerContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/object/NativeRayObject.java → java/runtime/src/main/java/io/ray/runtime/object/NativeRayObject.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.object;
package io.ray.runtime.object;
import com.google.common.base.Preconditions;
java/runtime/src/main/java/org/ray/runtime/object/ObjectSerializer.java → java/runtime/src/main/java/io/ray/runtime/object/ObjectSerializer.java
+8 -9
View File
@@ -1,15 +1,14 @@
package org.ray.runtime.object;
package io.ray.runtime.object;
import io.ray.api.exception.RayActorException;
import io.ray.api.exception.RayTaskException;
import io.ray.api.exception.RayWorkerException;
import io.ray.api.exception.UnreconstructableException;
import io.ray.api.id.ObjectId;
import io.ray.runtime.generated.Gcs.ErrorType;
import io.ray.runtime.serializer.Serializer;
import java.util.Arrays;
import org.apache.commons.lang3.tuple.Pair;
import org.ray.api.exception.RayActorException;
import org.ray.api.exception.RayTaskException;
import org.ray.api.exception.RayWorkerException;
import org.ray.api.exception.UnreconstructableException;
import org.ray.api.id.ObjectId;
import org.ray.runtime.generated.Gcs.ErrorType;
import org.ray.runtime.serializer.Serializer;
/**
* Serialize to and deserialize from {@link NativeRayObject}. Metadata is generated during
java/runtime/src/main/java/org/ray/runtime/object/ObjectStore.java → java/runtime/src/main/java/io/ray/runtime/object/ObjectStore.java
+6 -6
View File
@@ -1,16 +1,16 @@
package org.ray.runtime.object;
package io.ray.runtime.object;
import com.google.common.base.Preconditions;
import io.ray.api.RayObject;
import io.ray.api.WaitResult;
import io.ray.api.exception.RayException;
import io.ray.api.id.ObjectId;
import io.ray.runtime.context.WorkerContext;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import org.ray.api.RayObject;
import org.ray.api.WaitResult;
import org.ray.api.exception.RayException;
import org.ray.api.id.ObjectId;
import org.ray.runtime.context.WorkerContext;
/**
* A class that is used to put/get objects to/from the object store.
java/runtime/src/main/java/org/ray/runtime/object/RayObjectImpl.java → java/runtime/src/main/java/io/ray/runtime/object/RayObjectImpl.java
+4 -5
View File
@@ -1,11 +1,10 @@
package org.ray.runtime.object;
package io.ray.runtime.object;
import io.ray.api.Ray;
import io.ray.api.RayObject;
import io.ray.api.id.ObjectId;
import java.io.Serializable;
import org.ray.api.Ray;
import org.ray.api.RayObject;
import org.ray.api.id.ObjectId;
/**
* Implementation of {@link RayObject}.
*/
java/runtime/src/main/java/org/ray/runtime/runner/RunManager.java → java/runtime/src/main/java/io/ray/runtime/runner/RunManager.java
+5 -5
View File
@@ -1,10 +1,13 @@
package org.ray.runtime.runner;
package io.ray.runtime.runner;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import io.ray.runtime.config.RayConfig;
import io.ray.runtime.util.BinaryFileUtil;
import io.ray.runtime.util.ResourceUtil;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@@ -20,9 +23,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.ray.runtime.config.RayConfig;
import org.ray.runtime.util.BinaryFileUtil;
import org.ray.runtime.util.ResourceUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import redis.clients.jedis.Jedis;
@@ -37,7 +37,7 @@ public class RunManager {
private static final DateTimeFormatter DATE_TIME_FORMATTER =
DateTimeFormatter.ofPattern("YYYY-MM-dd_HH-mm-ss");
private static final String WORKER_CLASS = "org.ray.runtime.runner.worker.DefaultWorker";
private static final String WORKER_CLASS = "io.ray.runtime.runner.worker.DefaultWorker";
private static final String SESSION_LATEST = "session_latest";
java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultDriver.java → java/runtime/src/main/java/io/ray/runtime/runner/worker/DefaultDriver.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.ray.runtime.runner.worker;
package io.ray.runtime.runner.worker;
import org.ray.api.Ray;
import io.ray.api.Ray;
/**
* The main function of DefaultDriver.
java/runtime/src/main/java/org/ray/runtime/runner/worker/DefaultWorker.java → java/runtime/src/main/java/io/ray/runtime/runner/worker/DefaultWorker.java
+3 -3
View File
@@ -1,7 +1,7 @@
package org.ray.runtime.runner.worker;
package io.ray.runtime.runner.worker;
import org.ray.api.Ray;
import org.ray.runtime.RayRuntimeInternal;
import io.ray.api.Ray;
import io.ray.runtime.RayRuntimeInternal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/serializer/FstSerializer.java → java/runtime/src/main/java/io/ray/runtime/serializer/FstSerializer.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.ray.runtime.serializer;
package io.ray.runtime.serializer;
import io.ray.runtime.actor.NativeRayActor;
import io.ray.runtime.actor.NativeRayActorSerializer;
import org.nustaq.serialization.FSTConfiguration;
import org.ray.runtime.actor.NativeRayActor;
import org.ray.runtime.actor.NativeRayActorSerializer;
/**
* Java object serialization TODO: use others (e.g. Arrow) for higher performance
java/runtime/src/main/java/org/ray/runtime/serializer/MessagePackSerializer.java → java/runtime/src/main/java/io/ray/runtime/serializer/MessagePackSerializer.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.serializer;
package io.ray.runtime.serializer;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
java/runtime/src/main/java/org/ray/runtime/serializer/Serializer.java → java/runtime/src/main/java/io/ray/runtime/serializer/Serializer.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.serializer;
package io.ray.runtime.serializer;
import org.apache.commons.lang3.tuple.Pair;
java/runtime/src/main/java/org/ray/runtime/task/ArgumentsBuilder.java → java/runtime/src/main/java/io/ray/runtime/task/ArgumentsBuilder.java
+8 -8
View File
@@ -1,15 +1,15 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import io.ray.api.Ray;
import io.ray.api.RayObject;
import io.ray.api.id.ObjectId;
import io.ray.runtime.RayRuntimeInternal;
import io.ray.runtime.generated.Common.Language;
import io.ray.runtime.object.NativeRayObject;
import io.ray.runtime.object.ObjectSerializer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.ray.api.Ray;
import org.ray.api.RayObject;
import org.ray.api.id.ObjectId;
import org.ray.runtime.RayRuntimeInternal;
import org.ray.runtime.generated.Common.Language;
import org.ray.runtime.object.NativeRayObject;
import org.ray.runtime.object.ObjectSerializer;
/**
* Helper methods to convert arguments from/to objects.
java/runtime/src/main/java/org/ray/runtime/task/FunctionArg.java → java/runtime/src/main/java/io/ray/runtime/task/FunctionArg.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import com.google.common.base.Preconditions;
import org.ray.api.id.ObjectId;
import org.ray.runtime.object.NativeRayObject;
import io.ray.api.id.ObjectId;
import io.ray.runtime.object.NativeRayObject;
/**
* Represents a function argument in task spec.
java/runtime/src/main/java/org/ray/runtime/task/LocalModeTaskExecutor.java → java/runtime/src/main/java/io/ray/runtime/task/LocalModeTaskExecutor.java
+5 -6
View File
@@ -1,14 +1,13 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import org.ray.api.id.ActorId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.RayRuntimeInternal;
import org.ray.runtime.task.LocalModeTaskExecutor.LocalActorContext;
import io.ray.api.id.ActorId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.RayRuntimeInternal;
/**
* Task executor for local mode.
*/
public class LocalModeTaskExecutor extends TaskExecutor<LocalActorContext> {
public class LocalModeTaskExecutor extends TaskExecutor<LocalModeTaskExecutor.LocalActorContext> {
static class LocalActorContext extends TaskExecutor.ActorContext {
java/runtime/src/main/java/org/ray/runtime/task/LocalModeTaskSubmitter.java → java/runtime/src/main/java/io/ray/runtime/task/LocalModeTaskSubmitter.java
+27 -28
View File
@@ -1,8 +1,29 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.protobuf.ByteString;
import io.ray.api.BaseActor;
import io.ray.api.id.ActorId;
import io.ray.api.id.ObjectId;
import io.ray.api.id.TaskId;
import io.ray.api.id.UniqueId;
import io.ray.api.options.ActorCreationOptions;
import io.ray.api.options.CallOptions;
import io.ray.runtime.RayRuntimeInternal;
import io.ray.runtime.actor.LocalModeRayActor;
import io.ray.runtime.context.LocalModeWorkerContext;
import io.ray.runtime.functionmanager.FunctionDescriptor;
import io.ray.runtime.functionmanager.JavaFunctionDescriptor;
import io.ray.runtime.generated.Common;
import io.ray.runtime.generated.Common.ActorCreationTaskSpec;
import io.ray.runtime.generated.Common.ActorTaskSpec;
import io.ray.runtime.generated.Common.Language;
import io.ray.runtime.generated.Common.TaskArg;
import io.ray.runtime.generated.Common.TaskSpec;
import io.ray.runtime.generated.Common.TaskType;
import io.ray.runtime.object.LocalModeObjectStore;
import io.ray.runtime.object.NativeRayObject;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
@@ -16,28 +37,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import org.ray.api.BaseActor;
import org.ray.api.id.ActorId;
import org.ray.api.id.ObjectId;
import org.ray.api.id.TaskId;
import org.ray.api.id.UniqueId;
import org.ray.api.options.ActorCreationOptions;
import org.ray.api.options.CallOptions;
import org.ray.runtime.RayRuntimeInternal;
import org.ray.runtime.actor.LocalModeRayActor;
import org.ray.runtime.context.LocalModeWorkerContext;
import org.ray.runtime.functionmanager.FunctionDescriptor;
import org.ray.runtime.functionmanager.JavaFunctionDescriptor;
import org.ray.runtime.generated.Common;
import org.ray.runtime.generated.Common.ActorCreationTaskSpec;
import org.ray.runtime.generated.Common.ActorTaskSpec;
import org.ray.runtime.generated.Common.Language;
import org.ray.runtime.generated.Common.TaskArg;
import org.ray.runtime.generated.Common.TaskSpec;
import org.ray.runtime.generated.Common.TaskType;
import org.ray.runtime.object.LocalModeObjectStore;
import org.ray.runtime.object.NativeRayObject;
import org.ray.runtime.task.TaskExecutor.ActorContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +60,7 @@ public class LocalModeTaskSubmitter implements TaskSubmitter {
private final ExecutorService normalTaskExecutorService;
private final Map<ActorId, ActorContext> actorContexts = new ConcurrentHashMap<>();
private final Map<ActorId, TaskExecutor.ActorContext> actorContexts = new ConcurrentHashMap<>();
public LocalModeTaskSubmitter(RayRuntimeInternal runtime, TaskExecutor taskExecutor,
LocalModeObjectStore objectStore) {
@@ -123,9 +122,9 @@ public class LocalModeTaskSubmitter implements TaskSubmitter {
.setJobId(
ByteString.copyFrom(runtime.getRayConfig().getJobId().getBytes()))
.setTaskId(ByteString.copyFrom(taskIdBytes))
.setFunctionDescriptor(org.ray.runtime.generated.Common.FunctionDescriptor.newBuilder()
.setFunctionDescriptor(Common.FunctionDescriptor.newBuilder()
.setJavaFunctionDescriptor(
org.ray.runtime.generated.Common.JavaFunctionDescriptor.newBuilder()
Common.JavaFunctionDescriptor.newBuilder()
.setClassName(functionDescriptorList.get(0))
.setFunctionName(functionDescriptorList.get(1))
.setSignature(functionDescriptorList.get(2))))
@@ -254,7 +253,7 @@ public class LocalModeTaskSubmitter implements TaskSubmitter {
}
private void executeTask(TaskSpec taskSpec) {
ActorContext actorContext = null;
TaskExecutor.ActorContext actorContext = null;
if (taskSpec.getType() == TaskType.ACTOR_TASK) {
actorContext = actorContexts.get(getActorId(taskSpec));
Preconditions.checkNotNull(actorContext);
@@ -300,7 +299,7 @@ public class LocalModeTaskSubmitter implements TaskSubmitter {
}
private static JavaFunctionDescriptor getJavaFunctionDescriptor(TaskSpec taskSpec) {
org.ray.runtime.generated.Common.FunctionDescriptor functionDescriptor =
Common.FunctionDescriptor functionDescriptor =
taskSpec.getFunctionDescriptor();
if (functionDescriptor.getFunctionDescriptorCase() ==
Common.FunctionDescriptor.FunctionDescriptorCase.JAVA_FUNCTION_DESCRIPTOR) {
java/runtime/src/main/java/org/ray/runtime/task/NativeTaskExecutor.java → java/runtime/src/main/java/io/ray/runtime/task/NativeTaskExecutor.java
+8 -9
View File
@@ -1,20 +1,19 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import com.google.common.base.Preconditions;
import io.ray.api.Checkpointable;
import io.ray.api.Checkpointable.Checkpoint;
import io.ray.api.Checkpointable.CheckpointContext;
import io.ray.api.id.ActorId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.RayRuntimeInternal;
import java.util.ArrayList;
import java.util.List;
import org.ray.api.Checkpointable;
import org.ray.api.Checkpointable.Checkpoint;
import org.ray.api.Checkpointable.CheckpointContext;
import org.ray.api.id.ActorId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.RayRuntimeInternal;
import org.ray.runtime.task.NativeTaskExecutor.NativeActorContext;
/**
* Task executor for cluster mode.
*/
public class NativeTaskExecutor extends TaskExecutor<NativeActorContext> {
public class NativeTaskExecutor extends TaskExecutor<NativeTaskExecutor.NativeActorContext> {
// TODO(hchen): Use the C++ config.
private static final int NUM_ACTOR_CHECKPOINTS_TO_KEEP = 20;
java/runtime/src/main/java/org/ray/runtime/task/NativeTaskSubmitter.java → java/runtime/src/main/java/io/ray/runtime/task/NativeTaskSubmitter.java
+7 -7
View File
@@ -1,14 +1,14 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import com.google.common.base.Preconditions;
import io.ray.api.BaseActor;
import io.ray.api.id.ObjectId;
import io.ray.api.options.ActorCreationOptions;
import io.ray.api.options.CallOptions;
import io.ray.runtime.actor.NativeRayActor;
import io.ray.runtime.functionmanager.FunctionDescriptor;
import java.util.List;
import java.util.stream.Collectors;
import org.ray.api.BaseActor;
import org.ray.api.id.ObjectId;
import org.ray.api.options.ActorCreationOptions;
import org.ray.api.options.CallOptions;
import org.ray.runtime.actor.NativeRayActor;
import org.ray.runtime.functionmanager.FunctionDescriptor;
/**
* Task submitter for cluster mode. This is a wrapper class for core worker task interface.
java/runtime/src/main/java/org/ray/runtime/task/TaskExecutor.java → java/runtime/src/main/java/io/ray/runtime/task/TaskExecutor.java
+13 -15
View File
@@ -1,30 +1,28 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import com.google.common.base.Preconditions;
import io.ray.api.exception.RayTaskException;
import io.ray.api.id.ActorId;
import io.ray.api.id.JobId;
import io.ray.api.id.TaskId;
import io.ray.api.id.UniqueId;
import io.ray.runtime.RayRuntimeInternal;
import io.ray.runtime.functionmanager.JavaFunctionDescriptor;
import io.ray.runtime.functionmanager.RayFunction;
import io.ray.runtime.generated.Common.TaskType;
import io.ray.runtime.object.NativeRayObject;
import io.ray.runtime.object.ObjectSerializer;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import org.ray.api.exception.RayTaskException;
import org.ray.api.id.ActorId;
import org.ray.api.id.JobId;
import org.ray.api.id.TaskId;
import org.ray.api.id.UniqueId;
import org.ray.runtime.RayRuntimeInternal;
import org.ray.runtime.functionmanager.JavaFunctionDescriptor;
import org.ray.runtime.functionmanager.RayFunction;
import org.ray.runtime.generated.Common.TaskType;
import org.ray.runtime.object.NativeRayObject;
import org.ray.runtime.object.ObjectSerializer;
import org.ray.runtime.task.TaskExecutor.ActorContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* The task executor, which executes tasks assigned by raylet continuously.
*/
public abstract class TaskExecutor<T extends ActorContext> {
public abstract class TaskExecutor<T extends TaskExecutor.ActorContext> {
private static final Logger LOGGER = LoggerFactory.getLogger(TaskExecutor.class);
java/runtime/src/main/java/org/ray/runtime/task/TaskSubmitter.java → java/runtime/src/main/java/io/ray/runtime/task/TaskSubmitter.java
+6 -6
View File
@@ -1,11 +1,11 @@
package org.ray.runtime.task;
package io.ray.runtime.task;
import io.ray.api.BaseActor;
import io.ray.api.id.ObjectId;
import io.ray.api.options.ActorCreationOptions;
import io.ray.api.options.CallOptions;
import io.ray.runtime.functionmanager.FunctionDescriptor;
import java.util.List;
import org.ray.api.BaseActor;
import org.ray.api.id.ObjectId;
import org.ray.api.options.ActorCreationOptions;
import org.ray.api.options.CallOptions;
import org.ray.runtime.functionmanager.FunctionDescriptor;
/**
* A set of methods to submit tasks and create actors.
java/runtime/src/main/java/org/ray/runtime/util/BinaryFileUtil.java → java/runtime/src/main/java/io/ray/runtime/util/BinaryFileUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import com.google.common.base.Preconditions;
import java.io.File;
java/runtime/src/main/java/org/ray/runtime/util/IdUtil.java → java/runtime/src/main/java/io/ray/runtime/util/IdUtil.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import org.ray.api.id.BaseId;
import io.ray.api.id.BaseId;
/**
* Helper method for different Ids. Note: any changes to these methods must be synced with C++
java/runtime/src/main/java/org/ray/runtime/util/JniExceptionUtil.java → java/runtime/src/main/java/io/ray/runtime/util/JniExceptionUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.slf4j.Logger;
java/runtime/src/main/java/org/ray/runtime/util/JniUtils.java → java/runtime/src/main/java/io/ray/runtime/util/JniUtils.java
+2 -2
View File
@@ -1,12 +1,12 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import com.google.common.base.Strings;
import com.google.common.collect.Sets;
import com.sun.jna.NativeLibrary;
import io.ray.runtime.config.RayConfig;
import java.io.File;
import java.lang.reflect.Field;
import java.util.Set;
import org.ray.runtime.config.RayConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
java/runtime/src/main/java/org/ray/runtime/util/LambdaUtils.java → java/runtime/src/main/java/io/ray/runtime/util/LambdaUtils.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import java.io.Serializable;
import java.lang.invoke.SerializedLambda;
java/runtime/src/main/java/org/ray/runtime/util/NetworkUtil.java → java/runtime/src/main/java/io/ray/runtime/util/NetworkUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import com.google.common.base.Strings;
import java.io.IOException;
java/runtime/src/main/java/org/ray/runtime/util/ResourceUtil.java → java/runtime/src/main/java/io/ray/runtime/util/ResourceUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import java.util.HashMap;
import java.util.Map;
java/runtime/src/test/java/org/ray/runtime/util/SerializerTest.java → java/runtime/src/main/java/io/ray/runtime/util/SerializerTest.java
+3 -5
View File
@@ -1,13 +1,11 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import org.apache.commons.lang3.mutable.MutableBoolean;
import io.ray.runtime.serializer.Serializer;
import java.util.ArrayList;
import org.apache.commons.lang3.tuple.Pair;
import org.ray.runtime.serializer.Serializer;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.ArrayList;
public class SerializerTest {
@Test
java/runtime/src/main/java/org/ray/runtime/util/SystemUtil.java → java/runtime/src/main/java/io/ray/runtime/util/SystemUtil.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util;
package io.ray.runtime.util;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
java/runtime/src/main/java/org/ray/runtime/util/generator/BaseGenerator.java → java/runtime/src/main/java/io/ray/runtime/util/generator/BaseGenerator.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util.generator;
package io.ray.runtime.util.generator;
public abstract class BaseGenerator {
java/runtime/src/main/java/org/ray/runtime/util/generator/RayCallGenerator.java → java/runtime/src/main/java/io/ray/runtime/util/generator/RayCallGenerator.java
+16 -16
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util.generator;
package io.ray.runtime.util.generator;
import java.io.File;
import java.io.IOException;
@@ -21,18 +21,18 @@ public class RayCallGenerator extends BaseGenerator {
newLine("// Generated by `RayCallGenerator.java`. DO NOT EDIT.");
newLine("");
newLine("package org.ray.api;");
newLine("package io.ray.api;");
newLine("");
newLine("import org.ray.api.function.PyActorClass;");
newLine("import org.ray.api.function.PyRemoteFunction;");
newLine("import io.ray.api.function.PyActorClass;");
newLine("import io.ray.api.function.PyRemoteFunction;");
for (int i = 0; i <= MAX_PARAMETERS; i++) {
newLine("import org.ray.api.function.RayFunc" + i + ";");
newLine("import io.ray.api.function.RayFunc" + i + ";");
}
for (int i = 0; i <= MAX_PARAMETERS; i++) {
newLine("import org.ray.api.function.RayFuncVoid" + i + ";");
newLine("import io.ray.api.function.RayFuncVoid" + i + ";");
}
newLine("import org.ray.api.options.ActorCreationOptions;");
newLine("import org.ray.api.options.CallOptions;");
newLine("import io.ray.api.options.ActorCreationOptions;");
newLine("import io.ray.api.options.CallOptions;");
newLine("");
newLine("/**");
@@ -81,13 +81,13 @@ public class RayCallGenerator extends BaseGenerator {
newLine("// Generated by `RayCallGenerator.java`. DO NOT EDIT.");
newLine("");
newLine("package org.ray.api;");
newLine("package io.ray.api;");
newLine("");
for (int i = 1; i <= MAX_PARAMETERS; i++) {
newLine("import org.ray.api.function.RayFunc" + i + ";");
newLine("import io.ray.api.function.RayFunc" + i + ";");
}
for (int i = 1; i <= MAX_PARAMETERS; i++) {
newLine("import org.ray.api.function.RayFuncVoid" + i + ";");
newLine("import io.ray.api.function.RayFuncVoid" + i + ";");
}
newLine("");
newLine("/**");
@@ -112,9 +112,9 @@ public class RayCallGenerator extends BaseGenerator {
newLine("// Generated by `RayCallGenerator.java`. DO NOT EDIT.");
newLine("");
newLine("package org.ray.api;");
newLine("package io.ray.api;");
newLine("");
newLine("import org.ray.api.function.PyActorMethod;");
newLine("import io.ray.api.function.PyActorMethod;");
newLine("");
newLine("/**");
newLine(" * This class provides type-safe interfaces for remote actor calls.");
@@ -339,15 +339,15 @@ public class RayCallGenerator extends BaseGenerator {
public static void main(String[] args) throws IOException {
String path = System.getProperty("user.dir")
+ "/api/src/main/java/org/ray/api/RayCall.java";
+ "/api/src/main/java/io.ray/api/RayCall.java";
FileUtils.write(new File(path), new RayCallGenerator().generateRayCallDotJava(),
Charset.defaultCharset());
path = System.getProperty("user.dir")
+ "/api/src/main/java/org/ray/api/ActorCall.java";
+ "/api/src/main/java/io.ray/api/ActorCall.java";
FileUtils.write(new File(path), new RayCallGenerator().generateActorCallDotJava(),
Charset.defaultCharset());
path = System.getProperty("user.dir")
+ "/api/src/main/java/org/ray/api/PyActorCall.java";
+ "/api/src/main/java/io.ray/api/PyActorCall.java";
FileUtils.write(new File(path), new RayCallGenerator().generatePyActorCallDotJava(),
Charset.defaultCharset());
}
java/runtime/src/main/java/org/ray/runtime/util/generator/RayFuncGenerator.java → java/runtime/src/main/java/io/ray/runtime/util/generator/RayFuncGenerator.java
+4 -4
View File
@@ -1,4 +1,4 @@
package org.ray.runtime.util.generator;
package io.ray.runtime.util.generator;
import java.io.File;
import java.io.IOException;
@@ -6,7 +6,7 @@ import java.nio.charset.Charset;
import org.apache.commons.io.FileUtils;
/**
* A util class that generates all the RayFuncX classes under org.ray.api.function package.
* A util class that generates all the RayFuncX classes under io.ray.api.function package.
*/
public class RayFuncGenerator extends BaseGenerator {
@@ -33,7 +33,7 @@ public class RayFuncGenerator extends BaseGenerator {
newLine("// generated automatically, do not modify.");
newLine("");
newLine("package org.ray.api.function;");
newLine("package io.ray.api.function;");
newLine("");
newLine("/**");
String comment = String.format(
@@ -55,7 +55,7 @@ public class RayFuncGenerator extends BaseGenerator {
public static void main(String[] args) throws IOException {
String root = System.getProperty("user.dir")
+ "/api/src/main/java/org/ray/api/function/";
+ "/api/src/main/java/io/ray/api/function/";
RayFuncGenerator generator = new RayFuncGenerator();
for (int i = 0; i <= MAX_PARAMETERS; i++) {
// Functions that have return.
java/runtime/src/test/java/org/ray/runtime/functionmanager/FunctionManagerTest.java → java/runtime/src/test/java/io/ray/runtime/functionmanager/FunctionManagerTest.java
+5 -5
View File
@@ -1,5 +1,9 @@
package org.ray.runtime.functionmanager;
package io.ray.runtime.functionmanager;
import io.ray.api.function.RayFunc0;
import io.ray.api.function.RayFunc1;
import io.ray.api.id.JobId;
import io.ray.runtime.functionmanager.FunctionManager.JobFunctionTable;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -9,10 +13,6 @@ import javax.tools.ToolProvider;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.ray.api.function.RayFunc0;
import org.ray.api.function.RayFunc1;
import org.ray.api.id.JobId;
import org.ray.runtime.functionmanager.FunctionManager.JobFunctionTable;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;