Skip to content

Only manually load DLLs if onnxruntime.dll is not already loaded. #1800

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

Open
chemwolf6922 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Only manually load DLLs if onnxruntime.dll is not already loaded. #1800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 27 additions & 23 deletions src/python/py/_dll_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,33 @@ def add_onnxruntime_dependency(package_id: str):
so that they can be found by the dynamic linker.
"""
if _is_windows():
import importlib.util
ort_package = importlib.util.find_spec("onnxruntime")
if not ort_package:
raise ImportError("Could not find the onnxruntime package.")
ort_package_path = ort_package.submodule_search_locations[0]
os.add_dll_directory(os.path.join(ort_package_path, "capi"))

# Load the DirectML.dll library to avoid loading it again in the native code.
# This avoids needing to know the exact path of the shared library from native code.
dml_path = os.path.join(ort_package_path, "capi", "DirectML.dll")
# The dependent onnxruntime package may have multiple execution providers.
# Check to see if DirectML.dll exists before trying to load it.
if os.path.exists(dml_path):
import ctypes
_ = ctypes.CDLL(dml_path)

# Workaround for onnxruntime.dll loading
ort_path = os.path.join(ort_package_path, "capi", "onnxruntime.dll")
# The dependent onnxruntime package may have multiple execution providers.
# Check to see if onnxruntime.dll exists before trying to load it.
if os.path.exists(ort_path):
import ctypes
_ = ctypes.CDLL(ort_path)
import ctypes
kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
ort_handle = kernel32.GetModuleHandleW("onnxruntime.dll")
# Only manually load the dlls if onnxruntime.dll is not already loaded.
# This allows WinML to use its packed dlls.
if not ort_handle:
import importlib.util
ort_package = importlib.util.find_spec("onnxruntime")
if not ort_package:
raise ImportError("Could not find the onnxruntime package.")
ort_package_path = ort_package.submodule_search_locations[0]
os.add_dll_directory(os.path.join(ort_package_path, "capi"))

# Load the DirectML.dll library to avoid loading it again in the native code.
# This avoids needing to know the exact path of the shared library from native code.
dml_path = os.path.join(ort_package_path, "capi", "DirectML.dll")
# The dependent onnxruntime package may have multiple execution providers.
# Check to see if DirectML.dll exists before trying to load it.
if os.path.exists(dml_path):
_ = ctypes.CDLL(dml_path)

# Workaround for onnxruntime.dll loading
ort_path = os.path.join(ort_package_path, "capi", "onnxruntime.dll")
# The dependent onnxruntime package may have multiple execution providers.
# Check to see if onnxruntime.dll exists before trying to load it.
if os.path.exists(ort_path):
_ = ctypes.CDLL(ort_path)

elif _is_linux() or _is_macos():
import importlib.util
Expand Down
Loading