[Bugfix] Remove deprecated @abstractproperty (vllm-project#5174)

blinkbear · Jun 3, 2024 · a51bb4f · a51bb4f
1 parent 50df7af
commit a51bb4f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/vllm/core/evictor_v1.py b/vllm/core/evictor_v1.py
@@ -1,5 +1,5 @@
 import enum
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from typing import OrderedDict
 
 from vllm.block import PhysicalTokenBlock
@@ -44,7 +44,8 @@ def remove(self, block_hash: int) -> PhysicalTokenBlock:
         """
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def num_blocks(self) -> int:
         pass
 

diff --git a/vllm/core/evictor_v2.py b/vllm/core/evictor_v2.py
@@ -1,5 +1,5 @@
 import enum
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from typing import OrderedDict, Tuple
 
 
@@ -46,7 +46,8 @@ def remove(self, block_id: int):
         """Remove a given block id from the cache."""
         pass
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def num_blocks(self) -> int:
         pass
 

diff --git a/vllm/lora/worker_manager.py b/vllm/lora/worker_manager.py
@@ -1,4 +1,4 @@
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from contextlib import contextmanager
 from typing import Any, Dict, List, Literal, Optional, Set, Type, Union
 
@@ -42,7 +42,8 @@ def dummy_lora_cache(self):
         yield
         self._cached_dummy_lora = False
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def is_enabled(self) -> bool:
         ...