-
Notifications
You must be signed in to change notification settings - Fork 126
QCQMC Part 6: Add BluePrint #351
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
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
3e38a11
Add some tests for unit test.
fdmalone bcb3d4f
Tidy up.
fdmalone aa622a5
Converters.
fdmalone 9285e4d
Test slow test solution.
fdmalone b5d88a0
Add tests for qubit_maps.
fdmalone a50a58f
Update tests.
fdmalone 9a29bc2
Add trial tests.
fdmalone b60599e
Add generators test.
fdmalone caa0046
Add missing changes.
fdmalone 4330f42
Remove debug code.
fdmalone 7817f73
Remove prints.
fdmalone 64017f8
Remove redundant test docstrings.
fdmalone 58fadff
Add blueprint.
fdmalone 08dd528
Skip slow test.
fdmalone 7ddae81
Move conftest and skip another slow test.
fdmalone 33ed0cd
Fix serialization.
fdmalone 7227dfc
Fix _json_dict_.
fdmalone 2585997
Merge branch 'master' into qcqmc-6
fdmalone d66c1e1
Remove comparator.
fdmalone fa71795
Fix merge errors.
fdmalone 30ea62b
Address review comments.
fdmalone 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 hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[pytest] | ||
markers = | ||
slow: marks tests as slow (deselect with '--skipslow') |
This file contains hidden or 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 hidden or 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 |
---|---|---|
@@ -0,0 +1,324 @@ | ||
# Copyright 2024 Google | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
import itertools | ||
from typing import Dict, Iterable, Iterator, List, Optional, Sequence, Tuple, Union | ||
|
||
import attrs | ||
import cirq | ||
import numpy as np | ||
import quaff | ||
|
||
from recirq.qcqmc import config, data, trial_wf, for_refactor | ||
|
||
BlueprintParams = Union["BlueprintParamsTrialWf", "BlueprintParamsRobustShadow"] | ||
|
||
|
||
def apply_optimizer_suite_0(circuit: cirq.Circuit) -> cirq.Circuit: | ||
"""A circuit optimization routine that tries to merge gates. | ||
|
||
Args: | ||
circuit: The circuit to optimize | ||
|
||
Returns: | ||
The gate optimized circuit. | ||
""" | ||
|
||
circuit = cirq.expand_composite(circuit) | ||
circuit = cirq.align_left(circuit) | ||
circuit = cirq.drop_empty_moments(circuit) | ||
|
||
return circuit | ||
|
||
|
||
def _to_tuple_of_tuples( | ||
x: Iterable[Iterable[cirq.Qid]], | ||
) -> Tuple[Tuple[cirq.Qid, ...], ...]: | ||
# required for dataclass type conversion | ||
return tuple(tuple(_) for _ in x) | ||
|
||
|
||
def _to_tuple(x: Iterable[cirq.Circuit]) -> Tuple[cirq.Circuit, ...]: | ||
# required for dataclass type conversion | ||
return tuple(x) | ||
|
||
|
||
def _get_truncated_cliffords( | ||
n_cliffords: int, qubit_partition: Sequence[Sequence[cirq.Qid]], seed: int | ||
) -> Iterator[List[quaff.TruncatedCliffordGate]]: | ||
"""Gets the gates (not the circuits) for applying the random circuit for shadow tomography. | ||
|
||
Args: | ||
n_cliffords: The number of random cliffords to use during shadow tomography. | ||
qubit_partition: For shadow tomography, we partition the qubits into these | ||
disjoint partitions. For example, we can partition into single-qubit partitions | ||
and sample from random single-qubit cliffords or put all qubits in one partition | ||
and sample from random n-qubit cliffords. | ||
seed: A random number seed. | ||
|
||
Returns: | ||
An iterator to a list of truncated clifford gates. | ||
""" | ||
rng = np.random.default_rng(seed) | ||
|
||
for _ in range(n_cliffords): | ||
yield [ | ||
quaff.TruncatedCliffordGate.random(len(part), rng) | ||
for part in qubit_partition | ||
] | ||
|
||
|
||
def _get_resolvers( | ||
n_cliffords: int, qubit_partition: Sequence[Sequence[cirq.Qid]], seed: int | ||
) -> Iterator[Dict[str, np.integer]]: | ||
"""Gets the resolvers for a parameterized shadow tomography circuit. | ||
|
||
These are used in running the experiment / simulation. | ||
|
||
Args: | ||
n_cliffords: The number of random cliffords to use during shadow tomography. | ||
qubit_partition: For shadow tomography, we partition the qubits into these | ||
disjoint partitions. For example, we can partition into single-qubit partitions | ||
and sample from random single-qubit cliffords or put all qubits in one partition | ||
and sample from random n-qubit cliffords. | ||
Returns: | ||
An iterator to a circuit resolver. | ||
""" | ||
truncated_cliffords = _get_truncated_cliffords( | ||
n_cliffords=n_cliffords, qubit_partition=qubit_partition, seed=seed | ||
) | ||
|
||
for clifford_set in truncated_cliffords: | ||
yield quaff.get_truncated_cliffords_resolver(clifford_set) | ||
|
||
|
||
@attrs.frozen | ||
class BlueprintParamsTrialWf(data.Params): | ||
"""Class for storing the parameters that specify a BlueprintData. | ||
|
||
This stage of the experiment concerns itself with the Hardware-specific concerns | ||
of compilation and shadow tomography implementation. | ||
|
||
Args: | ||
name: `Params` name for this experiment. | ||
trial_wf_params: A back-reference to the `TrialWavefunctionParams` | ||
used in this experiment. | ||
n_cliffords: The number of random cliffords to use during shadow tomography. | ||
qubit_partition: For shadow tomography, we partition the qubits into these | ||
disjoint partitions. For example, we can partition into single-qubit partitions | ||
and sample from random single-qubit cliffords or put all qubits in one partition | ||
and sample from random n-qubit cliffords. | ||
seed: The random seed used for clifford generation. | ||
optimizer_suite: How to compile/optimize circuits for running on real devices. Can | ||
be `0` or `1` corresponding to the functions `apply_optimizer_suite_x`. | ||
path_prefix: A path string to prefix the blueprint output directory with. | ||
""" | ||
|
||
name: str | ||
trial_wf_params: trial_wf.TrialWavefunctionParams | ||
n_cliffords: int | ||
qubit_partition: Tuple[Tuple[cirq.Qid, ...], ...] = attrs.field( | ||
converter=_to_tuple_of_tuples | ||
) | ||
seed: int = 0 | ||
optimizer_suite: int = 0 | ||
path_prefix: str = "" | ||
|
||
@property | ||
def path_string(self) -> str: | ||
return self.path_prefix + config.OUTDIRS.DEFAULT_BLUEPRINT_DIRECTORY + self.name | ||
|
||
@property | ||
def qubits_jordan_wigner_order(self) -> Tuple[cirq.GridQubit, ...]: | ||
"""A helper that gets the qubits for this Blueprint.""" | ||
return self.trial_wf_params.qubits_jordan_wigner_ordered | ||
|
||
@property | ||
def qubits_linearly_connected(self) -> Tuple[cirq.GridQubit, ...]: | ||
"""A helper that gets the qubits for this Blueprint.""" | ||
return self.trial_wf_params.qubits_linearly_connected | ||
|
||
@property | ||
def qubits(self) -> Tuple[cirq.Qid, ...]: | ||
return self.trial_wf_params.qubits_linearly_connected | ||
|
||
def _json_dict_(self): | ||
simple_dict = attrs.asdict(self) | ||
simple_dict["trial_wf_params"] = self.trial_wf_params | ||
return simple_dict | ||
|
||
|
||
@attrs.frozen | ||
class BlueprintData(data.Data): | ||
"""Data resulting from the "Blueprint" phase of the experiment. | ||
|
||
This stage of the experiment concerns itself with the Hardware-specific concerns | ||
of compilation and shadow tomography implementation. | ||
|
||
Args: | ||
params: A back-reference to the `BlueprintParams` used to create this `Data`. | ||
compiled_circuit: A circuit suitable for running on the hardware including the | ||
ansatz preparation segment and shadow-tomography rotations (i.e. layers of | ||
cliffords). Its clifford layers are parameterized for efficient execution, | ||
so you must combine this with `resolvers`. | ||
parameterized_clifford_circuits: A parameterized circuit that corresponds to | ||
just the Clifford part of the shadow tomography circuit. Useful for | ||
inverting the channel when combined with resolvers. | ||
resolvers: A list of `cirq.ParamResolver` corresponding to the (outer) list of | ||
random cliffords. When combined with the parameterized `compiled_circuit` and | ||
`cirq.Sampler.run_sweep`, this will execute all the different random clifford | ||
circuits. | ||
""" | ||
|
||
params: BlueprintParams | ||
compiled_circuit: cirq.Circuit | ||
parameterized_clifford_circuits: Tuple[cirq.Circuit] = attrs.field( | ||
converter=_to_tuple | ||
) | ||
resolvers: List[cirq.ParamResolverOrSimilarType] | ||
|
||
def _json_dict_(self): | ||
simple_dict = attrs.asdict(self) | ||
simple_dict["params"] = self.params | ||
|
||
@property | ||
def resolved_clifford_circuits(self) -> Iterator[Tuple[cirq.Circuit, ...]]: | ||
"""An iterator of resolved clifford circuits.""" | ||
for resolver in self.resolvers: | ||
yield tuple( | ||
cirq.resolve_parameters(clifford, resolver) | ||
for clifford in self.parameterized_clifford_circuits | ||
) | ||
|
||
@classmethod | ||
def build_blueprint_from_base_circuit( | ||
cls, params: BlueprintParams, *, base_circuit: cirq.AbstractCircuit | ||
) -> "BlueprintData": | ||
"""Builds a BlueprintData from BlueprintParams. | ||
|
||
Args: | ||
params: The experiment blueprint parameters. | ||
base_circuit: The circuit to shadow tomographize. | ||
|
||
Returns: | ||
A constructed BlueprintData object. | ||
""" | ||
resolvers = list( | ||
_get_resolvers(params.n_cliffords, params.qubit_partition, params.seed) | ||
) | ||
|
||
parameterized_clifford_ops: Iterable[cirq.OP_TREE] = ( | ||
quaff.get_parameterized_truncated_cliffords_ops(params.qubit_partition) | ||
) | ||
|
||
parameterized_clifford_circuits = tuple( | ||
cirq.expand_composite( | ||
cirq.Circuit(ops), no_decomp=for_refactor.is_expected_elementary_cirq_op | ||
) | ||
for ops in parameterized_clifford_ops | ||
) | ||
parameterized_clifford_circuit = sum( | ||
parameterized_clifford_circuits, cirq.Circuit() | ||
) | ||
|
||
compiled_circuit = cirq.Circuit([base_circuit, parameterized_clifford_circuit]) | ||
|
||
circuit_with_measurement = compiled_circuit + cirq.Circuit( | ||
cirq.measure(*params.qubits, key="all") | ||
) | ||
|
||
apply_optimizer_suite = {0: apply_optimizer_suite_0}[params.optimizer_suite] | ||
|
||
optimized_circuit = apply_optimizer_suite(circuit_with_measurement) | ||
|
||
return BlueprintData( | ||
params=params, | ||
compiled_circuit=optimized_circuit, | ||
parameterized_clifford_circuits=parameterized_clifford_circuits, | ||
resolvers=resolvers, # type: ignore | ||
) | ||
|
||
@classmethod | ||
def build_blueprint_from_dependencies( | ||
cls, | ||
params: BlueprintParams, | ||
dependencies: Optional[Dict[data.Params, data.Data]] = None, | ||
) -> "BlueprintData": | ||
"""Builds a BlueprintData from BlueprintParams using the dependency-injection workflow system. | ||
|
||
Args: | ||
params: The blueprint parameters | ||
dependencies: The dependencies used to construct the base circuit. If | ||
BlueprintParamsRobustShadow are passed for params then the | ||
base_circuit used for shadow tomography will be an empty circuit. | ||
Otherwise it will be built from the trial wavefunction's | ||
superposition circuit. | ||
|
||
Returns: | ||
A constructed BlueprintData object. | ||
""" | ||
if isinstance(params, BlueprintParamsRobustShadow): | ||
base_circuit = cirq.Circuit() | ||
elif isinstance(params, BlueprintParamsTrialWf): | ||
assert dependencies is not None, "Provide trial_wf" | ||
assert params.trial_wf_params in dependencies, "trial_wf dependency" | ||
trial_wf_inst = dependencies[params.trial_wf_params] | ||
assert isinstance(trial_wf_inst, trial_wf.TrialWavefunctionData) | ||
base_circuit = trial_wf_inst.superposition_circuit | ||
else: | ||
raise ValueError(f"Bad param type {type(params)}") | ||
|
||
return BlueprintData.build_blueprint_from_base_circuit( | ||
params=params, base_circuit=base_circuit | ||
) | ||
|
||
|
||
@attrs.frozen(repr=False) | ||
class BlueprintParamsRobustShadow(data.Params): | ||
"""Class for storing the parameters that specify a BlueprintData. | ||
|
||
Args: | ||
n_cliffords: The number of random cliffords to use during shadow tomography. | ||
qubit_partition: For shadow tomography, we partition the qubits into these | ||
disjoint partitions. For example, we can partition into single-qubit partitions | ||
and sample from random single-qubit cliffords or put all qubits in one partition | ||
and sample from random n-qubit cliffords. | ||
seed: A random number seed. | ||
optimizer_suite: The optimizer suite to use. | ||
""" | ||
|
||
name: str | ||
n_cliffords: int | ||
qubit_partition: Tuple[Tuple[cirq.Qid, ...], ...] | ||
seed: int = 0 | ||
optimizer_suite: int = 0 | ||
|
||
def __post_init__(self): | ||
"""A little helper to ensure that tuples end up as tuples after loading.""" | ||
object.__setattr__( | ||
self, | ||
"qubit_partition", | ||
tuple(tuple(inner for inner in thing) for thing in self.qubit_partition), | ||
) | ||
|
||
@property | ||
def path_string(self) -> str: | ||
return config.OUTDIRS.DEFAULT_BLUEPRINT_DIRECTORY + self.name | ||
|
||
@property | ||
def qubits(self) -> Tuple[cirq.Qid, ...]: | ||
"""The cirq qubits.""" | ||
return tuple(itertools.chain(*self.qubit_partition)) | ||
|
||
def _json_dict_(self): | ||
return attrs.asdict(self) |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.