Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions vllm/utils/cpu_resource_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

import json
import os
import platform
import subprocess
import sys
from dataclasses import dataclass
from functools import cache

Expand Down Expand Up @@ -78,7 +78,7 @@ def parse_id_list(raw_str: str) -> list[int]:


def get_memory_node_info(node_id: int = 0) -> MemoryNodeInfo:
if platform.system() == "Darwin":
if sys.platform == "darwin":
# MacOS has no memory node
return MemoryNodeInfo(
total_memory=psutil.virtual_memory().total,
Expand Down Expand Up @@ -122,17 +122,14 @@ def get_memory_node_info(node_id: int = 0) -> MemoryNodeInfo:

def get_allowed_cpu_list() -> list[LogicalCPUInfo]:
cpu_list = _get_cpu_list()
if platform.system() == "Darwin":
return cpu_list

global_allowed_cpu_id_list = os.sched_getaffinity(0) # type: ignore[attr-defined]
logical_cpu_list = [x for x in cpu_list if x.id in global_allowed_cpu_id_list]

return logical_cpu_list
if sys.platform == "linux":
allowed = os.sched_getaffinity(0)
return [x for x in cpu_list if x.id in allowed]
return cpu_list


def get_visible_memory_node() -> list[int]:
if platform.system() == "Darwin":
if sys.platform == "darwin":
return [0]

allowed_memory_node_list = get_memory_affinity()
Expand Down Expand Up @@ -163,7 +160,7 @@ def _synthesize_cpu_list() -> list[LogicalCPUInfo]:


def _get_cpu_list() -> list[LogicalCPUInfo]:
if platform.system() == "Darwin":
if sys.platform == "darwin":
# For MacOS, no user-level CPU affinity and SMT, return all CPUs
return _synthesize_cpu_list()

Expand Down
Loading