-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 1.0!!! * 1.0!!!! * add test tools from qiskit <1.0 * fix linting issues for tests * fix transpilation error * fix small issues and deprecate echo_num for ARCs * Fix: Include type for updated numpy routine in _to_cpx_matrix * expand error message * focus on delays in test --------- Co-authored-by: grace-harper <[email protected]> Co-authored-by: Drew Vandeth <[email protected]>
- Loading branch information
1 parent
c580e06
commit e08b232
Showing
66 changed files
with
2,681 additions
and
84 deletions.
There are no files selected for viewing
This file contains 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 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 |
---|---|---|
|
@@ -24,6 +24,7 @@ | |
linear, | ||
operators, | ||
structures, | ||
test, | ||
utils, | ||
) | ||
|
||
|
This file contains 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 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,27 @@ | ||
# This code is part of Qiskit. | ||
# | ||
# (C) Copyright IBM 2017, 2018. | ||
# | ||
# This code is licensed under the Apache License, Version 2.0. You may | ||
# obtain a copy of this license in the LICENSE.txt file in the root directory | ||
# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0. | ||
# | ||
# Any modifications or derivative works of this code must retain this | ||
# copyright notice, and modified files need to carry a notice indicating | ||
# that they have been altered from the originals. | ||
|
||
"""Functionality and helpers for testing Qiskit.""" | ||
|
||
import warnings | ||
from .base import QiskitTestCase | ||
from .decorators import requires_aer_provider, online_test, slow_test | ||
from .reference_circuits import ReferenceCircuits | ||
from .utils import Path | ||
|
||
warnings.warn( | ||
"The `qiskit.test` module is deprecated since Qiskit 0.46, and will be removed in Qiskit 1.0." | ||
" This module was internal to Qiskit's test suite; if you absolutely require any of its" | ||
" functionality, consider vendoring the code into your own project.", | ||
DeprecationWarning, | ||
stacklevel=2, | ||
) |
This file contains 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,125 @@ | ||
# This code is part of Qiskit. | ||
# | ||
# (C) Copyright IBM 2022. | ||
# | ||
# This code is licensed under the Apache License, Version 2.0. You may | ||
# obtain a copy of this license in the LICENSE.txt file in the root directory | ||
# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0. | ||
# | ||
# Any modifications or derivative works of this code must retain this | ||
# copyright notice, and modified files need to carry a notice indicating | ||
# that they have been altered from the originals. | ||
|
||
"""Utility methods for canonicalising various Qiskit objects, to help with testing.""" | ||
|
||
import threading | ||
|
||
from qiskit.circuit import ( | ||
BreakLoopOp, | ||
CircuitInstruction, | ||
ContinueLoopOp, | ||
ControlFlowOp, | ||
ForLoopOp, | ||
Parameter, | ||
QuantumCircuit, | ||
) | ||
|
||
|
||
class _CanonicalParametersIterator: | ||
"""An object that, when iterated through, will produce the same sequence of parameters as every | ||
other instance of this iterator.""" | ||
|
||
__parameters = [] | ||
__mutex = threading.Lock() | ||
|
||
def __init__(self): | ||
self._counter = 0 | ||
|
||
def __iter__(self): | ||
return self | ||
|
||
def __next__(self): | ||
with self.__mutex: | ||
if len(self.__parameters) >= self._counter: | ||
param = Parameter(f"_canonicalization_loop_{self._counter}") | ||
self.__parameters.append(param) | ||
out = self.__parameters[self._counter] | ||
self._counter += 1 | ||
return out | ||
|
||
|
||
def canonicalize_control_flow(circuit: QuantumCircuit) -> QuantumCircuit: | ||
"""Canonicalize all control-flow operations in a circuit. | ||
This is not an efficient operation, and does not affect any properties of the circuit. Its | ||
intent is to normalise parts of circuits that have a non-deterministic construction. These are | ||
the ordering of bit arguments in control-flow blocks output by the builder interface, and | ||
automatically generated ``for``-loop variables. | ||
The canonical form sorts the bits in the arguments of these operations so that they always | ||
appear in the order they were originally added to the outer-most circuit. For-loop variables | ||
are re-bound into new, cached auto-generated ones.""" | ||
params = iter(_CanonicalParametersIterator()) | ||
base_bit_order = {bit: i for i, bit in enumerate(circuit.qubits)} | ||
base_bit_order.update((bit, i) for i, bit in enumerate(circuit.clbits)) | ||
|
||
def worker(circuit, bit_map=None): | ||
if bit_map is None: | ||
bit_map = {bit: bit for bits in (circuit.qubits, circuit.clbits) for bit in bits} | ||
|
||
def bit_key(bit): | ||
return base_bit_order[bit_map[bit]] | ||
|
||
# This isn't quite QuantumCircuit.copy_empty_like because of the bit reordering. | ||
out = QuantumCircuit( | ||
sorted(circuit.qubits, key=bit_key), | ||
sorted(circuit.clbits, key=bit_key), | ||
*circuit.qregs, | ||
*circuit.cregs, | ||
name=circuit.name, | ||
global_phase=circuit.global_phase, | ||
metadata=circuit.metadata, | ||
) | ||
for instruction in circuit.data: | ||
new_instruction = instruction | ||
# Control-flow operations associated bits in the instruction arguments with bits in the | ||
# circuit blocks just by sequencing. All blocks must have the same width. | ||
if isinstance(new_instruction.operation, ControlFlowOp): | ||
op = new_instruction.operation | ||
first_block = op.blocks[0] | ||
inner_bit_map = dict( | ||
zip(first_block.qubits, (bit_map[bit] for bit in new_instruction.qubits)) | ||
) | ||
inner_bit_map.update( | ||
zip(first_block.clbits, (bit_map[bit] for bit in new_instruction.clbits)) | ||
) | ||
new_instruction = CircuitInstruction( | ||
operation=op.replace_blocks( | ||
[worker(block, inner_bit_map) for block in op.blocks] | ||
), | ||
qubits=sorted(new_instruction.qubits, key=bit_key), | ||
clbits=sorted(new_instruction.clbits, key=bit_key), | ||
) | ||
elif isinstance(new_instruction.operation, (BreakLoopOp, ContinueLoopOp)): | ||
new_instruction = new_instruction.replace( | ||
qubits=sorted(new_instruction.qubits, key=bit_key), | ||
clbits=sorted(new_instruction.clbits, key=bit_key), | ||
) | ||
# For for loops specifically, the control-flow builders generate a loop parameter if one | ||
# is needed but not explicitly supplied. We want the parameters to compare equal, so we | ||
# replace them with those from a shared list. | ||
if isinstance(new_instruction.operation, ForLoopOp): | ||
old_op = new_instruction.operation | ||
indexset, loop_param, body = old_op.params | ||
if loop_param is not None: | ||
new_loop_param = next(params) | ||
new_op = ForLoopOp( | ||
indexset, | ||
new_loop_param, | ||
body.assign_parameters({loop_param: new_loop_param}), | ||
) | ||
new_instruction = new_instruction.replace(operation=new_op) | ||
out._append(new_instruction) | ||
return out | ||
|
||
return worker(circuit) |
Oops, something went wrong.