Kickoff the arithmetics library by Cryoris · Pull Request #4061 · Qiskit/qiskit

Cryoris · 2020-04-01T18:51:05Z

Summary

Start the arithmetic part of the circuit library. These circuits have been part of Aqua and have been refactored to derive from a circuit and have blueprint-characteristics, i.e. can be lazily constructed and are mutable.

Details and comments

This PR kicks off the development of the arithmetics library. Once this logic moved here we can remove it from Aqua. The integrated classes are:

Integer comparator: Compares the value of a qubit register against a fixed integer value. Flips the state of a control qubit depending on the result.
Functional Pauli rotations: Apply Pauli rotations based on a function expression, where the argument is the value of a qubit register; RY(f(x))|x>. Note that these can be used to approximate a mapping F|x> |0> -> .. + sqrt(f(x)) |x>|1>.
- linear Pauli rotations: for linear functions
- polynomial Pauli rotations: for polynomial functions
- piecewise linear Pauli rotations: for piecewise linear functions

For a modular design and extensibility, the FunctionalPauliRotations base class has been introduced as base class for all functional Pauli rotations. This is probably also sensible in regard of transpiler passes and circuit optimization, since there exist simplification rules specially for the structures arising from functional rotations.

The tests check both end-to-end results and the mutability of the objects. Ideally we would add a test, that checks that the objects do not break the code in Aqua, but I think this is not supported with the current travis setup (therefore the test is skipped).

Note

This requires the logical or gate from Aqua, which was added -- however this function is not yet properly converted to a Gate.

* fixed value comparator (now integer comparator) * linear rotation (now linear Pauli rotations) * piecewise linear rotation (now piecewise linear pauli rotations) Co-authored-by: Stefan Woerner <wor@zurich.ibm.com>

Co-authored-by: Almudena Carrera Vazquez <acv@zurich.ibm.com>

Co-authored-by: Shaohan Hu <shaohan.hu@ibm.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com>

Co-authored-by: Stefan Woerner <wor@zurich.ibm.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Shaohan Hu <shaohan.hu@ibm.com>

…into library-arithmetic

ajavadia

This is looking good. I checked some parts in detail and others skimmed for now, most comments are about documentation. I'll have another look before merge.

ajavadia · 2020-04-05T21:22:46Z

+        return self._num_state_qubits
+
+    @num_state_qubits.setter
+    def num_state_qubits(self, num_state_qubits: Optional[int]) -> None:


why is the setter input optional?

So that the circuit can be "reset" by

circuit.num_state_qubits = None

Maybe an application checks of the number of qubits has been set or not, though I don't have a concrete example where this would be needed. Should I set it to not support None?

that's fine. i just see that in this PR some setters accept None and some don't, is that intentional?

Co-Authored-By: Ali Javadi-Abhari <ajavadia@users.noreply.github.com>

…into library-arithmetic

* add functional rotations base class * refactor first arithmetic circuits * fixed value comparator (now integer comparator) * linear rotation (now linear Pauli rotations) * piecewise linear rotation (now piecewise linear pauli rotations) Co-authored-by: Stefan Woerner <wor@zurich.ibm.com> * integrate polynomial rotations Co-authored-by: Almudena Carrera Vazquez <acv@zurich.ibm.com> * update inits * add tests * skip test depending on Aqua * fix imports: no weighted_adder, add functional_rot * move circ diag in parsed-literal block * adjust formatting of linear circ diag * update rendering of docstrings * move AND/OR gates from Aqua Co-authored-by: Shaohan Hu <shaohan.hu@ibm.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com> * use data getter not _data in copy * add missing gate inits * fix imports * fix lint * move WSO from aqua Co-authored-by: Stefan Woerner <wor@zurich.ibm.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Shaohan Hu <shaohan.hu@ibm.com> * rename to weighted adder * refactor weighted adder and make a circuit * updates inits with weighted adder * add tests for weighted adder * fix outdated mcu1 import * add functional pauli rotations import * Update test/python/circuit/test_library.py Co-Authored-By: Ali Javadi-Abhari <ajavadia@users.noreply.github.com> * Update qiskit/circuit/library/arithmetic/weighted_adder.py Co-Authored-By: Ali Javadi-Abhari <ajavadia@users.noreply.github.com> * add comment on default behaviour of the weights * fix rst rendering * include arithmetic circs in sphinx * fix copyright * add _invalidate() method Co-authored-by: Stefan Woerner <wor@zurich.ibm.com> Co-authored-by: Almudena Carrera Vazquez <acv@zurich.ibm.com> Co-authored-by: Shaohan Hu <shaohan.hu@ibm.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Ali Javadi-Abhari <ajavadia@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Cryoris and others added 7 commits April 1, 2020 20:30

add functional rotations base class

33dd11b

refactor first arithmetic circuits

cca3170

* fixed value comparator (now integer comparator) * linear rotation (now linear Pauli rotations) * piecewise linear rotation (now piecewise linear pauli rotations) Co-authored-by: Stefan Woerner <wor@zurich.ibm.com>

