Merge branch 'main' into fix_aer_provider_gpu

.github/workflows/tests.yml

@@ -87,13 +87,18 @@ jobs:
           aer-test/bin/pip check
         shell: bash
   tests_linux:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
+    name: Linux Python ${{ matrix.python-version }}${{ matrix.qiskit-extra && format(' ({0})', matrix.qiskit-extra) }}
     needs: [sdist, lint]
     timeout-minutes: 60
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10", "3.11", "3.12.0"]
-        os: ["ubuntu-latest"]
+        qiskit-extra: [""]
+        include:
+          - python-version: "3.10"
+            qiskit-extra: "'qiskit>=1.0.0rc1'"
+
     env:
       AER_THRUST_BACKEND: OMP
       QISKIT_TEST_CAPTURE_STREAMS: 1
@@ -116,17 +121,19 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version}}-pip-test-
             ${{ runner.os }}-${{ matrix.python-version}}-pip-
             ${{ runner.os }}-${{ matrix.python-version}}-
-      - name: Install Deps
-        run: python -m pip install -U -c constraints.txt -r requirements-dev.txt wheel
       - name: Install openblas
         run: |
           set -e
           sudo apt-get update
           sudo apt-get install -y libopenblas-dev
         shell: bash
-      - name: Install Aer
+      - name: Install Aer and dependencies
         run: |
-          python -m pip install -U .
+          python -m pip install -U \
+            -c constraints.txt \
+            -r requirements-dev.txt \
+            ${{ matrix.qiskit-extra }} \
+            .
       - name: Run Tests
         run: |
           set -e
@@ -185,13 +192,13 @@ jobs:
           stestr run --slowest
         shell: bash
   tests_macos:
-    runs-on: ${{ matrix.os }}
+    runs-on: macOS-latest
+    name: macOS Python ${{ matrix.python-version }}
     needs: [sdist, lint]
     timeout-minutes: 60
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10", '3.11', "3.12.0"]
-        os: ["macOS-latest"]
     env:
       AER_THRUST_BACKEND: OMP
       QISKIT_TEST_CAPTURE_STREAMS: 1
@@ -214,12 +221,13 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version}}-pip-test-
             ${{ runner.os }}-${{ matrix.python-version}}-pip-
             ${{ runner.os }}-${{ matrix.python-version}}-
-      - name: Install Deps
+      - name: Install Aer and dependencies
         run: |
           set -e
-          pip install -U -c constraints.txt -r requirements-dev.txt
-      - name: Install Aer
-        run: python -m pip install -U .
+          pip install -U \
+            -c constraints.txt \
+            -r requirements-dev.txt \
+            .
       - name: Run Tests
         run: |
           set -e
@@ -228,13 +236,13 @@ jobs:
           stestr run --slowest
         shell: bash
   tests_windows:
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-2019
+    name: Windows Python ${{ matrix.python-version }}
     needs: ["lint", "sdist"]
     timeout-minutes: 60
     strategy:
       matrix:
         python-version: [3.8, 3.9, "3.10", "3.11", "3.12.0"]
-        os: ["windows-2019"]
     env:
       AER_THRUST_BACKEND: OMP
       QISKIT_TEST_CAPTURE_STREAMS: 1
@@ -259,15 +267,22 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version}}-
       - name: Add msbuild to PATH
         uses: microsoft/[email protected]
-      - name: Install Deps
-        run: python -m pip install -U -c constraints.txt -r requirements-dev.txt wheel build
-      - name: Install Aer Windows
+      - name: Build Aer Windows
         env:
           CMAKE_GENERATOR: "Visual Studio 16 2019"
         run: |
           set -e
+          pip install build
           python -I -m build --wheel
