Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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
14 changes: 9 additions & 5 deletions src/qibolab/_core/instruments/emulator/emulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def _sweep(
configs: dict[str, Config],
sweepers: list[ParallelSweepers],
updates: dict | None = None,
) -> NDArray:
) -> tuple[NDArray, NDArray | None]:
"""Sweep over sequence.

This function invokes itself recursively, adding an array
Expand All @@ -155,7 +155,7 @@ def _sweep(
return self._evolve(sequence, configs, updates)

state_slices: list[NDArray] = []
coeff_slices = []
coeff_slices = [] if self.save_dir is not None else None
parsweep = sweepers[0]
# execute once for each parallel value
for values in zip(*(s.values for s in parsweep)):
Expand All @@ -169,14 +169,18 @@ def _sweep(
updates[channel].update({sweeper.parameter.name: value})
states, coeffs = self._sweep(sequence, configs, sweepers[1:], updates)
state_slices.append(states)
coeff_slices.append(coeffs)
if coeff_slices is not None:
coeff_slices.append(coeffs)

# stack all slices in a single array, along the current outermost dimension
return np.stack(state_slices), np.stack(coeff_slices)
return (
np.stack(state_slices),
np.stack(coeff_slices) if coeff_slices is not None else None,
)

def _evolve(
self, sequence: PulseSequence, configs: dict[str, Config], updates: dict
) -> NDArray:
) -> tuple[NDArray, NDArray | None]:
"""Evolve a pulse sequence on the quantum emulator.

This method updates the sequence parameters, generates the time grid, constructs
Expand Down
22 changes: 22 additions & 0 deletions tests/instruments/emulator/test_emulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import pytest

from qibolab._core.execution_parameters import AcquisitionType, AveragingMode
from qibolab._core.pulses import Delay
from qibolab._core.sequence import PulseSequence
from qibolab._core.sweeper import Parameter, Sweeper

NSHOTS = 1000
Expand Down Expand Up @@ -51,3 +53,23 @@ def test_sweepers(platform):
acq_handle = list(seq.channel(platform.qubits[0].acquisition))[-1].id
res = platform.execute([seq], [[sweeper]], nshots=NSHOTS)
assert res[acq_handle].shape == (NSHOTS, 2)


def test_duration_sweeper_with_variable_sequence_length(platform):
q0 = platform.natives.single_qubit[0]
delay = Delay(duration=0)
seq = q0.RX() | PulseSequence([(platform.qubits[0].acquisition, delay)]) | q0.MZ()
sweeper = Sweeper(
parameter=Parameter.duration, values=np.array([0, 2000]), pulses=[delay]
)
acq_handle = list(seq.channel(platform.qubits[0].acquisition))[-1].id

res = platform.execute(
[seq],
[[sweeper]],
nshots=NSHOTS,
acquisition_type=AcquisitionType.DISCRIMINATION,
averaging_mode=AveragingMode.SINGLESHOT,
)

assert res[acq_handle].shape == (NSHOTS, 2)