Merge dev into master and delete dev
#1257
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[sc-73935] * Remove deprecated code from demos. * Update various `from pennylane import numpy as np` to `import numpy as np`.
**Summary:** Fixes a merge conflict between `master` and `dev` introduced by #1232 (due to divergent `dateOfLastModification`). To reproduce this PR: 1. Run `git checkout dev`. 2. Run `git checkout -b merge-master-into-dev`. 3. Run `git merge master`. 4. Accept all incoming changes for merge conflicts on `dateOfLastModification`. **Relevant GHA Workflow Runs:** * https://github.com/PennyLaneAI/qml/actions/runs/11241666164 * https://github.com/PennyLaneAI/qml/actions/runs/11253088983 --------- Co-authored-by: David Wierichs <[email protected]> Co-authored-by: Korbinian Kottmann <[email protected]> Co-authored-by: Ivana Kurečić <[email protected]>
- Branched off dev - Merged Master in via `--allow-unrelated-histories` Co-authored-by: Jack Brown <[email protected]>
Steps used for this merge: 1. Create new branch from `dev` 2. Merge `master` into that branch 3. Open PR --------- Co-authored-by: Jack Brown <[email protected]> Co-authored-by: Ivana Kurečić <[email protected]>
Steps used: * Checkout new branch from `dev` * Merge `master` using `git merge master` * Publish branch and open PR --------- Co-authored-by: Jack Brown <[email protected]> Co-authored-by: Ivana Kurečić <[email protected]> Co-authored-by: bellekaplan <[email protected]>
Tweak the way noisy devices are defined in the mitigation demos using noise models, whenever possible. [sc-72624]
This PR includes some updates and small fixes discovered during QA in the feature freeze before the release of PL 0.39.
I have created this PR to speed up the merge process in case the first one doesn't work --------- Co-authored-by: gmlej <[email protected]> Co-authored-by: Jorge J. Martínez de Lejarza <[email protected]> Co-authored-by: ixfoduap <[email protected]> Co-authored-by: Ivana Kurečić <[email protected]>
mudit2812
added
the
ci:build-all-qml-demos
|
👋 Hey, looks like you've updated some demos! 🐘 Don't forget to update the Please hide this comment once the field(s) are updated. Thanks! |
PietropaoloFrisoni
approved these changes
Nov 6, 2024
albi3ro
approved these changes
Nov 6, 2024
|
Thank you for opening this pull request. You can find the built site at this link. Deployment Info:
Note: It may take several minutes for updates to this pull request to be reflected on the deployed site. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As name says. Once this PR is merged,
devwill be deleted either automatically on merge, or manually if not.