Skip to content

⬆️ Update QDMI to latest version from stable v1.2.x branch (backport #1593)#1594

Closed
mergify[bot] wants to merge 2 commits intov3.xfrom
mergify/bp/v3.x/pr-1593
Closed

⬆️ Update QDMI to latest version from stable v1.2.x branch (backport #1593)#1594
mergify[bot] wants to merge 2 commits intov3.xfrom
mergify/bp/v3.x/pr-1593

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify bot commented Mar 30, 2026

Description

This PR updates QDMI to the latest version from the stable 1.2.x branch, which should be fairly close to the actual 1.2.2 release.
The biggest change here is that device now no longer need to directly link against qdmi::qdmi, but are rather self-contained.

Checklist

  • The pull request only contains commits that are focused and relevant to this change.
  • I have added appropriate tests that cover the new/changed functionality.
  • I have updated the documentation to reflect these changes.
  • I have added entries to the changelog for any noteworthy additions, changes, fixes, or removals.
  • I have added migration instructions to the upgrade guide (if needed).
  • The changes follow the project's style guidelines and introduce no new warnings.
  • The changes are fully tested and pass the CI checks.
  • I have reviewed my own code changes.

If PR contains AI-assisted content:

  • I have disclosed the use of AI tools in the PR description as per our AI Usage Guidelines.
  • AI-assisted commits include an Assisted-by: [Model Name] via [Tool Name] footer.
  • I confirm that I have personally reviewed and understood all AI-generated content, and accept full responsibility for it.

(cherry picked from commit bd9f9cb)

## Description

This PR updates QDMI to the latest version from the stable 1.2.x branch,
which should be fairly close to the actual 1.2.2 release.
The biggest change here is that device now no longer need to directly
link against `qdmi::qdmi`, but are rather self-contained.

## Checklist

<!---
This checklist serves as a reminder of a couple of things that ensure
your pull request will be merged swiftly.
-->

- [x] The pull request only contains commits that are focused and
relevant to this change.
- [x] I have added appropriate tests that cover the new/changed
functionality.
- [x] I have updated the documentation to reflect these changes.
- [x] I have added entries to the changelog for any noteworthy
additions, changes, fixes, or removals.
- [x] I have added migration instructions to the upgrade guide (if
needed).
- [x] The changes follow the project's style guidelines and introduce no
new warnings.
- [x] The changes are fully tested and pass the CI checks.
- [x] I have reviewed my own code changes.

**If PR contains AI-assisted content:**

- [x] I have disclosed the use of AI tools in the PR description as per
our [AI Usage
Guidelines](https://github.com/munich-quantum-toolkit/core/blob/main/docs/ai_usage.md).
- [x] AI-assisted commits include an `Assisted-by: [Model Name] via
[Tool Name]` footer.
- [x] I confirm that I have personally reviewed and understood all
AI-generated content, and accept full responsibility for it.

---------

Signed-off-by: burgholzer <burgholzer@me.com>
(cherry picked from commit bd9f9cb)

# Conflicts:
#	CHANGELOG.md
#	include/mqt-core/qdmi/common/Common.hpp
#	test/qdmi/devices/dd/concurrency_test.cpp
#	test/qdmi/devices/dd/device_properties_test.cpp
#	test/qdmi/devices/dd/device_status_test.cpp
#	test/qdmi/devices/dd/helpers/test_utils.cpp
#	test/qdmi/devices/dd/job_parameters_test.cpp
#	test/qdmi/devices/dd/results_probabilities_test.cpp
#	test/qdmi/devices/dd/results_sampling_test.cpp
#	test/qdmi/devices/dd/results_statevector_test.cpp
@mergify
Copy link
Copy Markdown
Author

mergify bot commented Mar 30, 2026

Cherry-pick of bd9f9cb has failed:

On branch mergify/bp/v3.x/pr-1593
Your branch is up to date with 'origin/v3.x'.

You are currently cherry-picking commit bd9f9cb4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cmake/ExternalDependencies.cmake
	modified:   src/qdmi/devices/dd/CMakeLists.txt
	modified:   src/qdmi/devices/dd/Device.cpp
	modified:   src/qdmi/devices/na/App.cpp
	modified:   src/qdmi/devices/na/CMakeLists.txt
	modified:   src/qdmi/devices/na/Device.cpp
	modified:   src/qdmi/devices/na/DynDevice.cpp
	modified:   src/qdmi/devices/na/Generator.cpp
	modified:   src/qdmi/devices/sc/App.cpp
	modified:   src/qdmi/devices/sc/CMakeLists.txt
	modified:   src/qdmi/devices/sc/Device.cpp
	modified:   src/qdmi/devices/sc/DynDevice.cpp
	modified:   src/qdmi/devices/sc/Generator.cpp
	modified:   test/qdmi/devices/dd/error_handling_test.cpp
	modified:   test/qdmi/devices/dd/job_lifecycle_test.cpp
	modified:   test/qdmi/devices/dd/session_lifecycle_test.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   include/mqt-core/qdmi/common/Common.hpp
	both modified:   test/qdmi/devices/dd/concurrency_test.cpp
	both modified:   test/qdmi/devices/dd/device_properties_test.cpp
	both modified:   test/qdmi/devices/dd/device_status_test.cpp
	both modified:   test/qdmi/devices/dd/helpers/test_utils.cpp
	both modified:   test/qdmi/devices/dd/job_parameters_test.cpp
	both modified:   test/qdmi/devices/dd/results_probabilities_test.cpp
	both modified:   test/qdmi/devices/dd/results_sampling_test.cpp
	both modified:   test/qdmi/devices/dd/results_statevector_test.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts PRs that currently have conflicts with their base branch label Mar 30, 2026
@mergify mergify bot added the conflict label Mar 30, 2026
@burgholzer
Copy link
Copy Markdown
Member

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Author

mergify bot commented Mar 30, 2026

rebase

☑️ Nothing to do, the required conditions are not met

Details
  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@burgholzer
Copy link
Copy Markdown
Member

@Mergifyio update

@mergify
Copy link
Copy Markdown
Author

mergify bot commented Mar 30, 2026

update

☑️ Nothing to do, the required conditions are not met

Details
  • -conflict [📌 update requirement]
  • #commits-behind > 0 [📌 update requirement]
  • -closed [📌 update requirement]
  • queue-position = -1 [📌 update requirement]

@burgholzer burgholzer closed this Mar 30, 2026
@mergify mergify bot removed the conflict label Mar 30, 2026
@mergify mergify bot deleted the mergify/bp/v3.x/pr-1593 branch March 30, 2026 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts PRs that currently have conflicts with their base branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant