xinyun/vllm
1
0
Fork 0
mirror of https://git.datalinker.icu/vllm-project/vllm.git synced 2026-06-08 05:42:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Refactor] Remove duplicate find_free_port (#20333)

Browse Source 
Signed-off-by: yewentao256 <zhyanwentao@126.com>
This commit is contained in:
Wentao Ye 2025-07-01 22:03:07 -04:00 committed by GitHub
parent a0389e0554
commit 7058d7dd5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/kernels/moe/utils.py
View File

@ -14,7 +14,7 @@ from torch.multiprocessing import (
spawn) # pyright: ignore[reportPrivateImportUsage] spawn) # pyright: ignore[reportPrivateImportUsage]
from typing_extensions import Concatenate, ParamSpec 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 has_deep_ep = importlib.util.find_spec("deep_ep") is not None
if has_deep_ep: if has_deep_ep:
@ -95,7 +95,7 @@ def parallel_launch(
world_size, world_size,
world_size, world_size,
0, 0,
f"tcp://{os.getenv('LOCALHOST', 'localhost')}:{find_free_port()}", f"tcp://{os.getenv('LOCALHOST', 'localhost')}:{get_open_port()}",
worker, worker,
) + args, ) + args,
nprocs=world_size, nprocs=world_size,

9
vllm/model_executor/layers/fused_moe/utils.py
View File

@ -1,7 +1,5 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project # SPDX-FileCopyrightText: Copyright contributors to the vLLM project
import socket
from contextlib import closing
from math import prod from math import prod
from typing import Optional 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) return m.view(dtype=torch.uint8)[idx, ...].view(dtype=m.dtype)
else: else:
return m[idx, ...] 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]