qiskit 1.4.1__cp39-abi3-win_amd64.whl → 2.0.0rc1__cp39-abi3-win_amd64.whl

qiskit/transpiler/layout.py

@@ -22,7 +22,7 @@ from typing import List
 from dataclasses import dataclass
 
 from qiskit import circuit
-from qiskit.circuit.quantumregister import Qubit, QuantumRegister
+from qiskit.circuit import Qubit, QuantumRegister
 from qiskit.transpiler.exceptions import LayoutError
 from qiskit.converters import isinstanceint
 

qiskit/transpiler/passes/__init__.py

@@ -43,7 +43,6 @@ Routing
 
    BasicSwap
    LookaheadSwap
-   StochasticSwap
    SabreSwap
    Commuting2qGateRouter
    StarPreRouting
@@ -75,7 +74,6 @@ Optimizations
    CollectLinearFunctions
    CollectCliffords
    ConsolidateBlocks
-   CXCancellation
    InverseCancellation
    CommutationAnalysis
    CommutativeCancellation
@@ -86,27 +84,13 @@ Optimizations
    RemoveFinalReset
    HoareOptimizer
    TemplateOptimization
-   EchoRZXWeylDecomposition
    ResetAfterMeasureSimplification
    OptimizeCliffords
    ElidePermutations
-   NormalizeRXAngle
    OptimizeAnnotated
    Split2QUnitaries
    RemoveIdentityEquivalent
-
-Calibration
-=============
-
-.. autosummary::
-   :toctree: ../stubs/
-
-   PulseGates
-   RZXCalibrationBuilder
-   RZXCalibrationBuilderNoEcho
-   RXCalibrationBuilder
-
-.. autofunction:: rzx_templates
+   ContractIdleWiresInControlFlow
 
 Scheduling
 =============
@@ -120,13 +104,8 @@ Scheduling
    PadDynamicalDecoupling
    PadDelay
    ConstrainedReschedule
-   ValidatePulseGates
    InstructionDurationCheck
    SetIOLatency
-   ALAPSchedule
-   ASAPSchedule
-   DynamicalDecoupling
-   AlignMeasures
 
 Circuit Analysis
 ================
@@ -185,7 +164,6 @@ Additional Passes
    MinimumPoint
    ContainsInstruction
    GatesInBasis
-   ConvertConditionsToIfOps
    UnrollForLoops
    FilterOpNodes
 """
@@ -208,7 +186,6 @@ from .layout import SabrePreLayout
 from .routing import BasicSwap
 from .routing import LayoutTransformation
 from .routing import LookaheadSwap
-from .routing import StochasticSwap
 from .routing import SabreSwap
 from .routing import Commuting2qGateRouter
 from .routing import StarPreRouting
@@ -230,7 +207,6 @@ from .optimization import ConsolidateBlocks
 from .optimization import CommutationAnalysis
 from .optimization import CommutativeCancellation
 from .optimization import CommutativeInverseCancellation
-from .optimization import CXCancellation
 from .optimization import Optimize1qGatesSimpleCommutation
 from .optimization import OptimizeSwapBeforeMeasure
 from .optimization import RemoveResetInZeroState
@@ -239,17 +215,16 @@ from .optimization import RemoveDiagonalGatesBeforeMeasure
 from .optimization import HoareOptimizer
 from .optimization import TemplateOptimization
 from .optimization import InverseCancellation
-from .optimization import EchoRZXWeylDecomposition
 from .optimization import CollectAndCollapse
 from .optimization import CollectLinearFunctions
 from .optimization import CollectCliffords
 from .optimization import ResetAfterMeasureSimplification
 from .optimization import OptimizeCliffords
 from .optimization import ElidePermutations
-from .optimization import NormalizeRXAngle
 from .optimization import OptimizeAnnotated
 from .optimization import RemoveIdentityEquivalent
 from .optimization import Split2QUnitaries
+from .optimization import ContractIdleWiresInControlFlow
 
 # circuit analysis
 from .analysis import ResourceEstimation
@@ -271,27 +246,15 @@ from .synthesis import SolovayKitaev
 from .synthesis import SolovayKitaevSynthesis
 from .synthesis import AQCSynthesisPlugin
 
-# calibration
-from .calibration import PulseGates
-from .calibration import RZXCalibrationBuilder
-from .calibration import RZXCalibrationBuilderNoEcho
-from .calibration import RXCalibrationBuilder
-from .calibration.rzx_templates import rzx_templates
-
 # circuit scheduling
 from .scheduling import TimeUnitConversion
 from .scheduling import ALAPScheduleAnalysis
 from .scheduling import ASAPScheduleAnalysis
 from .scheduling import PadDynamicalDecoupling
-from .scheduling import ValidatePulseGates
 from .scheduling import PadDelay
 from .scheduling import ConstrainedReschedule
 from .scheduling import InstructionDurationCheck
 from .scheduling import SetIOLatency
-from .scheduling import ALAPSchedule
-from .scheduling import ASAPSchedule
-from .scheduling import DynamicalDecoupling
-from .scheduling import AlignMeasures
 
 # additional utility passes
 from .utils import CheckMap
@@ -307,6 +270,5 @@ from .utils import Error
 from .utils import RemoveBarriers
 from .utils import ContainsInstruction
 from .utils import GatesInBasis
-from .utils import ConvertConditionsToIfOps
 from .utils import UnrollForLoops
 from .utils import FilterOpNodes

qiskit/transpiler/passes/basis/basis_translator.py

@@ -98,15 +98,16 @@ class BasisTranslator(TransformationPass):
             min_qubits (int): The minimum number of qubits for operations in the input
                 dag to translate.
         """
