Support merging 1-qubit gates in transformers for parameterized circuits #7149

babacry · 2025-03-17T22:32:57Z

Input: symbolized_circuit, sweep
Output: new_symbolzied_circuit, new_sweep

codecov · 2025-03-18T02:21:48Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.67%. Comparing base (5112418) to head (e67e661).
Report is 41 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff            @@
##             main    #7149    +/-   ##
========================================
  Coverage   98.66%   98.67%            
========================================
  Files        1106     1110     +4     
  Lines       96086    96266   +180     
========================================
+ Hits        94808    94987   +179     
- Misses       1278     1279     +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

babacry · 2025-03-18T18:05:59Z

Hi Eliott, Nour, I have added the function to support one use case. Could you PTAL? For the use case of combined input of sweep and parameterized circuit, will be added in the followup PR. Let's first make sure this PR is in the right place and do the right job. Thanks!

eliottrosenberg

I tested it a little bit in this colab, and it doesn't seem to work properly yet, the interface looks good to me.

cirq-core/cirq/transformers/merge_single_qubit_gates.py

eliottrosenberg

Thanks so much @babacry!!! I tested it here, and it seems to work!

eliottrosenberg · 2025-04-04T00:09:12Z

One small comment: it would be nice if the merged single-qubit gates ended up in the same moment; see this cell of the colab.

babacry · 2025-04-04T00:12:45Z

Got you, thanks a lot for the manual checks! I will update the pr accordingly and fix checks.

Note: if users expect update sweeps together with merging, it's not supported yet. It's a todo item to be supported in the followup PRs.

tag_transformers: remove_tags, index_tags. symbolize: symbolize_single_qubit_gates_by_indexed_tags

babacry · 2025-04-23T04:30:16Z

Thanks Nour for the valuable suggestions. I come up with a much better version with your inputs. @NoureldinYosri

I added tag_transformers and symbolize transformers which are some dependencies of merge_single_qubit_gates_symbolzied.

Could you help take another look? (I can split the tag_transformer, symbolize transformers out in different prs if this PR is too huge).

NoureldinYosri

lets split this PR into smaller PRs ... also what is happening with all these tags?

NoureldinYosri · 2025-04-29T23:08:42Z

cirq-core/cirq/transformers/merge_single_qubit_gates.py

@@ -65,6 +76,7 @@ def merge_single_qubit_gates_to_phxz(
    circuit: 'cirq.AbstractCircuit',
    *,
    context: Optional['cirq.TransformerContext'] = None,
+    merge_tags_fn: Optional[Callable[['cirq.CircuitOperation'], List[Hashable]]] = None,


I feel like this is a bit too general ... what is the problem with recieving a list of tags ?

I kind of need a function here as what I need to do is given a circuit op, set the output tags with more rule based tag setters and I believe the flexibility of the function can help users in different use cases.

Currently, the merge function do the following mapping in the rewriter

CircuitOperation(X['tag_needed'] -- Y['tag1']) --> phxz(x,z,a) with no tags

In my use case, I need a rule based tag setter:

case 1: CircuitOperation(X['tag_needed'] -- Y['tag1']) --'tag_needed' presented--> phxz(...)['phxz_{iter}']
case 2: CircuitOperation(X -- Z) --no 'tags_needed' found --> phxz(...) with no tags

Flexibility of merge_tags_fn: e.g., if users want to preserve all the tags in the circuit op, they may do the merges in merge_tags_fn, then the tags can preserve like the following

CircuitOperation(X['tag0'] -- Y['tag1']) --> phxz(...)['tag0', 'tag1']

NoureldinYosri · 2025-04-29T23:12:38Z

cirq-core/cirq/transformers/merge_single_qubit_gates.py

+        )
+        merged_circuits.append(merged_circuit)
+
+    if not all(


I don't think this should happen here ... this should be a test for the correctness of the transformer

It's to validate the input parameters sweep, basically all the resolvers in sweep shoulld resolve the circuit to the same structure, otherwise, we can't do the merge here.

If we don't check here, Step 2 of parameterization would possibly crash with different kind of errors.

I should probably update the error message as InvalidArgument("Invalid input sweep, different resolvers in sweep resulted in different merged structures.")

babacry · 2025-04-30T00:00:50Z

Thanks! @NoureldinYosri I will split the PRs =)

babacry · 2025-04-30T05:06:17Z

Split 2 pre-requisites in #7306 and #7307

mhucka · 2025-05-16T16:26:40Z

@babacry Are the 2 new PRs complete replacements for this one? If so, should this one be closed?

babacry · 2025-05-17T00:46:23Z

@mhucka this pr will depend on the other 2 prs.

Though this PR is too noisy right now and out of sync, I will close this one and create a new PR with this closed pr attached. FYI @NoureldinYosri @eliottrosenberg .

mhucka · 2025-05-17T01:42:29Z

@babacry Ok, thank you!

