Skip to content

Commit 04f98e7

Browse files
committed
run precommit
1 parent 5a90f98 commit 04f98e7

10 files changed

Lines changed: 21 additions & 30 deletions

File tree

lightx2v/disagg/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ bash scripts/disagg/run_dynamic.sh
140140

141141
1. 多机运行时,`DISAGG_CONTROLLER_CFG` 里的 `bootstrap_addr``static_instance_slots` 和各 slot 的 `env` 会直接影响远端实例如何绑定网络与 Mooncake 地址。
142142
2. 如果遇到端口占用,优先检查 `scripts/disagg/kill_service.sh` 是否已经把旧实例和 proxy 清理干净。
143-
3. 如果需要了解 controller 配置文件本身的字段含义,可以继续查看 `configs/disagg/` 下对应 JSON。
143+
3. 如果需要了解 controller 配置文件本身的字段含义,可以继续查看 `configs/disagg/` 下对应 JSON。

lightx2v/disagg/rdma_client.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
import time
88

99
from lightx2v.disagg.rdma_base import (
10-
AccessFlag,
11-
AHAttr,
1210
CQ,
1311
GID,
14-
GlobalRoute,
15-
IBDevice,
1612
MR,
1713
PD,
1814
QP,
15+
SGE,
16+
WR,
17+
AHAttr,
18+
AccessFlag,
19+
GlobalRoute,
20+
IBDevice,
1921
QPAttr,
2022
QPCap,
2123
QPInitAttr,
2224
QPType,
23-
SGE,
24-
WR,
2525
WROpcode,
2626
e,
2727
get_device_list,

lightx2v/disagg/rdma_server.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
import threading
55

66
from lightx2v.disagg.rdma_base import (
7-
AccessFlag,
8-
AHAttr,
97
CQ,
108
GID,
11-
GlobalRoute,
12-
IBDevice,
139
MR,
1410
PD,
1511
QP,
12+
AHAttr,
13+
AccessFlag,
14+
GlobalRoute,
15+
IBDevice,
1616
QPAttr,
1717
QPCap,
1818
QPInitAttr,

lightx2v/disagg/rdma_utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import socket
88
import time
99

10-
1110
logger = logging.getLogger(__name__)
1211

1312

@@ -232,4 +231,4 @@ def rtr_path_mtu_negotiated(ctx, port_num: int, peer_active_mtu: int | None) ->
232231
peer = int(peer_active_mtu)
233232
except (TypeError, ValueError):
234233
return local
235-
return min(local, peer)
234+
return min(local, peer)

lightx2v/disagg/services/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
from abc import ABC
21
import sys
2+
from abc import ABC
33

44
from loguru import logger as loguru_logger
55

6-
76
loguru_logger.remove()
87
loguru_logger.add(
98
sys.stderr,

lightx2v/disagg/services/controller.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import ipaddress
22
import json
3-
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
43
import os
54
import shlex
6-
import signal
75
import shutil
6+
import signal
87
import socket
98
import subprocess
109
import sys
1110
import time
1211
from collections.abc import Mapping
12+
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
1313
from pathlib import Path
1414
from threading import Event, Lock, Thread
1515
from typing import Any
@@ -501,11 +501,7 @@ def _with_env(base_cmd: str, env_map: dict[str, str]) -> str:
501501
return f"env {env_prefix} {base_cmd}"
502502

503503
sidecar_cmd = _with_env(
504-
(
505-
f"{shlex.quote(python_executable)} "
506-
"-m lightx2v.disagg.services.data_mgr_sidecar "
507-
f"--push-addr {shlex.quote(push_addr)} --req-addr {shlex.quote(req_addr)}"
508-
),
504+
(f"{shlex.quote(python_executable)} -m lightx2v.disagg.services.data_mgr_sidecar --push-addr {shlex.quote(push_addr)} --req-addr {shlex.quote(req_addr)}"),
509505
sidecar_env_vars,
510506
)
511507
cmd_with_python = [python_executable, *cmd[1:]]
@@ -547,9 +543,7 @@ def _with_env(base_cmd: str, env_map: dict[str, str]) -> str:
547543
service_pid = None
548544

549545
if sidecar_pid is None or service_pid is None:
550-
raise RuntimeError(
551-
f"failed to parse remote pids for {instance_type} rank={engine_rank} host={host}: stdout={completed.stdout!r} stderr={completed.stderr!r}"
552-
)
546+
raise RuntimeError(f"failed to parse remote pids for {instance_type} rank={engine_rank} host={host}: stdout={completed.stdout!r} stderr={completed.stderr!r}")
553547

554548
sidecar_meta = {
555549
"mode": "remote",

lightx2v/disagg/services/decoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def init(self, config):
143143
if data_bootstrap_addr is None or data_bootstrap_room is None:
144144
return
145145

146-
if not str(os.getenv("IS_CENTRALIZED", "0")).strip().lower() in {"1", "true", "yes", "on"}:
146+
if str(os.getenv("IS_CENTRALIZED", "0")).strip().lower() not in {"1", "true", "yes", "on"}:
147147
try:
148148
self._ensure_phase2_request_buffer()
149149
except Exception:

lightx2v/disagg/services/encoder.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import numpy as np
1212
import torch
13-
import zmq
1413

1514
from lightx2v.disagg.conn import MONITOR_POLLING_PORT, REQUEST_POLLING_PORT, DataArgs, DataManager, DataPoll, DataSender, DisaggregationMode, DisaggregationPhase, ReqManager
1615
from lightx2v.disagg.monitor import Reporter

lightx2v/disagg/services/transformer.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
from collections import deque
77
from multiprocessing import resource_tracker, shared_memory
88
from typing import Any, List, Optional
9+
from urllib.error import URLError
10+
from urllib.request import Request, urlopen
911

1012
import numpy as np
1113
import torch
12-
import zmq
13-
from urllib.error import URLError
14-
from urllib.request import Request, urlopen
1514

1615
from lightx2v.disagg.conn import MONITOR_POLLING_PORT, REQUEST_POLLING_PORT, DataArgs, DataManager, DataPoll, DataReceiver, DataSender, DisaggregationMode, DisaggregationPhase, ReqManager
1716
from lightx2v.disagg.monitor import Reporter

lightx2v/disagg/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ def load_wan_transformer(config: Dict[str, Any]):
374374
elif config.get("model_cls") == "wan2.2_moe":
375375
print("Loading MultiModelStruct module start", flush=True)
376376
from lightx2v.models.runners.wan.wan_runner import MultiModelStruct
377+
377378
print("Loading MultiModelStruct module done", flush=True)
378379

379380
high_noise_model_path = os.path.join(config["model_path"], "high_noise_model")

0 commit comments

Comments
 (0)