From 7058d7dd5d47185c738ad541c564e70b315690fc Mon Sep 17 00:00:00 2001 From: Wentao Ye <44945378+yewentao256@users.noreply.github.com> Date: Tue, 1 Jul 2025 22:03:07 -0400 Subject: [PATCH] [Refactor] Remove duplicate `find_free_port` (#20333) Signed-off-by: yewentao256 --- tests/kernels/moe/utils.py | 4 ++-- vllm/model_executor/layers/fused_moe/utils.py | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/kernels/moe/utils.py b/tests/kernels/moe/utils.py index e4cd8386e1020..e317ccbdb4a77 100644 --- a/tests/kernels/moe/utils.py +++ b/tests/kernels/moe/utils.py @@ -14,7 +14,7 @@ from torch.multiprocessing import ( spawn) # pyright: ignore[reportPrivateImportUsage] from typing_extensions import Concatenate, ParamSpec -from vllm.model_executor.layers.fused_moe.utils import find_free_port +from vllm.utils import get_open_port has_deep_ep = importlib.util.find_spec("deep_ep") is not None if has_deep_ep: @@ -95,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, diff --git a/vllm/model_executor/layers/fused_moe/utils.py b/vllm/model_executor/layers/fused_moe/utils.py index 4c91e697f8e97..692482c2ea692 100644 --- a/vllm/model_executor/layers/fused_moe/utils.py +++ b/vllm/model_executor/layers/fused_moe/utils.py @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Copyright contributors to the vLLM project -import socket -from contextlib import closing from math import prod from typing import Optional @@ -98,10 +96,3 @@ def _fp8_perm(m: torch.Tensor, idx: torch.Tensor) -> torch.Tensor: return m.view(dtype=torch.uint8)[idx, ...].view(dtype=m.dtype) else: return m[idx, ...] - - -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]