Skip to content

QVM - require gate_times_ns argument in noise_properties_from_calibration #7644

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

Merged
merged 1 commit into from
Sep 11, 2025
Merged

QVM - require gate_times_ns argument in noise_properties_from_calibration #7644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 3 additions & 11 deletions cirq-google/cirq_google/engine/calibration_to_noise_properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

from typing import Literal, TYPE_CHECKING

from cirq import _compat, ops
from cirq import ops
from cirq.devices import noise_utils
from cirq_google import engine, ops as cg_ops
from cirq_google.devices import google_noise_properties
Expand Down Expand Up @@ -93,7 +93,7 @@ def _unpack_2q_from_calibration(
def noise_properties_from_calibration(
calibration: engine.Calibration,
*,
gate_times_ns: dict[type[cirq.Gate], float] | Literal['legacy'] | None = None,
gate_times_ns: dict[type[cirq.Gate], float] | Literal['legacy'],
zphase_data: util.ZPhaseDataType | None = None,
) -> google_noise_properties.GoogleNoiseProperties:
"""Translates between `cirq_google.Calibration` and NoiseProperties.
Expand Down Expand Up @@ -126,15 +126,7 @@ def noise_properties_from_calibration(
A `cirq_google.GoogleNoiseProperties` which represents the error
present in the given Calibration object.
"""
if gate_times_ns is None:
_compat._warn_or_error(
'Function noise_properties_from_calibration was called without the '
'gate_times_ns argument.\n'
'This argument will become mandatory in cirq_google v1.7.\n'
'To continue using the old gate times default, please pass the "legacy" value.'
)
gate_times_ns = DEFAULT_GATE_NS
elif gate_times_ns == 'legacy':
if gate_times_ns == 'legacy':
gate_times_ns = DEFAULT_GATE_NS
if not isinstance(gate_times_ns, dict):
raise TypeError(
Expand Down
12 changes: 5 additions & 7 deletions cirq-google/cirq_google/engine/calibration_to_noise_properties_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,11 @@ def test_noise_properties_from_calibration():
syc_angles,
iswap_angles,
)
with cirq.testing.assert_deprecated(
"noise_properties_from_calibration was called without the gate_times_ns", deadline="v1.7"
):
prop = cirq_google.noise_properties_from_calibration(calibration)
assert prop == cirq_google.noise_properties_from_calibration(
calibration, gate_times_ns="legacy"
)
prop = cirq_google.noise_properties_from_calibration(calibration, gate_times_ns="legacy")

assert prop.gate_times_ns[cirq.ZPowGate] == 25
assert prop.gate_times_ns[cirq.ResetChannel] == 250
assert prop.gate_times_ns[cirq.FSimGate] == 32

for i, q in enumerate(qubits):
assert np.isclose(
Expand Down