Support multi-qubit measurement in plot_state_histogram #3054

AnimeshSinha1309 · 2020-06-01T07:51:37Z

plot_state_histogram works with single qubit measurements, multi-qubit measurements are now also supported.

plot_state_histogram works with single qubit measurements, multi-qubit measurements are detected by string matching and a warning is raised.

googlebot · 2020-06-01T07:51:42Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

googlebot · 2020-06-01T08:04:20Z

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

Order of imports and spaces on a line, linter issues fixed.

AnimeshSinha1309 · 2020-06-01T08:53:00Z

Please do not review this for now, I want to add the multi-qubit plotting logic here instead of raising a warning, just waiting to know if that is the expected behavior.

H-stacking the different measurements to allow plot_state_histogram to support multi-qubit measurements intermixed with single-qubit.

Removed import of warnings.

AnimeshSinha1309 · 2020-06-01T09:36:47Z

I guess now this should be review ready, I removed the warning and added h-stacking the results. Please review.

dabacon

Could you add a test for this new case?

cduck

Thanks for fixing this. It looks good but needs a few unit tests. See my comments and add the tests to visualize_test.py.

cirq/study/visualize.py

Removed a frivolous assertion and added tests for the plotting.

cduck

Almost done. Can you change the circuits in the tests to verify the endianness is preserved? Something like only do and X on the 2nd and 3rd qubits.

test_plot_state_histogram_multi_2 is essentially the same as test_plot_state_histogram and probably not needed.

cirq/study/visualize_test.py

Suppressed plots to PDFs during testing, updated some copied comments.

Applying X on all but one of the qubits, also deleting a test.

Stale.

cduck

LGTM. Just correct the comment and then I can merge.

cduck · 2020-06-08T20:27:49Z

cirq/study/visualize_test.py

