fix merge

Signed-off-by: Bill Nell <[email protected]>

Author: bnellnm

tests/kernels/moe/parallel_utils.py

@@ -5,9 +5,7 @@
 import dataclasses
 import importlib
 import os
-import socket
 import traceback
-from contextlib import closing
 from typing import Callable, Optional
 
 import torch
@@ -16,6 +14,8 @@
     spawn)  # pyright: ignore[reportPrivateImportUsage]
 from typing_extensions import Concatenate, ParamSpec
 
+from vllm.utils import get_open_port
+
 has_deep_ep = importlib.util.find_spec("deep_ep") is not None
 if has_deep_ep:
     from vllm.model_executor.layers.fused_moe.deepep_ht_prepare_finalize import (  # noqa: E501
@@ -82,13 +82,6 @@ def _worker_parallel_launch(
         torch.distributed.destroy_process_group()
 
 
-def find_free_port():
-    with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
-        s.bind(('', 0))
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        return s.getsockname()[1]
-
-
 def parallel_launch(
     world_size: int,
     worker: Callable[Concatenate[ProcessGroupInfo, P], None],
@@ -102,7 +95,7 @@ def parallel_launch(
             world_size,
             world_size,
             0,
-            f"tcp://{os.getenv('LOCALHOST', 'localhost')}:{find_free_port()}",
+            f"tcp://{os.getenv('LOCALHOST', 'localhost')}:{get_open_port()}",
             worker,
         ) + args,
         nprocs=world_size,