integrate polynomial rotations

bcbad39

Co-authored-by: Almudena Carrera Vazquez <acv@zurich.ibm.com>

update inits

75d33b2

add tests

14d6c35

skip test depending on Aqua

dfdda6c

Merge branch 'master' into library-arithmetic

44e4506

Cryoris requested review from 1ucian0, ajavadia, ewinston, kdk and mtreinish as code owners April 1, 2020 18:51

Cryoris requested review from dongreenberg, stefan-woerner and woodsp-ibm April 1, 2020 18:51

Cryoris added this to the 0.13 milestone Apr 1, 2020

ajavadia reviewed Apr 1, 2020

View reviewed changes

Comment thread qiskit/circuit/library/arithmetic/__init__.py

Comment thread qiskit/circuit/library/arithmetic/linear_pauli_rotations.py Outdated

Cryoris added 3 commits April 1, 2020 22:09

fix imports: no weighted_adder, add functional_rot

2472e5f

move circ diag in parsed-literal block

b8567ef

adjust formatting of linear circ diag

e0176cd

Cryoris changed the title ~~Kickoff the arithmetics library~~ [WIP] Kickoff the arithmetics library Apr 1, 2020

Cryoris and others added 6 commits April 1, 2020 22:24

update rendering of docstrings

a9b6fe7

move AND/OR gates from Aqua

ebcf7c0

Co-authored-by: Shaohan Hu <shaohan.hu@ibm.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com>

use data getter not _data in copy

1e59509

add missing gate inits

a528d92

fix imports

e0d7ad9

fix lint

52574e6

Cryoris changed the title ~~[WIP] Kickoff the arithmetics library~~ Kickoff the arithmetics library Apr 2, 2020

Cryoris and others added 2 commits April 2, 2020 11:13

Merge branch 'master' into library-arithmetic

2dbed9b

move WSO from aqua

ef8adc2

Co-authored-by: Stefan Woerner <wor@zurich.ibm.com> Co-authored-by: Manoel Marques <manoel@us.ibm.com> Co-authored-by: Shaohan Hu <shaohan.hu@ibm.com>

Cryoris added 8 commits April 3, 2020 20:28

rename to weighted adder

4645b35

refactor weighted adder and make a circuit

ef8a8b4

updates inits with weighted adder

c4ca57a

add tests for weighted adder

4c72a27

Merge branch 'library-arithmetic' of github.com:Cryoris/qiskit-terra …

dde459b

…into library-arithmetic

Merge branch 'master' into library-arithmetic

1285864

fix outdated mcu1 import

e1eed60

Merge branch 'master' into library-arithmetic

012b92d

ajavadia reviewed Apr 6, 2020

View reviewed changes

add functional pauli rotations import

5f7a9c9

Qiskit deleted a comment from ajavadia Apr 6, 2020

Cryoris and others added 9 commits April 6, 2020 11:03

Update test/python/circuit/test_library.py

0ab26aa

Co-Authored-By: Ali Javadi-Abhari <ajavadia@users.noreply.github.com>

Update qiskit/circuit/library/arithmetic/weighted_adder.py

f9fb70b

Co-Authored-By: Ali Javadi-Abhari <ajavadia@users.noreply.github.com>

Merge branch 'library-arithmetic' of github.com:Cryoris/qiskit-terra …

7f5c9c7

…into library-arithmetic

add comment on default behaviour of the weights

47966ab

fix rst rendering

76c3917

include arithmetic circs in sphinx

19ce135

fix copyright

c754fcd

add _invalidate() method

cf45675

Merge branch 'master' into library-arithmetic

0e3b792

ajavadia approved these changes Apr 7, 2020

View reviewed changes

ajavadia added the automerge label Apr 7, 2020

mergify Bot and others added 2 commits April 7, 2020 02:08

Merge branch 'master' into library-arithmetic

a3ad68a

Merge branch 'master' into library-arithmetic

bd2662e

mergify Bot merged commit 5571747 into Qiskit:master Apr 7, 2020

Cryoris mentioned this pull request Apr 11, 2020

Remove the boolean logic gates qiskit-community/qiskit-aqua#896

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kickoff the arithmetics library#4061

Kickoff the arithmetics library#4061
mergify[bot] merged 38 commits into
Qiskit:masterfrom
Cryoris:library-arithmetic

Cryoris commented Apr 1, 2020 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

ajavadia left a comment

Uh oh!

Uh oh!

Uh oh!

ajavadia Apr 5, 2020

Uh oh!

Cryoris Apr 6, 2020

Uh oh!

ajavadia Apr 7, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Cryoris commented Apr 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details and comments

Note

Uh oh!

Uh oh!

Uh oh!

ajavadia left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ajavadia Apr 5, 2020

Choose a reason for hiding this comment

Uh oh!

Cryoris Apr 6, 2020

Choose a reason for hiding this comment

Uh oh!

ajavadia Apr 7, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Cryoris commented Apr 1, 2020 •

edited

Loading