Add user defined gates, MS gate and fix some bugs #1025

BoxiLi · 2019-06-21T22:31:11Z

expand_oper: expand a qubits operator to dim N
User-defined gate can be given by a python function. By passing a list of user-defined gate function to the attribute QubitCircuit.user_gate, QubitCircuit.propagators() can return the corresponding matrices. Resolve Custom gates for QubitCircuit #914
MS gate and physical single qubit rotation. (Is the name mc_gate and qrot appropriate?) Resolve td qobj #814
Fix some bugs in resolving circuit gates. Allow more than one 2-qubits gates in the basis. This is actually already required in spinchain.py but covered by a bug

* import + sesolve * psi in args part 1 * psi in args part 2 * state in args part3 * dyn args test1 * dyn args test2 * args debug * ready for tests * s/mesolve pass tests * mcsolve rework * mcsolve rework part 2 * mcsolve cython cleaning * mcsolve working * mcsolve cython as object * mcsolve pass all test * automated test almost passing * pass all tests * docs and cleaning * diag ok * clean propagator * clean propagator 2 * clean floquet * clean floquet 2 * mcsolve serial_map bugfix * object args bug correction * dense cQobjEvo bugfix * spliting PR * merge priority correction * merge priority correction * mcsolve based on qoevo * better rouchon citation * final state avg? * faster postprocessing * final_state average flag * final state runs as property * Some patches for qip.Gate (qutip#995) * remove repetitive assignment * move description to class def Doc won't show it if it's under __init__ * check invalid input for targets and control * all must be integer * NotImplemented is not callable, use NotImplementedError * add whitespace * refactor * format correction

fix a bug in spinchain

coveralls · 2019-06-21T23:05:20Z

Coverage decreased (-0.06%) to 71.698% when pulling 10f02d0 on BoxiLi:user_gate into f9999c9 on qutip:master.

qutip/qip/gates.py

nathanshammah · 2019-06-23T15:03:47Z

qutip/qip/gates.py

@@ -177,6 +177,27 @@ def phasegate(theta, N=None, target=0):
                    dims=[[2], [2]])


+def qrot(theta, phi, N=None, target=0):


