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.

Sign up for GitHub

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

Jump to bottom

fix!: correctly compute duration for erfsquare waveform templates #406

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix!: correctly compute duration for erfsquare waveform templates #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2971993
test: add failing test of `erfsquare` durations
antalsz Sep 20, 2024
8aa4e46
fix: fix computation of duration for `erfsquare` waveform templates
antalsz Sep 20, 2024
491ac48
feat: support underscores in `erfsquare`, `padleft`, and `padright`
antalsz Sep 20, 2024
a3deee2
test: fix test cases that assume `erf_square` only needs `duration`
antalsz Sep 20, 2024
0e5bb8c
test: add `pad_*` parameters for `erf_square` to quil-py test cases
antalsz Sep 20, 2024
6df2e21
feat: check for `pad_left` and `pad_right` on all waveforms, include …
antalsz Sep 25, 2024
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
4 changes: 2 additions & 2 deletions quil-py/tests_py/program/test_program.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ def test_basic_block_fixed_schedule():
FENCE q0 q1
SET-PHASE q0 "flux_tx_cz" 0.0
SET-PHASE q1 "flux_tx_iswap" 0.0
NONBLOCKING PULSE q0 "flux_tx_cz" erf_square(duration: 6.000000000000001e-08)
NONBLOCKING PULSE q1 "flux_tx_iswap" erf_square(duration: 6.000000000000001e-08)
NONBLOCKING PULSE q0 "flux_tx_cz" erf_square(duration: 6.000000000000001e-08, pad_left: 0.1e-08, pad_right: 0.1e-08)
NONBLOCKING PULSE q1 "flux_tx_iswap" erf_square(duration: 6.000000000000001e-08, pad_left: 0.1e-08, pad_right: 0.1e-08)
SHIFT-PHASE q0 "flux_tx_cz" 1.0
SHIFT-PHASE q1 "flux_tx_iswap" 1.0
FENCE q0 q1
Expand Down
4 changes: 2 additions & 2 deletions quil-rs/src/program/analysis/control_flow_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,8 +745,8 @@ DEFCAL CZ q0 q1:
FENCE q0 q1
SET-PHASE q0 "flux_tx_cz" 0.0
SET-PHASE q1 "flux_tx_iswap" 0.0
NONBLOCKING PULSE q0 "flux_tx_cz" erf_square(duration: 6.000000000000001e-08)
NONBLOCKING PULSE q1 "flux_tx_iswap" erf_square(duration: 6.000000000000001e-08)
NONBLOCKING PULSE q0 "flux_tx_cz" erf_square(duration: 6.000000000000001e-08, pad_left: 0, pad_right: 0)
NONBLOCKING PULSE q1 "flux_tx_iswap" erf_square(duration: 6.000000000000001e-08, pad_left: 0, pad_right: 0)
SHIFT-PHASE q0 "flux_tx_cz" 1.0
SHIFT-PHASE q1 "flux_tx_iswap" 1.0
FENCE q0 q1
Expand Down
35 changes: 28 additions & 7 deletions quil-rs/src/program/scheduling/schedule.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ impl<'p> ScheduledBasicBlock<'p> {
fn get_waveform_duration_seconds(
program: &Program,
instruction: &Instruction,
waveform_invocation: &WaveformInvocation,
WaveformInvocation { name, parameters }: &WaveformInvocation,
) -> Option<Seconds> {
if let Some(definition) = program.waveforms.get(&waveform_invocation.name) {
if let Some(definition) = program.waveforms.get(name) {
let sample_count = definition.matrix.len();
let common_sample_rate =
program
Expand Down Expand Up @@ -243,11 +243,22 @@ impl<'p> ScheduledBasicBlock<'p> {
.map(|sample_rate| sample_count as f64 / sample_rate)
.map(Seconds)
} else {
waveform_invocation
.parameters
.get("duration")
.and_then(|v| v.to_real().ok())
.map(Seconds)
// Per the Quil spec, all waveform templates have a "duration"
// parameter, and "erf_square" also has "pad_left" and "pad_right".
// We explicitly choose to be more flexible here, and allow any
// built-in waveform templates to have "pad_*" parameters, as well
// as allow "erf_square" to omit them.
let parameter = |parameter_name| {
parameters
.get(parameter_name)
.and_then(|v| v.to_real().ok())
.map(Seconds)
};
Some(
parameter("duration")?
+ parameter("pad_left").unwrap_or(Seconds::zero())
+ parameter("pad_right").unwrap_or(Seconds::zero()),
)
}
}

Expand Down Expand Up @@ -404,6 +415,16 @@ PULSE 0 "a" flat(duration: 1.0)
#[case(
r#"DEFFRAME 0 "a":
SAMPLE-RATE: 1e9
PULSE 0 "a" erf_square(duration: 1.0, pad_left: 0.2, pad_right: 0.3)
PULSE 0 "a" erf_square(duration: 0.1, pad_left: 0.7, pad_right: 0.7)
PULSE 0 "a" erf_square(duration: 0.5, pad_left: 0.6, pad_right: 0.4)
FENCE
"#,
Ok(vec![0.0, 1.5, 3.0, 4.5])
)]
#[case(
r#"DEFFRAME 0 "a":
SAMPLE-RATE: 1e9
DEFFRAME 0 "b":
SAMPLE-RATE: 1e9
NONBLOCKING PULSE 0 "a" flat(duration: 1.0)
Expand Down
Loading