Skip to content
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.

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

Merge dev with master for v0.32 #913

Merged
merged 184 commits into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
5743fa5
Development branch
josh146 Nov 15, 2022
39ca8c1
Merge branch 'master' into dev
actions-user Nov 18, 2022
17fdcb4
Merge branch 'master' into dev
actions-user Nov 21, 2022
47e83e1
Merge branch 'master' into dev
actions-user Nov 21, 2022
12ef0b8
Merge branch 'master' into dev
actions-user Nov 22, 2022
ecad024
Merge branch 'master' into dev
actions-user Nov 23, 2022
b0fb42b
Merge branch 'master' into dev
actions-user Nov 25, 2022
f39ee3f
Merge branch 'master' into dev
actions-user Nov 28, 2022
00becee
Merge branch 'master' into dev
actions-user Nov 28, 2022
3685225
Merge branch 'master' into dev
actions-user Nov 29, 2022
ce0d527
Merge branch 'master' into dev
actions-user Dec 1, 2022
8a86295
Merge branch 'master' into dev
actions-user Dec 2, 2022
7a323e1
Merge branch 'master' into dev
actions-user Dec 5, 2022
289baab
Merge branch 'master' into dev
actions-user Dec 7, 2022
b91874b
Merge branch 'master' into dev
actions-user Dec 9, 2022
9c92f0e
Merge branch 'master' into dev
actions-user Dec 10, 2022
1d32d2b
Merge branch 'master' into dev
actions-user Dec 12, 2022
8c25d7d
Merge branch 'master' into dev
actions-user Dec 12, 2022
222e6a6
Merge branch 'master' into dev
actions-user Dec 16, 2022
a8284e3
Bumped requirement package versions (#667)
rashidnhm Dec 19, 2022
ccfcf45
Merge dev in master following v0.28.0 release of PennyLane (#671) (#672)
rashidnhm Dec 21, 2022
808b1d8
Merge branch 'master' into dev
rashidnhm Dec 21, 2022
00a7c8c
Merge branch 'master' into dev
actions-user Jan 3, 2023
bf00d71
Merge branch 'master' into dev
actions-user Jan 4, 2023
cc47e89
Merge branch 'master' into dev
actions-user Jan 5, 2023
b3f7f3e
Merge branch 'master' into dev
actions-user Jan 5, 2023
9316a8f
Merge branch 'master' into dev
actions-user Jan 18, 2023
eb7a990
Merge branch 'master' into dev
actions-user Jan 20, 2023
595b898
Merge branch 'master' into dev
actions-user Jan 23, 2023
03ee056
Merge branch 'master' into dev
actions-user Jan 23, 2023
76d7343
Merge branch 'master' into dev
actions-user Jan 30, 2023
5281bd8
Merge branch 'master' into dev
actions-user Feb 3, 2023
dadd39c
Merge branch 'master' into dev
actions-user Feb 3, 2023
a8ab874
Merge branch 'master' into dev
actions-user Feb 6, 2023
b39a0e7
Merge branch 'master' into dev
actions-user Feb 6, 2023
4f65f43
Merge branch 'master' into dev
actions-user Feb 10, 2023
673e059
Merge branch 'master' into dev
actions-user Feb 14, 2023
34b6c43
Merge branch 'master' into dev
actions-user Feb 21, 2023
3b40e58
Merge branch 'master' into dev
actions-user Feb 21, 2023
8356cca
Update chemical reactions demo to use pyscf for openshell H3 (#704)
soranjh Feb 21, 2023
10d6d86
Change ibm device in Quantum volume (#703)
rmoyard Feb 22, 2023
ab34e2a
Update demos to remove warnings (#705)
mudit2812 Feb 22, 2023
e8811cd
Update classical shadows (#708)
rmoyard Feb 23, 2023
942cbb5
Update SPSA demo to count circuit executions manually. (#706)
dwierichs Feb 24, 2023
c2bcccb
Merge branch 'master' into dev
actions-user Feb 24, 2023
62295af
Merge branch 'master' into dev
actions-user Feb 28, 2023
f98c1ec
Merge branch 'master' into dev
trbromley Mar 1, 2023
fd6fb94
Merge branch 'master' into dev
actions-user Mar 3, 2023
cf7ddcf
Merge branch 'master' into dev
actions-user Mar 3, 2023
3e34def
Merge branch 'master' into dev
rashidnhm Mar 15, 2023
f487736
Merge branch 'master' into dev
actions-user Mar 16, 2023
a2c4aac
Merge branch 'master' into dev
actions-user Mar 17, 2023
580ea7b
Merge branch 'master' into dev
actions-user Mar 20, 2023
36bd9a7
Merge branch 'master' into dev
actions-user Mar 22, 2023
125fe67
Merge branch 'master' into dev
actions-user Mar 22, 2023
a8cb199
Merge branch 'master' into dev
actions-user Mar 24, 2023
649de42
Merge branch 'master' into dev
actions-user Apr 3, 2023
3471f48
Merge branch 'master' into dev
actions-user Apr 4, 2023
59d2d60
Merge branch 'master' into dev
actions-user Apr 4, 2023
ff563c6
Merge branch 'master' into dev
actions-user Apr 4, 2023
e68fa30
Merge branch 'master' into dev
actions-user Apr 10, 2023
432b6e9
Merge branch 'master' into dev
actions-user Apr 10, 2023
dbccd02
Merge branch 'master' into dev
actions-user Apr 10, 2023
ce4d5bb
Updated adaptive circuits demo for new return type (#735)
mudit2812 Apr 14, 2023
ef4184f
Merge branch 'master' into dev
actions-user Apr 17, 2023
a5ad1d6
Merge branch 'master' into dev
actions-user Apr 18, 2023
d6b47ac
Merge branch 'master' into dev
actions-user Apr 18, 2023
d770e5b
Merge branch 'master' into dev
actions-user Apr 19, 2023
16b4dd2
Merge branch 'master' into dev
actions-user Apr 19, 2023
1e61f33
Merge branch 'master' into dev
actions-user Apr 21, 2023
3cdc59a
Merge branch 'master' into dev
actions-user Apr 22, 2023
a84c9a9
Merge branch 'master' into dev
actions-user Apr 24, 2023
7e4dfe9
Update automatically run demos to be able to execute with v0.30 (#741)
albi3ro Apr 24, 2023
be299d6
remove nlopt from list of requirements (#755)
albi3ro Apr 24, 2023
ba04866
Merge branch 'master' into dev
actions-user Apr 24, 2023
11991f5
use dev version of lightning for demo checker (#759)
albi3ro Apr 25, 2023
d494b50
Improve formatting of output in toric code demo (#762)
albi3ro Apr 26, 2023
c219606
Merge branch 'master' into dev
actions-user Apr 26, 2023
30a6039
use lightning in quantumvolume; fix qnspsa for new return; use H.spar…
timmysilv Apr 27, 2023
63a7104
Merge branch 'master' into dev
actions-user Apr 27, 2023
8c7e4cd
Merge branch 'master' into dev
actions-user Apr 28, 2023
ba89a43
Merge branch 'master' into dev
actions-user Apr 28, 2023
680d318
Merge branch 'master' into dev
actions-user Apr 28, 2023
1ce2d79
Update manually run demos (#766)
mudit2812 Apr 28, 2023
ad2e71d
Add warnings to pennylane-sf plugins and expected output (#761)
albi3ro Apr 28, 2023
0d40cb6
Merge branch 'master' into dev
rashidnhm May 3, 2023
53619bc
Merge branch 'master' into dev
actions-user May 4, 2023
4c41de4
Merge branch 'master' into dev
actions-user May 5, 2023
1bffa08
Merge branch 'master' into dev
actions-user May 8, 2023
2668695
Merge branch 'master' into dev
actions-user May 8, 2023
f898f7b
Merge branch 'master' into dev
actions-user May 8, 2023
d5c4f5d
Merge branch 'master' into dev
actions-user May 11, 2023
931403b
Merge branch 'master' into dev
actions-user May 12, 2023
89fe71f
Merge branch 'master' into dev
actions-user May 12, 2023
cd482a5
Merge branch 'master' into dev
actions-user May 15, 2023
0128b31
Merge branch 'master' into dev
actions-user May 15, 2023
2575190
Merge branch 'master' into dev
actions-user May 17, 2023
07bdfd9
Merge branch 'master' into dev
actions-user May 17, 2023
d584998
Merge branch 'master' into dev
actions-user May 18, 2023
e49598f
Merge branch 'master' into dev
actions-user May 18, 2023
301ab7a
Merge branch 'master' into dev
actions-user May 19, 2023
ccde5b1
Merge branch 'master' into dev
actions-user May 24, 2023
abdace6
Merge branch 'master' into dev
actions-user May 24, 2023
fb79fdd
Merge branch 'master' into dev
actions-user May 29, 2023
52137be
Merge branch 'master' into dev
actions-user May 30, 2023
f35a3fd
Merge branch 'master' into dev
actions-user May 31, 2023
dba08dd
Merge branch 'master' into dev
actions-user May 31, 2023
1e22667
Merge branch 'master' into dev
actions-user Jun 5, 2023
ef87ab0
Merge branch 'master' into dev
actions-user Jun 5, 2023
acfac90
Merge branch 'master' into dev
actions-user Jun 5, 2023
ed9495c
Merge branch 'master' into dev
actions-user Jun 6, 2023
29282b9
Merge branch 'master' into dev
actions-user Jun 7, 2023
f97947b
Merge branch 'master' into dev
actions-user Jun 8, 2023
953fdc2
Merge branch 'master' into dev
actions-user Jun 9, 2023
e9b1ae9
Merge branch 'master' into dev
actions-user Jun 9, 2023
2fc33cc
Merge branch 'master' into dev
actions-user Jun 12, 2023
bd943fb
Merge branch 'master' into dev
actions-user Jun 12, 2023
7b971bb
dev (#824)
KetpuntoG Jun 13, 2023
bada2cf
Update requirements.txt (#825)
trbromley Jun 16, 2023
4ae5736
Merge branch 'master' into dev
actions-user Jun 16, 2023
576f734
Merge branch 'master' into dev
actions-user Jun 16, 2023
66cd235
Update resource estimation demo for non-cubic systems (#823)
soranjh Jun 16, 2023
2f8959e
Merge branch 'master' into dev
actions-user Jun 19, 2023
7c2be4e
Merge branch 'master' into dev
actions-user Jun 19, 2023
020e8c3
Merge branch 'master' into dev
actions-user Jun 20, 2023
b7b20da
Change private methods in adjoint diff tutorial (#832)
albi3ro Jun 20, 2023
f478b84
Merge branch 'master' into dev
actions-user Jun 21, 2023
21061d0
Add fermionic operators demo (#813)
soranjh Jun 23, 2023
08206a6
Fixes for 0.31 release (#835)
mudit2812 Jun 23, 2023
9d979ee
Modify image in fermionic demo (#838)
soranjh Jun 23, 2023
e82ec77
use pinned versions of pennylane and plugins (#840)
timmysilv Jun 26, 2023
3f90541
Merge branch 'master' into dev
actions-user Jun 27, 2023
edaba44
Test interactive demo (#839)
josh146 Jun 27, 2023
7173528
use unpinned version of PL and plugins (#841)
timmysilv Jun 27, 2023
e7b3bff
Interactive demo (#843)
josh146 Jun 27, 2023
d0c1f3c
Circuit fourier2 (#844)
josh146 Jun 28, 2023
654b392
Merge branch 'master' into dev
actions-user Jun 29, 2023
940f9a4
Merge branch 'master' into dev
actions-user Jun 29, 2023
bdcf861
Merge branch 'master' into dev
actions-user Jul 1, 2023
ecdeafa
Merge branch 'master' into dev
actions-user Jul 3, 2023
45f3fc0
Merge branch 'master' into dev
actions-user Jul 3, 2023
2039127
Merge branch 'master' into dev
actions-user Jul 4, 2023
62f73ab
Merge branch 'master' into dev
actions-user Jul 4, 2023
f9ac339
Merge branch 'master' into dev
actions-user Jul 5, 2023
4945004
Merge branch 'master' into dev
actions-user Jul 6, 2023
27a0964
Merge branch 'master' into dev
actions-user Jul 7, 2023
a2d89fb
Replace deprecated X and P (#854)
lillian542 Jul 11, 2023
36161e1
Merge branch 'master' into dev
actions-user Jul 12, 2023
7634b9d
Merge branch 'master' into dev
actions-user Jul 13, 2023
02f0e41
Merge branch 'master' into dev
actions-user Jul 14, 2023
da87dc4
Merge branch 'master' into dev
actions-user Jul 14, 2023
bf675f3
Merge branch 'master' into dev
actions-user Jul 14, 2023
2f37ac5
Merge branch 'master' into dev
actions-user Jul 17, 2023
a4e2d02
Merge branch 'master' into dev. Fix conflicts.
rashidnhm Jul 18, 2023
25cb3fc
Merge branch 'master' into dev
actions-user Jul 18, 2023
771cf66
Merge branch 'master' into dev
actions-user Jul 19, 2023
0df6955
Updated JSON workflow to create and upload searchindex.js file (#867)
rashidnhm Jul 20, 2023
e9241c9
Fix bug in build-branch that prevents PL and plugins from being upgra…
rashidnhm Jul 20, 2023
55324c3
Merge branch 'master' into dev
actions-user Jul 21, 2023
937b0b7
Merge branch 'master' into dev
actions-user Jul 24, 2023
ec3d3eb
Merge branch 'master' into dev
actions-user Jul 25, 2023
a9383b4
Merge branch 'master' into dev
actions-user Jul 25, 2023
4969a1f
Remove interactive demo test (#853)
josh146 Jul 25, 2023
10778b4
Merge branch 'master' into dev
actions-user Jul 26, 2023
b18a637
Merge branch 'master' into dev
actions-user Jul 29, 2023
aadd4b5
removing files (#876)
KetpuntoG Aug 1, 2023
c24cfb1
Merge branch 'master' into dev
actions-user Aug 4, 2023
2f3cafb
Merge branch 'master' into dev
actions-user Aug 4, 2023
43bca6b
Merge branch 'master' into dev
actions-user Aug 8, 2023
3977e5e
Merge branch 'master' into dev
actions-user Aug 9, 2023
e18b1fb
removing (#883)
KetpuntoG Aug 10, 2023
2018c1c
Minor bump to sphinx, remote generation of sitemap (#884)
rashidnhm Aug 11, 2023
410b29c
Merge branch 'master' into dev
actions-user Aug 14, 2023
cde1ad7
Merge branch 'master' into dev
actions-user Aug 14, 2023
8e59c82
Merge branch 'master' into dev
actions-user Aug 16, 2023
3f4e81c
Demo on QSVT for matrix inversion (#836)
Jaybsoni Aug 17, 2023
ea2cd78
replace QSV --> StatePrep (#900)
Jaybsoni Aug 21, 2023
0922a4d
Added warning filter (#905)
mudit2812 Aug 25, 2023
4f5db0c
avoid index out of range error (#904)
lillian542 Aug 25, 2023
1a38829
Merge branch 'master' into dev
rashidnhm Aug 28, 2023
4bd3e49
change .xyz usage to datasets (#909)
DSGuala Aug 28, 2023
092c149
Merge branch 'master' into dev
actions-user Aug 28, 2023
c99f6e7
Bump requirements (#906)
mudit2812 Aug 28, 2023
7a9a0e3
Upgrade TensorFlow version (#914)
mudit2812 Aug 31, 2023
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
14 changes: 3 additions & 11 deletions .github/workflows/build-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@ jobs:

# Adding this install outside of poetry as the dependencies conflict with existing other packages.
# TODO: This needs to be revisited.
# The following needs to be done in order for this dependency to be moved into pyproject.toml:
# - PennyLane-Cirq needs to support cirq >= 1.1.0
# - PennyLane needs to support numpy ~> 1.24
${{ steps.venv.outputs.location }}/bin/python3 -m pip install --no-deps mitiq==0.25.0

- name: Download Worker Load Data Artifact
Expand Down Expand Up @@ -432,17 +435,6 @@ jobs:
retention-days: 1
path: /tmp/execution_times

# These are files that are generated as part of sphinx-build but are not needed and supported on the live website
# There does not seem to be an option to "not" generate them, therefore this step deletes these files before they
# are published to the live website.
- name: Update sitemap.xml
run: |
${{ steps.venv.outputs.location }}/bin/qml_pipeline_utils \
clean-sitemap \
--build-dir="${{ github.workspace }}/_build/html" \
--html-files="demos/sg_execution_times.html" \
--verbose

# Removes built html files that are not relevant to current node
# See documentation in github_job_scheduler.py for more details.
- name: Clean HTML Files
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,12 @@ Add the new dependency in the `[tool.poetry.group.executable-dependencies.depend

Once pyproject.toml files have been updated, the poetry.lock file needs to be refreshed:
```bash
poetry lock
poetry lock --no-update
```
This command will ensure that there are no dependency conflicts with any other package, and everything works.

The `--no-update` ensures existing package versions are not bumped as part of the locking process.

If the dependency change is required in prod, open the PR against `master`, or if it's only required in dev, then open
the PR against the `dev` branch, which will be synced to master on the next release of PennyLane.

Expand Down
3 changes: 1 addition & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
"sphinx.ext.intersphinx",
"sphinx.ext.mathjax",
"sphinx.ext.ifconfig",
"sphinx_gallery.gen_gallery",
"sphinx_sitemap",
"sphinx_gallery.gen_gallery"
]


Expand Down
2 changes: 1 addition & 1 deletion demonstrations/ahs_aquila.py
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ def circuit(params):
start_val = amplitude[0]
stop_val = amplitude[-1]
max_val = np.max(amplitude)
max_rate = np.max([(amplitude[i + 1] - amplitude[i]) / timestep for i in range(len(times))])
max_rate = np.max([(amplitude[i + 1] - amplitude[i]) / timestep for i in range(len(times)-1)])

print(f"start value: {start_val:.3} MHz")
print(f"stop value: {stop_val:.3} MHz")
Expand Down
2 changes: 1 addition & 1 deletion demonstrations/quantum_neural_net.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def quantum_neural_net(var, x):
for v in var:
layer(v)

return qml.expval(qml.X(0))
return qml.expval(qml.QuadX(0))


##############################################################################
Expand Down
6 changes: 3 additions & 3 deletions demonstrations/tutorial_QGAN.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def gen_cost(gen_weights):
# We begin by creating the optimizer:

opt = tf.keras.optimizers.SGD(0.4)

opt.build([disc_weights, gen_weights])

##############################################################################
# In the first stage of training, we optimize the discriminator while
Expand All @@ -213,7 +213,7 @@ def gen_cost(gen_weights):
cost = lambda: disc_cost(disc_weights)

for step in range(50):
opt.minimize(cost, disc_weights)
opt.minimize(cost, [disc_weights])
if step % 5 == 0:
cost_val = cost().numpy()
print("Step {}: cost = {}".format(step, cost_val))
Expand Down Expand Up @@ -243,7 +243,7 @@ def gen_cost(gen_weights):
cost = lambda: gen_cost(gen_weights)

for step in range(50):
opt.minimize(cost, gen_weights)
opt.minimize(cost, [gen_weights])
if step % 5 == 0:
cost_val = cost().numpy()
print("Step {}: cost = {}".format(step, cost_val))
Expand Down
2 changes: 1 addition & 1 deletion demonstrations/tutorial_apply_qsvt.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def real_u(A, phi):

@qml.qnode(qml.device("default.qubit", wires=["ancilla1", "ancilla2", 0, 1, 2]))
def linear_system_solver_circuit(phi):
qml.QubitStateVector(normalized_b, wires=[1, 2])
qml.StatePrep(normalized_b, wires=[1, 2])
real_u(A.T, phi) # invert the singular values of A transpose to get A^-1
return qml.state()

Expand Down
2 changes: 1 addition & 1 deletion demonstrations/tutorial_expressivity_fourier_series.py
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ def quantum_model(weights, x):
W(weights[0])
S(x)
W(weights[1])
return qml.expval(qml.X(wires=0))
return qml.expval(qml.QuadX(wires=0))

def random_weights():
return np.random.normal(size=(2, 5 * n_ansatz_layers), loc=0, scale=var)
Expand Down
2 changes: 1 addition & 1 deletion demonstrations/tutorial_general_parshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def make_cost(N, seed):
@qml.qnode(dev, interface="jax")
def cost(x):
"""Cost function on N qubits with N frequencies."""
qml.QubitStateVector(random_state(N, seed), wires=dev.wires)
qml.StatePrep(random_state(N, seed), wires=dev.wires)
for w in dev.wires:
qml.RZ(x, wires=w, id="x")
return qml.expval(qml.Hermitian(random_observable(N, seed), wires=dev.wires))
Expand Down
14 changes: 7 additions & 7 deletions demonstrations/tutorial_mbqc.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def cluster_state():
@qml.qnode(dev, interface="autograd")
def one_bit_teleportation(input_state):
# Prepare the input state
qml.QubitStateVector(input_state, wires=0)
qml.StatePrep(input_state, wires=0)

# Prepare the cluster state
qml.Hadamard(wires=1)
Expand Down Expand Up @@ -305,7 +305,7 @@ def generate_random_state(n=1):
@qml.qnode(dev, interface="autograd")
def RZ(theta, input_state):
# Prepare the input state
qml.QubitStateVector(input_state, wires=0)
qml.StatePrep(input_state, wires=0)

# Perform the Rz rotation
qml.RZ(theta, wires=0)
Expand All @@ -326,7 +326,7 @@ def RZ(theta, input_state):
@qml.qnode(mbqc_dev, interface="autograd")
def RZ_MBQC(theta, input_state):
# Prepare the input state
qml.QubitStateVector(input_state, wires=0)
qml.StatePrep(input_state, wires=0)

# Prepare the cluster state
qml.Hadamard(wires=1)
Expand Down Expand Up @@ -367,7 +367,7 @@ def RZ_MBQC(theta, input_state):
@qml.qnode(dev, interface="autograd")
def RX(theta, input_state):
# Prepare the input state
qml.QubitStateVector(input_state, wires=0)
qml.StatePrep(input_state, wires=0)

# Perform the Rz rotation
qml.RX(theta, wires=0)
Expand All @@ -382,7 +382,7 @@ def RX(theta, input_state):
@qml.qnode(mbqc_dev, interface="autograd")
def RX_MBQC(theta, input_state):
# Prepare the input state
qml.QubitStateVector(input_state, wires=0)
qml.StatePrep(input_state, wires=0)

# Prepare the cluster state
qml.Hadamard(wires=1)
Expand Down Expand Up @@ -447,7 +447,7 @@ def RX_MBQC(theta, input_state):
@qml.qnode(dev, interface="autograd")
def CNOT(input_state):
# Prepare the input state
qml.QubitStateVector(input_state, wires=[0, 1])
qml.StatePrep(input_state, wires=[0, 1])
qml.CNOT(wires=[0, 1])

return qml.density_matrix(wires=[0, 1])
Expand All @@ -459,7 +459,7 @@ def CNOT(input_state):
@qml.qnode(mbqc_dev, interface="autograd")
def CNOT_MBQC(input_state):
# Prepare the input state
qml.QubitStateVector(input_state, wires=[0, 1])
qml.StatePrep(input_state, wires=[0, 1])

# Prepare the cluster state
qml.Hadamard(wires=2)
Expand Down
Loading