Browse Source

when was this deprecated?

AlpinDale 7 months ago
parent
commit
5fecc6b025

+ 3 - 2
aphrodite/lora/worker_manager.py

@@ -1,4 +1,4 @@
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from contextlib import contextmanager
 from contextlib import contextmanager
 from typing import Any, Dict, List, Literal, Optional, Set, Type, Union
 from typing import Any, Dict, List, Literal, Optional, Set, Type, Union
 
 
@@ -40,7 +40,8 @@ class AbstractWorkerLoRAManager(ABC):
         yield
         yield
         self._cached_dummy_lora = False
         self._cached_dummy_lora = False
 
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def is_enabled(self) -> bool:
     def is_enabled(self) -> bool:
         ...
         ...
 
 

+ 3 - 2
aphrodite/processing/evictor_v1.py

@@ -1,5 +1,5 @@
 import enum
 import enum
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from typing import OrderedDict
 from typing import OrderedDict
 
 
 from aphrodite.common.block import PhysicalTokenBlock
 from aphrodite.common.block import PhysicalTokenBlock
@@ -44,7 +44,8 @@ class Evictor(ABC):
         """
         """
         pass
         pass
 
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def num_blocks(self) -> int:
     def num_blocks(self) -> int:
         pass
         pass
 
 

+ 3 - 2
aphrodite/processing/evictor_v2.py

@@ -1,5 +1,5 @@
 import enum
 import enum
-from abc import ABC, abstractmethod, abstractproperty
+from abc import ABC, abstractmethod
 from typing import OrderedDict, Tuple
 from typing import OrderedDict, Tuple
 
 
 
 
@@ -46,7 +46,8 @@ class Evictor(ABC):
         """Remove a given block id from the cache."""
         """Remove a given block id from the cache."""
         pass
         pass
 
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def num_blocks(self) -> int:
     def num_blocks(self) -> int:
         pass
         pass