qiskit 1.1.0__cp38-abi3-win_amd64.whl → 1.1.0rc1__cp38-abi3-win_amd64.whl

qiskit/qpy/__init__.py

@@ -11,9 +11,9 @@
 # that they have been altered from the originals.
 
 """
-=====================================
+###########################################################
 QPY serialization (:mod:`qiskit.qpy`)
-=====================================
+###########################################################
 
 .. currentmodule:: qiskit.qpy
 
@@ -32,8 +32,9 @@ which will preserve the Qiskit object exactly but will only work for a single Qi
 version (it is also
 `potentially insecure <https://docs.python.org/3/library/pickle.html#module-pickle>`__).
 
-Basic Usage
-===========
+*********
+Using QPY
+*********
 
 Using QPY is defined to be straightforward and mirror the user API of the
 serializers in Python's standard library, ``pickle`` and ``json``. There are
@@ -247,8 +248,9 @@ of QPY in qiskit-terra 0.18.0.
 
 .. _qpy_format:
 
+**********
 QPY Format
-==========
+**********
 
 The QPY serialization format is a portable cross-platform binary
 serialization format for :class:`~qiskit.circuit.QuantumCircuit` objects in Qiskit. The basic
@@ -301,14 +303,14 @@ circuits in the data.
 .. _qpy_version_12:
 
 Version 12
-----------
+==========
 
 Version 12 adds support for:
 
 * circuits containing memory-owning :class:`.expr.Var` variables.
 
 Changes to HEADER
-~~~~~~~~~~~~~~~~~
+-----------------
 
 The HEADER struct for an individual circuit has added three ``uint32_t`` counts of the input,
 captured and locally declared variables in the circuit.  The new form looks like:
@@ -334,7 +336,7 @@ that, the data continues with custom definitions and instructions as in prior ve
 
 
 EXPR_VAR_DECLARATION
-~~~~~~~~~~~~~~~~~~~~
+--------------------
 
 An ``EXPR_VAR_DECLARATION`` defines an :class:`.expr.Var` instance that is standalone; that is, it
 represents a self-owned memory location rather than wrapping a :class:`.Clbit` or
@@ -365,7 +367,7 @@ Type code  Meaning
 
 
 Changes to EXPR_VAR
-~~~~~~~~~~~~~~~~~~~
+-------------------
 
 The EXPR_VAR variable has gained a new type code and payload, in addition to the pre-existing ones:
 
@@ -398,7 +400,7 @@ Qiskit class            Type code  Payload
 .. _qpy_version_11:
 
 Version 11
-----------
+==========
 
 Version 11 is identical to Version 10 except for the following.
 First, the names in the CUSTOM_INSTRUCTION blocks
@@ -416,7 +418,7 @@ MODIFIER struct.
 .. _modifier_qpy:
 
 MODIFIER
-~~~~~~~~
+--------
 
 This represents :class:`~qiskit.circuit.annotated_operation.Modifier`
 
@@ -439,7 +441,7 @@ operation, and in the third case the field ``power`` represents the power of the
 .. _qpy_version_10:
 
 Version 10
-----------
+==========
 
 Version 10 adds support for:
 
@@ -452,7 +454,7 @@ is introduced, mapped to each symbolic library as follows: ``p`` refers to sympy
 encoding and ``e`` refers to symengine encoding.
 
 Changes to FILE_HEADER
-~~~~~~~~~~~~~~~~~~~~~~
+----------------------
 
 The contents of FILE_HEADER after V10 are defined as a C struct as:
 
@@ -468,7 +470,7 @@ The contents of FILE_HEADER after V10 are defined as a C struct as:
     } FILE_HEADER_V10;
 
 Changes to LAYOUT
-~~~~~~~~~~~~~~~~~
+-----------------
 
 The ``LAYOUT`` struct is updated to have an additional ``input_qubit_count`` field.
 With version 10 the ``LAYOUT`` struct is now:
@@ -491,14 +493,14 @@ and ``_output_qubit_list`` in the :class:`~.TranspileLayout` object are ``None``
 .. _qpy_version_9:
 
 Version 9
----------
+=========
 
 Version 9 adds support for classical :class:`~.expr.Expr` nodes and their associated
 :class:`~.types.Type`\\ s.
 
 
 EXPRESSION
-~~~~~~~~~~
+----------
 
 An :class:`~.expr.Expr` node is represented by a stream of variable-width data.  A node itself is
 represented by (in order in the byte stream):
@@ -530,7 +532,7 @@ Qiskit class            Type code  Payload
 
 
 EXPR_TYPE
-~~~~~~~~~
+---------
 
 A :class:`~.types.Type` is encoded by a single-byte ASCII ``char`` that encodes the kind of type,
 followed by a payload that varies depending on the type.  The defined codes are:
@@ -545,7 +547,7 @@ Qiskit class            Type code  Payload
 
 
 EXPR_VAR
-~~~~~~~~
+--------
 
 This represents a runtime variable of a :class:`~.expr.Var` node.  These are a type code, followed
 by a type-code-specific payload:
@@ -562,7 +564,7 @@ Python class                 Type code  Payload
 
 
 EXPR_VALUE
-~~~~~~~~~~
+----------
 
 This represents a literal object in the classical type system, such as an integer.  Currently there
 are very few such literals.  These are encoded as a type code, followed by a type-code-specific
@@ -580,7 +582,7 @@ Python type  Type code  Payload
 
 
 Changes to INSTRUCTION
-~~~~~~~~~~~~~~~~~~~~~~
+----------------------
 
 To support the use of :class:`~.expr.Expr` nodes in the fields :attr:`.IfElseOp.condition`,
 :attr:`.WhileLoopOp.condition` and :attr:`.SwitchCaseOp.target`, the INSTRUCTION struct is changed
@@ -627,7 +629,7 @@ Value  Effects
 
 
 Changes to INSTRUCTION_PARAM
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+----------------------------
 
 A new type code ``x`` is added that defines an EXPRESSION parameter.
 
@@ -635,7 +637,7 @@ A new type code ``x`` is added that defines an EXPRESSION parameter.
 .. _qpy_version_8:
 
 Version 8
----------
+=========
 
 Version 8 adds support for handling a :class:`~.TranspileLayout` stored in the
 :attr:`.QuantumCircuit.layout` attribute. In version 8 immediately following the
@@ -644,7 +646,7 @@ calibrations block at the end of the circuit payload there is now the
 :class:`~.TranspileLayout` class.
 
 LAYOUT
-~~~~~~
+------
 
 .. code-block:: c
 
@@ -666,7 +668,7 @@ are ``initial_layout_size`` ``INITIAL_LAYOUT_BIT`` structs to define the
 :attr:`.TranspileLayout.initial_layout` attribute.
 
 INITIAL_LAYOUT_BIT
-~~~~~~~~~~~~~~~~~~
+------------------
 
 .. code-block:: c
 
@@ -692,7 +694,7 @@ circuit.
 .. _qpy_version_7:
 
 Version 7
----------
+=========
 
 Version 7 adds support for :class:`.~Reference` instruction and serialization of
 a :class:`.~ScheduleBlock` program while keeping its reference to subroutines::
@@ -738,7 +740,7 @@ condition of an INSTRUCTION field <qpy_instructions>`.
 .. _qpy_version_6:
 
 Version 6
----------
+=========
 
 Version 6 adds support for :class:`.~ScalableSymbolicPulse`. These objects are saved and read
 like `SymbolicPulse` objects, and the class name is added to the data to correctly handle
@@ -765,7 +767,7 @@ identical to :ref:`qpy_version_5`.
 .. _qpy_version_5:
 
 Version 5
----------
+=========
 
 Version 5 changes from :ref:`qpy_version_4` by adding support for :class:`.~ScheduleBlock`
 and changing two payloads the INSTRUCTION metadata payload and the CUSTOM_INSTRUCTION block.
@@ -800,7 +802,7 @@ immediately follows the file header block to represent the program type stored i
 .. _qpy_schedule_block:
 
 SCHEDULE_BLOCK
-~~~~~~~~~~~~~~
+--------------
 
 :class:`~.ScheduleBlock` is first supported in QPY Version 5. This allows
 users to save pulse programs in the QPY binary format as follows:
@@ -825,7 +827,7 @@ no extra option is required to save the schedule block.
 .. _qpy_schedule_block_header:
 
 SCHEDULE_BLOCK_HEADER
-~~~~~~~~~~~~~~~~~~~~~
+---------------------
 
 :class:`~.ScheduleBlock` block starts with the following header:
 
@@ -844,7 +846,7 @@ attached to the schedule.
 .. _qpy_schedule_alignments:
 
 SCHEDULE_BLOCK_ALIGNMENTS
-~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------
 
 Then, alignment context of the schedule block starts with ``char``
 representing the supported context type followed by the :ref:`qpy_sequence` block representing
@@ -862,7 +864,7 @@ stored in the context parameters.
 .. _qpy_schedule_instructions:
 
 SCHEDULE_BLOCK_INSTRUCTIONS
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---------------------------
 
 This alignment block is further followed by ``num_element`` length of block elements which may
 consist of nested schedule blocks and schedule instructions.
@@ -887,7 +889,7 @@ The mapping of type char to the instruction subclass is defined as follows:
 .. _qpy_schedule_operands:
 
 SCHEDULE_BLOCK_OPERANDS
-~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------
 
 The operands of these instances can be serialized through the standard QPY value serialization
 mechanism, however there are special object types that only appear in the schedule operands.
@@ -904,7 +906,7 @@ Special objects start with the following type key:
 .. _qpy_schedule_channel:
 
 CHANNEL
-~~~~~~~
+-------
 
 Channel block starts with channel subtype ``char`` that maps an object data to
 :class:`~qiskit.pulse.channels.Channel` subclass. Mapping is defined as follows:
@@ -921,7 +923,7 @@ The key is immediately followed by the channel index serialized as the INSTRUCTI
 .. _qpy_schedule_waveform:
 
 Waveform
-~~~~~~~~
+--------
 
 Waveform block starts with WAVEFORM header:
 
@@ -943,7 +945,7 @@ INSTRUCTION_PARAM pack struct, which can be string or ``None``.
 .. _qpy_schedule_symbolic_pulse:
 
 SymbolicPulse
-~~~~~~~~~~~~~
+-------------
 
 SymbolicPulse block starts with SYMBOLIC_PULSE header:
 
@@ -977,7 +979,7 @@ INSTRUCTION_PARAM pack struct, which can be string or ``None``.
 .. _qpy_mapping:
 
 MAPPING
-~~~~~~~
+-------
 
 The MAPPING is a representation for arbitrary mapping object. This is a fixed length
 :ref:`qpy_sequence` of key-value pair represented by the MAP_ITEM payload.
@@ -999,7 +1001,7 @@ QPY serializable ``type``.
 .. _qpy_circuit_calibrations:
 
 CIRCUIT_CALIBRATIONS
-~~~~~~~~~~~~~~~~~~~~
+--------------------
 
 The CIRCUIT_CALIBRATIONS block is a dictionary to define pulse calibrations of the custom
 instruction set. This block starts with the following CALIBRATION header:
@@ -1034,7 +1036,7 @@ Finally, :ref:`qpy_schedule_block` payload is packed for each CALIBRATION_DEF en
 .. _qpy_instruction_v5:
 
 INSTRUCTION
-~~~~~~~~~~~
+-----------
 
 The INSTRUCTION block was modified to add two new fields ``num_ctrl_qubits`` and ``ctrl_state``
 which are used to model the :attr:`.ControlledGate.num_ctrl_qubits` and
@@ -1060,7 +1062,7 @@ The rest of the instruction payload is the same. You can refer to
 :ref:`qpy_instructions` for the details of the full payload.
 
 CUSTOM_INSTRUCTION
-~~~~~~~~~~~~~~~~~~
+------------------
 
 The CUSTOM_INSTRUCTION block in QPY version 5 adds a new field
 ``base_gate_size`` which is used to define the size of the
@@ -1103,7 +1105,7 @@ indicate the custom instruction is a custom :class:`~.ControlledGate`.
 .. _qpy_version_4:
 
 Version 4
----------
+=========
 
 Version 4 is identical to :ref:`qpy_version_3` except that it adds 2 new type strings
 to the INSTRUCTION_PARAM struct, ``z`` to represent ``None`` (which is encoded as
@@ -1133,7 +1135,7 @@ part of the circuit or not.
 .. _qpy_range_pack:
 
 RANGE
-~~~~~
+-----
 
 A RANGE is a representation of a ``range`` object. It is defined as:
 
@@ -1148,7 +1150,7 @@ A RANGE is a representation of a ``range`` object. It is defined as:
 .. _qpy_sequence:
 
 SEQUENCE
-~~~~~~~~
+--------
 
 A SEQUENCE is a representation of an arbitrary sequence object. As sequence are just fixed length
 containers of arbitrary python objects their QPY can't fully represent any sequence,
@@ -1170,7 +1172,7 @@ into proper type, e.g. ``tuple``, afterwards.
 .. _qpy_version_3:
 
 Version 3
----------
+=========
 
 Version 3 of the QPY format is identical to :ref:`qpy_version_2` except that it defines
 a struct format to represent a :class:`~qiskit.circuit.library.PauliEvolutionGate`
@@ -1185,7 +1187,7 @@ as follows:
 .. _pauli_evo_qpy:
 
 PAULI_EVOLUTION
-~~~~~~~~~~~~~~~
+---------------
 
 This represents the high level :class:`~qiskit.circuit.library.PauliEvolutionGate`
 
@@ -1213,7 +1215,7 @@ the :class:`.EvolutionSynthesis` class used by the gate.
 .. _qpy_pauli_sum_op:
 
 SPARSE_PAULI_OP_LIST_ELEM
-~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------
 
 This represents an instance of :class:`.SparsePauliOp`.
 
@@ -1237,7 +1239,7 @@ parameters are defined below as :ref:`qpy_param_vector`.
 .. _qpy_param_vector:
 
 PARAMETER_VECTOR_ELEMENT
-~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------
 
 A PARAMETER_VECTOR_ELEMENT represents a :class:`~qiskit.circuit.ParameterVectorElement`
 object the data for a INSTRUCTION_PARAM. The contents of the PARAMETER_VECTOR_ELEMENT are
@@ -1259,7 +1261,7 @@ the parameter's vector name.
 
 
 PARAMETER_EXPR
-~~~~~~~~~~~~~~
+--------------
 
 Additionally, since QPY format version v3 distinguishes between a
 :class:`~qiskit.circuit.Parameter` and :class:`~qiskit.circuit.ParameterVectorElement`
@@ -1313,14 +1315,14 @@ and size will be 0 as the value will just be the same as the key. If
 .. _qpy_version_2:
 
 Version 2
----------
+=========
 
 Version 2 of the QPY format is identical to version 1 except for the HEADER
 section is slightly different. You can refer to the :ref:`qpy_version_1` section
 for the details on the rest of the payload format.
 
 HEADER
-~~~~~~
+------
 
 The contents of HEADER are defined as a C struct are:
 
@@ -1350,10 +1352,10 @@ object  which is represented by a PARAM struct (see below), ``e`` defines a
 .. _qpy_version_1:
 
 Version 1
----------
+=========
 
 HEADER
-~~~~~~
+------
 
 The contents of HEADER as defined as a C struct are:
 
@@ -1373,7 +1375,7 @@ This is immediately followed by ``name_size`` bytes of utf8 data for the name
 of the circuit.
 
 METADATA
-~~~~~~~~
+--------
 
 The METADATA field is a UTF8 encoded JSON string. After reading the HEADER
 (which is a fixed size at the start of the QPY file) and the ``name`` string
@@ -1383,7 +1385,7 @@ the metadata for the circuit.
 .. _qpy_registers:
 
 REGISTERS
-~~~~~~~~~
+---------
 
 The contents of REGISTERS is a number of REGISTER object. If num_registers is
 > 0 then after reading METADATA you read that number of REGISTER structs defined
@@ -1433,7 +1435,7 @@ the register ``qr`` would be a standalone register. While something like::
 .. _qpy_custom_definition:
 
 CUSTOM_DEFINITIONS
-~~~~~~~~~~~~~~~~~~
+------------------
 
 This section specifies custom definitions for any of the instructions in the circuit.
 
@@ -1473,7 +1475,7 @@ it will be a :class:`~qiskit.circuit.Instruction` object.
 .. _qpy_instructions:
 
 INSTRUCTIONS
-~~~~~~~~~~~~
+------------
 
 The contents of INSTRUCTIONS is a list of INSTRUCTION metadata objects
 
@@ -1549,7 +1551,7 @@ and in QPY :ref:`qpy_version_3` ``'v'`` represents a
 .. _qpy_param_struct:
 
 PARAMETER
-~~~~~~~~~
+---------
 
 A PARAMETER represents a :class:`~qiskit.circuit.Parameter` object the data for
 a INSTRUCTION_PARAM. The contents of the PARAMETER are defined as:
@@ -1567,7 +1569,7 @@ parameter name.
 .. _qpy_param_expr:
 
 PARAMETER_EXPR
-~~~~~~~~~~~~~~
+--------------
 
 A PARAMETER_EXPR represents a :class:`~qiskit.circuit.ParameterExpression`
 object that the data for an INSTRUCTION_PARAM. The contents of a PARAMETER_EXPR
@@ -1606,7 +1608,7 @@ Finally, if type is ``i`` it represents an integer which is an ``int64_t``.
 .. _qpy_complex:
 
 COMPLEX
-~~~~~~~
+-------
 
 When representing a double precision complex value in QPY the following
 struct is used:

qiskit/quantum_info/operators/symplectic/pauli.py

@@ -144,13 +144,13 @@ class Pauli(BasePauli):
 
     .. code-block:: python
 
-        P = Pauli('-iXYZ')
+        p = Pauli('-iXYZ')
 
         print('P[0] =', repr(P[0]))
         print('P[1] =', repr(P[1]))
         print('P[2] =', repr(P[2]))
         print('P[:] =', repr(P[:]))
-        print('P[::-1] =', repr(P[::-1]))
+        print('P[::-1] =, repr(P[::-1]))
     """
 
     # Set the max Pauli string size before truncation
