Implement MatrixGate and simplify __eq__ in BasicGate to improve performance #288
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
most unit tests adjusted to new behavior
allow construction of MatrixGate from np.matrix and similar data structures implemented get_inverse() for MatrixGate
…invert a MatrixGate with no matrix
added unit test of various MatrixGate comparisons
|
Thanks for the PR! I will do the review in the next days. For legal reason, we require a standard contributor license agreement (CLA) from all contributors to ProjectQ. This CLA is a standard contract used by many Apache 2 licensed projects to give us a non-exclusive license to your contributions (so that we can, for example, redistribute it here on GitHub under the Apache 2 license). It can be signed online. Could you send me an empty email to info@projectq.ch so that I can send the CLA to your email for online signing? |
added optional argument to matrix setter to display attribute error directly to users even if they supply a matrix
cgogolin
added a commit
to PennyLaneAI/pennylane-pq
that referenced
this pull request
Dec 4, 2018
on Travis install PennyLane from git expecting implementation of my PR ProjectQ-Framework/ProjectQ#288, updated the plugin to be compatible with upcoming versions of ProjectQ
|
You should have received the signed CLA. Any feedback on the proposed implementation? |
|
CLA was received :) I have set aside time next week to work on ProjectQ, in particular your pull request |
|
A short update: I am very sorry for the delay. This PR looks fine and increases the performance significantly, thanks a lot for that 👍 As mentioned in #282 there is one downside to this approach that I will do some experiments with adding a branch |
There was a problem hiding this comment.
There are some possible issues with changing DaggeredGate to a MatrixGate. To make things easy, I'd suggest to remove the matrix property from BasicGate.
As mentioned previously this method returns False for:
MatrixGate([[0, 1], [1, 0]]) == X
I will commit a different version to this branch for which the above returns True and there is almost no speed decrease in normal use cases (i.e. only a few MatrixGates).
Let me know what you think about this new version.
projectq/ops/_basics.py
Outdated
| return False | ||
|
|
||
| def __str__(self): | ||
| raise NotImplementedError('This gate does not implement __str__.') |
There was a problem hiding this comment.
We need a __str__ and __hash__, e.g., for resource counting as this is now officially a gate which people can use directly
projectq/ops/_basics.py
Outdated
| def matrix(self, matrix=None): | ||
| raise AttributeError("You cannot set the matrix property of gates derived" | ||
| "from BasicGate. Please use MatrixGate instead if" | ||
| "you need that functionality.") |
There was a problem hiding this comment.
White spaces are missing in error message
projectq/ops/_metagates.py
Outdated
| @@ -39,7 +39,7 @@ class ControlQubitError(Exception): | |||
| pass | |||
|
|
|||
|
|
|||
| class DaggeredGate(BasicGate): | |||
| class DaggeredGate(MatrixGate): #todo: do we want this? | |||
There was a problem hiding this comment.
No, this should still be a BasicGate besides this introduces a bug, for example:
A DaggeredGate of QFT would now have a matrix property (because it is derived from MatrixGate) but it has no internal _matrix to return when DaggeredGate.matrix is called and will raise an AttributeError for _matrix which looks like an internal error
| @@ -29,7 +29,7 @@ | |||
| from projectq import MainEngine | |||
| from projectq.cengines import (BasicEngine, BasicMapperEngine, DummyEngine, | |||
| LocalOptimizer, NotYetMeasuredError) | |||
| from projectq.ops import (All, Allocate, BasicGate, BasicMathGate, CNOT, | |||
| from projectq.ops import (All, Allocate, BasicGate, MatrixGate, BasicMathGate, CNOT, | |||
There was a problem hiding this comment.
Line >80 characters and alphabetic order for inputs
|
Any comments on the changes which I have commit to this PR? Otherwise it looks good to me and should be incorporated into a new pip version asap. |
cgogolin
commented
Jan 30, 2019
There was a problem hiding this comment.
I am happy with the "middle ground solution" of comparing matrices in __eq__() only if one of the gates is a MatrixGate. Returning NotImplemented is a smart thing to do, which I didn't consider.
I just left a few comments on code duplication and doc strings which I would like to see addressed.
projectq/ops/_basics.py
Outdated
| @@ -262,12 +272,19 @@ def __eq__(self, other): | |||
| return True | |||
| return False | |||
|
|
|||
| def __ne__(self, other): | |||
| return not self.__eq__(other) | |||
|
|
|||
There was a problem hiding this comment.
Why is that necessary? Isn't __ne__() with the same implementation inherited from BasicGate?
There was a problem hiding this comment.
Sorry my bad, of course it uses __ne__ from BasicGate.
(It's a habit from Python2's old classes)
| def __str__(self): | ||
| raise NotImplementedError('This gate does not implement __str__.') | ||
| return("MatrixGate(" + str(self.matrix.tolist()) + ")") |
There was a problem hiding this comment.
Why do you convert to list here? Isn't it better if it is visible in the output that self.matrix is a numpy array (i.e., no commas between elements vs. commas between elements for lists)?
There was a problem hiding this comment.
Just so that the CommandPrinter prints such a gate on one line. A numpy matrix string has line breaks which then looks slightly weird to me.
We can use numpy arrays for this string once we switch from numpy matrix to numpy arrays #287
| return("MatrixGate(" + str(self.matrix.tolist()) + ")") | ||
|
|
||
| def __hash__(self): | ||
| return hash(str(self)) |
There was a problem hiding this comment.
Again, this seems superflous because __hash__() is inherited.
There was a problem hiding this comment.
uups. Python3 seems to remove hash if eq is redefined...
| """ Return True if equal (i.e., instance of same class). | ||
| """ | ||
| if not isinstance(other, self.__class__): | ||
| if not hasattr(other, 'matrix'): |
There was a problem hiding this comment.
I achnowledge that the docstring was not good, but do you really want no docstring at all?
projectq/ops/_basics.py
Outdated
| raise AttributeError("You cannot set the matrix property of gates derived" | ||
| "from BasicGate. Please use MatrixGate instead if" | ||
| "you need that functionality.") | ||
|
|
||
| def __eq__(self, other): | ||
| """ Return True if equal (i.e., instance of same class). |
There was a problem hiding this comment.
Maybe better "Return True if instance of the same class, unless other is an instance of :class:MatrixGate, in which case equality is to be checked by testing for existence and (approximate) equality of matrix representations."
|
I leave it to you to decide on and implement my requested changes. However you decide, green light for the merge. |
|
Thanks for the review. I have included your comments into this version which definitely makes the code better 👍 |
damiansteiger
approved these changes
Jan 30, 2019
WrathfulSpatula
added a commit
to vm6502q/ProjectQ
that referenced
this pull request
Apr 19, 2020
* Update to newer RevKit version. (ProjectQ-Framework#271) * Add VQE example (ProjectQ-Framework#274) * Update docs of decompositions. (ProjectQ-Framework#281) * Add FlipBits gate (ProjectQ-Framework#289) * Fix strings with invalid escape sequences. (ProjectQ-Framework#300) * Avoid 502 error when waiting for IBM Q results, resolves ProjectQ-Framework#291 (ProjectQ-Framework#294) * Expose num_retries and interval in IBMBackend (ProjectQ-Framework#295) * Don't accept controlled single-qubit gates in restricted gate set. (ProjectQ-Framework#301) * Implement MatrixGate and simplify __eq__ in BasicGate to improve performance (ProjectQ-Framework#288) * Bumped version number to 0.4.2 * Phase Estimation as a Gate in ops (ProjectQ-Framework#260) * First testing version of Phase Estimation with a lot of hardcoding * Adapt to All(Measure) * Adding operators for more than 1 quibit, first version * Adding operators for more than 1 quibit, first versioni: testing * Work in progress: create a PhaseX gate to tests via class * Work in progress: create a PhaseX gate to tests via class. Clean garbaje files * Work in progress: create a PhaseX gate to tests via class. Some enhanement * Work in progress: create a PhaseX gate to tests via class. PhaseX testing * Work in progress: Debugging algorithm * Work in progress: Debugging algorithm * Adding 2qubit example * adding 2 qubit Gate * Initial version * Create Phase Estimation as a new Gate in operations * Solving travis checks * python 2 compatibility + error in StatePreparation normalization * test coverage includes now the string * Improve the check test for no eigenvector test * Start modifying to decomposition * QPE as decomposition and gate * QPE as decomposition and gate: correct a detail in the test * try to get the travis-ci freeze solved * Solve a name not defined error in the phaseestimation tests * Solve coverage in tests * Address comments in review + change how to assert the tests * Enhance statistis in the tests bi more executions * Correct bad calculation in tests * Refine test * Address Andi comments: add detail in the examples and atributes and removing code in the test that is never executed * Correct statistics in qpe test (ProjectQ-Framework#328) * Amplitude Amplification algorithm as a Gate in ops * Amplitude Amplification algorithm as a Gate in ops, correct test_string_functions * Amplitude Amplification algorithm as a Gate in ops, correct coverage for _qaagate_test * Amplitude Amplification algorithm as a Gate in ops, correct test estimation statistics in phaseestimation_test * Try to triger Travis test because an apt get failure in the travis test * resend docs/projectq.ops.rst file * resend file versions previous to AA * Try to triger Travis test because it never ran * Try to triger Travis test again to try to get the tests ran * Amplitude Amplification algorithm as a Gate in ops (ProjectQ-Framework#327) * Amplitude Amplification algorithm as a Gate in ops * Amplitude Amplification algorithm as a Gate in ops, correct test_string_functions * Amplitude Amplification algorithm as a Gate in ops, correct coverage for _qaagate_test * Amplitude Amplification algorithm as a Gate in ops, correct test estimation statistics in phaseestimation_test * Try to triger Travis test because an apt get failure in the travis test * Address changes proposed by Damien * Address changes proposed by Damien, missed one * Address comments by Damien including eliminate the usage of algorith_inverse and eliminate QPE files form the PR * Address comments by Damien including eliminate the usage of algorith_inverse and eliminate QPE files form the PR, second try * Address comments by Damien forgot _qaagate_test * Update amplitudeamplification_test.py Wrap lines to 80 characters * Update amplitudeamplification.py Wrap lines to 80 characters * Update _qaagate.py Minor style correction * Update amplitudeamplification_test.py Cleanup imports * 3 additional 2-qubit gates (ProjectQ-Framework#330) * Modified _gates.py: Documentation, 2-qubit rotations, 1qubit-rotation string attributes. * Strings of rotation gates fixed. * Added two-qubit rotation gate tests. * Resource Counter import Rzz added. * Added Rzz test and fixed expected outcome. * removed wrongfully pushed dev gates. * Update _gates.py Remove unneeded import * Removed hardcoded "Phase" name for Ph(angle) gate * C++ simulator performance improvements (ProjectQ-Framework#329) * C++ simulator performance: make the swap-gate run in native C++ It was defined as a BasicMathGate before which made it run as python code through the emulate_math_wrapper. The new variant just uses its matrix representation to run it in native code. * C++ simulator performance: add dedicated C++ code for common math gates The BasicMathGate uses a C++ python wrapper (emulate_math_wrapper) to allow generic calculations which makes it very slow. This detects some math gates and provides a native C++ implementation for it. * C++ simulator performance: use larger memory alignment * C++ simulator performance: recycle large StateVector memory buffers This avoids costly std::vector copying/reallocations by using some static std::vector to reuse the allocated buffer (just by std::swap'ing a vector into a buffer for later use when it would be deallocated otherwise). * C++ simulator performance: improve compiler flags * Add test coverage for constant math emulation * Revert "Add test coverage for constant math emulation" This reverts commit 3bb8a2c. * Add test coverage for constant math emulation * Update constant math documentation to include list of pre-conditions (ProjectQ-Framework#331) * Allow selection of drawing order in CircuitDrawer (solves ProjectQ-Framework#333) (ProjectQ-Framework#334) * included the possibility to draw the gates in the order they were added to the circuit * edited param names tests should pass now * solved comments * solved comments * passes tests * Test for unordered and ordered circuit drawing * Reindent files in _circuits * Minor adjustments to _drawer.py * added test_body_with_drawing_order * fixed tests and how draw_gates_in_parallel is interpreted * Fix failing tests with Python 2.7 One test of _to_latex_test.py was failing due to precision issues. * Trapped ion decomposer setup and rotation gates improvement (ProjectQ-Framework#346) * reduced Ry decomposition : modification of restrictedgateset setup to include compiler chooser, extension of available decompositions, new setup based on restrictedgateset but adapted for trapped ion configurations * Addition of test file for the rz2rx decomposition Addition of test file for the rz2rx decomposition and edit to comments in the rz2rx file * Revert "Addition of test file for the rz2rx decomposition" This reverts commit 5aab56b. * Create rz2rx_test file Addition of test file for the rz2rx decomposition * Update rz2rx.py Update to comments * Update rz2rx_test.py Update to comments * Minor update: remove accidental file * Minor update rz2rx.py Corrected an angle. * Minor update rz2rx_test.py Edited comments. * Create h2rx_test.py Updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * Improvement of the decomposition chooser; Note that basic restricted gate set will fail decomposing into Rxx because of the default chooser * Updates to h2rx and cnot2rxx * Create cnot2rxx_test.py Testing file for cnot2rxx decomposition. Includes updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * basic rotation gates at an angle of 0 or 2pi are removed by the optimizer. basic rotation gates ignore now the global phase and are defined over 0:2pi * Update and create trapped_ion_decomposer_test.py * Minor update Documentation and comments. * Update on comments regarding Identity gates * Changes 1/2 : command can be printed with unicode symbols only via new to_String method; syntax correction; * Work in progress, is commutable * Update to decomposition test files rz2rx_test now tests each decomposition defined in rz2rx.all_defined_decomposition_rules Similar for cnot2rxx_test and h2rx_test * Revert "Work in progress, is commutable" This reverts commit 27f820c. * minor fixes; revert rotation gates to [0;4pi) * fix comments * Fix a few issues with the trapped-ion setup - Store the sign of the last Ry gate on an engine-by-engine basis - Cleanup of some remaining print statements - Some stylistic issues fixed * Mostly fixing stylistic issues and some code cleanup * h2rx decomposition with correct global phase * cnot2rxx decomposition with correct global phase * Fix non-ASCII character in cnot2rxx.py * Fix some more files for non-ASCII characters * Specify encoding for files with non-ASCII characters * Fix test errors * Fix tests for Python 2.7 * Complete code coverage for trapped-ion setup Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Matplotlib drawer backend (ProjectQ-Framework#352) * Adding tutorials directory * test * BV Algorithm * add Matplotlib circuit drawer backend, this version works for H, CNOT, and Multi-CNOT. * Delete the added unnecessary attributes in Command object * Create the CircuitDrawerMatplotlib Class to handles drawing with matplotlib * Deleted tutorials/.gitkeep * update * fix measurement gate * Delete unrelated files. * fix Toffoli gate position issue and change the qubit position from 'str' to 'int' * Pytest for drawer_mpl * Tests for _plot function * Fix the R(angle) gate drawing * added test for is_available and QFT gate * fix drawing distance between gates when gate_length >2 * new test png for pytest mpl * added Swap gates and CSwap gate with multi-control and multi-target. * update test and comments * Address comments in _drawer.py * Reindent and reformat parts of _drawer.py * Address comments in _plot.py - Minor tweaks, code cleanup, rewrites, etc. * Reindent and reformat _plot.py * update tests * Move matplotlib drawer into its own file + add test coverage * Use regular expressions to rewrite and shorten gate names * Change internal storage format for CircuitDrawerMatplotlib * Better graphics and adapt plot functions to new internal format - Support for new internal format - Resulting quantum circuit figure whould work better with scaling - Large quantum circuits will now result in wider figure instead of squeezing everything into the default matplotlib size - Some support for multi-target qubit gates - General code cleanup - Dropped support for double lines when qubit is in classical state * Complete test coverage + add some checks for to_draw() inputs * Compatibility with matplotlib 2.2.3 * Remove compatibility code for MacOSX. Use local matplotlibrc if necessary instead. * Add matplotlib dependency to requirements.txt * Fix non-UTF8 character in file * Fix .travis.yml * Remove unnecessary PNG files * Add CircuitDrawerMatplotlib to documentation and minor code fix * Fix docstring for CircuitDrawerMatplotlib Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Ibm backend v2 (solves ProjectQ-Framework#318 and ProjectQ-Framework#347) (ProjectQ-Framework#349) * reduced Ry decomposition : modification of restrictedgateset setup to include compiler chooser, extension of available decompositions, new setup based on restrictedgateset but adapted for trapped ion configurations * Addition of test file for the rz2rx decomposition Addition of test file for the rz2rx decomposition and edit to comments in the rz2rx file * Revert "Addition of test file for the rz2rx decomposition" This reverts commit 5aab56b. * Create rz2rx_test file Addition of test file for the rz2rx decomposition * Update rz2rx.py Update to comments * Update rz2rx_test.py Update to comments * Minor update: remove accidental file * Minor update rz2rx.py Corrected an angle. * Minor update rz2rx_test.py Edited comments. * Create h2rx_test.py Updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * Improvement of the decomposition chooser; Note that basic restricted gate set will fail decomposing into Rxx because of the default chooser * Updates to h2rx and cnot2rxx * Create cnot2rxx_test.py Testing file for cnot2rxx decomposition. Includes updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * basic rotation gates at an angle of 0 or 2pi are removed by the optimizer. basic rotation gates ignore now the global phase and are defined over 0:2pi * Update and create trapped_ion_decomposer_test.py * Minor update Documentation and comments. * Update on comments regarding Identity gates * Changes 1/2 : command can be printed with unicode symbols only via new to_String method; syntax correction; * Work in progress, is commutable * Update to decomposition test files rz2rx_test now tests each decomposition defined in rz2rx.all_defined_decomposition_rules Similar for cnot2rxx_test and h2rx_test * Revert "Work in progress, is commutable" This reverts commit 27f820c. * ibmq fix: projectq uses new ibmq API (no doc available, just look at qiskit). Connection fixed for 5qb devices, the 15qb melbourne device and the online simulator coupling map obtained from ibm server instead of being manually written one setup can be used for the 3 different backend * minor fixes * update on the ibm example * minor fixes; revert rotation gates to [0;4pi) * fix comments * fix mapper choice for simulator. added comments * minor fixes with results, mapper and testing files. Improvement of get_probabilities * Revert "Merge branch 'develop' into ibm_V2" This reverts commit cd0452a, reversing changes made to 03daf79. * minor fixes * bug fix in client test file * fixing bug and python2.7 compatibility for testing files * fix errors * major fix on testing files * minor fix on comments and python 2.7 compatibility * fix 'super()' call for python 2.7 * additional tests * python2.7 fix * increase coverage, fix a print statement * Some minor stylistic adjustments * Reindent files and fix some linting warnings/errors * Improve test coverage * Improve code readability Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Automatically generate documentation ReST files (ProjectQ-Framework#339) * Automate generation of documentation ReST files * Fix error in conf.py * Adjust .gitignore * Update setup.py (ProjectQ-Framework#337) * Rewrite setup.py to fix some issues on Mac OSX and some code cleanup - On Mac OSX with Homebrew, properly find the path to the OpenMP library if compiling with clang from Homebrew - Code cleanup and some reformating * Remove use of deprecated setuptools.Feature Now try to compile the C++ simulator and if it fails, simply install a pure Python package with some warning messages for the user. * Update documentation to reflect the latest change to setup.py * Fix error with deleted method of BuildExt * Remove global COPYING file and move text to setup.py file itself * Fix compilation issues on MacOS X * Update .gitignore * Fix setup.py for Python2 and MacPorts (Mac OS) * Fix setup.py on Windows * Some more fixes * Attempt to fix failing installation on Travis CI * Fix installation under Linux * Undo changes in .travis.yml * Update setup related tutorials * Fix a few remaining typos. * ProjectQ v0.5.0 (ProjectQ-Framework#356) * Bumped version number to 0.5.0 * Remove unneeded test * Fix error in examples/ibm.py * Add documentation for **kwargs for CircuitDrawerMatplotlib * Update setup.py license header Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> * Fix generated documentation (ProjectQ-Framework#360) * Fix some issues with builtin modules and fix some warnings * Move generated documentation files into dedicated folder Co-authored-by: Damien Nguyen <damien1@huawei.com> * Fix bugs with matplotlib drawer (ProjectQ-Framework#361) * Accept keywords arguments for Matplotlib drawing * fix circ drawer when depth == 1 Co-authored-by: Damien Nguyen <damien1@huawei.com> Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> Co-authored-by: Mathias Soeken <mathias.soeken@gmail.com> Co-authored-by: Christian Gogolin <git@cgogolin.de> Co-authored-by: Thomas Haener <thomashaener@users.noreply.github.com> Co-authored-by: Damian S. Steiger <dsteiger@phys.ethz.ch> Co-authored-by: Fernando <fernandodelaiglesia@users.noreply.github.com> Co-authored-by: David Wierichs <davidwierichs@gmail.com> Co-authored-by: Melven Roehrig-Zoellner <Melven.Roehrig-Zoellner@DLR.de> Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> Co-authored-by: alexandrupaler <alexandrupaler@gmail.com> Co-authored-by: David Bretaud <40793394+dbretaud@users.noreply.github.com> Co-authored-by: Cheng Li <lichengchris@gmail.com> Co-authored-by: Nguyen Damien <damien1@huawei.com> Co-authored-by: Ari Jordan <56979766+AriJordan@users.noreply.github.com>
WrathfulSpatula
added a commit
to vm6502q/ProjectQ
that referenced
this pull request
Apr 19, 2020
* Merge from upstream (#15) * Update to newer RevKit version. (ProjectQ-Framework#271) * Add VQE example (ProjectQ-Framework#274) * Update docs of decompositions. (ProjectQ-Framework#281) * Add FlipBits gate (ProjectQ-Framework#289) * Fix strings with invalid escape sequences. (ProjectQ-Framework#300) * Avoid 502 error when waiting for IBM Q results, resolves ProjectQ-Framework#291 (ProjectQ-Framework#294) * Expose num_retries and interval in IBMBackend (ProjectQ-Framework#295) * Don't accept controlled single-qubit gates in restricted gate set. (ProjectQ-Framework#301) * Implement MatrixGate and simplify __eq__ in BasicGate to improve performance (ProjectQ-Framework#288) * Bumped version number to 0.4.2 * Phase Estimation as a Gate in ops (ProjectQ-Framework#260) * First testing version of Phase Estimation with a lot of hardcoding * Adapt to All(Measure) * Adding operators for more than 1 quibit, first version * Adding operators for more than 1 quibit, first versioni: testing * Work in progress: create a PhaseX gate to tests via class * Work in progress: create a PhaseX gate to tests via class. Clean garbaje files * Work in progress: create a PhaseX gate to tests via class. Some enhanement * Work in progress: create a PhaseX gate to tests via class. PhaseX testing * Work in progress: Debugging algorithm * Work in progress: Debugging algorithm * Adding 2qubit example * adding 2 qubit Gate * Initial version * Create Phase Estimation as a new Gate in operations * Solving travis checks * python 2 compatibility + error in StatePreparation normalization * test coverage includes now the string * Improve the check test for no eigenvector test * Start modifying to decomposition * QPE as decomposition and gate * QPE as decomposition and gate: correct a detail in the test * try to get the travis-ci freeze solved * Solve a name not defined error in the phaseestimation tests * Solve coverage in tests * Address comments in review + change how to assert the tests * Enhance statistis in the tests bi more executions * Correct bad calculation in tests * Refine test * Address Andi comments: add detail in the examples and atributes and removing code in the test that is never executed * Correct statistics in qpe test (ProjectQ-Framework#328) * Amplitude Amplification algorithm as a Gate in ops * Amplitude Amplification algorithm as a Gate in ops, correct test_string_functions * Amplitude Amplification algorithm as a Gate in ops, correct coverage for _qaagate_test * Amplitude Amplification algorithm as a Gate in ops, correct test estimation statistics in phaseestimation_test * Try to triger Travis test because an apt get failure in the travis test * resend docs/projectq.ops.rst file * resend file versions previous to AA * Try to triger Travis test because it never ran * Try to triger Travis test again to try to get the tests ran * Amplitude Amplification algorithm as a Gate in ops (ProjectQ-Framework#327) * Amplitude Amplification algorithm as a Gate in ops * Amplitude Amplification algorithm as a Gate in ops, correct test_string_functions * Amplitude Amplification algorithm as a Gate in ops, correct coverage for _qaagate_test * Amplitude Amplification algorithm as a Gate in ops, correct test estimation statistics in phaseestimation_test * Try to triger Travis test because an apt get failure in the travis test * Address changes proposed by Damien * Address changes proposed by Damien, missed one * Address comments by Damien including eliminate the usage of algorith_inverse and eliminate QPE files form the PR * Address comments by Damien including eliminate the usage of algorith_inverse and eliminate QPE files form the PR, second try * Address comments by Damien forgot _qaagate_test * Update amplitudeamplification_test.py Wrap lines to 80 characters * Update amplitudeamplification.py Wrap lines to 80 characters * Update _qaagate.py Minor style correction * Update amplitudeamplification_test.py Cleanup imports * 3 additional 2-qubit gates (ProjectQ-Framework#330) * Modified _gates.py: Documentation, 2-qubit rotations, 1qubit-rotation string attributes. * Strings of rotation gates fixed. * Added two-qubit rotation gate tests. * Resource Counter import Rzz added. * Added Rzz test and fixed expected outcome. * removed wrongfully pushed dev gates. * Update _gates.py Remove unneeded import * Removed hardcoded "Phase" name for Ph(angle) gate * C++ simulator performance improvements (ProjectQ-Framework#329) * C++ simulator performance: make the swap-gate run in native C++ It was defined as a BasicMathGate before which made it run as python code through the emulate_math_wrapper. The new variant just uses its matrix representation to run it in native code. * C++ simulator performance: add dedicated C++ code for common math gates The BasicMathGate uses a C++ python wrapper (emulate_math_wrapper) to allow generic calculations which makes it very slow. This detects some math gates and provides a native C++ implementation for it. * C++ simulator performance: use larger memory alignment * C++ simulator performance: recycle large StateVector memory buffers This avoids costly std::vector copying/reallocations by using some static std::vector to reuse the allocated buffer (just by std::swap'ing a vector into a buffer for later use when it would be deallocated otherwise). * C++ simulator performance: improve compiler flags * Add test coverage for constant math emulation * Revert "Add test coverage for constant math emulation" This reverts commit 3bb8a2c. * Add test coverage for constant math emulation * Update constant math documentation to include list of pre-conditions (ProjectQ-Framework#331) * Allow selection of drawing order in CircuitDrawer (solves ProjectQ-Framework#333) (ProjectQ-Framework#334) * included the possibility to draw the gates in the order they were added to the circuit * edited param names tests should pass now * solved comments * solved comments * passes tests * Test for unordered and ordered circuit drawing * Reindent files in _circuits * Minor adjustments to _drawer.py * added test_body_with_drawing_order * fixed tests and how draw_gates_in_parallel is interpreted * Fix failing tests with Python 2.7 One test of _to_latex_test.py was failing due to precision issues. * Trapped ion decomposer setup and rotation gates improvement (ProjectQ-Framework#346) * reduced Ry decomposition : modification of restrictedgateset setup to include compiler chooser, extension of available decompositions, new setup based on restrictedgateset but adapted for trapped ion configurations * Addition of test file for the rz2rx decomposition Addition of test file for the rz2rx decomposition and edit to comments in the rz2rx file * Revert "Addition of test file for the rz2rx decomposition" This reverts commit 5aab56b. * Create rz2rx_test file Addition of test file for the rz2rx decomposition * Update rz2rx.py Update to comments * Update rz2rx_test.py Update to comments * Minor update: remove accidental file * Minor update rz2rx.py Corrected an angle. * Minor update rz2rx_test.py Edited comments. * Create h2rx_test.py Updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * Improvement of the decomposition chooser; Note that basic restricted gate set will fail decomposing into Rxx because of the default chooser * Updates to h2rx and cnot2rxx * Create cnot2rxx_test.py Testing file for cnot2rxx decomposition. Includes updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * basic rotation gates at an angle of 0 or 2pi are removed by the optimizer. basic rotation gates ignore now the global phase and are defined over 0:2pi * Update and create trapped_ion_decomposer_test.py * Minor update Documentation and comments. * Update on comments regarding Identity gates * Changes 1/2 : command can be printed with unicode symbols only via new to_String method; syntax correction; * Work in progress, is commutable * Update to decomposition test files rz2rx_test now tests each decomposition defined in rz2rx.all_defined_decomposition_rules Similar for cnot2rxx_test and h2rx_test * Revert "Work in progress, is commutable" This reverts commit 27f820c. * minor fixes; revert rotation gates to [0;4pi) * fix comments * Fix a few issues with the trapped-ion setup - Store the sign of the last Ry gate on an engine-by-engine basis - Cleanup of some remaining print statements - Some stylistic issues fixed * Mostly fixing stylistic issues and some code cleanup * h2rx decomposition with correct global phase * cnot2rxx decomposition with correct global phase * Fix non-ASCII character in cnot2rxx.py * Fix some more files for non-ASCII characters * Specify encoding for files with non-ASCII characters * Fix test errors * Fix tests for Python 2.7 * Complete code coverage for trapped-ion setup Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Matplotlib drawer backend (ProjectQ-Framework#352) * Adding tutorials directory * test * BV Algorithm * add Matplotlib circuit drawer backend, this version works for H, CNOT, and Multi-CNOT. * Delete the added unnecessary attributes in Command object * Create the CircuitDrawerMatplotlib Class to handles drawing with matplotlib * Deleted tutorials/.gitkeep * update * fix measurement gate * Delete unrelated files. * fix Toffoli gate position issue and change the qubit position from 'str' to 'int' * Pytest for drawer_mpl * Tests for _plot function * Fix the R(angle) gate drawing * added test for is_available and QFT gate * fix drawing distance between gates when gate_length >2 * new test png for pytest mpl * added Swap gates and CSwap gate with multi-control and multi-target. * update test and comments * Address comments in _drawer.py * Reindent and reformat parts of _drawer.py * Address comments in _plot.py - Minor tweaks, code cleanup, rewrites, etc. * Reindent and reformat _plot.py * update tests * Move matplotlib drawer into its own file + add test coverage * Use regular expressions to rewrite and shorten gate names * Change internal storage format for CircuitDrawerMatplotlib * Better graphics and adapt plot functions to new internal format - Support for new internal format - Resulting quantum circuit figure whould work better with scaling - Large quantum circuits will now result in wider figure instead of squeezing everything into the default matplotlib size - Some support for multi-target qubit gates - General code cleanup - Dropped support for double lines when qubit is in classical state * Complete test coverage + add some checks for to_draw() inputs * Compatibility with matplotlib 2.2.3 * Remove compatibility code for MacOSX. Use local matplotlibrc if necessary instead. * Add matplotlib dependency to requirements.txt * Fix non-UTF8 character in file * Fix .travis.yml * Remove unnecessary PNG files * Add CircuitDrawerMatplotlib to documentation and minor code fix * Fix docstring for CircuitDrawerMatplotlib Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Ibm backend v2 (solves ProjectQ-Framework#318 and ProjectQ-Framework#347) (ProjectQ-Framework#349) * reduced Ry decomposition : modification of restrictedgateset setup to include compiler chooser, extension of available decompositions, new setup based on restrictedgateset but adapted for trapped ion configurations * Addition of test file for the rz2rx decomposition Addition of test file for the rz2rx decomposition and edit to comments in the rz2rx file * Revert "Addition of test file for the rz2rx decomposition" This reverts commit 5aab56b. * Create rz2rx_test file Addition of test file for the rz2rx decomposition * Update rz2rx.py Update to comments * Update rz2rx_test.py Update to comments * Minor update: remove accidental file * Minor update rz2rx.py Corrected an angle. * Minor update rz2rx_test.py Edited comments. * Create h2rx_test.py Updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * Improvement of the decomposition chooser; Note that basic restricted gate set will fail decomposing into Rxx because of the default chooser * Updates to h2rx and cnot2rxx * Create cnot2rxx_test.py Testing file for cnot2rxx decomposition. Includes updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * basic rotation gates at an angle of 0 or 2pi are removed by the optimizer. basic rotation gates ignore now the global phase and are defined over 0:2pi * Update and create trapped_ion_decomposer_test.py * Minor update Documentation and comments. * Update on comments regarding Identity gates * Changes 1/2 : command can be printed with unicode symbols only via new to_String method; syntax correction; * Work in progress, is commutable * Update to decomposition test files rz2rx_test now tests each decomposition defined in rz2rx.all_defined_decomposition_rules Similar for cnot2rxx_test and h2rx_test * Revert "Work in progress, is commutable" This reverts commit 27f820c. * ibmq fix: projectq uses new ibmq API (no doc available, just look at qiskit). Connection fixed for 5qb devices, the 15qb melbourne device and the online simulator coupling map obtained from ibm server instead of being manually written one setup can be used for the 3 different backend * minor fixes * update on the ibm example * minor fixes; revert rotation gates to [0;4pi) * fix comments * fix mapper choice for simulator. added comments * minor fixes with results, mapper and testing files. Improvement of get_probabilities * Revert "Merge branch 'develop' into ibm_V2" This reverts commit cd0452a, reversing changes made to 03daf79. * minor fixes * bug fix in client test file * fixing bug and python2.7 compatibility for testing files * fix errors * major fix on testing files * minor fix on comments and python 2.7 compatibility * fix 'super()' call for python 2.7 * additional tests * python2.7 fix * increase coverage, fix a print statement * Some minor stylistic adjustments * Reindent files and fix some linting warnings/errors * Improve test coverage * Improve code readability Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Automatically generate documentation ReST files (ProjectQ-Framework#339) * Automate generation of documentation ReST files * Fix error in conf.py * Adjust .gitignore * Update setup.py (ProjectQ-Framework#337) * Rewrite setup.py to fix some issues on Mac OSX and some code cleanup - On Mac OSX with Homebrew, properly find the path to the OpenMP library if compiling with clang from Homebrew - Code cleanup and some reformating * Remove use of deprecated setuptools.Feature Now try to compile the C++ simulator and if it fails, simply install a pure Python package with some warning messages for the user. * Update documentation to reflect the latest change to setup.py * Fix error with deleted method of BuildExt * Remove global COPYING file and move text to setup.py file itself * Fix compilation issues on MacOS X * Update .gitignore * Fix setup.py for Python2 and MacPorts (Mac OS) * Fix setup.py on Windows * Some more fixes * Attempt to fix failing installation on Travis CI * Fix installation under Linux * Undo changes in .travis.yml * Update setup related tutorials * Fix a few remaining typos. * ProjectQ v0.5.0 (ProjectQ-Framework#356) * Bumped version number to 0.5.0 * Remove unneeded test * Fix error in examples/ibm.py * Add documentation for **kwargs for CircuitDrawerMatplotlib * Update setup.py license header Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> * Fix generated documentation (ProjectQ-Framework#360) * Fix some issues with builtin modules and fix some warnings * Move generated documentation files into dedicated folder Co-authored-by: Damien Nguyen <damien1@huawei.com> * Fix bugs with matplotlib drawer (ProjectQ-Framework#361) * Accept keywords arguments for Matplotlib drawing * fix circ drawer when depth == 1 Co-authored-by: Damien Nguyen <damien1@huawei.com> Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> Co-authored-by: Mathias Soeken <mathias.soeken@gmail.com> Co-authored-by: Christian Gogolin <git@cgogolin.de> Co-authored-by: Thomas Haener <thomashaener@users.noreply.github.com> Co-authored-by: Damian S. Steiger <dsteiger@phys.ethz.ch> Co-authored-by: Fernando <fernandodelaiglesia@users.noreply.github.com> Co-authored-by: David Wierichs <davidwierichs@gmail.com> Co-authored-by: Melven Roehrig-Zoellner <Melven.Roehrig-Zoellner@DLR.de> Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> Co-authored-by: alexandrupaler <alexandrupaler@gmail.com> Co-authored-by: David Bretaud <40793394+dbretaud@users.noreply.github.com> Co-authored-by: Cheng Li <lichengchris@gmail.com> Co-authored-by: Nguyen Damien <damien1@huawei.com> Co-authored-by: Ari Jordan <56979766+AriJordan@users.noreply.github.com> * Passing unit tests Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> Co-authored-by: Mathias Soeken <mathias.soeken@gmail.com> Co-authored-by: Christian Gogolin <git@cgogolin.de> Co-authored-by: Thomas Haener <thomashaener@users.noreply.github.com> Co-authored-by: Damian S. Steiger <dsteiger@phys.ethz.ch> Co-authored-by: Fernando <fernandodelaiglesia@users.noreply.github.com> Co-authored-by: David Wierichs <davidwierichs@gmail.com> Co-authored-by: Melven Roehrig-Zoellner <Melven.Roehrig-Zoellner@DLR.de> Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> Co-authored-by: alexandrupaler <alexandrupaler@gmail.com> Co-authored-by: David Bretaud <40793394+dbretaud@users.noreply.github.com> Co-authored-by: Cheng Li <lichengchris@gmail.com> Co-authored-by: Nguyen Damien <damien1@huawei.com> Co-authored-by: Ari Jordan <56979766+AriJordan@users.noreply.github.com>
WrathfulSpatula
added a commit
to vm6502q/ProjectQ
that referenced
this pull request
Apr 19, 2020
* Testing tolerance * Testing tolerance * Disabling state prep test for 4 qubits * Tolerance on uniformly controlled gates, and temporarily disabling Python simulator test * Updating Travis * Init empty simulator list * QPE() tolerances * Phase tolerance * Uni. Ctrld. amplitude agnostic unit test * New normalization API * Optional xFail on QPE tests, after long history of problems * Time evolution decomposition arbitrary phase factors * Revert last commit * Merge from upstream (#15) * Update to newer RevKit version. (ProjectQ-Framework#271) * Add VQE example (ProjectQ-Framework#274) * Update docs of decompositions. (ProjectQ-Framework#281) * Add FlipBits gate (ProjectQ-Framework#289) * Fix strings with invalid escape sequences. (ProjectQ-Framework#300) * Avoid 502 error when waiting for IBM Q results, resolves ProjectQ-Framework#291 (ProjectQ-Framework#294) * Expose num_retries and interval in IBMBackend (ProjectQ-Framework#295) * Don't accept controlled single-qubit gates in restricted gate set. (ProjectQ-Framework#301) * Implement MatrixGate and simplify __eq__ in BasicGate to improve performance (ProjectQ-Framework#288) * Bumped version number to 0.4.2 * Phase Estimation as a Gate in ops (ProjectQ-Framework#260) * First testing version of Phase Estimation with a lot of hardcoding * Adapt to All(Measure) * Adding operators for more than 1 quibit, first version * Adding operators for more than 1 quibit, first versioni: testing * Work in progress: create a PhaseX gate to tests via class * Work in progress: create a PhaseX gate to tests via class. Clean garbaje files * Work in progress: create a PhaseX gate to tests via class. Some enhanement * Work in progress: create a PhaseX gate to tests via class. PhaseX testing * Work in progress: Debugging algorithm * Work in progress: Debugging algorithm * Adding 2qubit example * adding 2 qubit Gate * Initial version * Create Phase Estimation as a new Gate in operations * Solving travis checks * python 2 compatibility + error in StatePreparation normalization * test coverage includes now the string * Improve the check test for no eigenvector test * Start modifying to decomposition * QPE as decomposition and gate * QPE as decomposition and gate: correct a detail in the test * try to get the travis-ci freeze solved * Solve a name not defined error in the phaseestimation tests * Solve coverage in tests * Address comments in review + change how to assert the tests * Enhance statistis in the tests bi more executions * Correct bad calculation in tests * Refine test * Address Andi comments: add detail in the examples and atributes and removing code in the test that is never executed * Correct statistics in qpe test (ProjectQ-Framework#328) * Amplitude Amplification algorithm as a Gate in ops * Amplitude Amplification algorithm as a Gate in ops, correct test_string_functions * Amplitude Amplification algorithm as a Gate in ops, correct coverage for _qaagate_test * Amplitude Amplification algorithm as a Gate in ops, correct test estimation statistics in phaseestimation_test * Try to triger Travis test because an apt get failure in the travis test * resend docs/projectq.ops.rst file * resend file versions previous to AA * Try to triger Travis test because it never ran * Try to triger Travis test again to try to get the tests ran * Amplitude Amplification algorithm as a Gate in ops (ProjectQ-Framework#327) * Amplitude Amplification algorithm as a Gate in ops * Amplitude Amplification algorithm as a Gate in ops, correct test_string_functions * Amplitude Amplification algorithm as a Gate in ops, correct coverage for _qaagate_test * Amplitude Amplification algorithm as a Gate in ops, correct test estimation statistics in phaseestimation_test * Try to triger Travis test because an apt get failure in the travis test * Address changes proposed by Damien * Address changes proposed by Damien, missed one * Address comments by Damien including eliminate the usage of algorith_inverse and eliminate QPE files form the PR * Address comments by Damien including eliminate the usage of algorith_inverse and eliminate QPE files form the PR, second try * Address comments by Damien forgot _qaagate_test * Update amplitudeamplification_test.py Wrap lines to 80 characters * Update amplitudeamplification.py Wrap lines to 80 characters * Update _qaagate.py Minor style correction * Update amplitudeamplification_test.py Cleanup imports * 3 additional 2-qubit gates (ProjectQ-Framework#330) * Modified _gates.py: Documentation, 2-qubit rotations, 1qubit-rotation string attributes. * Strings of rotation gates fixed. * Added two-qubit rotation gate tests. * Resource Counter import Rzz added. * Added Rzz test and fixed expected outcome. * removed wrongfully pushed dev gates. * Update _gates.py Remove unneeded import * Removed hardcoded "Phase" name for Ph(angle) gate * C++ simulator performance improvements (ProjectQ-Framework#329) * C++ simulator performance: make the swap-gate run in native C++ It was defined as a BasicMathGate before which made it run as python code through the emulate_math_wrapper. The new variant just uses its matrix representation to run it in native code. * C++ simulator performance: add dedicated C++ code for common math gates The BasicMathGate uses a C++ python wrapper (emulate_math_wrapper) to allow generic calculations which makes it very slow. This detects some math gates and provides a native C++ implementation for it. * C++ simulator performance: use larger memory alignment * C++ simulator performance: recycle large StateVector memory buffers This avoids costly std::vector copying/reallocations by using some static std::vector to reuse the allocated buffer (just by std::swap'ing a vector into a buffer for later use when it would be deallocated otherwise). * C++ simulator performance: improve compiler flags * Add test coverage for constant math emulation * Revert "Add test coverage for constant math emulation" This reverts commit 3bb8a2c. * Add test coverage for constant math emulation * Update constant math documentation to include list of pre-conditions (ProjectQ-Framework#331) * Allow selection of drawing order in CircuitDrawer (solves ProjectQ-Framework#333) (ProjectQ-Framework#334) * included the possibility to draw the gates in the order they were added to the circuit * edited param names tests should pass now * solved comments * solved comments * passes tests * Test for unordered and ordered circuit drawing * Reindent files in _circuits * Minor adjustments to _drawer.py * added test_body_with_drawing_order * fixed tests and how draw_gates_in_parallel is interpreted * Fix failing tests with Python 2.7 One test of _to_latex_test.py was failing due to precision issues. * Trapped ion decomposer setup and rotation gates improvement (ProjectQ-Framework#346) * reduced Ry decomposition : modification of restrictedgateset setup to include compiler chooser, extension of available decompositions, new setup based on restrictedgateset but adapted for trapped ion configurations * Addition of test file for the rz2rx decomposition Addition of test file for the rz2rx decomposition and edit to comments in the rz2rx file * Revert "Addition of test file for the rz2rx decomposition" This reverts commit 5aab56b. * Create rz2rx_test file Addition of test file for the rz2rx decomposition * Update rz2rx.py Update to comments * Update rz2rx_test.py Update to comments * Minor update: remove accidental file * Minor update rz2rx.py Corrected an angle. * Minor update rz2rx_test.py Edited comments. * Create h2rx_test.py Updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * Improvement of the decomposition chooser; Note that basic restricted gate set will fail decomposing into Rxx because of the default chooser * Updates to h2rx and cnot2rxx * Create cnot2rxx_test.py Testing file for cnot2rxx decomposition. Includes updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * basic rotation gates at an angle of 0 or 2pi are removed by the optimizer. basic rotation gates ignore now the global phase and are defined over 0:2pi * Update and create trapped_ion_decomposer_test.py * Minor update Documentation and comments. * Update on comments regarding Identity gates * Changes 1/2 : command can be printed with unicode symbols only via new to_String method; syntax correction; * Work in progress, is commutable * Update to decomposition test files rz2rx_test now tests each decomposition defined in rz2rx.all_defined_decomposition_rules Similar for cnot2rxx_test and h2rx_test * Revert "Work in progress, is commutable" This reverts commit 27f820c. * minor fixes; revert rotation gates to [0;4pi) * fix comments * Fix a few issues with the trapped-ion setup - Store the sign of the last Ry gate on an engine-by-engine basis - Cleanup of some remaining print statements - Some stylistic issues fixed * Mostly fixing stylistic issues and some code cleanup * h2rx decomposition with correct global phase * cnot2rxx decomposition with correct global phase * Fix non-ASCII character in cnot2rxx.py * Fix some more files for non-ASCII characters * Specify encoding for files with non-ASCII characters * Fix test errors * Fix tests for Python 2.7 * Complete code coverage for trapped-ion setup Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Matplotlib drawer backend (ProjectQ-Framework#352) * Adding tutorials directory * test * BV Algorithm * add Matplotlib circuit drawer backend, this version works for H, CNOT, and Multi-CNOT. * Delete the added unnecessary attributes in Command object * Create the CircuitDrawerMatplotlib Class to handles drawing with matplotlib * Deleted tutorials/.gitkeep * update * fix measurement gate * Delete unrelated files. * fix Toffoli gate position issue and change the qubit position from 'str' to 'int' * Pytest for drawer_mpl * Tests for _plot function * Fix the R(angle) gate drawing * added test for is_available and QFT gate * fix drawing distance between gates when gate_length >2 * new test png for pytest mpl * added Swap gates and CSwap gate with multi-control and multi-target. * update test and comments * Address comments in _drawer.py * Reindent and reformat parts of _drawer.py * Address comments in _plot.py - Minor tweaks, code cleanup, rewrites, etc. * Reindent and reformat _plot.py * update tests * Move matplotlib drawer into its own file + add test coverage * Use regular expressions to rewrite and shorten gate names * Change internal storage format for CircuitDrawerMatplotlib * Better graphics and adapt plot functions to new internal format - Support for new internal format - Resulting quantum circuit figure whould work better with scaling - Large quantum circuits will now result in wider figure instead of squeezing everything into the default matplotlib size - Some support for multi-target qubit gates - General code cleanup - Dropped support for double lines when qubit is in classical state * Complete test coverage + add some checks for to_draw() inputs * Compatibility with matplotlib 2.2.3 * Remove compatibility code for MacOSX. Use local matplotlibrc if necessary instead. * Add matplotlib dependency to requirements.txt * Fix non-UTF8 character in file * Fix .travis.yml * Remove unnecessary PNG files * Add CircuitDrawerMatplotlib to documentation and minor code fix * Fix docstring for CircuitDrawerMatplotlib Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Ibm backend v2 (solves ProjectQ-Framework#318 and ProjectQ-Framework#347) (ProjectQ-Framework#349) * reduced Ry decomposition : modification of restrictedgateset setup to include compiler chooser, extension of available decompositions, new setup based on restrictedgateset but adapted for trapped ion configurations * Addition of test file for the rz2rx decomposition Addition of test file for the rz2rx decomposition and edit to comments in the rz2rx file * Revert "Addition of test file for the rz2rx decomposition" This reverts commit 5aab56b. * Create rz2rx_test file Addition of test file for the rz2rx decomposition * Update rz2rx.py Update to comments * Update rz2rx_test.py Update to comments * Minor update: remove accidental file * Minor update rz2rx.py Corrected an angle. * Minor update rz2rx_test.py Edited comments. * Create h2rx_test.py Updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * Improvement of the decomposition chooser; Note that basic restricted gate set will fail decomposing into Rxx because of the default chooser * Updates to h2rx and cnot2rxx * Create cnot2rxx_test.py Testing file for cnot2rxx decomposition. Includes updated method for test_decomposition which tests that decomposition produces identical wave-state up to a global phase. * basic rotation gates at an angle of 0 or 2pi are removed by the optimizer. basic rotation gates ignore now the global phase and are defined over 0:2pi * Update and create trapped_ion_decomposer_test.py * Minor update Documentation and comments. * Update on comments regarding Identity gates * Changes 1/2 : command can be printed with unicode symbols only via new to_String method; syntax correction; * Work in progress, is commutable * Update to decomposition test files rz2rx_test now tests each decomposition defined in rz2rx.all_defined_decomposition_rules Similar for cnot2rxx_test and h2rx_test * Revert "Work in progress, is commutable" This reverts commit 27f820c. * ibmq fix: projectq uses new ibmq API (no doc available, just look at qiskit). Connection fixed for 5qb devices, the 15qb melbourne device and the online simulator coupling map obtained from ibm server instead of being manually written one setup can be used for the 3 different backend * minor fixes * update on the ibm example * minor fixes; revert rotation gates to [0;4pi) * fix comments * fix mapper choice for simulator. added comments * minor fixes with results, mapper and testing files. Improvement of get_probabilities * Revert "Merge branch 'develop' into ibm_V2" This reverts commit cd0452a, reversing changes made to 03daf79. * minor fixes * bug fix in client test file * fixing bug and python2.7 compatibility for testing files * fix errors * major fix on testing files * minor fix on comments and python 2.7 compatibility * fix 'super()' call for python 2.7 * additional tests * python2.7 fix * increase coverage, fix a print statement * Some minor stylistic adjustments * Reindent files and fix some linting warnings/errors * Improve test coverage * Improve code readability Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> * Automatically generate documentation ReST files (ProjectQ-Framework#339) * Automate generation of documentation ReST files * Fix error in conf.py * Adjust .gitignore * Update setup.py (ProjectQ-Framework#337) * Rewrite setup.py to fix some issues on Mac OSX and some code cleanup - On Mac OSX with Homebrew, properly find the path to the OpenMP library if compiling with clang from Homebrew - Code cleanup and some reformating * Remove use of deprecated setuptools.Feature Now try to compile the C++ simulator and if it fails, simply install a pure Python package with some warning messages for the user. * Update documentation to reflect the latest change to setup.py * Fix error with deleted method of BuildExt * Remove global COPYING file and move text to setup.py file itself * Fix compilation issues on MacOS X * Update .gitignore * Fix setup.py for Python2 and MacPorts (Mac OS) * Fix setup.py on Windows * Some more fixes * Attempt to fix failing installation on Travis CI * Fix installation under Linux * Undo changes in .travis.yml * Update setup related tutorials * Fix a few remaining typos. * ProjectQ v0.5.0 (ProjectQ-Framework#356) * Bumped version number to 0.5.0 * Remove unneeded test * Fix error in examples/ibm.py * Add documentation for **kwargs for CircuitDrawerMatplotlib * Update setup.py license header Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> * Fix generated documentation (ProjectQ-Framework#360) * Fix some issues with builtin modules and fix some warnings * Move generated documentation files into dedicated folder Co-authored-by: Damien Nguyen <damien1@huawei.com> * Fix bugs with matplotlib drawer (ProjectQ-Framework#361) * Accept keywords arguments for Matplotlib drawing * fix circ drawer when depth == 1 Co-authored-by: Damien Nguyen <damien1@huawei.com> Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> Co-authored-by: Mathias Soeken <mathias.soeken@gmail.com> Co-authored-by: Christian Gogolin <git@cgogolin.de> Co-authored-by: Thomas Haener <thomashaener@users.noreply.github.com> Co-authored-by: Damian S. Steiger <dsteiger@phys.ethz.ch> Co-authored-by: Fernando <fernandodelaiglesia@users.noreply.github.com> Co-authored-by: David Wierichs <davidwierichs@gmail.com> Co-authored-by: Melven Roehrig-Zoellner <Melven.Roehrig-Zoellner@DLR.de> Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> Co-authored-by: alexandrupaler <alexandrupaler@gmail.com> Co-authored-by: David Bretaud <40793394+dbretaud@users.noreply.github.com> Co-authored-by: Cheng Li <lichengchris@gmail.com> Co-authored-by: Nguyen Damien <damien1@huawei.com> Co-authored-by: Ari Jordan <56979766+AriJordan@users.noreply.github.com> * Passing unit tests Co-authored-by: Damian Steiger <damiansteiger@users.noreply.github.com> Co-authored-by: Mathias Soeken <mathias.soeken@gmail.com> Co-authored-by: Christian Gogolin <git@cgogolin.de> Co-authored-by: Thomas Haener <thomashaener@users.noreply.github.com> Co-authored-by: Damian S. Steiger <dsteiger@phys.ethz.ch> Co-authored-by: Fernando <fernandodelaiglesia@users.noreply.github.com> Co-authored-by: David Wierichs <davidwierichs@gmail.com> Co-authored-by: Melven Roehrig-Zoellner <Melven.Roehrig-Zoellner@DLR.de> Co-authored-by: Nguyen Damien <ngn.damien@gmail.com> Co-authored-by: alexandrupaler <alexandrupaler@gmail.com> Co-authored-by: David Bretaud <40793394+dbretaud@users.noreply.github.com> Co-authored-by: Cheng Li <lichengchris@gmail.com> Co-authored-by: Nguyen Damien <damien1@huawei.com> Co-authored-by: Ari Jordan <56979766+AriJordan@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses #282 by implementing a MatrixGate base class for gates that are defined via their matrix (similar to how, e.g., RotationGate captures gates defined via an angle).
Specifically this PR does:
__eq__()inBasicGateto only do class/type comparison.matrixinBasisGatealtogether (this allows to no longer worry about==betweenMatrixGatesandBasicGatesas they are now always not equal.__eq__()inMatrixGatethat does matrix comparison (slow but this is the thing to do for gates that are really defined via their matrix)MatrixGateand other gates.Please have a look and tell me what do do/don't like. Please pay especially close attention to the changes unit tests. I am not 100% sure I modified
_simulator_test.pyin the correct way.