Skip to content

Commit 3f3d2ce

Browse files
committed
clean up space
Signed-off-by: Xiao Yu <[email protected]>
1 parent 46b781c commit 3f3d2ce

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

vllm/envs.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,8 +1183,12 @@ def get_vllm_port() -> Optional[int]:
11831183
# If set, use the fp8 mfma in rocm paged attention.
11841184
"VLLM_ROCM_FP8_MFMA_PAGE_ATTN":
11851185
lambda: bool(int(os.getenv("VLLM_ROCM_FP8_MFMA_PAGE_ATTN", "0"))),
1186+
<<<<<<< HEAD
11861187

11871188
>>>>>>> c588bf50e (Update vllm/envs.py)
1189+
=======
1190+
1191+
>>>>>>> 0c785a544 (clean up space)
11881192
# Whether to use pytorch symmetric memory for allreduce
11891193
"VLLM_ALLREDUCE_USE_SYMM_MEM":
11901194
lambda: bool(int(os.getenv("VLLM_ALLREDUCE_USE_SYMM_MEM", "0"))),

0 commit comments

Comments
 (0)