Skip to content

Commit

Permalink
fit lint errors, upgrade pylint, fix tomo bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@dcmckayibm
dcmckayibm committed Oct 3, 2024
1 parent a5a01eb commit 06b0bdf
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 34 deletions.
38 changes: 20 additions & 18 deletions qiskit_experiments/framework/base_experiment.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@
from qiskit.exceptions import QiskitError
from qiskit.qobj.utils import MeasLevel
from qiskit.providers.options import Options
from qiskit_ibm_runtime import SamplerV2 as Sampler
from qiskit_experiments.framework import BackendData
from qiskit_experiments.framework.store_init_args import StoreInitArgs
from qiskit_experiments.framework.base_analysis import BaseAnalysis
from qiskit_experiments.framework.experiment_data import ExperimentData
from qiskit_experiments.framework.configs import ExperimentConfig
from qiskit_experiments.database_service import Qubit

from qiskit_ibm_runtime import SamplerV2 as Sampler


class BaseExperiment(ABC, StoreInitArgs):
"""Abstract base class for experiments."""
Expand All @@ -42,7 +41,7 @@ def __init__(
analysis: Optional[BaseAnalysis] = None,
backend: Optional[Backend] = None,
experiment_type: Optional[str] = None,
use_sampler: Options[bool] = False
use_sampler: Options[bool] = False,
):
"""Initialize the experiment object.
Expand Down Expand Up @@ -218,6 +217,7 @@ def run(
it contains one.
timeout: Time to wait for experiment jobs to finish running before
cancelling.
use_sampler: Use the SamplerV2 to run the experiment
run_options: backend runtime options used for circuit execution.
Returns:
Expand Down Expand Up @@ -359,29 +359,31 @@ def _run_jobs(self, circuits: List[QuantumCircuit], **run_options) -> List[Job]:
if self._use_sampler:
sampler = Sampler(self.backend)

#have to hand set some of these options
#see https://docs.quantum.ibm.com/api/qiskit-ibm-runtime/qiskit_ibm_runtime.options.SamplerExecutionOptionsV2
if 'init_qubits' in run_options:
sampler.options.execution.init_qubits = run_options['init_qubits']
if 'rep_delay' in run_options:
sampler.options.execution.rep_delay = run_options['rep_delay']
if 'meas_level' in run_options:
if run_options['meas_level'] == 2:
# have to hand set some of these options
# see https://docs.quantum.ibm.com/api/qiskit-ibm-runtime
# /qiskit_ibm_runtime.options.SamplerExecutionOptionsV2
if "init_qubits" in run_options:
sampler.options.execution.init_qubits = run_options["init_qubits"]
if "rep_delay" in run_options:
sampler.options.execution.rep_delay = run_options["rep_delay"]
if "meas_level" in run_options:
if run_options["meas_level"] == 2:
sampler.options.execution.meas_type = "classified"
elif run_options['meas_level'] == 1:
if 'meas_return' in run_options:
if run_options['meas_return'] == 'avg':
elif run_options["meas_level"] == 1:
if "meas_return" in run_options:
if run_options["meas_return"] == "avg":
sampler.options.execution.meas_type = "avg_kerneled"
else:
sampler.options.execution.meas_type = "kerneled"
else:
#assume this is what is wanted if no meas return specified
# assume this is what is wanted if no meas return specified
sampler.options.execution.meas_type = "kerneled"
else:
raise QiskitError('Only meas level 1 + 2 supported by sampler')
raise QiskitError("Only meas level 1 + 2 supported by sampler")


jobs = [sampler.run(circs, shots=run_options.get('shots', None)) for circs in job_circuits]
jobs = [
sampler.run(circs, shots=run_options.get("shots", None)) for circs in job_circuits
]
else:
jobs = [self.backend.run(circs, **run_options) for circs in job_circuits]

Expand Down
32 changes: 16 additions & 16 deletions qiskit_experiments/framework/experiment_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@
from qiskit.exceptions import QiskitError
from qiskit.providers import Job, Backend, Provider
from qiskit.utils.deprecation import deprecate_arg
from qiskit.primitives import BitArray, SamplerPubResult

from qiskit_ibm_experiment import (
IBMExperimentService,
ExperimentData as ExperimentDataclass,
AnalysisResultData as AnalysisResultDataclass,
ResultQuality,
)

from qiskit_experiments.framework.json import ExperimentEncoder, ExperimentDecoder
from qiskit_experiments.database_service.utils import (
plot_to_svg_bytes,
Expand All @@ -68,8 +70,6 @@

from .containers.figure_data import FigureData, FigureType

from qiskit.primitives import BitArray, SamplerPubResult

if TYPE_CHECKING:
# There is a cyclical dependency here, but the name needs to exist for
# Sphinx on Python 3.9+ to link type hints correctly. The gating on
Expand Down Expand Up @@ -987,8 +987,8 @@ def _add_result_data(self, result: Result, job_id: Optional[str] = None) -> None
job_id: The id of the job the result came from. If `None`, the
job id in `result` is used.
"""
if hasattr(result, 'results'):
#backend run results
if hasattr(result, "results"):
# backend run results
if job_id is None:
job_id = result.job_id
if job_id not in self._jobs:
Expand All @@ -1011,9 +1011,9 @@ def _add_result_data(self, result: Result, job_id: Optional[str] = None) -> None
data["meas_return"] = expr_result.meas_return
self._result_data.append(data)
else:
#sampler results
# sampler results
if job_id is None:
raise QiskitError('job_id must be provided, not available in the sampler result')
raise QiskitError("job_id must be provided, not available in the sampler result")
if job_id not in self._jobs:
self._jobs[job_id] = None
self.job_ids.append(job_id)
Expand All @@ -1022,22 +1022,22 @@ def _add_result_data(self, result: Result, job_id: Optional[str] = None) -> None
# Sampler results are a list
for i, _ in enumerate(result):
data = {}
#convert to a Sampler Pub Result (can remove this later when the bug is fixed)
# convert to a Sampler Pub Result (can remove this later when the bug is fixed)
testres = SamplerPubResult(result[i].data, result[i].metadata)
data["job_id"] = job_id
if type(testres.data[next(iter(testres.data))]) is BitArray:
#bit results so has counts
if isinstance(testres.data[next(iter(testres.data))], BitArray):
# bit results so has counts
data["meas_level"] = 2
data["meas_return"] = 'avg'
#join the data
data["meas_return"] = "avg"
# join the data
data["counts"] = testres.join_data(testres.data.keys()).get_counts()
#number of shots
# number of shots
data["shots"] = testres.data[next(iter(testres.data))].num_shots
else:
raise QiskitError("Sampler with meas level 1 support TBD")
data["metadata"] = testres.metadata['circuit_metadata']
raise QiskitError("Sampler with meas level 1 support TBD")

data["metadata"] = testres.metadata["circuit_metadata"]

self._result_data.append(data)

def _retrieve_data(self):
Expand Down

0 comments on commit 06b0bdf

Please sign in to comment.