Merge main into feature/rb_speedup (#923)

* Backend timing helper for experiments (#860) Added `BackendTiming` class with methods for helping round delay and pulse durations to match backend timing constraints. Co-authored-by: Naoki Kanazawa <[email protected]> * Update test imports for qiskit-aer 0.11 (#913) Update test imports for qiskit-aer 0.11 See Qiskit/qiskit-aer#1526 Co-authored-by: Will Shanks <[email protected]> Co-authored-by: Naoki Kanazawa <[email protected]>
qiskit-community · Sep 29, 2022 · 55604f7 · 55604f7
1 parent 0b15ccb
commit 55604f7
Show file tree

Hide file tree

Showing 22 changed files with 613 additions and 32 deletions.
diff --git a/docs/tutorials/quantum_volume.rst b/docs/tutorials/quantum_volume.rst
@@ -30,7 +30,7 @@ z_value = 2), and at least 100 trials have been ran.
     from qiskit_experiments.framework import BatchExperiment
     from qiskit_experiments.library import QuantumVolume
     from qiskit import Aer
-    from qiskit.providers.aer import AerSimulator
+    from qiskit_aer import AerSimulator
 
     # For simulation
     from qiskit.providers.fake_provider import FakeSydney

diff --git a/docs/tutorials/randomized_benchmarking.rst b/docs/tutorials/randomized_benchmarking.rst
@@ -19,7 +19,7 @@ for an explanation on the RB method, which is based on Ref. [1, 2].
     import qiskit.circuit.library as circuits
 
     # For simulation
-    from qiskit.providers.aer import AerSimulator
+    from qiskit_aer import AerSimulator
     from qiskit.providers.fake_provider import FakeParis
 
     backend = AerSimulator.from_backend(FakeParis())

diff --git a/docs/tutorials/readout_mitigation.rst b/docs/tutorials/readout_mitigation.rst
@@ -40,7 +40,7 @@ experiments to generate the corresponding mitigators.
     from qiskit.visualization import plot_histogram
     from qiskit_experiments.library import LocalReadoutError, CorrelatedReadoutError
     # For simulation
-    from qiskit.providers.aer import AerSimulator
+    from qiskit_aer import AerSimulator
     from qiskit.providers.fake_provider import FakeParis
 
     from qiskit.result.mitigation.utils import (

diff --git a/docs/tutorials/state_tomography.rst b/docs/tutorials/state_tomography.rst
@@ -8,7 +8,7 @@ Quantum State Tomography
     from qiskit_experiments.library import StateTomography
 
     # For simulation
-    from qiskit.providers.aer import AerSimulator
+    from qiskit_aer import AerSimulator
     from qiskit.providers.fake_provider import FakeParis
 
     # Noisy simulator backend

diff --git a/docs/tutorials/t1.rst b/docs/tutorials/t1.rst
@@ -38,8 +38,8 @@ for qubit 0.
 
     # A T1 simulator
     from qiskit.providers.fake_provider import FakeVigo
-    from qiskit.providers.aer import AerSimulator
-    from qiskit.providers.aer.noise import NoiseModel
+    from qiskit_aer import AerSimulator
+    from qiskit_aer.noise import NoiseModel
 
     # A kerneled data simulator
     from qiskit_experiments.test.mock_iq_backend import MockIQBackend
@@ -167,4 +167,4 @@ that is close to a logical value '0'.
 .. jupyter-execute::
 
     import qiskit.tools.jupyter
-    %qiskit_copyright
+    %qiskit_copyright
diff --git a/docs/tutorials/t2ramsey_characterization.rst b/docs/tutorials/t2ramsey_characterization.rst
@@ -65,8 +65,8 @@ pure T1/T2 relaxation noise model.
 
     # A T1 simulator
     from qiskit.providers.fake_provider import FakeVigo
-    from qiskit.providers.aer import AerSimulator
-    from qiskit.providers.aer.noise import NoiseModel
+    from qiskit_aer import AerSimulator
+    from qiskit_aer.noise import NoiseModel
 
     # Create a pure relaxation noise model for AerSimulator
     noise_model = NoiseModel.from_backend(

diff --git a/docs/tutorials/tphi_characterization.rst b/docs/tutorials/tphi_characterization.rst
@@ -23,8 +23,8 @@ we compute the results for :math:`T_\varphi.`
 
     # An Aer simulator
     from qiskit.providers.fake_provider import FakeVigo
-    from qiskit.providers.aer import AerSimulator
-    from qiskit.providers.aer.noise import NoiseModel
+    from qiskit_aer import AerSimulator
+    from qiskit_aer.noise import NoiseModel
 
     # Create a pure relaxation noise model for AerSimulator
     noise_model = NoiseModel.from_backend(

diff --git a/qiskit_experiments/framework/__init__.py b/qiskit_experiments/framework/__init__.py
@@ -219,7 +219,6 @@
     AnalysisConfig
     ExperimentEncoder
     ExperimentDecoder
-    BackendData
     FigureData
 
 .. _composite-experiment:
@@ -242,12 +241,14 @@
     BaseExperiment
     BaseAnalysis
 
-Mix-ins
+Experiment Configuration Helper Classes
 *******
 
 .. autosummary::
     :toctree: ../stubs/
 
+    BackendData
+    BackendTiming
     RestlessMixin
 
 .. _create-experiment:
@@ -262,6 +263,7 @@
 )
 from .base_analysis import BaseAnalysis
 from .base_experiment import BaseExperiment
+from .backend_timing import BackendTiming
 from .configs import ExperimentConfig, AnalysisConfig
 from .analysis_result_data import AnalysisResultData
 from .experiment_data import ExperimentData