mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2026-04-23 00:17:25 +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>
629 lines
22 KiB
Python
629 lines
22 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 hashlib
|
||
import pickle
|
||
import threading
|
||
import time
|
||
from typing import Any, Callable, Dict, List, Optional, Sequence, Set
|
||
|
||
from paddleformers.utils.log import logger
|
||
|
||
|
||
class LayerDoneCounter:
|
||
"""
|
||
Independent synchronization primitive for tracking layer completion of a single transfer.
|
||
|
||
Used in compute-transfer overlap scenarios:
|
||
- Each LayerDoneCounter instance tracks layer completion for one transfer task.
|
||
- Uses CUDA Events for efficient waiting (no polling).
|
||
- Thread-safe.
|
||
|
||
Attributes:
|
||
_num_layers: Total number of layers.
|
||
_lock: Thread lock.
|
||
_completed_layers: Set of completed layer indices.
|
||
_callbacks: List of layer-completion callbacks.
|
||
_cuda_events: CUDA event per layer.
|
||
_layer_complete_times: Mapping of layer index to completion time.
|
||
_wait_count: Count of active waiters.
|
||
"""
|
||
|
||
def __init__(self, num_layers: int):
|
||
"""
|
||
Initialize the layer done counter.
|
||
|
||
Args:
|
||
num_layers: Total number of layers to track
|
||
"""
|
||
self._num_layers = num_layers
|
||
self._lock = threading.RLock()
|
||
self._completed_layers: Set[int] = set()
|
||
self._callbacks: List[Callable[[int], None]] = []
|
||
self._start_time: float = time.time()
|
||
|
||
# ============ CUDA Events for efficient waiting (no polling) ============
|
||
# Initialized to None; set by set_layer_event() after kernel submission to transfer stream.
|
||
# None means no event recorded yet for that layer (must fall back to polling).
|
||
self._cuda_events: List[Any] = [None] * num_layers
|
||
self._layer_complete_times: Dict[int, float] = {}
|
||
|
||
# ============ Reference count for active waiters (prevents premature cleanup) ============
|
||
self._wait_count: int = 0
|
||
|
||
def get_num_layers(self) -> int:
|
||
"""Get the total number of layers."""
|
||
return self._num_layers
|
||
|
||
# ============ Mark Methods (called by transfer thread) ============
|
||
|
||
def set_layer_event(self, layer_idx: int, cuda_event: Any) -> None:
|
||
"""
|
||
Set the CUDA event for a specific layer (used for cross-stream synchronization).
|
||
|
||
Called by transfer thread after submitting a layer's kernel to a non-default
|
||
stream (e.g., input_stream), so that wait_for_layer() can correctly synchronize
|
||
on the actual stream where the transfer runs.
|
||
|
||
Args:
|
||
layer_idx: Index of the layer
|
||
cuda_event: CUDA event recorded on the transfer stream after kernel submission
|
||
"""
|
||
with self._lock:
|
||
if 0 <= layer_idx < len(self._cuda_events):
|
||
self._cuda_events[layer_idx] = cuda_event
|
||
|
||
def mark_layer_done(self, layer_idx: int, cuda_event: Any = None) -> bool:
|
||
"""
|
||
Mark a layer as completed.
|
||
|
||
Args:
|
||
layer_idx: Index of the completed layer
|
||
cuda_event: Optional CUDA event to record completion
|
||
|
||
Returns:
|
||
True if this was the last layer, False otherwise
|
||
"""
|
||
with self._lock:
|
||
if layer_idx in self._completed_layers:
|
||
logger.warning(f"[mark_layer_done] layer {layer_idx} already marked done")
|
||
return len(self._completed_layers) >= self._num_layers
|
||
|
||
self._completed_layers.add(layer_idx)
|
||
self._layer_complete_times[layer_idx] = time.time()
|
||
|
||
# Record CUDA event if provided
|
||
if cuda_event is not None:
|
||
try:
|
||
cuda_event.record()
|
||
except Exception as e:
|
||
logger.warning(f"Failed to record CUDA event for layer {layer_idx}: {e}")
|
||
|
||
# Execute callbacks for this layer
|
||
for callback in self._callbacks:
|
||
try:
|
||
callback(layer_idx)
|
||
except Exception:
|
||
pass
|
||
|
||
return len(self._completed_layers) >= self._num_layers
|
||
|
||
def mark_all_done(self, cuda_event: Any = None) -> bool:
|
||
"""
|
||
Mark all layers as completed at once (used for D2H all-layers evict mode).
|
||
|
||
Args:
|
||
cuda_event: Optional CUDA event to record completion
|
||
|
||
Returns:
|
||
True (always returns True since all layers are marked done)
|
||
"""
|
||
with self._lock:
|
||
now = time.time()
|
||
self._completed_layers = set(range(self._num_layers))
|
||
self._layer_complete_times = {i: now for i in range(self._num_layers)}
|
||
|
||
# Record CUDA event if provided
|
||
if cuda_event is not None:
|
||
try:
|
||
cuda_event.record()
|
||
except Exception as e:
|
||
logger.warning(f"Failed to record CUDA event: {e}")
|
||
|
||
# Execute all callbacks (call with -1 to indicate all layers done)
|
||
for callback in self._callbacks:
|
||
try:
|
||
callback(-1)
|
||
except Exception:
|
||
pass
|
||
|
||
return True
|
||
|
||
# ============ Query Methods ============
|
||
|
||
def is_layer_done(self, layer_idx: int) -> bool:
|
||
"""
|
||
Check if a specific layer is completed.
|
||
|
||
Args:
|
||
layer_idx: Index of the layer to check
|
||
|
||
Returns:
|
||
True if the layer is completed, False otherwise
|
||
"""
|
||
with self._lock:
|
||
return layer_idx in self._completed_layers
|
||
|
||
def is_all_done(self) -> bool:
|
||
"""
|
||
Check if all layers are completed.
|
||
|
||
Returns:
|
||
True if all layers are completed, False otherwise
|
||
"""
|
||
with self._lock:
|
||
return len(self._completed_layers) >= self._num_layers
|
||
|
||
def get_completed_count(self) -> int:
|
||
"""
|
||
Get the number of completed layers.
|
||
|
||
Returns:
|
||
Number of completed layers
|
||
"""
|
||
with self._lock:
|
||
return len(self._completed_layers)
|
||
|
||
def get_pending_layers(self) -> List[int]:
|
||
"""
|
||
Get list of pending layer indices.
|
||
|
||
Returns:
|
||
List of pending layer indices
|
||
"""
|
||
with self._lock:
|
||
return [i for i in range(self._num_layers) if i not in self._completed_layers]
|
||
|
||
# ============ Wait Methods (called by forward thread) ============
|
||
|
||
def wait_for_layer(self, layer_idx: int, timeout: Optional[float] = None) -> bool:
|
||
"""
|
||
Wait for a specific layer to complete (CUDA Event synchronization).
|
||
|
||
Always synchronizes the CUDA event before returning to guarantee the GPU
|
||
transfer has actually completed, not just that the kernel was submitted.
|
||
The fast path that only checked is_layer_done() was unsafe because
|
||
mark_layer_done() is called immediately after kernel submission (async),
|
||
before the GPU has finished the transfer.
|
||
|
||
Args:
|
||
layer_idx: Index of the layer to wait for
|
||
timeout: Maximum wait time in seconds (default: 1s)
|
||
|
||
Returns:
|
||
True if layer completed
|
||
|
||
Raises:
|
||
LayerSwapTimeoutError: If timeout occurs before layer completes
|
||
"""
|
||
self._increment_wait_count()
|
||
try:
|
||
start_time = time.time()
|
||
timeout = timeout if timeout is not None else 1.0
|
||
while True:
|
||
# Always try CUDA event sync first: set_layer_event() is called before
|
||
# mark_layer_done(), so once is_layer_done() is True the event is present.
|
||
cuda_event = self._cuda_events[layer_idx] if layer_idx < len(self._cuda_events) else None
|
||
if cuda_event is not None:
|
||
try:
|
||
cuda_event.synchronize()
|
||
return True
|
||
except Exception as e:
|
||
logger.warning(f"CUDA event sync failed for layer {layer_idx}: {e}")
|
||
# Event sync failed; fall through to is_layer_done check
|
||
|
||
# No event yet (or sync failed): check software state as fallback
|
||
# (covers non-cupy scenarios where events are never set)
|
||
if self.is_layer_done(layer_idx):
|
||
return True
|
||
|
||
elapsed = time.time() - start_time
|
||
if elapsed >= timeout:
|
||
logger.error(f"[WaitForLayer] layer={layer_idx} TIMEOUT after {elapsed:.2f}s")
|
||
raise LayerSwapTimeoutError(f"Layer swap timeout: layer={layer_idx}, elapsed={elapsed:.2f}s")
|
||
|
||
time.sleep(0.001)
|
||
finally:
|
||
self._decrement_wait_count()
|
||
|
||
def wait_all(self, timeout: Optional[float] = None) -> bool:
|
||
"""
|
||
Wait for all layers to complete (used for D2H all-layers evict mode).
|
||
|
||
Always synchronizes _cuda_events[-1] (set by set_layer_event for the last layer)
|
||
before returning, for the same reason as wait_for_layer.
|
||
|
||
Args:
|
||
timeout: Maximum wait time in seconds (default: 300s)
|
||
|
||
Returns:
|
||
True if all layers completed
|
||
|
||
Raises:
|
||
LayerSwapTimeoutError: If timeout occurs
|
||
"""
|
||
self._increment_wait_count()
|
||
try:
|
||
start_time = time.time()
|
||
timeout = timeout if timeout is not None else 300.0
|
||
while True:
|
||
# _cuda_events[-1] is set by set_layer_event(num_layers-1, ...) before mark_all_done()
|
||
last_event = self._cuda_events[-1] if self._cuda_events else None
|
||
if last_event is not None:
|
||
try:
|
||
last_event.synchronize()
|
||
return True
|
||
except Exception as e:
|
||
logger.warning(f"CUDA event sync failed for wait_all: {e}")
|
||
|
||
# No event yet (or sync failed): check software state as fallback
|
||
if self.is_all_done():
|
||
return True
|
||
|
||
elapsed = time.time() - start_time
|
||
if elapsed >= timeout:
|
||
logger.error(f"[wait_all] TIMEOUT after {elapsed:.2f}s")
|
||
raise LayerSwapTimeoutError(f"wait_all timeout: elapsed={elapsed:.2f}s")
|
||
|
||
time.sleep(0.001)
|
||
finally:
|
||
self._decrement_wait_count()
|
||
|
||
# ============ Callback Methods ============
|
||
|
||
def register_callback(self, callback: Callable[[int], None]) -> None:
|
||
"""
|
||
Register a callback to be called when each layer completes.
|
||
|
||
Args:
|
||
callback: Function to call with layer index when completed
|
||
"""
|
||
with self._lock:
|
||
self._callbacks.append(callback)
|
||
|
||
# ============ Internal Helper Methods ============
|
||
|
||
def _increment_wait_count(self) -> None:
|
||
"""Increment the wait count."""
|
||
with self._lock:
|
||
self._wait_count += 1
|
||
|
||
def _decrement_wait_count(self) -> None:
|
||
"""Decrement the wait count."""
|
||
with self._lock:
|
||
if self._wait_count > 0:
|
||
self._wait_count -= 1
|
||
|
||
def _should_cleanup(self) -> bool:
|
||
"""Check if cleanup is safe (no active waiters and all done)."""
|
||
with self._lock:
|
||
return self._wait_count == 0 and self.is_all_done()
|
||
|
||
# ============ Time Tracking Methods ============
|
||
|
||
def get_layer_complete_time(self, layer_idx: int) -> Optional[float]:
|
||
"""
|
||
Get the completion time for a specific layer.
|
||
|
||
Args:
|
||
layer_idx: Index of the layer
|
||
|
||
Returns:
|
||
Completion time as Unix timestamp, or None if not completed
|
||
"""
|
||
with self._lock:
|
||
return self._layer_complete_times.get(layer_idx)
|
||
|
||
def get_layer_wait_time(self, layer_idx: int) -> Optional[float]:
|
||
"""
|
||
Get the time from transfer start to layer completion.
|
||
|
||
Args:
|
||
layer_idx: Index of the layer
|
||
|
||
Returns:
|
||
Time in seconds, or None if not completed
|
||
"""
|
||
with self._lock:
|
||
complete_time = self._layer_complete_times.get(layer_idx)
|
||
if complete_time is None:
|
||
return None
|
||
return complete_time - self._start_time
|
||
|
||
def get_all_layer_times(self) -> Dict[int, float]:
|
||
"""
|
||
Get completion times for all layers.
|
||
|
||
Returns:
|
||
Dictionary mapping layer_idx to completion time
|
||
"""
|
||
with self._lock:
|
||
return self._layer_complete_times.copy()
|
||
|
||
def get_elapsed_time(self) -> float:
|
||
"""
|
||
Get elapsed time since transfer start.
|
||
|
||
Returns:
|
||
Elapsed time in seconds
|
||
"""
|
||
return time.time() - self._start_time
|
||
|
||
def get_stats(self) -> Dict:
|
||
"""
|
||
Get current statistics.
|
||
|
||
Returns:
|
||
Dictionary with statistics
|
||
"""
|
||
with self._lock:
|
||
return {
|
||
"num_layers": self._num_layers,
|
||
"completed_layers": len(self._completed_layers),
|
||
"pending_layers": self._num_layers - len(self._completed_layers),
|
||
"wait_count": self._wait_count,
|
||
}
|
||
|
||
# ============ Cleanup Methods ============
|
||
|
||
def cleanup(self) -> None:
|
||
"""
|
||
Explicit cleanup method to release CUDA events.
|
||
|
||
Called when the transfer is complete and no more waiting is needed.
|
||
"""
|
||
with self._lock:
|
||
# Check if safe to cleanup
|
||
if self._wait_count > 0:
|
||
return
|
||
|
||
# Clear CUDA events
|
||
self._cuda_events.clear()
|
||
|
||
def __del__(self) -> None:
|
||
"""
|
||
Destructor to ensure CUDA events are released.
|
||
|
||
Note: This is a fallback. For explicit cleanup, call cleanup() method.
|
||
"""
|
||
try:
|
||
if self._cuda_events:
|
||
self._cuda_events.clear()
|
||
except Exception:
|
||
pass # Ignore errors during destruction
|
||
|
||
|
||
class LayerSwapTimeoutError(Exception):
|
||
"""Exception raised when layer swap operation times out."""
|
||
|
||
pass
|
||
|
||
|
||
# ============ Block Hash Computation ============
|
||
|
||
|
||
def hash_block_tokens(
|
||
token_ids: Sequence[int],
|
||
parent_block_hash: str | None = None,
|
||
extra_keys: Any = None,
|
||
) -> str:
|
||
"""
|
||
Compute hash value for a single block.
|
||
|
||
Reference: vLLM's hash_block_tokens implementation using chained hash:
|
||
hash = SHA256((parent_block_hash, token_ids_tuple, extra_keys))
|
||
|
||
Args:
|
||
token_ids: Token IDs of the current block.
|
||
parent_block_hash: Hash of the parent block (chained hash).
|
||
extra_keys: Additional keys (e.g., multimodal info, LoRA).
|
||
|
||
Returns:
|
||
Computed block hash as hex string.
|
||
"""
|
||
if parent_block_hash is None:
|
||
parent_block_hash = ""
|
||
|
||
value = (parent_block_hash, tuple(token_ids), extra_keys)
|
||
return hashlib.sha256(pickle.dumps(value)).hexdigest()
|
||
|
||
|
||
def get_block_hash_extra_keys(
|
||
request: Any,
|
||
start_idx: int,
|
||
end_idx: int,
|
||
mm_idx: int,
|
||
) -> tuple:
|
||
"""
|
||
Retrieve additional hash keys for a block based on multimodal information.
|
||
|
||
Mirrors the logic from prefix_cache_manager.PrefixCacheManager.get_block_hash_extra_keys.
|
||
|
||
For each block [start_idx, end_idx), scans the multimodal positions starting
|
||
from mm_idx and collects hashes of any multimodal items that overlap with the block.
|
||
|
||
Args:
|
||
request: Request object. Must expose a ``multimodal_inputs`` attribute which
|
||
is either None or a dict with keys:
|
||
- ``mm_positions``: list of objects with ``.offset`` and ``.length``
|
||
- ``mm_hashes``: list of hash strings, one per multimodal item
|
||
start_idx: Token index of the block start (inclusive).
|
||
end_idx: Token index of the block end (exclusive).
|
||
mm_idx: Index into mm_positions / mm_hashes to start scanning from
|
||
(avoids re-scanning already-processed items).
|
||
|
||
Returns:
|
||
(next_mm_idx, hash_keys):
|
||
next_mm_idx: updated mm_idx for the next block.
|
||
hash_keys : list of multimodal hash strings that fall within this block.
|
||
"""
|
||
hash_keys: List[str] = []
|
||
mm_inputs = getattr(request, "multimodal_inputs", None)
|
||
if (
|
||
mm_inputs is None
|
||
or "mm_positions" not in mm_inputs
|
||
or "mm_hashes" not in mm_inputs
|
||
or len(mm_inputs["mm_positions"]) == 0
|
||
):
|
||
return mm_idx, hash_keys
|
||
|
||
mm_positions = mm_inputs["mm_positions"]
|
||
mm_hashes = mm_inputs["mm_hashes"]
|
||
|
||
# Fast exit: last multimodal item ends before this block starts
|
||
if mm_positions[-1].offset + mm_positions[-1].length <= start_idx:
|
||
return mm_idx, hash_keys
|
||
|
||
for img_idx in range(mm_idx, len(mm_positions)):
|
||
image_offset = mm_positions[img_idx].offset
|
||
image_length = mm_positions[img_idx].length
|
||
|
||
if image_offset + image_length <= start_idx:
|
||
# Multimodal item ends before block starts – skip
|
||
continue
|
||
elif image_offset >= end_idx:
|
||
# Multimodal item starts after block ends – stop
|
||
return img_idx, hash_keys
|
||
elif image_offset + image_length > end_idx:
|
||
# Multimodal item spans beyond block end – include hash, stop at this item
|
||
hash_keys.append(mm_hashes[img_idx])
|
||
return img_idx, hash_keys
|
||
else:
|
||
# Multimodal item is fully contained within the block
|
||
hash_keys.append(mm_hashes[img_idx])
|
||
|
||
return len(mm_positions) - 1, hash_keys
|
||
|
||
|
||
def get_request_block_hasher(
|
||
block_size: int,
|
||
) -> Callable[[Any], List[str]]:
|
||
"""
|
||
Factory function: returns a block hash calculator bound to block_size.
|
||
|
||
The returned function computes hashes for new complete blocks in a request.
|
||
Computation logic:
|
||
1. Get all token IDs (prompt + output)
|
||
2. Determine starting position based on existing block_hashes count
|
||
3. Compute hashes for new complete blocks (chained hash, with multimodal extra_keys)
|
||
|
||
Usage:
|
||
# Create hasher at service startup
|
||
block_hasher = get_request_block_hasher(block_size=64)
|
||
|
||
# Use in Request.prompt_hashes property
|
||
new_hashes = block_hasher(self)
|
||
self._prompt_hashes.extend(new_hashes)
|
||
|
||
Args:
|
||
block_size: Number of tokens per block.
|
||
|
||
Returns:
|
||
A function that takes a request and returns a list of newly computed
|
||
block hashes.
|
||
"""
|
||
|
||
def request_block_hasher(request: Any) -> List[str]:
|
||
"""
|
||
Compute hashes for uncomputed complete blocks in a request.
|
||
|
||
Args:
|
||
request: Request object with the following attributes:
|
||
- prompt_token_ids: Input token IDs.
|
||
- _prompt_hashes: List of existing block hashes (private attr).
|
||
- output_token_ids: Output token IDs (optional).
|
||
- multimodal_inputs (optional): Multimodal info dict with
|
||
``mm_positions`` and ``mm_hashes``.
|
||
|
||
Returns:
|
||
List of newly computed block hashes (only new complete blocks).
|
||
"""
|
||
# Get prompt token IDs
|
||
prompt_ids = request.prompt_token_ids
|
||
if hasattr(prompt_ids, "tolist"):
|
||
prompt_ids = prompt_ids.tolist()
|
||
if prompt_ids is None:
|
||
prompt_ids = []
|
||
|
||
# Get output token IDs
|
||
output_ids = getattr(request, "output_token_ids", [])
|
||
if hasattr(output_ids, "tolist"):
|
||
output_ids = output_ids.tolist()
|
||
if output_ids is None:
|
||
output_ids = []
|
||
|
||
# Combine all token IDs
|
||
all_token_ids = list(prompt_ids) + list(output_ids)
|
||
num_tokens = len(all_token_ids)
|
||
|
||
# Get existing block hashes
|
||
existing_hashes = getattr(request, "_prompt_hashes", [])
|
||
if existing_hashes is None:
|
||
existing_hashes = []
|
||
|
||
# Calculate starting position (skip already computed blocks)
|
||
start_token_idx = len(existing_hashes) * block_size
|
||
|
||
# Return empty if no new complete blocks
|
||
if start_token_idx + block_size > num_tokens:
|
||
return []
|
||
|
||
new_block_hashes: List[str] = []
|
||
prev_block_hash = existing_hashes[-1] if existing_hashes else None
|
||
|
||
# mm_idx tracks which multimodal item to scan from, avoiding redundant iteration
|
||
mm_idx = 0
|
||
|
||
# Compute hashes for new complete blocks
|
||
while True:
|
||
end_token_idx = start_token_idx + block_size
|
||
if end_token_idx > num_tokens:
|
||
break
|
||
|
||
# Get tokens for current block
|
||
block_tokens = all_token_ids[start_token_idx:end_token_idx]
|
||
|
||
# Collect multimodal extra_keys for this block
|
||
mm_idx, extra_keys = get_block_hash_extra_keys(
|
||
request=request,
|
||
start_idx=start_token_idx,
|
||
end_idx=end_token_idx,
|
||
mm_idx=mm_idx,
|
||
)
|
||
extra_keys_value = tuple(extra_keys) if extra_keys else None
|
||
|
||
# Compute hash (chained hash)
|
||
block_hash = hash_block_tokens(block_tokens, prev_block_hash, extra_keys_value)
|
||
new_block_hashes.append(block_hash)
|
||
|
||
# Update state
|
||
start_token_idx += block_size
|
||
prev_block_hash = block_hash
|
||
|
||
return new_block_hashes
|
||
|
||
return request_block_hasher
|