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
24 changes: 19 additions & 5 deletions tests/ut/kv_connector/test_mooncake_connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ def setUp(self):
engine=self.engine,
local_engine_id="local_engine",
local_handshake_port=5555,
side_channel_port=30000,
local_kv_caches_base_addr=[0x1000, 0x2000],
block_len=[1024, 2048],
ready_event=self.ready_event,
Expand Down Expand Up @@ -294,6 +295,7 @@ def setUp(self):
engine=self.engine,
local_engine_id="local_engine",
local_handshake_port=5555,
side_channel_port=30000,
local_kv_caches_base_addr=[0x1000, 0x2000],
block_len=[1024, 2048],
ready_event=self.ready_event,
Expand Down Expand Up @@ -351,6 +353,7 @@ def setUp(self):
engine=self.engine,
local_engine_id="local_engine",
local_handshake_port=5555,
side_channel_port=30000,
local_kv_caches_base_addr=[0x1000, 0x2000],
block_len=[1024, 2048],
ready_event=self.ready_event,
Expand All @@ -367,6 +370,9 @@ def setUp(self):
"remote_transfer_port": 7777,
"offset": 0,
"tp_num_need_pulls": 2,
"remote_port_send_num": {
6666: 1
},
"all_task_done": False
}
self.thread.task_tracker = MagicMock()
Expand All @@ -382,7 +388,7 @@ def test_handle_request(self, mock_send, mock_transfer):
self.thread._handle_request(self.test_req)

mock_transfer.assert_called_once_with(self.test_req)
mock_send.assert_called_once_with("req1", "localhost", 6666)
mock_send.assert_called_once_with("req1", "localhost", 6666, {6666: 1})
if not self.thread.task_tracker.update_done_task_count.called:
self.thread.task_tracker.update_done_task_count("req1")
self.thread.task_tracker.update_done_task_count.assert_called_once_with(
Expand Down Expand Up @@ -433,6 +439,7 @@ def setUp(self):
engine=self.engine,
local_engine_id="local_engine",
local_handshake_port=5555,
side_channel_port=30000,
local_kv_caches_base_addr=[0x1000, 0x2000],
block_len=[1024, 2048],
ready_event=self.ready_event,
Expand Down Expand Up @@ -497,6 +504,7 @@ def setUp(self):
engine=self.engine,
local_engine_id="local_engine",
local_handshake_port=5555,
side_channel_port=30000,
local_kv_caches_base_addr=[0x1000, 0x2000],
block_len=[1024, 2048],
ready_event=self.ready_event,
Expand Down Expand Up @@ -654,6 +662,7 @@ def test_add_new_req(self):

meta.add_new_req(request_id="req1",
local_block_ids=[1, 2, 3],
num_external_tokens=48,
kv_transfer_params={
"remote_block_ids": [4, 5, 6],
"remote_engine_id": "remote_engine",
Expand Down Expand Up @@ -706,7 +715,7 @@ def test_build_connector_meta(self):
request = MockRequest("req1")
blocks_mock = MagicMock()
blocks_mock.get_unhashed_block_ids.return_value = [4, 5, 6]
self.scheduler._reqs_need_recv["req1"] = (request, [4, 5, 6])
self.scheduler._reqs_need_recv["req1"] = (request, [4, 5, 6], 48)
request.kv_transfer_params = {
"remote_block_ids": [1, 2, 3],
"remote_engine_id": "remote",
Expand Down Expand Up @@ -1278,6 +1287,8 @@ def get_kv_split_metadata(use_mla, pcp_size, dcp_size, tp_size,
worker.pcp_rank = pcp_rank
worker._prefill_tp_size = _prefill_tp_size
worker.local_remote_block_port_mapping = None
worker.block_size = 16
worker.num_key_value_heads = 1

meta = types.SimpleNamespace()

Expand All @@ -1286,6 +1297,9 @@ def get_kv_split_metadata(use_mla, pcp_size, dcp_size, tp_size,
meta.remote_port = remote_port
meta.remote_block_ids = remote_block_ids
meta.local_block_ids = local_block_ids
meta.num_external_tokens = pcp_size * dcp_size * len(
local_block_ids) * worker.block_size
meta.num_prompt_blocks = pcp_size * dcp_size * len(local_block_ids)

remote_handshake_port_list, local_block_ids_list, remote_block_ids_list = worker._get_kv_split_metadata(
'0', meta)
Expand Down Expand Up @@ -1324,17 +1338,17 @@ def get_kv_split_metadata(use_mla, pcp_size, dcp_size, tp_size,
self.assertEqual(
get_kv_split_metadata(True, 1, 2, 8, 1, 0, 8, 2, 2, 30000, [1],
[1]),
([[30009], [30001]], [[], [1]], [[], [1]]))
([[30000], [30008]], [[1], []], [[1], []]))

self.assertEqual(
get_kv_split_metadata(False, 1, 2, 8, 1, 0, 8, 2, 2, 30000, [1],
[1]),
([[30009], [30001]], [[], [1]], [[], [1]]))
([[30000], [30008]], [[1], []], [[1], []]))

self.assertEqual(
get_kv_split_metadata(True, 1, 2, 8, 0, 0, 8, 2, 2, 30000,
[1, 2, 3], [1, 2, 3, 4, 5]),
([[30008], [30000]], [[1, 2], [3, 4, 5]], [[1, 2], [1, 2, 3]]))
([[30000], [30008]], [[1, 2, 3], [4, 5]], [[1, 2, 3], [1, 2]]))


if __name__ == '__main__':
Expand Down
Loading
Loading