+    c = cirq.Circuit(
+        cirq.X.on_each(*qubits[1:]),
+        cirq.measure(*qubits[:2]),  # One multi-qubit measurement
+        cirq.measure_each(*qubits[2:]),  # One single-qubit measurement


The comment is wrong. It is now two single-qubit measurements.

CirqBot · 2020-06-08T23:15:23Z

Automerge cancelled: A status check is failing.

Replaced single qubit measurement with multiple qubit.

AnimeshSinha1309 · 2020-06-09T13:04:47Z

@cduck I have no idea what is wrong, the docs fail on some completely separate module:

Warning, treated as error:
/home/runner/work/Cirq/Cirq/docs/generated/cirq.experiments.cross_entropy_benchmarking.rst:6:Error in "autofunction" directive:
1 argument(s) required, 0 supplied.

The commits that were working before are now failing, I just tried to roll back the bunch of commits I made trying to get rid of the error. What do I do about this?

cduck · 2020-06-09T14:59:27Z

This error appears unrelated to your code. It could be caused by a newly published version of one of the documentation packages that broke something. @dstrain115, @dabacon Any ideas?

dabacon · 2020-06-09T21:47:28Z

This error appears unrelated to your code. It could be caused by a newly published version of one of the documentation packages that broke something. @dstrain115, @dabacon Any ideas?

I have a fix for this in #3082

CirqBot · 2020-06-09T23:00:32Z

Automerge cancelled: A status check is failing.

@dstrain115

* [SVG] Noise hack and font fix (#3076) - Specify the font. This should not be a change for viewing in Jupyter notebook but fixes opening the svg data in e.g. inkscape where the default font is different and the boxes aren't the right size - Don't display virtual tags (for noise) xref #2905 * Support multi-qubit measurement in plot_state_histogram (#3054) * Add generated code for batch.proto (#3086) Review: @dstrain115 * Fix flakes in random_circuit_test (#3084) * Added api docs gen (copy from TFQ). * updated site_path prefix. * removed pre-built. * rename. * move to dev_tools. * removed __future__ and formatting. * yet more formatting. Co-authored-by: Matthew Harrigan <mpharrigan@google.com> Co-authored-by: Animesh Sinha <AnimeshSinha1309@gmail.com> Co-authored-by: Matthew Neeley <maffoo@google.com> Co-authored-by: Dave Bacon <dabacon@gmail.com>

@dstrain115

* [SVG] Noise hack and font fix (#3076) - Specify the font. This should not be a change for viewing in Jupyter notebook but fixes opening the svg data in e.g. inkscape where the default font is different and the boxes aren't the right size - Don't display virtual tags (for noise) xref #2905 * Support multi-qubit measurement in plot_state_histogram (#3054) * Add generated code for batch.proto (#3086) Review: @dstrain115 * Fix flakes in random_circuit_test (#3084) * Fix Quirk import extra gates bug * Move image files to docs/images/ * Move unneeded site assets * Move Sphinx templates, Makefile, conf, and init * Added api docs gen (copy from TFQ). (#3089) * [SVG] Noise hack and font fix (#3076) - Specify the font. This should not be a change for viewing in Jupyter notebook but fixes opening the svg data in e.g. inkscape where the default font is different and the boxes aren't the right size - Don't display virtual tags (for noise) xref #2905 * Support multi-qubit measurement in plot_state_histogram (#3054) * Add generated code for batch.proto (#3086) Review: @dstrain115 * Fix flakes in random_circuit_test (#3084) * Added api docs gen (copy from TFQ). * updated site_path prefix. * removed pre-built. * rename. * move to dev_tools. * removed __future__ and formatting. * yet more formatting. Co-authored-by: Matthew Harrigan <mpharrigan@google.com> Co-authored-by: Animesh Sinha <AnimeshSinha1309@gmail.com> Co-authored-by: Matthew Neeley <maffoo@google.com> Co-authored-by: Dave Bacon <dabacon@gmail.com> * Move doc tools to /dev_tools/docs/ * Move examples index into tutorials/ * Move basics tutorial into tutorials/ * Encode URL bracket so not mistaken for template. * Update references to moves docs and image files. * Update references to docs_coverage_test.py * Format py with check/format-incremental --apply * Move Sphinx RST files * Add _index.yaml for site * Add initial _book.yaml for leftnav * Manually format docs/_sphinx/conf.py for CI * Update references to moved api.rst file * Move docs/_sphinx to dev_tools/docs/sphinx * Update README.rst path for snippets_test.py * Move run_doctest to dev_tools/docs/ * Move build-docs.sh to dev_tools/docs/sphinx/ * Update references to build-docs.sh * Remove build_docs CI test Co-authored-by: Matthew Harrigan <mpharrigan@google.com> Co-authored-by: Animesh Sinha <AnimeshSinha1309@gmail.com> Co-authored-by: Matthew Neeley <maffoo@google.com> Co-authored-by: Dave Bacon <dabacon@gmail.com> Co-authored-by: Matteo Pompili <matpompili@gmail.com> Co-authored-by: MichaelBroughton <MichaelBroughton@users.noreply.github.com>

@dstrain115

* [SVG] Noise hack and font fix (quantumlib#3076) - Specify the font. This should not be a change for viewing in Jupyter notebook but fixes opening the svg data in e.g. inkscape where the default font is different and the boxes aren't the right size - Don't display virtual tags (for noise) xref quantumlib#2905 * Support multi-qubit measurement in plot_state_histogram (quantumlib#3054) * Add generated code for batch.proto (quantumlib#3086) Review: @dstrain115 * Fix flakes in random_circuit_test (quantumlib#3084) * Added api docs gen (copy from TFQ). * updated site_path prefix. * removed pre-built. * rename. * move to dev_tools. * removed __future__ and formatting. * yet more formatting. Co-authored-by: Matthew Harrigan <mpharrigan@google.com> Co-authored-by: Animesh Sinha <AnimeshSinha1309@gmail.com> Co-authored-by: Matthew Neeley <maffoo@google.com> Co-authored-by: Dave Bacon <dabacon@gmail.com>

@dstrain115

* [SVG] Noise hack and font fix (quantumlib#3076) - Specify the font. This should not be a change for viewing in Jupyter notebook but fixes opening the svg data in e.g. inkscape where the default font is different and the boxes aren't the right size - Don't display virtual tags (for noise) xref quantumlib#2905 * Support multi-qubit measurement in plot_state_histogram (quantumlib#3054) * Add generated code for batch.proto (quantumlib#3086) Review: @dstrain115 * Fix flakes in random_circuit_test (quantumlib#3084) * Fix Quirk import extra gates bug * Move image files to docs/images/ * Move unneeded site assets * Move Sphinx templates, Makefile, conf, and init * Added api docs gen (copy from TFQ). (quantumlib#3089) * [SVG] Noise hack and font fix (quantumlib#3076) - Specify the font. This should not be a change for viewing in Jupyter notebook but fixes opening the svg data in e.g. inkscape where the default font is different and the boxes aren't the right size - Don't display virtual tags (for noise) xref quantumlib#2905 * Support multi-qubit measurement in plot_state_histogram (quantumlib#3054) * Add generated code for batch.proto (quantumlib#3086) Review: @dstrain115 * Fix flakes in random_circuit_test (quantumlib#3084) * Added api docs gen (copy from TFQ). * updated site_path prefix. * removed pre-built. * rename. * move to dev_tools. * removed __future__ and formatting. * yet more formatting. Co-authored-by: Matthew Harrigan <mpharrigan@google.com> Co-authored-by: Animesh Sinha <AnimeshSinha1309@gmail.com> Co-authored-by: Matthew Neeley <maffoo@google.com> Co-authored-by: Dave Bacon <dabacon@gmail.com> * Move doc tools to /dev_tools/docs/ * Move examples index into tutorials/ * Move basics tutorial into tutorials/ * Encode URL bracket so not mistaken for template. * Update references to moves docs and image files. * Update references to docs_coverage_test.py * Format py with check/format-incremental --apply * Move Sphinx RST files * Add _index.yaml for site * Add initial _book.yaml for leftnav * Manually format docs/_sphinx/conf.py for CI * Update references to moved api.rst file * Move docs/_sphinx to dev_tools/docs/sphinx * Update README.rst path for snippets_test.py * Move run_doctest to dev_tools/docs/ * Move build-docs.sh to dev_tools/docs/sphinx/ * Update references to build-docs.sh * Remove build_docs CI test Co-authored-by: Matthew Harrigan <mpharrigan@google.com> Co-authored-by: Animesh Sinha <AnimeshSinha1309@gmail.com> Co-authored-by: Matthew Neeley <maffoo@google.com> Co-authored-by: Dave Bacon <dabacon@gmail.com> Co-authored-by: Matteo Pompili <matpompili@gmail.com> Co-authored-by: MichaelBroughton <MichaelBroughton@users.noreply.github.com>

)

Detecting multi-qubit in plot_state_histogram

2457626

plot_state_histogram works with single qubit measurements, multi-qubit measurements are detected by string matching and a warning is raised.

googlebot added the cla: no label Jun 1, 2020

Merge branch 'master' into issues/hist-multi

b4be22e

googlebot added cla: yes Makes googlebot stop complaining. and removed cla: no labels Jun 1, 2020

Formatting Changes

5e3c4fc

Order of imports and spaces on a line, linter issues fixed.

AnimeshSinha1309 added 2 commits June 1, 2020 14:55

Multi-qubit measurements supported

91dcde3

H-stacking the different measurements to allow plot_state_histogram to support multi-qubit measurements intermixed with single-qubit.

Removed unused import

11cb27f

Removed import of warnings.

dabacon previously requested changes Jun 1, 2020

View reviewed changes

cduck requested changes Jun 1, 2020

View reviewed changes

cirq/study/visualize.py Outdated Show resolved Hide resolved

cirq/study/visualize.py Show resolved Hide resolved

Added Tests

c244714

Removed a frivolous assertion and added tests for the plotting.

cduck requested changes Jun 2, 2020

View reviewed changes

AnimeshSinha1309 added 2 commits June 3, 2020 04:21

Bad Comments and Plots

25996ba

Suppressed plots to PDFs during testing, updated some copied comments.

Merge branch 'master' into issues/hist-multi

ce4c822

AnimeshSinha1309 requested a review from dabacon June 5, 2020 15:19

Endianness in tests

fe415aa

Applying X on all but one of the qubits, also deleting a test.

AnimeshSinha1309 requested a review from cduck June 8, 2020 05:22

cduck changed the title ~~Warning for multi-qubit measurement in plot_state_histogram~~ Support multi-qubit measurement in plot_state_histogram Jun 8, 2020

cduck approved these changes Jun 8, 2020

View reviewed changes

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

CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label Jun 8, 2020

CirqBot removed automerge Tells CirqBot to sync and merge this PR. (If it's running.) front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. labels Jun 8, 2020

Fixed comment

c235953

Replaced single qubit measurement with multiple qubit.

AnimeshSinha1309 force-pushed the issues/hist-multi branch 3 times, most recently from 8cadd59 to fe415aa Compare June 9, 2020 12:36

Merge branch 'master' into issues/hist-multi

9485d33

cduck mentioned this pull request Jun 9, 2020

Github workflow's build the docs is failing #3081

Closed

dabacon added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Jun 9, 2020

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

Merge branch 'master' into issues/hist-multi

7866bcc

dabacon merged commit f55090a into quantumlib:master Jun 9, 2020

tonybruguier pushed a commit to tonybruguier/Cirq that referenced this pull request Aug 23, 2020

Support multi-qubit measurement in plot_state_histogram (quantumlib#3054

a9414ae

)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support multi-qubit measurement in plot_state_histogram #3054

Support multi-qubit measurement in plot_state_histogram #3054

AnimeshSinha1309 commented Jun 1, 2020 •

edited by cduck

googlebot commented Jun 1, 2020

googlebot commented Jun 1, 2020

AnimeshSinha1309 commented Jun 1, 2020

AnimeshSinha1309 commented Jun 1, 2020

dabacon left a comment

cduck left a comment

cduck left a comment

cduck left a comment

cduck Jun 8, 2020 •

edited

AnimeshSinha1309 Jun 8, 2020

CirqBot commented Jun 8, 2020

AnimeshSinha1309 commented Jun 9, 2020

cduck commented Jun 9, 2020

dabacon commented Jun 9, 2020 •

edited

CirqBot commented Jun 9, 2020

Support multi-qubit measurement in plot_state_histogram #3054

Support multi-qubit measurement in plot_state_histogram #3054

Conversation

AnimeshSinha1309 commented Jun 1, 2020 • edited by cduck

googlebot commented Jun 1, 2020

What to do if you already signed the CLA

Individual signers

Corporate signers

googlebot commented Jun 1, 2020

AnimeshSinha1309 commented Jun 1, 2020

AnimeshSinha1309 commented Jun 1, 2020

dabacon left a comment

Choose a reason for hiding this comment

cduck left a comment

Choose a reason for hiding this comment

cduck left a comment

Choose a reason for hiding this comment

cduck left a comment

Choose a reason for hiding this comment

cduck Jun 8, 2020 • edited

Choose a reason for hiding this comment

AnimeshSinha1309 Jun 8, 2020

Choose a reason for hiding this comment

CirqBot commented Jun 8, 2020

AnimeshSinha1309 commented Jun 9, 2020

cduck commented Jun 9, 2020

dabacon commented Jun 9, 2020 • edited

CirqBot commented Jun 9, 2020

AnimeshSinha1309 commented Jun 1, 2020 •

edited by cduck

cduck Jun 8, 2020 •

edited

dabacon commented Jun 9, 2020 •

edited