Commit 66b809cc authored by zhuwenwen's avatar zhuwenwen
Browse files

Merge tag 'v0.7.2' into v0.7.2-dev

parents 37b63c24 0408efc6
# SPDX-License-Identifier: Apache-2.0
from vllm.lora.ops.torch_ops.lora_ops import bgmv_expand # noqa: F401 from vllm.lora.ops.torch_ops.lora_ops import bgmv_expand # noqa: F401
from vllm.lora.ops.torch_ops.lora_ops import (bgmv_expand_slice, bgmv_shrink, from vllm.lora.ops.torch_ops.lora_ops import (bgmv_expand_slice, bgmv_shrink,
sgmv_expand, sgmv_expand_slice, sgmv_expand, sgmv_expand_slice,
......
# SPDX-License-Identifier: Apache-2.0
import torch import torch
......
# SPDX-License-Identifier: Apache-2.0
from vllm.lora.ops.triton_ops.bgmv_expand import bgmv_expand from vllm.lora.ops.triton_ops.bgmv_expand import bgmv_expand
from vllm.lora.ops.triton_ops.bgmv_expand_slice import bgmv_expand_slice from vllm.lora.ops.triton_ops.bgmv_expand_slice import bgmv_expand_slice
from vllm.lora.ops.triton_ops.bgmv_shrink import bgmv_shrink from vllm.lora.ops.triton_ops.bgmv_shrink import bgmv_shrink
......
# SPDX-License-Identifier: Apache-2.0
""" """
Based on: Based on:
Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023). Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023).
......
# SPDX-License-Identifier: Apache-2.0
""" """
Based on: Based on:
Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023). Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023).
......
# SPDX-License-Identifier: Apache-2.0
""" """
Based on: Based on:
Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023). Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023).
......
# SPDX-License-Identifier: Apache-2.0
""" """
Based on: Based on:
Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023). Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023).
......
# SPDX-License-Identifier: Apache-2.0
""" """
Based on: Based on:
Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023). Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023).
......
# SPDX-License-Identifier: Apache-2.0
import functools import functools
from typing import Dict, List, Tuple from typing import Dict, List, Tuple
......
# SPDX-License-Identifier: Apache-2.0
# Adapted from: https://github.com/huggingface/peft/blob/main/src/peft/tuners/lora/config.py # Adapted from: https://github.com/huggingface/peft/blob/main/src/peft/tuners/lora/config.py
import json import json
......
# SPDX-License-Identifier: Apache-2.0
from vllm.lora.punica_wrapper.punica_base import PunicaWrapperBase from vllm.lora.punica_wrapper.punica_base import PunicaWrapperBase
from vllm.lora.punica_wrapper.punica_selector import get_punica_wrapper from vllm.lora.punica_wrapper.punica_selector import get_punica_wrapper
......
# SPDX-License-Identifier: Apache-2.0
""" """
Based on: Based on:
Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023). Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023).
......
# SPDX-License-Identifier: Apache-2.0
from typing import Callable, Optional, Tuple, Union from typing import Callable, Optional, Tuple, Union
import torch import torch
......
# SPDX-License-Identifier: Apache-2.0
""" """
Based on: Based on:
Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023). Chen, L., Ye, Z., Wu, Y., Zhuo, D., Ceze, L., & Krishnamurthy, A. (2023).
......
# SPDX-License-Identifier: Apache-2.0
from typing import Optional, Tuple, Union, final from typing import Optional, Tuple, Union, final
import torch import torch
......
# SPDX-License-Identifier: Apache-2.0
from vllm.logger import init_logger from vllm.logger import init_logger
from vllm.platforms import current_platform from vllm.platforms import current_platform
from vllm.utils import resolve_obj_by_qualname from vllm.utils import resolve_obj_by_qualname
......
# SPDX-License-Identifier: Apache-2.0
from typing import TYPE_CHECKING, List, Optional, Tuple, Union from typing import TYPE_CHECKING, List, Optional, Tuple, Union
import torch import torch
......
# SPDX-License-Identifier: Apache-2.0
import warnings import warnings
from typing import Optional from typing import Optional
...@@ -31,7 +33,7 @@ class LoRARequest( ...@@ -31,7 +33,7 @@ class LoRARequest(
base_model_name: Optional[str] = msgspec.field(default=None) base_model_name: Optional[str] = msgspec.field(default=None)
def __post_init__(self): def __post_init__(self):
if 'lora_local_path' in self.__struct_fields__: if self.lora_local_path:
warnings.warn( warnings.warn(
"The 'lora_local_path' attribute is deprecated " "The 'lora_local_path' attribute is deprecated "
"and will be removed in a future version. " "and will be removed in a future version. "
......
# SPDX-License-Identifier: Apache-2.0
import os import os
import re import re
from typing import List, Optional, Set, Tuple, Type, Union from typing import List, Optional, Set, Tuple, Type, Union
......
# SPDX-License-Identifier: Apache-2.0
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
......
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