Skip to content

Commit

Permalink
Merge master into dev (#1236)
Browse files Browse the repository at this point in the history
**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]>
  • Loading branch information
4 people authored Oct 9, 2024
1 parent 624a1b3 commit 03dc559
Show file tree
Hide file tree
Showing 175 changed files with 1,258 additions and 525 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validate-demo-metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
METADATA_FILE_LIST: ${{ needs.generate-metadata-file-list.outputs.metadata_files }}
run: |
cd metadata_schemas
${{ steps.poetry.outputs.bin }} run check-jsonschema -v --traceback-mode full --schemafile demo.metadata.schema.0.1.3.json $METADATA_FILE_LIST
${{ steps.poetry.outputs.bin }} run check-jsonschema -v --traceback-mode full --schemafile demo.metadata.schema.0.1.4.json $METADATA_FILE_LIST
validate-metadata-preview-images:
runs-on: ubuntu-latest
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions demonstrations/adjoint_diff_benchmarking.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2021-11-23T00:00:00+00:00",
"dateOfLastModification": "2024-08-06T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [],
"tags": [],
"previewImages": [
Expand All @@ -17,7 +17,6 @@
],
"seoDescription": "Benchmarking file for adjoint diff demonstration.",
"doi": "",
"canonicalURL": "/qml/demos/adjoint_diff_benchmarking",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand Down
5 changes: 2 additions & 3 deletions demonstrations/ahs_aquila.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2023-05-16T00:00:00+00:00",
"dateOfLastModification": "2024-09-04T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": ["Quantum Hardware", "Devices and Performance", "Quantum Computing"],
"tags": [],
"previewImages": [
Expand All @@ -17,7 +17,6 @@
],
"seoDescription": "Perform measurements on neutral atom hardware through PennyLane",
"doi": "",
"canonicalURL": "/qml/demos/ahs_aquila",
"references": [
{
"id": "Semeghini",
Expand Down Expand Up @@ -76,4 +75,4 @@
"logo": "/_static/hardware_logos/aws.png"
}
]
}
}
5 changes: 2 additions & 3 deletions demonstrations/braket-parallel-gradients.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"dateOfPublication": "2020-12-08T00:00:00+00:00",
"dateOfLastModification": "2024-08-14T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Devices and Performance"
],
Expand All @@ -25,7 +25,6 @@
],
"seoDescription": "Parallelize gradient calculations with Amazon Braket",
"doi": "",
"canonicalURL": "/qml/demos/braket-parallel-gradients",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand All @@ -48,4 +47,4 @@
"logo": "/_static/hardware_logos/aws.png"
}
]
}
}
3 changes: 1 addition & 2 deletions demonstrations/circuits_as_fourier_series.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2023-09-11T00:00:00+00:00",
"dateOfLastModification": "2024-08-05T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Optimization",
"Quantum Machine Learning"
Expand All @@ -24,7 +24,6 @@
],
"seoDescription": "Learn with this interactive, code-free introduction to the idea of quantum circuits as Fourier series.",
"doi": "",
"canonicalURL": "/qml/demos/circuits_as_fourier_series",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand Down
3 changes: 1 addition & 2 deletions demonstrations/covalent_cloud_gpu.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"dateOfPublication": "2024-05-24T00:00:00+00:00",
"dateOfLastModification": "2024-08-05T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Machine Learning"
],
Expand All @@ -26,7 +26,6 @@
],
"seoDescription": "Explore the process of running GPU-accelerated quantum circuit simulations on Covalent Cloud using PennyLane.",
"doi": "",
"canonicalURL": "/qml/demos/covalent_cloud_gpu",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand Down
3 changes: 1 addition & 2 deletions demonstrations/ensemble_multi_qpu.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2020-02-14T00:00:00+00:00",
"dateOfLastModification": "2024-08-14T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Machine Learning"
],
Expand All @@ -19,7 +19,6 @@
],
"seoDescription": "We demonstrate how two QPUs can be combined in parallel to help solve a machine learning classification problem, using PyTorch and PennyLane.",
"doi": "",
"canonicalURL": "/qml/demos/ensemble_multi_qpu",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand Down
3 changes: 1 addition & 2 deletions demonstrations/function_fitting_qsp.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2022-05-24T00:00:00+00:00",
"dateOfLastModification": "2024-08-06T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Machine Learning"
],
Expand All @@ -19,7 +19,6 @@
],
"seoDescription": "Learn how to create polynomial approximations to functions using Quantum Signal Processing (QSP).",
"doi": "",
"canonicalURL": "/qml/demos/function_fitting_qsp",
"references": [
{
"id": "Martyn2021",
Expand Down
5 changes: 2 additions & 3 deletions demonstrations/gbs.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"dateOfPublication": "2020-12-04T00:00:00+00:00",
"dateOfLastModification": "2024-08-06T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Hardware",
"Quantum Computing"
Expand All @@ -23,7 +23,6 @@
],
"seoDescription": "Using light to perform tasks beyond the reach of classical computers.",
"doi": "",
"canonicalURL": "/qml/demos/gbs",
"references": [
{
"id": "Arute2019",
Expand Down Expand Up @@ -98,4 +97,4 @@
"weight": 1.0
}
]
}
}
5 changes: 2 additions & 3 deletions demonstrations/getting_started_with_hybrid_jobs.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2023-10-16T00:00:00+00:00",
"dateOfLastModification": "2024-08-05T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Devices and Performance"
],
Expand All @@ -23,7 +23,6 @@
],
"seoDescription": "Getting started with the Amazon Braket Hybrid Jobs",
"doi": "",
"canonicalURL": "/qml/demos/getting_started_with_hybrid_jobs",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand All @@ -35,4 +34,4 @@
"logo": "/_static/hardware_logos/aws.png"
}
]
}
}
7 changes: 3 additions & 4 deletions demonstrations/gqe_training.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"authors": [
{
"username": "Joseph"
},
},
{
"username": "zy_n"
}
],
"dateOfPublication": "2024-09-20T00:00:00+00:00",
"dateOfLastModification": "2024-09-20T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": ["Quantum Machine Learning", "Quantum Chemistry", "Algorithms"],
"tags": [],
"previewImages": [
Expand All @@ -24,7 +24,6 @@
],
"seoDescription": "Learn how you can train a small GPT model using the generative quantum eigensolver (GQE) technique and PennyLane data.",
"doi": "",
"canonicalURL": "/qml/demos/gqe_training",
"references": [
{
"id": "nakaji2024",
Expand Down Expand Up @@ -71,4 +70,4 @@
}
],
"hardware": []
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2024-07-02T00:00:00+00:00",
"dateOfLastModification": "2024-08-06T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Computing",
"How-to"
Expand All @@ -24,7 +24,6 @@
],
"seoDescription": "Learn how to get started using Qiskit 1.0 with PennyLane",
"doi": "",
"canonicalURL": "/qml/demos/how_to_use_qiskit1_with_pennylane",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand Down
3 changes: 1 addition & 2 deletions demonstrations/ibm_pennylane.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"dateOfPublication": "2023-06-20T00:00:00+00:00",
"dateOfLastModification": "2024-08-08T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Devices and Performance"
],
Expand All @@ -29,7 +29,6 @@
],
"seoDescription": "Learn how to use IBM devices with PennyLane.",
"doi": "",
"canonicalURL": "/qml/demos/ibm_pennylane",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand Down
5 changes: 2 additions & 3 deletions demonstrations/learning2learn.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2021-03-02T00:00:00+00:00",
"dateOfLastModification": "2024-09-04T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Machine Learning"
],
Expand All @@ -19,7 +19,6 @@
],
"seoDescription": "Use a classical recurrent neural network to initilize the parameters of a variational quatum algorithm.",
"doi": "",
"canonicalURL": "/qml/demos/learning2learn",
"references": [],
"basedOnPapers": [
"10.48550/arXiv.1907.05415"
Expand All @@ -37,4 +36,4 @@
"weight": 1.0
}
]
}
}
3 changes: 1 addition & 2 deletions demonstrations/ml_classical_shadows.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2022-05-02T00:00:00+00:00",
"dateOfLastModification": "2024-09-05T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Machine Learning"
],
Expand All @@ -23,7 +23,6 @@
],
"seoDescription": "Learn how to apply machine learning to quantum many-body problems by using classical shadow formalism and ML to predict the ground-state properties of the 2D antiferromagnetic Heisenberg model.",
"doi": "",
"canonicalURL": "/qml/demos/ml_classical_shadows",
"references": [
{
"id": "preskill",
Expand Down
5 changes: 2 additions & 3 deletions demonstrations/oqc_pulse.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2023-10-30T00:00:00+00:00",
"dateOfLastModification": "2024-08-06T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Quantum Computing"
],
Expand All @@ -23,7 +23,6 @@
],
"seoDescription": "Learn how to create polynomial approximations to functions using Quantum Signal Processing (QSP).",
"doi": "",
"canonicalURL": "/qml/demos/oqc_pulse",
"references": [
{
"id": "Rahamim",
Expand Down Expand Up @@ -71,4 +70,4 @@
"weight": 1.0
}
]
}
}
5 changes: 2 additions & 3 deletions demonstrations/plugins_hybrid.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2019-10-11T00:00:00+00:00",
"dateOfLastModification": "2024-08-06T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Devices and Performance"
],
Expand All @@ -19,7 +19,6 @@
],
"seoDescription": "This tutorial introduces the notion of hybrid computation by combining several PennyLane device backends to train an algorithm containing both photonic and qubit devices.",
"doi": "",
"canonicalURL": "/qml/demos/plugins_hybrid",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand All @@ -35,4 +34,4 @@
"weight": 1.0
}
]
}
}
3 changes: 1 addition & 2 deletions demonstrations/pytorch_noise.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2019-10-11T00:00:00+00:00",
"dateOfLastModification": "2024-08-06T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Devices and Performance"
],
Expand All @@ -19,7 +19,6 @@
],
"seoDescription": "Extend PyTorch with real quantum computing power, by using it to optimize a noisy quantum hardware device.",
"doi": "",
"canonicalURL": "/qml/demos/pytorch_noise",
"references": [],
"basedOnPapers": [],
"referencedByPapers": [],
Expand Down
5 changes: 2 additions & 3 deletions demonstrations/qnspsa.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"dateOfPublication": "2022-07-18T00:00:00+00:00",
"dateOfLastModification": "2024-08-05T00:00:00+00:00",
"dateOfLastModification": "2024-10-07T00:00:00+00:00",
"categories": [
"Optimization"
],
Expand All @@ -19,7 +19,6 @@
],
"seoDescription": "Introduction to the Quantum natural SPSA optimizer, which reduces the number of quantum measurements in the optimization.",
"doi": "",
"canonicalURL": "/qml/demos/qnspsa",
"references": [
{
"id": "Gacon2021",
Expand Down Expand Up @@ -90,4 +89,4 @@
"logo": "/_static/hardware_logos/aws.png"
}
]
}
}
Loading

0 comments on commit 03dc559

Please sign in to comment.