[Refactor] Remove duplicate ceil_div (#20023)
Signed-off-by: yewentao256 <zhyanwentao@126.com>
This commit is contained in:
@@ -6,11 +6,7 @@ import torch
|
||||
|
||||
from vllm import _custom_ops as ops
|
||||
from vllm.triton_utils import tl, triton
|
||||
from vllm.utils import round_up
|
||||
|
||||
|
||||
def ceil_div(a, b):
|
||||
return (a + b - 1) // b
|
||||
from vllm.utils import cdiv, round_up
|
||||
|
||||
|
||||
@triton.jit
|
||||
@@ -115,7 +111,7 @@ def moe_align_block_size_triton(
|
||||
cumsum = torch.zeros((num_experts + 1, ),
|
||||
dtype=torch.int32,
|
||||
device=topk_ids.device)
|
||||
tokens_per_thread = ceil_div(numel, num_experts)
|
||||
tokens_per_thread = cdiv(numel, num_experts)
|
||||
|
||||
moe_align_block_size_stage1[grid](
|
||||
topk_ids,
|
||||
|
||||
@@ -19,7 +19,7 @@ from vllm.model_executor.layers.quantization.utils.w8a8_utils import (
|
||||
CUTLASS_BLOCK_FP8_SUPPORTED)
|
||||
from vllm.platforms import current_platform
|
||||
from vllm.triton_utils import tl, triton
|
||||
from vllm.utils import direct_register_custom_op
|
||||
from vllm.utils import cdiv, direct_register_custom_op
|
||||
|
||||
logger = init_logger(__name__)
|
||||
has_deep_gemm = importlib.util.find_spec("deep_gemm") is not None
|
||||
@@ -158,12 +158,9 @@ def apply_w8a8_block_fp8_linear(
|
||||
if current_platform.is_cuda():
|
||||
if current_platform.has_device_capability(100):
|
||||
|
||||
def ceil_div(x: int, y: int) -> int:
|
||||
return (x + y - 1) // y
|
||||
|
||||
use_cutlass = cutlass_block_fp8_supported and (
|
||||
ceil_div(weight.shape[0], 128) == weight_scale.shape[0]
|
||||
and ceil_div(weight.shape[1], 128) == weight_scale.shape[1])
|
||||
cdiv(weight.shape[0], 128) == weight_scale.shape[0]
|
||||
and cdiv(weight.shape[1], 128) == weight_scale.shape[1])
|
||||
else:
|
||||
# TODO: update this after switching to public sm90 block scale gemm
|
||||
# as it also supports weight.shape % 128 != 0
|
||||
|
||||
Reference in New Issue
Block a user