-          pip install -U dist/*.whl
+        shell: bash
+      - name: Install Aer and dependencies
+        run: |
+          set -e
+          shopt -s failglob
+          pip install -U \
+            -c constraints.txt \
+            -r requirements-dev.txt \
+            dist/*.whl
         shell: bash
       - name: Run Tests
         env:

.github/workflows/unit-tests-latest-qiskit.yml

@@ -31,24 +31,25 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version}}-pip-test-
             ${{ runner.os }}-${{ matrix.python-version}}-pip-
             ${{ runner.os }}-${{ matrix.python-version}}-
-      - name: Install Deps
-        run: |
-          python -m pip install -U -c constraints.txt -r requirements-dev.txt wheel
-          pip install -U git+https://github.com/Qiskit/qiskit.git
       - name: Install openblas
         run: |
           set -e
           sudo apt-get update
           sudo apt-get install -y libopenblas-dev
         shell: bash
-      - name: Install Aer
+      - name: Install dependencies and Aer
         run: |
-          python -m pip install -U .
+          python -m pip install -U setuptools wheel
+          python -m pip install -U \
+            -c constraints.txt \
+            -r requirements-dev.txt \
+            'git+https://github.com/Qiskit/qiskit.git@main' \
+            .
       - name: Run Tests
         run: |
           set -e
           pip check
           rm -rf qiskit_aer
           stestr run --slowest
         shell: bash
-
+

README.md

@@ -55,7 +55,7 @@ $ python
 ```python
 import qiskit
 from qiskit_aer import AerSimulator
-from qiskit.providers.fake_provider import FakeManilaV2
+from qiskit_ibm_runtime import QiskitRuntimeService
 
 # Generate 3-qubit GHZ state
 circ = qiskit.QuantumCircuit(3)
@@ -73,10 +73,10 @@ counts_ideal = result_ideal.get_counts(0)
 print('Counts(ideal):', counts_ideal)
 # Counts(ideal): {'000': 493, '111': 531}
 
-# Construct a noisy simulator backend from an IBMQ backend
-# This simulator backend will be automatically configured
-# using the device configuration and noise model
-backend = FakeManilaV2()
+# Construct a simulator using a noise model
+# from a real backend.
+provider = QiskitRuntimeService()
+backend = provider.get_backend("ibm_kyoto")
 aersim_backend = AerSimulator.from_backend(backend)
 
 # Perform noisy simulation

qiskit_aer/primitives/estimator.py

@@ -97,6 +97,11 @@ def __init__(
                 If approximation is True, this parameter is ignored and assumed to be False.
         """
         super().__init__(options=run_options)
+        # These three private attributes used to be created by super, but were deprecated in Qiskit
+        # 0.46. See https://github.com/Qiskit/qiskit/pull/11051
+        self._circuits = []
+        self._parameters = []
+        self._observables = []
 
         backend_options = {} if backend_options is None else backend_options
         method = (
@@ -204,7 +209,8 @@ def _run(
             parameter_values,
             **run_options,
         )
-        job.submit()
+        # The public submit method was removed in Qiskit 0.46
+        (job.submit if hasattr(job, "submit") else job._submit)()  # pylint: disable=no-member
         return job
 
     def _compute(self, circuits, observables, parameter_values, run_options):

qiskit_aer/primitives/sampler.py

@@ -67,6 +67,11 @@ def __init__(
             skip_transpilation: if True, transpilation is skipped.
         """
         super().__init__(options=run_options)
+        # These two private attributes used to be created by super, but were deprecated in Qiskit
+        # 0.46. See https://github.com/Qiskit/qiskit/pull/11051
+        self._circuits = []
+        self._parameters = []
+
         self._backend = AerSimulator()
         backend_options = {} if backend_options is None else backend_options
         self._backend.set_options(**backend_options)
@@ -157,7 +162,8 @@ def _run(
                 self._circuits.append(circuit)
                 self._parameters.append(circuit.parameters)
         job = PrimitiveJob(self._call, circuit_indices, parameter_values, **run_options)
-        job.submit()
+        # The public submit method was removed in Qiskit 0.46
+        (job.submit if hasattr(job, "submit") else job._submit)()  # pylint: disable=no-member
         return job
 
     @staticmethod

test/terra/backends/aer_simulator/test_options.py

@@ -14,12 +14,18 @@
 """
 
 from ddt import ddt, data
-from qiskit import QuantumCircuit, transpile
 from qiskit_aer.noise import NoiseModel
 from test.terra.backends.simulator_test_case import SimulatorTestCase, supported_methods
+
+import qiskit
+from qiskit import QuantumCircuit, transpile
 from qiskit.quantum_info.random import random_unitary
 from qiskit.quantum_info import state_fidelity
-from qiskit.providers.fake_provider import FakeMontreal
+
+if qiskit.__version__.startswith("0."):
+    from qiskit.providers.fake_provider import FakeAlmaden as Fake20QV1
+else:
+    from qiskit.providers.fake_provider import Fake20QV1
 
 from qiskit_aer import AerSimulator
 
@@ -299,8 +305,8 @@ def test_statevector_memory(self):
     def test_num_qubits(self, method):
         """Test number of qubits is correctly checked"""
 
-        num_qubits = FakeMontreal().configuration().num_qubits
-        backend = AerSimulator.from_backend(FakeMontreal(), method=method)
+        num_qubits = Fake20QV1().configuration().num_qubits
+        backend = AerSimulator.from_backend(Fake20QV1(), method=method)
         self.assertGreaterEqual(backend.configuration().num_qubits, num_qubits)
 
     def test_mps_svd_method(self):

test/terra/backends/aer_simulator/test_truncate.py

@@ -9,8 +9,15 @@
 AerSimulator Integration Tests
 """
 from ddt import ddt
+
+import qiskit
 from qiskit import transpile, QuantumCircuit
-from qiskit.providers.fake_provider import FakeQuito
+
+if qiskit.__version__.startswith("0."):
+    from qiskit.providers.fake_provider import FakeQuito as Fake5QV1
+else:
+    from qiskit.providers.fake_provider import Fake5QV1
+
 from qiskit_aer.noise import NoiseModel
 from test.terra.backends.simulator_test_case import SimulatorTestCase, supported_methods
 
@@ -46,7 +53,7 @@ def create_circuit_for_truncate(self):
         return circuit
 
     def device_backend(self):
-        return FakeQuito()
+        return Fake5QV1()
 
     def test_truncate_ideal_sparse_circuit(self):
         """Test qubit truncation for large circuit with unused qubits."""