Classical sympy conditions with qudits #4778

daxfohl · 2021-12-23T21:56:34Z

Part 14 of https://tinyurl.com/cirq-feedforward, the final PR of the series(!)

Adds a measured_qubits field to ActOnArgs, that records which qubits were used in each measurement. Then uses the dimensions of these qubits when calculating the integer value of each measurement when resolving sympy expressions.

Closes #3232
Closes #887

Related: #3233 or #3231 (open question @95-martin-orion whether this closes those or not)

daxfohl · 2021-12-24T00:04:32Z

cirq-core/cirq/sim/act_on_args.py

@@ -47,6 +47,7 @@ def __init__(
        prng: np.random.RandomState = None,
        qubits: Sequence['cirq.Qid'] = None,
        log_of_measurement_results: Dict[str, List[int]] = None,
+        measured_qubits: Dict[str, Tuple['cirq.Qid', ...]] = None,


@95-martin-orion I did this the least-invasive way, of adding this measured_qubits member and propagating it everywhere it needed to be. This is a little smelly because it and log_of_measurement_results go hand in hand and are initialized, copied, etc. in pairs. I think the better option though is to introduce a new classical_state: ClassicalState that contains both of these dictionaries, plus whatever we add later, and then deprecate log_of_measurement_results.. I know it breaks the "rule of three" to do so, but I'm pretty sure we'll have a third thing to put into it soon.

It may be a big deprecation, but it may be worth it to do now rather than having to clean up the mess after things like repeated measurements, keeping track of qubits, etc have all become dependent on it.

Additionally I noticed a minor bug here is that I don't keep track of the qubits in keyed channels. If we have a ClassicalState class then we can make the interface such that writing to the dictionaries requires both a value and a qubit list, so that such an omission is impossible. Of course, that will make for a much bigger review. WDYT?

@95-martin-orion

Adds a `ClassicalDataStore` class so we can keep track of which qubits are associated to which measurements. Closes #3232. Initially this was created as part 14 (of 14) of https://tinyurl.com/cirq-feedforward to enable qudits in classical conditions, by storing and using dimensions of the measured qubits when calculating the integer value of each measurement when resolving sympy expressions. However it may have broader applicability. This approach also sets us up to more easily add different types of measurements (#3233, #4274). It will also ease the path to #3002 and #4449., as we can eventually pass this into `Result` rather than the raw `log_of_measurement_results` dictionary. (The return type of `_run` will have to be changed to `Sequence[C;assicalDataStoreReader]`. Related: #887, #3231 (open question @95-martin-orion whether this closes those or not) This PR contains a `ClassicalDataStoreReader` and `ClassicalDataStoreBase` parent "interface" for the `ClassicalDataStore` class as well. This will allow us to swap in different representations that may have different performance characteristics. See #3808 for an example use case. This could be done by adding an optional `ClassicalDataStore` factory method argument to the `SimulatorBase` initializer, or separately to sampler classes. (Note this is an alternative to #4778 for supporting qudits in sympy classical control expressions, as discussed here: https://github.com/quantumlib/Cirq/pull/4778/files#r774816995. The other PR was simpler and less invasive, but a bit hacky. I felt even though bigger, this seemed like the better approach and especially fits better with our future direction, and closed the other one). **Breaking Changes**: 1. The abstract method `SimulatorBase._create_partial_act_on_args` argument `log_of_measurement_results: Dict` has been changed to `classical_data: ClassicalData`. Any third-party simulators that inherit `SimulatorBase` will need to update their implementation accordingly. 2. The abstract base class `ActOnArgs.__init__` argument `log_of_measurement_results: Dict` is now copied before use. For users that depend on the pass-by-reference semantics (this should be rare), they can use the new `classical_data: ClassicalData` argument instead, which is pass-by-reference.

@95-martin-orion

…mlib#4781) Adds a `ClassicalDataStore` class so we can keep track of which qubits are associated to which measurements. Closes quantumlib#3232. Initially this was created as part 14 (of 14) of https://tinyurl.com/cirq-feedforward to enable qudits in classical conditions, by storing and using dimensions of the measured qubits when calculating the integer value of each measurement when resolving sympy expressions. However it may have broader applicability. This approach also sets us up to more easily add different types of measurements (quantumlib#3233, quantumlib#4274). It will also ease the path to quantumlib#3002 and quantumlib#4449., as we can eventually pass this into `Result` rather than the raw `log_of_measurement_results` dictionary. (The return type of `_run` will have to be changed to `Sequence[C;assicalDataStoreReader]`. Related: quantumlib#887, quantumlib#3231 (open question @95-martin-orion whether this closes those or not) This PR contains a `ClassicalDataStoreReader` and `ClassicalDataStoreBase` parent "interface" for the `ClassicalDataStore` class as well. This will allow us to swap in different representations that may have different performance characteristics. See quantumlib#3808 for an example use case. This could be done by adding an optional `ClassicalDataStore` factory method argument to the `SimulatorBase` initializer, or separately to sampler classes. (Note this is an alternative to quantumlib#4778 for supporting qudits in sympy classical control expressions, as discussed here: https://github.com/quantumlib/Cirq/pull/4778/files#r774816995. The other PR was simpler and less invasive, but a bit hacky. I felt even though bigger, this seemed like the better approach and especially fits better with our future direction, and closed the other one). **Breaking Changes**: 1. The abstract method `SimulatorBase._create_partial_act_on_args` argument `log_of_measurement_results: Dict` has been changed to `classical_data: ClassicalData`. Any third-party simulators that inherit `SimulatorBase` will need to update their implementation accordingly. 2. The abstract base class `ActOnArgs.__init__` argument `log_of_measurement_results: Dict` is now copied before use. For users that depend on the pass-by-reference semantics (this should be rare), they can use the new `classical_data: ClassicalData` argument instead, which is pass-by-reference.

@95-martin-orion

…mlib#4781) Adds a `ClassicalDataStore` class so we can keep track of which qubits are associated to which measurements. Closes quantumlib#3232. Initially this was created as part 14 (of 14) of https://tinyurl.com/cirq-feedforward to enable qudits in classical conditions, by storing and using dimensions of the measured qubits when calculating the integer value of each measurement when resolving sympy expressions. However it may have broader applicability. This approach also sets us up to more easily add different types of measurements (quantumlib#3233, quantumlib#4274). It will also ease the path to quantumlib#3002 and quantumlib#4449., as we can eventually pass this into `Result` rather than the raw `log_of_measurement_results` dictionary. (The return type of `_run` will have to be changed to `Sequence[C;assicalDataStoreReader]`. Related: quantumlib#887, quantumlib#3231 (open question @95-martin-orion whether this closes those or not) This PR contains a `ClassicalDataStoreReader` and `ClassicalDataStoreBase` parent "interface" for the `ClassicalDataStore` class as well. This will allow us to swap in different representations that may have different performance characteristics. See quantumlib#3808 for an example use case. This could be done by adding an optional `ClassicalDataStore` factory method argument to the `SimulatorBase` initializer, or separately to sampler classes. (Note this is an alternative to quantumlib#4778 for supporting qudits in sympy classical control expressions, as discussed here: https://github.com/quantumlib/Cirq/pull/4778/files#r774816995. The other PR was simpler and less invasive, but a bit hacky. I felt even though bigger, this seemed like the better approach and especially fits better with our future direction, and closed the other one). **Breaking Changes**: 1. The abstract method `SimulatorBase._create_partial_act_on_args` argument `log_of_measurement_results: Dict` has been changed to `classical_data: ClassicalData`. Any third-party simulators that inherit `SimulatorBase` will need to update their implementation accordingly. 2. The abstract base class `ActOnArgs.__init__` argument `log_of_measurement_results: Dict` is now copied before use. For users that depend on the pass-by-reference semantics (this should be rare), they can use the new `classical_data: ClassicalData` argument instead, which is pass-by-reference.

daxfohl added 30 commits December 8, 2021 16:50

Allow sympy expressions as classical controls

b76950e

Format

5fdff50

move Condition to value

ef081d7

Condition subclasses

0dd430e

Fix sympy resolver

3fb7f75

lint

9568ae0

fix CCO serialization

04fcff7

fix CCO serialization

b3c344e

add json reprs for conditions

b8ff20a

add support for qudits in conditions

aa99805

add test

cbb029b

tests

efce2f9

tests

b34994b

test

5537397

format

73ed74b

docstrings

a415235

subop

3a0a56d

regex

f930f6a

docs

39a7a95

Make test_sympy more intuitive.

42bac3e

Sympy str roundtrip

f4ea9d8

Resolve some code review comments

71f61f5

Add escape key to parse_sympy_condition

2261355

repr

6b36357

coverage

afbf3c9

coverage

58fb2dc

parser

bd80c0b

Improve sympy repr

c39a572

lint

12d38ca

sympy.basic

724febb

daxfohl added 13 commits December 20, 2021 10:35

_from_json_dict_

d167de7

lint

72d82eb

reduce fixed_tokens

b55188e

Merge branch 'master' into sympy3

fd1fefb

Merge branch 'master' into sympymerge

f6a6645

Merge branch 'sympy3' of https://github.com/daxfohl/Cirq into sympy3

de3f887

more tests

ca56bd8

format

6f8e344

Key

689719f

combined test

96ba4e9

Merge remote-tracking branch 'origin/sympy3' into sympy3

793c138

Merge branch 'sympy3' into qudits2

0b5526f

Merge branch 'master' into qudits2

8c17a3f

CirqBot added the size: M 50< lines changed <250 label Dec 23, 2021

daxfohl added 2 commits December 23, 2021 14:04

lint

c56d6bb

Docstrings

681a008

daxfohl marked this pull request as ready for review December 23, 2021 22:33

daxfohl requested review from cduck, vtomole, wcourtney and a team as code owners December 23, 2021 22:33

daxfohl requested a review from dabacon December 23, 2021 22:33

Merge branch 'master' into qudits2

1bddb1c

daxfohl commented Dec 24, 2021

View reviewed changes

daxfohl mentioned this pull request Dec 24, 2021

Add ClassicalDataStore class to keep track of qubits measured #4781

Merged

daxfohl closed this Dec 24, 2021

daxfohl deleted the qudits branch February 7, 2022 20:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Classical sympy conditions with qudits #4778

Classical sympy conditions with qudits #4778

daxfohl commented Dec 23, 2021 •

edited

Loading

daxfohl Dec 24, 2021 •

edited

Loading

Classical sympy conditions with qudits #4778

Classical sympy conditions with qudits #4778

Conversation

daxfohl commented Dec 23, 2021 • edited Loading

daxfohl Dec 24, 2021 • edited Loading

Choose a reason for hiding this comment

daxfohl commented Dec 23, 2021 •

edited

Loading

daxfohl Dec 24, 2021 •

edited

Loading