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

Improve performance of sampler experiment #1935

Merged
merged 8 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from 6 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
57 changes: 50 additions & 7 deletions qiskit_aer/primitives/sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

from collections.abc import Sequence

from qiskit.circuit import QuantumCircuit
import numpy as np
from qiskit.circuit import ParameterExpression, QuantumCircuit
from qiskit.compiler import transpile
from qiskit.exceptions import QiskitError
from qiskit.primitives import BaseSampler, SamplerResult
Expand Down Expand Up @@ -88,25 +89,30 @@ def _call(
is_shots_none = "shots" in run_options and run_options["shots"] is None
self._transpile(circuits, is_shots_none)

experiments = []
parameter_binds = []
experiment_manager = _ExperimentManager()
for i, value in zip(circuits, parameter_values):
if len(value) != len(self._parameters[i]):
raise QiskitError(
f"The number of values ({len(value)}) does not match "
f"the number of parameters ({len(self._parameters[i])})."
)
parameter_binds.append({k: [v] for k, v in zip(self._parameters[i], value)})
experiments.append(self._transpiled_circuits[(i, is_shots_none)])

experiment_manager.append(
key=i,
parameter_bind=dict(zip(self._parameters[i], value)),
experiment_circuit=self._transpiled_circuits[(i, is_shots_none)],
)

result = self._backend.run(
experiments, parameter_binds=parameter_binds, **run_options
experiment_manager.experiment_circuits,
parameter_binds=experiment_manager.parameter_binds,
**run_options,
).result()

# Postprocessing
metadata = []
quasis = []
for i in range(len(experiments)):
for i in experiment_manager.experiment_indices:
if is_shots_none:
probabilities = result.data(i)["probabilities"]
num_qubits = result.results[i].metadata["num_qubits"]
Expand Down Expand Up @@ -186,3 +192,40 @@ def _transpile(self, circuit_indices: Sequence[int], is_shots_none: bool):
)
for i, circuit in zip(to_handle, circuits):
self._transpiled_circuits[(i, is_shots_none)] = circuit


class _ExperimentManager:
def __init__(self):
self.keys: list[int] = []
self.experiment_circuits: list[QuantumCircuit] = []
self.parameter_binds: list[dict[ParameterExpression, list[float]]] = []
self._input_indices: list[list[int]] = []
self._num_experiment: int = 0

def __len__(self):
return self._num_experiment

@property
def experiment_indices(self):
"""indices of experiments"""
return np.argsort(sum(self._input_indices, [])).tolist()

def append(
self,
key: tuple[int, int],
parameter_bind: dict[ParameterExpression, float],
experiment_circuit: QuantumCircuit,
):
"""append experiments"""
if parameter_bind and key in self.keys:
key_index = self.keys.index(key)
for k, vs in self.parameter_binds[key_index].items():
vs.append(parameter_bind[k])
self._input_indices[key_index].append(self._num_experiment)
else:
self.experiment_circuits.append(experiment_circuit)
self.keys.append(key)
self.parameter_binds.append({k: [v] for k, v in parameter_bind.items()})
self._input_indices.append([self._num_experiment])

self._num_experiment += 1
6 changes: 6 additions & 0 deletions releasenotes/notes/sampler-performance-81e1649ec4657aad.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
---
ikkoham marked this conversation as resolved.
Show resolved Hide resolved
upgrade:
- |
Improved performance when the same circuits and multiple parameters are passed to
:class:`~.Sampler`.
Loading