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

Remove quantum engine sampler #5673

Merged
merged 3 commits into from Jul 7, 2022
Merged

Remove quantum engine sampler #5673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64bcc59
Minor updates to development page
dstrain115 Jul 6, 2022
b6dbd1e
t pMerge branch 'master' of https://github.com/quantumlib/Cirq
dstrain115 Jul 7, 2022
d339942
Remove deprecated QuantumEngineSampler
dstrain115 Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion cirq-google/cirq_google/__init__.py
View file
Open in desktop
Expand Up @@ -74,7 +74,6 @@
EngineProcessor,
EngineResult,
ProtoVersion,
QuantumEngineSampler,
ProcessorSampler,
ValidatingSampler,
get_engine,
Expand Down
4 changes: 2 additions & 2 deletions cirq-google/cirq_google/calibration/phased_fsim.py
View file
Open in desktop
Expand Up @@ -544,7 +544,7 @@ class LocalXEBPhasedFSimCalibrationOptions(XEBPhasedFSimCalibrationOptions):
These "Local" options (corresponding to `LocalXEBPhasedFSimCalibrationRequest`) instruct
`cirq_google.run_calibrations` to execute XEB analysis locally (not via the quantum
engine). As such, `run_calibrations` can work with any `cirq.Sampler`, not just
`QuantumEngineSampler`.
`ProcessorSampler`.

Args:
n_library_circuits: The number of distinct, two-qubit random circuits to use in our
Expand Down Expand Up @@ -864,7 +864,7 @@ class LocalXEBPhasedFSimCalibrationRequest(PhasedFSimCalibrationRequest):
A "Local" request (corresponding to `LocalXEBPhasedFSimCalibrationOptions`) instructs
`cirq_google.run_calibrations` to execute XEB analysis locally (not via the quantum
engine). As such, `run_calibrations` can work with any `cirq.Sampler`, not just
`QuantumEngineSampler`.
`ProcessorSampler`.

Attributes:
options: local-XEB-specific characterization options.
Expand Down
2 changes: 0 additions & 2 deletions cirq-google/cirq_google/engine/__init__.py
View file
Open in desktop
Expand Up @@ -67,8 +67,6 @@
estimate_run_sweep_time,
)

from cirq_google.engine.engine_sampler import QuantumEngineSampler

from cirq_google.engine.validating_sampler import ValidatingSampler

from cirq_google.engine.virtual_engine_factory import (
Expand Down
4 changes: 2 additions & 2 deletions cirq-google/cirq_google/engine/engine.py
View file
Open in desktop
Expand Up @@ -763,7 +763,7 @@ def sampler(self, processor_id: Union[str, List[str]]) -> 'cirq_google.Processor
determining which processors may be used when sampling.

Returns:
A `cirq.Sampler` instance (specifically a `engine_sampler.QuantumEngineSampler`
A `cirq.Sampler` instance (specifically a `engine_sampler.ProcessorSampler`
that will send circuits to the Quantum Computing Service
when sampled.
"""
Expand All @@ -776,7 +776,7 @@ def get_sampler(self, processor_id: Union[str, List[str]]) -> 'cirq_google.Proce
processor_id: String identifier of which processor should be used to sample.

Returns:
A `cirq.Sampler` instance (specifically a `engine_sampler.QuantumEngineSampler`
A `cirq.Sampler` instance (specifically a `engine_sampler.ProcessorSampler`
that will send circuits to the Quantum Computing Service
when sampled.

Expand Down
2 changes: 1 addition & 1 deletion cirq-google/cirq_google/engine/engine_processor.py
View file
Open in desktop
Expand Up @@ -106,7 +106,7 @@ def get_sampler(self) -> 'cg.engine.ProcessorSampler':
"""Returns a sampler backed by the engine.

Returns:
A `cirq.Sampler` instance (specifically a `engine_sampler.QuantumEngineSampler`
A `cirq.Sampler` instance (specifically a `engine_sampler.ProcessorSampler`
that will send circuits to the Quantum Computing Service
when sampled.1
"""
Expand Down
127 changes: 0 additions & 127 deletions cirq-google/cirq_google/engine/engine_sampler.py
View file
Open in desktop

This file was deleted.

149 changes: 0 additions & 149 deletions cirq-google/cirq_google/engine/engine_sampler_test.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion cirq-google/cirq_google/json_test_data/spec.py
View file
Open in desktop
Expand Up @@ -49,7 +49,6 @@
'PerQubitDepolarizingWithDampedReadoutNoiseModel',
'SerializingArg',
'THETA_ZETA_GAMMA_FLOQUET_PHASED_FSIM_CHARACTERIZATION',
'QuantumEngineSampler',
'ProcessorSampler',
'ValidatingSampler',
'CouldNotPlaceError',
Expand Down