Skip to content

Commit 0754a2a

Browse files
ashishks0522Alan-eMartinandrijapaudoctorperceptronactions-user
authored
master to test-v2-master (#1450)
## Changes - Sync test master with original master --------- Co-authored-by: Alan Martin <53958929+Alan-eMartin@users.noreply.github.com> Co-authored-by: Andrija Paurevic <46359773+andrijapau@users.noreply.github.com> Co-authored-by: Paul Finlay <50180049+doctorperceptron@users.noreply.github.com> Co-authored-by: GitHub Nightly Merge Action <actions@github.com> Co-authored-by: josephbowles <54283511+josephbowles@users.noreply.github.com> Co-authored-by: Rashid N H M <95639609+rashidnhm@users.noreply.github.com> Co-authored-by: doctorperceptron <paul@xanadu.ai> Co-authored-by: dwierichs <david.wierichs@xanadu.ai> Co-authored-by: JerryChen97 <chenys13@outlook.com> Co-authored-by: Mudit Pandey <18223836+mudit2812@users.noreply.github.com> Co-authored-by: Astral Cai <astral.cai@xanadu.ai> Co-authored-by: Luis Alfredo Nuñez Meneses <alfredo.nunez@xanadu.ai>
1 parent c340da3 commit 0754a2a

94 files changed

Lines changed: 2339 additions & 2453 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/v2-build-branch-dev.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: V2 Build QML Branch - Dev
22
on:
33
workflow_dispatch:
44
schedule:
5-
- cron: '0 0 * * 0,2,4,6' # At 00:00 on Sunday, Tuesday, Thursday, and Saturday.
5+
- cron: '0 0 * * 1,3,5' # At 00:00 on Sunday (Monday am), Tuesday (Wednesday am), Thursday (Friday am).
66

77
concurrency:
88
group: v2-build-qml-demo-branch-dev
@@ -16,6 +16,7 @@ jobs:
1616
dev: true
1717
save-artifact: true
1818
artifact-name: build-branch-dev
19+
artifact-retention: 3
1920
keep-going: false
2021
quiet: false
2122
batch_size: 10

.github/workflows/v2-build-branch-master.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: V2 Build QML Branch - Master
22
on:
33
workflow_dispatch:
44
schedule:
5-
- cron: '0 0 * * 0,2,4,6' # At 00:00 on Sunday, Tuesday, Thursday, and Saturday.
5+
- cron: '0 0 * * 1,3,5' # At 00:00 on Sunday (Monday am), Tuesday (Wednesday am), Thursday (Friday am).
66

77
concurrency:
88
group: v2-build-qml-demo-branch-master
@@ -16,6 +16,7 @@ jobs:
1616
dev: false
1717
save-artifact: true
1818
artifact-name: build-branch-master
19+
artifact-retention: 3
1920
keep-going: false
2021
quiet: false
2122
batch_size: 10

.github/workflows/v2-build-demos.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ on:
2626
type: boolean
2727
default: true
2828
artifact-name:
29-
description: Name of the artifact containing the built demos (defaults to demo-build-{ref})
29+
description: Name of the artifact containing the built demos (defaults to demo-build-{ref}).
3030
required: false
3131
type: string
3232
default: ''
33+
artifact-retention:
34+
description: The number of days to persist the consolidated artifacts.
35+
required: false
36+
type: number
37+
default: 1
3338
keep-going:
3439
description: Keep going if a demo fails to build.
3540
required: false
@@ -76,6 +81,11 @@ on:
7681
required: false
7782
type: string
7883
default: ''
84+
artifact-retention:
85+
description: The number of days to persist the consolidated artifacts.
86+
required: false
87+
type: number
88+
default: 1
7989
keep-going:
8090
description: Keep going if a demo fails to build.
8191
required: false
@@ -87,8 +97,7 @@ on:
8797
type: boolean
8898
default: false
8999
batch_size:
90-
description: |
91-
Number of demos to build per job
100+
description: Number of demos to build per job.
92101
type: number
93102
default: 10
94103

@@ -208,7 +217,7 @@ jobs:
208217
with:
209218
name: ${{ needs.generate-build-variables.outputs.artifact-name }}
210219
path: _build/pack/*.zip
211-
retention-days: 1
220+
retention-days: ${{ inputs.artifact-retention }}
212221
overwrite: true
213222

214223
- name: Delete partial artifacts

.github/workflows/v2-deploy-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,13 @@ jobs:
8080
github.event.workflow_run.event == 'pull_request' &&
8181
needs.prepare-build-context.result == 'success' &&
8282
needs.prepare-build-context.outputs.pr_ref != '' &&
83+
needs.prepare-build-context.outputs.pr_id != '' &&
8384
needs.prepare-build-context.outputs.updated_demos != '[]'
8485
uses: ./.github/workflows/v2-deploy-demos.yml
8586
needs: prepare-build-context
8687
with:
8788
# TODO: Update SWC environment to "swc-prod"
88-
environment: 'swc-dev'
89+
environment: 'swc-staging'
8990
artifact-name: demo-build-${{ needs.prepare-build-context.outputs.pr_ref }}
9091
workflow-run-id: ${{ github.event.workflow_run.id }}
9192
pr_number: ${{ fromJson(needs.prepare-build-context.outputs.pr_id) }}

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ download:
6262
wget --no-verbose -N https://download.pytorch.org/tutorial/hymenoptera_data.zip -P $(DATADIR)
6363
unzip -q -o $(DATADIR)/hymenoptera_data.zip -d $(DATADIR)/
6464

65+
# TODO: Update flax, or certain tutorials e.g. tutorial_rl_pulse.py will fail due to implicit confliction between jax==0.6.0 and flax==0.9.0
6566
environment:
6667
@command -v $(POETRY_BIN) --version >/dev/null 2>&1 || { echo >&2 "Setting up the environment requires a valid installation of python-poetry. Please install and add poetry to PATH or pass the executable using POETRY_BIN. Aborting."; exit 1; }
6768
@if [ '$(BASE_ONLY)' = 'true' ]; then\

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,10 @@ Due to the large scope of requirements in this repository, the traditional `requ
165165
and `pyproject.toml` is being introduced instead, the goal being easier management in regard to adding/updating packages.
166166

167167
To install all the dependencies locally, [poetry](https://python-poetry.org/) needs to be installed. Please follow the
168-
[official installation documentation](https://python-poetry.org/docs/#installation).
168+
[official installation documentation](https://python-poetry.org/docs/#installation). To ensure that no issues arise, we
169+
recommend using the [official installer](https://python-poetry.org/docs/#installing-with-the-official-installer).
170+
171+
**IMPORTANT NOTE:** It is important to install Poetry using the official instructions and NOT into the same virtual env as QML itself, this would cause poetry to manage itself and raise unexpected errors.
169172

170173
### Installing dependencies
171174

-6.39 KB
Loading
21.5 KB
Loading

_static/demonstration_assets/quantum_volume/lima.svg

Lines changed: 0 additions & 233 deletions
This file was deleted.

conf.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@
1818
import numpy as np
1919
from jinja2 import FileSystemLoader, Environment
2020
import yaml
21-
from pennylane import PennyLaneDeprecationWarning
2221
from pathlib import Path
2322

2423
sys.path.insert(0, os.path.abspath("."))
2524
sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
2625

26+
# This module has been refactored from pennylane v0.41.0 to v0.42.0
27+
# This can be removed after the release of v0.42.0
28+
try:
29+
from pennylane.exceptions import PennyLaneDeprecationWarning
30+
except ModuleNotFoundError:
31+
from pennylane import PennyLaneDeprecationWarning
2732

2833
# -- Project information -----------------------------------------------------
2934
# General information about the project.
@@ -213,3 +218,6 @@
213218
"pennylane": ("https://docs.pennylane.ai/en/stable/", None),
214219
"catalyst": ("https://docs.pennylane.ai/projects/catalyst/en/stable", None)
215220
}
221+
222+
# Enable :doc: references for intersphinx (disabled by default in Sphinx 5.0+)
223+
intersphinx_disabled_reftypes = []

0 commit comments

Comments
 (0)