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.

Sign up for GitHub

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

Jump to bottom

Localize RNG in TF test #6037

Closed
wants to merge 4 commits into from
Closed

Localize RNG in TF test #6037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ab2b43
localize RNG in TF test
Shiro-Raven Jul 24, 2024
e2fc642
runtime improvements and more stable RNGs
Shiro-Raven Jul 24, 2024
3b0ad76
more shots
Shiro-Raven Jul 24, 2024
b661f15
Merge branch 'master' into ad/tf-test-fix
Shiro-Raven Jul 24, 2024
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
34 changes: 22 additions & 12 deletions ...efault_qubit_2_integration/test_tensorflow_autograph_qnode_shot_vector_default_qubit_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Integration tests for using the TF interface with shot vectors and with a QNode"""
# pylint: disable=too-many-arguments,too-few-public-methods,unexpected-keyword-arg
# pylint: disable=too-many-arguments,too-few-public-methods,unexpected-keyword-arg,redefined-outer-name
Shiro-Raven marked this conversation as resolved.
Show resolved Hide resolved
import pytest

import pennylane as qml
Expand All @@ -27,14 +27,16 @@
shots_and_num_copies = [((1, (5, 2), 10), 4)]
shots_and_num_copies_hess = [((10, (5, 1)), 2)]

kwargs = {
"finite-diff": {"h": 10e-2},
"parameter-shift": {},
"spsa": {"h": 10e-2, "num_directions": 20},
}

qubit_device_and_diff_method = [
[DefaultQubit(), "finite-diff", {"h": 10e-2}],
[DefaultQubit(), "parameter-shift", {}],
[
DefaultQubit(),
"spsa",
{"h": 10e-2, "num_directions": 20, "sampler_rng": np.random.default_rng(42)},
],
[DefaultQubit(), "finite-diff"],
[DefaultQubit(), "parameter-shift"],
[DefaultQubit(), "spsa"],
]

TOLS = {
Expand All @@ -44,8 +46,16 @@
}


@pytest.fixture
def gradient_kwargs(request):
diff_method = request.node.funcargs["diff_method"]
return kwargs[diff_method] | (
{"sampler_rng": np.random.default_rng(42)} if diff_method == "spsa" else {}
)


@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
@pytest.mark.parametrize("dev,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev,diff_method", qubit_device_and_diff_method)
@pytest.mark.parametrize(
"decorator,interface",
[(tf.function, "tf"), (lambda x: x, "tf-autograph")],
Expand Down Expand Up @@ -329,7 +339,7 @@ def circuit(a, **_):

@pytest.mark.slow
@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies_hess)
@pytest.mark.parametrize("dev,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev,diff_method", qubit_device_and_diff_method)
@pytest.mark.parametrize(
"decorator,interface",
[(tf.function, "tf"), (lambda x: x, "tf-autograph")],
Expand Down Expand Up @@ -374,11 +384,11 @@ def circuit(x, y, **_):
assert h.shape == (2, num_copies)


shots_and_num_copies = [((1000000, 900000, 800000), 3), ((1000000, (900000, 2)), 3)]
shots_and_num_copies = [((30000, 28000, 26000), 3), ((20000, (18000, 2)), 3)]


@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
@pytest.mark.parametrize("dev,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev,diff_method", qubit_device_and_diff_method)
@pytest.mark.parametrize(
"decorator,interface",
[(tf.function, "tf"), (lambda x: x, "tf-autograph")],
Expand Down
2 changes: 1 addition & 1 deletion ...terfaces/default_qubit_2_integration/test_tensorflow_qnode_shot_vector_default_qubit_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ def circuit(x):
assert hess.shape == (num_copies, 3, 2, 2)


shots_and_num_copies = [((1000000, 900000, 800000), 3), ((1000000, (900000, 2)), 3)]
shots_and_num_copies = [((30000, 28000, 26000), 3), ((30000, (28000, 2)), 3)]


@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
Expand Down
33 changes: 22 additions & 11 deletions tests/interfaces/test_autograd_qnode_shot_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Integration tests for using the Autograd interface with shot vectors and with a QNode"""
# pylint: disable=too-many-arguments
# pylint: disable=too-many-arguments,redefined-outer-name

import pytest

Expand All @@ -25,13 +25,17 @@
shots_and_num_copies = [(((5, 2), 1, 10), 4), ((1, 10, (5, 2)), 4)]
shots_and_num_copies_hess = [(((5, 1), 10), 2), ((10, (5, 1)), 2)]

SEED_FOR_SPSA = 42
spsa_kwargs = {"h": 0.05, "num_directions": 20, "sampler_rng": np.random.default_rng(SEED_FOR_SPSA)}

kwargs = {
"finite-diff": {"h": 0.05},
"parameter-shift": {},
"spsa": {"h": 0.05, "num_directions": 20},
}

qubit_device_and_diff_method = [
["default.qubit.legacy", "finite-diff", {"h": 0.05}],
["default.qubit.legacy", "parameter-shift", {}],
["default.qubit.legacy", "spsa", spsa_kwargs],
["default.qubit.legacy", "finite-diff"],
["default.qubit.legacy", "parameter-shift"],
["default.qubit.legacy", "spsa"],
]

