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

Add durations of pulse gates from DAG calibrations #7463

Merged
merged 8 commits into from
Jan 22, 2022
Merged

Add durations of pulse gates from DAG calibrations #7463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fc82116
is dag has calibration for node, now passes the duration from the sch…
nbronn Dec 30, 2021
8549e7e
fixed the case in which node.op.name is not in dag.calibrations
nbronn Jan 3, 2022
799d82c
Merge branch 'main' into param-gates-for-dd
nbronn Jan 5, 2022
c5aaa5e
one last linting issue hopefully
nbronn Jan 5, 2022
d8ed6de
fixed issue with .has_calibration() due to error with .add_calibration()
nbronn Jan 10, 2022
98fab9c
Merge branch 'main' into param-gates-for-dd
nbronn Jan 10, 2022
6c9a23c
Merge branch 'main' into param-gates-for-dd
kdk Jan 21, 2022
f20726a
Merge branch 'main' into param-gates-for-dd
mergify[bot] Jan 22, 2022
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: 3 additions & 1 deletion qiskit/dagcircuit/dagcircuit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,9 @@ def add_calibration(self, gate, qubits, schedule, params=None):
Exception: if the gate is of type string and params is None.
"""
if isinstance(gate, Gate):
self._calibrations[gate.name][(tuple(qubits), tuple(gate.params))] = schedule
self._calibrations[gate.name][
(tuple(qubits), tuple(float(p) for p in gate.params))
] = schedule
else:
self._calibrations[gate][(tuple(qubits), tuple(params or []))] = schedule

Expand Down
4 changes: 2 additions & 2 deletions qiskit/transpiler/passes/calibration/builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ def rescale_cr_inst(instruction: Play, theta: float, sample_mult: int = 16) -> P
gaussian_area = abs(amp) * sigma * np.sqrt(2 * np.pi) * math.erf(n_sigmas)
area = gaussian_area + abs(amp) * width

target_area = abs(theta) / (np.pi / 2.0) * area
sign = theta / abs(theta)
target_area = abs(float(theta)) / (np.pi / 2.0) * area
sign = theta / abs(float(theta))

if target_area > gaussian_area:
width = (target_area - gaussian_area) / abs(amp)
Expand Down
12 changes: 9 additions & 3 deletions qiskit/transpiler/passes/scheduling/alap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,15 @@ def pad_with_delays(qubits: List[int], until, unit) -> None:
# validate node.op.duration
if node.op.duration is None:
indices = [bit_indices[qarg] for qarg in node.qargs]
raise TranspilerError(
f"Duration of {node.op.name} on qubits {indices} is not found."
)
if dag.has_calibration_for(node):
node.op.duration = dag.calibrations[node.op.name][
(tuple(indices), tuple(float(p) for p in node.op.params))
].duration

if node.op.duration is None:
raise TranspilerError(
f"Duration of {node.op.name} on qubits {indices} is not found."
)
if isinstance(node.op.duration, ParameterExpression):
indices = [bit_indices[qarg] for qarg in node.qargs]
raise TranspilerError(
Expand Down
12 changes: 9 additions & 3 deletions qiskit/transpiler/passes/scheduling/asap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,15 @@ def pad_with_delays(qubits: List[int], until, unit) -> None:
# validate node.op.duration
if node.op.duration is None:
indices = [bit_indices[qarg] for qarg in node.qargs]
raise TranspilerError(
f"Duration of {node.op.name} on qubits {indices} is not found."
)
if dag.has_calibration_for(node):
node.op.duration = dag.calibrations[node.op.name][
(tuple(indices), tuple(float(p) for p in node.op.params))
].duration

if node.op.duration is None:
raise TranspilerError(
f"Duration of {node.op.name} on qubits {indices} is not found."
)
if isinstance(node.op.duration, ParameterExpression):
indices = [bit_indices[qarg] for qarg in node.qargs]
raise TranspilerError(
Expand Down