Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/sglang/srt/disaggregation/base/conn.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class StateType(str, enum.Enum):
# DeepSeek-V4 online C128 request-scoped state.
C128_STATE = "c128_state"
# Target aux hidden rows used to bootstrap decode-side draft KV.
DSPARK_HIDDEN = "dspark_hidden"
PD_HIDDEN = "pd_hidden"


@dataclasses.dataclass
Expand Down
20 changes: 10 additions & 10 deletions python/sglang/srt/disaggregation/common/conn.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ def __init__(
self.register_to_bootstrap()
self.transfer_infos = {}
self.req_to_decode_prefix_len: Dict[int, int] = {}
self.req_to_dspark_hidden_meta: Dict[int, dict] = {}
self.req_to_pd_hidden_meta: Dict[int, dict] = {}
self.decode_kv_args_table = {}
self.pp_group = get_pp_group()
# If a timeout happens on the prefill side, it means prefill instances
Expand Down Expand Up @@ -245,10 +245,10 @@ def __init__(
f"Unsupported DisaggregationMode: {self.disaggregation_mode}"
)

def supports_dspark_hidden_streaming(self) -> bool:
def supports_pd_hidden_streaming(self) -> bool:
return False

def mark_dspark_hidden_request_done(
def mark_pd_hidden_request_done(
self,
bootstrap_room: int,
state_indices: Optional[List] = None,
Expand All @@ -261,22 +261,22 @@ def mark_dspark_hidden_request_done(
del bootstrap_room, state_indices
return None

def pop_dspark_hidden_request_done(self, bootstrap_room: int) -> bool:
def pop_pd_hidden_request_done(self, bootstrap_room: int) -> bool:
"""Consume a hidden-request-done event for early source-window release."""
del bootstrap_room
return False

# Backward-compatible aliases for backend-specific implementations that have
# not yet migrated to the request-level naming.
def mark_dspark_hidden_done(
def mark_pd_hidden_done(
self,
bootstrap_room: int,
state_indices: Optional[List] = None,
) -> None:
self.mark_dspark_hidden_request_done(bootstrap_room, state_indices)
self.mark_pd_hidden_request_done(bootstrap_room, state_indices)

def pop_dspark_hidden_done(self, bootstrap_room: int) -> bool:
return self.pop_dspark_hidden_request_done(bootstrap_room)
def pop_pd_hidden_done(self, bootstrap_room: int) -> bool:
return self.pop_pd_hidden_request_done(bootstrap_room)

def check_status(self, bootstrap_room: int) -> KVPoll:
return self.request_status[bootstrap_room]
Expand Down Expand Up @@ -1182,8 +1182,8 @@ def clear(self) -> None:
self.kv_mgr.request_status.pop(self.bootstrap_room, None)
if hasattr(self.kv_mgr, "req_to_decode_prefix_len"):
self.kv_mgr.req_to_decode_prefix_len.pop(self.bootstrap_room, None)
if hasattr(self.kv_mgr, "req_to_dspark_hidden_meta"):
self.kv_mgr.req_to_dspark_hidden_meta.pop(self.bootstrap_room, None)
if hasattr(self.kv_mgr, "req_to_pd_hidden_meta"):
self.kv_mgr.req_to_pd_hidden_meta.pop(self.bootstrap_room, None)
if hasattr(self.kv_mgr, "transfer_infos"):
self.kv_mgr.transfer_infos.pop(self.bootstrap_room, None)

Expand Down
24 changes: 10 additions & 14 deletions python/sglang/srt/disaggregation/common/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ class TransferKVChunk:
state_indices: Optional[List]
chunk_id: Optional[int] = None
kv_sent: bool = False
dspark_hidden_packet_idx: int = 0
dspark_hidden_sent: bool = False
dspark_hidden_ready_sent: bool = False
dspark_hidden_ack_ready: bool = False
dspark_hidden_ack_expected_count: int = 0
dspark_hidden_ack_timed_out: bool = False
dspark_hidden_start: Optional[int] = None
dspark_hidden_row_len: int = 0
dspark_hidden_is_last_chunk: bool = False
dspark_hidden_release_indices: Optional[List[int]] = None
pd_hidden_packet_idx: int = 0
pd_hidden_sent: bool = False
pd_hidden_ready_sent: bool = False
pd_hidden_ack_ready: bool = False
pd_hidden_ack_expected_count: int = 0
pd_hidden_ack_timed_out: bool = False
pd_hidden_start: Optional[int] = None
pd_hidden_row_len: int = 0
pd_hidden_is_last_chunk: bool = False
pd_hidden_release_indices: Optional[List[int]] = None
enqueue_time: float = 0.0
source_event: Optional[Any] = None
trace_ctx: Union[TraceReqContext, TraceNullContext] = dataclasses.field(
Expand Down Expand Up @@ -146,10 +146,6 @@ def accept_chunk(
return "accepted"


DSparkHiddenChunk = PDHiddenChunk
DSparkHiddenRequestState = PDHiddenRequestState


def pack_list_of_buffers(buffers: List[bytes]) -> bytes:
if not buffers:
return b""
Expand Down
Loading
Loading