Fix regression caused by fa3 block_table (#15009)
This commit is contained in:
@@ -263,7 +263,14 @@ def make_local_attention_virtual_batches(
|
|||||||
np.arange(actual_batch_size, dtype=np.int32),
|
np.arange(actual_batch_size, dtype=np.int32),
|
||||||
local_blocks * pages_per_local_batch,
|
local_blocks * pages_per_local_batch,
|
||||||
)
|
)
|
||||||
block_table_local = block_table[batch_indices, block_indices].view(
|
|
||||||
|
# NOTE: https://github.com/pytorch/pytorch/pull/160256 causes performance
|
||||||
|
# regression when using numpy arrays (batch and block indices) to index into
|
||||||
|
# torch tensor (block_table). As a workaround, convert numpy arrays to torch
|
||||||
|
# tensor first, which recovers perf.
|
||||||
|
batch_indices_torch = torch.from_numpy(batch_indices)
|
||||||
|
block_indices_torch = torch.from_numpy(block_indices)
|
||||||
|
block_table_local = block_table[batch_indices_torch, block_indices_torch].view(
|
||||||
virtual_batches, -1
|
virtual_batches, -1
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user