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

Fix add_calibration bug #9223

Merged
merged 3 commits into from
Jan 25, 2023
Merged

Conversation

nkanazawa1989
Copy link
Contributor

Summary

This quantum circuit fails in transpile with main.

from qiskit import pulse, circuit, transpile

# Parameterized calibration
param = circuit.Parameter("P1")
with pulse.build() as my_pulse:
    pulse.play(pulse.Constant(128, param), pulse.DriveChannel(0))

# Add calibration to the inst_map, to attach it through the transpile
inst_map = pulse.InstructionScheduleMap()
inst_map.add("my_gate", (0,), my_pulse)

# This is gate to transpile (to add calibration)
gate = circuit.Gate("my_gate", 1, params=[param])

# Some quantum circuit
qc = circuit.QuantumCircuit(1)
qc.append(gate, [0])

# Transpile to add calibration
qc_transpiled = transpile(qc, basis_gates=["my_gate"], inst_map=inst_map)

This PR fixes the bug.

Details and comments

During the transpile input QuantumCircuit is converted into DAGCircuit and the pulse gate calibration is ported from the provided inst_map. However, QuantumCircuit.add_calibration and DAGCircuit.add_calibration have different parameter formatting mechanism, and parameterized gate operand cannot be properly passed to the DAGCircuit calibration.

This PR updates both add_calibration method so that both methods identically format operand values.

@nkanazawa1989 nkanazawa1989 added Changelog: Bugfix Include in the "Fixed" section of the changelog mod: transpiler Issues and PRs related to Transpiler labels Dec 1, 2022
@nkanazawa1989 nkanazawa1989 requested a review from a team as a code owner December 1, 2022 15:57
@qiskit-bot
Copy link
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the the following people are requested to review this:

@coveralls
Copy link

coveralls commented Dec 1, 2022

Pull Request Test Coverage Report for Build 3986668008

  • 31 of 32 (96.88%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.005%) to 84.929%

Changes Missing Coverage Covered Lines Changed/Added Lines %
qiskit/dagcircuit/dagcircuit.py 15 16 93.75%
Totals Coverage Status
Change from base Build 3986142857: 0.005%
Covered Lines: 66734
Relevant Lines: 78576

💛 - Coveralls

@mtreinish mtreinish added the stable backport potential The bug might be minimal and/or import enough to be port to stable label Jan 23, 2023
@mtreinish mtreinish added this to the 0.23.0 milestone Jan 23, 2023
Copy link
Member

@mtreinish mtreinish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm, this makes sense to unify the param processing. Even if as pointed out in the comments the current mechanism is potentially fragile

@mergify mergify bot merged commit b7ab0dc into Qiskit:main Jan 25, 2023
mergify bot pushed a commit that referenced this pull request Jan 25, 2023
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit b7ab0dc)
mergify bot added a commit that referenced this pull request Jan 25, 2023
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit b7ab0dc)

Co-authored-by: Naoki Kanazawa <nkanazawa1989@gmail.com>
@nkanazawa1989 nkanazawa1989 deleted the fix/dag_parameterized_cal branch December 11, 2023 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: Bugfix Include in the "Fixed" section of the changelog mod: transpiler Issues and PRs related to Transpiler stable backport potential The bug might be minimal and/or import enough to be port to stable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants