Skip to content

Commit 2cf5c85

Browse files
author
wangzaijun
committed
fix hugepage_num
1 parent 01f8ac6 commit 2cf5c85

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

lightllm/utils/kv_cache_utils.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ def calcu_cpu_cache_meta() -> "CpuKVCacheMeta":
8484
args = get_env_start_args()
8585
assert args.enable_cpu_cache
8686

87-
if get_model_type(model_path=args.model_dir) not in ["deepseek_v2", "deepseek_v3"]:
87+
if get_model_type(model_path=args.model_dir) in ["deepseek_v2", "deepseek_v3"]:
8888
item_size = 2
89-
num_key_value_heads = get_num_key_value_heads(args.model_dir) * 2
90-
head_dim = get_head_dim(args.model_dir)
89+
num_key_value_heads = 1
90+
head_dim = 512 + 64
9191
layer_num = get_layer_num(args.model_dir)
9292
else:
9393
item_size = 2
94-
num_key_value_heads = 1
95-
head_dim = 512 + 64
94+
num_key_value_heads = get_num_key_value_heads(args.model_dir) * 2
95+
head_dim = get_head_dim(args.model_dir)
9696
layer_num = get_layer_num(args.model_dir)
9797

9898
if args.mtp_mode is not None:
@@ -157,13 +157,14 @@ def _get_default_hugepage_size() -> int:
157157

158158
# 优先尝试 HugeTLB 分配,失败则回退到普通页
159159
shmid = libc.shmget(key, size_to_alloc, shmflg)
160+
hugepages_num = (size_to_alloc + 1024 * 1024 * 1024 - 1) // (1024 * 1024 * 1024)
160161
if shmid < 0 and use_hugetlb:
161162
err = ctypes.get_errno()
162163
logger.error(
163164
f"shmget with SHM_HUGETLB failed (errno={err}). Falling back to regular pages."
164165
f"You may need to configure hugepages manually, e.g.,"
165166
f"sudo sed -i 's/^GRUB_CMDLINE_LINUX=\"/& default_hugepagesz=1G \
166-
hugepagesz=1G hugepages=1000/' /etc/default/grub"
167+
hugepagesz=1G hugepages={hugepages_num}/' /etc/default/grub"
167168
f"sudo update-grub"
168169
f"sudo reboot"
169170
)

0 commit comments

Comments
 (0)