Skip to content

Commit

Permalink
tpu: align worker index with node boundary (#979)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlpinDale authored Dec 24, 2024
1 parent adb6982 commit 495435a
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions aphrodite/executor/ray_tpu_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,40 @@ def _init_workers_ray(self, placement_group: "PlacementGroup",
# Else, added to the list of workers.
self.workers.append(worker)

logger.debug(f"workers: {self.workers}")
logger.debug(f"driver_dummy_worker: {self.driver_dummy_worker}")

if self.driver_dummy_worker is None:
raise ValueError(
"Ray does not allocate any TPUs on the driver node. Consider "
"adjusting the Ray placement group or running the driver on a "
"TPU node.")

worker_ips = [
ray.get(worker.get_node_ip.remote()) # type: ignore[attr-defined]
for worker in self.workers
]
ip_counts: Dict[str, int] = {}
for ip in worker_ips:
ip_counts[ip] = ip_counts.get(ip, 0) + 1

def sort_by_driver_then_worker_ip(worker):
"""
Sort the workers based on 3 properties:
1. If the worker is on the same node as the driver (vllm engine),
it should be placed first.
2. Then, if the worker is on a node with fewer workers, it should
be placed first.
3. Finally, if the work is on a node with smaller IP address, it
should be placed first.
"""
ip = ray.get(worker.get_node_ip.remote())
return (ip != driver_ip, ip_counts[ip], ip)
# After sorting, the workers on the same node will be
# close to each other, and the workers on the driver
# node will be placed first.
self.workers = sorted(self.workers, key=sort_by_driver_then_worker_ip)

# Get the set of TPU IDs used on each node.
worker_node_and_gpu_ids = self._run_workers("get_node_and_gpu_ids",
use_dummy_driver=True)
Expand Down

0 comments on commit 495435a

Please sign in to comment.