Remove workarounds for passing run options to sampler

This runtime patching code was added along with the initial support for sampler execution because the path through `qiskit_ibm_runtime.SamplerV2` through to `BackendSamplerV2` did not carry through options for level 1 measurements or noise models. This path is used in the tests (while execution on physical backends with `SamplerV2` does not use this path). Now with Qiskit 1.3 and qiskit-ibm-runtime 0.34, this patching is no longer needed. Remaining warnings filtering was moved to the calibrations tutorial where it was needed.
wshanks · Dec 8, 2024 · 944289d · 944289d
1 parent 519bb53
commit 944289d
Show file tree

Hide file tree

Showing 27 changed files with 7 additions and 392 deletions.
diff --git a/docs/howtos/artifacts.rst b/docs/howtos/artifacts.rst
@@ -25,13 +25,6 @@ Viewing artifacts
 Here we run a parallel experiment consisting of two :class:`.T1` experiments in parallel and then view the output
 artifacts as a list of :class:`.ArtifactData` objects accessed by :meth:`.ExperimentData.artifacts`:
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     from qiskit_ibm_runtime.fake_provider import FakePerth

diff --git a/docs/manuals/characterization/t1.rst b/docs/manuals/characterization/t1.rst
@@ -34,13 +34,6 @@ for qubit 0.
     packages to run simulations.  You can install them with ``python -m pip
     install qiskit-aer qiskit-ibm-runtime``.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     import numpy as np

diff --git a/docs/manuals/characterization/t2ramsey.rst b/docs/manuals/characterization/t2ramsey.rst
@@ -62,13 +62,6 @@ pure T1/T2 relaxation noise model.
     packages to run simulations.  You can install them with ``python -m pip
     install qiskit-aer qiskit-ibm-runtime``.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     # A T1 simulator

diff --git a/docs/manuals/characterization/tphi.rst b/docs/manuals/characterization/tphi.rst
@@ -25,13 +25,6 @@ From the :math:`T_1` and :math:`T_2` estimates, we compute the results for
     packages to run simulations.  You can install them with ``python -m pip
     install qiskit-aer qiskit-ibm-runtime``.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     import numpy as np

diff --git a/docs/manuals/measurement/readout_mitigation.rst b/docs/manuals/measurement/readout_mitigation.rst
@@ -35,13 +35,6 @@ experiments to generate the corresponding mitigators.
     packages to run simulations.  You can install them with ``python -m pip
     install qiskit-aer qiskit-ibm-runtime``.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     import numpy as np

diff --git a/docs/manuals/measurement/restless_measurements.rst b/docs/manuals/measurement/restless_measurements.rst
@@ -88,10 +88,6 @@ they use always starts with the qubits in the ground state.
         category=DeprecationWarning,
     )
 
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     from qiskit_ibm_runtime.fake_provider import FakePerth

diff --git a/docs/manuals/verification/quantum_volume.rst b/docs/manuals/verification/quantum_volume.rst
@@ -29,13 +29,6 @@ z_value = 2), and at least 100 trials have been ran.
     packages to run simulations.  You can install them with ``python -m pip
     install qiskit-aer qiskit-ibm-runtime``.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     from qiskit_experiments.framework import BatchExperiment

diff --git a/docs/manuals/verification/randomized_benchmarking.rst b/docs/manuals/verification/randomized_benchmarking.rst
@@ -16,13 +16,6 @@ explanation on the RB method, which is based on Refs. [1]_ [2]_.
     packages to run simulations.  You can install them with ``python -m pip
     install qiskit-aer qiskit-ibm-runtime``.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     import numpy as np

diff --git a/docs/manuals/verification/state_tomography.rst b/docs/manuals/verification/state_tomography.rst
@@ -14,13 +14,6 @@ complete basis of measurement operators.
 
 We first initialize a simulator to run the experiments on.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     from qiskit_aer import AerSimulator

diff --git a/docs/tutorials/calibrations.rst b/docs/tutorials/calibrations.rst
@@ -56,6 +56,7 @@ This automatic updating can also be disabled using the ``auto_update`` flag.
         message=".*The entire Qiskit Pulse package is being deprecated.*",
         category=DeprecationWarning,
     )
+    warnings.filterwarnings("ignore", ".*Could not determine job completion time.*", UserWarning)
 
 .. jupyter-execute::
 

diff --git a/docs/tutorials/custom_experiment.rst b/docs/tutorials/custom_experiment.rst
@@ -562,13 +562,6 @@ To test our code, we first simulate a noisy backend with asymmetric readout erro
     You can install it with ``python -m pip install qiskit-aer``.
 
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
   from qiskit_aer import AerSimulator, noise