@@ -736,11 +736,8 @@ class Pauli(BasePauli):
             n_qubits = num_qubits
         if layout is None:
             layout = list(range(self.num_qubits))
-        else:
-            if any(x < 0 or x >= n_qubits for x in layout):
-                raise QiskitError("Provided layout contains indices outside the number of qubits.")
-            if len(set(layout)) != len(layout):
-                raise QiskitError("Provided layout contains duplicate indices.")
+        elif any(x >= n_qubits for x in layout):
+            raise QiskitError("Provided layout contains indices outside the number of qubits.")
         new_op = type(self)("I" * n_qubits)
         return new_op.compose(self, qargs=layout)
 

qiskit/quantum_info/operators/symplectic/sparse_pauli_op.py

@@ -1139,6 +1139,7 @@ class SparsePauliOp(LinearOp):
                 specified will be applied without any expansion. If layout is
                 None, the operator will be expanded to the given number of qubits.
 
+
         Returns:
             A new :class:`.SparsePauliOp` with the provided layout applied
         """
@@ -1158,15 +1159,10 @@ class SparsePauliOp(LinearOp):
                     f"applied to a {n_qubits} qubit operator"
                 )
             n_qubits = num_qubits
+        if layout is not None and any(x >= n_qubits for x in layout):
+            raise QiskitError("Provided layout contains indices outside the number of qubits.")
         if layout is None:
             layout = list(range(self.num_qubits))
-        else:
-            if any(x < 0 or x >= n_qubits for x in layout):
-                raise QiskitError("Provided layout contains indices outside the number of qubits.")
-            if len(set(layout)) != len(layout):
-                raise QiskitError("Provided layout contains duplicate indices.")
-        if self.num_qubits == 0:
-            return type(self)(["I" * n_qubits] * self.size, self.coeffs)
         new_op = type(self)("I" * n_qubits)
         return new_op.compose(self, qargs=layout)
 

qiskit/result/__init__.py

@@ -17,9 +17,6 @@ Experiment Results (:mod:`qiskit.result`)
 
 .. currentmodule:: qiskit.result
 
-Core classes
-============
-
 .. autosummary::
    :toctree: ../stubs/
 
@@ -27,9 +24,6 @@ Core classes
    ResultError
    Counts
 
-Marginalization
-===============
-
 .. autofunction:: marginal_counts
 .. autofunction:: marginal_distribution
 .. autofunction:: marginal_memory

qiskit/scheduler/__init__.py

@@ -19,22 +19,13 @@ Circuit Scheduler (:mod:`qiskit.scheduler`)
 
 A circuit scheduler compiles a circuit program to a pulse program.
 
-Core API
-========
-
 .. autoclass:: ScheduleConfig
 
 .. currentmodule:: qiskit.scheduler.schedule_circuit
 .. autofunction:: schedule_circuit
 .. currentmodule:: qiskit.scheduler
 
-Pulse scheduling methods
-========================
-
-.. currentmodule:: qiskit.scheduler.methods
-.. autofunction:: as_soon_as_possible
-.. autofunction:: as_late_as_possible
-.. currentmodule:: qiskit.scheduler
+.. automodule:: qiskit.scheduler.methods
 """
 from qiskit.scheduler import schedule_circuit
 from qiskit.scheduler.config import ScheduleConfig

