Qcut sampling postprocessing function #2358

anthayes92 · 2022-03-22T13:28:49Z

Context:
The pipeline for cutting a circuit with sampling measurements requires it own postprocessing capabilities. This will support returning bitstrings as well as expectation values, the choice of which should be specified by the user.

Description of the Change:
Add sampling postprocessing function

Benefits:
Facilitates cutting circuits with sampling measurements

Possible Drawbacks:
Potential computational bottleneck depending on number of fragments circuits to be processed

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

…version

…ithub.com:PennyLaneAI/pennylane into qcut-sample-subgraphs-to-fragment-tape-conversion

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

…version

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

pennylane/transforms/qcut.py

trbromley

Thanks @anthayes92!

doc/releases/changelog-dev.md

pennylane/transforms/qcut.py

trbromley · 2022-03-23T18:10:48Z

tests/transforms/test_qcut.py

+        for pp, exp_pp in zip(postprocessed, expected_postprocessed):
+            assert np.allclose(pp, exp_pp)


Suggested change

for pp, exp_pp in zip(postprocessed, expected_postprocessed):

assert np.allclose(pp, exp_pp)

assert np.allclose(postprocessed[0], expected_postprocessed[0])

Do we need the loop if there's only one element?

trbromley · 2022-03-23T18:13:37Z

tests/transforms/test_qcut.py

