Skip to content

Commit ed03704

Browse files
committed
fix conflict
Signed-off-by: Bo Deng <deemod@nvidia.com>
1 parent f329156 commit ed03704

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tensorrt_llm/_torch/disaggregation/native/transfer.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -521,19 +521,19 @@ def _build_kv_write_meta(self, task: KVSendTask, req_info: RecvReqInfo) -> Write
521521
frag_size = rp.src.memory.bytes_per_region # type: ignore[attr-defined]
522522
kv_sizes.extend([frag_size] * len(rp.src.memory.ptrs)) # type: ignore[attr-defined]
523523

524-
# handle mamba fragments
525-
m_src, m_dst, m_sizes = MambaPolicy.collect_frags(
526-
self_page_table=extractor.page_table,
527-
peer_page_table=peer_extractor.page_table,
528-
src_slot=self._slice.mamba_state_index,
529-
dst_slot=req_info.mamba_state_index,
530-
self_ri=self._registrar.self_rank_info,
531-
peer_ri=peer_ri,
532-
)
533-
if m_src:
534-
src_frags.extend(m_src)
535-
dst_frags.extend(m_dst)
536-
kv_sizes.extend(m_sizes)
524+
# handle mamba fragments
525+
m_src, m_dst, m_sizes = MambaPolicy.collect_frags(
526+
self_page_table=extractor.page_table,
527+
peer_page_table=peer_extractor.page_table,
528+
src_slot=task._slice.mamba_state_index,
529+
dst_slot=req_info.mamba_state_index,
530+
self_ri=self._registrar.self_rank_info,
531+
peer_ri=peer_ri,
532+
)
533+
if m_src:
534+
src_frags.extend(m_src)
535+
dst_frags.extend(m_dst)
536+
kv_sizes.extend(m_sizes)
537537

538538
if timer:
539539
timer.record_prepare_args_end(peer_ri.instance_rank)

0 commit comments

Comments
 (0)