-
         super().__init__()
         self._equiv_lib = equivalence_library
         self._target_basis = target_basis
-        self._target = target
+        # Bypass target if it doesn't contain any basis gates (i.e. it's a _FakeTarget), as this
+        # not part of the official target model.
+        self._target = target if target is not None and len(target.operation_names) > 0 else None
         self._non_global_operations = None
         self._qargs_with_non_global_operation = {}
         self._min_qubits = min_qubits
-        if target is not None:
+        if self._target is not None:
             self._non_global_operations = self._target.get_non_global_operation_names()
             self._qargs_with_non_global_operation = defaultdict(set)
             for gate in self._non_global_operations:

qiskit/transpiler/passes/basis/decompose.py

@@ -17,7 +17,6 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import Type
 from fnmatch import fnmatch
-import warnings
 
 from qiskit.transpiler.basepasses import TransformationPass
 from qiskit.transpiler.passes.utils import control_flow
@@ -75,11 +74,9 @@ class Decompose(TransformationPass):
             elif getattr(node.op, "definition", None) is None:
                 # if we try to synthesize, turn the node into a DAGCircuit and run HLS
                 if self.apply_synthesis:
-                    # note that node_as_dag does not include the condition, which will
-                    # be propagated in ``substitute_node_with_dag``
                     node_as_dag = _node_to_dag(node)
                     synthesized = hls.run(node_as_dag)
-                    dag.substitute_node_with_dag(node, synthesized, propagate_condition=True)
+                    dag.substitute_node_with_dag(node, synthesized)
 
                 # else: no definition and synthesis not enabled, so we do nothing
             else:
@@ -131,17 +128,6 @@ class Decompose(TransformationPass):
 
 
 def _node_to_dag(node: DAGOpNode) -> DAGCircuit:
-    # Control flow is already handled separately, however that does not capture
-    # c_if, which we are treating here. We explicitly ignore the condition attribute,
-    # which will be handled by ``substitute_node_with_dag``, so we create a copy of the node
-    # and set the condition to None. Once ``c_if`` is removed for 2.0, this block can go, too.
-    with warnings.catch_warnings():
-        warnings.filterwarnings("ignore", category=DeprecationWarning)
-        if getattr(node.op, "condition", None) is not None:
-            op = node.op.copy()
-            op.condition = None
-            node = DAGOpNode(op, node.qargs, node.cargs)
-
     # create new dag and apply the operation
     dag = DAGCircuit()
     dag.add_qubits(node.qargs)

qiskit/transpiler/passes/basis/unroll_3q_or_more.py

@@ -54,13 +54,9 @@ class Unroll3qOrMore(TransformationPass):
             QiskitError: if a 3q+ gate is not decomposable
         """
         for node in dag.multi_qubit_ops():
-            if dag._has_calibration_for(node):
-                continue
 
             if isinstance(node.op, ControlFlowOp):
-                dag.substitute_node(
-                    node, control_flow.map_blocks(self.run, node.op), propagate_condition=False
-                )
+                dag.substitute_node(node, control_flow.map_blocks(self.run, node.op))
                 continue
 
             if self.target is not None:

qiskit/transpiler/passes/basis/unroll_custom_definitions.py

@@ -67,14 +67,15 @@ class UnrollCustomDefinitions(TransformationPass):
         for node in dag.op_nodes():
             if isinstance(node.op, ControlFlowOp):
                 dag.substitute_node(
-                    node, control_flow.map_blocks(self.run, node.op), propagate_condition=False
+                    node,
+                    control_flow.map_blocks(self.run, node.op),
                 )
                 continue
 
             if getattr(node.op, "_directive", False):
                 continue
 
-            if dag._has_calibration_for(node) or len(node.qargs) < self._min_qubits:
+            if len(node.qargs) < self._min_qubits:
                 continue
 
             controlled_gate_open_ctrl = isinstance(node.op, ControlledGate) and node.op._open_ctrl

qiskit/transpiler/passes/layout/apply_layout.py

@@ -67,6 +67,10 @@ class ApplyLayout(TransformationPass):
             new_dag.add_captured_var(var)
         for var in dag.iter_declared_vars():
             new_dag.add_declared_var(var)
+        for stretch in dag.iter_captured_stretches():
+            new_dag.add_captured_stretch(stretch)
+        for stretch in dag.iter_declared_stretches():
+            new_dag.add_declared_stretch(stretch)
         new_dag.metadata = dag.metadata
         new_dag.add_clbits(dag.clbits)
         for creg in dag.cregs.values():

qiskit/transpiler/passes/layout/dense_layout.py

@@ -21,8 +21,6 @@ from qiskit.transpiler.basepasses import AnalysisPass
 from qiskit.transpiler.exceptions import TranspilerError
 from qiskit.transpiler.passes.layout import disjoint_utils
 
-from qiskit.utils import deprecate_arg
-
 from qiskit._accelerate.dense_layout import best_subset
 
 
@@ -38,27 +36,15 @@ class DenseLayout(AnalysisPass):
         by being set in ``property_set``.
     """
 