qiskit/scheduler/methods/__init__.py

@@ -10,6 +10,13 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
-"""Scheduling methods."""
+"""
+.. currentmodule:: qiskit.scheduler.methods
+
+Pulse scheduling methods.
+
+.. autofunction:: as_soon_as_possible
+.. autofunction:: as_late_as_possible
+"""
 
 from qiskit.scheduler.methods.basic import as_soon_as_possible, as_late_as_possible

qiskit/synthesis/__init__.py

@@ -99,7 +99,12 @@ Decomposition of general :math:`2^n \times 2^n` unitary matrices for any number
 
 .. autofunction:: qs_decomposition
 
-The Approximate Quantum Compiler is available as the module :mod:`qiskit.synthesis.unitary.aqc`.
+The Approximate Quantum Compiler is available here:
+
+.. autosummary::
+    :toctree: ../stubs/
+
+    qiskit.synthesis.unitary.aqc
 
 One-Qubit Synthesis
 ===================

qiskit/transpiler/passes/__init__.py

@@ -154,10 +154,8 @@ The synthesis transpiler plugin documentation can be found in the
    HLSConfig
    SolovayKitaev
 
-Post Layout
-===========
-
-These are post qubit selection.
+Post Layout (Post transpile qubit selection)
+============================================
 
 .. autosummary::
    :toctree: ../stubs/

