saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-07-30 20:18:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 31463811: Servicing: Redist (Nuget) conflicts with Microsoft.AI.MachineLearning starting 21H1+ (#6460)

Browse source 
* update load library code to have the fullly qualified path

* make it work for syswow32

* git Revert "make it work for syswow32"

This reverts commit b9f594341b7cf07241b18d0c376af905edcabae3.

Co-authored-by: Sheil Kumar <sheilk@microsoft.com>
This commit is contained in:
Sheil Kumar 2021-01-27 12:25:03 -08:00 committed by GitHub
parent c05adb1147
commit d5f51c4033
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
winml/adapter/winml_adapter_dml.cpp
View file

@ -22,28 +22,36 @@ namespace winmla = Windows::AI::MachineLearning::Adapter;
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
static bool IsCurrentModuleInSystem32() {
std::string current_module_path;
current_module_path.reserve(MAX_PATH);
auto size_module_path = GetModuleFileNameA((HINSTANCE)&__ImageBase, current_module_path.data(), MAX_PATH);
FAIL_FAST_IF(size_module_path == 0);
static std::string System32Path() {
std::string system32_path;
system32_path.reserve(MAX_PATH);
auto size_system32_path = GetSystemDirectoryA(system32_path.data(), MAX_PATH);
FAIL_FAST_IF(size_system32_path == 0);
return system32_path;
}
return _strnicmp(system32_path.c_str(), current_module_path.c_str(), size_system32_path) == 0;
static bool IsCurrentModuleInPath(const std::string& path) {
std::string current_module_path;
current_module_path.reserve(MAX_PATH);
auto size_module_path = GetModuleFileNameA((HINSTANCE)&__ImageBase, current_module_path.data(), MAX_PATH);
FAIL_FAST_IF(size_module_path == 0);
return _strnicmp(path.c_str(), current_module_path.c_str(), path.size()) == 0;
}
Microsoft::WRL::ComPtr<IDMLDevice> CreateDmlDevice(ID3D12Device* d3d12Device) {
std::string directml_dll = "directml.dll";
DWORD flags = 0;
#ifdef BUILD_INBOX
flags |= IsCurrentModuleInSystem32() ? LOAD_LIBRARY_SEARCH_SYSTEM32 : 0;
auto system32_path = System32Path();
if (IsCurrentModuleInPath(system32_path))
{
flags |= LOAD_LIBRARY_SEARCH_SYSTEM32;
directml_dll = system32_path + "\\" + directml_dll;
}
#endif
// Dynamically load DML to avoid WinML taking a static dependency on DirectML.dll
wil::unique_hmodule dmlDll(LoadLibraryExA("DirectML.dll", nullptr, flags));
wil::unique_hmodule dmlDll(LoadLibraryExA(directml_dll.c_str(), nullptr, flags));
THROW_LAST_ERROR_IF(!dmlDll);
auto dmlCreateDevice1Fn = reinterpret_cast<decltype(&DMLCreateDevice1)>(

26
winml/lib/Api.Ort/OnnxruntimeEnvironment.cpp
View file

@ -16,30 +16,38 @@ static bool debug_output_ = false;
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
static bool IsCurrentModuleInSystem32() {
std::string current_module_path;
current_module_path.reserve(MAX_PATH);
auto size_module_path = GetModuleFileNameA((HINSTANCE)&__ImageBase, current_module_path.data(), MAX_PATH);
FAIL_FAST_IF(size_module_path == 0);
static std::string System32Path() {
std::string system32_path;
system32_path.reserve(MAX_PATH);
auto size_system32_path = GetSystemDirectoryA(system32_path.data(), MAX_PATH);
FAIL_FAST_IF(size_system32_path == 0);
return system32_path;
}
return _strnicmp(system32_path.c_str(), current_module_path.c_str(), size_system32_path) == 0;
static bool IsCurrentModuleInPath(const std::string& path) {
std::string current_module_path;
current_module_path.reserve(MAX_PATH);
auto size_module_path = GetModuleFileNameA((HINSTANCE)&__ImageBase, current_module_path.data(), MAX_PATH);
FAIL_FAST_IF(size_module_path == 0);
return _strnicmp(path.c_str(), current_module_path.c_str(), path.size()) == 0;
}
static HRESULT GetOnnxruntimeLibrary(HMODULE& module) {
#if WINAPI_FAMILY == WINAPI_FAMILY_PC_APP
auto out_module = LoadPackagedLibrary(L"onnxruntime.dll", 0);
#else
std::string onnxruntime_dll = "onnxruntime.dll";
DWORD flags = 0;
#ifdef BUILD_INBOX
flags |= IsCurrentModuleInSystem32() ? LOAD_LIBRARY_SEARCH_SYSTEM32 : 0;
auto system32_path = System32Path();
if (IsCurrentModuleInPath(system32_path))
{
flags |= LOAD_LIBRARY_SEARCH_SYSTEM32;
onnxruntime_dll = system32_path + "\\" + onnxruntime_dll;
}
#endif
auto out_module = LoadLibraryExA("onnxruntime.dll", nullptr, flags);
auto out_module = LoadLibraryExA(onnxruntime_dll.c_str(), nullptr, flags);
#endif
if (out_module == nullptr) {
return HRESULT_FROM_WIN32(GetLastError());