-    @deprecate_arg(
-        name="backend_prop",
-        since="1.4",
-        package_name="Qiskit",
-        removal_timeline="in Qiskit 2.0",
-        additional_msg="The BackendProperties data structure has been deprecated and will be "
-        "removed in Qiskit 2.0. The `target` input argument should be used instead. "
-        "You can use Target.from_configuration() to build the target from the properties "
-        "object, but in 2.0 you will need to generate a target directly.",
-    )
-    def __init__(self, coupling_map=None, backend_prop=None, target=None):
+    def __init__(self, coupling_map=None, target=None):
         """DenseLayout initializer.
 
         Args:
             coupling_map (Coupling): directed graph representing a coupling map.
-            backend_prop (BackendProperties): backend properties object
             target (Target): A target representing the target backend.
         """
         super().__init__()
         self.coupling_map = coupling_map
-        self.backend_prop = backend_prop
         self.target = target
         self.adjacency_matrix = None
         if target is not None:
@@ -139,8 +125,6 @@ class DenseLayout(AnalysisPass):
         error_mat, use_error = _build_error_matrix(
             coupling_map.size(),
             reverse_index_map,
-            backend_prop=self.backend_prop,
-            coupling_map=self.coupling_map,
             target=self.target,
         )
 
@@ -160,7 +144,7 @@ class DenseLayout(AnalysisPass):
         return best_map
 
 
-def _build_error_matrix(num_qubits, qubit_map, target=None, coupling_map=None, backend_prop=None):
+def _build_error_matrix(num_qubits, qubit_map, target=None):
     error_mat = np.zeros((num_qubits, num_qubits))
     use_error = False
     if target is not None and target.qargs is not None:
