Skip to content

Commit 6dc4f55

Browse files
authored
Add Ascend NPU mode (#4217)
1 parent 918a545 commit 6dc4f55

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

ppdiffusers/deploy/img_to_img_infer.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def parse_arguments():
5656
type=str,
5757
default="paddle",
5858
# Note(zhoushunjie): Will support 'tensorrt', 'paddle-tensorrt' soon.
59-
choices=["onnx_runtime", "paddle", "paddlelite"],
59+
choices=["onnx_runtime", "paddle", "paddle-tensorrt", "tensorrt", "paddlelite"],
6060
help="The inference runtime backend of unet model and text encoder model.",
6161
)
6262
parser.add_argument(
@@ -140,7 +140,11 @@ def create_paddle_lite_runtime(model_dir, model_prefix, device="cpu", device_id=
140140
option.use_cann()
141141
option.set_lite_nnadapter_device_names(["huawei_ascend_npu"])
142142
option.set_lite_nnadapter_model_cache_dir(os.path.join(model_dir, model_prefix))
143-
option.set_lite_nnadapter_context_properties("HUAWEI_ASCEND_NPU_SELECTED_DEVICE_IDS={}".format(device_id))
143+
option.set_lite_nnadapter_context_properties(
144+
"HUAWEI_ASCEND_NPU_SELECTED_DEVICE_IDS={};HUAWEI_ASCEND_NPU_PRECISION_MODE=allow_mix_precision".format(
145+
device_id
146+
)
147+
)
144148
elif device == "kunlunxin_xpu":
145149
# TODO(shentanyue): Add kunlunxin_xpu code
146150
pass

ppdiffusers/deploy/inpaint_legacy_infer.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def parse_arguments():
5656
type=str,
5757
default="paddle",
5858
# Note(zhoushunjie): Will support 'tensorrt', 'paddle-tensorrt' soon.
59-
choices=["onnx_runtime", "paddle", "paddlelite"],
59+
choices=["onnx_runtime", "paddle", "paddle-tensorrt", "tensorrt", "paddlelite"],
6060
help="The inference runtime backend of unet model and text encoder model.",
6161
)
6262
parser.add_argument(
@@ -140,7 +140,11 @@ def create_paddle_lite_runtime(model_dir, model_prefix, device="cpu", device_id=
140140
option.use_cann()
141141
option.set_lite_nnadapter_device_names(["huawei_ascend_npu"])
142142
option.set_lite_nnadapter_model_cache_dir(os.path.join(model_dir, model_prefix))
143-
option.set_lite_nnadapter_context_properties("HUAWEI_ASCEND_NPU_SELECTED_DEVICE_IDS={}".format(device_id))
143+
option.set_lite_nnadapter_context_properties(
144+
"HUAWEI_ASCEND_NPU_SELECTED_DEVICE_IDS={};HUAWEI_ASCEND_NPU_PRECISION_MODE=allow_mix_precision".format(
145+
device_id
146+
)
147+
)
144148
elif device == "kunlunxin_xpu":
145149
# TODO(shentanyue): Add kunlunxin_xpu code
146150
pass

ppdiffusers/deploy/text_to_img_infer.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def parse_arguments():
4949
type=str,
5050
default="paddle",
5151
# Note(zhoushunjie): Will support 'tensorrt', 'paddle-tensorrt' soon.
52-
choices=["onnx_runtime", "paddle", "paddlelite"],
52+
choices=["onnx_runtime", "paddle", "paddle-tensorrt", "tensorrt", "paddlelite"],
5353
help="The inference runtime backend of unet model and text encoder model.",
5454
)
5555
parser.add_argument(
@@ -133,7 +133,11 @@ def create_paddle_lite_runtime(model_dir, model_prefix, device="cpu", device_id=
133133
option.use_cann()
134134
option.set_lite_nnadapter_device_names(["huawei_ascend_npu"])
135135
option.set_lite_nnadapter_model_cache_dir(os.path.join(model_dir, model_prefix))
136-
option.set_lite_nnadapter_context_properties("HUAWEI_ASCEND_NPU_SELECTED_DEVICE_IDS={}".format(device_id))
136+
option.set_lite_nnadapter_context_properties(
137+
"HUAWEI_ASCEND_NPU_SELECTED_DEVICE_IDS={};HUAWEI_ASCEND_NPU_PRECISION_MODE=allow_mix_precision".format(
138+
device_id
139+
)
140+
)
137141
elif device == "kunlunxin_xpu":
138142
# TODO(shentanyue): Add kunlunxin_xpu code
139143
pass

0 commit comments

Comments
 (0)