Add TwoQubitDiagonalGate #2891

ajhanus · 2020-04-05T22:08:13Z

Part of #2587

googlebot · 2020-04-05T22:08:32Z

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

vtomole · 2020-04-06T14:13:42Z

Hey @cduck, @hanusaj will be taking this implementation from me.

cirq/ops/two_qubit_diagonal_gate.py

vtomole · 2020-04-06T14:21:38Z

@hanusaj The Travis tests are failing.

googlebot · 2020-04-14T15:21:17Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

vtomole · 2020-04-14T15:44:02Z

@hanusaj You'll need to squash my commits and commit them as your own.

googlebot · 2020-04-17T22:29:57Z

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

cirq/ops/two_qubit_diagonal_gate.py

cirq/ops/two_qubit_diagonal_gate_test.py

cirq/ops/two_qubit_diagonal_gate.py

cirq/protocols/json_serialization_test.py

cirq/ops/two_qubit_diagonal_gate.py

format Respond to reviews revetr revert again ignore global phase lint Fixed edits for the Add TwoQubitDiagonalGate. Change the docstring for the two_qubit_diagonal_gate.py

vtomole

Adress https://github.com/quantumlib/Cirq/pull/2591/files#r355094520

vtomole · 2020-04-20T01:23:39Z

cirq/ops/two_qubit_diagonal_gate.py

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Creates the Gate instrance for a two qubit diagonal gate.


lower case 'g` for gate

Has been addressed.

vtomole · 2020-04-20T01:23:50Z

cirq/ops/two_qubit_diagonal_gate.py

+# limitations under the License.
+"""Creates the Gate instrance for a two qubit diagonal gate.
+
+The Gate is used to create a 4x4 matrix with the diagonal elements


lower case g for gate

Has been addressed.

vtomole · 2020-04-20T01:24:11Z

cirq/ops/two_qubit_diagonal_gate.py

+# limitations under the License.
+"""Creates the Gate instrance for a two qubit diagonal gate.
+
+The Gate is used to create a 4x4 matrix with the diagonal elements


Use latex notation for multiplication sign.

Has been addressed.

vtomole · 2020-04-20T01:24:30Z

cirq/ops/two_qubit_diagonal_gate.py

+
+@value.value_equality()
+class TwoQubitDiagonalGate(gate_features.TwoQubitGate):
+    """A gate given by a diagonal 4x4 matrix."""


Use latex notation for multiplication sign.

Has been addressed.

vtomole · 2020-04-20T01:30:43Z

cirq/ops/two_qubit_diagonal_gate.py

