[Bugfix] Remove deprecated @abstractproperty (#5174)

This commit is contained in:
Zhuohan Li 2024-06-01 15:40:25 -07:00 committed by GitHub
parent b9c0605a8e
commit 8279078e21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 6 deletions

View File

@ -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 vllm.block import PhysicalTokenBlock from vllm.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

View File

@ -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

View File

@ -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
@ -42,7 +42,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:
... ...