Merge branch 'main' of https://github.com/Qiskit-Extensions/qiskit-ex…

…periments into issue-qiskit-community#1238 local/issue-#1238 update
Naohnakazawa · Apr 23, 2024 · e0d412a · e0d412a
2 parents 585aefe + cb37d42
commit e0d412a
Show file tree

Hide file tree

Showing 122 changed files with 2,661 additions and 2,130 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -88,6 +88,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Temporary workaround for GitVersion
+        shell: bash
+        run: |
+          git config --unset-all extensions.worktreeconfig
       - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:

diff --git a/docs/conf.py b/docs/conf.py
@@ -167,7 +167,6 @@
     "qiskit_aer": ("https://qiskit.github.io/qiskit-aer/", None),
     "qiskit_dynamics": ("https://qiskit-extensions.github.io/qiskit-dynamics/", None),
     "qiskit_ibm_runtime": ("https://docs.quantum.ibm.com/api/qiskit-ibm-runtime/", None),
-    "qiskit_ibm_provider": ("https://docs.quantum.ibm.com/api/qiskit-ibm-provider/", None),
 }
 
 

diff --git a/docs/howtos/cloud_service.rst b/docs/howtos/cloud_service.rst
@@ -19,7 +19,7 @@ Saving
 
 .. note::
     This guide requires :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>` version 0.15 and up, which can be installed with ``python -m pip install qiskit-ibm-runtime``.
-    For how to migrate from the older :external+qiskit_ibm_provider:doc:`qiskit-ibm-provider <index>` to :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>`,
+    For how to migrate from the older ``qiskit-ibm-provider`` to :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>`,
     consult the `migration guide <https://docs.quantum.ibm.com/api/migration-guides/qiskit-runtime-from-provider>`_.\
 
 You must run the experiment on a real IBM

diff --git a/docs/howtos/rerun_analysis.rst b/docs/howtos/rerun_analysis.rst
@@ -13,7 +13,7 @@ Solution
 
 .. note::
     This guide requires :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>` version 0.15 and up, which can be installed with ``python -m pip install qiskit-ibm-runtime``.
-    For how to migrate from the older :external+qiskit_ibm_provider:doc:`qiskit-ibm-provider <index>` to :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>`,
+    For how to migrate from the older ``qiskit-ibm-provider`` to :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>`,
     consult the `migration guide <https://docs.quantum.ibm.com/api/migration-guides/qiskit-runtime-from-provider>`_.\
 
 Once you recreate the exact experiment you ran and all of its parameters and options,
@@ -25,18 +25,18 @@ job IDs:
 .. jupyter-input::
 
     from qiskit_experiments.framework import ExperimentData
-    from qiskit_ibm_provider import IBMProvider
+    from qiskit_ibm_runtime import QiskitRuntimeService
 
     # The experiment you ran
     experiment = Experiment(**opts)
 
     # List of job IDs for the experiment
-    job_ids= [job1, job2, ...]
+    job_ids= ["job1_id", "job2_id", ...]
 
-    provider = IBMProvider()
+    service = QiskitRuntimeService(channel="ibm_quantum")
 
     expdata = ExperimentData(experiment = experiment)
-    expdata.add_jobs([provider.retrieve_job(job_id) for job_id in job_ids])
+    expdata.add_jobs([service.job(job_id) for job_id in job_ids])
     experiment.analysis.run(expdata, replace_results=True)
 
     # Block execution of subsequent code until analysis is complete
@@ -51,7 +51,7 @@ invoke the :meth:`.ExperimentData.add_data` method instead of :meth:`.Experiment
 
 .. jupyter-input::
 
-    data.add_data([provider.retrieve_job(job_id).result() for job_id in job_ids])
+    data.add_data([service.job(job_id).result() for job_id in job_ids])
 
 The remaining workflow remains the same.
 
@@ -116,7 +116,7 @@ first component experiment.
     )
 
     data = ExperimentData(experiment=pexp)
-    data.add_jobs([provider.retrieve_job(job_id) for job_id in job_ids])
+    data.add_jobs([service.job(job_id) for job_id in job_ids])
     pexp.analysis.run(data, replace_results=True)
 
 See Also

diff --git a/docs/howtos/runtime_sessions.rst b/docs/howtos/runtime_sessions.rst
@@ -12,7 +12,7 @@ Solution
 
 .. note::
     This guide requires :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>` version 0.15 and up, which can be installed with ``python -m pip install qiskit-ibm-runtime``.
-    For how to migrate from the older :external+qiskit_ibm_provider:doc:`qiskit-ibm-provider <index>` to :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>`,
+    For how to migrate from the older ``qiskit-ibm-provider`` to :external+qiskit_ibm_runtime:doc:`qiskit-ibm-runtime <index>`,
     consult the `migration guide <https://docs.quantum.ibm.com/api/migration-guides/qiskit-runtime-from-provider>`_.\
 
 Use the :class:`~qiskit_ibm_runtime.IBMBackend` object in :external+qiskit_ibm_runtime:doc:`index`, which supports sessions.

diff --git a/docs/manuals/measurement/restless_measurements.rst b/docs/manuals/measurement/restless_measurements.rst
@@ -189,7 +189,7 @@ using the code below.
     tau = sum(durations) * dt / (len(durations))
 
     n_circs = len(cal_drag.circuits())
-    # can be obtained from backend.default_rep_delay on a backend from qiskit-ibm-provider
+    # can be obtained from backend.default_rep_delay on a backend from qiskit-ibm-runtime
 
     delay_s = 0.0025
     delay_r = 1e-6  # restless delay

diff --git a/docs/manuals/verification/randomized_benchmarking.rst b/docs/manuals/verification/randomized_benchmarking.rst
@@ -208,6 +208,8 @@ The EPGs of two-qubit RB are analyzed with the corrected EPC if available.
 
 Note that ``EPC_corrected`` value is smaller than one of raw ``EPC``, which indicates
 contribution of depolarization from single-qubit error channels.
+If you don't need ``EPG`` value, you can skip its computation by
+``exp_2q.analysis.set_options(gate_error_ratio=False)``.
 
 
 Displaying the RB circuits