-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Expand file tree
/
Copy pathpeer.py
More file actions
363 lines (311 loc) · 15 KB
/
peer.py
File metadata and controls
363 lines (311 loc) · 15 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
from dataclasses import dataclass, field
from typing import Dict, List, Tuple
from tensorrt_llm import logger
from tensorrt_llm._torch.disaggregation.base.region import RegionMapperBase
from tensorrt_llm._torch.disaggregation.native.mixers.attention.peer import AttentionPolicy
from tensorrt_llm._torch.disaggregation.native.rank_info import RankInfo
from tensorrt_llm._torch.disaggregation.resource.kv_extractor import KVRegionExtractorV1
from tensorrt_llm._torch.disaggregation.resource.page import AttentionLayerGroup
from tensorrt_llm._torch.disaggregation.resource.utils import (
PoolRole,
get_global_layer_ids,
get_layer_group_num_layers,
get_layer_to_layer_group,
get_physical_pool,
get_pool_role,
get_pool_view_global_layer_ids,
get_pool_view_num_layers,
)
# Type alias for (lg_idx, pool_idx) pair
LGPoolKey = Tuple[int, int]
@dataclass
class PeerOverlap:
overlap_pp_size: int = 0
overlap_tp_size: int = 0
overlap_cp_size: int = 0
duplicate_head_factor: int = 1
peer_duplicate_head_factor: int = 1
ranks: List[int] = field(default_factory=list)
class PeerRegistrar:
def __init__(self, self_rank_info: RankInfo, self_extractor: KVRegionExtractorV1):
self._ri = self_rank_info
self._attention_policy = AttentionPolicy(self_rank_info)
self._peer_ri_cache: Dict[str, RankInfo] = {}
self._kv_map_cache: Dict[
tuple, RegionMapperBase
] = {} # key: (peer_key, self_lg_pool_key, peer_lg_pool_key)
self._self_ext_cache = self_extractor
self._peer_ext_cache: Dict[str, KVRegionExtractorV1] = {}
self._overlap_cache: Dict[str, PeerOverlap] = {}
self._lg_pool_mapping_cache: Dict[
str, Dict[LGPoolKey, LGPoolKey]
] = {} # peer_key -> {(self_lg, self_pi) -> (peer_lg, peer_pi)}
def register(self, peer_name: str, peer_rank: int, peer_ri: RankInfo):
assert self._self_ext_cache is not None
if not self._check_peer_compatible(peer_ri):
raise ValueError(
f"PeerRegistrar.register: peer {peer_name} (rank={peer_rank}) is incompatible with local rank."
)
key = self._unique_key(peer_name, peer_rank)
self._peer_ri_cache[key] = peer_ri
peer_ri = self.get_peer_rank_info(peer_name, peer_rank)
extractor = KVRegionExtractorV1(peer_ri.page_table)
self._peer_ext_cache[key] = extractor
def peer_extractor(self, peer_name: str, peer_rank: int) -> KVRegionExtractorV1:
return self._peer_ext_cache[self._unique_key(peer_name, peer_rank)]
@property
def self_extractor(self) -> KVRegionExtractorV1:
assert self._self_ext_cache is not None
return self._self_ext_cache
def unregister(self, peer_name: str, peer_rank: int):
key = self._unique_key(peer_name, peer_rank)
if key in self._peer_ri_cache:
del self._peer_ri_cache[key]
if key in self._peer_ext_cache:
del self._peer_ext_cache[key]
# Clean up kv_map_cache entries for this peer
keys_to_remove = [k for k in self._kv_map_cache if k[0] == key]
for k in keys_to_remove:
del self._kv_map_cache[k]
if key in self._lg_pool_mapping_cache:
del self._lg_pool_mapping_cache[key]
def get_peer_rank_info(self, peer_name: str, peer_rank: int):
return self._peer_ri_cache[self._unique_key(peer_name, peer_rank)]
@property
def self_rank_info(self) -> RankInfo:
return self._ri
def _unique_key(self, name: str, rank: int) -> str:
return name + str(rank)
def _check_peer_compatible(self, peer_ri: RankInfo) -> bool:
if not self._attention_policy.check_peer_compatible(peer_ri):
return False
self_layers = sum(self._ri.layer_num_per_pp)
peer_layers = sum(peer_ri.layer_num_per_pp)
if self_layers != peer_layers:
logger.warning(
"PeerRegistrar: total layer count mismatch "
f"(local={self_layers}, peer={peer_layers})."
)
return False
return True
def get_pool_mapping(self, peer_ri: RankInfo) -> Dict[LGPoolKey, LGPoolKey]:
"""Get mapping from (self_lg_idx, self_pool_idx) -> (peer_lg_idx, peer_pool_idx).
Two-step matching:
1. Find peer layer_group via layer_to_layer_group (global_layer_id -> lg_idx).
2. Within the matched peer layer_group, find the peer pool by matching
pool_role AND global_layer_ids overlap.
"""
key = self._unique_key(peer_ri.instance_name, peer_ri.instance_rank)
if key in self._lg_pool_mapping_cache:
return self._lg_pool_mapping_cache[key]
mapping: Dict[LGPoolKey, LGPoolKey] = {}
self_pt = self._self_ext_cache.page_table
peer_pt = peer_ri.page_table
if self_pt is None or peer_pt is None:
self._lg_pool_mapping_cache[key] = mapping
return mapping
if not self_pt.layer_groups or not peer_pt.layer_groups:
self._lg_pool_mapping_cache[key] = mapping
return mapping
peer_layer_to_group = get_layer_to_layer_group(peer_pt)
assert self._ri.attention is not None
kv_factor = self._ri.attention.kv_factor
for self_lg_idx, self_lg in enumerate(self_pt.layer_groups):
if not isinstance(self_lg, AttentionLayerGroup):
continue
for self_pi, self_pv in enumerate(self_lg.pool_views):
is_indexer = len(self_pv.buffer_entries) == 0
# For INDEXER (empty buffer_entries), use group-level IDs for step-1 lookup
pv_global_ids = (
get_global_layer_ids(self_lg)
if is_indexer
else get_pool_view_global_layer_ids(self_pv, self_lg)
)
if not pv_global_ids:
continue
# Step 1: find peer layer_group via any overlapping global_layer_id
peer_lg_idx = None
for glid in pv_global_ids:
if glid in peer_layer_to_group:
peer_lg_idx = peer_layer_to_group[glid]
break
if peer_lg_idx is None:
continue
peer_lg = peer_pt.layer_groups[peer_lg_idx]
# Step 2: find peer pool within group by matching pool_role + layer overlap
self_pool_role = (
PoolRole.INDEXER if is_indexer else get_pool_role(self_pv, kv_factor=kv_factor)
)
self_layer_set = set(pv_global_ids)
matched_peer_pi = None
for peer_pi, peer_pv in enumerate(peer_lg.pool_views):
peer_is_indexer = len(peer_pv.buffer_entries) == 0
peer_pool_role = (
PoolRole.INDEXER
if peer_is_indexer
else get_pool_role(peer_pv, kv_factor=kv_factor)
)
if peer_pool_role != self_pool_role:
continue
if is_indexer:
# INDEXER pools match by role alone
matched_peer_pi = peer_pi
break
if set(get_pool_view_global_layer_ids(peer_pv, peer_lg)) & self_layer_set:
matched_peer_pi = peer_pi
break
if matched_peer_pi is not None:
mapping[(self_lg_idx, self_pi)] = (peer_lg_idx, matched_peer_pi)
self._lg_pool_mapping_cache[key] = mapping
return mapping
def get_kv_map(
self,
peer_ri: RankInfo,
self_pool_key: LGPoolKey,
peer_pool_key: LGPoolKey,
) -> RegionMapperBase:
"""Get mapper for a specific pool pair.
Args:
peer_ri: Peer rank info.
self_pool_key: (self_lg_idx, self_pool_idx).
peer_pool_key: (peer_lg_idx, peer_pool_idx).
"""
peer_key = self._unique_key(peer_ri.instance_name, peer_ri.instance_rank)
cache_key = (peer_key, self_pool_key, peer_pool_key)
if cache_key in self._kv_map_cache:
return self._kv_map_cache[cache_key]
self_pt = self._self_ext_cache.page_table
peer_pt = peer_ri.page_table
assert self_pt is not None
assert peer_pt is not None
self_lg_idx, self_pi = self_pool_key
peer_lg_idx, peer_pi = peer_pool_key
self_lg = self_pt.layer_groups[self_lg_idx]
peer_lg = peer_pt.layer_groups[peer_lg_idx]
self_pv = self_lg.pool_views[self_pi]
peer_pv = peer_lg.pool_views[peer_pi]
assert self._ri.attention is not None
kv_factor = self._ri.attention.kv_factor
is_indexer = len(self_pv.buffer_entries) == 0
self_pool_role = (
PoolRole.INDEXER if is_indexer else get_pool_role(self_pv, kv_factor=kv_factor)
)
# For INDEXER (empty buffer_entries), use group-level global layer IDs
if is_indexer:
self_global_ids = get_global_layer_ids(self_lg)
peer_global_ids = get_global_layer_ids(peer_lg)
self_num_layers = get_layer_group_num_layers(self_lg)
peer_num_layers = get_layer_group_num_layers(peer_lg)
else:
self_global_ids = get_pool_view_global_layer_ids(self_pv, self_lg)
peer_global_ids = get_pool_view_global_layer_ids(peer_pv, peer_lg)
self_num_layers = get_pool_view_num_layers(self_pv)
peer_num_layers = get_pool_view_num_layers(peer_pv)
overlapping_layers = sorted(set(self_global_ids) & set(peer_global_ids))
transfer_layers = len(overlapping_layers)
if transfer_layers > 0:
first_overlap_layer = overlapping_layers[0]
self_layer_offset = self_global_ids.index(first_overlap_layer)
peer_layer_offset = peer_global_ids.index(first_overlap_layer)
else:
self_layer_offset = 0
peer_layer_offset = 0
self_phys = get_physical_pool(self_pt, self_lg_idx, self_pv.pool_idx)
peer_phys = get_physical_pool(peer_pt, peer_lg_idx, peer_pv.pool_idx)
mapper = self._attention_policy.build_kv_mapper(
peer_ri=peer_ri,
pool_role=self_pool_role,
transfer_layers=transfer_layers,
self_layer_offset=self_layer_offset,
peer_layer_offset=peer_layer_offset,
self_pool_num_layers=self_num_layers,
peer_pool_num_layers=peer_num_layers,
self_pool_slot_bytes=self_phys.slot_bytes,
peer_pool_slot_bytes=peer_phys.slot_bytes,
)
self._kv_map_cache[cache_key] = mapper
return mapper
@staticmethod
def _find_overlap(self_val, peer_val, self_rank, peer_rank=None):
if self_val <= peer_val:
overlap = peer_val // self_val
start = self_rank * overlap + (peer_rank * peer_val if peer_rank is not None else 0)
end = start + overlap
else:
ratio = self_val // peer_val
start = (self_rank // ratio) + (peer_rank * peer_val if peer_rank is not None else 0)
overlap = 1
end = start + overlap
return overlap, start, end
def get_peer_overlap(self, peer_rank_info: RankInfo, peer_dp_rank: int) -> PeerOverlap:
peer_ri = peer_rank_info
key = self._unique_key(peer_ri.instance_name, peer_dp_rank)
if key in self._overlap_cache:
return self._overlap_cache[key]
# compute pp overlap and target layers
self_start_layer = sum(self._ri.layer_num_per_pp[: self._ri.pp_rank])
self_end_layer = self_start_layer + self._ri.layer_num_per_pp[self._ri.pp_rank]
pre = 0
tgt_pp_ranks: List[int] = []
for p in range(peer_ri.pp_size):
peer_start_layer = pre
peer_end_layer = peer_start_layer + peer_ri.layer_num_per_pp[p]
if self_start_layer < peer_end_layer and self_end_layer > peer_start_layer:
tgt_pp_ranks.append(p)
pre += peer_ri.layer_num_per_pp[p]
if tgt_pp_ranks == []:
targets = PeerOverlap()
self._overlap_cache[key] = targets
return targets
peer_start_pp = tgt_pp_ranks[0]
overlap_pp_size = len(tgt_pp_ranks)
peer_end_pp = peer_start_pp + overlap_pp_size
self_tp_per_dp = self._ri.tp_size_per_dp_group
peer_tp_per_dp = peer_ri.tp_size_per_dp_group
self_tp_rank_in_dp = self._ri.tp_rank % self_tp_per_dp
overlap_tp_size, peer_start_tp, peer_end_tp = self._find_overlap(
self_tp_per_dp, peer_tp_per_dp, self_tp_rank_in_dp, peer_dp_rank
)
overlap_cp_size, peer_start_cp, peer_end_cp = self._find_overlap(
self._ri.cp_size, peer_ri.cp_size, self._ri.cp_rank
)
ranks: List[int] = []
for pp in range(peer_start_pp, peer_end_pp):
for cp in range(peer_start_cp, peer_end_cp):
for tp in range(peer_start_tp, peer_end_tp):
ranks.append(pp * peer_ri.tp_size * peer_ri.cp_size + cp * peer_ri.tp_size + tp)
dup_head, peer_dup_head = self._attention_policy.duplicate_head_factors(peer_ri)
targets = PeerOverlap(
overlap_pp_size=overlap_pp_size,
overlap_tp_size=overlap_tp_size,
overlap_cp_size=overlap_cp_size,
duplicate_head_factor=dup_head,
peer_duplicate_head_factor=peer_dup_head,
ranks=ranks,
)
self._overlap_cache[key] = targets
return targets
def should_send_kv(self, peer_overlap: PeerOverlap, peer_rank_info: RankInfo) -> bool:
dup_head_factor = peer_overlap.duplicate_head_factor
if dup_head_factor <= 1:
return True
self_tp_rank_in_dp_group = self._ri.tp_rank % self._ri.tp_size_per_dp_group
return (peer_rank_info.dp_rank % dup_head_factor) == (
self_tp_rank_in_dp_group % dup_head_factor
)
def should_send_aux(self, peer_rank_info: RankInfo) -> bool:
# to ensure the transfer aux is not duplicated
# TP: only the first rank in each peer-TP-sized group sends aux
ratio = max(1, self._ri.tp_size_per_dp_group // peer_rank_info.tp_size_per_dp_group)
self_tp_rank_in_dp_group = self._ri.tp_rank % self._ri.tp_size_per_dp_group
should_send_in_tp = self_tp_rank_in_dp_group % ratio == 0
# PP: only the first self-PP rank whose layers overlap with the peer's PP rank sends aux.
# All tp/pp ranks have the same aux data, so pick the first overlapping one to avoid duplication.
peer_start_layer = sum(peer_rank_info.layer_num_per_pp[: peer_rank_info.pp_rank])
peer_end_layer = peer_start_layer + peer_rank_info.layer_num_per_pp[peer_rank_info.pp_rank]
offset = 0
for p, n in enumerate(self._ri.layer_num_per_pp):
if offset < peer_end_layer and offset + n > peer_start_layer:
return should_send_in_tp and p == self._ri.pp_rank
offset += n
return False