178 lines
9.2 KiB
Diff
178 lines
9.2 KiB
Diff
From eb9ef257a95f931c248edb35b05cf18068c8c4ad Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 10:32:00 +0100
|
|
Subject: [PATCH 1/8] Add MIGraphXExecutionProvider to ORT_PROVIDERS
|
|
|
|
---
|
|
utils.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/utils.py b/utils.py
|
|
index cf3dd6e6..813b9520 100644
|
|
--- a/utils.py
|
|
+++ b/utils.py
|
|
@@ -46,7 +46,7 @@
|
|
annotator_ckpts_path = str(Path(here, "./ckpts"))
|
|
TEMP_DIR = tempfile.gettempdir()
|
|
USE_SYMLINKS = False
|
|
- ORT_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "CoreMLExecutionProvider"]
|
|
+ ORT_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "CoreMLExecutionProvider", "MIGraphXExecutionProvider"]
|
|
|
|
os.environ['AUX_ANNOTATOR_CKPTS_PATH'] = os.getenv('AUX_ANNOTATOR_CKPTS_PATH', annotator_ckpts_path)
|
|
os.environ['AUX_TEMP_DIR'] = os.getenv('AUX_TEMP_DIR', str(TEMP_DIR))
|
|
|
|
From 2c754a7cd9d4a44c251676c4b022f65ea824c4d3 Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 10:32:15 +0100
|
|
Subject: [PATCH 2/8] Update config.example.yaml
|
|
|
|
---
|
|
config.example.yaml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/config.example.yaml b/config.example.yaml
|
|
index 6734ad02..1de7d738 100644
|
|
--- a/config.example.yaml
|
|
+++ b/config.example.yaml
|
|
@@ -17,4 +17,4 @@ USE_SYMLINKS: False
|
|
# empty list or only keep ["CPUExecutionProvider"] means you use cv2.dnn.readNetFromONNX to load onnx models
|
|
# if your onnx models can only run on the CPU or have other issues, we recommend using pt model instead.
|
|
# default value is ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider"]
|
|
-EP_list: ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider"]
|
|
+EP_list: ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "MIGraphXExecutionProvider"]
|
|
|
|
From 9cca5c69ba4892dfb0afb30652490fe64154aa91 Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 10:32:30 +0100
|
|
Subject: [PATCH 3/8] Add MIGraphXExecutionProvider to GPU providers
|
|
|
|
---
|
|
node_wrappers/dwpose.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/node_wrappers/dwpose.py b/node_wrappers/dwpose.py
|
|
index f0422588..34905037 100644
|
|
--- a/node_wrappers/dwpose.py
|
|
+++ b/node_wrappers/dwpose.py
|
|
@@ -8,7 +8,7 @@
|
|
|
|
DWPOSE_MODEL_NAME = "yzd-v/DWPose"
|
|
#Trigger startup caching for onnxruntime
|
|
-GPU_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CoreMLExecutionProvider"]
|
|
+GPU_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CoreMLExecutionProvider", "MIGraphXExecutionProvider"]
|
|
def check_ort_gpu():
|
|
try:
|
|
import onnxruntime as ort
|
|
|
|
From d23b24f17217c03a0f9101feea4495cb205974f6 Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 10:33:42 +0100
|
|
Subject: [PATCH 4/8] Add MIGraphXExecutionProvider to ONNX_PROVIDERS
|
|
|
|
---
|
|
src/custom_controlnet_aux/dwpose/util.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/custom_controlnet_aux/dwpose/util.py b/src/custom_controlnet_aux/dwpose/util.py
|
|
index 42874b33..92de18d7 100644
|
|
--- a/src/custom_controlnet_aux/dwpose/util.py
|
|
+++ b/src/custom_controlnet_aux/dwpose/util.py
|
|
@@ -436,7 +436,7 @@ def guess_onnx_input_shape_dtype(filename):
|
|
if os.getenv('AUX_ORT_PROVIDERS'):
|
|
ONNX_PROVIDERS = os.getenv('AUX_ORT_PROVIDERS').split(',')
|
|
else:
|
|
- ONNX_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider"]
|
|
+ ONNX_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "MIGraphXExecutionProvider"]
|
|
def get_ort_providers() -> List[str]:
|
|
providers = []
|
|
try:
|
|
|
|
From 4a55dbc32337a8ecfbe948bfe8a68189ba4e079a Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 10:38:03 +0100
|
|
Subject: [PATCH 5/8] Update config.example.yaml
|
|
|
|
---
|
|
config.example.yaml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/config.example.yaml b/config.example.yaml
|
|
index 1de7d738..280a6212 100644
|
|
--- a/config.example.yaml
|
|
+++ b/config.example.yaml
|
|
@@ -16,5 +16,5 @@ USE_SYMLINKS: False
|
|
# for example, if you have CUDA installed, you can set it to: ["CUDAExecutionProvider", "CPUExecutionProvider"]
|
|
# empty list or only keep ["CPUExecutionProvider"] means you use cv2.dnn.readNetFromONNX to load onnx models
|
|
# if your onnx models can only run on the CPU or have other issues, we recommend using pt model instead.
|
|
-# default value is ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider"]
|
|
+# default value is ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "MIGraphXExecutionProvider"]
|
|
EP_list: ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "MIGraphXExecutionProvider"]
|
|
|
|
From 24b4572d2c87bba2cb55fe6f666f05638f591371 Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 14:10:30 +0100
|
|
Subject: [PATCH 6/8] Update EP_list default value in config example
|
|
|
|
---
|
|
config.example.yaml | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/config.example.yaml b/config.example.yaml
|
|
index 280a6212..527be3fa 100644
|
|
--- a/config.example.yaml
|
|
+++ b/config.example.yaml
|
|
@@ -16,5 +16,5 @@ USE_SYMLINKS: False
|
|
# for example, if you have CUDA installed, you can set it to: ["CUDAExecutionProvider", "CPUExecutionProvider"]
|
|
# empty list or only keep ["CPUExecutionProvider"] means you use cv2.dnn.readNetFromONNX to load onnx models
|
|
# if your onnx models can only run on the CPU or have other issues, we recommend using pt model instead.
|
|
-# default value is ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "MIGraphXExecutionProvider"]
|
|
-EP_list: ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "MIGraphXExecutionProvider"]
|
|
+# default value is ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "MIGraphXExecutionProvider", "CPUExecutionProvider"]
|
|
+EP_list: ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "MIGraphXExecutionProvider", "CPUExecutionProvider"]
|
|
|
|
From 6965b98dcfb33e6b4da415ec660c76672c984633 Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 14:11:04 +0100
|
|
Subject: [PATCH 7/8] Reorder ONNX_PROVIDERS list for consistency
|
|
|
|
---
|
|
src/custom_controlnet_aux/dwpose/util.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/custom_controlnet_aux/dwpose/util.py b/src/custom_controlnet_aux/dwpose/util.py
|
|
index 92de18d7..921c9294 100644
|
|
--- a/src/custom_controlnet_aux/dwpose/util.py
|
|
+++ b/src/custom_controlnet_aux/dwpose/util.py
|
|
@@ -436,7 +436,7 @@ def guess_onnx_input_shape_dtype(filename):
|
|
if os.getenv('AUX_ORT_PROVIDERS'):
|
|
ONNX_PROVIDERS = os.getenv('AUX_ORT_PROVIDERS').split(',')
|
|
else:
|
|
- ONNX_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "MIGraphXExecutionProvider"]
|
|
+ ONNX_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "MIGraphXExecutionProvider", "CPUExecutionProvider"]
|
|
def get_ort_providers() -> List[str]:
|
|
providers = []
|
|
try:
|
|
|
|
From cb5790ad75c621729068b6164392728e6cdaf8d5 Mon Sep 17 00:00:00 2001
|
|
From: Dw_03 <madduck634858934@protonmail.com>
|
|
Date: Tue, 4 Nov 2025 14:11:52 +0100
|
|
Subject: [PATCH 8/8] Update utils.py
|
|
|
|
---
|
|
utils.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/utils.py b/utils.py
|
|
index 813b9520..c37f9411 100644
|
|
--- a/utils.py
|
|
+++ b/utils.py
|
|
@@ -46,7 +46,7 @@
|
|
annotator_ckpts_path = str(Path(here, "./ckpts"))
|
|
TEMP_DIR = tempfile.gettempdir()
|
|
USE_SYMLINKS = False
|
|
- ORT_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "CPUExecutionProvider", "CoreMLExecutionProvider", "MIGraphXExecutionProvider"]
|
|
+ ORT_PROVIDERS = ["CUDAExecutionProvider", "DirectMLExecutionProvider", "OpenVINOExecutionProvider", "ROCMExecutionProvider", "MIGraphXExecutionProvider", "CPUExecutionProvider", "CoreMLExecutionProvider"]
|
|
|
|
os.environ['AUX_ANNOTATOR_CKPTS_PATH'] = os.getenv('AUX_ANNOTATOR_CKPTS_PATH', annotator_ckpts_path)
|
|
os.environ['AUX_TEMP_DIR'] = os.getenv('AUX_TEMP_DIR', str(TEMP_DIR))
|