mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2026-04-23 08:21:53 +08:00
7707be8384
* [Feature][KVCache] Support cache manager v1 architecture Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Update cache manager and related modules Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: update cache_manager and related modules Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: add node to evictable set in complete_swap_to_device When a node transitions from SWAP_TO_DEVICE to DEVICE via complete_swap_to_device, it was not being added to the _evictable_device set. This caused nodes with ref_count=0 to become "orphaned" - not appearing in any evictable set despite having cache_status=DEVICE. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: update cache manager v1 and related modules - Add new cache_manager.py with cache management functionality - Add radix_tree.py for prefix caching - Update block_pool.py and metadata.py - Update request.py and resource_manager_v1.py for scheduling - Update gpu_model_runner.py for GPU model execution Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat(cache): add cache controller v1 implementation - Add CacheController class for cache management - Update config.py with cache related configurations - Refactor gpu_model_runner.py for improved cache handling * feat(cache_manager): update cache manager v1 * fix(cache_manager): 修复 swap_cache H2D/D2H 方向的 block_ids 逻辑并清理 ForwardMeta ## Motivation 修复 swap_cache_optimized.cu 中 H2D 方向时 src/dst block_ids 使用错误的问题, 并清理 ForwardMeta 中已废弃的 cache_controller 字段。 ## Modifications - fix: swap_cache_optimized.cu 中根据 D2H 模板参数正确选取 src/dst block_ids, 修复 H2D 方向 src/dst 倒置 bug(同时修复 SwapCachePerLayerImpl 和 SwapCacheAllLayersBatchImpl) - refactor: cache_manager/v1/__init__.py 将 LayerSwapTimeoutError 导入从 cache_controller 改为 cache_utils(正确来源) - refactor: ForwardMeta 移除废弃的 cache_controller 字段 - refactor: gpu_model_runner.py 移除对应的 cache_controller 赋值语句 - test: 新增 tests/cache_manager/v1/test_swap_cache_ops.py 单元测试 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * feat(cache_manager): refactor cache manager v1 and optimize swap ops ## Motivation 对 cache manager v1 进行重构和优化,精简代码结构,提升可维护性。 ## Modifications - 重构 transfer_manager.py,大幅精简代码逻辑 - 优化 swap_cache_optimized.cu GPU 算子实现 - 调整 cache_manager.py、cache_controller.py 逻辑,修复 free_device_blocks 方法缺失问题 - 更新 block_pool.py、cache_utils.py、metadata.py、radix_tree.py - 精简 gpu_model_runner.py、forward_meta.py、attention.py 中相关调用 - 更新对应单元测试(test_cache_controller、test_swap_cache_ops、test_transfer_manager) - 调整 config.py 中相关配置项 * [KVCache][MTP] 支持 cache_manager_v1 下的 MTP KV Cache 初始化及多模态 hash ## Motivation 在 enable_cache_manager_v1 路径下,MTP(speculative decode)的 KV Cache 需要由 CacheController 统一管理,以复用 swap/transfer 能力,同时修复多模态场景下 block hash 未携带 multimodal extra_keys 的问题。 ## Modifications - `cache_controller.py` - 新增 `initialize_mtp_kv_cache`:通过 CacheController 初始化 MTP KV Cache, 并将其注册到 cache_kvs_map,使 transfer_manager 自动覆盖 MTP 层 - `initialize_host_cache` 中的 num_layers 改为包含 MTP 额外 cache 层数,保证 Host Cache 也为 MTP 分配足够空间 - `_free_gpu_cache` 改名为 `free_gpu_cache`(对外可调用) - `cache_utils.py` - 新增 `get_block_hash_extra_keys`:提取单个 block 内的多模态 hash 信息, 对齐 PrefixCacheManager 的 multimodal extra_keys 逻辑 - `get_request_block_hasher` 中在 hash_block_tokens 时携带 extra_keys, 修复多模态场景 prefix cache 命中率不准的问题 - `spec_decode/mtp.py` - `update_mtp_block_num` 新增 `skip_cache_init` 参数,避免 v1 cache manager 路径下重复初始化 MTP KV Cache - `gpu_model_runner.py` - `initialize_kv_cache(v1)` 路径:在主模型 cache 初始化后,调用 `cache_controller.initialize_mtp_kv_cache` 完成 MTP cache 创建 - `clear_cache` / `wakeup` / `reset` 等路径:respect `enable_cache_manager_v1` 标志,跳过重复的 proposer.initialize_kv_cache 调用 ## Usage or Command ```bash # 启动支持 MTP + cache_manager_v1 的推理服务(示例) bash run.sh ``` * fix(cache_manager): multi-GPU fix, mm hash boundary fix, and remove batch ops 1. Fix CuPy stream/event creation for multi-GPU: wrap all stream operations with cp.cuda.Device(device_id) context to ensure streams/events are bound to the correct device, preventing cross-device errors in multi-GPU setups. 2. Remove cudaSetDevice from SwapCacheAllLayers (handled by cupy context now). 3. Remove swap_cache_all_layers_batch op: simplified the implementation by removing the batch upload variant; all-layer transfers now use the standard swap_cache_all_layers with cupy device context. 4. Fix mm hash boundary comparison in get_block_hash_extra_keys: change strict less-than (<) to less-than-or-equal (<=) so that multimodal items ending exactly at block start are correctly excluded. 5. Extract config fields to KVCacheBase: model_config, cache_config, quant_config, parallel_config are now set in the base class __init__ to avoid duplication in CacheController and CacheManager subclasses. 6. Translate metadata.py docstrings from Chinese to English for broader contributor accessibility. 7. Add test_cache_utils.py: comprehensive unit tests for get_block_hash_extra_keys covering all boundary and overlap scenarios. 8. Expand test suite: test_request.py cache fields tests, test_radix_tree.py backup candidate tests, test_transfer_manager.py and test_cache_manager.py multi-GPU and concurrent operation tests. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] fix List import and move write_policy normalization to CacheManager ## Motivation 修复两处问题: 1. `fastdeploy/engine/request.py` 中 `List` 未导入导致 pre-commit F821 报错 2. `write_policy` 归一化逻辑(`write_through` → `write_through_selective`)不应放在 `FDConfig`,移至 `CacheManager.__init__` 中,使其只影响 Cache Manager V1 的内部逻辑 ## Modifications - `fastdeploy/engine/request.py`: 在 `typing` 导入中补充 `List`,删除重复的 `CacheSwapMetadata` TYPE_CHECKING 导入,修复 F821/F811 - `fastdeploy/config.py`: 删除 `write_policy` 归一化逻辑 - `fastdeploy/cache_manager/v1/cache_manager.py`: 将归一化逻辑移入 `CacheManager.__init__` Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] fix pre-commit code style issues ## Motivation 修复 CI pre-commit 代码风格检查失败问题。 ## Modifications - `fastdeploy/engine/common_engine.py`: black 格式化 - `fastdeploy/worker/worker_process.py`: black 格式化 + isort 修复 - `fastdeploy/cache_manager/v1/storage/__init__.py`: isort 修复 - `fastdeploy/worker/gpu_worker.py`: isort 修复 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [Feature][KVCache] update cache_manager_v1 modules ## Motivation 更新 Cache Manager V1 相关模块,完善版权信息、改进模块结构与可维护性。 ## Modifications - `fastdeploy/cache_manager/v1/` 系列模块:补充版权 header,优化代码结构 - `fastdeploy/config.py`:配置项更新 - `fastdeploy/engine/sched/resource_manager_v1.py`:调度相关更新 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [Feature][KVCache] add BatchRequest.from_tasks and refactor worker task parsing ## Motivation 将 worker_process 中重复的 task 解析逻辑收敛到 BatchRequest,减少代码冗余,提升可维护性。 ## Modifications - `fastdeploy/engine/request.py`:新增 `BatchRequest.from_tasks()` 类方法,统一将 task_queue 任务分类为推理请求和控制请求 - `fastdeploy/worker/worker_process.py`:使用 `BatchRequest.from_tasks()` 替代内联解析逻辑,并修复重复的 control_reqs 处理块 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [Feature][KVCache] add NUMA affinity for host cache and skip swap cache tests ## Motivation 优化 Host cache 内存分配的 NUMA 亲和性,减少跨 NUMA 访问延迟; 同时跳过 swap cache ops 测试(当前环境不支持)。 ## Modifications - `fastdeploy/cache_manager/v1/cache_controller.py`: - 新增 `_get_numa_node_for_gpu()` 方法,通过 nvidia-smi 或 sysfs 获取 GPU 对应的 NUMA 节点 - 新增 `_bind_to_closest_numa_node()` 方法,绑定当前线程到 GPU 最近的 NUMA 节点 - 在 `initialize_host_cache()` 中调用 NUMA 绑定,优化 H2D 传输性能 - `tests/cache_manager/v1/test_swap_cache_ops.py`:跳过所有测试类(`TestSwapCacheAllLayersCorrectness`、`TestSwapCacheAllLayersPerformance`、`TestSwapCacheRandomBlockIndices`) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] fix unittest failures for cache_manager_v1 三个单测因接口变更或 Mock 方式问题导致失败,需修复。 - tests/distributed/chunked_moe.py:`setup_model_runner` 使用 `__new__` 跳过 `__init__`,补加 `enable_cache_manager_v1 = False`,修复 `AttributeError` - tests/engine/test_resource_manager.py:`PrefixCacheManager` 为局部导入,`patch` 路径改为定义位置 `fastdeploy.cache_manager.prefix_cache_manager.PrefixCacheManager` - tests/v1/test_resource_manager_v1.py:`_trigger_preempt` 第四参数已由 `list` 改为 `BatchRequest`,更新测试传参和断言 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] remove debug logging code ## Modifications - fastdeploy/engine/request.py:删除调试用 logger 及 prompt_hashes 中的 debug 日志 - fastdeploy/worker/worker_process.py:删除 __main__ 中的调试 import 和 print 语句 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] fix cupy device id caching and pickle for _match_result ## Motivation 修复两个 bug: 1. `transfer_manager.py` 中每次调用 `cp.cuda.runtime.getDevice()` 存在隐患,应在初始化时缓存为实例变量,保证后续操作使用一致的设备 ID。 2. `request.py` 的 `__getstate__` 未跳过 `_match_result`,该字段包含 BlockNode 树的父子循环引用,pickle 时会触发 `RecursionError`;同时补充 `__setstate__` 确保 unpickle 后字段恢复为安全默认值。 ## Modifications - `transfer_manager.py`:初始化时调用 `cp.cuda.runtime.getDevice()` 并缓存到 `self._cupy_device_id`,后续 `with cp.cuda.Device(...)` 和日志均使用该缓存值。 - `request.py`: - `__getstate__` 中将 `_match_result` 加入跳过集合 `_SKIP_KEYS`,避免循环引用导致 pickle 失败。 - 新增 `__setstate__`,unpickle 后将 `_block_hasher` 和 `_match_result` 恢复为 `None`。 ## Usage or Command * fix(test): fix unit test errors for _trigger_preempt and wakeup with MTP - Use BatchRequest instead of list in test_trigger_preempt_records_tasks - Add missing enable_cache_manager_v1 attr in TestSleepWakeupBehavior._make_runner Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] fix gpu_free_block_list returning wrong block IDs ## Motivation `gpu_free_block_list` 的兼容 property 中误用了 `list(range(N))`, 将 `available_blocks()` 的返回值当作整数传给 `range()`, 导致返回 `[0, 1, ..., N-1]` 的假列表,而非真实的空闲 block ID。 ## Modifications - `cache_manager/v1/cache_manager.py`:将 `list(range(self._device_pool.available_blocks()))` 改为 `list(self._device_pool.available_blocks())` Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] 修复 gpu_free_block_list 返回 int 导致 TypeError ## Motivation gpu_free_block_list 属性中调用 BlockPool.available_blocks(), 该方法返回 int(空闲块数量),用 list() 包装 int 会触发 TypeError: 'int' object is not iterable。 ## Modifications 将 list(self._device_pool.available_blocks()) 改为 list(self._device_pool._free_blocks),直接返回空闲块索引列表。 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [KVCache][CacheManager] 适配 V1 CacheManager 的 pause/sleep/free_cache 操作 ## Motivation V1 CacheManager 引入了新的 reset_cache() 接口,pause 和 sleep 操作需要适配, 同时 free_cache 需要支持可选的 clear_storage 参数。 ## Modifications - cache_controller.py: free_cache 新增 clear_storage 参数(默认 False), 仅当 clear_storage=True 时才调用 _clear_storage(),避免不必要的 storage 清空 - common_engine.py: pause 和 sleep 操作中,当 ENABLE_V1_KVCACHE_MANAGER 时 使用 cache_manager.reset_cache() 替代旧的 reset() 和 pause_transfer 逻辑 - gpu_model_runner.py: sleep 时仅在非 V1 cache manager 下执行 MTP cache 清除 ## Usage or Command # 启动服务(V1 CacheManager) python -m fastdeploy.entrypoints.openai.api_server \ --enable-v1-kvcache-manager \ ... * [BugFix][KVCache] fix missing enable_cache_manager_v1 in test mocks and remove unused select_blocks_for_backup - Remove unused `select_blocks_for_backup` method from radix_tree.py - Fix `match_prefix` default param `skip_storage=True` and log order in cache_manager.py - Sync test_gpu_model_runner.py with upstream/develop (add TestInsertTasksV1SplitwiseSuffix) - Add `enable_cache_manager_v1=False` to all mock runners to fix AttributeError in CI Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [BugFix][KVCache] simplify _free_blocks in ResourceManagerV1 for non-v1 path Remove redundant prefix_caching branch in else path; always call recycle_gpu_blocks with full block_tables for non-cache-manager-v1 case. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * [KVCache][Optimization][BugFix] fix and optimize block_pool, cache_manager, transfer_manager, request ## Motivation 修复 cache_manager v1 中若干代码质量问题,提升性能并消除潜在的类型不一致 Bug。 ## Modifications 1. **block_pool.py**:`BlockPool.allocate` 将逐个 pop 循环替换为切片 + 批量 set.update,消除 Python 循环开销,O(n) → O(k)(C 层批量操作) 2. **cache_manager.py**:`match_prefix` 在 prefix caching 关闭时提前 return 前写入空 `MatchResult()`,避免调用方解引用 `_match_result=None` 崩溃 3. **transfer_manager.py**:`_build_device_layer_indices` 在 `_cache_kvs_map` 为空时也重置四个层索引列表,防止残留旧 tensor 被 swap 算子使用 4. **request.py**:`BatchRequest.append_swap_metadata` / `append_evict_metadata` 构造 `CacheSwapMetadata` 时将 `src_type`/`dst_type` 从字符串改为 `CacheLevel` 枚举,与字段类型声明一致;补充 `CacheLevel` 导入;`match_result` 属性返回类型标注修正为 `Optional[MatchResult]` 5. **resource_manager_v1.py**:`_allocate_gpu_blocks` 日志从 `INFO` 降级为 `DEBUG`,消除高频调度路径的日志噪音 6. **tests/engine/test_request.py**:同步更新 `src_type`/`dst_type` 断言为 `CacheLevel` 枚举值,补充 `CacheLevel` 导入 ## Usage or Command 单元测试: ```bash source .venv/py310/bin/activate cd baidu/FastDeploy python -m pytest tests/cache_manager/v1/test_cache_manager.py -v python -m pytest tests/cache_manager/v1/test_transfer_manager.py -v python -m pytest tests/engine/test_request.py -v ``` * [BugFix][KVCache] Fix BlockPool.allocate returns all blocks when num_blocks=0 ## Motivation 当 `allocate(num_blocks=0)` 被调用时,Python 负索引陷阱导致严重错误: `-0 == 0`,所以 `self._free_blocks[-0:]` 等价于 `self._free_blocks[0:]`, 会返回并清空整个空闲块列表,而非返回空列表。 ## Modifications 在 `BlockPool.allocate` 中增加对 `num_blocks == 0` 的提前判断,直接返回 `[]`, 避免触发 Python 负索引陷阱。 ## Usage or Command ```bash # 运行相关单元测试验证修复 python -m pytest tests/cache_manager/v1/test_cache_manager.py -vv -s ``` * [KVCache][Test] add unit tests for cache_manager v1 modules ## Motivation 补全 cache_manager/v1 各模块的单测覆盖,确保核心方法有完整的测试保障。 ## Modifications 新增/补充以下测试文件,全部 326 个用例通过: - tests/cache_manager/v1/test_block_pool.py(新建) 覆盖 BlockPool.get_metadata/set_metadata/resize、DeviceBlockPool/HostBlockPool - tests/cache_manager/v1/test_metadata.py(新建) 覆盖 BlockNode、RadixTreeStats、MatchResult、CacheSwapMetadata、AsyncTaskHandler - tests/cache_manager/v1/test_cache_utils.py(补充) 新增 hash_block_tokens、get_request_block_hasher、LayerDoneCounter 时间追踪及内部辅助方法 - tests/cache_manager/v1/test_radix_tree.py(补充) 新增 TestCompleteSwapToDevice 专项测试类(6 个用例) - tests/cache_manager/v1/test_cache_manager.py(补充) 新增 offload_to_host、load_from_host、pending backup 系列、prepare_prefetch_metadata - tests/cache_manager/v1/test_transfer_manager.py(补充) 新增 _swap_single_layer 校验路径、sync_input/output_stream、record_input_stream_event ## Usage or Command ```bash # 运行所有新增单测 source .venv/py310/bin/activate python -m pytest tests/cache_manager/v1/test_block_pool.py \ tests/cache_manager/v1/test_metadata.py \ tests/cache_manager/v1/test_cache_utils.py \ tests/cache_manager/v1/test_radix_tree.py \ tests/cache_manager/v1/test_cache_manager.py \ tests/cache_manager/v1/test_transfer_manager.py -v # 期望结果:326 passed ``` --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Jiang-Jia-Jun <163579578+Jiang-Jia-Jun@users.noreply.github.com>
755 lines
30 KiB
Python
755 lines
30 KiB
Python
# Copyright (c) 2025 PaddlePaddle Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import unittest
|
|
from dataclasses import dataclass
|
|
from unittest.mock import MagicMock, Mock, patch
|
|
|
|
import numpy as np
|
|
import paddle
|
|
|
|
from fastdeploy.engine.request import ImagePosition
|
|
from fastdeploy.spec_decode import SpecMethod
|
|
from fastdeploy.worker.gpu_model_runner import GPUModelRunner
|
|
from fastdeploy.worker.input_batch import InputBatch
|
|
|
|
|
|
@dataclass
|
|
class TestRequest:
|
|
multimodal_inputs: dict = None
|
|
|
|
|
|
class TestFeaturePositions(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
# Create a mock GPUModelRunner instance for testing
|
|
self.mock_fd_config = Mock()
|
|
self.mock_model_config = Mock()
|
|
self.mock_model_config.enable_mm = True
|
|
self.mock_fd_config.model_config = self.mock_model_config
|
|
|
|
# Mock other necessary configurations
|
|
self.mock_fd_config.scheduler_config = Mock()
|
|
self.mock_fd_config.scheduler_config.max_num_seqs = 10
|
|
self.mock_fd_config.parallel_config = Mock()
|
|
self.mock_fd_config.parallel_config.tensor_parallel_size = 1
|
|
|
|
self.runner = GPUModelRunner.__new__(GPUModelRunner)
|
|
self.runner.fd_config = self.mock_fd_config
|
|
self.runner.model_config = self.mock_model_config
|
|
self.runner.scheduler_config = self.mock_fd_config.scheduler_config
|
|
|
|
def test_completely_within_range(self):
|
|
"""Test positions that are completely within the prefill range"""
|
|
mm_positions = [
|
|
ImagePosition(offset=10, length=5), # [10, 14]
|
|
ImagePosition(offset=15, length=5), # [15, 19]
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 2)
|
|
self.assertEqual(result[0].offset, 0)
|
|
self.assertEqual(result[0].length, 5)
|
|
self.assertEqual(result[1].offset, 0)
|
|
self.assertEqual(result[1].length, 5)
|
|
|
|
def test_completely_outside_range(self):
|
|
"""Test positions that are completely outside the prefill range"""
|
|
mm_positions = [
|
|
ImagePosition(offset=5, length=3), # [5, 7] - before range
|
|
ImagePosition(offset=25, length=5), # [25, 29] - after range
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 0)
|
|
|
|
def test_partial_overlap_start(self):
|
|
"""Test positions that partially overlap at the start of the range"""
|
|
mm_positions = [
|
|
ImagePosition(offset=8, length=5), # [8, 12] overlaps with [10, 20]
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 1)
|
|
self.assertEqual(result[0].offset, 2) # Adjusted to start at prefill_start_index
|
|
self.assertEqual(result[0].length, 3) # Length reduced to fit within range
|
|
|
|
def test_partial_overlap_end(self):
|
|
"""Test positions that partially overlap at the end of the range"""
|
|
mm_positions = [
|
|
ImagePosition(offset=8, length=50), # [8, 58] overlaps with [10, 20]
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 1)
|
|
self.assertEqual(result[0].offset, 2) # Offset remains the same
|
|
self.assertEqual(result[0].length, 10) # Length reduced to fit within range
|
|
|
|
def test_exact_range_boundary(self):
|
|
"""Test positions that exactly match the range boundaries"""
|
|
mm_positions = [
|
|
ImagePosition(offset=10, length=10), # Exactly matches [10, 20]
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 1)
|
|
self.assertEqual(result[0].offset, 0)
|
|
self.assertEqual(result[0].length, 10)
|
|
|
|
def test_edge_overlap(self):
|
|
"""Test positions that exactly touch the range boundaries"""
|
|
mm_positions = [
|
|
ImagePosition(offset=20, length=5), # Starts exactly at end boundary but should be excluded
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 0) # Should be excluded - ends at boundary means outside
|
|
|
|
def test_multiple_overlapping_positions(self):
|
|
"""Test mixed positions with different overlap scenarios"""
|
|
mm_positions = [
|
|
ImagePosition(offset=5, length=3), # [5, 8] - before range
|
|
ImagePosition(offset=8, length=5), # [8, 13] - overlaps start
|
|
ImagePosition(offset=13, length=6), # [13, 19] - completely within
|
|
ImagePosition(offset=19, length=5), # [19, 24] - overlaps end
|
|
ImagePosition(offset=24, length=3), # [24, 27] - after range
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
self.assertEqual(len(result), 3)
|
|
|
|
# First position (overlapping start)
|
|
self.assertEqual(result[0].offset, 2)
|
|
self.assertEqual(result[0].length, 3)
|
|
|
|
# Second position (completely within)
|
|
self.assertEqual(result[1].offset, 0)
|
|
self.assertEqual(result[1].length, 6)
|
|
|
|
# Third position (overlapping end)
|
|
self.assertEqual(result[2].offset, 0)
|
|
self.assertEqual(result[2].length, 1)
|
|
|
|
def test_zero_length_range(self):
|
|
"""Test with zero-length prefill range"""
|
|
mm_positions = [
|
|
ImagePosition(offset=10, length=5),
|
|
]
|
|
prefill_start_index = 15
|
|
prefill_end_index = 15 # Zero-length range
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 0)
|
|
|
|
def test_empty_positions_list(self):
|
|
"""Test with an empty positions list"""
|
|
mm_positions = []
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 0)
|
|
|
|
def test_identical_positions_copy(self):
|
|
"""Test that positions within range are correctly deep copied"""
|
|
mm_positions = [
|
|
ImagePosition(offset=12, length=5),
|
|
]
|
|
prefill_start_index = 10
|
|
prefill_end_index = 20
|
|
|
|
result = self.runner._get_feature_positions(mm_positions, prefill_start_index, prefill_end_index)
|
|
|
|
self.assertEqual(len(result), 1)
|
|
# Verify it's a copy, not the same object
|
|
self.assertIsNot(result[0], mm_positions[0])
|
|
# But has the same values
|
|
self.assertEqual(result[0].offset, 0)
|
|
self.assertEqual(result[0].length, 5)
|
|
|
|
|
|
class TestProcessMMFeatures(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
# Create a mock GPUModelRunner instance for testing
|
|
self.mock_fd_config = Mock()
|
|
self.mock_model_config = Mock()
|
|
self.mock_model_config.enable_mm = True
|
|
self.mock_model_config.model_type = "qwen"
|
|
self.mock_fd_config.model_config = self.mock_model_config
|
|
|
|
# Mock other necessary configurations
|
|
self.mock_fd_config.scheduler_config = Mock()
|
|
self.mock_fd_config.scheduler_config.max_num_seqs = 10
|
|
self.mock_fd_config.parallel_config = Mock()
|
|
self.mock_fd_config.parallel_config.tensor_parallel_size = 1
|
|
|
|
self.runner = GPUModelRunner.__new__(GPUModelRunner)
|
|
self.runner.fd_config = self.mock_fd_config
|
|
self.runner.model_config = self.mock_model_config
|
|
self.runner.scheduler_config = self.mock_fd_config.scheduler_config
|
|
self.runner.enable_mm = True
|
|
self.runner.is_pooling_model = False
|
|
self.runner.encoder_cache = {}
|
|
self.runner.share_inputs = InputBatch(self.mock_fd_config)
|
|
self.runner.share_inputs.image_features = None
|
|
self.runner.share_inputs.image_features_list = None
|
|
self.runner.share_inputs.rope_emb = paddle.full(shape=[2, 1], fill_value=0, dtype="float32")
|
|
self.runner.extract_vision_features = Mock()
|
|
self.runner.prepare_rope3d = Mock()
|
|
|
|
def _create_mock_request(self, with_image=False, task_type_value=0, **kwargs):
|
|
"""Helper method to create mock requests"""
|
|
request = Mock()
|
|
request.task_type.value = task_type_value
|
|
request.idx = kwargs.get("idx", 0)
|
|
request.request_id = kwargs.get("request_id", "test_req")
|
|
request.with_image = with_image
|
|
request.prefill_start_index = kwargs.get("prefill_start_index", 0)
|
|
request.prefill_end_index = kwargs.get("prefill_end_index", 10)
|
|
request.num_image_start = kwargs.get("num_image_start", 0)
|
|
request.num_image_end = kwargs.get("num_image_end", 0)
|
|
request.image_start = kwargs.get("image_start", 0)
|
|
request.image_end = kwargs.get("image_end", 0)
|
|
|
|
# Setup multimodal_inputs
|
|
request.multimodal_inputs = {
|
|
"position_ids": kwargs.get("position_ids", np.array([[1, 2, 3]])),
|
|
}
|
|
|
|
if with_image:
|
|
request.multimodal_inputs.update(
|
|
{
|
|
"images": kwargs.get("images", []),
|
|
"grid_thw": kwargs.get("grid_thw", []),
|
|
"mm_positions": kwargs.get("mm_positions", []),
|
|
"mm_hashes": kwargs.get("mm_hashes", []),
|
|
"vit_seqlen": kwargs.get("vit_seqlen", []),
|
|
"vit_position_ids": kwargs.get("vit_position_ids", []),
|
|
"mm_num_token_func": lambda **kwargs: 123,
|
|
}
|
|
)
|
|
|
|
# Add get method for evict_mm_hashes
|
|
request.get = Mock(side_effect=lambda key, default=None: kwargs.get(key, default))
|
|
|
|
return request
|
|
|
|
def test_process_mm_features_no_mm_enabled(self):
|
|
"""Test when multimodal is not enabled"""
|
|
self.runner.enable_mm = False
|
|
request_list = [self._create_mock_request()]
|
|
|
|
self.runner._process_mm_features(request_list)
|
|
|
|
# Should return early without processing
|
|
|
|
self.assertIsNone(self.runner.share_inputs["image_features_list"])
|
|
|
|
def test_process_mm_features_no_prefill_requests(self):
|
|
"""Test when there are no prefill requests"""
|
|
request_list = [
|
|
self._create_mock_request(task_type_value=1), # Not prefill
|
|
self._create_mock_request(task_type_value=2), # Not prefill
|
|
]
|
|
|
|
# Mock prepare_rope3d to return list of rope embeddings
|
|
self.runner.prepare_rope3d.return_value = [1, 2]
|
|
self.runner._process_mm_features(request_list)
|
|
|
|
# Should not process any requests
|
|
self.assertFalse(
|
|
any(isinstance(t, paddle.Tensor) for t in self.runner.share_inputs["image_features_list"]),
|
|
)
|
|
|
|
def test_process_mm_features_evict_cache(self):
|
|
"""Test eviction of multimodal cache"""
|
|
# Pre-populate cache
|
|
self.runner.encoder_cache["hash1"] = "cached_feature1"
|
|
self.runner.encoder_cache["hash2"] = "cached_feature2"
|
|
|
|
request_list = [self._create_mock_request(task_type_value=0, evict_mm_hashes=["hash1"])]
|
|
|
|
# Mock prepare_rope3d to return list of rope embeddings
|
|
self.runner.prepare_rope3d.return_value = [1, 2]
|
|
self.runner._process_mm_features(request_list)
|
|
|
|
# Check that hash1 was evicted but hash2 remains
|
|
self.assertNotIn("hash1", self.runner.encoder_cache)
|
|
self.assertIn("hash2", self.runner.encoder_cache)
|
|
|
|
def test_process_mm_features_with_image_no_cache(self):
|
|
"""Test processing images without cache"""
|
|
# Mock image features output
|
|
self.runner.extract_vision_features.return_value = paddle.full(shape=[2, 1], fill_value=0, dtype="float32")
|
|
|
|
# Setup grid_thw to return a value for paddle.prod
|
|
grid_thw = [np.array([1, 4, 4])] # prod will be 16, //4 = 4
|
|
|
|
request_list = [
|
|
self._create_mock_request(
|
|
task_type_value=0,
|
|
with_image=True,
|
|
idx=0,
|
|
num_image_start=0,
|
|
num_image_end=1,
|
|
grid_thw=grid_thw,
|
|
mm_hashes=["new_hash"],
|
|
mm_positions=[Mock(offset=0, length=4)],
|
|
images=[1] * 16, # 16 image tokens
|
|
vit_seqlen=[4],
|
|
vit_position_ids=[[0, 1, 2, 3]],
|
|
)
|
|
]
|
|
|
|
# Mock prepare_rope3d to return list of rope embeddings
|
|
self.runner.prepare_rope3d.return_value = [1, 2]
|
|
self.runner._process_mm_features(request_list)
|
|
|
|
# Verify extract_vision_features was called
|
|
self.runner.extract_vision_features.assert_called_once()
|
|
|
|
# Verify cache was populated
|
|
self.assertIn("new_hash", self.runner.encoder_cache)
|
|
|
|
# Verify image features were set
|
|
self.assertTrue(
|
|
any(isinstance(t, paddle.Tensor) for t in self.runner.share_inputs["image_features_list"]),
|
|
)
|
|
|
|
def test_process_mm_features_with_cache_hit(self):
|
|
"""Test processing images with cache hit"""
|
|
import numpy as np
|
|
|
|
# Pre-populate cache
|
|
cached_feature = Mock()
|
|
cached_feature.cuda = paddle.full(shape=[2, 1], fill_value=0, dtype="float32")
|
|
self.runner.encoder_cache["cached_hash"] = cached_feature
|
|
|
|
# Mock image features output (should not be used due to cache hit)
|
|
mock_features = Mock()
|
|
self.runner.extract_vision_features.return_value = mock_features
|
|
|
|
grid_thw = [np.array([1, 4, 4])]
|
|
|
|
request_list = [
|
|
self._create_mock_request(
|
|
task_type_value=0,
|
|
with_image=True,
|
|
idx=0,
|
|
num_image_start=0,
|
|
num_image_end=1,
|
|
grid_thw=grid_thw,
|
|
mm_hashes=["cached_hash"],
|
|
mm_positions=[Mock(offset=0, length=4)],
|
|
images=[1] * 16,
|
|
vit_seqlen=[4],
|
|
vit_position_ids=[[0, 1, 2, 3]],
|
|
)
|
|
]
|
|
|
|
# Mock prepare_rope3d to return list of rope embeddings
|
|
self.runner.prepare_rope3d.return_value = [1, 2]
|
|
self.runner._process_mm_features(request_list)
|
|
|
|
# Verify extract_vision_features was NOT called (cache hit)
|
|
self.runner.extract_vision_features.assert_not_called()
|
|
|
|
# Verify image features were set using cached feature
|
|
self.assertTrue(
|
|
any(isinstance(t, paddle.Tensor) for t in self.runner.share_inputs["image_features_list"]),
|
|
)
|
|
|
|
def test_process_mm_features_mixed_cache(self):
|
|
"""Test processing with mixed cache hit and miss"""
|
|
import numpy as np
|
|
|
|
# Pre-populate one cache entry
|
|
cached_feature = Mock()
|
|
cached_feature.cuda = paddle.full(shape=[2, 1], fill_value=0, dtype="float32")
|
|
self.runner.encoder_cache["hash1"] = cached_feature
|
|
|
|
self.runner.extract_vision_features.return_value = paddle.full(shape=[2, 1], fill_value=0, dtype="float32")
|
|
grid_thw = [np.array([1, 4, 4]), np.array([1, 4, 4])]
|
|
|
|
request_list = [
|
|
self._create_mock_request(
|
|
task_type_value=0,
|
|
with_image=True,
|
|
idx=0,
|
|
num_image_start=0,
|
|
num_image_end=2,
|
|
grid_thw=grid_thw,
|
|
mm_hashes=["hash1", "hash2"], # hash1 in cache, hash2 not
|
|
mm_positions=[Mock(offset=0, length=4), Mock(offset=4, length=4)],
|
|
images=[1] * 32, # 2 images, 16 tokens each
|
|
vit_seqlen=[4, 4],
|
|
vit_position_ids=[[0, 1, 2, 3], [4, 5, 6, 7]],
|
|
)
|
|
]
|
|
|
|
# Mock prepare_rope3d to return list of rope embeddings
|
|
self.runner.prepare_rope3d.return_value = [1, 2]
|
|
self.runner._process_mm_features(request_list)
|
|
|
|
# Verify extract_vision_features was called (for hash2)
|
|
self.runner.extract_vision_features.assert_called_once()
|
|
|
|
# Verify both hashes are now in cache
|
|
self.assertIn("hash1", self.runner.encoder_cache)
|
|
self.assertIn("hash2", self.runner.encoder_cache)
|
|
|
|
# Verify image features were set
|
|
self.assertTrue(
|
|
any(isinstance(t, paddle.Tensor) for t in self.runner.share_inputs["image_features_list"]),
|
|
)
|
|
|
|
def test_process_mm_features_no_encoder_cache(self):
|
|
"""Test processing without encoder cache"""
|
|
import numpy as np
|
|
|
|
self.runner.encoder_cache = None
|
|
|
|
# Mock image features output
|
|
self.runner.extract_vision_features.return_value = paddle.full(shape=[2, 1], fill_value=0, dtype="float32")
|
|
grid_thw = [np.array([1, 4, 4])]
|
|
|
|
request_list = [
|
|
self._create_mock_request(
|
|
task_type_value=0,
|
|
with_image=True,
|
|
idx=0,
|
|
image_start=0,
|
|
image_end=16,
|
|
num_image_start=0,
|
|
num_image_end=1,
|
|
grid_thw=grid_thw,
|
|
mm_positions=[Mock(offset=0, length=4)],
|
|
images=[1] * 16,
|
|
vit_seqlen=[4],
|
|
vit_position_ids=[[0, 1, 2, 3]],
|
|
)
|
|
]
|
|
|
|
# Mock prepare_rope3d to return list of rope embeddings
|
|
self.runner.prepare_rope3d.return_value = [1, 2]
|
|
self.runner._process_mm_features(request_list)
|
|
|
|
# Verify extract_vision_features was called
|
|
self.runner.extract_vision_features.assert_called_once()
|
|
|
|
# Verify image features were set
|
|
self.assertTrue(
|
|
any(isinstance(t, paddle.Tensor) for t in self.runner.share_inputs["image_features_list"]),
|
|
)
|
|
|
|
|
|
class TestSleepWakeupBehavior(unittest.TestCase):
|
|
def _make_runner(self):
|
|
runner = GPUModelRunner.__new__(GPUModelRunner)
|
|
runner.is_weight_sleeping = False
|
|
runner.is_kvcache_sleeping = False
|
|
runner.use_cudagraph = False
|
|
runner.spec_method = None
|
|
runner.local_rank = 0
|
|
runner.device_id = 1
|
|
runner.num_gpu_blocks = 8
|
|
runner.model = Mock(clear_graph_opt_backend=Mock())
|
|
runner.clear_cache = Mock()
|
|
runner.initialize_kv_cache = Mock()
|
|
runner.capture_model = Mock()
|
|
runner.share_inputs = Mock(reset_share_inputs=Mock())
|
|
runner.dynamic_weight_manager = Mock(
|
|
clear_deepep_buffer=Mock(),
|
|
clear_model_weight=Mock(),
|
|
clear_communication_group=Mock(),
|
|
restart_communication_group=Mock(),
|
|
recreate_deepep_buffer=Mock(),
|
|
reload_model_weights=Mock(),
|
|
)
|
|
runner.fd_config = Mock()
|
|
runner.fd_config.parallel_config = Mock(
|
|
enable_expert_parallel=False,
|
|
shutdown_comm_group_if_worker_idle=False,
|
|
)
|
|
runner.proposer = Mock(
|
|
clear_mtp_cache=Mock(),
|
|
initialize_kv_cache=Mock(),
|
|
model_inputs=Mock(reset_model_inputs=Mock()),
|
|
)
|
|
runner.enable_cache_manager_v1 = False
|
|
return runner
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.print_gpu_memory_use")
|
|
@patch("paddle.device.cuda.empty_cache")
|
|
def test_sleep_offloads_weight_and_cache(self, mock_empty_cache, mock_print_memory):
|
|
runner = self._make_runner()
|
|
runner.use_cudagraph = True
|
|
runner.spec_method = SpecMethod.MTP
|
|
runner.fd_config.parallel_config.enable_expert_parallel = True
|
|
runner.fd_config.parallel_config.shutdown_comm_group_if_worker_idle = True
|
|
|
|
runner.sleep("weight,kv_cache")
|
|
|
|
runner.model.clear_graph_opt_backend.assert_called_once()
|
|
runner.dynamic_weight_manager.clear_deepep_buffer.assert_called_once()
|
|
runner.dynamic_weight_manager.clear_model_weight.assert_called_once()
|
|
runner.dynamic_weight_manager.clear_communication_group.assert_called_once()
|
|
runner.proposer.clear_mtp_cache.assert_called_once()
|
|
runner.clear_cache.assert_called_once()
|
|
self.assertTrue(runner.is_weight_sleeping)
|
|
self.assertTrue(runner.is_kvcache_sleeping)
|
|
mock_empty_cache.assert_called_once()
|
|
mock_print_memory.assert_called_once()
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.print_gpu_memory_use")
|
|
@patch("paddle.device.cuda.empty_cache")
|
|
def test_sleep_weight_is_idempotent(self, mock_empty_cache, mock_print_memory):
|
|
runner = self._make_runner()
|
|
runner.is_weight_sleeping = True
|
|
|
|
runner.sleep("weight")
|
|
|
|
runner.dynamic_weight_manager.clear_model_weight.assert_not_called()
|
|
runner.clear_cache.assert_not_called()
|
|
mock_empty_cache.assert_not_called()
|
|
mock_print_memory.assert_not_called()
|
|
|
|
def test_wakeup_rejects_weight_only_when_cudagraph_requires_kvcache(self):
|
|
runner = self._make_runner()
|
|
runner.use_cudagraph = True
|
|
runner.is_kvcache_sleeping = True
|
|
|
|
with self.assertRaises(RuntimeError):
|
|
runner.wakeup("weight")
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.print_gpu_memory_use")
|
|
def test_wakeup_restores_weight_and_cache(self, mock_print_memory):
|
|
runner = self._make_runner()
|
|
runner.use_cudagraph = True
|
|
runner.spec_method = SpecMethod.MTP
|
|
runner.is_weight_sleeping = True
|
|
runner.is_kvcache_sleeping = True
|
|
runner.fd_config.parallel_config.enable_expert_parallel = True
|
|
runner.fd_config.parallel_config.shutdown_comm_group_if_worker_idle = True
|
|
|
|
runner.wakeup("weight,kv_cache")
|
|
|
|
runner.proposer.model_inputs.reset_model_inputs.assert_called_once()
|
|
runner.share_inputs.reset_share_inputs.assert_called_once()
|
|
runner.proposer.initialize_kv_cache.assert_called_once_with(main_model_num_blocks=runner.num_gpu_blocks)
|
|
runner.initialize_kv_cache.assert_called_once()
|
|
runner.dynamic_weight_manager.restart_communication_group.assert_called_once()
|
|
runner.dynamic_weight_manager.recreate_deepep_buffer.assert_called_once()
|
|
runner.dynamic_weight_manager.reload_model_weights.assert_called_once()
|
|
runner.capture_model.assert_called_once()
|
|
self.assertFalse(runner.is_weight_sleeping)
|
|
self.assertFalse(runner.is_kvcache_sleeping)
|
|
mock_print_memory.assert_called_once()
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.print_gpu_memory_use")
|
|
def test_wakeup_kvcache_is_idempotent(self, mock_print_memory):
|
|
runner = self._make_runner()
|
|
runner.is_kvcache_sleeping = False
|
|
|
|
runner.wakeup("kv_cache")
|
|
|
|
runner.initialize_kv_cache.assert_not_called()
|
|
runner.dynamic_weight_manager.reload_model_weights.assert_not_called()
|
|
mock_print_memory.assert_not_called()
|
|
|
|
|
|
def _sync_async_set_value(tgt, src):
|
|
"""Synchronous stand-in for async_set_value used in tests (no CUDA required).
|
|
|
|
Writes to real numpy arrays; silently skips Mock objects (untracked share_inputs
|
|
fields whose values we do not assert on).
|
|
"""
|
|
from unittest.mock import MagicMock
|
|
|
|
import numpy as np
|
|
|
|
if isinstance(tgt, MagicMock):
|
|
return # untracked field — nothing to write
|
|
if isinstance(src, (int, float, bool)):
|
|
tgt[:] = src
|
|
elif isinstance(src, (list, np.ndarray)):
|
|
tgt[:] = np.array(src).reshape(tgt.shape)
|
|
elif hasattr(src, "numpy"):
|
|
tgt[:] = src.numpy()
|
|
else:
|
|
tgt[:] = src
|
|
|
|
|
|
class TestInsertTasksV1SplitwiseSuffix(unittest.TestCase):
|
|
"""Tests for insert_tasks_v1 splitwise_role=\'decode\' + SpecMethod.SUFFIX branch."""
|
|
|
|
def _make_share_inputs(self, bsz=4, max_draft=6):
|
|
"""Mock-backed share_inputs; only keys we assert on hold real numpy arrays."""
|
|
import numpy as np
|
|
|
|
# Keys whose values we want to inspect after the call
|
|
tracked = {
|
|
"seq_lens_encoder": np.zeros((bsz, 1), dtype=np.int32),
|
|
"draft_tokens": np.zeros((bsz, max_draft), dtype=np.int64),
|
|
"seq_lens_this_time_buffer": np.zeros((bsz, 1), dtype=np.int32),
|
|
"req_ids": [""] * bsz,
|
|
"preempted_idx": np.zeros((bsz, 1), dtype=np.int32),
|
|
"num_running_requests": 0,
|
|
"running_requests_ids": [],
|
|
}
|
|
|
|
class _SI:
|
|
def get_index_by_batch_id(self, batch_id):
|
|
return batch_id
|
|
|
|
def __getitem__(self, key):
|
|
# Return real array for tracked keys; Mock for everything else
|
|
if key in tracked:
|
|
return tracked[key]
|
|
return MagicMock()
|
|
|
|
def __setitem__(self, key, value):
|
|
tracked[key] = value
|
|
|
|
return _SI()
|
|
|
|
def _make_runner(self, bsz=4, num_spec_tokens=3):
|
|
from unittest.mock import Mock
|
|
|
|
from fastdeploy.spec_decode import SpecMethod
|
|
from fastdeploy.worker.gpu_model_runner import GPUModelRunner
|
|
|
|
runner = GPUModelRunner.__new__(GPUModelRunner)
|
|
runner.enable_mm = False
|
|
runner.is_pooling_model = False
|
|
runner.speculative_decoding = True
|
|
runner.spec_method = SpecMethod.SUFFIX
|
|
runner.speculative_config = Mock(num_speculative_tokens=num_spec_tokens)
|
|
runner.deterministic_logger = None
|
|
runner.routing_replay_manager = Mock()
|
|
runner.prompt_logprobs_reqs = {}
|
|
runner.in_progress_prompt_logprobs = {}
|
|
runner.forward_batch_reqs_list = [None] * bsz
|
|
runner._cached_launch_token_num = -1
|
|
runner._cached_real_bsz = 0
|
|
runner.exist_prefill_flag = True
|
|
runner.proposer = Mock()
|
|
runner.sampler = Mock()
|
|
runner.model_config = Mock(eos_tokens_lens=1)
|
|
runner.share_inputs = self._make_share_inputs(bsz=bsz, max_draft=num_spec_tokens + 2)
|
|
|
|
fd_config = Mock()
|
|
fd_config.scheduler_config.splitwise_role = "decode"
|
|
fd_config.routing_replay_config.enable_routing_replay = False
|
|
runner.fd_config = fd_config
|
|
runner.scheduler_config = fd_config.scheduler_config
|
|
runner.enable_cache_manager_v1 = False
|
|
return runner
|
|
|
|
def _make_prefill_request(self, idx, draft_token_ids):
|
|
from unittest.mock import Mock
|
|
|
|
from fastdeploy.engine.request import RequestType
|
|
|
|
req = Mock()
|
|
req.task_type = Mock(value=RequestType.PREFILL.value)
|
|
req.idx = idx
|
|
req.request_id = f"req_{idx}"
|
|
req.prompt_token_ids = [10, 20, 30]
|
|
req.output_token_ids = [99]
|
|
req.draft_token_ids = draft_token_ids
|
|
req.pooling_params = None
|
|
req.guided_json = None
|
|
req.guided_regex = None
|
|
req.structural_tag = None
|
|
req.guided_grammar = None
|
|
req.prefill_start_index = 0
|
|
req.prefill_end_index = 3
|
|
req.multimodal_inputs = None
|
|
req.get = Mock(return_value=None)
|
|
req.eos_token_ids = [2]
|
|
req.block_tables = []
|
|
return req
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.async_set_value", side_effect=_sync_async_set_value)
|
|
def test_draft_tokens_and_seq_lens_written(self, _mock_asv):
|
|
"""draft_tokens[0:2] and seq_lens_this_time_buffer=2 are written."""
|
|
runner = self._make_runner(num_spec_tokens=3)
|
|
req = self._make_prefill_request(idx=0, draft_token_ids=[101, 202, 303])
|
|
runner.insert_tasks_v1([req], num_running_requests=1)
|
|
|
|
self.assertEqual(runner.share_inputs["draft_tokens"][0, 0], 101)
|
|
self.assertEqual(runner.share_inputs["draft_tokens"][0, 1], 202)
|
|
self.assertEqual(runner.share_inputs["seq_lens_this_time_buffer"][0, 0], 2)
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.async_set_value", side_effect=_sync_async_set_value)
|
|
def test_exist_prefill_flag_cleared(self, _mock_asv):
|
|
runner = self._make_runner()
|
|
req = self._make_prefill_request(idx=0, draft_token_ids=[1, 2])
|
|
runner.insert_tasks_v1([req], num_running_requests=1)
|
|
self.assertFalse(runner.exist_prefill_flag)
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.async_set_value", side_effect=_sync_async_set_value)
|
|
def test_cached_launch_token_num_incremented(self, _mock_asv):
|
|
runner = self._make_runner(num_spec_tokens=3)
|
|
runner._cached_launch_token_num = 10
|
|
runner._cached_real_bsz = 2
|
|
req = self._make_prefill_request(idx=0, draft_token_ids=[1, 2])
|
|
runner.insert_tasks_v1([req], num_running_requests=1)
|
|
# token_num_one_step = num_speculative_tokens + 1 = 4
|
|
self.assertEqual(runner._cached_launch_token_num, 14)
|
|
self.assertEqual(runner._cached_real_bsz, 3)
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.async_set_value", side_effect=_sync_async_set_value)
|
|
def test_cached_launch_token_num_skipped_when_negative_one(self, _mock_asv):
|
|
runner = self._make_runner(num_spec_tokens=3)
|
|
runner._cached_launch_token_num = -1
|
|
req = self._make_prefill_request(idx=0, draft_token_ids=[1, 2])
|
|
runner.insert_tasks_v1([req], num_running_requests=1)
|
|
self.assertEqual(runner._cached_launch_token_num, -1)
|
|
|
|
@patch("fastdeploy.worker.gpu_model_runner.async_set_value", side_effect=_sync_async_set_value)
|
|
def test_raises_when_fewer_than_two_draft_tokens(self, _mock_asv):
|
|
runner = self._make_runner()
|
|
req = self._make_prefill_request(idx=0, draft_token_ids=[42])
|
|
with self.assertRaises(ValueError):
|
|
runner.insert_tasks_v1([req], num_running_requests=1)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|