Merge branch 'main' into restore_arm64_macos

.github/workflows/tests.yml

@@ -231,7 +231,6 @@ jobs:
       - name: Run Tests
         run: |
           set -e
-          pip check
           rm -rf qiskit_aer
           stestr run --slowest
         shell: bash

qiskit_aer/backends/aer_compiler.py

@@ -123,7 +123,8 @@ def _inline_initialize(self, circ, optype):
         if isinstance(optype, set) and Initialize not in optype:
             return circ
 
-        for inst, _, _ in circ.data:
+        for datum in circ.data:
+            inst = datum.operation
             if isinstance(inst, Initialize) and (
                 (not isinstance(inst.params[0], complex)) or (len(inst.params) == 1)
             ):
@@ -133,7 +134,8 @@ def _inline_initialize(self, circ, optype):
 
         new_circ = circ.copy()
         new_circ.data = []
-        for inst, qargs, cargs in circ.data:
+        for datum in circ.data:
+            inst, qargs, cargs = datum.operation, datum.qubits, datum.clbits
             if isinstance(inst, Initialize) and (
                 (not isinstance(inst.params[0], complex)) or (len(inst.params) == 1)
             ):

qiskit_aer/backends/aerbackend.py

@@ -615,7 +615,8 @@ def _assemble_noise_model(self, circuits, optypes, **run_options):
             ):
                 updated_circ = False
                 new_data = []
-                for inst, qargs, cargs in circ.data:
+                for datum in circ.data:
+                    inst, qargs, cargs = datum.operation, datum.qubits, datum.clbits
                     if isinstance(inst, QuantumChannelInstruction):
                         updated_circ = True
                         if not updated_noise:

qiskit_aer/primitives/sampler.py

@@ -22,14 +22,14 @@
 from qiskit.circuit import ParameterExpression, QuantumCircuit
 from qiskit.compiler import transpile
 from qiskit.exceptions import QiskitError
-from qiskit.primitives import BaseSampler, SamplerResult
+from qiskit.primitives import BaseSamplerV1, SamplerResult
 from qiskit.primitives.utils import final_measurement_mapping, init_circuit
 from qiskit.result import QuasiDistribution
 
 from .. import AerSimulator
 
 
-class Sampler(BaseSampler):
+class Sampler(BaseSamplerV1):
     """
     Aer implementation of Sampler class.
 

test/terra/backends/test_parameterized_qobj.py

@@ -20,6 +20,7 @@
 
 from test.terra import common
 
+import qiskit
 from qiskit.compiler import assemble, transpile
 from qiskit.circuit import QuantumCircuit, Parameter
 from test.terra.reference.ref_save_expval import (
@@ -72,6 +73,7 @@ def parameterized_qobj(
         qobj = assemble(circuits, backend=backend, shots=shots, parameterizations=params)
         return qobj
 
+    @unittest.skipIf(qiskit.__version__.startswith("1.2"), "skip Qiskit 1.2 tentatively")
     def test_parameterized_qobj_qasm_save_expval(self):
         """Test parameterized qobj with Expectation Value snapshot and qasm simulator."""
         shots = 1000
@@ -95,6 +97,7 @@ def test_parameterized_qobj_qasm_save_expval(self):
                 for label in labels:
                     self.assertAlmostEqual(data[label], target[label], delta=1e-7)
 
+    @unittest.skipIf(qiskit.__version__.startswith("1.2"), "skip Qiskit 1.2 tentatively")
     def test_parameterized_qobj_statevector(self):
         """Test parameterized qobj with Expectation Value snapshot and qasm simulator."""
         statevec_targets = save_expval_final_statevecs() * 3

test/terra/backends/test_runtime_parameterization.py

@@ -22,6 +22,7 @@
 
 from test.terra import common
 
+import qiskit
 from qiskit.compiler import assemble, transpile
 from qiskit.circuit import QuantumCircuit, Parameter
 from test.terra.reference.ref_save_expval import (
@@ -89,6 +90,7 @@ def runtime_parameterization(
         qobj = assemble(circuits, backend=backend, shots=shots, parameterizations=params)
         return qobj
 
+    @unittest.skipIf(qiskit.__version__.startswith("1.2"), "skip Qiskit 1.2 tentatively")
     def test_runtime_parameterization_qasm_save_expval(self):
         """Test parameterized qobj with Expectation Value snapshot and qasm simulator."""
         shots = 1000
@@ -114,6 +116,7 @@ def test_runtime_parameterization_qasm_save_expval(self):
                 for label in labels:
                     self.assertAlmostEqual(data[label], target[label], delta=1e-7)
 
+    @unittest.skipIf(qiskit.__version__.startswith("1.2"), "skip Qiskit 1.2 tentatively")
     def test_runtime_parameterization_statevector(self):
         """Test parameterized qobj with Expectation Value snapshot and qasm simulator."""
         statevec_targets = save_expval_final_statevecs() * 3