+    gives the correct results.
+    """
+
+    def test_sample_postprocess(self):


Might be good to have an interface-based test like here, where we also check that the returned is converted to the right interface type.

trbromley · 2022-03-23T18:15:34Z

tests/transforms/test_qcut.py

+        for pp, exp_pp in zip(postprocessed, expected_postprocessed):
+            assert np.allclose(pp, exp_pp)
+
+    def test_mc_sample_postprocess(self):


Similarly for this test, would be good to check for all the interfaces.

These tests now iterate over all interfaces.

tests/transforms/test_qcut.py

trbromley · 2022-03-23T18:26:41Z

tests/transforms/test_qcut.py

+            fixed_samples, communication_graph, fixed_settings, shots, func
+        )
+
+        expected = 85.33333333333333


I'd be tempted to add some spy functionality (e.g., to classical_processing_fn,prod, and potentially hstack) to check the provided inputs are as expected.

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

pennylane/transforms/qcut.py

anthayes92 · 2022-03-24T15:01:54Z

tests/transforms/test_qcut.py

+
+        fixed_settings = np.array([[0, 7, 1], [5, 7, 2], [1, 0, 3], [5, 1, 1]])
+
+        # spy_func = mocker.spy(fn)


I'm not sure how to spy on this function, generally we use mocker.spy(package, "function") but this function exists by itself so I only have a single arg to pass to spy

Ok, can leave out for now 👍

trbromley

Thanks @anthayes92! Just left a few more comments - would it also be possible to fix what is mentioned here?

pennylane/transforms/qcut.py

trbromley · 2022-03-24T22:19:53Z

tests/transforms/test_qcut.py

+        ]
+
+        postprocessed = qcut.qcut_processing_fn_sample(fixed_samples, communication_graph, shots)
+        postprocessed = qml.math.cast_like(postprocessed, lib.ones(1))


Why are we casting the output to the interface type? We need to cast the input to the interface type and check that the output is of the same type.

(same for the test below)

ah I got mixed up! changed here: fd328ac

trbromley · 2022-03-24T22:23:26Z

tests/transforms/test_qcut.py

+
+        fixed_settings = np.array([[0, 7, 1], [5, 7, 2], [1, 0, 3], [5, 1, 1]])
+
+        # spy_func = mocker.spy(fn)


Ok, can leave out for now 👍

tests/transforms/test_qcut.py

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

anthayes92 · 2022-03-25T14:23:36Z

Thanks for the suggestions @trbromley , I've updated the docsting for expand_fragment_tapes_mc to include the settings array and also changed the tape diagrams since the tape.draw() function has been updated to give cleaner output.

trbromley

Thanks @anthayes92. I've left a final round of comments but should be good to merge once resolved.

doc/releases/changelog-dev.md

pennylane/transforms/qcut.py

trbromley · 2022-03-27T17:26:24Z

tests/transforms/test_qcut.py

+            np.array([[0.0], [-1.0], [-1.0]]),
+            np.array([[1.0], [1.0], [1.0]]),
+        ]
+        cast_fixed_samples = [qml.math.cast_like(fs, lib.ones(1)) for fs in fixed_samples]


Suggested change

cast_fixed_samples = [qml.math.cast_like(fs, lib.ones(1)) for fs in fixed_samples]

cast_fixed_samples = [qml.math.convert_like(fs, lib.ones(1)) for fs in fixed_samples]

This is an important distinction.

trbromley · 2022-03-27T17:31:41Z

tests/transforms/test_qcut.py

+        fragment_configurations, settings = qml.transforms.qcut.expand_fragment_tapes_mc(
+            fragment_tapes, communication_graph, shots
+        )


Suggested change

fragment_configurations, settings = qml.transforms.qcut.expand_fragment_tapes_mc(

fragment_tapes, communication_graph, shots

)

trbromley · 2022-03-27T17:32:29Z

tests/transforms/test_qcut.py

+            np.array([[0.0], [-1.0], [-1.0]]),
+            np.array([[1.0], [1.0], [1.0]]),
+        ]
+        cast_fixed_samples = [qml.math.cast_like(fs, lib.ones(1)) for fs in fixed_samples]


Suggested change

cast_fixed_samples = [qml.math.cast_like(fs, lib.ones(1)) for fs in fixed_samples]

cast_fixed_samples = [qml.math.convert_like(fs, lib.ones(1)) for fs in fixed_samples]

trbromley · 2022-03-27T17:34:55Z

tests/transforms/test_qcut.py

+        postprocessed = qcut.qcut_processing_fn_mc(
+            fixed_samples, communication_graph, fixed_settings, shots, fn
+        )
+        postprocessed = qml.math.cast_like(postprocessed, lib.ones(1))


Suggested change

postprocessed = qml.math.cast_like(postprocessed, lib.ones(1))

I don't think we need this - we should be testing that postprocessed is the expected type without casting.

trbromley · 2022-03-27T17:41:30Z

tests/transforms/test_qcut.py

+        spy_hstack = mocker.spy(np, "hstack")
+
+        postprocessed = qcut.qcut_processing_fn_mc(
+            fixed_samples, communication_graph, fixed_settings, shots, fn


Suggested change

fixed_samples, communication_graph, fixed_settings, shots, fn

cast_fixed_samples, communication_graph, fixed_settings, shots, fn

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

anthayes92 · 2022-03-28T13:54:17Z

Thanks for the suggestions @trbromley . Updates to the tests have been manually checked and added here: ceb1383

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

trbromley

Thanks @anthayes92!

anthayes92 and others added 30 commits March 11, 2022 18:51

extend graph_to_tape for sampling, add unit test

248f83a

add PR to changelog

7b07eab

add fragment sample circuit unit test

b9f65e2

Apply suggestions from code review

d44e63a

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

add sampling tensor obs error, add test

c6ac586

add test for sample obs

5a4f9e7

Apply suggestions from code review

cf33690

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

extend graph to tape logic to sample measurements, add unit test

61c32fc

remove unused logic, add mid circuit meas test

fcf2c3e

update changelog

efbc343

Merge branch 'master' into qcut-sample-subgraphs-to-fragment-tape-con…

4b65562

…version

fix variables

7983ba0

Merge branch 'qcut-sample-subgraphs-to-fragment-tape-conversion' of g…

5ab21b6

…ithub.com:PennyLaneAI/pennylane into qcut-sample-subgraphs-to-fragment-tape-conversion

Apply suggestions from code review

81c71f7

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

add suggestions from code review

e8971b9

add upsupported meas exception, add unit test

201d400

fix codefactor issue

ad1c479

Merge branch 'master' into qcut-sample-subgraphs-to-fragment-tape-con…

71ceb83

…version

add expand_fragment_tapes_mc function and unit test

9ed788d

update docs

70bc71f

update changelog

4237654

update unit test

b3866d1

add unit tests for MC measurements and state preps

6c1c17b

update expansion logic, add unit test

a71dc9e

fix wire bug

558cc79

Apply suggestions from code review

1d793c9

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

Merge branch 'master' into qcut-sample-fragment-configurations

c609ded

add suggestions from code review

f9b8ddf

begin mc postprocessing function, add unit test

65a9226

attempt MC postprocessing

86010d4

anthayes92 requested a review from trbromley March 23, 2022 15:01

anthayes92 commented Mar 23, 2022

View reviewed changes

pennylane/transforms/qcut.py Show resolved Hide resolved

trbromley suggested changes Mar 23, 2022

View reviewed changes

anthayes92 and others added 4 commits March 23, 2022 14:38

Apply suggestions from code review

b912475

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

add suggestions from code review

d00b742

Merge branch 'master' into qcut-sampling-postprocessing-function

1deb4cc

add remaining suggestions

09cc5f2

anthayes92 commented Mar 24, 2022

View reviewed changes

Merge branch 'master' into qcut-sampling-postprocessing-function

fcb8e6d

anthayes92 requested a review from trbromley March 24, 2022 17:27

Merge branch 'master' into qcut-sampling-postprocessing-function

07b4b9b

trbromley reviewed Mar 24, 2022

View reviewed changes

anthayes92 and others added 2 commits March 25, 2022 09:38

Apply suggestions from code review

076abdd

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

add code review suggestions

fd328ac

Merge branch 'master' into qcut-sampling-postprocessing-function

0008811

anthayes92 requested a review from trbromley March 25, 2022 15:10

Merge branch 'master' into qcut-sampling-postprocessing-function

7263085

trbromley reviewed Mar 27, 2022

View reviewed changes

anthayes92 and others added 3 commits March 28, 2022 09:07

Apply suggestions from code review

13e3828

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

add code review suggestions

ceb1383

Merge branch 'master' into qcut-sampling-postprocessing-function

a1d3582

anthayes92 and others added 2 commits March 28, 2022 09:55

Update pennylane/transforms/qcut.py

0bf1187

Co-authored-by: Tom Bromley <49409390+trbromley@users.noreply.github.com>

format

b9f490f

anthayes92 requested a review from trbromley March 28, 2022 16:11

Merge branch 'master' into qcut-sampling-postprocessing-function

e9caf96

trbromley approved these changes Mar 29, 2022

View reviewed changes

anthayes92 merged commit 62afe04 into master Mar 29, 2022

anthayes92 deleted the qcut-sampling-postprocessing-function branch March 29, 2022 13:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Qcut sampling postprocessing function #2358

Qcut sampling postprocessing function #2358

anthayes92 commented Mar 22, 2022

trbromley left a comment

trbromley Mar 23, 2022

trbromley Mar 23, 2022

trbromley Mar 23, 2022

anthayes92 Mar 24, 2022

trbromley Mar 23, 2022

anthayes92 Mar 24, 2022

trbromley Mar 24, 2022

trbromley left a comment

trbromley Mar 24, 2022

trbromley Mar 24, 2022

anthayes92 Mar 25, 2022

trbromley Mar 24, 2022

anthayes92 commented Mar 25, 2022

trbromley left a comment

trbromley Mar 27, 2022

trbromley Mar 27, 2022

trbromley Mar 27, 2022

trbromley Mar 27, 2022

trbromley Mar 27, 2022

anthayes92 commented Mar 28, 2022

trbromley left a comment

		for pp, exp_pp in zip(postprocessed, expected_postprocessed):
		assert np.allclose(pp, exp_pp)

	for pp, exp_pp in zip(postprocessed, expected_postprocessed):
	assert np.allclose(pp, exp_pp)
	assert np.allclose(postprocessed[0], expected_postprocessed[0])


		fixed_settings = np.array([[0, 7, 1], [5, 7, 2], [1, 0, 3], [5, 1, 1]])

		# spy_func = mocker.spy(fn)

	cast_fixed_samples = [qml.math.cast_like(fs, lib.ones(1)) for fs in fixed_samples]
	cast_fixed_samples = [qml.math.convert_like(fs, lib.ones(1)) for fs in fixed_samples]

	fragment_configurations, settings = qml.transforms.qcut.expand_fragment_tapes_mc(
	fragment_tapes, communication_graph, shots
	)

	fixed_samples, communication_graph, fixed_settings, shots, fn
	cast_fixed_samples, communication_graph, fixed_settings, shots, fn

Qcut sampling postprocessing function #2358

Qcut sampling postprocessing function #2358

Conversation

anthayes92 commented Mar 22, 2022

trbromley 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

trbromley 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

anthayes92 commented Mar 25, 2022

trbromley 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

anthayes92 commented Mar 28, 2022

trbromley left a comment

Choose a reason for hiding this comment