"vscode:/vscode.git/clone" did not exist on "49314869887e169be080201ab8bcda14e745c080"
Unverified Commit 37e84a40 authored by SangBin Cho's avatar SangBin Cho Committed by GitHub
Browse files

[Typing] Fix Sequence type GenericAlias only available after Python 3.9. (#4092)

parent 4695397d
"""A block manager that manages token blocks.""" """A block manager that manages token blocks."""
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from collections.abc import Sequence as GenericSequence
from itertools import count, takewhile from itertools import count, takewhile
from os.path import commonprefix from os.path import commonprefix
from typing import Dict, List, Optional, Set from typing import Dict, List, Optional
from typing import Sequence as GenericSequence
from typing import Set
from vllm.block import BlockTable, PhysicalTokenBlock from vllm.block import BlockTable, PhysicalTokenBlock
from vllm.core.evictor import EvictionPolicy, Evictor, make_evictor from vllm.core.evictor import EvictionPolicy, Evictor, make_evictor
......
"""A block manager that manages token blocks.""" """A block manager that manages token blocks."""
from collections.abc import Sequence as GenericSequence
from typing import Dict, List, Optional from typing import Dict, List, Optional
from typing import Sequence as GenericSequence
from vllm.core.block.block_table import BlockTable from vllm.core.block.block_table import BlockTable
from vllm.core.block.cpu_gpu_block_allocator import CpuGpuBlockAllocator from vllm.core.block.cpu_gpu_block_allocator import CpuGpuBlockAllocator
......
import enum import enum
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from collections.abc import Sequence as GenericSequence
from typing import Dict, List from typing import Dict, List
from typing import Sequence as GenericSequence
from vllm.sequence import Sequence, SequenceGroup from vllm.sequence import Sequence, SequenceGroup
......
...@@ -6,11 +6,12 @@ import socket ...@@ -6,11 +6,12 @@ import socket
import subprocess import subprocess
import uuid import uuid
import warnings import warnings
from collections import OrderedDict, defaultdict from collections import defaultdict
from functools import lru_cache, partial from functools import lru_cache, partial
from platform import uname from platform import uname
from typing import (Any, AsyncIterator, Awaitable, Callable, Dict, Generic, from typing import (Any, AsyncIterator, Awaitable, Callable, Dict, Generic,
Hashable, List, Optional, Tuple, TypeVar, Union) Hashable, List, Optional, OrderedDict, Tuple, TypeVar,
Union)
import psutil import psutil
import torch import torch
...@@ -51,7 +52,7 @@ class Counter: ...@@ -51,7 +52,7 @@ class Counter:
class LRUCache(Generic[T]): class LRUCache(Generic[T]):
def __init__(self, capacity: int): def __init__(self, capacity: int):
self.cache = OrderedDict[Hashable, T]() self.cache: OrderedDict[Hashable, T] = OrderedDict()
self.capacity = capacity self.capacity = capacity
def __contains__(self, key: Hashable) -> bool: def __contains__(self, key: Hashable) -> bool:
......
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