fa3 & trtllm_mha spec overlap (#11874)
This commit is contained in:
@@ -90,11 +90,7 @@ class ForwardMode(IntEnum):
|
||||
self == ForwardMode.EXTEND
|
||||
or self == ForwardMode.MIXED
|
||||
or self == ForwardMode.DRAFT_EXTEND
|
||||
or (
|
||||
self == ForwardMode.DRAFT_EXTEND_V2
|
||||
if include_draft_extend_v2
|
||||
else False
|
||||
)
|
||||
or (include_draft_extend_v2 and self == ForwardMode.DRAFT_EXTEND_V2)
|
||||
or self == ForwardMode.TARGET_VERIFY
|
||||
or self == ForwardMode.SPLIT_PREFILL
|
||||
)
|
||||
@@ -115,22 +111,21 @@ class ForwardMode(IntEnum):
|
||||
return self == ForwardMode.TARGET_VERIFY
|
||||
|
||||
def is_draft_extend(self, include_v2: bool = False):
|
||||
if include_v2:
|
||||
return (
|
||||
self == ForwardMode.DRAFT_EXTEND_V2 or self == ForwardMode.DRAFT_EXTEND
|
||||
)
|
||||
return self == ForwardMode.DRAFT_EXTEND
|
||||
return self == ForwardMode.DRAFT_EXTEND or (
|
||||
include_v2 and self == ForwardMode.DRAFT_EXTEND_V2
|
||||
)
|
||||
|
||||
def is_draft_extend_v2(self):
|
||||
# For fixed shape logits output in v2 eagle worker
|
||||
return self == ForwardMode.DRAFT_EXTEND_V2
|
||||
|
||||
def is_extend_or_draft_extend_or_mixed(self):
|
||||
def is_extend_or_draft_extend_or_mixed(self, include_draft_extend_v2: bool = False):
|
||||
return (
|
||||
self == ForwardMode.EXTEND
|
||||
or self == ForwardMode.DRAFT_EXTEND
|
||||
or self == ForwardMode.MIXED
|
||||
or self == ForwardMode.SPLIT_PREFILL
|
||||
or (include_draft_extend_v2 and self == ForwardMode.DRAFT_EXTEND_V2)
|
||||
)
|
||||
|
||||
def is_cuda_graph(self):
|
||||
|
||||
Reference in New Issue
Block a user