+    def _unitary_(self) -> np.ndarray:
+        if self._is_parameterized_():
+            return None
+        return np.diag(


Does https://github.com/quantumlib/Cirq/pull/2591/files#r355092235 work for tuples?

It did not work for tuples. I got a the following error. TypeError: can't multiply sequence by non-int of type 'complex'.

vtomole · 2020-04-20T01:31:48Z

cirq/ops/two_qubit_diagonal_gate.py

+            return NotImplemented
+        for index, angle in enumerate(self._diag_angles_radians):
+            subspace_index = args.subspace_index(big_endian_bits_int=index)
+            args.target_tensor[subspace_index] *= np.exp(1j * angle)


What happens with https://github.com/quantumlib/Cirq/pull/2591/files#r355092574?

args.target_tensor *= np.exp(1j * self._diag_angles_radians.reshape((2,2))) did not work since self._diag_angles_radians was not a numpy.array. Similar to above, the np.exp(1j * self_diag_angles_radians) didn't work with tuples.

vtomole · 2020-04-20T01:33:05Z

cirq/ops/two_qubit_diagonal_gate.py

+            return NotImplemented
+        angles = []
+        for angle in self._diag_angles_radians:
+            mulAngle = protocols.mul(angle, exponent, NotImplemented)


Address https://github.com/quantumlib/Cirq/pull/2591/files#r355093962

I thought that the code I added returned NotImplemented from the __pow__ function. If I should address the comment in another way, let me know.

ping @cduck

vtomole · 2020-04-20T01:34:17Z

cirq/ops/two_qubit_diagonal_gate_test.py

+    sqrt_diagonal_gate = diagonal_gate**.5
+
+    expected_angles = [prime / 2 for prime in diagonal_angles]
+    np.testing.assert_allclose(expected_angles,


Address https://github.com/quantumlib/Cirq/pull/2591/files#r355094239

Has been addressed.

vtomole

Merging as "pretty decent" reasons were given for not fixing some of @cduck's suggestions.

CirqBot · 2020-05-08T23:35:09Z

Automerge cancelled: "automerge" label was never added.

CirqBot · 2020-05-08T23:35:34Z

Automerge cancelled: "automerge" label was never added.

* Add TwoQubitDiagonalGate format Respond to reviews revetr revert again ignore global phase lint Fixed edits for the Add TwoQubitDiagonalGate. Change the docstring for the two_qubit_diagonal_gate.py * Pull request review edits. * GitHub merge fail fixes. * Update two_qubit_diagonal_gate.py Co-authored-by: Victory Omole <vtomole2@gmail.com>

googlebot added the cla: no label Apr 5, 2020

ajhanus force-pushed the two_diag_edits branch 3 times, most recently from cc8ff4d to fa7fed9 Compare April 5, 2020 22:21

vtomole mentioned this pull request Apr 6, 2020

Add TwoQubitDiagonalGate #2591

Closed

vtomole requested a review from cduck April 6, 2020 14:12

vtomole requested changes Apr 6, 2020

View reviewed changes

cirq/ops/two_qubit_diagonal_gate.py Outdated Show resolved Hide resolved

vtomole changed the title ~~Two diag edits~~ Add TwoQubitDiagonalGate Apr 6, 2020

ajhanus force-pushed the two_diag_edits branch from 123f4f4 to f9c027c Compare April 14, 2020 15:21

ajhanus force-pushed the two_diag_edits branch 5 times, most recently from 7192a41 to 63bd918 Compare April 17, 2020 22:29

googlebot added cla: yes Makes googlebot stop complaining. and removed cla: no labels Apr 17, 2020

ajhanus force-pushed the two_diag_edits branch 3 times, most recently from 73a1e38 to 47bf076 Compare April 17, 2020 23:19

vtomole reviewed Apr 18, 2020

View reviewed changes

cirq/ops/two_qubit_diagonal_gate.py Outdated Show resolved Hide resolved

ajhanus force-pushed the two_diag_edits branch 3 times, most recently from 84de6da to cb06057 Compare April 19, 2020 14:31

vtomole reviewed Apr 19, 2020

View reviewed changes

cirq/ops/two_qubit_diagonal_gate_test.py Outdated Show resolved Hide resolved

ajhanus commented Apr 19, 2020

View reviewed changes

cirq/ops/two_qubit_diagonal_gate.py Outdated Show resolved Hide resolved

ajhanus force-pushed the two_diag_edits branch 3 times, most recently from 3aaf0c9 to 239246c Compare April 19, 2020 21:12

vtomole requested changes Apr 19, 2020

View reviewed changes

cirq/ops/two_qubit_diagonal_gate.py Outdated Show resolved Hide resolved

cirq/ops/two_qubit_diagonal_gate.py Outdated Show resolved Hide resolved

cirq/protocols/json_serialization_test.py Outdated Show resolved Hide resolved

ajhanus force-pushed the two_diag_edits branch 2 times, most recently from 8244669 to 17cd6cd Compare April 19, 2020 21:38

ajhanus commented Apr 19, 2020

View reviewed changes

cirq/ops/two_qubit_diagonal_gate.py Show resolved Hide resolved

Add TwoQubitDiagonalGate

adb6b2e

format Respond to reviews revetr revert again ignore global phase lint Fixed edits for the Add TwoQubitDiagonalGate. Change the docstring for the two_qubit_diagonal_gate.py

ajhanus force-pushed the two_diag_edits branch from 17cd6cd to adb6b2e Compare April 20, 2020 00:43

vtomole requested changes Apr 20, 2020

View reviewed changes

ajhanus added 3 commits April 20, 2020 15:26

Pull request review edits.

7e85106

Merge branch 'master' into two_diag_edits

ff363d2

GitHub merge fail fixes.

afea4e1

vtomole approved these changes May 8, 2020

View reviewed changes

vtomole added 2 commits May 8, 2020 14:26

Merge branch 'master' into two_diag_edits

a13215c

Update two_qubit_diagonal_gate.py

ce2c280

vtomole approved these changes May 8, 2020

View reviewed changes

Merge branch 'master' into two_diag_edits

172667f

vtomole added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label May 8, 2020

CirqBot removed the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label May 8, 2020

vtomole added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label May 8, 2020

CirqBot removed the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label May 8, 2020

vtomole merged commit 4a0ded7 into quantumlib:master May 8, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add TwoQubitDiagonalGate #2891

Add TwoQubitDiagonalGate #2891

ajhanus commented Apr 5, 2020 •

edited by vtomole

googlebot commented Apr 5, 2020

vtomole commented Apr 6, 2020

vtomole commented Apr 6, 2020

googlebot commented Apr 14, 2020

vtomole commented Apr 14, 2020 •

edited

googlebot commented Apr 17, 2020

vtomole left a comment

vtomole Apr 20, 2020

ajhanus Apr 21, 2020

vtomole Apr 20, 2020

ajhanus Apr 21, 2020

vtomole Apr 20, 2020

ajhanus Apr 21, 2020

vtomole Apr 20, 2020

ajhanus Apr 21, 2020

vtomole Apr 20, 2020

ajhanus Apr 20, 2020

vtomole Apr 20, 2020

ajhanus Apr 20, 2020

vtomole Apr 20, 2020

ajhanus Apr 20, 2020

vtomole Apr 20, 2020

vtomole Apr 20, 2020

ajhanus Apr 21, 2020

vtomole left a comment •

edited

CirqBot commented May 8, 2020

CirqBot commented May 8, 2020

Add TwoQubitDiagonalGate #2891

Add TwoQubitDiagonalGate #2891

Conversation

ajhanus commented Apr 5, 2020 • edited by vtomole

googlebot commented Apr 5, 2020

vtomole commented Apr 6, 2020

vtomole commented Apr 6, 2020

googlebot commented Apr 14, 2020

vtomole commented Apr 14, 2020 • edited

googlebot commented Apr 17, 2020

vtomole left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vtomole left a comment • edited

Choose a reason for hiding this comment

CirqBot commented May 8, 2020

CirqBot commented May 8, 2020

ajhanus commented Apr 5, 2020 •

edited by vtomole

vtomole commented Apr 14, 2020 •

edited

vtomole left a comment •

edited