Skip to content

[Cherrypick from win-onnxruntime] Add MigraphX EP support for auto EP #25481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jul 23, 2025
Merged

[Cherrypick from win-onnxruntime] Add MigraphX EP support for auto EP #25481

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3c67302
[MigraphX] Enable automatic selection of MigraphX EP for PREFER_GPU p…
Jun 23, 2025
a4403e0
bypass check until vendor id is finalized
Jun 24, 2025
f4646a7
Fix EPF
Jun 24, 2025
c93b349
Reenable device check and change factory creation
owenzhangzhengzhong Jul 16, 2025
45117b2
[MIGRAPHX] Add ORT generic interface build support for MigraphX
Jun 9, 2025
b29af05
Remove preprocesor check for error msg
Jun 10, 2025
73edb49
Rename preprocessor flag for uniformity and add missing places
Jun 11, 2025
e653e45
Apply latest EP Factory interface change and add new test
wonchung-microsoft Jul 22, 2025
29560e0
[MIGRAPHX] Remove #ifdef MIGRAPHX by default for generic interface
wonchung-microsoft Jul 3, 2025
02cd7b3
nit: remove comments
wonchung-microsoft Jul 22, 2025
a0350e7
lintrunner
wonchung-microsoft Jul 23, 2025
1fdf96d
lintrunner
wonchung-microsoft Jul 23, 2025
19ea584
lintrunner
wonchung-microsoft Jul 23, 2025
c1efbba
lintrunner
wonchung-microsoft Jul 23, 2025
bcf5cb5
lintrunner
wonchung-microsoft Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename preprocessor flag for uniformity and add missing places
  • Loading branch information
@wonchung-microsoft
Karim Vadsariya authored and wonchung-microsoft committed Jul 22, 2025
commit 73edb49d707218ffce5d49b8f6d007e196d7c2ed
2 changes: 1 addition & 1 deletion cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ if (onnxruntime_USE_MIGRAPHX)
endif()

if (onnxruntime_USE_MIGRAPHX_INTERFACE AND (NOT onnxruntime_USE_MIGRAPHX))
list(APPEND ORT_PROVIDER_FLAGS -DUSE_MIGRAPHX_INTERFACE=1)
list(APPEND ORT_PROVIDER_FLAGS -DUSE_MIGRAPHX_PROVIDER_INTERFACE=1)
endif()

if (onnxruntime_USE_ARMNN)
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/provider_factory_creators.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "core/providers/dnnl/dnnl_provider_factory_creator.h"
#endif

#if defined(USE_MIGRAPHX)
#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_PROVIDER_INTERFACE)
#include "core/providers/migraphx/migraphx_provider_factory_creator.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/shared_library/provider_bridge_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ std::unique_ptr<IDataTransfer> CreateGPUDataTransfer() {
}
#endif

#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_INTERFACE)
#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_PROVIDER_INTERFACE)
std::unique_ptr<IAllocator> CreateMIGraphXAllocator(int16_t device_id, const char* name) {
return g_host->CreateMIGraphXAllocator(device_id, name);
}
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/providers/shared_library/provider_interfaces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ struct ProviderHost {
virtual Status CudaCall_false(int retCode, const char* exprString, const char* libName, int successCode, const char* msg, const char* file, const int line) = 0;
virtual void CudaCall_true(int retCode, const char* exprString, const char* libName, int successCode, const char* msg, const char* file, const int line) = 0;

#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_INTERFACE)
#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_PROVIDER_INTERFACE)
virtual std::unique_ptr<IAllocator> CreateMIGraphXAllocator(int16_t device_id, const char* name) = 0;
virtual std::unique_ptr<IAllocator> CreateMIGraphXPinnedAllocator(int16_t device_id, const char* name) = 0;
#endif
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/core/session/provider_bridge_ort.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ struct ProviderHostImpl : ProviderHost {
Status CudaCall_false(int retCode, const char* exprString, const char* libName, int successCode, const char* msg, const char* file, const int line) override { return GetProviderInfo_CUDA().CudaCall_false(retCode, exprString, libName, successCode, msg, file, line); }
void CudaCall_true(int retCode, const char* exprString, const char* libName, int successCode, const char* msg, const char* file, const int line) override { GetProviderInfo_CUDA().CudaCall_true(retCode, exprString, libName, successCode, msg, file, line); }

#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_INTERFACE)
#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_PROVIDER_INTERFACE)
std::unique_ptr<IAllocator> CreateMIGraphXAllocator(int16_t device_id, const char* name) override { return GetProviderInfo_MIGraphX().CreateMIGraphXAllocator(device_id, name); }
std::unique_ptr<IAllocator> CreateMIGraphXPinnedAllocator(int16_t device_id, const char* name) override { return GetProviderInfo_MIGraphX().CreateMIGraphXPinnedAllocator(device_id, name); }
#endif
Expand Down
2 changes: 1 addition & 1 deletion onnxruntime/python/onnxruntime_pybind_state.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ static std::shared_ptr<IExecutionProviderFactory> CreateExecutionProviderFactory
<< "TensorRT-ExecutionProvider.html#requirements to ensure all dependencies are met.";
#endif
} else if (type == kMIGraphXExecutionProvider) {
#ifdef USE_MIGRAPHX
#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_PROVIDER_INTERFACE)
std::string calibration_table;
std::string save_model_path;
std::string load_model_path;
Expand Down
4 changes: 2 additions & 2 deletions onnxruntime/python/onnxruntime_pybind_state_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct OrtStatus {
#define BACKEND_DNNL ""
#endif

#if USE_MIGRAPHX
#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_PROVIDER_INTERFACE)
#define BACKEND_MIGRAPHX "-MIGRAPHX"
#else
#define BACKEND_MIGRAPHX ""
Expand Down Expand Up @@ -132,7 +132,7 @@ struct OrtStatus {
#if defined(USE_NV) || defined(USE_NV_PROVIDER_INTERFACE)
#include "core/providers/nv_tensorrt_rtx/nv_provider_factory.h"
#endif
#ifdef USE_MIGRAPHX
#if defined(USE_MIGRAPHX) || defined(USE_MIGRAPHX_PROVIDER_INTERFACE)
#include "core/providers/migraphx/migraphx_provider_factory.h"
#include "core/providers/migraphx/migraphx_execution_provider_info.h"
#endif
Expand Down
Loading