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

Fix PulseQobj converter name collision #8839

Merged
merged 7 commits into from
Jan 6, 2023
Merged

Fix PulseQobj converter name collision #8839

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
272620b
Update pulse qobj converter. Reimplemented with visitor pattern.
nkanazawa1989 Oct 5, 2022
e9736b4
Add release note.
nkanazawa1989 Oct 5, 2022
f7a912a
Merge branch 'main' of github.com:Qiskit/qiskit-terra into fix/pulse_…
nkanazawa1989 Dec 10, 2022
f5bf8f3
Review comments
nkanazawa1989 Dec 10, 2022
f1ad415
Use method dispatch
nkanazawa1989 Dec 10, 2022
392324a
give descriptive method name
nkanazawa1989 Jan 4, 2023
49a3493
Merge branch 'main' into fix/pulse_qobj_converter
nkanazawa1989 Jan 6, 2023
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 qiskit/assembler/assemble_schedules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ def _assemble_instructions(
if acquire_instruction_map:
if hasattr(run_config, "meas_map"):
_validate_meas_map(acquire_instruction_map, run_config.meas_map)
for (time, _), instrs in acquire_instruction_map.items():
for (time, _), instruction_bundle in acquire_instruction_map.items():
qobj_instructions.append(
instruction_converter.convert_bundled_acquires(time, instrs),
instruction_converter(time, instruction_bundle),
)

return qobj_instructions, max_memory_slot
Expand Down
16 changes: 5 additions & 11 deletions qiskit/assembler/disassemble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def _disassemble_circuit(qobj) -> CircuitModule:
return CircuitModule((_experiments_to_circuits(qobj), run_config, user_qobj_header))


def _qobj_to_circuit_cals(qobj, pulse_lib, param_pulses):
def _qobj_to_circuit_cals(qobj, pulse_lib):
"""Return circuit calibrations dictionary from qobj/exp config calibrations."""
qobj_cals = qobj.config.calibrations.to_dict()["gates"]
converter = QobjToInstructionConverter(pulse_lib)
Expand All @@ -113,11 +113,8 @@ def _qobj_to_circuit_cals(qobj, pulse_lib, param_pulses):
)
}
for instruction in gate["instructions"]:
schedule = (
converter.convert_parametric(PulseQobjInstruction.from_dict(instruction))
if "pulse_shape" in instruction and instruction["pulse_shape"] in param_pulses
else converter(PulseQobjInstruction.from_dict(instruction))
)
qobj_instruction = PulseQobjInstruction.from_dict(instruction)
schedule = converter(qobj_instruction)
cal[config] = cal[config].insert(schedule.ch_start_time(), schedule)
if gate["name"] in qc_cals:
qc_cals[gate["name"]].update(cal)
Expand Down Expand Up @@ -238,17 +235,14 @@ def _experiments_to_circuits(qobj):
_inst.c_if(conditional["register"], conditional["value"])
conditional = {}
pulse_lib = qobj.config.pulse_library if hasattr(qobj.config, "pulse_library") else []
parametric_pulses = (
qobj.config.parametric_pulses if hasattr(qobj.config, "parametric_pulses") else []
)
# The dict update method did not work here; could investigate in the future
if hasattr(qobj.config, "calibrations"):
circuit.calibrations = dict(
**circuit.calibrations, **_qobj_to_circuit_cals(qobj, pulse_lib, parametric_pulses)
**circuit.calibrations, **_qobj_to_circuit_cals(qobj, pulse_lib)
)
if hasattr(exp.config, "calibrations"):
circuit.calibrations = dict(
**circuit.calibrations, **_qobj_to_circuit_cals(exp, pulse_lib, parametric_pulses)
**circuit.calibrations, **_qobj_to_circuit_cals(exp, pulse_lib)
)
circuits.append(circuit)
return circuits
Expand Down
Loading