mirror of
https://github.com/wassname/ray.git
synced 2026-06-27 16:46:37 +08:00
Bazel fixes (#9519)
This commit is contained in:
mehrdadn
+56
-59
@@ -1,7 +1,6 @@
|
||||
# Bazel build
|
||||
# C/C++ documentation: https://docs.bazel.build/versions/master/be/c-cpp.html
|
||||
|
||||
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
|
||||
load("@rules_proto//proto:defs.bzl", "proto_library")
|
||||
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library", "cc_test")
|
||||
load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
|
||||
@@ -151,6 +150,7 @@ cc_library(
|
||||
"src/ray/rpc/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":ray_common",
|
||||
"@boost//:asio",
|
||||
@@ -174,6 +174,7 @@ cc_library(
|
||||
"src/ray/rpc/node_manager/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":grpc_common_lib",
|
||||
":node_manager_cc_grpc",
|
||||
@@ -199,6 +200,7 @@ cc_library(
|
||||
"src/ray/rpc/gcs_server/gcs_rpc_client.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs_service_cc_grpc",
|
||||
":grpc_common_lib",
|
||||
@@ -223,6 +225,7 @@ cc_library(
|
||||
"src/ray/rpc/object_manager/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":grpc_common_lib",
|
||||
":object_manager_cc_grpc",
|
||||
@@ -247,6 +250,7 @@ cc_library(
|
||||
"src/ray/rpc/worker/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":grpc_common_lib",
|
||||
":ray_common",
|
||||
@@ -272,6 +276,7 @@ cc_library(
|
||||
"src/ray/rpc/metrics_agent_client.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":grpc_common_lib",
|
||||
":ray_common",
|
||||
@@ -349,22 +354,6 @@ cc_library(
|
||||
],
|
||||
)
|
||||
|
||||
copy_file(
|
||||
name = "copy_jni_h",
|
||||
src = "@bazel_tools//tools/jdk:jni_header",
|
||||
out = "jni.h",
|
||||
)
|
||||
|
||||
copy_file(
|
||||
name = "copy_jni_md_h",
|
||||
src = select({
|
||||
"@bazel_tools//src/conditions:windows": "@bazel_tools//tools/jdk:jni_md_header-windows",
|
||||
"@bazel_tools//src/conditions:darwin": "@bazel_tools//tools/jdk:jni_md_header-darwin",
|
||||
"//conditions:default": "@bazel_tools//tools/jdk:jni_md_header-linux",
|
||||
}),
|
||||
out = "jni_md.h",
|
||||
)
|
||||
|
||||
cc_library(
|
||||
name = "ae",
|
||||
srcs = [
|
||||
@@ -440,7 +429,6 @@ flatbuffer_cc_library(
|
||||
name = "plasma_fbs",
|
||||
srcs = ["src/ray/object_manager/plasma/plasma.fbs"],
|
||||
flatc_args = FLATC_ARGS,
|
||||
includes = ["src/ray/object_manager/format/object_manager.fbs"],
|
||||
out_prefix = "src/ray/object_manager/plasma/",
|
||||
)
|
||||
|
||||
@@ -462,9 +450,7 @@ cc_library(
|
||||
],
|
||||
),
|
||||
copts = COPTS,
|
||||
includes = [
|
||||
"@boost//:asio",
|
||||
],
|
||||
strip_include_prefix = "src",
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
":common_cc_proto",
|
||||
@@ -507,6 +493,7 @@ cc_library(
|
||||
],
|
||||
),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs",
|
||||
":ray_common",
|
||||
@@ -551,6 +538,7 @@ cc_library(
|
||||
],
|
||||
),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs",
|
||||
":gcs_pub_sub_lib",
|
||||
@@ -591,9 +579,6 @@ cc_library(
|
||||
],
|
||||
),
|
||||
copts = COPTS,
|
||||
includes = [
|
||||
"src",
|
||||
],
|
||||
linkopts = select({
|
||||
"@bazel_tools//src/conditions:windows": [
|
||||
],
|
||||
@@ -601,6 +586,7 @@ cc_library(
|
||||
"-lpthread",
|
||||
],
|
||||
}),
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":ray_util",
|
||||
":reporter_rpc",
|
||||
@@ -641,6 +627,7 @@ cc_library(
|
||||
"-lpthread",
|
||||
],
|
||||
}),
|
||||
strip_include_prefix = "src",
|
||||
visibility = ["//streaming:__subpackages__"],
|
||||
deps = [
|
||||
":common_cc_proto",
|
||||
@@ -683,6 +670,7 @@ cc_library(
|
||||
"-lpthread",
|
||||
],
|
||||
}),
|
||||
strip_include_prefix = "src",
|
||||
visibility = ["//streaming:__subpackages__"],
|
||||
deps = [
|
||||
":gcs_cc_proto",
|
||||
@@ -716,6 +704,7 @@ cc_library(
|
||||
"src/ray/core_worker/transport/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
":gcs",
|
||||
@@ -739,6 +728,7 @@ cc_library(
|
||||
"src/ray/core_worker/test/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":core_worker_lib",
|
||||
],
|
||||
@@ -1035,6 +1025,7 @@ cc_library(
|
||||
"src/ray/gcs/test/gcs_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs",
|
||||
":gcs_service_rpc",
|
||||
@@ -1064,15 +1055,24 @@ cc_test(
|
||||
],
|
||||
)
|
||||
|
||||
cc_library(
|
||||
name = "gcs_server_test_util",
|
||||
hdrs = [
|
||||
"src/ray/gcs/gcs_server/test/gcs_server_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
)
|
||||
|
||||
cc_test(
|
||||
name = "gcs_node_manager_test",
|
||||
srcs = [
|
||||
"src/ray/gcs/gcs_server/test/gcs_node_manager_test.cc",
|
||||
"src/ray/gcs/gcs_server/test/gcs_server_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
deps = [
|
||||
":gcs_server_lib",
|
||||
":gcs_server_test_util",
|
||||
":gcs_test_util_lib",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
@@ -1082,11 +1082,11 @@ cc_test(
|
||||
name = "gcs_placement_group_manager_test",
|
||||
srcs = [
|
||||
"src/ray/gcs/gcs_server/test/gcs_placement_group_manager_test.cc",
|
||||
"src/ray/gcs/gcs_server/test/gcs_server_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
deps = [
|
||||
":gcs_server_lib",
|
||||
":gcs_server_test_util",
|
||||
":gcs_test_util_lib",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
@@ -1096,11 +1096,11 @@ cc_test(
|
||||
name = "gcs_placement_group_scheduler_test",
|
||||
srcs = [
|
||||
"src/ray/gcs/gcs_server/test/gcs_placement_group_scheduler_test.cc",
|
||||
"src/ray/gcs/gcs_server/test/gcs_server_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
deps = [
|
||||
":gcs_server_lib",
|
||||
":gcs_server_test_util",
|
||||
":gcs_test_util_lib",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
@@ -1110,11 +1110,11 @@ cc_test(
|
||||
name = "gcs_actor_scheduler_test",
|
||||
srcs = [
|
||||
"src/ray/gcs/gcs_server/test/gcs_actor_scheduler_test.cc",
|
||||
"src/ray/gcs/gcs_server/test/gcs_server_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
deps = [
|
||||
":gcs_server_lib",
|
||||
":gcs_server_test_util",
|
||||
":gcs_test_util_lib",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
@@ -1124,11 +1124,11 @@ cc_test(
|
||||
name = "gcs_actor_manager_test",
|
||||
srcs = [
|
||||
"src/ray/gcs/gcs_server/test/gcs_actor_manager_test.cc",
|
||||
"src/ray/gcs/gcs_server/test/gcs_server_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
deps = [
|
||||
":gcs_server_lib",
|
||||
":gcs_server_test_util",
|
||||
":gcs_test_util_lib",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
@@ -1147,6 +1147,7 @@ cc_library(
|
||||
],
|
||||
),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs",
|
||||
":gcs_in_memory_store_client",
|
||||
@@ -1161,6 +1162,7 @@ cc_library(
|
||||
"src/ray/gcs/gcs_server/test/gcs_table_storage_test_base.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
"redis_store_client",
|
||||
],
|
||||
@@ -1219,6 +1221,7 @@ cc_library(
|
||||
],
|
||||
),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs",
|
||||
":gcs_pub_sub_lib",
|
||||
@@ -1240,6 +1243,7 @@ cc_library(
|
||||
],
|
||||
),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":service_based_gcs_client_lib",
|
||||
],
|
||||
@@ -1298,11 +1302,11 @@ cc_test(
|
||||
name = "gcs_object_manager_test",
|
||||
srcs = [
|
||||
"src/ray/gcs/gcs_server/test/gcs_object_manager_test.cc",
|
||||
"src/ray/gcs/gcs_server/test/gcs_server_test_util.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
deps = [
|
||||
":gcs_server_lib",
|
||||
":gcs_server_test_util",
|
||||
":gcs_test_util_lib",
|
||||
"@com_google_googletest//:gtest_main",
|
||||
],
|
||||
@@ -1319,9 +1323,7 @@ cc_library(
|
||||
"src/ray/object_manager/notification/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
includes = [
|
||||
"src",
|
||||
],
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs",
|
||||
":object_manager_fbs",
|
||||
@@ -1393,9 +1395,7 @@ cc_library(
|
||||
"src/ray/util/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
includes = [
|
||||
"src",
|
||||
],
|
||||
strip_include_prefix = "src",
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
":sha256",
|
||||
@@ -1447,7 +1447,7 @@ cc_library(
|
||||
"src/ray/thirdparty/sha256.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
includes = ["src/ray/thirdparty"],
|
||||
strip_include_prefix = "src",
|
||||
)
|
||||
|
||||
alias(
|
||||
@@ -1470,6 +1470,7 @@ cc_library(
|
||||
"src/ray/gcs/redis_context.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":hiredis",
|
||||
":ray_common",
|
||||
@@ -1490,6 +1491,7 @@ cc_library(
|
||||
"src/ray/gcs/store_client/store_client.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
"redis_client",
|
||||
],
|
||||
@@ -1506,6 +1508,7 @@ cc_library(
|
||||
"src/ray/gcs/store_client/store_client.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":ray_common",
|
||||
":ray_util",
|
||||
@@ -1518,6 +1521,7 @@ cc_library(
|
||||
"src/ray/gcs/store_client/test/store_client_test_base.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
"redis_store_client",
|
||||
],
|
||||
@@ -1569,6 +1573,7 @@ cc_library(
|
||||
"src/ray/gcs/*.h",
|
||||
]),
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
deps = [
|
||||
":gcs_cc_proto",
|
||||
":hiredis",
|
||||
@@ -1732,7 +1737,7 @@ flatbuffer_cc_library(
|
||||
name = "node_manager_fbs",
|
||||
srcs = ["src/ray/raylet/format/node_manager.fbs"],
|
||||
flatc_args = FLATC_ARGS,
|
||||
out_prefix = "src/ray/raylet/format/",
|
||||
out_prefix = "ray/raylet/format/",
|
||||
)
|
||||
|
||||
flatbuffer_cc_library(
|
||||
@@ -1808,25 +1813,8 @@ cc_binary(
|
||||
srcs = glob([
|
||||
"src/ray/core_worker/lib/java/*.h",
|
||||
"src/ray/core_worker/lib/java/*.cc",
|
||||
]) + [
|
||||
"@bazel_tools//tools/jdk:jni_header",
|
||||
] + select({
|
||||
"@bazel_tools//src/conditions:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
|
||||
"@bazel_tools//src/conditions:darwin": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
|
||||
"//conditions:default": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
|
||||
}) + [
|
||||
":jni.h",
|
||||
":jni_md.h",
|
||||
],
|
||||
]),
|
||||
copts = COPTS,
|
||||
includes = [
|
||||
"src",
|
||||
"external/bazel_tools/tools/jdk/include",
|
||||
] + select({
|
||||
"@bazel_tools//src/conditions:windows": ["external/bazel_tools/tools/jdk/include/windows"],
|
||||
"@bazel_tools//src/conditions:darwin": ["external/bazel_tools/tools/jdk/include/darwin"],
|
||||
"//conditions:default": ["external/bazel_tools/tools/jdk/include/linux"],
|
||||
}),
|
||||
# Export ray ABI symbols, which can then be used by libstreaming_java.so. see `//:_raylet`
|
||||
linkopts = select({
|
||||
"@bazel_tools//src/conditions:darwin": [
|
||||
@@ -1845,7 +1833,7 @@ cc_binary(
|
||||
"//:global_state_accessor_lib",
|
||||
"//:src/ray/ray_exported_symbols.lds",
|
||||
"//:src/ray/ray_version_script.lds",
|
||||
"//streaming:jni",
|
||||
"@bazel_tools//tools/jdk:jni",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -1912,12 +1900,20 @@ alias(
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
cc_library(
|
||||
name = "ray_redis_module",
|
||||
hdrs = [
|
||||
"src/ray/gcs/redis_module/redis_string.h",
|
||||
"src/ray/gcs/redis_module/redismodule.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
strip_include_prefix = "src",
|
||||
)
|
||||
|
||||
cc_binary(
|
||||
name = "libray_redis_module.so",
|
||||
srcs = [
|
||||
"src/ray/gcs/redis_module/ray_redis_module.cc",
|
||||
"src/ray/gcs/redis_module/redis_string.h",
|
||||
"src/ray/gcs/redis_module/redismodule.h",
|
||||
],
|
||||
copts = COPTS,
|
||||
linkshared = 1,
|
||||
@@ -1926,6 +1922,7 @@ cc_binary(
|
||||
deps = [
|
||||
":gcs_cc_proto",
|
||||
":ray_common",
|
||||
":ray_redis_module",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
+12
-39
@@ -1,33 +1,16 @@
|
||||
filegroup(
|
||||
name = "c_headers",
|
||||
srcs = glob([
|
||||
"include/*.h",
|
||||
# This library is for internal use, because the library assumes a
|
||||
# different include prefix for itself than external libraries do.
|
||||
cc_library(
|
||||
name = "_msgpack",
|
||||
hdrs = glob([
|
||||
"include/**/*.h",
|
||||
"include/**/**/*.h",
|
||||
"include/**/**/**/*.h",
|
||||
],
|
||||
exclude = [
|
||||
"include/msgpack.h",
|
||||
],
|
||||
),
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "cxx_headers",
|
||||
srcs = glob([
|
||||
"include/*.hpp",
|
||||
"include/**/*.hpp",
|
||||
"include/**/**/*.hpp",
|
||||
"include/**/**/**/*.hpp",
|
||||
],
|
||||
exclude = [
|
||||
"include/msgpack.hpp",
|
||||
],
|
||||
),
|
||||
]),
|
||||
strip_include_prefix = "include",
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "source_files",
|
||||
cc_library(
|
||||
name = "msgpack",
|
||||
srcs = [
|
||||
"src/objectc.c",
|
||||
"src/unpack.c",
|
||||
@@ -35,25 +18,15 @@ filegroup(
|
||||
"src/vrefbuffer.c",
|
||||
"src/zone.c",
|
||||
],
|
||||
)
|
||||
|
||||
cc_library(
|
||||
name = "msgpack",
|
||||
srcs = [
|
||||
":c_headers",
|
||||
":cxx_headers",
|
||||
":source_files",
|
||||
],
|
||||
hdrs = [
|
||||
"include/msgpack.h",
|
||||
"include/msgpack.hpp",
|
||||
],
|
||||
includes = [
|
||||
"include",
|
||||
],
|
||||
strip_include_prefix = "include",
|
||||
copts = [
|
||||
#"-std=c++11",
|
||||
],
|
||||
deps = [
|
||||
":_msgpack",
|
||||
],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
+2
-1
@@ -35,6 +35,8 @@ cc_library(
|
||||
name = "_hiredis",
|
||||
hdrs = [
|
||||
"deps/hiredis/dict.c",
|
||||
"deps/hiredis/dict.h",
|
||||
"deps/hiredis/fmacros.h",
|
||||
],
|
||||
strip_include_prefix = "deps/hiredis",
|
||||
)
|
||||
@@ -55,7 +57,6 @@ cc_library(
|
||||
"deps/hiredis/*.h",
|
||||
"deps/hiredis/adapters/*.h",
|
||||
]),
|
||||
includes = ["deps/hiredis"],
|
||||
strip_include_prefix = "deps",
|
||||
deps = [
|
||||
":_hiredis",
|
||||
|
||||
+7
-12
@@ -1,4 +1,5 @@
|
||||
load("//bazel:ray.bzl", "define_java_module")
|
||||
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
|
||||
load("@rules_proto_grpc//java:defs.bzl", "java_proto_compile")
|
||||
|
||||
exports_files([
|
||||
@@ -144,24 +145,18 @@ filegroup(
|
||||
|
||||
# plasma_store_server binary should be located in jar root path
|
||||
# and keep in sync with mvn resource
|
||||
genrule(
|
||||
copy_file(
|
||||
name = "cp_plasma_store_server",
|
||||
srcs = [
|
||||
"//:plasma_store_server",
|
||||
],
|
||||
outs = ["plasma_store_server"],
|
||||
cmd = """
|
||||
cp -f $(location //:plasma_store_server) $@
|
||||
""",
|
||||
src = "//:plasma_store_server",
|
||||
out = "plasma_store_server",
|
||||
)
|
||||
|
||||
# `//:redis-server`'s full path is `external/com_github_antirez_redis/redis-server`,
|
||||
# This rule removes the prefix, and only keeps `redis-server`.
|
||||
genrule(
|
||||
copy_file(
|
||||
name = "redis-server-without-prefix",
|
||||
srcs = ["//:redis-server"],
|
||||
outs = ["redis-server"],
|
||||
cmd = "cp $< $@",
|
||||
src = "//:redis-server",
|
||||
out = "redis-server",
|
||||
)
|
||||
|
||||
filegroup(
|
||||
|
||||
@@ -135,7 +135,7 @@ cdef extern from "ray/common/id.h" namespace "ray" nogil:
|
||||
int parent_task_counter)
|
||||
|
||||
|
||||
cdef extern from "ray/protobuf/common.pb.h" nogil:
|
||||
cdef extern from "src/ray/protobuf/common.pb.h" nogil:
|
||||
cdef cppclass CLanguage "Language":
|
||||
pass
|
||||
cdef cppclass CWorkerType "ray::WorkerType":
|
||||
@@ -150,16 +150,16 @@ cdef extern from "ray/protobuf/common.pb.h" nogil:
|
||||
|
||||
# This is a workaround for C++ enum class since Cython has no corresponding
|
||||
# representation.
|
||||
cdef extern from "ray/protobuf/common.pb.h" nogil:
|
||||
cdef extern from "src/ray/protobuf/common.pb.h" nogil:
|
||||
cdef CLanguage LANGUAGE_PYTHON "Language::PYTHON"
|
||||
cdef CLanguage LANGUAGE_CPP "Language::CPP"
|
||||
cdef CLanguage LANGUAGE_JAVA "Language::JAVA"
|
||||
|
||||
cdef extern from "ray/protobuf/common.pb.h" nogil:
|
||||
cdef extern from "src/ray/protobuf/common.pb.h" nogil:
|
||||
cdef CWorkerType WORKER_TYPE_WORKER "ray::WorkerType::WORKER"
|
||||
cdef CWorkerType WORKER_TYPE_DRIVER "ray::WorkerType::DRIVER"
|
||||
|
||||
cdef extern from "ray/protobuf/common.pb.h" nogil:
|
||||
cdef extern from "src/ray/protobuf/common.pb.h" nogil:
|
||||
cdef CTaskType TASK_TYPE_NORMAL_TASK "ray::TaskType::NORMAL_TASK"
|
||||
cdef CTaskType TASK_TYPE_ACTOR_CREATION_TASK "ray::TaskType::ACTOR_CREATION_TASK" # noqa: E501
|
||||
cdef CTaskType TASK_TYPE_ACTOR_TASK "ray::TaskType::ACTOR_TASK"
|
||||
|
||||
@@ -16,7 +16,7 @@ from ray.includes.unique_ids cimport (
|
||||
CTaskID,
|
||||
)
|
||||
|
||||
cdef extern from "ray/protobuf/common.pb.h" nogil:
|
||||
cdef extern from "src/ray/protobuf/common.pb.h" nogil:
|
||||
cdef cppclass CFunctionDescriptorType \
|
||||
"ray::FunctionDescriptorType":
|
||||
pass
|
||||
|
||||
@@ -24,7 +24,7 @@ cdef extern from "google/protobuf/repeated_field.h" nogil:
|
||||
cdef cppclass RepeatedField[Element]:
|
||||
const Element* data() const
|
||||
|
||||
cdef extern from "ray/protobuf/serialization.pb.h" nogil:
|
||||
cdef extern from "src/ray/protobuf/serialization.pb.h" nogil:
|
||||
cdef cppclass CPythonBuffer "ray::serialization::PythonBuffer":
|
||||
void set_address(uint64_t value)
|
||||
uint64_t address() const
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "bundle_spec.h"
|
||||
#include "ray/common/bundle_spec.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
void BundleSpecification::ComputeResources() {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "client_connection.h"
|
||||
#include "ray/common/client_connection.h"
|
||||
|
||||
#include <boost/asio/buffer.hpp>
|
||||
#include <boost/asio/generic/stream_protocol.hpp>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "common_protocol.h"
|
||||
#include "ray/common/common_protocol.h"
|
||||
|
||||
#include "ray/util/logging.h"
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <string>
|
||||
|
||||
#include "ray/common/grpc_util.h"
|
||||
#include "ray/protobuf/common.pb.h"
|
||||
#include "src/ray/protobuf/common.pb.h"
|
||||
|
||||
namespace ray {
|
||||
/// See `common.proto` for definition of `FunctionDescriptor` oneof type.
|
||||
@@ -25,6 +25,8 @@ using FunctionDescriptorType = rpc::FunctionDescriptor::FunctionDescriptorCase;
|
||||
/// Wrap a protobuf message.
|
||||
class FunctionDescriptorInterface : public MessageWrapper<rpc::FunctionDescriptor> {
|
||||
public:
|
||||
virtual ~FunctionDescriptorInterface() {}
|
||||
|
||||
/// Construct an empty FunctionDescriptor.
|
||||
FunctionDescriptorInterface() : MessageWrapper() {}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "status.h"
|
||||
#include "ray/common/status.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
+3
-3
@@ -400,7 +400,7 @@ std::ostream &operator<<(std::ostream &os, const PlacementGroupID &id);
|
||||
} \
|
||||
};
|
||||
|
||||
#include "id_def.h"
|
||||
#include "ray/common/id_def.h"
|
||||
|
||||
#undef DEFINE_UNIQUE_ID
|
||||
|
||||
@@ -482,7 +482,7 @@ std::string BaseID<T>::Hex() const {
|
||||
constexpr char hex[] = "0123456789abcdef";
|
||||
const uint8_t *id = Data();
|
||||
std::string result;
|
||||
for (int i = 0; i < T::Size(); i++) {
|
||||
for (size_t i = 0; i < T::Size(); i++) {
|
||||
unsigned int val = id[i];
|
||||
result.push_back(hex[val >> 4]);
|
||||
result.push_back(hex[val & 0xf]);
|
||||
@@ -510,7 +510,7 @@ DEFINE_UNIQUE_ID(ActorID);
|
||||
DEFINE_UNIQUE_ID(TaskID);
|
||||
DEFINE_UNIQUE_ID(ObjectID);
|
||||
DEFINE_UNIQUE_ID(PlacementGroupID);
|
||||
#include "id_def.h"
|
||||
#include "ray/common/id_def.h"
|
||||
|
||||
#undef DEFINE_UNIQUE_ID
|
||||
} // namespace std
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "network_util.h"
|
||||
#include "ray/common/network_util.h"
|
||||
|
||||
#include "ray/util/logging.h"
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <boost/date_time/posix_time/posix_time_types.hpp>
|
||||
#include <boost/system/error_code.hpp>
|
||||
|
||||
#include "constants.h"
|
||||
#include "ray/common/constants.h"
|
||||
|
||||
using boost::asio::deadline_timer;
|
||||
using boost::asio::io_service;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "ray/common/bundle_spec.h"
|
||||
#include "ray/common/grpc_util.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/protobuf/common.pb.h"
|
||||
#include "src/ray/protobuf/common.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
@@ -71,7 +71,7 @@ class PlacementGroupSpecBuilder {
|
||||
message_->set_placement_group_id(placement_group_id.Binary());
|
||||
message_->set_name(name);
|
||||
message_->set_strategy(strategy);
|
||||
for (int i = 0; i < bundles.size(); i++) {
|
||||
for (size_t i = 0; i < bundles.size(); i++) {
|
||||
auto resources = bundles[i];
|
||||
auto message_bundle = message_->add_bundles();
|
||||
auto mutable_bundle_id = message_bundle->mutable_bundle_id();
|
||||
|
||||
@@ -37,7 +37,7 @@ class RayConfig {
|
||||
public: \
|
||||
inline type name() { return name##_; }
|
||||
|
||||
#include "ray_config_def.h"
|
||||
#include "ray/common/ray_config_def.h"
|
||||
/// -------------------------------------------------------------------------
|
||||
#undef RAY_CONFIG
|
||||
|
||||
@@ -71,7 +71,7 @@ class RayConfig {
|
||||
for (auto const &pair : config_map) {
|
||||
// We use a big chain of if else statements because C++ doesn't allow
|
||||
// switch statements on strings.
|
||||
#include "ray_config_def.h"
|
||||
#include "ray/common/ray_config_def.h"
|
||||
RAY_LOG(FATAL) << "Received unexpected config parameter " << pair.first;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
#include "absl/types/optional.h"
|
||||
#include "ray/common/buffer.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "ray/util/logging.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "scheduling_resources.h"
|
||||
#include "ray/common/task/scheduling_resources.h"
|
||||
|
||||
#include <cmath>
|
||||
#include <sstream>
|
||||
|
||||
@@ -12,11 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/common/task/scheduling_resources.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "scheduling_resources.h"
|
||||
|
||||
namespace ray {
|
||||
class SchedulingResourcesTest : public ::testing::Test {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include <sstream>
|
||||
#include "ray/common/task/task.h"
|
||||
|
||||
#include "task.h"
|
||||
#include <sstream>
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "ray/protobuf/common.pb.h"
|
||||
#include "src/ray/protobuf/common.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "ray/common/buffer.h"
|
||||
#include "ray/common/ray_object.h"
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/protobuf/common.pb.h"
|
||||
#include "src/ray/protobuf/common.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
#include "ray/common/buffer.h"
|
||||
#include "ray/common/ray_object.h"
|
||||
#include "ray/common/test_util.h"
|
||||
#include "ray/util/filesystem.h"
|
||||
#include "ray/util/logging.h"
|
||||
#include "ray/util/process.h"
|
||||
#include "ray/util/util.h"
|
||||
#include "test_util.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -16,15 +16,14 @@
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#include <boost/optional.hpp>
|
||||
#include <functional>
|
||||
#include <string>
|
||||
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/protobuf/common.pb.h"
|
||||
#include "ray/util/util.h"
|
||||
#include "src/ray/protobuf/common.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
#include "ray/core_worker/common.h"
|
||||
#include "ray/core_worker/context.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/protobuf/core_worker.pb.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/core_worker.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ struct PlacementGroupCreationOptions {
|
||||
PlacementGroupCreationOptions(
|
||||
const std::string &name, PlacementStrategy strategy,
|
||||
const std::vector<std::unordered_map<std::string, double>> &bundles)
|
||||
: name(name), strategy(strategy), bundles(bundles) {}
|
||||
: strategy(strategy), bundles(bundles), name(name) {}
|
||||
|
||||
/// The strategy to place the bundle in Placement Group.
|
||||
const PlacementStrategy strategy = rpc::PACK;
|
||||
|
||||
@@ -14,8 +14,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/util/logging.h>
|
||||
#include <boost/fiber/all.hpp>
|
||||
|
||||
#include "ray/util/logging.h"
|
||||
namespace ray {
|
||||
|
||||
/// Used by async actor mode. The fiber event will be used
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/core_worker/store_provider/memory_store/memory_store.h"
|
||||
#include "ray/protobuf/core_worker.pb.h"
|
||||
#include "ray/rpc/worker/core_worker_client.h"
|
||||
#include "src/ray/protobuf/core_worker.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/io_ray_runtime_RayNativeRuntime.h"
|
||||
#include "io_ray_runtime_RayNativeRuntime.h"
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/core_worker/actor_handle.h"
|
||||
#include "ray/core_worker/core_worker.h"
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
|
||||
thread_local JNIEnv *local_env = nullptr;
|
||||
jobject java_task_executor = nullptr;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/io_ray_runtime_actor_NativeActorHandle.h"
|
||||
#include "io_ray_runtime_actor_NativeActorHandle.h"
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "ray/core_worker/actor_handle.h"
|
||||
#include "ray/core_worker/common.h"
|
||||
#include "ray/core_worker/core_worker.h"
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/io_ray_runtime_context_NativeWorkerContext.h"
|
||||
#include "io_ray_runtime_context_NativeWorkerContext.h"
|
||||
#include <jni.h>
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/core_worker/context.h"
|
||||
#include "ray/core_worker/core_worker.h"
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/io_ray_runtime_gcs_GlobalStateAccessor.h"
|
||||
#include "io_ray_runtime_gcs_GlobalStateAccessor.h"
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
#include "ray/core_worker/common.h"
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
#include "ray/gcs/gcs_client/global_state_accessor.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/io_ray_runtime_object_NativeObjectStore.h"
|
||||
#include "io_ray_runtime_object_NativeObjectStore.h"
|
||||
#include <jni.h>
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/core_worker/common.h"
|
||||
#include "ray/core_worker/core_worker.h"
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/io_ray_runtime_task_NativeTaskExecutor.h"
|
||||
#include "io_ray_runtime_task_NativeTaskExecutor.h"
|
||||
#include <jni.h>
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/core_worker/common.h"
|
||||
#include "ray/core_worker/core_worker.h"
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
#include "ray/raylet_client/raylet_client.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/io_ray_runtime_task_NativeTaskSubmitter.h"
|
||||
#include "io_ray_runtime_task_NativeTaskSubmitter.h"
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/core_worker/common.h"
|
||||
#include "ray/core_worker/core_worker.h"
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
|
||||
/// Store C++ instances of ray function in the cache to avoid unnessesary JNI operations.
|
||||
thread_local std::unordered_map<jint, std::vector<std::pair<jobject, ray::RayFunction>>>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/core_worker/lib/java/jni_utils.h"
|
||||
#include "jni_utils.h"
|
||||
|
||||
jclass java_boolean_class;
|
||||
jmethodID java_boolean_init;
|
||||
|
||||
@@ -46,12 +46,12 @@ class ObjectRecoveryManager {
|
||||
std::function<void(const ObjectID &object_id, bool pin_object)>
|
||||
reconstruction_failure_callback,
|
||||
bool lineage_reconstruction_enabled)
|
||||
: rpc_address_(rpc_address),
|
||||
: task_resubmitter_(task_resubmitter),
|
||||
reference_counter_(reference_counter),
|
||||
rpc_address_(rpc_address),
|
||||
client_factory_(client_factory),
|
||||
local_object_pinning_client_(local_object_pinning_client),
|
||||
object_lookup_(object_lookup),
|
||||
task_resubmitter_(task_resubmitter),
|
||||
reference_counter_(reference_counter),
|
||||
in_memory_store_(in_memory_store),
|
||||
reconstruction_failure_callback_(reconstruction_failure_callback),
|
||||
lineage_reconstruction_enabled_(lineage_reconstruction_enabled) {}
|
||||
|
||||
@@ -21,10 +21,10 @@
|
||||
#include "absl/container/flat_hash_set.h"
|
||||
#include "absl/synchronization/mutex.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/protobuf/common.pb.h"
|
||||
#include "ray/rpc/grpc_server.h"
|
||||
#include "ray/rpc/worker/core_worker_client.h"
|
||||
#include "ray/util/logging.h"
|
||||
#include "src/ray/protobuf/common.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
@@ -370,8 +370,8 @@ class ReferenceCounter : public ReferenceCounterInterface {
|
||||
object_size(object_size),
|
||||
owned_by_us(true),
|
||||
owner_address(owner_address),
|
||||
is_reconstructable(is_reconstructable),
|
||||
pinned_at_raylet_id(pinned_at_raylet_id) {}
|
||||
pinned_at_raylet_id(pinned_at_raylet_id),
|
||||
is_reconstructable(is_reconstructable) {}
|
||||
|
||||
/// Constructor from a protobuf. This is assumed to be a message from
|
||||
/// another process, so the object defaults to not being owned by us.
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "ray/common/ray_config.h"
|
||||
#include "ray/core_worker/context.h"
|
||||
#include "ray/core_worker/core_worker.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
#include "ray/common/task/task.h"
|
||||
#include "ray/core_worker/actor_reporter.h"
|
||||
#include "ray/core_worker/store_provider/memory_store/memory_store.h"
|
||||
#include "ray/protobuf/core_worker.pb.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/core_worker.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -31,10 +31,10 @@
|
||||
#include "ray/core_worker/context.h"
|
||||
#include "ray/core_worker/store_provider/memory_store/memory_store.h"
|
||||
#include "ray/core_worker/transport/direct_actor_transport.h"
|
||||
#include "ray/protobuf/core_worker.pb.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "ray/raylet_client/raylet_client.h"
|
||||
#include "ray/util/filesystem.h"
|
||||
#include "src/ray/protobuf/core_worker.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
||||
@@ -14,6 +14,12 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef __clang__
|
||||
// TODO(mehrdadn): Remove this when the warnings are addressed
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic warning "-Wunused-result"
|
||||
#endif
|
||||
|
||||
#include <boost/asio/thread_pool.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
#include <list>
|
||||
@@ -332,11 +338,11 @@ class SchedulingQueue {
|
||||
SchedulingQueue(boost::asio::io_service &main_io_service, DependencyWaiter &waiter,
|
||||
WorkerContext &worker_context,
|
||||
int64_t reorder_wait_seconds = kMaxReorderWaitSeconds)
|
||||
: wait_timer_(main_io_service),
|
||||
waiter_(waiter),
|
||||
: worker_context_(worker_context),
|
||||
reorder_wait_seconds_(reorder_wait_seconds),
|
||||
wait_timer_(main_io_service),
|
||||
main_thread_id_(boost::this_thread::get_id()),
|
||||
worker_context_(worker_context) {}
|
||||
waiter_(waiter) {}
|
||||
|
||||
void Add(int64_t seq_no, int64_t client_processed_up_to,
|
||||
std::function<void()> accept_request, std::function<void()> reject_request,
|
||||
@@ -525,3 +531,7 @@ class CoreWorkerDirectTaskReceiver {
|
||||
};
|
||||
|
||||
} // namespace ray
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
@@ -66,9 +66,9 @@ class CoreWorkerDirectTaskSubmitter {
|
||||
resolver_(store, task_finisher),
|
||||
task_finisher_(task_finisher),
|
||||
lease_timeout_ms_(lease_timeout_ms),
|
||||
max_tasks_in_flight_per_worker_(max_tasks_in_flight_per_worker),
|
||||
local_raylet_id_(local_raylet_id),
|
||||
actor_create_callback_(std::move(actor_create_callback)),
|
||||
max_tasks_in_flight_per_worker_(max_tasks_in_flight_per_worker),
|
||||
cancel_retry_timer_(std::move(cancel_timer)) {}
|
||||
|
||||
/// Schedule a task for direct submission to a worker.
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/gcs/callback.h"
|
||||
#include "ray/gcs/entry_change_notification.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
@@ -714,6 +714,8 @@ class WorkerInfoAccessor {
|
||||
|
||||
class PlacementGroupInfoAccessor {
|
||||
public:
|
||||
virtual ~PlacementGroupInfoAccessor() = default;
|
||||
|
||||
// TODO(AlisaWu): fill the accessor.
|
||||
/// Create an placement group to GCS asynchronously.
|
||||
///
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "asio.h"
|
||||
#include "ray/gcs/asio.h"
|
||||
|
||||
#include "ray/util/logging.h"
|
||||
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/protobuf/gcs.pb.h>
|
||||
#include <vector>
|
||||
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
namespace gcs {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "global_state_accessor.h"
|
||||
#include "ray/gcs/gcs_client/global_state_accessor.h"
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "ray/gcs/gcs_client/service_based_gcs_client.h"
|
||||
#include "ray/rpc/server_call.h"
|
||||
#include "service_based_gcs_client.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -14,8 +14,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/common/task/task_spec.h>
|
||||
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/gcs/accessor.h"
|
||||
#include "ray/gcs/subscription_executor.h"
|
||||
#include "ray/util/sequencer.h"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "error_info_handler_impl.h"
|
||||
#include "ray/gcs/gcs_server/error_info_handler_impl.h"
|
||||
|
||||
namespace ray {
|
||||
namespace rpc {
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_actor_manager.h"
|
||||
|
||||
#include <ray/common/ray_config.h>
|
||||
#include "ray/gcs/gcs_server/gcs_actor_manager.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
#include "ray/common/ray_config.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
|
||||
@@ -14,19 +14,19 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/common/id.h>
|
||||
#include <ray/common/task/task_execution_spec.h>
|
||||
#include <ray/common/task/task_spec.h>
|
||||
#include <ray/protobuf/gcs_service.pb.h>
|
||||
#include <ray/rpc/worker/core_worker_client.h>
|
||||
#include <utility>
|
||||
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "gcs_actor_scheduler.h"
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/task/task_execution_spec.h"
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/gcs/gcs_server/gcs_actor_scheduler.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/rpc/gcs_server/gcs_rpc_server.h"
|
||||
#include "ray/rpc/worker/core_worker_client.h"
|
||||
#include "src/ray/protobuf/gcs_service.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -12,11 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_actor_scheduler.h"
|
||||
#include <ray/common/ray_config.h>
|
||||
#include <ray/protobuf/node_manager.pb.h>
|
||||
#include <ray/util/asio_util.h>
|
||||
#include "gcs_actor_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_actor_scheduler.h"
|
||||
|
||||
#include "ray/common/ray_config.h"
|
||||
#include "ray/gcs/gcs_server/gcs_actor_manager.h"
|
||||
#include "ray/util/asio_util.h"
|
||||
#include "src/ray/protobuf/node_manager.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -14,20 +14,20 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/common/id.h>
|
||||
#include <ray/common/task/task_execution_spec.h>
|
||||
#include <ray/common/task/task_spec.h>
|
||||
#include <ray/gcs/accessor.h>
|
||||
#include <ray/protobuf/gcs_service.pb.h>
|
||||
#include <ray/raylet_client/raylet_client.h>
|
||||
#include <ray/rpc/node_manager/node_manager_client.h>
|
||||
#include <ray/rpc/worker/core_worker_client.h>
|
||||
#include <queue>
|
||||
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "absl/container/flat_hash_set.h"
|
||||
#include "gcs_node_manager.h"
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/task/task_execution_spec.h"
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/gcs/accessor.h"
|
||||
#include "ray/gcs/gcs_server/gcs_node_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/raylet_client/raylet_client.h"
|
||||
#include "ray/rpc/node_manager/node_manager_client.h"
|
||||
#include "ray/rpc/worker/core_worker_client.h"
|
||||
#include "src/ray/protobuf/gcs_service.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_job_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_job_manager.h"
|
||||
|
||||
#include "ray/gcs/pb_util.h"
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "gcs_object_manager.h"
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/gcs/gcs_server/gcs_object_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/rpc/gcs_server/gcs_rpc_server.h"
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_node_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_node_manager.h"
|
||||
|
||||
#include <ray/common/ray_config.h>
|
||||
#include <ray/gcs/pb_util.h>
|
||||
#include <ray/protobuf/gcs.pb.h>
|
||||
#include "ray/common/ray_config.h"
|
||||
#include "ray/gcs/pb_util.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -14,16 +14,15 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/common/id.h>
|
||||
#include <ray/gcs/accessor.h>
|
||||
#include <ray/protobuf/gcs.pb.h>
|
||||
#include <ray/rpc/client_call.h>
|
||||
#include <ray/rpc/gcs_server/gcs_rpc_server.h>
|
||||
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "absl/container/flat_hash_set.h"
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/gcs/accessor.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/rpc/client_call.h"
|
||||
#include "ray/rpc/gcs_server/gcs_rpc_server.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_object_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_object_manager.h"
|
||||
|
||||
#include "ray/gcs/pb_util.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "gcs_node_manager.h"
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/gcs/gcs_server/gcs_node_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
|
||||
|
||||
@@ -13,9 +13,10 @@
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/gcs/gcs_server/gcs_placement_group_manager.h"
|
||||
#include <ray/common/ray_config.h>
|
||||
#include <ray/gcs/pb_util.h>
|
||||
#include <ray/protobuf/gcs.pb.h>
|
||||
|
||||
#include "ray/common/ray_config.h"
|
||||
#include "ray/gcs/pb_util.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -13,18 +13,18 @@
|
||||
// limitations under the License.
|
||||
|
||||
#pragma once
|
||||
#include <ray/common/id.h>
|
||||
#include <ray/common/task/task_execution_spec.h>
|
||||
#include <ray/common/task/task_spec.h>
|
||||
#include <ray/protobuf/gcs_service.pb.h>
|
||||
#include <ray/rpc/worker/core_worker_client.h>
|
||||
#include <utility>
|
||||
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "absl/container/flat_hash_set.h"
|
||||
#include "gcs_placement_group_scheduler.h"
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/task/task_execution_spec.h"
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/gcs/gcs_server/gcs_placement_group_scheduler.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/rpc/worker/core_worker_client.h"
|
||||
#include "src/ray/protobuf/gcs_service.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -13,8 +13,9 @@
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/gcs/gcs_server/gcs_placement_group_scheduler.h"
|
||||
#include <ray/protobuf/gcs.pb.h>
|
||||
|
||||
#include "ray/gcs/gcs_server/gcs_placement_group_manager.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -13,19 +13,19 @@
|
||||
// limitations under the License.
|
||||
#pragma once
|
||||
|
||||
#include <ray/common/id.h>
|
||||
#include <ray/gcs/accessor.h>
|
||||
#include <ray/protobuf/gcs_service.pb.h>
|
||||
#include <ray/raylet_client/raylet_client.h>
|
||||
#include <ray/rpc/node_manager/node_manager_client.h>
|
||||
#include <ray/rpc/worker/core_worker_client.h>
|
||||
#include <queue>
|
||||
#include <tuple>
|
||||
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "absl/container/flat_hash_set.h"
|
||||
#include "gcs_node_manager.h"
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/gcs/accessor.h"
|
||||
#include "ray/gcs/gcs_server/gcs_node_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/raylet_client/raylet_client.h"
|
||||
#include "ray/rpc/node_manager/node_manager_client.h"
|
||||
#include "ray/rpc/worker/core_worker_client.h"
|
||||
#include "src/ray/protobuf/gcs_service.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
@@ -62,6 +62,7 @@ class GcsPlacementGroupSchedulerInterface {
|
||||
|
||||
class GcsScheduleStrategy {
|
||||
public:
|
||||
virtual ~GcsScheduleStrategy() {}
|
||||
virtual ScheduleMap Schedule(
|
||||
std::vector<std::shared_ptr<ray::BundleSpecification>> &bundles,
|
||||
const GcsNodeManager &node_manager) = 0;
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_redis_failure_detector.h"
|
||||
#include "ray/gcs/gcs_server/gcs_redis_failure_detector.h"
|
||||
|
||||
#include "ray/common/ray_config.h"
|
||||
|
||||
extern "C" {
|
||||
|
||||
@@ -12,19 +12,19 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_server.h"
|
||||
#include "ray/gcs/gcs_server/gcs_server.h"
|
||||
|
||||
#include "error_info_handler_impl.h"
|
||||
#include "gcs_actor_manager.h"
|
||||
#include "gcs_job_manager.h"
|
||||
#include "gcs_node_manager.h"
|
||||
#include "gcs_object_manager.h"
|
||||
#include "gcs_placement_group_manager.h"
|
||||
#include "gcs_worker_manager.h"
|
||||
#include "ray/common/network_util.h"
|
||||
#include "ray/common/ray_config.h"
|
||||
#include "stats_handler_impl.h"
|
||||
#include "task_info_handler_impl.h"
|
||||
#include "ray/gcs/gcs_server/error_info_handler_impl.h"
|
||||
#include "ray/gcs/gcs_server/gcs_actor_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_job_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_node_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_object_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_placement_group_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_worker_manager.h"
|
||||
#include "ray/gcs/gcs_server/stats_handler_impl.h"
|
||||
#include "ray/gcs/gcs_server/task_info_handler_impl.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/gcs/pubsub/gcs_pub_sub.h>
|
||||
#include <ray/gcs/redis_gcs_client.h>
|
||||
#include <ray/rpc/client_call.h>
|
||||
#include <ray/rpc/gcs_server/gcs_rpc_server.h>
|
||||
#include "ray/gcs/gcs_server/gcs_object_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_redis_failure_detector.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/rpc/client_call.h"
|
||||
#include "ray/rpc/gcs_server/gcs_rpc_server.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/status.h"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
#include "ray/gcs/store_client/in_memory_store_client.h"
|
||||
#include "ray/gcs/store_client/redis_store_client.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_worker_manager.h"
|
||||
#include "ray/gcs/gcs_server/gcs_worker_manager.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/rpc/gcs_server/gcs_rpc_server.h"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "stats_handler_impl.h"
|
||||
#include "ray/gcs/gcs_server/stats_handler_impl.h"
|
||||
|
||||
namespace ray {
|
||||
namespace rpc {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/rpc/gcs_server/gcs_rpc_server.h"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "task_info_handler_impl.h"
|
||||
#include "ray/gcs/gcs_server/task_info_handler_impl.h"
|
||||
|
||||
namespace ray {
|
||||
namespace rpc {
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "gcs_table_storage.h"
|
||||
#include "ray/gcs/gcs_server/gcs_table_storage.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/rpc/gcs_server/gcs_rpc_server.h"
|
||||
|
||||
@@ -12,13 +12,12 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <ray/gcs/gcs_server/test/gcs_server_test_util.h>
|
||||
#include <ray/gcs/test/gcs_test_util.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/common/test_util.h"
|
||||
#include "ray/gcs/gcs_server/test/gcs_server_test_util.h"
|
||||
#include "ray/gcs/test/gcs_test_util.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <ray/gcs/gcs_server/test/gcs_server_test_util.h>
|
||||
#include <ray/gcs/test/gcs_test_util.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/gcs/gcs_server/test/gcs_server_test_util.h"
|
||||
#include "ray/gcs/test/gcs_test_util.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <ray/gcs/gcs_server/test/gcs_server_test_util.h>
|
||||
#include <ray/gcs/test/gcs_test_util.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/gcs/gcs_server/test/gcs_server_test_util.h"
|
||||
#include "ray/gcs/test/gcs_test_util.h"
|
||||
|
||||
namespace ray {
|
||||
class GcsNodeManagerTest : public ::testing::Test {
|
||||
|
||||
@@ -13,9 +13,10 @@
|
||||
// limitations under the License.
|
||||
|
||||
#include "ray/gcs/gcs_server/gcs_object_manager.h"
|
||||
#include <ray/gcs/gcs_server/test/gcs_server_test_util.h>
|
||||
#include <ray/gcs/test/gcs_test_util.h>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/gcs/gcs_server/test/gcs_server_test_util.h"
|
||||
#include "ray/gcs/test/gcs_test_util.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -12,12 +12,11 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <ray/gcs/gcs_server/test/gcs_server_test_util.h>
|
||||
#include <ray/gcs/test/gcs_test_util.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/gcs/gcs_server/test/gcs_server_test_util.h"
|
||||
#include "ray/gcs/test/gcs_test_util.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include <ray/gcs/gcs_server/test/gcs_server_test_util.h>
|
||||
#include <ray/gcs/test/gcs_test_util.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "ray/gcs/gcs_server/test/gcs_server_test_util.h"
|
||||
#include "ray/gcs/test/gcs_test_util.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "gcs_pub_sub.h"
|
||||
#include "ray/gcs/pubsub/gcs_pub_sub.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -16,11 +16,10 @@
|
||||
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "absl/synchronization/mutex.h"
|
||||
|
||||
#include "ray/gcs/callback.h"
|
||||
#include "ray/gcs/redis_client.h"
|
||||
#include "ray/gcs/redis_context.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
namespace gcs {
|
||||
|
||||
@@ -14,9 +14,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ray/common/task/task_spec.h>
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/task/task_spec.h"
|
||||
#include "ray/gcs/accessor.h"
|
||||
#include "ray/gcs/callback.h"
|
||||
#include "ray/gcs/subscription_executor.h"
|
||||
|
||||
@@ -23,10 +23,9 @@
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/status.h"
|
||||
#include "ray/util/logging.h"
|
||||
|
||||
#include "ray/gcs/redis_async_context.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "ray/util/logging.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
struct redisContext;
|
||||
struct redisAsyncContext;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <functional>
|
||||
|
||||
#include "redismodule.h"
|
||||
#include "ray/gcs/redis_module/redismodule.h"
|
||||
|
||||
// NOTE(zongheng): this duplicated declaration serves as forward-declaration
|
||||
// only. The implementation is supposed to be linked in from credis. In
|
||||
|
||||
@@ -13,15 +13,16 @@
|
||||
// limitations under the License.
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "ray/common/common_protocol.h"
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/status.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "ray/gcs/redis_module/redis_string.h"
|
||||
#include "ray/gcs/redis_module/redismodule.h"
|
||||
#include "ray/util/logging.h"
|
||||
#include "redis_string.h"
|
||||
#include "redismodule.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
using ray::Status;
|
||||
using ray::rpc::GcsChangeMode;
|
||||
@@ -38,7 +39,7 @@ using ray::rpc::TablePubsub;
|
||||
// All commands in this file that depend on "module" must be wrapped by "#if
|
||||
// RAY_USE_NEW_GCS", until we switch to this launch configuration as the
|
||||
// default.
|
||||
#include "chain_module.h"
|
||||
#include "ray/gcs/redis_module/chain_module.h"
|
||||
extern RedisChainModule module;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "redismodule.h"
|
||||
#include "ray/gcs/redis_module/redismodule.h"
|
||||
|
||||
/* Format a RedisModuleString.
|
||||
*
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "absl/container/flat_hash_map.h"
|
||||
#include "absl/synchronization/mutex.h"
|
||||
#include "ray/gcs/store_client/store_client.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "ray/gcs/redis_client.h"
|
||||
#include "ray/gcs/redis_context.h"
|
||||
#include "ray/gcs/store_client/store_client.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -16,12 +16,13 @@
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/status.h"
|
||||
#include "ray/gcs/callback.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "ray/util/io_service_pool.h"
|
||||
#include "ray/util/logging.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
#include "ray/gcs/callback.h"
|
||||
#include "ray/gcs/entry_change_notification.h"
|
||||
#include "ray/gcs/redis_context.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "ray/util/logging.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
struct redisAsyncContext;
|
||||
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
#include <utility>
|
||||
|
||||
#include "gmock/gmock.h"
|
||||
#include "ray/common/placement_group.h"
|
||||
#include "ray/common/task/task.h"
|
||||
#include "ray/common/task/task_util.h"
|
||||
#include "ray/common/test_util.h"
|
||||
#include "ray/protobuf/gcs_service.grpc.pb.h"
|
||||
#include "ray/util/asio_util.h"
|
||||
#include "src/ray/common/placement_group.h"
|
||||
#include "src/ray/protobuf/gcs_service.grpc.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
#include "ray/common/id.h"
|
||||
#include "ray/common/task/task.h"
|
||||
#include "ray/protobuf/gcs.pb.h"
|
||||
#include "src/ray/protobuf/gcs.pb.h"
|
||||
|
||||
namespace ray {
|
||||
|
||||
|
||||
@@ -12,8 +12,10 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "lineage_cache.h"
|
||||
#include "ray/raylet/lineage_cache.h"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "ray/gcs/redis_gcs_client.h"
|
||||
#include "ray/stats/stats.h"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "raylet.h"
|
||||
#include "ray/raylet/raylet.h"
|
||||
|
||||
#include <boost/asio.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "reconstruction_policy.h"
|
||||
#include "ray/raylet/reconstruction_policy.h"
|
||||
|
||||
#include "ray/stats/stats.h"
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "cluster_resource_scheduler.h"
|
||||
#include "ray/raylet/scheduling/cluster_resource_scheduler.h"
|
||||
|
||||
std::string VectorToString(const std::vector<FixedPoint> &vector) {
|
||||
std::stringstream buffer;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user