what about being a bit more explicit and call it qubit_rotate, qrotate, or rotate_qubit? Maybe qrot` is fine too.

qutip/qip/gates.py

nathanshammah · 2019-06-23T15:07:56Z

qutip/qip/gates.py

+    Parameters
+    ----------
+    theta : The duration of the interaction pulse
+    """


Also here: Shouldn't it have also "Returns" in the docstring?

Add target docstring. Maybe default should be a list instead of a tuple for coherence with rest of code where integer is integer or list?

nathanshammah

Regarding the Molmer-Sorensen gate: It is very nice how you handled the possibility for expansion to N qubits. I could not test the code as I could not figure out how to fork properly the PR to the branch. If you add a short gist with a brief example of both the Molmer Sorensen gate and creating a user-defined gate, maybe I can copy paste this more easily and check it out. It think such an example would make an interesting addition to qutip.org/tutorials.

qutip/qip/gates.py

nathanshammah · 2019-06-23T15:11:53Z

qutip/qip/gates.py

+    Parameters
+    ----------
+    theta : The duration of the interaction pulse
+    """


Add target docstring. Maybe default should be a list instead of a tuple for coherence with rest of code where integer is integer or list?

qutip/tests/test_gates.py

qutip/qip/gates.py

nathanshammah · 2019-06-23T15:22:54Z

Also: maybe this PR, which seems self-contained with respect to deliverables and independent on the "qutip.nisq" module, could be made directly to the master, so that we can already include it in the next QuTiP release.

BoxiLi · 2019-06-23T16:30:33Z

@nathanshammah Thanks a lot for the review. I'm not sure how gist works, should I upload only the example or with the definition of expand_oper? Maybe we can talk about this tomorrow at the meeting. I have some examples in notebook.
Yes, you are right, I think this PR could be merged directly to master, but I also used expand_oper in my circuitprocessor a lot so I may need you to update qip_opt from master branch.

nathanshammah · 2019-06-24T14:52:41Z

Maybe we can change the base branch to master. Never did it before but it seems straightforward https://help.github.com/en/articles/changing-the-base-branch-of-a-pull-request and then update qip opt branch.

…_gate

BoxiLi · 2019-06-24T14:59:19Z

@nathanshammah @quantshah I tried it, but a lot of commits appear which don't belong to me. They are updates from the master branch.

quantshah · 2019-06-24T15:00:08Z

Great. I was trying to see if I can add commits to this PR directly and it is possible. I will post here how to do that in a while. Just going to resolve these conflicts and rebase against master

BoxiLi · 2019-06-24T15:06:11Z

@quantshah I find it a bit weird because those commits are merged from master to qip_opt and I'm now just trying to merge back to master. Where do those conflicts come from?

quantshah · 2019-06-24T15:21:46Z

The conflicts are because first we branched qip_opt from master, but then qip_opt was not updated to master itself and I tried to update it against master since this will be a PR which gets merged into master and not your GSoC project. This led to many changes which happened over master and were not there in your PR and led to some conflicts between master and qip_opt I suppose.

quantshah · 2019-06-24T15:28:52Z

We could take this PR as an example of how to work with a very messy git history. I see some forced pushes which should probably have been rebases to avoid conflicts.

But at this point I would suggest to Boxi that you open a fresh PR branching from the current master on your local qutip repo. So do:

git checkout master
git pull upstream master
git push origin master

This syncs your master to QuTiP. Then, start a new branch and make the same changes that you did here on that new branch.

Make the changes, add commit etc.

git checkout -b user_gate2
...
git add .
git commit -m "message"

and then make a new PR and close this (without merging). Then delete this branch (locally and remote)

git branch -D user_gate
git push origin -delete user_gate

BoxiLi · 2019-06-24T15:33:25Z

But if I haven't changed any of those files, shouldn't git ignore them and believe that master is the up-to-date one? May the workflow here "master->qip_opt->user_gate->master" is not what git expected. The correct way should be "master->qip_opt->user_gate->qip_opt->master" or "master->user_gate->master".
So I should have started from master if I want to be merged back to master, not through qip_opt.

BoxiLi · 2019-06-24T15:34:22Z

Sure, I'll do it.

quantshah · 2019-06-24T15:44:12Z

So I should have started from master if I want to be merged back to master, not through qip_opt.

It is not necessary to do so. You just have to make sure that the branch you want to merge to (in this case we changed this midway to master from opt_qip) is not having conflicts with your code. And maybe that is what happened. Not sure though.

quantshah and others added 10 commits June 11, 2019 22:32

expand operator for qubit system

ea2a0ac

user defiend gate

e0c6352

Tests

1621cf0

check gate function parameter number

583df46

MS gate and qrot gate

049f9c9

bugs and pep8

56f0c67

allow more that 1 2q gate as resolving basis

2048fe0

fix a bug in spinchain

add function name to __all__

8f94e9b

wrong place for the tests

bb110ee

nathanshammah self-requested a review June 23, 2019 13:54

nathanshammah added the review in progress PR being reviewed label Jun 23, 2019

nathanshammah reviewed Jun 23, 2019

View reviewed changes

qutip/qip/gates.py Outdated Show resolved Hide resolved

nathanshammah reviewed Jun 23, 2019

View reviewed changes

qutip/qip/gates.py Show resolved Hide resolved

nathanshammah reviewed Jun 23, 2019

View reviewed changes

BoxiLi force-pushed the user_gate branch from 0caa3dd to 9426b1a Compare June 23, 2019 16:58

name change and docs

8a996a9

BoxiLi force-pushed the user_gate branch from 9426b1a to 8a996a9 Compare June 23, 2019 17:15

BoxiLi added 2 commits June 23, 2019 21:03

pep8

f8edf81

doc change

f354651

quantshah added 2 commits June 24, 2019 16:56

minor changes in doc string

c952f5f

Merge branch 'user_gate' of https://github.com/BoxiLi/qutip into user…

10f02d0

…_gate

BoxiLi changed the base branch from qip_opt to master June 24, 2019 14:57

Merge branch 'master' of https://github.com/qutip/qutip into user_gate

1f74d68

BoxiLi mentioned this pull request Jun 24, 2019

Add user defined gates, MS gate and fix some bugs (replacement) #1028

Merged

BoxiLi closed this Jun 24, 2019

nathanshammah added this to In progress in Quantum devices: Pulse level control, noise description and error mitigation Jan 29, 2020

nathanshammah moved this from In progress to Done in Quantum devices: Pulse level control, noise description and error mitigation Jan 29, 2020

BoxiLi deleted the user_gate branch January 28, 2021 16:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add user defined gates, MS gate and fix some bugs #1025

Add user defined gates, MS gate and fix some bugs #1025

BoxiLi commented Jun 21, 2019

coveralls commented Jun 21, 2019 •

edited

nathanshammah Jun 23, 2019

nathanshammah Jun 23, 2019

nathanshammah Jun 23, 2019

nathanshammah left a comment

nathanshammah Jun 23, 2019

nathanshammah commented Jun 23, 2019

BoxiLi commented Jun 23, 2019

nathanshammah commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

quantshah commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

quantshah commented Jun 24, 2019

quantshah commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

quantshah commented Jun 24, 2019

		@@ -177,6 +177,27 @@ def phasegate(theta, N=None, target=0):
		dims=[[2], [2]])


		def qrot(theta, phi, N=None, target=0):

Add user defined gates, MS gate and fix some bugs #1025

Add user defined gates, MS gate and fix some bugs #1025

Conversation

BoxiLi commented Jun 21, 2019

coveralls commented Jun 21, 2019 • edited

nathanshammah Jun 23, 2019

Choose a reason for hiding this comment

nathanshammah Jun 23, 2019

Choose a reason for hiding this comment

nathanshammah Jun 23, 2019

Choose a reason for hiding this comment

nathanshammah left a comment

Choose a reason for hiding this comment

nathanshammah Jun 23, 2019

Choose a reason for hiding this comment

nathanshammah commented Jun 23, 2019

BoxiLi commented Jun 23, 2019

nathanshammah commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

quantshah commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

quantshah commented Jun 24, 2019

quantshah commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

BoxiLi commented Jun 24, 2019

quantshah commented Jun 24, 2019

coveralls commented Jun 21, 2019 •

edited