Skip to content

Commit

Permalink
Merge branch 'master' into gpu-pytest-xdist
Browse files Browse the repository at this point in the history
  • Loading branch information
josephleekl committed Jan 18, 2025
2 parents b7cf799 + 290c986 commit 11a1c3f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@

### Improvements

* Update `qml.MultiControlledX` tests following the latest updates in PennyLane.
[(#1040)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1040)

* Update the minimum required version of PennyLane to `v0.40.0`.
[(#1033)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1033)

* Merge the `v0.40.0-rc` branch to the master and bump version.
[(#1038)](https://github.com/PennyLaneAI/pennylane-lightning/pull/1038)

Expand All @@ -23,7 +26,7 @@

This release contains contributions from (in alphabetical order):

Joseph Lee, Shuli Shu
Yushao Chen, Joseph Lee, Shuli Shu

---

Expand Down
2 changes: 1 addition & 1 deletion tests/lightning_tensor/test_gates_and_expval.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def circuit_ansatz(params, wires):
qml.matrix(qml.PauliX([wires[1]])), control_wires=[wires[0]], wires=wires[1]
)
qml.DiagonalQubitUnitary(np.array([1, 1]), wires=wires[2])
qml.MultiControlledX(wires=[wires[0], wires[1], wires[3]], control_values=[wires[0], wires[1]])
qml.MultiControlledX(wires=[wires[0], wires[1], wires[3]], control_values=[0, 1])
qml.PauliX(wires=wires[1])
qml.PauliY(wires=wires[2])
qml.PauliZ(wires=wires[3])
Expand Down
2 changes: 1 addition & 1 deletion tests/test_gates.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def op(op_name):
"MultiControlledX": [
qml.MultiControlledX,
[],
{"wires": [0, 1, 2], "control_values": "01"},
{"wires": [0, 1, 2], "control_values": [0, 1]},
],
"SingleExcitation": [qml.SingleExcitation, [0.123], {"wires": [0, 1]}],
"SingleExcitationPlus": [qml.SingleExcitationPlus, [0.123], {"wires": [0, 1]}],
Expand Down

0 comments on commit 11a1c3f

Please sign in to comment.