Skip to content

Migrate contrib json tests #7742

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

Closed
wants to merge 4 commits into from
Closed

Migrate contrib json tests #7742

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
a551848
Migrate contrib JSON tests to test data files and deprecate DEFAULT_C…
RahilJain1366 Nov 7, 2025
2741a75
removing unnecessay files for #7520 fix
RahilJain1366 Nov 7, 2025
580b798
review fixes #7520
RahilJain1366 Nov 8, 2025
c6422ea
CI - wake up now
pavoljuhas Nov 8, 2025
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
20 changes: 16 additions & 4 deletions cirq-core/cirq/contrib/json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"""Functions for JSON serialization and de-serialization for classes in Contrib."""

from __future__ import annotations

import functools

from cirq.protocols.json_serialization import _register_resolver, DEFAULT_RESOLVERS, ObjectFactory
Expand Down Expand Up @@ -38,7 +37,20 @@ def _class_resolver_dictionary() -> dict[str, ObjectFactory]:
]
return {cls.__name__: cls for cls in classes}


DEFAULT_CONTRIB_RESOLVERS = [contrib_class_resolver] + DEFAULT_RESOLVERS

_register_resolver(_class_resolver_dictionary)

DEFAULT_CONTRIB_RESOLVERS = [contrib_class_resolver, *DEFAULT_RESOLVERS]

_DEFAULT_CONTRIB_RESOLVERS_DEPRECATION_MESSAGE = (
'DEFAULT_CONTRIB_RESOLVERS will no longer be supported.'
'Contrib classes are now automatically resolved through the standard JSON resolver.'
'You can remove the "resolvers" parameter from assert_json_roundtrip_works calls.'
)
from cirq import _compat

_compat.deprecate_attributes(
__name__,
{
'DEFAULT_CONTRIB_RESOLVERS': ('v1.8', _DEFAULT_CONTRIB_RESOLVERS_DEPRECATION_MESSAGE),
},
)
33 changes: 0 additions & 33 deletions cirq-core/cirq/contrib/json_test.py
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions cirq-core/cirq/contrib/json_test_data/BayesianNetworkGate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"cirq_type": "BayesianNetworkGate",
"init_probs": [
["q0", 0.125],
["q1", null]
],
"arc_probs": [
["q1", ["q0"], [0.25, 0.5]]
]
}
1 change: 1 addition & 0 deletions cirq-core/cirq/contrib/json_test_data/BayesianNetworkGate.repr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cirq.contrib.bayesian_network.BayesianNetworkGate(init_probs=[('q0', 0.125), ('q1', None)], arc_probs=[('q1', ('q0',), [0.25, 0.5])])
169 changes: 169 additions & 0 deletions cirq-core/cirq/contrib/json_test_data/QuantumVolumeResult.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
{
"cirq_type": "QuantumVolumeResult",
"model_circuit": {
"cirq_type": "Circuit",
"moments": [
{
"cirq_type": "Moment",
"operations": [
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 0
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 1
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 2
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 3
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 4
}
]
}
]
}
]
},
"heavy_set": [
1,
2,
3
],
"compiled_circuit": {
"cirq_type": "Circuit",
"moments": [
{
"cirq_type": "Moment",
"operations": [
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 0
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 1
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 2
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 3
}
]
},
{
"cirq_type": "GateOperation",
"gate": {
"cirq_type": "HPowGate",
"exponent": 1.0,
"global_shift": 0.0
},
"qubits": [
{
"cirq_type": "LineQubit",
"x": 4
}
]
}
]
}
]
},
"sampler_result": 0.1
}
1 change: 1 addition & 0 deletions cirq-core/cirq/contrib/json_test_data/QuantumVolumeResult.repr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cirq.contrib.quantum_volume.QuantumVolumeResult(model_circuit=cirq.Circuit(cirq.Moment(cirq.H(cirq.LineQubit(0)), cirq.H(cirq.LineQubit(1)), cirq.H(cirq.LineQubit(2)), cirq.H(cirq.LineQubit(3)), cirq.H(cirq.LineQubit(4)))), heavy_set=[1, 2, 3], compiled_circuit=cirq.Circuit(cirq.Moment(cirq.H(cirq.LineQubit(0)), cirq.H(cirq.LineQubit(1)), cirq.H(cirq.LineQubit(2)), cirq.H(cirq.LineQubit(3)), cirq.H(cirq.LineQubit(4)))), sampler_result=0.1)
3 changes: 3 additions & 0 deletions cirq-core/cirq/contrib/json_test_data/SwapPermutationGate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cirq_type": "SwapPermutationGate"
}
1 change: 1 addition & 0 deletions cirq-core/cirq/contrib/json_test_data/SwapPermutationGate.repr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cirq.contrib.acquaintance.SwapPermutationGate(swap_gate=cirq.SWAP)
2 changes: 0 additions & 2 deletions cirq-core/cirq/contrib/json_test_data/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,4 @@
should_not_be_serialized=["Unique", "CircuitDag"],
resolver_cache=_class_resolver_dictionary(),
deprecated={},
# TODO: #7520 - create .json and .repr for these so they can be tested here
tested_elsewhere=["QuantumVolumeResult", "SwapPermutationGate", "BayesianNetworkGate"],
)