Merge from main

Qiskit · Jan 12, 2024 · 8346968 · 8346968
1 parent d75c1c7
commit 8346968
Show file tree

Hide file tree

Showing 43 changed files with 2,170 additions and 538 deletions.
diff --git a/docs/apidoc/tools.rst b/docs/apidoc/tools.rst
diff --git a/qiskit/assembler/assemble_circuits.py b/qiskit/assembler/assemble_circuits.py
@@ -34,7 +34,7 @@
     converters,
     QobjHeader,
 )
-from qiskit.tools.parallel import parallel_map
+from qiskit.utils.parallel import parallel_map
 
 
 PulseLibrary = Dict[str, List[complex]]

diff --git a/qiskit/circuit/quantumcircuit.py b/qiskit/circuit/quantumcircuit.py
@@ -1955,7 +1955,9 @@ def add_register(self, *regs: Register | int | Sequence[Bit]) -> None:
 
     def add_bits(self, bits: Iterable[Bit]) -> None:
         """Add Bits to the circuit."""
-        duplicate_bits = set(self._qubit_indices).union(self._clbit_indices).intersection(bits)
+        duplicate_bits = {
+            bit for bit in bits if bit in self._qubit_indices or bit in self._clbit_indices
+        }
         if duplicate_bits:
             raise CircuitError(f"Attempted to add bits found already in circuit: {duplicate_bits}")
 

diff --git a/qiskit/compiler/scheduler.py b/qiskit/compiler/scheduler.py
@@ -25,7 +25,7 @@
 from qiskit.providers.backend import Backend
 from qiskit.scheduler import ScheduleConfig
 from qiskit.scheduler.schedule_circuit import schedule_circuit
-from qiskit.tools.parallel import parallel_map
+from qiskit.utils.parallel import parallel_map
 
 logger = logging.getLogger(__name__)
 

diff --git a/qiskit/passmanager/passmanager.py b/qiskit/passmanager/passmanager.py
@@ -21,7 +21,7 @@
 
 import dill
 
-from qiskit.tools.parallel import parallel_map
+from qiskit.utils.parallel import parallel_map
 from .base_tasks import Task, PassManagerIR
 from .exceptions import PassManagerError
 from .flow_controllers import FlowControllerLinear

diff --git a/qiskit/tools/visualization.py → qiskit/primitives/containers/__init__.py b/qiskit/tools/visualization.py → qiskit/primitives/containers/__init__.py
@@ -1,6 +1,6 @@
 # This code is part of Qiskit.
 #
-# (C) Copyright IBM 2017, 2019.
+# (C) Copyright IBM 2023.
 #
 # 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
@@ -10,7 +10,12 @@
 # copyright notice, and modified files need to carry a notice indicating
 # that they have been altered from the originals.
 
-# pylint: disable=unused-wildcard-import,missing-module-docstring,wildcard-import
+"""
+Data containers for primitives.
+"""
 
-# NOTE(mtreinish): Import public API here to maintain backwards compat
-from qiskit.visualization import *
+from .bindings_array import BindingsArray
+from .data_bin import make_data_bin
+from .observables_array import ObservablesArray
+from .primitive_result import PrimitiveResult
+from .pub_result import PubResult