Skip to content

Commit 1748522

Browse files
Ziy1-Tanktyxx
Ziy1-Tan
authored and
ktyxx
committed
[core] Place object_manager bazel targets into separate directories (ray-project#52285)
Signed-off-by: Ziy1-Tan <[email protected]>
1 parent b58b046 commit 1748522

27 files changed

+287
-337
lines changed

‎BUILD.bazel

Lines changed: 5 additions & 276 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ ray_cc_library(
311311
],
312312
deps = [
313313
":grpc_common_lib",
314-
":object_manager_grpc_stub_manager",
314+
"//src/ray/object_manager:object_manager_grpc_stub_manager",
315315
":object_manager_cc_grpc",
316316
"//src/ray/common:asio",
317317
"//src/ray/common:status",
@@ -562,8 +562,8 @@ ray_cc_library(
562562
"//src/ray/common:id",
563563
"//src/ray/common:ray_object",
564564
"//src/ray/gcs/gcs_client:gcs_client_lib",
565-
":object_manager_common",
566-
":object_directory",
565+
"//src/ray/object_manager:object_manager_common",
566+
"//src/ray/object_manager:object_directory",
567567
"//src/ray/pubsub:subscriber_lib",
568568
":worker_pool",
569569
":worker_rpc",
@@ -607,7 +607,8 @@ ray_cc_library(
607607
":local_object_manager",
608608
":node_manager_fbs",
609609
":node_manager_rpc",
610-
":object_manager",
610+
"//src/ray/object_manager:object_manager",
611+
"//src/ray/object_manager:ownership_object_directory",
611612
"//src/ray/pubsub:pubsub_lib",
612613
":raylet_agent_manager",
613614
":runtime_env_agent_client",
@@ -675,106 +676,6 @@ ray_cc_test(
675676
],
676677
)
677678

678-
ray_cc_test(
679-
name = "pull_manager_test",
680-
size = "small",
681-
srcs = [
682-
"src/ray/object_manager/test/pull_manager_test.cc",
683-
],
684-
tags = ["team:core"],
685-
deps = [
686-
":pull_manager",
687-
"//src/ray/common:test_util",
688-
"@com_google_googletest//:gtest_main",
689-
],
690-
)
691-
692-
ray_cc_test(
693-
name = "object_buffer_pool_test",
694-
size = "small",
695-
srcs = [
696-
"src/ray/object_manager/test/object_buffer_pool_test.cc",
697-
],
698-
tags = ["team:core"],
699-
deps = [
700-
":object_buffer_pool",
701-
"@com_google_googletest//:gtest_main",
702-
],
703-
)
704-
705-
ray_cc_test(
706-
name = "ownership_based_object_directory_test",
707-
size = "small",
708-
srcs = [
709-
"src/ray/object_manager/test/ownership_based_object_directory_test.cc",
710-
],
711-
tags = ["team:core"],
712-
deps = [
713-
":ownership_based_object_directory",
714-
":ray_mock",
715-
"@com_google_googletest//:gtest_main",
716-
],
717-
)
718-
719-
ray_cc_test(
720-
name = "push_manager_test",
721-
size = "small",
722-
srcs = [
723-
"src/ray/object_manager/test/push_manager_test.cc",
724-
],
725-
tags = ["team:core"],
726-
deps = [
727-
":raylet_lib",
728-
"//src/ray/common:test_util",
729-
"@com_google_googletest//:gtest_main",
730-
],
731-
)
732-
733-
ray_cc_test(
734-
name = "spilled_object_test",
735-
size = "small",
736-
srcs = [
737-
"src/ray/object_manager/test/spilled_object_test.cc",
738-
],
739-
tags = ["team:core"],
740-
deps = [
741-
":raylet_lib",
742-
"@boost//:endian",
743-
"//src/ray/common:test_util",
744-
"@com_google_absl//absl/strings:str_format",
745-
"@com_google_googletest//:gtest_main",
746-
],
747-
)
748-
749-
750-
ray_cc_test(
751-
name = "create_request_queue_test",
752-
size = "small",
753-
srcs = [
754-
"src/ray/object_manager/test/create_request_queue_test.cc",
755-
],
756-
tags = ["team:core"],
757-
deps = [
758-
"//src/ray/object_manager/plasma:plasma_store_server_lib",
759-
"@com_google_googletest//:gtest",
760-
"@com_google_googletest//:gtest_main",
761-
],
762-
)
763-
764-
ray_cc_test(
765-
name = "get_request_queue_test",
766-
size = "small",
767-
srcs = [
768-
"src/ray/object_manager/test/get_request_queue_test.cc",
769-
],
770-
tags = ["team:core"],
771-
deps = [
772-
"//src/ray/object_manager/plasma:plasma_store_server_lib",
773-
"@com_google_googletest//:gtest",
774-
"@com_google_googletest//:gtest_main",
775-
],
776-
)
777-
778679
ray_cc_test(
779680
name = "worker_pool_test",
780681
size = "small",
@@ -948,178 +849,6 @@ ray_cc_test(
948849
],
949850
)
950851

951-
ray_cc_library(
952-
name = "object_manager",
953-
srcs = ["src/ray/object_manager/object_manager.cc"],
954-
hdrs = ["src/ray/object_manager/object_manager.h"],
955-
deps = [
956-
":chunk_object_reader",
957-
":object_buffer_pool",
958-
":object_directory",
959-
":object_manager_common",
960-
":object_manager_rpc",
961-
":ownership_based_object_directory",
962-
":pull_manager",
963-
":push_manager",
964-
"//src/ray/common:asio",
965-
"//src/ray/common:id",
966-
"//src/ray/common:ray_config",
967-
"//src/ray/common:status",
968-
"//src/ray/object_manager/plasma:plasma_store_server_lib",
969-
"//src/ray/protobuf:common_cc_proto",
970-
"//src/ray/protobuf:node_manager_cc_proto",
971-
"@boost//:asio",
972-
"@boost//:bind",
973-
"@com_google_absl//absl/container:flat_hash_map",
974-
"@com_google_absl//absl/container:flat_hash_set",
975-
"@com_google_absl//absl/time",
976-
],
977-
)
978-
979-
ray_cc_library(
980-
name = "push_manager",
981-
srcs = ["src/ray/object_manager/push_manager.cc"],
982-
hdrs = ["src/ray/object_manager/push_manager.h"],
983-
deps = [
984-
"//src/ray/stats:stats_metric",
985-
"//src/ray/common:id",
986-
"//src/ray/common:ray_config",
987-
"//src/ray/common:status",
988-
"//src/ray/util",
989-
"@com_google_absl//absl/container:flat_hash_map",
990-
"@com_google_absl//absl/container:flat_hash_set",
991-
],
992-
)
993-
994-
ray_cc_library(
995-
name = "pull_manager",
996-
srcs = ["src/ray/object_manager/pull_manager.cc"],
997-
hdrs = ["src/ray/object_manager/pull_manager.h"],
998-
deps = [
999-
":object_manager_rpc",
1000-
":ownership_based_object_directory",
1001-
"//src/ray/stats:stats_metric",
1002-
"//src/ray/common:id",
1003-
"//src/ray/common:ray_config",
1004-
"//src/ray/common:ray_object",
1005-
"//src/ray/common:status",
1006-
"//src/ray/util:container_util",
1007-
"//src/ray/util:counter_map",
1008-
"@boost//:asio",
1009-
"@boost//:bind",
1010-
"@com_google_absl//absl/container:flat_hash_map",
1011-
"@com_google_absl//absl/container:flat_hash_set",
1012-
"@com_google_absl//absl/time",
1013-
],
1014-
)
1015-
1016-
ray_cc_library(
1017-
name = "ownership_based_object_directory",
1018-
srcs = ["src/ray/object_manager/ownership_based_object_directory.cc"],
1019-
hdrs = ["src/ray/object_manager/ownership_based_object_directory.h"],
1020-
deps = [
1021-
"//src/ray/gcs/gcs_client:gcs_client_lib",
1022-
":object_directory",
1023-
"//src/ray/pubsub:subscriber_lib",
1024-
":worker_rpc",
1025-
"//src/ray/common:asio",
1026-
"//src/ray/common:id",
1027-
"//src/ray/common:status",
1028-
"//src/ray/util:sequencer",
1029-
"@com_google_absl//absl/container:flat_hash_map",
1030-
],
1031-
)
1032-
1033-
ray_cc_library(
1034-
name = "object_directory",
1035-
hdrs = ["src/ray/object_manager/object_directory.h"],
1036-
deps = [
1037-
"//src/ray/gcs/gcs_client:gcs_client_lib",
1038-
":object_manager_common",
1039-
"//src/ray/common:asio",
1040-
"//src/ray/common:id",
1041-
"//src/ray/common:status",
1042-
],
1043-
)
1044-
1045-
ray_cc_library(
1046-
name = "object_buffer_pool",
1047-
srcs = ["src/ray/object_manager/object_buffer_pool.cc"],
1048-
hdrs = ["src/ray/object_manager/object_buffer_pool.h"],
1049-
deps = [
1050-
":memory_object_reader",
1051-
"//src/ray/common:id",
1052-
"//src/ray/common:status",
1053-
"//src/ray/util:logging",
1054-
"@boost//:asio",
1055-
"@boost//:bind",
1056-
"@com_google_absl//absl/base",
1057-
"@com_google_absl//absl/container:flat_hash_map",
1058-
"@com_google_absl//absl/synchronization",
1059-
"@com_google_absl//absl/time",
1060-
],
1061-
)
1062-
1063-
ray_cc_library(
1064-
name = "object_manager_common",
1065-
srcs = ["src/ray/object_manager/common.cc"],
1066-
hdrs = ["src/ray/object_manager/common.h"],
1067-
deps = [
1068-
"//src/ray/common:id",
1069-
"//src/ray/common:ray_config",
1070-
"//src/ray/common:status",
1071-
"@boost//:asio",
1072-
"@com_google_absl//absl/strings",
1073-
],
1074-
)
1075-
1076-
ray_cc_library(
1077-
name = "object_manager_grpc_stub_manager",
1078-
hdrs = ["src/ray/object_manager/grpc_stub_manager.h"],
1079-
deps = [
1080-
":grpc_client",
1081-
"@com_github_grpc_grpc//:grpc++",
1082-
],
1083-
)
1084-
1085-
ray_cc_library(
1086-
name = "memory_object_reader",
1087-
srcs = ["src/ray/object_manager/memory_object_reader.cc"],
1088-
hdrs = ["src/ray/object_manager/memory_object_reader.h"],
1089-
deps = [
1090-
":object_reader",
1091-
"//src/ray/object_manager/plasma:plasma_client",
1092-
],
1093-
)
1094-
1095-
ray_cc_library(
1096-
name = "chunk_object_reader",
1097-
srcs = ["src/ray/object_manager/chunk_object_reader.cc"],
1098-
hdrs = ["src/ray/object_manager/chunk_object_reader.h"],
1099-
deps = [
1100-
":spilled_object_reader",
1101-
"//src/ray/util:logging",
1102-
],
1103-
)
1104-
1105-
ray_cc_library(
1106-
name = "spilled_object_reader",
1107-
srcs = ["src/ray/object_manager/spilled_object_reader.cc"],
1108-
hdrs = ["src/ray/object_manager/spilled_object_reader.h"],
1109-
deps = [
1110-
":object_reader",
1111-
"//src/ray/util:logging",
1112-
"@com_google_absl//absl/types:optional",
1113-
"@com_google_googletest//:gtest_prod",
1114-
],
1115-
)
1116-
1117-
ray_cc_library(
1118-
name = "object_reader",
1119-
hdrs = ["src/ray/object_manager/object_reader.h"],
1120-
deps = ["//src/ray/protobuf:common_cc_proto"],
1121-
)
1122-
1123852
ray_cc_library(
1124853
name = "platform_shims",
1125854
srcs = [] + select({

‎src/ray/core_worker/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,11 @@ ray_cc_library(
458458
srcs = ["experimental_mutable_object_manager.cc"],
459459
hdrs = ["experimental_mutable_object_manager.h"],
460460
deps = [
461-
"//:object_manager_common",
462461
"//src/ray/common:ray_config",
463462
"//src/ray/common:ray_object",
464463
"//src/ray/common:status",
465464
"//src/ray/common:task_common",
465+
"//src/ray/object_manager:object_manager_common",
466466
"//src/ray/object_manager/plasma:plasma_client",
467467
"@com_google_absl//absl/container:node_hash_map",
468468
"@com_google_absl//absl/strings",

‎src/ray/core_worker/experimental_mutable_object_manager.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#include "ray/core_worker/experimental_mutable_object_manager.h"
1616

17+
#include <fcntl.h>
18+
1719
#include <memory>
1820
#include <string>
1921
#include <utility>

‎src/ray/core_worker/test/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,14 @@ ray_cc_test(
124124
srcs = ["object_recovery_manager_test.cc"],
125125
tags = ["team:core"],
126126
deps = [
127-
"//:object_manager_common",
128127
"//:ray_mock",
129128
"//src/ray/raylet_client:raylet_client_lib",
130129
"//src/ray/common:task_common",
131130
"//src/ray/common:test_util",
132131
"//src/ray/core_worker:memory_store",
133132
"//src/ray/core_worker:normal_task_submitter",
134133
"//src/ray/core_worker:object_recovery_manager",
134+
"//src/ray/object_manager:object_manager_common",
135135
"@com_google_googletest//:gtest",
136136
"@com_google_googletest//:gtest_main",
137137
],
@@ -334,9 +334,9 @@ ray_cc_test(
334334
"//conditions:default": ["@platforms//:incompatible"],
335335
}),
336336
deps = [
337-
"//:object_manager_common",
338337
"//:ray_mock",
339338
"//src/ray/core_worker:experimental_mutable_object_provider",
339+
"//src/ray/object_manager:object_manager_common",
340340
"//src/ray/object_manager/plasma:plasma_client",
341341
"//src/ray/object_manager/plasma:plasma_store_server_lib",
342342
"@com_google_absl//absl/functional:bind_front",

0 commit comments

Comments
 (0)