"tests/vscode:/vscode.git/clone" did not exist on "86bfb6dba7c6e0650e7d7498cbd46b49155b2a42"
Unverified Commit 60cad94b authored by Ning Xie's avatar Ning Xie Committed by GitHub
Browse files

[Hardware] correct method signatures for HPU,ROCm,XPU (#18551)


Signed-off-by: default avatarAndy Xie <andy.xning@gmail.com>
parent 9c1baa5b
...@@ -42,7 +42,6 @@ def tpu_platform_plugin() -> Optional[str]: ...@@ -42,7 +42,6 @@ def tpu_platform_plugin() -> Optional[str]:
logger.debug("Confirmed TPU platform is available.") logger.debug("Confirmed TPU platform is available.")
except Exception as e: except Exception as e:
logger.debug("TPU platform is not available because: %s", str(e)) logger.debug("TPU platform is not available because: %s", str(e))
pass
return "vllm.platforms.tpu.TpuPlatform" if is_tpu else None return "vllm.platforms.tpu.TpuPlatform" if is_tpu else None
...@@ -112,7 +111,6 @@ def rocm_platform_plugin() -> Optional[str]: ...@@ -112,7 +111,6 @@ def rocm_platform_plugin() -> Optional[str]:
amdsmi.amdsmi_shut_down() amdsmi.amdsmi_shut_down()
except Exception as e: except Exception as e:
logger.debug("ROCm platform is not available because: %s", str(e)) logger.debug("ROCm platform is not available because: %s", str(e))
pass
return "vllm.platforms.rocm.RocmPlatform" if is_rocm else None return "vllm.platforms.rocm.RocmPlatform" if is_rocm else None
...@@ -130,7 +128,6 @@ def hpu_platform_plugin() -> Optional[str]: ...@@ -130,7 +128,6 @@ def hpu_platform_plugin() -> Optional[str]:
"habana_frameworks is not found.") "habana_frameworks is not found.")
except Exception as e: except Exception as e:
logger.debug("HPU platform is not available because: %s", str(e)) logger.debug("HPU platform is not available because: %s", str(e))
pass
return "vllm.platforms.hpu.HpuPlatform" if is_hpu else None return "vllm.platforms.hpu.HpuPlatform" if is_hpu else None
...@@ -148,7 +145,6 @@ def xpu_platform_plugin() -> Optional[str]: ...@@ -148,7 +145,6 @@ def xpu_platform_plugin() -> Optional[str]:
logger.debug("Confirmed XPU platform is available.") logger.debug("Confirmed XPU platform is available.")
except Exception as e: except Exception as e:
logger.debug("XPU platform is not available because: %s", str(e)) logger.debug("XPU platform is not available because: %s", str(e))
pass
return "vllm.platforms.xpu.XPUPlatform" if is_xpu else None return "vllm.platforms.xpu.XPUPlatform" if is_xpu else None
...@@ -170,7 +166,6 @@ def cpu_platform_plugin() -> Optional[str]: ...@@ -170,7 +166,6 @@ def cpu_platform_plugin() -> Optional[str]:
except Exception as e: except Exception as e:
logger.debug("CPU platform is not available because: %s", str(e)) logger.debug("CPU platform is not available because: %s", str(e))
pass
return "vllm.platforms.cpu.CpuPlatform" if is_cpu else None return "vllm.platforms.cpu.CpuPlatform" if is_cpu else None
...@@ -222,8 +217,11 @@ def resolve_current_platform_cls_qualname() -> str: ...@@ -222,8 +217,11 @@ def resolve_current_platform_cls_qualname() -> str:
platform_cls_qualname = func() platform_cls_qualname = func()
if platform_cls_qualname is not None: if platform_cls_qualname is not None:
activated_plugins.append(name) activated_plugins.append(name)
logger.info("Platform plugin %s loaded.", name)
logger.warning(
"Platform plugin %s function's return value is None", name)
except Exception: except Exception:
pass logger.exception("Failed to load platform plugin %s", name)
activated_builtin_plugins = list( activated_builtin_plugins = list(
set(activated_plugins) & set(builtin_platform_plugins.keys())) set(activated_plugins) & set(builtin_platform_plugins.keys()))
......
...@@ -39,8 +39,8 @@ class HpuPlatform(Platform): ...@@ -39,8 +39,8 @@ class HpuPlatform(Platform):
def is_async_output_supported(cls, enforce_eager: Optional[bool]) -> bool: def is_async_output_supported(cls, enforce_eager: Optional[bool]) -> bool:
return True return True
@staticmethod @classmethod
def inference_mode(): def inference_mode(cls):
return torch.no_grad() return torch.no_grad()
@classmethod @classmethod
......
...@@ -217,9 +217,9 @@ class RocmPlatform(Platform): ...@@ -217,9 +217,9 @@ class RocmPlatform(Platform):
major, minor = torch.cuda.get_device_capability(device_id) major, minor = torch.cuda.get_device_capability(device_id)
return DeviceCapability(major=major, minor=minor) return DeviceCapability(major=major, minor=minor)
@staticmethod @classmethod
@with_amdsmi_context @with_amdsmi_context
def is_fully_connected(physical_device_ids: list[int]) -> bool: def is_fully_connected(cls, physical_device_ids: list[int]) -> bool:
""" """
Query if the set of gpus are fully connected by xgmi (1 hop) Query if the set of gpus are fully connected by xgmi (1 hop)
""" """
......
...@@ -37,15 +37,17 @@ class XPUPlatform(Platform): ...@@ -37,15 +37,17 @@ class XPUPlatform(Platform):
logger.info("Using IPEX attention backend.") logger.info("Using IPEX attention backend.")
return "vllm.attention.backends.ipex_attn.IpexAttnBackend" return "vllm.attention.backends.ipex_attn.IpexAttnBackend"
@staticmethod @classmethod
def get_device_capability( def get_device_capability(
device_id: int = 0) -> Optional[DeviceCapability]: cls,
device_id: int = 0,
) -> Optional[DeviceCapability]:
# capacity format differs from cuda's and will cause unexpected # capacity format differs from cuda's and will cause unexpected
# failure, so use None directly # failure, so use None directly
return None return None
@staticmethod @classmethod
def get_device_name(device_id: int = 0) -> str: def get_device_name(cls, device_id: int = 0) -> str:
return torch.xpu.get_device_name(device_id) return torch.xpu.get_device_name(device_id)
@classmethod @classmethod
...@@ -57,8 +59,8 @@ class XPUPlatform(Platform): ...@@ -57,8 +59,8 @@ class XPUPlatform(Platform):
def is_async_output_supported(cls, enforce_eager: Optional[bool]) -> bool: def is_async_output_supported(cls, enforce_eager: Optional[bool]) -> bool:
return True return True
@staticmethod @classmethod
def inference_mode(): def inference_mode(cls):
return torch.no_grad() return torch.no_grad()
@classmethod @classmethod
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment