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

Fixes disassembler error for mcx gate #6291

Merged
merged 7 commits into from
Apr 24, 2021
Merged

Fixes disassembler error for mcx gate #6291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43c1ff8
Fix disassemble of mcx gates
enavarro51 Apr 21, 2021
0897223
Add compiler test
enavarro51 Apr 22, 2021
f62100c
Merge branch 'main' into disassemble_mcx_6271
enavarro51 Apr 22, 2021
a95a4b1
Merge branch 'main' into disassemble_mcx_6271
kdk Apr 23, 2021
1cac361
Merge branch 'main' into disassemble_mcx_6271
enavarro51 Apr 24, 2021
feec3a4
Merge branch 'main' into disassemble_mcx_6271
mergify[bot] Apr 24, 2021
b0b5022
Merge branch 'main' into disassemble_mcx_6271
mergify[bot] Apr 24, 2021
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
2 changes: 2 additions & 0 deletions qiskit/assembler/disassemble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def _experiments_to_circuits(qobj):
_inst = instr_method(params, qubits)
elif i.name == 'isometry':
_inst = instr_method(*params, qubits, clbits)
elif i.name in ['mcx', 'mcu1', 'mcp']:
_inst = instr_method(*params, qubits[:-1], qubits[-1], *clbits)
else:
_inst = instr_method(*params, *qubits, *clbits)
elif name == 'bfunc':
Expand Down
15 changes: 15 additions & 0 deletions test/python/compiler/test_disassembler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,21 @@ def test_circuit_with_simple_conditional(self):
self.assertEqual(circuits[0], qc)
self.assertEqual({}, header)

def test_circuit_with_mcx(self):
"""Verify disassemble handles mcx gate - #6271."""
qr = QuantumRegister(5)
cr = ClassicalRegister(5)
qc = QuantumCircuit(qr, cr)
qc.mcx([0, 1, 2], 4)
qobj = assemble(qc)
circuits, run_config_out, header = disassemble(qobj)
run_config_out = RunConfig(**run_config_out)
self.assertEqual(run_config_out.n_qubits, 5)
self.assertEqual(run_config_out.memory_slots, 5)
self.assertEqual(len(circuits), 1)
self.assertEqual(circuits[0], qc)
self.assertEqual({}, header)

def test_multiple_conditionals_multiple_registers(self):
"""Verify disassemble handles multiple conditionals and registers."""
qr = QuantumRegister(3)
Expand Down