[Core][Engine] allow DP ray placement groups to be set on specific nodes (#44669)
Signed-off-by: walterbm <walter.beller.morales@gmail.com>
This commit is contained in:
+46
-11
@@ -101,6 +101,23 @@ def _get_bundle_node_ip(bundle: dict[str, float]) -> str:
|
||||
raise ValueError(f"Missing node affinity in placement bundle: {bundle}")
|
||||
|
||||
|
||||
def _node_ip_from_resources(node_resources: dict) -> str | None:
|
||||
"""Return the node IP encoded in a Ray per-node resource dict, or None.
|
||||
|
||||
Ray advertises each node's IP as a ``node:<ip>`` resource key. The head node
|
||||
also carries ``node:__internal_head__``, and placement groups add
|
||||
``..._group_...`` keys; both are ignored.
|
||||
"""
|
||||
for key in node_resources:
|
||||
if (
|
||||
key.startswith("node:")
|
||||
and key != "node:__internal_head__"
|
||||
and "_group_" not in key
|
||||
):
|
||||
return key.split(":", 1)[1]
|
||||
return None
|
||||
|
||||
|
||||
class CoreEngineProcManager:
|
||||
"""
|
||||
Utility class to handle creation, readiness, and shutdown
|
||||
@@ -506,6 +523,32 @@ class CoreEngineActorManager:
|
||||
assert dp_master_ip_key in nodes[0], (
|
||||
f"The DP master node (ip: {dp_master_ip}) is missing or dead"
|
||||
)
|
||||
|
||||
# optionally restrict DP placement to a caller-provided node set.
|
||||
requested_node_ips = {
|
||||
ip.strip()
|
||||
for ip in envs.VLLM_RAY_DP_PLACEMENT_NODE_IPS.split(",")
|
||||
if ip.strip()
|
||||
}
|
||||
if requested_node_ips:
|
||||
allowed_node_ips = set(requested_node_ips)
|
||||
# The master node must host the local ranks, so it has to be allowed.
|
||||
if dp_master_ip not in allowed_node_ips:
|
||||
allowed_node_ips.add(dp_master_ip)
|
||||
filtered_nodes = [
|
||||
node_resources
|
||||
for node_resources in nodes
|
||||
if _node_ip_from_resources(node_resources) in allowed_node_ips
|
||||
]
|
||||
logger.info(
|
||||
"VLLM_RAY_DP_PLACEMENT_NODE_IPS set; restricting DP placement "
|
||||
"from %d to %d node(s): %s",
|
||||
len(nodes),
|
||||
len(filtered_nodes),
|
||||
sorted(allowed_node_ips),
|
||||
)
|
||||
nodes = filtered_nodes
|
||||
|
||||
device_str = current_platform.ray_device_key
|
||||
n_node_devices: list[int] = [
|
||||
int(node_resources[device_str])
|
||||
@@ -572,18 +615,10 @@ class CoreEngineActorManager:
|
||||
# for "span" pack strategy
|
||||
collected_bundles = []
|
||||
for node_resources in nodes:
|
||||
node_ip_keys = [
|
||||
key
|
||||
for key in node_resources
|
||||
if key != "node:__internal_head__"
|
||||
and key.startswith("node:")
|
||||
and "_group_" not in key
|
||||
]
|
||||
assert len(node_ip_keys) == 1, (
|
||||
f"Zero or multiple node IP keys found in node resources: {node_ip_keys}"
|
||||
node_ip = _node_ip_from_resources(node_resources)
|
||||
assert node_ip is not None, (
|
||||
f"No node IP key found in node resources: {node_resources}"
|
||||
)
|
||||
node_ip_key = node_ip_keys[0]
|
||||
node_ip = node_ip_key.split(":")[1]
|
||||
|
||||
n_device_on_node = int(node_resources.get(device_str, 0))
|
||||
if pack_strategy == "span" and n_device_on_node != 0:
|
||||
|
||||
Reference in New Issue
Block a user