TOLS = {
Expand All @@ -41,8 +45,16 @@
}


@pytest.fixture
def gradient_kwargs(request):
diff_method = request.node.funcargs["diff_method"]
return kwargs[diff_method] | (
{"sampler_rng": np.random.default_rng(42)} if diff_method == "spsa" else {}
)


@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
@pytest.mark.parametrize("dev_name,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev_name,diff_method", qubit_device_and_diff_method)
class TestReturnWithShotVectors:
"""Class to test the shape of the Jacobian/Hessian with different return types and shot vectors."""

Expand Down Expand Up @@ -369,7 +381,7 @@ def cost(a):

@pytest.mark.slow
@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies_hess)
@pytest.mark.parametrize("dev_name,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev_name,diff_method", qubit_device_and_diff_method)
class TestReturnShotVectorHessian:
"""Class to test the shape of the Hessian with different return types and shot vectors."""

Expand Down Expand Up @@ -553,12 +565,11 @@ def cost2(x):
assert hess.shape == (num_copies, 3, 2, 2)


shots_and_num_copies = [((1000000, 900000, 800000), 3), ((1000000, (900000, 2)), 3)]
shots_and_num_copies = [((30000, 28000, 26000), 3), ((30000, (28000, 2)), 3)]


@pytest.mark.skip("failing in CI for inscrutable reasons, passes locally")
@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
@pytest.mark.parametrize("dev_name,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev_name,diff_method", qubit_device_and_diff_method)
class TestReturnShotVectorIntegration:
"""Tests for the integration of shots with the autograd interface."""

Expand Down
32 changes: 23 additions & 9 deletions tests/interfaces/test_tensorflow_autograph_qnode_shot_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Integration tests for using the TF interface with shot vectors and with a QNode"""
# pylint: disable=too-many-arguments,too-few-public-methods
# pylint: disable=too-many-arguments,too-few-public-methods,redefined-outer-name
import pytest

import pennylane as qml
Expand All @@ -26,11 +26,17 @@
shots_and_num_copies = [((1, (5, 2), 10), 4)]
shots_and_num_copies_hess = [((10, (5, 1)), 2)]

spsa_kwargs = {"h": 10e-2, "num_directions": 30, "sampler_rng": np.random.default_rng(42)}

kwargs = {
"finite-diff": {"h": 10e-2},
"parameter-shift": {},
"spsa": {"h": 10e-2, "num_directions": 30},
}

qubit_device_and_diff_method = [
["default.qubit.legacy", "finite-diff", {"h": 10e-2}],
["default.qubit.legacy", "parameter-shift", {}],
["default.qubit.legacy", "spsa", spsa_kwargs],
["default.qubit.legacy", "finite-diff"],
["default.qubit.legacy", "parameter-shift"],
["default.qubit.legacy", "spsa"],
]

TOLS = {
Expand All @@ -40,8 +46,16 @@
}


@pytest.fixture
def gradient_kwargs(request):
diff_method = request.node.funcargs["diff_method"]
return kwargs[diff_method] | (
{"sampler_rng": np.random.default_rng(42)} if diff_method == "spsa" else {}
)


@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
@pytest.mark.parametrize("dev_name,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev_name,diff_method", qubit_device_and_diff_method)
@pytest.mark.parametrize(
"decorator,interface",
[(tf.function, "tf"), (lambda x: x, "tf-autograph")],
Expand Down Expand Up @@ -337,7 +351,7 @@ def circuit(a):

@pytest.mark.slow
@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies_hess)
@pytest.mark.parametrize("dev_name,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev_name,diff_method", qubit_device_and_diff_method)
@pytest.mark.parametrize(
"decorator,interface",
[(tf.function, "tf"), (lambda x: x, "tf-autograph")],
Expand Down Expand Up @@ -384,11 +398,11 @@ def circuit(x, y):
assert h.shape == (2, num_copies)


shots_and_num_copies = [((1000000, 900000, 800000), 3), ((1000000, (900000, 2)), 3)]
shots_and_num_copies = [((20000, 18000, 16000), 3), ((20000, (18000, 2)), 3)]


@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
@pytest.mark.parametrize("dev_name,diff_method,gradient_kwargs", qubit_device_and_diff_method)
@pytest.mark.parametrize("dev_name,diff_method", qubit_device_and_diff_method)
@pytest.mark.parametrize(
"decorator,interface",
[(tf.function, "tf"), (lambda x: x, "tf-autograph")],
Expand Down
2 changes: 1 addition & 1 deletion tests/interfaces/test_tensorflow_qnode_shot_vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ def circuit(x):
assert hess.shape == (num_copies, 3, 2, 2)


shots_and_num_copies = [((1000000, 900000, 800000), 3), ((1000000, (900000, 2)), 3)]
shots_and_num_copies = [((20000, 18000, 16000), 3), ((20000, (18000, 2)), 3)]


@pytest.mark.parametrize("shots,num_copies", shots_and_num_copies)
Expand Down
Loading