qiskit 1.2.0__cp38-abi3-macosx_10_9_universal2.whl → 1.2.0rc1__cp38-abi3-macosx_10_9_universal2.whl

qiskit/providers/models/__init__.py

@@ -38,52 +38,26 @@ Classes
    GateProperties
    Nduv
 """
-# pylint: disable=undefined-all-variable
-__all__ = [
-    "BackendConfiguration",
-    "PulseBackendConfiguration",
-    "QasmBackendConfiguration",
-    "UchannelLO",
-    "GateConfig",
-    "BackendProperties",
-    "GateProperties",
-    "Nduv",
-    "BackendStatus",
-    "JobStatus",
-    "PulseDefaults",
-    "Command",
-]
-
-import importlib
 import warnings
 
-
-_NAME_MAP = {
-    # public object name mapped to containing module
-    "BackendConfiguration": "qiskit.providers.models.backendconfiguration",
-    "PulseBackendConfiguration": "qiskit.providers.models.backendconfiguration",
-    "QasmBackendConfiguration": "qiskit.providers.models.backendconfiguration",
-    "UchannelLO": "qiskit.providers.models.backendconfiguration",
-    "GateConfig": "qiskit.providers.models.backendconfiguration",
-    "BackendProperties": "qiskit.providers.models.backendproperties",
-    "GateProperties": "qiskit.providers.models.backendproperties",
-    "Nduv": "qiskit.providers.models.backendproperties",
-    "BackendStatus": "qiskit.providers.models.backendstatus",
-    "JobStatus": "qiskit.providers.models.jobstatus",
-    "PulseDefaults": "qiskit.providers.models.pulsedefaults",
-    "Command": "qiskit.providers.models.pulsedefaults",
-}
-
-
-def __getattr__(name):
-    if (module_name := _NAME_MAP.get(name)) is not None:
-        warnings.warn(
-            "qiskit.providers.models is deprecated since Qiskit 1.2 and will be "
-            "removed in Qiskit 2.0. With the removal of Qobj, there is no need for these "
-            "schema-conformant objects. If you still need to use them, it could be because "
-            "you are using a BackendV1, which is also deprecated in favor of BackendV2.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return getattr(importlib.import_module(module_name), name)
-    raise AttributeError(f"module 'qiskit.providers.models' has no attribute '{name}'")
+from .backendconfiguration import (
+    BackendConfiguration,
+    PulseBackendConfiguration,
+    QasmBackendConfiguration,
+    UchannelLO,
+    GateConfig,
+)
+from .backendproperties import BackendProperties, GateProperties, Nduv
+from .backendstatus import BackendStatus
+from .jobstatus import JobStatus
+from .pulsedefaults import PulseDefaults, Command
+
+
+warnings.warn(
+    "qiskit.providers.models is deprecated since Qiskit 1.2 and will be removed in Qiskit 2.0."
+    "With the removal of Qobj, there is no need for these schema-conformant objects. If you still need"
+    "to use them, it could be because you are using a BackendV1, which is also deprecated in favor"
+    "of BackendV2",
+    DeprecationWarning,
+    2,
+)

qiskit/qasm3/exporter.py

@@ -626,13 +626,7 @@ class QASM3Builder:
             if builtin in _BUILTIN_GATES:
                 # It's built into the langauge; we don't need to re-add it.
                 continue
-            try:
-                self.symbols.register_gate_without_definition(builtin, None)
-            except QASM3ExporterError as exc:
-                raise QASM3ExporterError(
-                    f"Cannot use '{builtin}' as a basis gate for the reason in the prior exception."
-                    " Consider renaming the gate if needed, or omitting this basis gate if not."
-                ) from exc
+            self.symbols.register_gate_without_definition(builtin, None)
 
         header = ast.Header(ast.Version("3.0"), list(self.build_includes()))
 

qiskit/qpy/__init__.py

@@ -774,7 +774,7 @@ In addition, new payload MAP_ITEM is defined to implement the :ref:`qpy_mapping`
 
 With the support of :class:`.~ScheduleBlock`, now :class:`~.QuantumCircuit` can be
 serialized together with :attr:`~.QuantumCircuit.calibrations`, or
-`Pulse Gates <https://docs.quantum.ibm.com/guides/pulse>`_.
+`Pulse Gates <https://docs.quantum.ibm.com/build/pulse>`_.
 In QPY version 5 and above, :ref:`qpy_circuit_calibrations` payload is
 packed after the :ref:`qpy_instructions` block.
 

qiskit/quantum_info/operators/symplectic/sparse_pauli_op.py

@@ -937,7 +937,7 @@ class SparsePauliOp(LinearOp):
                 array (the default).
             force_serial: if ``True``, use an unthreaded implementation, regardless of the state of
                 the `Qiskit threading-control environment variables
-                <https://docs.quantum.ibm.com/guides/configure-qiskit-local#environment-variables>`__.
+                <https://docs.quantum.ibm.com/start/configure-qiskit-local#environment-variables>`__.
                 By default, this will use threaded parallelism over the available CPUs.
 
         Returns:

qiskit/transpiler/passes/basis/basis_translator.py

@@ -162,8 +162,7 @@ class BasisTranslator(TransformationPass):
         # If the source basis is a subset of the target basis and we have no circuit
         # instructions on qargs that have non-global operations there is nothing to
         # translate and we can exit early.
-        source_basis_names = {x[0] for x in source_basis}
-        if source_basis_names.issubset(target_basis) and not qargs_local_source_basis:
+        if source_basis.issubset(target_basis) and not qargs_local_source_basis:
             return dag
 
         logger.info(

qiskit/transpiler/passes/optimization/consolidate_blocks.py

@@ -28,7 +28,6 @@ from qiskit.transpiler.passmanager import PassManager
 from qiskit.transpiler.passes.synthesis import unitary_synthesis
 from qiskit.circuit.controlflow import CONTROL_FLOW_OP_NAMES
 from qiskit._accelerate.convert_2q_block_matrix import blocks_to_matrix
-from qiskit.exceptions import QiskitError
 
 from .collect_1q_runs import Collect1qRuns
 from .collect_2q_blocks import Collect2qBlocks
@@ -126,12 +125,7 @@ class ConsolidateBlocks(TransformationPass):
                         qc.append(nd.op, [q[block_index_map[i]] for i in nd.qargs])
                     unitary = UnitaryGate(Operator(qc), check_input=False)
                 else:
-                    try:
-                        matrix = blocks_to_matrix(block, block_index_map)
-                    except QiskitError:
-                        # If building a matrix for the block fails we should not consolidate it
-                        # because there is nothing we can do with it.
-                        continue
+                    matrix = blocks_to_matrix(block, block_index_map)
                     unitary = UnitaryGate(matrix, check_input=False)
 
                 max_2q_depth = 20  # If depth > 20, there will be 1q gates to consolidate.

qiskit/transpiler/passes/scheduling/alignments/pulse_gate_validation.py

@@ -31,7 +31,7 @@ class ValidatePulseGates(AnalysisPass):
 
     In Qiskit SDK, we can define the pulse-level implementation of custom quantum gate
     instructions, as a `pulse gate
-    <https://docs.quantum.ibm.com/guides/pulse>`__,
+    <https://docs.quantum.ibm.com/build/pulse>`__,
     thus user gates should satisfy all waveform memory constraints imposed by the backend.
 
     This pass validates all attached calibration entries and raises ``TranspilerError`` to

qiskit/transpiler/passes/scheduling/padding/dynamical_decoupling.py

@@ -20,7 +20,7 @@ from qiskit.circuit import Gate, ParameterExpression, Qubit
 from qiskit.circuit.delay import Delay
 from qiskit.circuit.library.standard_gates import IGate, UGate, U3Gate
 from qiskit.circuit.reset import Reset
-from qiskit.dagcircuit import DAGCircuit, DAGNode, DAGInNode, DAGOpNode, DAGOutNode
+from qiskit.dagcircuit import DAGCircuit, DAGNode, DAGInNode, DAGOpNode
 from qiskit.quantum_info.operators.predicates import matrix_equal
 from qiskit.synthesis.one_qubit import OneQubitEulerDecomposer
 from qiskit.transpiler.exceptions import TranspilerError
@@ -331,7 +331,8 @@ class PadDynamicalDecoupling(BasePadding):
         if time_interval % self._alignment != 0:
             raise TranspilerError(
                 f"Time interval {time_interval} is not divisible by alignment {self._alignment} "
-                f"between {_format_node(prev_node)} and {_format_node(next_node)}."
+                f"between DAGNode {prev_node.name} on qargs {prev_node.qargs} and {next_node.name} "
+                f"on qargs {next_node.qargs}."
             )
 
         if not self.__is_dd_qubit(dag.qubits.index(qubit)):
@@ -429,10 +430,3 @@ class PadDynamicalDecoupling(BasePadding):
             else:
                 params.append(p)
         return tuple(params)
-
-
-def _format_node(node: DAGNode) -> str:
-    """Util to format the DAGNode, DAGInNode, and DAGOutNode."""
-    if isinstance(node, (DAGInNode, DAGOutNode)):
-        return f"{node.__class__.__name__} on qarg {node.wire}"
-    return f"DAGNode {node.name} on qargs {node.qargs}"

qiskit/transpiler/passes/synthesis/unitary_synthesis.py

@@ -54,7 +54,7 @@ from qiskit.circuit.library.standard_gates import (
 from qiskit.converters import circuit_to_dag, dag_to_circuit
 from qiskit.dagcircuit.dagcircuit import DAGCircuit, DAGOpNode
 from qiskit.exceptions import QiskitError
-from qiskit.providers.models.backendproperties import BackendProperties
+from qiskit.providers.models import BackendProperties
 from qiskit.quantum_info import Operator
 from qiskit.synthesis.one_qubit import one_qubit_decompose
 from qiskit.synthesis.two_qubit.xx_decompose import XXDecomposer, XXEmbodiments

qiskit/transpiler/preset_passmanagers/builtin_plugins.py

@@ -14,6 +14,7 @@
 
 import os
 
+from qiskit.circuit import Instruction
 from qiskit.transpiler.passes.optimization.split_2q_unitaries import Split2QUnitaries
 from qiskit.transpiler.passmanager import PassManager
 from qiskit.transpiler.exceptions import TranspilerError
@@ -65,6 +66,7 @@ from qiskit.circuit.library.standard_gates import (
     CYGate,
     SXGate,
     SXdgGate,
+    get_standard_gate_name_mapping,
 )
 from qiskit.utils.parallel import CPU_COUNT
 from qiskit import user_config
@@ -171,16 +173,58 @@ class DefaultInitPassManager(PassManagerStagePlugin):
                 )
             )
             init.append(CommutativeCancellation())
-            init.append(Collect2qBlocks())
-            init.append(ConsolidateBlocks())
-            # If approximation degree is None that indicates a request to approximate up to the
-            # error rates in the target. However, in the init stage we don't yet know the target
-            # qubits being used to figure out the fidelity so just use the default fidelity parameter
-            # in this case.
-            if pass_manager_config.approximation_degree is not None:
-                init.append(Split2QUnitaries(pass_manager_config.approximation_degree))
-            else:
-                init.append(Split2QUnitaries())
+            # skip peephole optimization before routing if target basis gate set is discrete,
+            # i.e. only consists of Cliffords that an user might want to keep
+            # use rz, sx, x, cx as basis, rely on physical optimziation to fix everything later one
+            stdgates = get_standard_gate_name_mapping()
+
+            def _is_one_op_non_discrete(ops):
+                """Checks if one operation in `ops` is not discrete, i.e. is parameterizable
+                Args:
+                    ops (List(Operation)): list of operations to check
+                Returns
+                    True if at least one operation in `ops` is not discrete, False otherwise
+                """
+                found_one_continuous_gate = False
+                for op in ops:
+                    if isinstance(op, str):
+                        if op in _discrete_skipped_ops:
+                            continue
+                        op = stdgates.get(op, None)
+
+                    if op is not None and op.name in _discrete_skipped_ops:
+                        continue
+
+                    if op is None or not isinstance(op, Instruction):
+                        return False
+
+                    if len(op.params) > 0:
+                        found_one_continuous_gate = True
+                return found_one_continuous_gate
+
+            target = pass_manager_config.target
+            basis = pass_manager_config.basis_gates
+            # consolidate gates before routing if the user did not specify a discrete basis gate, i.e.
+            # * no target or basis gate set has been specified
+            # * target has been specified, and we have one non-discrete gate in the target's spec
+            # * basis gates have been specified, and we have one non-discrete gate in that set
+            do_consolidate_blocks_init = target is None and basis is None
+            do_consolidate_blocks_init |= target is not None and _is_one_op_non_discrete(
+                target.operations
+            )
+            do_consolidate_blocks_init |= basis is not None and _is_one_op_non_discrete(basis)
+
+            if do_consolidate_blocks_init:
+                init.append(Collect2qBlocks())
+                init.append(ConsolidateBlocks())
+                # If approximation degree is None that indicates a request to approximate up to the
+                # error rates in the target. However, in the init stage we don't yet know the target
+                # qubits being used to figure out the fidelity so just use the default fidelity parameter
+                # in this case.
+                if pass_manager_config.approximation_degree is not None:
+                    init.append(Split2QUnitaries(pass_manager_config.approximation_degree))
+                else:
+                    init.append(Split2QUnitaries())
         else:
             raise TranspilerError(f"Invalid optimization level {optimization_level}")
         return init

qiskit/visualization/bloch.py

@@ -50,7 +50,6 @@ __all__ = ["Bloch"]
 
 import math
 import os
-import re
 import numpy as np
 import matplotlib
 import matplotlib.pyplot as plt
@@ -61,47 +60,6 @@ from mpl_toolkits.mplot3d.art3d import Patch3D
 from .utils import matplotlib_close_if_inline
 
 
-# This version pattern is taken from the pypa packaging project:
-# https://github.com/pypa/packaging/blob/21.3/packaging/version.py#L223-L254
-# which is dual licensed Apache 2.0 and BSD see the source for the original
-# authors and other details
-VERSION_PATTERN = (
-    "^"
-    + r"""
-    v?
-    (?:
-        (?:(?P<epoch>[0-9]+)!)?                           # epoch
-        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
-        (?P<pre>                                          # pre-release
-            [-_\.]?
-            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
-            [-_\.]?
-            (?P<pre_n>[0-9]+)?
-        )?
-        (?P<post>                                         # post release
-            (?:-(?P<post_n1>[0-9]+))
-            |
-            (?:
-                [-_\.]?
-                (?P<post_l>post|rev|r)
-                [-_\.]?
-                (?P<post_n2>[0-9]+)?
-            )
-        )?
-        (?P<dev>                                          # dev release
-            [-_\.]?
-            (?P<dev_l>dev)
-            [-_\.]?
-            (?P<dev_n>[0-9]+)?
-        )?
-    )
-    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
-"""
-    + "$"
-)
-VERSION_PATTERN_REGEX = re.compile(VERSION_PATTERN, re.VERBOSE | re.IGNORECASE)
-
-
 class Arrow3D(Patch3D, FancyArrowPatch):
     """Makes a fancy arrow"""
 
@@ -461,8 +419,7 @@ class Bloch:
             self.fig = plt.figure(figsize=self.figsize)
 
         if not self._ext_axes:
-            version_match = VERSION_PATTERN_REGEX.search(matplotlib.__version__)
-            if tuple(int(x) for x in version_match.group("release").split(".")) >= (3, 4, 0):
+            if tuple(int(x) for x in matplotlib.__version__.split(".")) >= (3, 4, 0):
                 self.axes = Axes3D(
                     self.fig, azim=self.view[0], elev=self.view[1], auto_add_to_figure=False
                 )

qiskit/visualization/dag_visualization.py

@@ -174,13 +174,10 @@ def dag_drawer(dag, scale=0.7, filename=None, style="color"):
                         label = register_bit_labels.get(
                             node.wire, f"q_{dag.find_bit(node.wire).index}"
                         )
-                    elif isinstance(node.wire, Clbit):
+                    else:
                         label = register_bit_labels.get(
                             node.wire, f"c_{dag.find_bit(node.wire).index}"
                         )
-                    else:
-                        label = str(node.wire.name)
-
                     n["label"] = label
                     n["color"] = "black"
                     n["style"] = "filled"
@@ -190,12 +187,10 @@ def dag_drawer(dag, scale=0.7, filename=None, style="color"):
                         label = register_bit_labels.get(
                             node.wire, f"q[{dag.find_bit(node.wire).index}]"
                         )
-                    elif isinstance(node.wire, Clbit):
+                    else:
                         label = register_bit_labels.get(
                             node.wire, f"c[{dag.find_bit(node.wire).index}]"
                         )
-                    else:
-                        label = str(node.wire.name)
                     n["label"] = label
                     n["color"] = "black"
                     n["style"] = "filled"
@@ -208,10 +203,8 @@ def dag_drawer(dag, scale=0.7, filename=None, style="color"):
             e = {}
             if isinstance(edge, Qubit):
                 label = register_bit_labels.get(edge, f"q_{dag.find_bit(edge).index}")
-            elif isinstance(edge, Clbit):
-                label = register_bit_labels.get(edge, f"c_{dag.find_bit(edge).index}")
             else:
-                label = str(edge.name)
+                label = register_bit_labels.get(edge, f"c_{dag.find_bit(edge).index}")
             e["label"] = label
             return e
 

{qiskit-1.2.0.dist-info → qiskit-1.2.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qiskit
-Version: 1.2.0
+Version: 1.2.0rc1
 Summary: An open-source SDK for working with quantum computers at the level of extended quantum circuits, operators, and primitives.
 Author-email: Qiskit Development Team <qiskit@us.ibm.com>
 License: Apache 2.0
@@ -28,29 +28,29 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: rustworkx>=0.15.0
-Requires-Dist: numpy<3,>=1.17
-Requires-Dist: scipy>=1.5
-Requires-Dist: sympy>=1.3
-Requires-Dist: dill>=0.3
-Requires-Dist: python-dateutil>=2.8.0
-Requires-Dist: stevedore>=3.0.0
+Requires-Dist: rustworkx >=0.15.0
+Requires-Dist: numpy <3,>=1.17
+Requires-Dist: scipy >=1.5
+Requires-Dist: sympy >=1.3
+Requires-Dist: dill >=0.3
+Requires-Dist: python-dateutil >=2.8.0
+Requires-Dist: stevedore >=3.0.0
 Requires-Dist: typing-extensions
-Requires-Dist: symengine>=0.11
+Requires-Dist: symengine >=0.11
 Provides-Extra: all
-Requires-Dist: qiskit[crosstalk-pass,csp-layout-pass,qasm3-import,visualization]; extra == "all"
+Requires-Dist: qiskit[crosstalk-pass,csp-layout-pass,qasm3-import,visualization] ; extra == 'all'
 Provides-Extra: crosstalk-pass
-Requires-Dist: z3-solver>=4.7; extra == "crosstalk-pass"
+Requires-Dist: z3-solver >=4.7 ; extra == 'crosstalk-pass'
 Provides-Extra: csp-layout-pass
-Requires-Dist: python-constraint>=1.4; extra == "csp-layout-pass"
+Requires-Dist: python-constraint >=1.4 ; extra == 'csp-layout-pass'
 Provides-Extra: qasm3-import
-Requires-Dist: qiskit-qasm3-import>=0.1.0; extra == "qasm3-import"
+Requires-Dist: qiskit-qasm3-import >=0.1.0 ; extra == 'qasm3-import'
 Provides-Extra: visualization
-Requires-Dist: matplotlib>=3.3; extra == "visualization"
-Requires-Dist: pydot; extra == "visualization"
-Requires-Dist: Pillow>=4.2.1; extra == "visualization"
-Requires-Dist: pylatexenc>=1.4; extra == "visualization"
-Requires-Dist: seaborn>=0.9.0; extra == "visualization"
+Requires-Dist: matplotlib >=3.3 ; extra == 'visualization'
+Requires-Dist: pydot ; extra == 'visualization'
+Requires-Dist: Pillow >=4.2.1 ; extra == 'visualization'
+Requires-Dist: pylatexenc >=1.4 ; extra == 'visualization'
+Requires-Dist: seaborn >=0.9.0 ; extra == 'visualization'
 
 # Qiskit
 
@@ -77,7 +77,7 @@ For more details on how to use Qiskit, refer to the documentation located here:
 ## Installation
 
 > [!WARNING]
-> Do not try to upgrade an existing Qiskit 0.* environment to Qiskit 1.0 in-place. [Read more](https://docs.quantum.ibm.com/migration-guides/qiskit-1.0-installation).
+> Do not try to upgrade an existing Qiskit 0.* environment to Qiskit 1.0 in-place. [Read more](https://docs.quantum.ibm.com/api/migration-guides/qiskit-1.0-installation).
 
 We encourage installing Qiskit via ``pip``:
 
@@ -87,7 +87,7 @@ pip install qiskit
 
 Pip will handle all dependencies automatically and you will always install the latest (and well-tested) version.
 
-To install from source, follow the instructions in the [documentation](https://docs.quantum.ibm.com/guides/install-qiskit-source).
+To install from source, follow the instructions in the [documentation](https://docs.quantum.ibm.com/start/install-qiskit-source).
 
 ## Create your first quantum program in Qiskit