-
Notifications
You must be signed in to change notification settings - Fork 41
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
Fixed incorrect use of walrus operator #1478
Open
lasradorohan
wants to merge
6
commits into
PennyLaneAI:main
Choose a base branch
from
lasradorohan:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
015ea61
Fixed incorrect use of walrus operator
lasradorohan 17519f8
Added test for argnums parameter
lasradorohan 7f4fd41
Added test for argnums parameter
lasradorohan e1533e1
Added test for argnums parameter
lasradorohan c4dfcfb
Merge branch 'main' into main
lasradorohan 08a1595
Added release note for bug fix #1478
lasradorohan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -19,7 +19,7 @@ | |||||||||||||||||||||
import pennylane as qml | ||||||||||||||||||||||
import pytest | ||||||||||||||||||||||
from jax import numpy as jnp | ||||||||||||||||||||||
from jax.tree_util import tree_flatten | ||||||||||||||||||||||
from jax.tree_util import tree_flatten, tree_map, tree_all, tree_structure | ||||||||||||||||||||||
|
||||||||||||||||||||||
import catalyst.utils.calculate_grad_shape as infer | ||||||||||||||||||||||
from catalyst import ( | ||||||||||||||||||||||
|
@@ -1780,5 +1780,35 @@ def fn(x): | |||||||||||||||||||||
assert np.allclose(res_pattern_partial, expected) | ||||||||||||||||||||||
|
||||||||||||||||||||||
|
||||||||||||||||||||||
@pytest.mark.parametrize("argnums", [0, 1, (0, 1)]) | ||||||||||||||||||||||
@pytest.mark.parametrize("transform_qjit", [False, True]) | ||||||||||||||||||||||
def test_grad_argnums(argnums, transform_qjit): | ||||||||||||||||||||||
"""Tests https://github.com/PennyLaneAI/catalyst/issues/1477""" | ||||||||||||||||||||||
@qml.qnode(device=qml.device("lightning.qubit", wires=4), interface="jax") | ||||||||||||||||||||||
def circuit(inputs, weights): | ||||||||||||||||||||||
qml.AngleEmbedding(features=inputs, wires=range(4), rotation="X") | ||||||||||||||||||||||
for i in range(1, 4): | ||||||||||||||||||||||
qml.CRX(weights[i - 1], wires=[i, 0]) | ||||||||||||||||||||||
return qml.expval(qml.PauliZ(wires=0)) | ||||||||||||||||||||||
|
||||||||||||||||||||||
if transform_qjit: | ||||||||||||||||||||||
circuit = qjit(circuit) | ||||||||||||||||||||||
|
||||||||||||||||||||||
weights = jnp.array([3.0326467, 0.98860157, 1.9887222]) | ||||||||||||||||||||||
inputs = jnp.array([0.9653214, 0.31468165, 0.63302994]) | ||||||||||||||||||||||
|
||||||||||||||||||||||
def compare_structure_and_value(o1, o2): | ||||||||||||||||||||||
return tree_structure(o1) == tree_structure(o2) and \ | ||||||||||||||||||||||
tree_all(tree_map(jnp.allclose, o1, o2)) | ||||||||||||||||||||||
|
||||||||||||||||||||||
result = grad(circuit, argnums=argnums)(weights, inputs) | ||||||||||||||||||||||
expected = jax.grad(circuit, argnums=argnums)(weights, inputs) | ||||||||||||||||||||||
assert compare_structure_and_value(result, expected) | ||||||||||||||||||||||
|
||||||||||||||||||||||
_, result = value_and_grad(circuit, argnums=argnums)(weights, inputs) | ||||||||||||||||||||||
_, expected = jax.value_and_grad(circuit, argnums=argnums)(weights, inputs) | ||||||||||||||||||||||
Comment on lines
+1805
to
+1809
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ideally we might want to compare against a computation not involving Catalyst at all, which can be achieved like this (applying
Suggested change
|
||||||||||||||||||||||
assert compare_structure_and_value(result, expected) | ||||||||||||||||||||||
|
||||||||||||||||||||||
|
||||||||||||||||||||||
if __name__ == "__main__": | ||||||||||||||||||||||
pytest.main(["-x", __file__]) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need to test without qjit, since we would be testing PennyLane in that case (which has its own test suite):