Skip to content
This repository was archived by the owner on Dec 7, 2021. It is now read-only.

Use qiskit.circuit.library AND/OR instead of QuantumCircuit #917

Merged
manoelmarques merged 2 commits into from
Apr 25, 2020
Merged

Use qiskit.circuit.library AND/OR instead of QuantumCircuit #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00080ec
Use qiskit.circuit.library AND/OR instead of QuantumCircuit
manoelmarques Apr 25, 2020
b895619
replace append with compose
manoelmarques Apr 25, 2020
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
3 changes: 2 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ jobs:
- optimization37
- optimization38
install:
- pip --version
# dummy install cmd to prevent travis from installing requirements.txt
- pip --version
script:
- sort -f -u aqua137.dep aqua138.dep aqua237.dep aqua238.dep chemistry37.dep chemistry38.dep finance37.dep finance38.dep ml37.dep ml38.dep optimization37.dep optimization38.dep || true
- stage: Coverage
Expand Down
99 changes: 50 additions & 49 deletions qiskit/aqua/circuits/boolean_logical_circuits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

from qiskit import QuantumCircuit, QuantumRegister
from qiskit.qasm import pi
from qiskit.circuit.library import AND, OR

from qiskit.aqua import AquaError

Expand Down Expand Up @@ -305,13 +306,13 @@ def construct_circuit(
lits = [l[1] for l in self._ast[1:]]
flags = BooleanLogicNormalForm._lits_to_flags(lits)
if flags is not None:
circuit.AND(
self._variable_register,
self._output_register[0],
self._ancillary_register,
flags=flags,
mct_mode=mct_mode
)
and_circuit = AND(num_variable_qubits=len(self._variable_register),
flags=flags, mcx_mode=mct_mode)
qubits = self._variable_register[:] + [self._output_register[0]]
if self._ancillary_register:
qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]

circuit.compose(and_circuit, qubits, inplace=True)
else: # self._depth == 2:
active_clause_indices = []
# compute all clauses
Expand All @@ -328,13 +329,13 @@ def construct_circuit(
flags = BooleanLogicNormalForm._lits_to_flags(lits)
if flags is not None:
active_clause_indices.append(clause_index)
circuit.OR(
self._variable_register,
self._clause_register[clause_index],
self._ancillary_register,
flags=flags,
mct_mode=mct_mode
)
or_circuit = OR(num_variable_qubits=len(self._variable_register),
flags=flags, mcx_mode=mct_mode)
qubits = self._variable_register[:] + [self._clause_register[clause_index]]
if self._ancillary_register:
qubits += self._ancillary_register[:or_circuit.num_ancilla_qubits]

circuit.compose(or_circuit, qubits, inplace=True)

# collect results from all clauses
circuit.mct(
Expand All @@ -352,13 +353,13 @@ def construct_circuit(
lits = [clause_expr[1]]
flags = BooleanLogicNormalForm._lits_to_flags(lits)
if flags is not None:
circuit.OR(
self._variable_register,
self._clause_register[clause_index],
self._ancillary_register,
flags=flags,
mct_mode=mct_mode
)
or_circuit = OR(num_variable_qubits=len(self._variable_register),
flags=flags, mcx_mode=mct_mode)
qubits = self._variable_register[:] + [self._clause_register[clause_index]]
if self._ancillary_register:
qubits += self._ancillary_register[:or_circuit.num_ancilla_qubits]

circuit.compose(or_circuit, qubits, inplace=True)

return circuit

Expand Down Expand Up @@ -411,13 +412,13 @@ def construct_circuit(
lits = [l[1] for l in self._ast[1:]]
flags = BooleanLogicNormalForm._lits_to_flags(lits)
if flags is not None:
circuit.OR(
self._variable_register,
self._output_register[0],
self._ancillary_register,
flags=flags,
mct_mode=mct_mode
)
or_circuit = OR(num_variable_qubits=len(self._variable_register),
flags=flags, mcx_mode=mct_mode)
qubits = self._variable_register[:] + [self._output_register[0]]
if self._ancillary_register:
qubits += self._ancillary_register[:or_circuit.num_ancilla_qubits]

circuit.compose(or_circuit, qubits, inplace=True)
else:
circuit.u3(pi, 0, pi, self._output_register[0])
else: # self._depth == 2
Expand All @@ -434,13 +435,13 @@ def construct_circuit(
)
flags = BooleanLogicNormalForm._lits_to_flags(lits)
if flags is not None:
circuit.AND(
self._variable_register,
self._clause_register[clause_index],
self._ancillary_register,
flags=flags,
mct_mode=mct_mode
)
and_circuit = AND(num_variable_qubits=len(self._variable_register),
flags=flags, mcx_mode=mct_mode)
qubits = self._variable_register[:] + [self._clause_register[clause_index]]
if self._ancillary_register:
qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]

circuit.compose(and_circuit, qubits, inplace=True)
else:
circuit.u3(pi, 0, pi, self._clause_register[clause_index])

Expand All @@ -465,13 +466,13 @@ def construct_circuit(
lits = [clause_expr[1]]
flags = BooleanLogicNormalForm._lits_to_flags(lits)
if flags is not None:
circuit.AND(
self._variable_register,
self._clause_register[clause_index],
self._ancillary_register,
flags=flags,
mct_mode=mct_mode
)
and_circuit = AND(num_variable_qubits=len(self._variable_register),
flags=flags, mcx_mode=mct_mode)
qubits = self._variable_register[:] + [self._clause_register[clause_index]]
if self._ancillary_register:
qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]

circuit.compose(and_circuit, qubits, inplace=True)
else:
circuit.u3(pi, 0, pi, self._clause_register[clause_index])
return circuit
Expand Down Expand Up @@ -528,13 +529,13 @@ def build_clause(clause_expr):
else:
raise AquaError('Unexpected clause expression {}.'.format(clause_expr))
flags = BooleanLogicNormalForm._lits_to_flags(lits)
circuit.AND(
self._variable_register,
self._output_register[self._output_idx],
self._ancillary_register,
flags=flags,
mct_mode=mct_mode
)
and_circuit = AND(num_variable_qubits=len(self._variable_register),
flags=flags, mcx_mode=mct_mode)
qubits = self._variable_register[:] + [self._output_register[self._output_idx]]
if self._ancillary_register:
qubits += self._ancillary_register[:and_circuit.num_ancilla_qubits]

circuit.compose(and_circuit, qubits, inplace=True)

# compute all clauses
if self._depth == 0:
Expand Down