Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add serialization support for DoubleSliceSpan #1989

Merged
merged 6 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion qiskit_ibm_runtime/utils/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@
from qiskit_ibm_runtime.options.zne_options import ( # pylint: disable=ungrouped-imports
ExtrapolatorType,
)
from qiskit_ibm_runtime.execution_span import SliceSpan, ExecutionSpans
from qiskit_ibm_runtime.execution_span.execution_span import (
DoubleSliceSpan,
SliceSpan,
ExecutionSpans,
)

from .noise_learner_result import NoiseLearnerResult

Expand Down Expand Up @@ -327,6 +331,16 @@ def default(self, obj: Any) -> Any: # pylint: disable=arguments-differ
if isinstance(obj, NoiseLearnerResult):
out_val = {"data": obj.data, "metadata": obj.metadata}
return {"__type__": "NoiseLearnerResult", "__value__": out_val}
if isinstance(obj, DoubleSliceSpan):
out_val = {
"start": obj.start,
"stop": obj.stop,
"data_slices": {
idx: (shape, arg_sl.start, arg_sl.stop, shot_sl.start, shot_sl.stop)
for idx, (shape, arg_sl, shot_sl) in obj._data_slices.items()
},
}
return {"__type__": "DoubleSliceSpan", "__value__": out_val}
if isinstance(obj, SliceSpan):
out_val = {
"start": obj.start,
Expand Down Expand Up @@ -450,6 +464,12 @@ def object_hook(self, obj: Any) -> Any:
return PrimitiveResult(**obj_val)
if obj_type == "NoiseLearnerResult":
return NoiseLearnerResult(**obj_val)
if obj_type == "DoubleSliceSpan":
obj_val["data_slices"] = {
int(idx): (tuple(shape), slice(arg0, arg1), slice(shot0, shot1))
for idx, (shape, arg0, arg1, shot0, shot1) in obj_val["data_slices"].items()
}
return DoubleSliceSpan(**obj_val)
if obj_type == "ExecutionSpan":
new_slices = {
int(idx): (tuple(shape), slice(*sl_args))
Expand Down
19 changes: 18 additions & 1 deletion test/unit/test_data_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@
NoiseLearnerResult,
)
from qiskit_ibm_runtime.fake_provider import FakeNairobiV2
from qiskit_ibm_runtime.execution_span import SliceSpan, ExecutionSpans
from qiskit_ibm_runtime.execution_span.execution_span import (
DoubleSliceSpan,
SliceSpan,
ExecutionSpans,
)

from .mock.fake_runtime_client import CustomResultRuntimeJob
from .mock.fake_runtime_service import FakeRuntimeService
Expand Down Expand Up @@ -451,6 +455,19 @@ def make_test_primitive_results(self):
SliceSpan(
datetime(2024, 8, 20), datetime(2024, 8, 21), {0: ((14,), slice(2, 3))}
),
DoubleSliceSpan(
datetime(2022, 1, 1),
datetime(2023, 1, 1),
{
1: ((100,), slice(4, 9), slice(1, 2)),
0: ((2, 5), slice(5, 7), slice(3, 4)),
},
),
DoubleSliceSpan(
datetime(2024, 8, 20),
datetime(2024, 8, 21),
{0: ((14,), slice(2, 3), slice(1, 9))},
),
]
)
}
Expand Down
Loading