Skip to content

🏁 Fix dynamic loading of QDMI device DLLs on Windows when an absolute path is provided (backport #1720) #1722

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
burgholzer merged 1 commit into from
May 19, 2026
Merged

🏁 Fix dynamic loading of QDMI device DLLs on Windows when an absolute path is provided (backport #1720) #1722

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ This project adheres to [Semantic Versioning], with the exception that minor rel

- 🚸 Improve native gate support for the Qiskit-to-OpenQASM3 conversion in the QDMI-Qiskit interface ([#1719]) ([**@burgholzer**])

### Fixed

- 🏁 Fix dynamic loading of QDMI device DLLs on Windows when an absolute path is provided ([#1720]) ([**@burgholzer**])

## [3.6.0] - 2026-05-13

_If you are upgrading: please see [`UPGRADING.md`](UPGRADING.md#360)._
Expand Down Expand Up @@ -370,8 +374,9 @@ _📚 Refer to the [GitHub Release Notes](https://github.com/munich-quantum-tool
[3.0.0]: https://github.com/munich-quantum-toolkit/core/releases/tag/v3.0.0
[2.7.0]: https://github.com/munich-quantum-toolkit/core/releases/tag/v2.7.0

<!-- PR links -->
<!-- PR links -

[#1720]: https://github.com/munich-quantum-toolkit/core/pull/1720
[#1719]: https://github.com/munich-quantum-toolkit/core/pull/1719
[#1702]: https://github.com/munich-quantum-toolkit/core/pull/1702
[#1694]: https://github.com/munich-quantum-toolkit/core/pull/1694
Expand Down
10 changes: 7 additions & 3 deletions src/qdmi/driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,14 @@ namespace {
[[nodiscard]] auto loadDeviceLibrary(const std::string& libName) -> HMODULE {
const auto requested = std::filesystem::path(libName);

const std::filesystem::path path = requested.has_parent_path()
? requested
: getDriverDirectory() / requested;
if (requested.has_parent_path()) {
// A directory component was supplied: Directly load the library.
return LoadLibraryW(requested.wstring().c_str());
}

// Bare filename: resolve relative to the driver's own directory so that
// builtin device DLLs installed next to the driver are found reliably.
const auto path = getDriverDirectory() / requested;
return LoadLibraryExW(path.wstring().c_str(), nullptr,
LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR |
LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
Expand Down
Loading