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>
290 lines
12 KiB
Python
290 lines
12 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.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING, Dict, Optional
|
|
|
|
import numpy as np
|
|
import paddle
|
|
from paddle import nn
|
|
from paddleformers.utils.log import logger
|
|
|
|
from fastdeploy.config import FDConfig
|
|
from fastdeploy.model_executor.layers.quantization.kv_cache import (
|
|
KvCacheQuantzationTypes,
|
|
)
|
|
from fastdeploy.model_executor.layers.quantization.quant_base import QuantMethodBase
|
|
|
|
if TYPE_CHECKING:
|
|
from fastdeploy.model_executor.forward_meta import ForwardMeta
|
|
|
|
import os
|
|
|
|
from safetensors import safe_open
|
|
|
|
from fastdeploy.model_executor.layers.utils import get_tensor
|
|
from fastdeploy.model_executor.utils import default_weight_loader, set_weight_attrs
|
|
|
|
|
|
class Attention(nn.Layer):
|
|
"""
|
|
The AttentionLayer.
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
fd_config: FDConfig,
|
|
layer_id: int,
|
|
v_head_dim: int = -1,
|
|
rope_type: str = "",
|
|
qkv_bias: Optional[paddle.Tensor] = None,
|
|
qkv_scale: Optional[paddle.Tensor] = None,
|
|
prefix: str = "",
|
|
out_scale: float = -1.0,
|
|
linear_shift: paddle.Tensor = None,
|
|
linear_smooth: paddle.Tensor = None,
|
|
use_neox_rotary_style: bool = False,
|
|
use_qk_norm: bool = False,
|
|
qk_norm_before_rope: bool = False,
|
|
rms_norm_eps: float = 1e-6,
|
|
with_sinks: bool = False,
|
|
) -> None:
|
|
"""
|
|
Initializes `LMLayer` with the given parameters.
|
|
|
|
Args:
|
|
fd_config (dict): The config of LM model.
|
|
layer_id (int): The id of current layer.
|
|
v_head_dim (int, optional): The head dim of value. Defaults to -1.
|
|
rope_type (str, optional): The type of RoPE. Defaults to "".
|
|
qkv_bias (Optional[paddle.Tensor], optional): The bias of QKV. Defaults to None.
|
|
qkv_scale (Optional[paddle.Tensor], optional): The scale of QKV. Defaults to None.
|
|
prefix (str, optional): The name of current layer. Defaults to "".
|
|
linear_shift (Optional[paddle.Tensor], optional): The shift of linear. Defaults to None.
|
|
linear_smooth (Optional[paddle.Tensor], optional): The smooth of linear. Defaults to None.
|
|
use_qk_norm (bool, optional): Whether to apply rmsnorm on QA after rope. Defaults to False.
|
|
qk_norm_before_rope (bool, optional): Whether to apply rmsnorm before rope (e.g., Qwen style). Defaults to False. if True, use_qk_norm should also be True.
|
|
rms_norm_eps (float, optional): The epsilon of RMSNorm. Defaults to 1e-6.
|
|
|
|
Raises:
|
|
ValueError: If the `v_head_dim` is less than 0.
|
|
"""
|
|
super().__init__()
|
|
self.fd_config = fd_config
|
|
self.num_heads: int = (
|
|
fd_config.model_config.num_attention_heads // fd_config.parallel_config.tensor_parallel_size
|
|
)
|
|
self.head_dim: int = fd_config.model_config.head_dim
|
|
self.kv_num_heads: int = max(
|
|
1,
|
|
fd_config.model_config.num_key_value_heads // fd_config.parallel_config.tensor_parallel_size,
|
|
)
|
|
self.layer_id: int = layer_id
|
|
self.v_head_dim: int = v_head_dim if v_head_dim > 0 else self.head_dim
|
|
self.rope_type: str = rope_type
|
|
self.qk_head_dim: int = self.head_dim
|
|
self.prefix: str = prefix
|
|
# not use
|
|
self.linear_shift: paddle.Tensor | None = linear_shift
|
|
self.linear_smooth: paddle.Tensor | None = linear_smooth
|
|
self.qkv_bias: paddle.Tensor | None = qkv_bias
|
|
self.qkv_scale: paddle.Tensor | None = qkv_scale
|
|
self._dtype = self._helper.get_default_dtype()
|
|
|
|
self.out_scale: float = out_scale
|
|
self.use_neox_rotary_style: bool = use_neox_rotary_style
|
|
|
|
self.with_sinks: bool = with_sinks
|
|
|
|
if fd_config.quant_config and hasattr(fd_config.quant_config, "kv_cache_quant_type"):
|
|
self.quant_method: QuantMethodBase = fd_config.quant_config.get_quant_method(self)
|
|
|
|
# set for RL model, as RL do not need load state dict
|
|
if fd_config.quant_config.kv_cache_quant_type == KvCacheQuantzationTypes.BLOCK_WISE_FP8:
|
|
self.cache_quant_type_str = "block_wise_fp8"
|
|
self.quant_max_bound = 448.0
|
|
self.quant_min_bound = -448.0
|
|
else:
|
|
self.quant_method = None
|
|
|
|
if self.quant_method is None:
|
|
logger.info(f"Attention is running in cache kv {self._dtype} mode")
|
|
else:
|
|
logger.info(f"Attention is running in cache kv {self.quant_method.cache_quant_config.quant_type} mode")
|
|
self.use_qk_norm = use_qk_norm
|
|
self.qk_norm_before_rope = qk_norm_before_rope
|
|
self.rms_norm_eps = rms_norm_eps
|
|
if self.use_qk_norm:
|
|
self.q_norm_key = f"{self.prefix}.q_norm"
|
|
self.k_norm_key = f"{self.prefix}.k_norm"
|
|
self.init_weight()
|
|
|
|
if self.with_sinks:
|
|
self.sinks = self.create_parameter(
|
|
shape=[self.num_heads],
|
|
dtype=self._dtype,
|
|
is_bias=False,
|
|
default_initializer=paddle.nn.initializer.Constant(0),
|
|
)
|
|
|
|
set_weight_attrs(
|
|
self.sinks,
|
|
{
|
|
"output_dim": True,
|
|
},
|
|
)
|
|
|
|
if (
|
|
hasattr(self.fd_config.model_config, "layer_types")
|
|
and self.fd_config.model_config.layer_types[self.layer_id] == "sliding_attention"
|
|
):
|
|
self.sliding_window = self.fd_config.model_config.sliding_window
|
|
else:
|
|
self.sliding_window = 0
|
|
|
|
if (
|
|
fd_config.plas_attention_config is not None
|
|
and fd_config.plas_attention_config.plas_encoder_top_k_left is not None
|
|
and fd_config.plas_attention_config.plas_encoder_top_k_right is not None
|
|
and fd_config.plas_attention_config.plas_decoder_top_k_left is not None
|
|
and fd_config.plas_attention_config.plas_decoder_top_k_right is not None
|
|
):
|
|
mlp_weight_path = os.path.join(
|
|
fd_config.model_config.model, fd_config.plas_attention_config.mlp_weight_name
|
|
)
|
|
self.plas_use_mlp = mlp_weight_path is not None and os.path.exists(mlp_weight_path)
|
|
plas_block_size = fd_config.plas_attention_config.plas_block_size
|
|
plas_max_seq_length = fd_config.plas_attention_config.plas_max_seq_length
|
|
if self.plas_use_mlp:
|
|
mlp_weight = {}
|
|
with safe_open(mlp_weight_path, framework="np", device="cpu") as f:
|
|
for key_name in f.keys():
|
|
weight = f.get_tensor(key_name)
|
|
weight = paddle.Tensor(weight, zero_copy=True)
|
|
weight = weight._copy_to(paddle.framework._current_expected_place(), False)
|
|
mlp_weight[key_name] = weight
|
|
|
|
if self.layer_id < fd_config.model_config.num_hidden_layers - 1:
|
|
self.attn_gate_weight = mlp_weight[
|
|
f"ernie.layers.{self.layer_id}.self_attn.attn_gate.weight"
|
|
].astype(paddle.get_default_dtype())[
|
|
fd_config.parallel_config.tensor_parallel_rank
|
|
* self.kv_num_heads : (fd_config.parallel_config.tensor_parallel_rank + 1)
|
|
* self.kv_num_heads
|
|
]
|
|
assert self.attn_gate_weight.shape[1] % plas_block_size == 0
|
|
|
|
self.cache_k_block_means = paddle.zeros(
|
|
[
|
|
fd_config.scheduler_config.max_num_seqs,
|
|
plas_max_seq_length // plas_block_size,
|
|
self.kv_num_heads,
|
|
self.head_dim,
|
|
],
|
|
dtype=paddle.get_default_dtype(),
|
|
)
|
|
|
|
def init_weight(self):
|
|
if self.quant_method is not None:
|
|
self.quant_method.create_weights(
|
|
self,
|
|
weight_loader=(
|
|
self.weight_loader if hasattr(self, "weight_loader") else default_weight_loader(self.fd_config)
|
|
),
|
|
)
|
|
|
|
if self.use_qk_norm:
|
|
self.q_norm_weight = self.create_parameter(
|
|
shape=[self.qk_head_dim],
|
|
dtype="float32",
|
|
is_bias=False,
|
|
default_initializer=paddle.nn.initializer.Constant(0),
|
|
)
|
|
|
|
self.k_norm_weight = self.create_parameter(
|
|
shape=[self.qk_head_dim],
|
|
dtype="float32",
|
|
is_bias=False,
|
|
default_initializer=paddle.nn.initializer.Constant(0),
|
|
)
|
|
|
|
def load_state_dict(self, state_dict: Dict[str, paddle.Tensor | np.ndarray]):
|
|
"""
|
|
Attention only have quant related scales not other parameters.
|
|
"""
|
|
if self.quant_method is not None:
|
|
self.quant_method.process_loaded_weights(self, state_dict)
|
|
if self.use_qk_norm:
|
|
q_norm_weight_tensor = paddle.to_tensor(get_tensor(state_dict.pop(self.q_norm_key + ".weight")))
|
|
k_norm_weight_tensor = paddle.to_tensor(get_tensor(state_dict.pop(self.k_norm_key + ".weight")))
|
|
self.q_norm_weight.set_value(q_norm_weight_tensor.astype("float32"))
|
|
self.k_norm_weight.set_value(k_norm_weight_tensor.astype("float32"))
|
|
|
|
if self.with_sinks:
|
|
sinks_tensor = paddle.to_tensor(get_tensor(state_dict.pop(f"{self.prefix}.sinks")))
|
|
self.sinks.set_value(sinks_tensor)
|
|
|
|
def weight_loader(self, param, loaded_weight, loaded_shard_id: Optional[str] = None):
|
|
if self.use_qk_norm and ("q_norm" in param.name or "k_norm" in param.name):
|
|
loaded_weight = get_tensor(loaded_weight).astype("float32")
|
|
param.copy_(loaded_weight, False)
|
|
return
|
|
|
|
loaded_weight = get_tensor(loaded_weight).cast(paddle.get_default_dtype())
|
|
if self.quant_method.cache_quant_config.has_zero_point: # cache_int4_zp
|
|
loaded_weight = 1.0 / loaded_weight
|
|
else:
|
|
loaded_weight = self.quant_method.cache_quant_config.max_bound / loaded_weight
|
|
|
|
param.copy_(loaded_weight, False)
|
|
|
|
def forward(
|
|
self,
|
|
q: paddle.Tensor = None,
|
|
k: paddle.Tensor = None,
|
|
v: paddle.Tensor = None,
|
|
qkv: paddle.Tensor = None,
|
|
compressed_kv: paddle.Tensor = None,
|
|
k_pe: paddle.Tensor = None,
|
|
forward_meta: ForwardMeta = None,
|
|
) -> paddle.Tensor:
|
|
"""
|
|
The forward function of attention layer.
|
|
args:
|
|
q: the query tensor
|
|
k: the key tensor
|
|
v: the value tensor
|
|
forward_meta: the forward meta data
|
|
compressed_kv: optional compressed key-value cache (for MLA)
|
|
k_pe: optional key positional encoding (for MLA)
|
|
"""
|
|
# ============ V1 KVCACHE Manager: Layer-by-layer swap wait ============
|
|
# Wait for swap-in of current layer before using cache
|
|
if forward_meta.layer_done_counter is not None:
|
|
forward_meta.layer_done_counter.wait_for_layer(self.layer_id)
|
|
|
|
return forward_meta.attn_backend.forward(
|
|
q,
|
|
k,
|
|
v,
|
|
qkv,
|
|
compressed_kv,
|
|
k_pe,
|
|
self,
|
|
forward_meta,
|
|
)
|