babacry force-pushed the merge_single branch 6 times, most recently from 3dea74b to d5da63a Compare March 18, 2025 02:09

babacry force-pushed the merge_single branch from d5da63a to c4751c5 Compare March 18, 2025 02:26

babacry assigned eliottrosenberg and NoureldinYosri Mar 18, 2025

eliottrosenberg requested changes Mar 24, 2025

View reviewed changes

cirq-core/cirq/transformers/merge_single_qubit_gates.py Outdated Show resolved Hide resolved

babacry mentioned this pull request Apr 2, 2025

Is MatrixGate supported with sympy? If not, can/shall we support it? #7206

Closed

babacry commented Apr 2, 2025

View reviewed changes

cirq-core/cirq/transformers/merge_single_qubit_gates.py Outdated Show resolved Hide resolved

eliottrosenberg self-requested a review April 4, 2025 00:06

eliottrosenberg approved these changes Apr 4, 2025

View reviewed changes

babacry force-pushed the merge_single branch 11 times, most recently from 33a8233 to 7ac61a5 Compare April 9, 2025 08:09

babacry marked this pull request as ready for review April 9, 2025 19:22

babacry force-pushed the merge_single branch from 56bc992 to 6612674 Compare April 16, 2025 21:30

babacry added 6 commits April 22, 2025 18:20

Support merge 1-qubit gates for parameterized circuits

11104cc

Note: if users expect update sweeps together with merging, it's not supported yet. It's a todo item to be supported in the followup PRs.

Reimplement.

f45f90e

fix checks.

a48d4bb

fix lint

1ddf7ce

fix docstring and func name

3c46507

Expose more transformers

ecb6a83

tag_transformers: remove_tags, index_tags. symbolize: symbolize_single_qubit_gates_by_indexed_tags

babacry force-pushed the merge_single branch from a948e11 to ecb6a83 Compare April 23, 2025 01:26

babacry added 10 commits April 22, 2025 18:32

fix

a61b1e3

fix format, type, lint

830d2eb

fix

b09d33c

fix tags_to_ignore and coverage

dac4e32

rm logging code..

2982730

rm unnecessary and wrong utils

37163c0

fix tag_transformer

b680e50

fix TParamValComplex

875179b

fix param resolve, type casting etc.

414adda

fix format

f197a89

babacry requested a review from NoureldinYosri April 23, 2025 04:30

babacry added 3 commits April 22, 2025 21:43

fix checks

807f35f

Small fixes of comments and docstrings.

69ad9eb

Fix docstring, rm empty lines.

e67e661

NoureldinYosri reviewed Apr 29, 2025

View reviewed changes

babacry closed this May 17, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support merging 1-qubit gates in transformers for parameterized circuits #7149

Support merging 1-qubit gates in transformers for parameterized circuits #7149

babacry commented Mar 17, 2025 •

edited

Loading

codecov bot commented Mar 18, 2025 •

edited

Loading

babacry commented Mar 18, 2025

eliottrosenberg left a comment

eliottrosenberg left a comment

eliottrosenberg commented Apr 4, 2025

babacry commented Apr 4, 2025

babacry commented Apr 23, 2025

NoureldinYosri left a comment

NoureldinYosri Apr 29, 2025

babacry Apr 29, 2025

NoureldinYosri Apr 29, 2025

babacry Apr 29, 2025 •

edited

Loading

babacry commented Apr 30, 2025

babacry commented Apr 30, 2025

mhucka commented May 16, 2025

babacry commented May 17, 2025

mhucka commented May 17, 2025

Support merging 1-qubit gates in transformers for parameterized circuits #7149

Support merging 1-qubit gates in transformers for parameterized circuits #7149

Conversation

babacry commented Mar 17, 2025 • edited Loading

codecov bot commented Mar 18, 2025 • edited Loading

Codecov Report

babacry commented Mar 18, 2025

eliottrosenberg left a comment

Choose a reason for hiding this comment

eliottrosenberg left a comment

Choose a reason for hiding this comment

eliottrosenberg commented Apr 4, 2025

babacry commented Apr 4, 2025

babacry commented Apr 23, 2025

NoureldinYosri left a comment

Choose a reason for hiding this comment

NoureldinYosri Apr 29, 2025

Choose a reason for hiding this comment

babacry Apr 29, 2025

Choose a reason for hiding this comment

NoureldinYosri Apr 29, 2025

Choose a reason for hiding this comment

babacry Apr 29, 2025 • edited Loading

Choose a reason for hiding this comment

babacry commented Apr 30, 2025

babacry commented Apr 30, 2025

mhucka commented May 16, 2025

babacry commented May 17, 2025

mhucka commented May 17, 2025

babacry commented Mar 17, 2025 •

edited

Loading

codecov bot commented Mar 18, 2025 •

edited

Loading

babacry Apr 29, 2025 •

edited

Loading