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

* 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
+2 -2
View File
@@ -15,7 +15,7 @@
/src/ray/gcs/format/*_generated.h
/src/ray/object_manager/format/*_generated.h
/src/ray/raylet/format/*_generated.h
/java/runtime/src/main/java/org/ray/runtime/generated/*
/java/runtime/src/main/java/io/ray/runtime/generated/*
# Redis temporary files
*dump.rdb
@@ -152,7 +152,7 @@ java/runtime/native_dependencies/
# streaming/python
streaming/python/generated/
streaming/java/streaming-runtime/src/main/java/org/ray/streaming/runtime/generated/
streaming/java/streaming-runtime/src/main/java/io/ray/streaming/runtime/generated/
streaming/build/java
.clwb
streaming/**/.settings
+7 -7
View File
@@ -32,7 +32,7 @@ def define_java_module(
define_test_lib = False,
test_deps = [],
**kwargs):
lib_name = "org_ray_ray_" + name
lib_name = "io_ray_ray_" + name
pom_file_targets = [lib_name]
native.java_library(
name = lib_name,
@@ -44,15 +44,15 @@ def define_java_module(
**kwargs
)
checkstyle_test(
name = "org_ray_ray_" + name + "-checkstyle",
target = ":org_ray_ray_" + name,
name = "io_ray_ray_" + name + "-checkstyle",
target = ":io_ray_ray_" + name,
config = "//java:checkstyle.xml",
suppressions = "//java:checkstyle-suppressions.xml",
size = "small",
tags = ["checkstyle"],
)
if define_test_lib:
test_lib_name = "org_ray_ray_" + name + "_test"
test_lib_name = "io_ray_ray_" + name + "_test"
pom_file_targets.append(test_lib_name)
native.java_library(
name = test_lib_name,
@@ -60,15 +60,15 @@ def define_java_module(
deps = test_deps,
)
checkstyle_test(
name = "org_ray_ray_" + name + "_test-checkstyle",
target = ":org_ray_ray_" + name + "_test",
name = "io_ray_ray_" + name + "_test-checkstyle",
target = ":io_ray_ray_" + name + "_test",
config = "//java:checkstyle.xml",
suppressions = "//java:checkstyle-suppressions.xml",
size = "small",
tags = ["checkstyle"],
)
pom_file(
name = "org_ray_ray_" + name + "_pom",
name = "io_ray_ray_" + name + "_pom",
targets = pom_file_targets,
template_file = name + "/pom_template.xml",
substitutions = {
+25 -24
View File
@@ -17,17 +17,17 @@ all_modules = [
java_import(
name = "all_modules",
jars = [
"liborg_ray_ray_" + module + ".jar"
"libio_ray_ray_" + module + ".jar"
for module in all_modules
] + [
"liborg_ray_ray_" + module + "-src.jar"
"libio_ray_ray_" + module + "-src.jar"
for module in all_modules
] + [
"all_tests_deploy.jar",
"all_tests_deploy-src.jar",
],
deps = [
":org_ray_ray_" + module
":io_ray_ray_" + module
for module in all_modules
] + [
":all_tests",
@@ -56,11 +56,11 @@ define_java_module(
],
define_test_lib = True,
exclude_srcs = [
"runtime/src/main/java/org/ray/runtime/generated/*.java",
"runtime/src/main/java/io/ray/runtime/generated/*.java",
],
test_deps = [
":org_ray_ray_api",
":org_ray_ray_runtime",
":io_ray_ray_api",
":io_ray_ray_runtime",
"@maven//:org_apache_commons_commons_lang3",
"@maven//:com_beust_jcommander",
"@maven//:org_testng_testng",
@@ -68,7 +68,7 @@ define_java_module(
],
visibility = ["//visibility:public"],
deps = [
":org_ray_ray_api",
":io_ray_ray_api",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_typesafe_config",
@@ -80,6 +80,7 @@ define_java_module(
"@maven//:org_ow2_asm_asm",
"@maven//:org_slf4j_slf4j_api",
"@maven//:org_slf4j_slf4j_log4j12",
"@maven//:org_testng_testng",
"@maven//:redis_clients_jedis",
],
)
@@ -87,8 +88,8 @@ define_java_module(
define_java_module(
name = "tutorial",
deps = [
":org_ray_ray_api",
":org_ray_ray_runtime",
":io_ray_ray_api",
":io_ray_ray_runtime",
"@maven//:com_google_guava_guava",
],
)
@@ -96,8 +97,8 @@ define_java_module(
define_java_module(
name = "test",
deps = [
":org_ray_ray_api",
":org_ray_ray_runtime",
":io_ray_ray_api",
":io_ray_ray_runtime",
"@maven//:com_google_code_gson_gson",
"@maven//:com_google_guava_guava",
"@maven//:com_sun_xml_bind_jaxb_core",
@@ -116,8 +117,8 @@ java_binary(
data = ["testng.xml"],
main_class = "org.testng.TestNG",
runtime_deps = [
":org_ray_ray_runtime_test",
":org_ray_ray_test",
":io_ray_ray_runtime_test",
":io_ray_ray_test",
],
)
@@ -164,7 +165,7 @@ filegroup(
],
)
# Generates the depedencies needed by maven.
# Generates the dependencies needed by maven.
genrule(
name = "gen_maven_deps",
srcs = [
@@ -177,7 +178,7 @@ genrule(
set -x
WORK_DIR="$$(pwd)"
# Copy protobuf-generated files.
rm -rf "$$WORK_DIR/java/runtime/src/main/java/org/ray/runtime/generated"
rm -rf "$$WORK_DIR/java/runtime/src/main/java/io/ray/runtime/generated"
for f in $(locations //java:all_java_proto); do
unzip "$$f" -x META-INF/MANIFEST.MF -d "$$WORK_DIR/java/runtime/src/main/java"
done
@@ -198,17 +199,17 @@ genrule(
genrule(
name = "copy_pom_file",
srcs = [
"//java:org_ray_ray_" + module + "_pom"
"//java:io_ray_ray_" + module + "_pom"
for module in all_modules
],
outs = ["copy_pom_file.out"],
cmd = """
set -x
WORK_DIR="$$(pwd)"
cp -f $(location //java:org_ray_ray_api_pom) "$$WORK_DIR/java/api/pom.xml"
cp -f $(location //java:org_ray_ray_runtime_pom) "$$WORK_DIR/java/runtime/pom.xml"
cp -f $(location //java:org_ray_ray_tutorial_pom) "$$WORK_DIR/java/tutorial/pom.xml"
cp -f $(location //java:org_ray_ray_test_pom) "$$WORK_DIR/java/test/pom.xml"
cp -f $(location //java:io_ray_ray_api_pom) "$$WORK_DIR/java/api/pom.xml"
cp -f $(location //java:io_ray_ray_runtime_pom) "$$WORK_DIR/java/runtime/pom.xml"
cp -f $(location //java:io_ray_ray_tutorial_pom) "$$WORK_DIR/java/tutorial/pom.xml"
cp -f $(location //java:io_ray_ray_test_pom) "$$WORK_DIR/java/test/pom.xml"
date > $@
""",
local = 1,
@@ -221,10 +222,10 @@ java_binary(
# fat jar file. It's not really an executable jar. So we set its `main_class` to empty.
main_class = "",
runtime_deps = [
"//java:org_ray_ray_api",
"//java:org_ray_ray_runtime",
"//streaming/java:org_ray_ray_streaming-api",
"//streaming/java:org_ray_ray_streaming-runtime",
"//java:io_ray_ray_api",
"//java:io_ray_ray_runtime",
"//streaming/java:io_ray_ray_streaming-api",
"//streaming/java:io_ray_ray_streaming-runtime",
],
)
+1 -1
View File
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.ray</groupId>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
+1 -1
View File
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.ray</groupId>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
@@ -1,19 +1,19 @@
// Generated by `RayCallGenerator.java`. DO NOT EDIT.
package org.ray.api;
package io.ray.api;
import org.ray.api.function.RayFunc1;
import org.ray.api.function.RayFunc2;
import org.ray.api.function.RayFunc3;
import org.ray.api.function.RayFunc4;
import org.ray.api.function.RayFunc5;
import org.ray.api.function.RayFunc6;
import org.ray.api.function.RayFuncVoid1;
import org.ray.api.function.RayFuncVoid2;
import org.ray.api.function.RayFuncVoid3;
import org.ray.api.function.RayFuncVoid4;
import org.ray.api.function.RayFuncVoid5;
import org.ray.api.function.RayFuncVoid6;
import io.ray.api.function.RayFunc1;
import io.ray.api.function.RayFunc2;
import io.ray.api.function.RayFunc3;
import io.ray.api.function.RayFunc4;
import io.ray.api.function.RayFunc5;
import io.ray.api.function.RayFunc6;
import io.ray.api.function.RayFuncVoid1;
import io.ray.api.function.RayFuncVoid2;
import io.ray.api.function.RayFuncVoid3;
import io.ray.api.function.RayFuncVoid4;
import io.ray.api.function.RayFuncVoid5;
import io.ray.api.function.RayFuncVoid6;
/**
* This class provides type-safe interfaces for remote actor calls.
@@ -1,6 +1,6 @@
package org.ray.api;
package io.ray.api;
import org.ray.api.id.ActorId;
import io.ray.api.id.ActorId;
/**
* A handle to an actor. <p>
@@ -1,10 +1,9 @@
package org.ray.api;
package io.ray.api;
import io.ray.api.id.ActorId;
import io.ray.api.id.UniqueId;
import java.util.List;
import org.ray.api.id.ActorId;
import org.ray.api.id.UniqueId;
public interface Checkpointable {
class CheckpointContext {
@@ -1,8 +1,8 @@
// Generated by `RayCallGenerator.java`. DO NOT EDIT.
package org.ray.api;
package io.ray.api;
import org.ray.api.function.PyActorMethod;
import io.ray.api.function.PyActorMethod;
/**
* This class provides type-safe interfaces for remote actor calls.
@@ -1,13 +1,13 @@
package org.ray.api;
package io.ray.api;
import io.ray.api.id.ObjectId;
import io.ray.api.id.UniqueId;
import io.ray.api.runtime.RayRuntime;
import io.ray.api.runtime.RayRuntimeFactory;
import io.ray.api.runtimecontext.RuntimeContext;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import org.ray.api.id.ObjectId;
import org.ray.api.id.UniqueId;
import org.ray.api.runtime.RayRuntime;
import org.ray.api.runtime.RayRuntimeFactory;
import org.ray.api.runtimecontext.RuntimeContext;
/**
* This class contains all public APIs of Ray.
@@ -21,7 +21,7 @@ public final class Ray extends RayCall {
*/
public static void init() {
try {
Class clz = Class.forName("org.ray.runtime.DefaultRayRuntimeFactory");
Class clz = Class.forName("io.ray.runtime.DefaultRayRuntimeFactory");
RayRuntimeFactory factory = (RayRuntimeFactory) clz.newInstance();
init(factory);
} catch (Exception e) {
@@ -1,4 +1,4 @@
package org.ray.api;
package io.ray.api;
/**
* A handle to a Java actor. <p>
@@ -1,25 +1,25 @@
// Generated by `RayCallGenerator.java`. DO NOT EDIT.
package org.ray.api;
package io.ray.api;
import org.ray.api.function.PyActorClass;
import org.ray.api.function.PyRemoteFunction;
import org.ray.api.function.RayFunc0;
import org.ray.api.function.RayFunc1;
import org.ray.api.function.RayFunc2;
import org.ray.api.function.RayFunc3;
import org.ray.api.function.RayFunc4;
import org.ray.api.function.RayFunc5;
import org.ray.api.function.RayFunc6;
import org.ray.api.function.RayFuncVoid0;
import org.ray.api.function.RayFuncVoid1;
import org.ray.api.function.RayFuncVoid2;
import org.ray.api.function.RayFuncVoid3;
import org.ray.api.function.RayFuncVoid4;
import org.ray.api.function.RayFuncVoid5;
import org.ray.api.function.RayFuncVoid6;
import org.ray.api.options.ActorCreationOptions;
import org.ray.api.options.CallOptions;
import io.ray.api.function.PyActorClass;
import io.ray.api.function.PyRemoteFunction;
import io.ray.api.function.RayFunc0;
import io.ray.api.function.RayFunc1;
import io.ray.api.function.RayFunc2;
import io.ray.api.function.RayFunc3;
import io.ray.api.function.RayFunc4;
import io.ray.api.function.RayFunc5;
import io.ray.api.function.RayFunc6;
import io.ray.api.function.RayFuncVoid0;
import io.ray.api.function.RayFuncVoid1;
import io.ray.api.function.RayFuncVoid2;
import io.ray.api.function.RayFuncVoid3;
import io.ray.api.function.RayFuncVoid4;
import io.ray.api.function.RayFuncVoid5;
import io.ray.api.function.RayFuncVoid6;
import io.ray.api.options.ActorCreationOptions;
import io.ray.api.options.CallOptions;
/**
* This class provides type-safe interfaces for `Ray.call` and `Ray.createActor`.
@@ -1,6 +1,6 @@
package org.ray.api;
package io.ray.api;
import org.ray.api.id.ObjectId;
import io.ray.api.id.ObjectId;
/**
* Represents an object in the object store.
@@ -1,4 +1,4 @@
package org.ray.api;
package io.ray.api;
/**
* Handle of a Python actor.
@@ -1,4 +1,4 @@
package org.ray.api;
package io.ray.api;
import java.util.List;
@@ -1,4 +1,4 @@
package org.ray.api.exception;
package io.ray.api.exception;
/**
* Indicates that the actor died unexpectedly before finishing a task.
@@ -1,4 +1,4 @@
package org.ray.api.exception;
package io.ray.api.exception;
/**
* Base class of all ray exceptions.
@@ -1,4 +1,4 @@
package org.ray.api.exception;
package io.ray.api.exception;
/**
* Indicates that a task threw an exception during execution.
@@ -1,4 +1,4 @@
package org.ray.api.exception;
package io.ray.api.exception;
/**
* Indicates that the worker died unexpectedly while executing a task.
@@ -1,6 +1,6 @@
package org.ray.api.exception;
package io.ray.api.exception;
import org.ray.api.id.ObjectId;
import io.ray.api.id.ObjectId;
/**
* Indicates that an object is lost (either evicted or explicitly deleted) and cannot be
@@ -1,4 +1,4 @@
package org.ray.api.function;
package io.ray.api.function;
/**
* A class that represents a Python actor class.
@@ -1,4 +1,4 @@
package org.ray.api.function;
package io.ray.api.function;
/**
* A class that represents a method of a Python actor.
@@ -1,4 +1,4 @@
package org.ray.api.function;
package io.ray.api.function;
/**
* A class that represents a Python remote function.
@@ -1,4 +1,4 @@
package org.ray.api.function;
package io.ray.api.function;
import java.io.Serializable;
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 0 parameter.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 1 parameter.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 2 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 3 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 4 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 5 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 6 parameters.
@@ -1,4 +1,4 @@
package org.ray.api.function;
package io.ray.api.function;
/**
* Interface of all `RayFuncVoidX` classes.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 0 parameter.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 1 parameter.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 2 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 3 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 4 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 5 parameters.
@@ -1,6 +1,6 @@
// generated automatically, do not modify.
package org.ray.api.function;
package io.ray.api.function;
/**
* Functional interface for a remote function that has 6 parameters.
@@ -1,4 +1,4 @@
package org.ray.api.id;
package io.ray.api.id;
import java.io.Serializable;
import java.nio.ByteBuffer;
@@ -1,4 +1,4 @@
package org.ray.api.id;
package io.ray.api.id;
import java.io.Serializable;
import java.nio.ByteBuffer;
@@ -1,4 +1,4 @@
package org.ray.api.id;
package io.ray.api.id;
import java.io.Serializable;
import java.nio.ByteBuffer;
@@ -1,4 +1,4 @@
package org.ray.api.id;
package io.ray.api.id;
import java.io.Serializable;
import java.nio.ByteBuffer;
@@ -1,4 +1,4 @@
package org.ray.api.id;
package io.ray.api.id;
import java.io.Serializable;
import java.nio.ByteBuffer;
@@ -1,4 +1,4 @@
package org.ray.api.id;
package io.ray.api.id;
import java.io.Serializable;
import java.nio.ByteBuffer;
@@ -1,4 +1,4 @@
package org.ray.api.options;
package io.ray.api.options;
import java.util.HashMap;
import java.util.Map;
@@ -1,4 +1,4 @@
package org.ray.api.options;
package io.ray.api.options;
import java.util.HashMap;
import java.util.Map;
@@ -1,4 +1,4 @@
package org.ray.api.options;
package io.ray.api.options;
import java.util.HashMap;
import java.util.Map;
@@ -1,21 +1,21 @@
package org.ray.api.runtime;
package io.ray.api.runtime;
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.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.id.UniqueId;
import io.ray.api.options.ActorCreationOptions;
import io.ray.api.options.CallOptions;
import io.ray.api.runtimecontext.RuntimeContext;
import java.util.List;
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.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.id.UniqueId;
import org.ray.api.options.ActorCreationOptions;
import org.ray.api.options.CallOptions;
import org.ray.api.runtimecontext.RuntimeContext;
/**
* Base interface of a Ray runtime.
@@ -1,4 +1,4 @@
package org.ray.api.runtime;
package io.ray.api.runtime;
/**
* A factory that produces a RayRuntime instance.
@@ -1,7 +1,7 @@
package org.ray.api.runtimecontext;
package io.ray.api.runtimecontext;
import io.ray.api.id.UniqueId;
import java.util.Map;
import org.ray.api.id.UniqueId;
/**
* A class that represents the information of a node.
@@ -1,8 +1,8 @@
package org.ray.api.runtimecontext;
package io.ray.api.runtimecontext;
import io.ray.api.id.ActorId;
import io.ray.api.id.JobId;
import java.util.List;
import org.ray.api.id.ActorId;
import org.ray.api.id.JobId;
/**
* A class used for getting information of Ray runtime.
+1 -1
View File
@@ -13,5 +13,5 @@
<suppress checks=".*" files="RayCall.java"/>
<suppress checks=".*" files="ActorCall.java"/>
<!-- suppress check for flatbuffer-generated files. -->
<suppress checks=".*" files="org[\\/]ray[\\/]runtime[\\/]generated[\\/]" />
<suppress checks=".*" files="io[\\/]ray[\\/]runtime[\\/]generated[\\/]" />
</suppressions>
@@ -13,7 +13,7 @@ RAY_HOME: The root directory of Ray project.
"""
# constants declarations
PACKAGE_DECLARATION = "package org.ray.runtime.generated;"
PACKAGE_DECLARATION = "package io.ray.runtime.generated;"
def add_package(file):
@@ -41,5 +41,5 @@ def add_package_declarations(generated_root_path):
if __name__ == "__main__":
ray_home = sys.argv[1]
root_path = os.path.join(
ray_home, "java/runtime/src/main/java/org/ray/runtime/generated")
ray_home, "java/runtime/src/main/java/io/ray/runtime/generated")
add_package_declarations(root_path)
+1 -1
View File
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.ray</groupId>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>0.1-SNAPSHOT</version>
<modules>
+2 -2
View File
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.ray</groupId>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.ray</groupId>
<groupId>io.ray</groupId>
<artifactId>ray-api</artifactId>
<version>${project.version}</version>
</dependency>
+2 -2
View File
@@ -4,7 +4,7 @@
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.ray</groupId>
<groupId>io.ray</groupId>
<artifactId>ray-superpom</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
@@ -18,7 +18,7 @@
<dependencies>
<dependency>
<groupId>org.ray</groupId>
<groupId>io.ray</groupId>
<artifactId>ray-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -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);
}
@@ -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;
@@ -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;
@@ -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;
@@ -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.
@@ -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
@@ -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.
@@ -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
@@ -1,4 +1,4 @@
package org.ray.runtime.actor;
package io.ray.runtime.actor;
import java.io.IOException;
import org.nustaq.serialization.FSTBasicObjectSerializer;
@@ -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.
@@ -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.
@@ -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;
@@ -1,4 +1,4 @@
package org.ray.runtime.config;
package io.ray.runtime.config;
public enum RunMode {
@@ -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.
@@ -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.
@@ -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 {
@@ -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.
@@ -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.
@@ -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;
@@ -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.
@@ -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.
@@ -1,4 +1,4 @@
package org.ray.runtime.functionmanager;
package io.ray.runtime.functionmanager;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
@@ -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;
@@ -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.
@@ -1,4 +1,4 @@
package org.ray.runtime.gcs;
package io.ray.runtime.gcs;
import com.google.common.base.Strings;
import java.util.List;
@@ -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;
@@ -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;
@@ -1,4 +1,4 @@
package org.ray.runtime.object;
package io.ray.runtime.object;
import com.google.common.base.Preconditions;
@@ -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
@@ -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.
@@ -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}.
*/
@@ -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";
@@ -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.
@@ -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;
@@ -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
@@ -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;
@@ -1,4 +1,4 @@
package org.ray.runtime.serializer;
package io.ray.runtime.serializer;
import org.apache.commons.lang3.tuple.Pair;
@@ -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.
@@ -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.
@@ -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 {
@@ -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) {
@@ -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;
@@ -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.

Some files were not shown because too many files have changed in this diff Show More