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
114 changes: 42 additions & 72 deletions sgl-kernel/python/sgl_kernel/kvcacheio.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,21 @@ def transfer_kv_per_layer(
dst_v: torch.Tensor,
src_indices: torch.Tensor,
dst_indices: torch.Tensor,
io_backend: str,
page_size: int,
item_size: int,
Comment thread
xiezhq-hermann marked this conversation as resolved.
block_quota: int = 2,
num_warps_per_block: int = 32,
):
if io_backend == "kernel":
torch.ops.sgl_kernel.transfer_kv_per_layer(
src_k,
dst_k,
src_v,
dst_v,
src_indices,
dst_indices,
item_size * src_k.element_size(), # todo, hot fix for compatibility
block_quota,
num_warps_per_block,
)
elif io_backend == "direct":
torch.ops.sgl_kernel.transfer_kv_direct(
[src_k, src_v], [dst_k, dst_v], src_indices, dst_indices, page_size
)
else:
raise ValueError(f"Unsupported io backend")
torch.ops.sgl_kernel.transfer_kv_per_layer(
src_k,
dst_k,
src_v,
dst_v,
src_indices,
dst_indices,
item_size,
block_quota,
num_warps_per_block,
)


def transfer_kv_per_layer_pf_lf(
Expand Down Expand Up @@ -69,29 +60,23 @@ def transfer_kv_all_layer(
dst_v_layers: torch.Tensor,
src_indices: torch.Tensor,
dst_indices: torch.Tensor,
io_backend: str,
item_size: int,
Comment thread
xiezhq-hermann marked this conversation as resolved.
num_layers: int,
block_quota: int = 2,
num_warps_per_block: int = 32,
):
if io_backend == "kernel":
torch.ops.sgl_kernel.transfer_kv_all_layer(
src_k_layers,
dst_k_layers,
src_v_layers,
dst_v_layers,
src_indices,
dst_indices,
item_size,
num_layers,
block_quota,
num_warps_per_block,
)
elif io_backend == "direct":
raise NotImplementedError("Deprecated interface")
else:
raise ValueError(f"Unsupported io backend")
torch.ops.sgl_kernel.transfer_kv_all_layer(
src_k_layers,
dst_k_layers,
src_v_layers,
dst_v_layers,
src_indices,
dst_indices,
item_size,
num_layers,
block_quota,
num_warps_per_block,
)


def transfer_kv_all_layer_lf_pf(
Expand Down Expand Up @@ -139,28 +124,19 @@ def transfer_kv_per_layer_mla(
dst: torch.Tensor,
src_indices: torch.Tensor,
dst_indices: torch.Tensor,
io_backend: str,
page_size: int,
item_size: int,
Comment thread
xiezhq-hermann marked this conversation as resolved.
block_quota: int = 2,
num_warps_per_block: int = 32,
):
if io_backend == "kernel":
torch.ops.sgl_kernel.transfer_kv_per_layer_mla(
src,
dst,
src_indices,
dst_indices,
item_size * src.element_size(), # todo, hot fix for compatibility
block_quota,
num_warps_per_block,
)
elif io_backend == "direct":
torch.ops.sgl_kernel.transfer_kv_direct(
[src], [dst], src_indices, dst_indices, page_size
)
else:
raise ValueError(f"Unsupported io backend")
torch.ops.sgl_kernel.transfer_kv_per_layer_mla(
src,
dst,
src_indices,
dst_indices,
item_size,
block_quota,
num_warps_per_block,
)


def transfer_kv_per_layer_mla_pf_lf(
Expand Down Expand Up @@ -190,27 +166,21 @@ def transfer_kv_all_layer_mla(
dst_layers: torch.Tensor,
src_indices: torch.Tensor,
dst_indices: torch.Tensor,
io_backend: str,
item_size: int,
Comment thread
xiezhq-hermann marked this conversation as resolved.
num_layers: int,
block_quota: int = 2,
num_warps_per_block: int = 32,
):
if io_backend == "kernel":
torch.ops.sgl_kernel.transfer_kv_all_layer_mla(
src_layers,
dst_layers,
src_indices,
dst_indices,
item_size,
num_layers,
block_quota,
num_warps_per_block,
)
elif io_backend == "direct":
raise NotImplementedError("Deprecated interface")
else:
raise ValueError(f"Unsupported io backend")
torch.ops.sgl_kernel.transfer_kv_all_layer_mla(
src_layers,
dst_layers,
src_indices,
dst_indices,
item_size,
num_layers,
block_quota,
num_warps_per_block,
)


def transfer_kv_all_layer_mla_lf_pf(
Expand Down
10 changes: 2 additions & 8 deletions sgl-kernel/tests/test_kvcacheio.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ def test_transfer_kv(
dst_pool_kernel[layer_idx_to_test],
src_indices_device,
dst_indices_device,
io_backend="kernel",
page_size=page_size,
item_size=item_size,
item_size=item_size * dtype.itemsize,
Comment thread
xiezhq-hermann marked this conversation as resolved.
)
transfer_kv_direct(
[src_pool_host[layer_idx_to_test]],
Expand Down Expand Up @@ -138,7 +136,6 @@ def test_transfer_kv(
dst_layers_device,
src_indices_device,
dst_indices_device,
io_backend="kernel",
item_size=item_size * dtype.itemsize,
Comment thread
xiezhq-hermann marked this conversation as resolved.
num_layers=num_layers,
)
Expand Down Expand Up @@ -173,9 +170,7 @@ def test_transfer_kv(
dst_v_pool_kernel[layer_idx_to_test],
src_indices_device,
dst_indices_device,
io_backend="kernel",
page_size=page_size,
item_size=item_size,
item_size=item_size * dtype.itemsize,
Comment thread
xiezhq-hermann marked this conversation as resolved.
)
transfer_kv_direct(
[src_k_pool[layer_idx_to_test], src_v_pool[layer_idx_to_test]],
Expand Down Expand Up @@ -235,7 +230,6 @@ def test_transfer_kv(
dst_v_layers_device,
src_indices_device,
dst_indices_device,
io_backend="kernel",
item_size=item_size * dtype.itemsize,
Comment thread
xiezhq-hermann marked this conversation as resolved.
num_layers=num_layers,
)
Expand Down
Loading