[core] Cleanup utils targets dependency continue (#50175)

Signed-off-by: dentiny <[email protected]>
ray-project · Feb 3, 2025 · 766a525 · 766a525
1 parent 8c792db
commit 766a525
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -386,6 +386,7 @@ ray_cc_library(
         "//src/ray/protobuf:common_cc_proto",
         "//src/ray/util",
         "//src/ray/util:compat",
+        "//src/ray/util:counter_map",
         "@msgpack",
     ],
 )
@@ -537,7 +538,10 @@ ray_cc_library(
         ":scheduler",
         ":worker_rpc",
         "//src/ray/protobuf:agent_manager_cc_proto",
+        "//src/ray/util:counter_map",
         "//src/ray/util:thread_checker",
+        "//src/ray/util:throttler",
+        "//src/ray/util:type_traits",
         "@boost//:bimap",
         "@com_github_grpc_grpc//src/proto/grpc/health/v1:health_proto",
         "@com_google_absl//absl/container:btree",
@@ -718,6 +722,7 @@ ray_cc_library(
         "//src/ray/protobuf:common_cc_proto",
         "//src/ray/protobuf:runtime_env_agent_cc_proto",
         "//src/ray/util",
+        "//src/ray/util:throttler",
         "@boost//:asio",
         "@boost//:beast",
         "@boost//:system",
@@ -1972,6 +1977,7 @@ ray_cc_library(
         ":pubsub_lib",
         ":ray_common",
         ":redis_store_client",
+        "//src/ray/util:sequencer",
         "//src/ray/protobuf:usage_cc_proto",
     ],
 )
@@ -2209,6 +2215,7 @@ ray_cc_library(
         ":ray_common",
         ":stats_lib",
         "//src/ray/util",
+        "//src/ray/util:exponential_backoff",
         "@boost//:asio",
     ],
 )
@@ -2224,7 +2231,7 @@ ray_cc_library(
         "src/ray/gcs/store_client/store_client.h",
     ],
     deps = [
-        "redis_client",
+        ":redis_client",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/synchronization",
     ],
@@ -2370,6 +2377,7 @@ ray_cc_library(
         "//src/ray/protobuf:gcs_cc_proto",
         "//src/ray/protobuf:gcs_service_cc_proto",
         "//src/ray/util",
+        "//src/ray/util:exponential_backoff",
         "@boost//:asio",
     ],
 )
@@ -2510,6 +2518,7 @@ pyx_library(
         "//:stats_lib",
         "//src/ray/protobuf:serialization_cc_proto",
         "//src/ray/util",
+        "//src/ray/util:memory",
     ],
 )
 

diff --git a/src/ray/common/BUILD b/src/ray/common/BUILD
@@ -74,15 +74,12 @@ ray_cc_library(
 
 ray_cc_library(
     name = "file_system_monitor",
-    srcs = [
-        "file_system_monitor.cc",
-    ],
-    hdrs = [
-        "file_system_monitor.h",
-    ],
+    srcs = ["file_system_monitor.cc"],
+    hdrs = ["file_system_monitor.h"],
     deps = [
         ":asio",
         "//src/ray/util",
+        "//src/ray/util:event",
         "@com_google_googletest//:gtest_prod",
     ],
 )
@@ -139,6 +136,7 @@ ray_cc_library(
         "//src/ray/protobuf:common_cc_proto",
         "//src/ray/protobuf:gcs_cc_proto",
         "//src/ray/util",
+        "//src/ray/util:random",
         "@com_github_google_flatbuffers//:flatbuffers",
         "@msgpack",
     ],
@@ -211,6 +209,7 @@ ray_cc_library(
         ":event_stats",
         ":ray_config",
         "//src/ray/util",
+        "//src/ray/util:array",
         "@boost//:asio",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/synchronization",

diff --git a/src/ray/util/BUILD b/src/ray/util/BUILD
@@ -201,27 +201,13 @@ ray_cc_library(
     hdrs = ["util.h"],
     srcs = ["util.cc"],
     deps = [
-        ":array",
         ":cmd_line_utils",
         ":container_util",
-        ":counter_map",
-        ":event",
-        ":event_label",
-        ":exponential_backoff",
         ":function_traits",
         ":logging",
         ":macros",
-        ":memory",
         ":process",
-        ":random",
-        ":sample",
-        ":sequencer",
         ":string_utils",
-        ":timestamp_utils",
-        ":throttler",
-        ":thread_utils",
-        ":type_traits",
-        ":visibility",
         "//:sha256",
     ],
 )

diff --git a/src/ray/util/tests/BUILD b/src/ray/util/tests/BUILD
@@ -6,6 +6,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         "//src/ray/util",
+        "//src/ray/util:array",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -53,6 +54,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         "//src/ray/util",
+        "//src/ray/util:counter_map",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -67,11 +69,12 @@ ray_cc_test(
         "team:core",
     ],
     deps = [
+        "//src/ray/common:ray_config",
+        "//src/ray/protobuf:gcs_cc_proto",
         "//src/ray/util",
+        "//src/ray/util:event",
         "@boost//:range",
         "@com_google_googletest//:gtest_main",
-        "//src/ray/protobuf:gcs_cc_proto",
-        "//src/ray/common:ray_config",
     ],
 )
 
@@ -82,6 +85,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         "//src/ray/util",
+        "//src/ray/util:exponential_backoff",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -127,6 +131,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         "//:ray_common",
+        "//src/ray/util:sample",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -138,6 +143,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         "//src/ray/util",
+        "//src/ray/util:sequencer",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -160,6 +166,7 @@ ray_cc_test(
     tags = ["team:core"],
     deps = [
         "//src/ray/util",
+        "//src/ray/util:throttler",
         "@com_google_absl//absl/time",
         "@com_google_googletest//:gtest_main",
     ],