@@ -190,25 +174,4 @@ def _build_error_matrix(num_qubits, qubit_map, target=None, coupling_map=None, b
             elif len(qargs) == 2:
                 error_mat[qubit_map[qargs[0]]][qubit_map[qargs[1]]] = max_error
                 use_error = True
-    elif backend_prop and coupling_map:
-        error_dict = {
-            tuple(gate.qubits): gate.parameters[0].value
-            for gate in backend_prop.gates
-            if len(gate.qubits) == 2
-        }
-        for edge in coupling_map.get_edges():
-            gate_error = error_dict.get(edge)
-            if gate_error is not None:
-                if edge[0] not in qubit_map or edge[1] not in qubit_map:
-                    continue
-                error_mat[qubit_map[edge[0]]][qubit_map[edge[1]]] = gate_error
-                use_error = True
-        for index, qubit_data in enumerate(backend_prop.qubits):
-            if index not in qubit_map:
-                continue
-            for item in qubit_data:
-                if item.name == "readout_error":
-                    mapped_index = qubit_map[index]
-                    error_mat[mapped_index][mapped_index] = item.value
-                    use_error = True
     return error_mat, use_error

qiskit/transpiler/passes/layout/full_ancilla_allocation.py

@@ -92,10 +92,10 @@ class FullAncillaAllocation(AnalysisPass):
 
         if idle_physical_qubits:
             if self.ancilla_name in dag.qregs:
-                save_prefix = QuantumRegister.prefix
-                QuantumRegister.prefix = self.ancilla_name
-                qreg = QuantumRegister(len(idle_physical_qubits))
-                QuantumRegister.prefix = save_prefix
+                qreg = QuantumRegister(
+                    len(idle_physical_qubits),
+                    name=f"{self.ancilla_name}{QuantumRegister.instances_count + 1}",
+                )
             else:
                 qreg = QuantumRegister(len(idle_physical_qubits), name=self.ancilla_name)
 

qiskit/transpiler/passes/layout/sabre_layout.py

@@ -39,7 +39,7 @@ from qiskit._accelerate.sabre import sabre_layout_and_routing, Heuristic, Neighb
 from qiskit.transpiler.passes.routing.sabre_swap import _build_sabre_dag, _apply_sabre_result
 from qiskit.transpiler.target import Target
 from qiskit.transpiler.coupling import CouplingMap
-from qiskit.utils.parallel import CPU_COUNT
+from qiskit.utils import default_num_processes
 
 logger = logging.getLogger(__name__)
 
@@ -176,11 +176,11 @@ class SabreLayout(TransformationPass):
         self.max_iterations = max_iterations
         self.trials = swap_trials
         if swap_trials is None:
-            self.swap_trials = CPU_COUNT
+            self.swap_trials = default_num_processes()
         else:
             self.swap_trials = swap_trials
         if layout_trials is None:
-            self.layout_trials = CPU_COUNT
+            self.layout_trials = default_num_processes()
         else:
             self.layout_trials = layout_trials
         self.skip_routing = skip_routing
@@ -315,6 +315,10 @@ class SabreLayout(TransformationPass):
             mapped_dag.add_captured_var(var)
         for var in dag.iter_declared_vars():
             mapped_dag.add_declared_var(var)
+        for stretch in dag.iter_captured_stretches():
+            mapped_dag.add_captured_stretch(stretch)
+        for stretch in dag.iter_declared_stretches():
+            mapped_dag.add_declared_stretch(stretch)
         mapped_dag.global_phase = dag.global_phase
         self.property_set["original_qubit_indices"] = {
             bit: index for index, bit in enumerate(dag.qubits)

qiskit/transpiler/passes/layout/vf2_layout.py

@@ -24,7 +24,6 @@ from qiskit.transpiler.basepasses import AnalysisPass
 from qiskit.transpiler.exceptions import TranspilerError
 from qiskit.transpiler.passes.layout import vf2_utils
 
-from qiskit.utils import deprecate_arg
 
 logger = logging.getLogger(__name__)
 
@@ -74,16 +73,6 @@ class VF2Layout(AnalysisPass):
     ``vf2_avg_error_map`` key in the property set when :class:`~.VF2Layout` is run.
     """
 
-    @deprecate_arg(
-        name="properties",
-        since="1.4",
-        package_name="Qiskit",
-        removal_timeline="in Qiskit 2.0",
-        additional_msg="The BackendProperties data structure has been deprecated and will be "
-        "removed in Qiskit 2.0. The `target` input argument should be used instead. "
-        "You can use Target.from_configuration() to build the target from the properties "
-        "object, but in 2.0 you will need to generate a target directly.",
-    )
     def __init__(
         self,
         coupling_map=None,
@@ -91,7 +80,6 @@ class VF2Layout(AnalysisPass):
         seed=None,
         call_limit=None,
         time_limit=None,
-        properties=None,
         max_trials=None,
         target=None,
     ):
@@ -105,16 +93,13 @@ class VF2Layout(AnalysisPass):
             call_limit (int): The number of state visits to attempt in each execution of
                 VF2.
             time_limit (float): The total time limit in seconds to run ``VF2Layout``
-            properties (BackendProperties): The backend properties for the backend. If
-                :meth:`~qiskit.providers.models.BackendProperties.readout_error` is available
-                it is used to score the layout.
             max_trials (int): The maximum number of trials to run VF2 to find
                 a layout. If this is not specified the number of trials will be limited
                 based on the number of edges in the interaction graph or the coupling graph
                 (whichever is larger) if no other limits are set. If set to a value <= 0 no
                 limit on the number of trials will be set.
             target (Target): A target representing the backend device to run ``VF2Layout`` on.
-                If specified it will supersede a set value for ``properties`` and
+                If specified it will supersede a set value for
                 ``coupling_map`` if the :class:`.Target` contains connectivity constraints. If the value
                 of ``target`` models an ideal backend without any constraints then the value of
                 ``coupling_map``
@@ -132,7 +117,6 @@ class VF2Layout(AnalysisPass):
             self.coupling_map = target_coupling_map
         else:
             self.coupling_map = coupling_map
-        self.properties = properties
         self.strict_direction = strict_direction
         self.seed = seed
         self.call_limit = call_limit
@@ -146,9 +130,7 @@ class VF2Layout(AnalysisPass):
             raise TranspilerError("coupling_map or target must be specified.")
         self.avg_error_map = self.property_set["vf2_avg_error_map"]
         if self.avg_error_map is None:
-            self.avg_error_map = vf2_utils.build_average_error_map(
-                self.target, self.properties, self.coupling_map
-            )
+            self.avg_error_map = vf2_utils.build_average_error_map(self.target, self.coupling_map)
 
         result = vf2_utils.build_interaction_graph(dag, self.strict_direction)
         if result is None: