Merge branch 'main' into restore_arm64_macos

doichanj · Aug 15, 2024 · 41f10af · 41f10af
2 parents 7b6d69e + 44bd7eb
commit 41f10af
Show file tree

Hide file tree

Showing 30 changed files with 1,407 additions and 624 deletions.
diff --git a/.github/workflows/unit-tests-latest-qiskit.yml b/.github/workflows/unit-tests-latest-qiskit.yml
@@ -39,7 +39,7 @@ jobs:
         shell: bash
       - name: Install dependencies and Aer
         run: |
-          python -m pip install -U setuptools wheel
+          python -m pip install -U setuptools setuptools-rust wheel
           python -m pip install -U \
             -c constraints.txt \
             -r requirements-dev.txt \

diff --git a/qiskit_aer/backends/aer_compiler.py b/qiskit_aer/backends/aer_compiler.py
@@ -42,7 +42,6 @@
 from qiskit.transpiler.passes import Decompose
 
 
-from qiskit.qobj import QobjExperimentHeader
 from qiskit_aer.aererror import AerError
 from qiskit_aer.noise import NoiseModel
 
@@ -62,7 +61,7 @@
     AerConfig,
 )
 
-from .backend_utils import circuit_optypes
+from .backend_utils import circuit_optypes, CircuitHeader
 from ..library.control_flow_instructions import AerMark, AerJump, AerStore
 
 
@@ -682,7 +681,7 @@ def assemble_circuit(circuit: QuantumCircuit, basis_gates=None):
         for inst in circuit.data
     )
 
-    header = QobjExperimentHeader(
+    header = CircuitHeader(
         n_qubits=num_qubits,
         qreg_sizes=qreg_sizes,
         memory_slots=num_memory,

diff --git a/qiskit_aer/backends/aer_simulator.py b/qiskit_aer/backends/aer_simulator.py
@@ -15,14 +15,15 @@
 
 import copy
 import logging
+from warnings import warn
 from qiskit.providers import convert_to_target
 from qiskit.providers.options import Options
-from qiskit.providers.models import QasmBackendConfiguration
 from qiskit.providers.backend import BackendV2, BackendV1
-from qiskit.transpiler.target import target_to_backend_properties
 
 from ..version import __version__
 from .aerbackend import AerBackend, AerError
+from .backendconfiguration import AerBackendConfiguration
+from .backendproperties import target_to_backend_properties
 from .backend_utils import (
     cpp_execute_circuits,
     cpp_execute_qobj,
@@ -685,7 +686,6 @@ class AerSimulator(AerBackend):
         "simulator": True,
         "local": True,
         "conditional": True,
-        "open_pulse": False,
         "memory": True,
         "max_shots": int(1e6),
         "description": "A C++ QasmQobj simulator with noise",
@@ -728,7 +728,7 @@ def __init__(
 
         # Default configuration
         if configuration is None:
-            configuration = QasmBackendConfiguration.from_dict(AerSimulator._DEFAULT_CONFIGURATION)
+            configuration = AerBackendConfiguration.from_dict(AerSimulator._DEFAULT_CONFIGURATION)
 
         # set backend name from method and device in option
         if "from" not in configuration.backend_name:
@@ -846,29 +846,30 @@ def from_backend(cls, backend, **options):
             else:
                 description = backend.description
 
-            configuration = QasmBackendConfiguration(
+            configuration = AerBackendConfiguration(
                 backend_name=f"aer_simulator_from({backend.name})",
                 backend_version=backend.backend_version,
                 n_qubits=backend.num_qubits,
                 basis_gates=backend.operation_names,
                 gates=[],
-                local=True,
-                simulator=True,
-                conditional=True,
-                open_pulse=False,
-                memory=False,
                 max_shots=int(1e6),
-                coupling_map=(
-                    None if backend.coupling_map is None else list(backend.coupling_map.get_edges())
-                ),
+                coupling_map=list(backend.coupling_map.get_edges()),
                 max_experiments=backend.max_circuits,
                 description=description,
             )
             properties = target_to_backend_properties(backend.target)
             target = backend.target
         elif isinstance(backend, BackendV1):
+            # BackendV1 will be removed in Qiskit 2.0, so we will remove this soon
+            warn(
+                " from_backend using V1 based backend is deprecated as of Aer 0.15"
+                " and will be removed no sooner than 3 months from that release"
+                " date. Please use backends based on V2.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
             # Get configuration and properties from backend
-            configuration = copy.copy(backend.configuration())
+            configuration = backend.configuration()
             properties = copy.copy(backend.properties())
 
             # Customize configuration name