Skip to content

Commit b314228

Browse files
committed
fix conflict
1 parent 1c59a8a commit b314228

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

fastdeploy/model_executor/utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,13 +554,13 @@ def fn(loaded_weight_name, is_moe):
554554
return fn
555555

556556

557+
def has_flashinfer():
558+
return importlib.util.find_spec("flashinfer") is not None
559+
560+
557561
@cache
558562
def get_sm_version():
559563
if paddle.cuda.is_available():
560564
prop = paddle.device.cuda.get_device_properties()
561565
return prop.major * 10 + prop.minor
562566
return 0
563-
564-
565-
def has_flashinfer():
566-
return importlib.util.find_spec("flashinfer") is not None

0 commit comments

Comments
 (0)