add missing files

HabanaAI · Sep 20, 2024 · 9f8b8e7 · 9f8b8e7
1 parent f4d2097
commit 9f8b8e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/vllm/engine/arg_utils.py b/vllm/engine/arg_utils.py
@@ -35,6 +35,7 @@
     "openvino",
     "tpu",
     "xpu",
+    "hpu",
 ]
 
 

diff --git a/vllm/platforms/interface.py b/vllm/platforms/interface.py
@@ -42,13 +42,10 @@ def is_rocm(self) -> bool:
     def is_tpu(self) -> bool:
         return self._enum == PlatformEnum.TPU
 
-<<<<<<< HEAD
     def is_hpu(self) -> bool:
         return self._enum == PlatformEnum.HPU
 
     @staticmethod
-    def get_device_capability(device_id: int = 0) -> Tuple[int, int]:
-=======
     def is_cpu(self) -> bool:
         return self._enum == PlatformEnum.CPU
 
@@ -89,7 +86,6 @@ def has_device_capability(
 
     @classmethod
     def get_device_name(cls, device_id: int = 0) -> str:
->>>>>>> upstream/main
         raise NotImplementedError
 
     @classmethod
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ @@
         "openvino",
         "tpu",
         "xpu",
+        "hpu",
     ]
@@ Expand Down @@