diff --git a/docs/tutorials/getting_started.rst b/docs/tutorials/getting_started.rst
@@ -86,13 +86,6 @@ backend, real or simulated, that you can access through Qiskit.
     packages to run simulations.  You can install them with ``python -m pip
     install qiskit-aer qiskit-ibm-runtime``.
 
-.. jupyter-execute::
-    :hide-code:
-
-    # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-    from qiskit_experiments.test.patching import patch_sampler_test_support
-    patch_sampler_test_support()
-
 .. jupyter-execute::
 
     from qiskit_ibm_runtime.fake_provider import FakePerth

diff --git a/qiskit_experiments/library/characterization/correlated_readout_error.py b/qiskit_experiments/library/characterization/correlated_readout_error.py
@@ -77,10 +77,6 @@ class CorrelatedReadoutError(BaseExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             from qiskit.providers.fake_provider import GenericBackendV2
             from qiskit_aer import AerSimulator
 

diff --git a/qiskit_experiments/library/characterization/fine_frequency.py b/qiskit_experiments/library/characterization/fine_frequency.py
@@ -53,10 +53,6 @@ class FineFrequency(BaseExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_ibm_runtime.fake_provider import FakePerth
             from qiskit_aer import AerSimulator

diff --git a/qiskit_experiments/library/characterization/local_readout_error.py b/qiskit_experiments/library/characterization/local_readout_error.py
@@ -66,10 +66,6 @@ class LocalReadoutError(BaseExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_aer import AerSimulator
             from qiskit_ibm_runtime.fake_provider import FakePerth

diff --git a/qiskit_experiments/library/characterization/multi_state_discrimination.py b/qiskit_experiments/library/characterization/multi_state_discrimination.py
@@ -58,10 +58,6 @@ class MultiStateDiscrimination(BaseExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_experiments.test.pulse_backend import SingleTransmonTestBackend
             backend = SingleTransmonTestBackend(5.2e9,-.25e9, 1e9, 0.8e9, 1e4, noise=False, seed=199)

diff --git a/qiskit_experiments/library/characterization/ramsey_xy.py b/qiskit_experiments/library/characterization/ramsey_xy.py
@@ -85,10 +85,6 @@ class RamseyXY(BaseExperiment, RestlessMixin):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_aer import AerSimulator
             from qiskit_ibm_runtime.fake_provider import FakePerth

diff --git a/qiskit_experiments/library/characterization/t1.py b/qiskit_experiments/library/characterization/t1.py
@@ -41,10 +41,6 @@ class T1(BaseExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_ibm_runtime.fake_provider import FakeManilaV2
             from qiskit_aer import AerSimulator

diff --git a/qiskit_experiments/library/characterization/t2ramsey.py b/qiskit_experiments/library/characterization/t2ramsey.py
@@ -63,10 +63,6 @@ class T2Ramsey(BaseExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_ibm_runtime.fake_provider import FakeManilaV2
             from qiskit_aer import AerSimulator

diff --git a/qiskit_experiments/library/characterization/tphi.py b/qiskit_experiments/library/characterization/tphi.py
@@ -54,10 +54,6 @@ class Tphi(BatchExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_ibm_runtime.fake_provider import FakeManilaV2
             from qiskit_aer import AerSimulator

diff --git a/qiskit_experiments/library/characterization/zz_ramsey.py b/qiskit_experiments/library/characterization/zz_ramsey.py
@@ -129,10 +129,6 @@ class ZZRamsey(BaseExperiment):
         .. jupyter-execute::
             :hide-code:
 
-            # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-            from qiskit_experiments.test.patching import patch_sampler_test_support
-            patch_sampler_test_support()
-
             # backend
             from qiskit_ibm_runtime.fake_provider import FakePerth
             from qiskit_aer import AerSimulator

diff --git a/qiskit_experiments/test/mock_iq_backend.py b/qiskit_experiments/test/mock_iq_backend.py
@@ -47,11 +47,6 @@ def __init__(
         backend_version: str = None,
         **fields,
     ):
-        # Temporary workaround for missing support in Qiskit and qiskit-ibm-runtime
-        from qiskit_experiments.test.patching import patch_sampler_test_support
-
-        patch_sampler_test_support()
-
         super().__init__(provider, name, description, online_date, backend_version, **fields)
 
         backend_v1 = FakeOpenPulse2Q()