qiskit/transpiler/passes/basis/basis_translator.py

@@ -97,8 +97,8 @@ class BasisTranslator(TransformationPass):
 
     When this error occurs it typically means that either the target basis
     is not universal or there are additional equivalence rules needed in the
-    :class:`~.EquivalenceLibrary` instance being used by the
-    :class:`~.BasisTranslator` pass. You can refer to
+    :clas:~.EquivalenceLibrary` instance being used by the
+    :class:~.BasisTranslator` pass. You can refer to
     :ref:`custom_basis_gates` for details on adding custom equivalence rules.
     """
 

qiskit/transpiler/passes/routing/commuting_2q_gate_routing/commuting_2q_gate_router.py

@@ -160,13 +160,8 @@ class Commuting2qGateRouter(TransformationPass):
         if len(dag.qubits) != next(iter(dag.qregs.values())).size:
             raise TranspilerError("Circuit has qubits not contained in the qubit register.")
 
-        # Fix output permutation -- copied from ElidePermutations
-        input_qubit_mapping = {qubit: index for index, qubit in enumerate(dag.qubits)}
-        self.property_set["original_layout"] = Layout(input_qubit_mapping)
-        if self.property_set["original_qubit_indices"] is None:
-            self.property_set["original_qubit_indices"] = input_qubit_mapping
-
         new_dag = dag.copy_empty_like()
+
         current_layout = Layout.generate_trivial_layout(*dag.qregs.values())
 
         # Used to keep track of nodes that do not decompose using swap strategies.
@@ -188,8 +183,6 @@ class Commuting2qGateRouter(TransformationPass):
 
         self._compose_non_swap_nodes(accumulator, current_layout, new_dag)
 
-        self.property_set["virtual_permutation_layout"] = current_layout
-
         return new_dag
 
     def _compose_non_swap_nodes(

qiskit/transpiler/passes/routing/star_prerouting.py

@@ -329,13 +329,13 @@ class StarPreRouting(TransformationPass):
             last_2q_gate = None
 
         int_digits = floor(log10(len(processing_order))) + 1
-        processing_order_index_map = {
-            node: f"a{str(index).zfill(int(int_digits))}"
-            for index, node in enumerate(processing_order)
-        }
+        processing_order_s = set(processing_order)
 
         def tie_breaker_key(node):
-            return processing_order_index_map.get(node, node.sort_key)
+            if node in processing_order_s:
+                return "a" + str(processing_order.index(node)).zfill(int(int_digits))
+            else:
+                return node.sort_key
 
         for node in dag.topological_op_nodes(key=tie_breaker_key):
             block_id = node_to_block_id.get(node, None)