[Code Together] Add support for qml.ResetError in default.mixed #1541

wongwsvincent · 2021-08-17T03:20:47Z

Context: Add support for qml.ResetError for default.mixed device, and a test of the gradient computation

Description of the Change: Added ResetError to the list of supported operations, and a test function for gradient check

Benefits: Support single-qubit reset error channel that simulates the reset of qubits to 0 or 1 given a probability.

Possible Drawbacks:

Related GitHub Issues: 1530

…e feature

Co-authored-by: Josh Izaac <josh146@gmail.com>

Co-authored-by: Maria Schuld <mariaschuld@gmail.com>

codecov · 2021-08-17T03:35:04Z

Codecov Report

Merging #1541 (c482b52) into master (a9a7311) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1541   +/-   ##
=======================================
  Coverage   99.14%   99.14%           
=======================================
  Files         188      188           
  Lines       13411    13411           
=======================================
  Hits        13297    13297           
  Misses        114      114

Impacted Files	Coverage Δ
pennylane/devices/default_mixed.py	`100.00% <ø> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a9a7311...c482b52. Read the comment docs.

antalszava

Hi @wongwsvincent, thank you for your contribution! 🙂 🎉 This is overall in great shape already, leaving some suggestions to refine it.

What would additionally remain, is adding tests for applying the channel using default.mixed. The gradient test is already nice to have, these additional tests would just add an extra layer of unit testing.

antalszava · 2021-08-17T14:05:37Z

.github/CHANGELOG.md

@@ -121,6 +121,9 @@
  an owner of the pruned tensor and its constituent observables, but leaves the
  original tensor in the queue without an owner.

+* The `qml.ResetError` is now supported for `default.mixed` device. 


Nice! 🙂 Could you add yourself to the list of contributors too on line 137?

Yep! I have just added my name.

antalszava · 2021-08-17T14:08:22Z

tests/ops/test_channel_ops.py

@@ -279,6 +279,40 @@ def test_p0_p1_sum_not_normalized(self):
        with pytest.raises(ValueError, match="must be between"):
            channel.ResetError(1.0, 1.0, wires=0).kraus_matrices

+    @pytest.mark.parametrize("angle", np.linspace(0, 2 * np.pi, 7))
+    def test_grad_reseterror(self, angle, tol):
+        """Test that analytical gradient is computed correctly for different states. Channel


Maybe worth adjusting the docstring here, as we're falling back to finite differences. qml.ResetError doesn't support analytic gradients at the moment, grad_method = "F" here denotes this fact.

I have removed the word analytical. I hope it looks good now

antalszava · 2021-08-17T14:11:26Z

pennylane/devices/default_mixed.py

@@ -91,6 +91,7 @@ class DefaultMixed(QubitDevice):
        "DepolarizingChannel",
        "BitFlip",
        "PhaseFlip",
+        "ResetError",


Awesome catch! 🥇

…cent/pennylane into add_reseterror_support

wongwsvincent · 2021-08-18T05:19:11Z

Hi @antalszava , I have made the changes as requested. This PR is ready for another review.

antalszava · 2021-08-18T13:58:00Z

Hi @wongwsvincent, thanks! It seems that adding tests for applying the channel using default.mixed would still remain.

Also, there seems to be a conflict in the changelog. This can be resolved by pulling master (git checkout master followed by git pull), switching to the feature branch (git checkout add_reseterror_support) and then merging master (git merge master). The culprit seems to be the changelog file. We'd like to have all the entries kept there, for some reason git could not resolve the addition there well.

wongwsvincent · 2021-08-18T20:31:57Z

Hi @antalszava , thanks for reviewing and catching the missing tests! I have added a few tests for qml.ResetError in tests/devices/test_default_mixed.py. I have also fixed the conflicts in CHANGELOG.md.

All checks look good without complaints. It should be ready for review.

antalszava

Hi @wongwsvincent, the additional tests are looking awesome, thank you! 💯 There seem to be small things to be adjusted. Overall, however, this is near approval.

antalszava · 2021-08-18T21:36:35Z

tests/templates/test_layers/test_strongly_entangling.py

@@ -160,13 +160,6 @@ def circuit(weights, ranges=None):
            weights = np.random.randn(1, 2, 3)
            circuit(weights, ranges=[0])

-    def test_id(self):


Hi @wongwsvincent how come this test was removed?

ops, sorry! I must have mistakenly removed it when I was resolving my merge conflicts. The test is added back.

tests/ops/test_channel_ops.py

tests/devices/test_default_mixed.py

.github/CHANGELOG.md

Co-authored-by: antalszava <antalszava@gmail.com>

wongwsvincent · 2021-08-18T22:24:51Z

Hi @wongwsvincent, the additional tests are looking awesome, thank you! 💯 There seem to be small things to be adjusted. Overall, however, this is near approval.

Thanks for the suggestions @antalszava ! All the issues are addressed. Ready for a (hopefully) final review.

antalszava

Looks good to me! 🎉 Great one @wongwsvincent, thank you for your contribution! 🙂

wongwsvincent and others added 22 commits May 17, 2021 15:02

Allow custom range sequence for StronglyEntanglingLayers

cb5e881

minor code cleaning for StronglyEntanglingLayers custom range sequenc…

bf1a966

…e feature

Update CHANGELOG.md with PR#1332

a076bbb

Merge branch 'master' into master

b75b70f

Update test_strongly_entangling.py

b04ae3c

Merge branch 'master' of https://github.com/wongwsvincent/pennylane

1f7f4a8

Merge branch 'master' into master

2db341e

Update test_strongly_entangling.py

34abe10

Merge branch 'master' of https://github.com/wongwsvincent/pennylane

3b44652

Update .github/CHANGELOG.md

6f67168

Co-authored-by: Josh Izaac <josh146@gmail.com>

Merge branch 'master' into master

48e9f84

Update pennylane/templates/layers/strongly_entangling.py

b4e2f59

Co-authored-by: Maria Schuld <mariaschuld@gmail.com>

Update pennylane/templates/layers/strongly_entangling.py

d133435

Co-authored-by: Maria Schuld <mariaschuld@gmail.com>

Merge branch 'master' into master

00959e6

Update strongly_entangling.py and test_strongly_entangling.py

79b0784

format strongly_entangling.py and test_strongly_entangling.py with Black

5b94e57

Merge branch 'master' into master

8302a79

Merge branch 'master' into master

85a0d11

Update test_strongly_entangling.py and CHANGELOG.md

2b3b20b

Merge branch 'master' of https://github.com/wongwsvincent/pennylane

f412d05

Adding ResetError support and relevant test

b904574

Update CHANGELOG.md

4c92793

wongwsvincent mentioned this pull request Aug 17, 2021

Add support for qml.ResetError in default.mixed #1530

Closed

Merge branch 'master' into add_reseterror_support

c98c276

antalszava suggested changes Aug 17, 2021

View reviewed changes

antalszava and others added 3 commits August 17, 2021 13:53

Merge branch 'master' into add_reseterror_support

36ffb55

minor updates

9a1adf4

Merge branch 'add_reseterror_support' of https://github.com/wongwsvin…

5ecc0e9

…cent/pennylane into add_reseterror_support

wongwsvincent added 5 commits August 18, 2021 10:48

Merge branch 'master' into add_reseterror_support

8aa6e84

restoring missing files

ec4391d

resolve conflicts

1000290

Merge branch 'master' into add_reseterror_support

f09800a

Update test_default_mixed.py

603872e

antalszava reviewed Aug 18, 2021

View reviewed changes

wongwsvincent and others added 3 commits August 18, 2021 14:46

Update test_strongly_entangling.py

6064cb4

Update .github/CHANGELOG.md

26664e9

Co-authored-by: antalszava <antalszava@gmail.com>

Update tests/ops/test_channel_ops.py

e2b7108

Co-authored-by: antalszava <antalszava@gmail.com>

Merge branch 'master' into add_reseterror_support

c482b52

antalszava approved these changes Aug 19, 2021

View reviewed changes

antalszava merged commit a0d3606 into PennyLaneAI:master Aug 19, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Code Together] Add support for qml.ResetError in default.mixed #1541

[Code Together] Add support for qml.ResetError in default.mixed #1541

wongwsvincent commented Aug 17, 2021 •

edited

Loading

codecov bot commented Aug 17, 2021 •

edited

Loading

antalszava left a comment

antalszava Aug 17, 2021

wongwsvincent Aug 18, 2021

antalszava Aug 17, 2021

wongwsvincent Aug 18, 2021

antalszava Aug 17, 2021

wongwsvincent commented Aug 18, 2021

antalszava commented Aug 18, 2021

wongwsvincent commented Aug 18, 2021

antalszava left a comment

antalszava Aug 18, 2021

wongwsvincent Aug 18, 2021

wongwsvincent commented Aug 18, 2021

antalszava left a comment

[Code Together] Add support for qml.ResetError in default.mixed #1541

[Code Together] Add support for qml.ResetError in default.mixed #1541

Conversation

wongwsvincent commented Aug 17, 2021 • edited Loading

codecov bot commented Aug 17, 2021 • edited Loading

Codecov Report

antalszava left a comment

Choose a reason for hiding this comment

antalszava Aug 17, 2021

Choose a reason for hiding this comment

wongwsvincent Aug 18, 2021

Choose a reason for hiding this comment

antalszava Aug 17, 2021

Choose a reason for hiding this comment

wongwsvincent Aug 18, 2021

Choose a reason for hiding this comment

antalszava Aug 17, 2021

Choose a reason for hiding this comment

wongwsvincent commented Aug 18, 2021

antalszava commented Aug 18, 2021

wongwsvincent commented Aug 18, 2021

antalszava left a comment

Choose a reason for hiding this comment

antalszava Aug 18, 2021

Choose a reason for hiding this comment

wongwsvincent Aug 18, 2021

Choose a reason for hiding this comment

wongwsvincent commented Aug 18, 2021

antalszava left a comment

Choose a reason for hiding this comment

wongwsvincent commented Aug 17, 2021 •

edited

Loading

codecov bot commented Aug 17, 2021 •

edited

Loading