Unverified Commit 71b1c8b6 authored by Yeshwanth N's avatar Yeshwanth N Committed by GitHub
Browse files

[Chore]:Extract math and argparse utilities to separate modules (#27188)


Signed-off-by: default avatarYeshwanth Surya <yeshsurya@gmail.com>
Signed-off-by: default avatarYeshwanth N <yeshsurya@gmail.com>
Signed-off-by: default avataryeshsurya <yeshsurya@gmail.com>
parent 8fb7b2fa
...@@ -8,7 +8,7 @@ for processing prompts with various sampling parameters. ...@@ -8,7 +8,7 @@ for processing prompts with various sampling parameters.
import argparse import argparse
from vllm import EngineArgs, LLMEngine, RequestOutput, SamplingParams from vllm import EngineArgs, LLMEngine, RequestOutput, SamplingParams
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
def create_test_prompts() -> list[tuple[str, SamplingParams]]: def create_test_prompts() -> list[tuple[str, SamplingParams]]:
......
...@@ -25,7 +25,7 @@ python load_sharded_state.py \ ...@@ -25,7 +25,7 @@ python load_sharded_state.py \
import dataclasses import dataclasses
from vllm import LLM, EngineArgs, SamplingParams from vllm import LLM, EngineArgs, SamplingParams
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
def parse_args(): def parse_args():
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
from argparse import Namespace from argparse import Namespace
from vllm import LLM, EngineArgs from vllm import LLM, EngineArgs
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
def parse_args(): def parse_args():
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
from argparse import Namespace from argparse import Namespace
from vllm import LLM, EngineArgs, PoolingParams from vllm import LLM, EngineArgs, PoolingParams
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
def parse_args(): def parse_args():
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
from argparse import Namespace from argparse import Namespace
from vllm import LLM, EngineArgs from vllm import LLM, EngineArgs
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
def parse_args(): def parse_args():
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
from argparse import Namespace from argparse import Namespace
from vllm import LLM, EngineArgs from vllm import LLM, EngineArgs
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
def parse_args(): def parse_args():
......
...@@ -13,7 +13,7 @@ from tqdm import tqdm ...@@ -13,7 +13,7 @@ from tqdm import tqdm
from vllm import LLM, SamplingParams from vllm import LLM, SamplingParams
from vllm.engine.arg_utils import EngineArgs from vllm.engine.arg_utils import EngineArgs
from vllm.inputs import PromptType from vllm.inputs import PromptType
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
DURATION_MS = int(os.getenv("VLLM_TPU_PROFILE_DURATION_MS", 3000)) DURATION_MS = int(os.getenv("VLLM_TPU_PROFILE_DURATION_MS", 3000))
DELAY_MS = int(os.getenv("VLLM_TPU_PROFILE_DELAY_MS", 0)) DELAY_MS = int(os.getenv("VLLM_TPU_PROFILE_DELAY_MS", 0))
......
...@@ -13,7 +13,7 @@ from vllm.assets.audio import AudioAsset ...@@ -13,7 +13,7 @@ from vllm.assets.audio import AudioAsset
from vllm.assets.image import ImageAsset from vllm.assets.image import ImageAsset
from vllm.assets.video import VideoAsset from vllm.assets.video import VideoAsset
from vllm.multimodal.image import convert_image_mode from vllm.multimodal.image import convert_image_mode
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
class QueryResult(NamedTuple): class QueryResult(NamedTuple):
......
...@@ -30,7 +30,7 @@ from pathlib import Path ...@@ -30,7 +30,7 @@ from pathlib import Path
from vllm import LLM, EngineArgs from vllm import LLM, EngineArgs
from vllm.model_executor.model_loader import ShardedStateLoader from vllm.model_executor.model_loader import ShardedStateLoader
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
def parse_args(): def parse_args():
......
...@@ -9,7 +9,7 @@ from vllm.inputs import TokensPrompt ...@@ -9,7 +9,7 @@ from vllm.inputs import TokensPrompt
from vllm.v1.metrics.reader import Counter, Vector from vllm.v1.metrics.reader import Counter, Vector
try: try:
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
except ImportError: except ImportError:
from argparse import ArgumentParser as FlexibleArgumentParser from argparse import ArgumentParser as FlexibleArgumentParser
......
...@@ -22,7 +22,7 @@ from vllm.assets.image import ImageAsset ...@@ -22,7 +22,7 @@ from vllm.assets.image import ImageAsset
from vllm.assets.video import VideoAsset from vllm.assets.video import VideoAsset
from vllm.lora.request import LoRARequest from vllm.lora.request import LoRARequest
from vllm.multimodal.image import convert_image_mode from vllm.multimodal.image import convert_image_mode
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
class ModelRequestData(NamedTuple): class ModelRequestData(NamedTuple):
......
...@@ -18,7 +18,7 @@ from transformers import AutoProcessor, AutoTokenizer ...@@ -18,7 +18,7 @@ from transformers import AutoProcessor, AutoTokenizer
from vllm import LLM, EngineArgs, SamplingParams from vllm import LLM, EngineArgs, SamplingParams
from vllm.lora.request import LoRARequest from vllm.lora.request import LoRARequest
from vllm.multimodal.utils import fetch_image from vllm.multimodal.utils import fetch_image
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
QUESTION = "What is the content of each image?" QUESTION = "What is the content of each image?"
IMAGE_URLS = [ IMAGE_URLS = [
......
...@@ -18,7 +18,7 @@ from PIL.Image import Image ...@@ -18,7 +18,7 @@ from PIL.Image import Image
from vllm import LLM, EngineArgs from vllm import LLM, EngineArgs
from vllm.entrypoints.score_utils import ScoreMultiModalParam from vllm.entrypoints.score_utils import ScoreMultiModalParam
from vllm.multimodal.utils import fetch_image from vllm.multimodal.utils import fetch_image
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
ROOT_DIR = Path(__file__).parent.parent.parent ROOT_DIR = Path(__file__).parent.parent.parent
EXAMPLES_DIR = ROOT_DIR / "examples" EXAMPLES_DIR = ROOT_DIR / "examples"
......
...@@ -26,7 +26,7 @@ import requests ...@@ -26,7 +26,7 @@ import requests
from openai import OpenAI from openai import OpenAI
from utils import get_first_model from utils import get_first_model
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
# Modify OpenAI's API key and API base to use vLLM's API server. # Modify OpenAI's API key and API base to use vLLM's API server.
openai_api_key = "EMPTY" openai_api_key = "EMPTY"
......
...@@ -16,7 +16,7 @@ from vllm.model_executor.model_loader.tensorizer import ( ...@@ -16,7 +16,7 @@ from vllm.model_executor.model_loader.tensorizer import (
tensorize_vllm_model, tensorize_vllm_model,
tensorizer_kwargs_arg, tensorizer_kwargs_arg,
) )
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
logger = logging.getLogger() logger = logging.getLogger()
......
...@@ -22,7 +22,7 @@ from vllm.engine.arg_utils import ( ...@@ -22,7 +22,7 @@ from vllm.engine.arg_utils import (
optional_type, optional_type,
parse_type, parse_type,
) )
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
@pytest.mark.parametrize( @pytest.mark.parametrize(
......
...@@ -7,7 +7,7 @@ import pytest ...@@ -7,7 +7,7 @@ import pytest
from vllm.entrypoints.openai.cli_args import make_arg_parser, validate_parsed_serve_args from vllm.entrypoints.openai.cli_args import make_arg_parser, validate_parsed_serve_args
from vllm.entrypoints.openai.serving_models import LoRAModulePath from vllm.entrypoints.openai.serving_models import LoRAModulePath
from vllm.utils import FlexibleArgumentParser from vllm.utils.argparse_utils import FlexibleArgumentParser
from ...utils import VLLM_PATH from ...utils import VLLM_PATH
......
...@@ -6,7 +6,6 @@ import pytest ...@@ -6,7 +6,6 @@ import pytest
import torch import torch
from vllm.platforms import current_platform from vllm.platforms import current_platform
from vllm.utils import cdiv
from vllm.utils.deep_gemm import ( from vllm.utils.deep_gemm import (
_ceil_to_ue8m0, _ceil_to_ue8m0,
calc_diff, calc_diff,
...@@ -16,6 +15,7 @@ from vllm.utils.deep_gemm import ( ...@@ -16,6 +15,7 @@ from vllm.utils.deep_gemm import (
get_paged_mqa_logits_metadata, get_paged_mqa_logits_metadata,
) )
from vllm.utils.import_utils import has_deep_gemm from vllm.utils.import_utils import has_deep_gemm
from vllm.utils.math_utils import cdiv
def kv_cache_cast_to_fp8(x: torch.Tensor) -> torch.Tensor: def kv_cache_cast_to_fp8(x: torch.Tensor) -> torch.Tensor:
......
...@@ -10,7 +10,7 @@ from tests.kernels.quantization.nvfp4_utils import ( ...@@ -10,7 +10,7 @@ from tests.kernels.quantization.nvfp4_utils import (
get_nvfp4_global_scale, get_nvfp4_global_scale,
) )
from vllm.platforms import current_platform from vllm.platforms import current_platform
from vllm.utils import round_up from vllm.utils.math_utils import round_up
if not current_platform.is_device_capability(100): if not current_platform.is_device_capability(100):
pytest.skip( pytest.skip(
......
...@@ -7,7 +7,7 @@ from torch import Tensor ...@@ -7,7 +7,7 @@ from torch import Tensor
import vllm._custom_ops as ops import vllm._custom_ops as ops
from vllm.platforms import current_platform from vllm.platforms import current_platform
from vllm.utils import cdiv from vllm.utils.math_utils import cdiv
def ref_mla( def ref_mla(
......
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