ZXW Diagram implementation #92

exAClior · 2023-06-18T07:09:14Z

Implement ZXWDiagram.
Moving functions under zx_diagram.jl to utils.jl for reusing them for ZXWDiagram.

codecov · 2023-06-18T14:54:47Z

Codecov Report

Patch coverage: 85.67% and project coverage change: -11.46 ⚠️

Comparison is base (bbc19ab) 94.34% compared to head (1f5787b) 82.88%.

Additional details and impacted files

@@             Coverage Diff             @@
##           master      #92       +/-   ##
===========================================
- Coverage   94.34%   82.88%   -11.46%     
===========================================
  Files          11       16        +5     
  Lines        2085     2478      +393     
===========================================
+ Hits         1967     2054       +87     
- Misses        118      424      +306

Impacted Files	Coverage Δ
src/ZXCalculus.jl	`100.00% <ø> (ø)`
src/phase.jl	`74.24% <50.00%> (-8.58%)`	⬇️
src/utils.jl	`75.77% <75.77%> (ø)`
src/zxw_diagram.jl	`86.20% <86.20%> (ø)`
src/parameter.jl	`96.34% <96.34%> (ø)`
src/to_eincode.jl	`98.78% <98.78%> (ø)`
src/scalar.jl	`100.00% <100.00%> (ø)`

... and 7 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

ChenZhao44 · 2023-06-18T15:31:06Z

Thank you for the pull request; it looks great overall. I have a few minor suggestions. It seems that you have extended the SpiderType and used it in the ZXWDiagram. This extension also makes the original ZXDiagram capable of handling ZXW, resulting in no difference between the new ZXWDiagram. I suggest defining a new spider type for ZXWDiagram only to avoid affecting the previous data structures and algorithms.

exAClior · 2023-06-19T02:05:08Z

Thank you for the pull request; it looks great overall. I have a few minor suggestions. It seems that you have extended the SpiderType and used it in the ZXWDiagram. This extension also makes the original ZXDiagram capable of handling ZXW, resulting in no difference between the new ZXWDiagram. I suggest defining a new spider type for ZXWDiagram only to avoid affecting the previous data structures and algorithms.

This makes much more sense. I will change it accordingly. Thank you!

exAClior · 2023-06-19T13:30:07Z

Since we are implementing ZXWDiagram with as little coupling with the original implementation with ZXDiagram as possible, I want to take this opportunity to remove redundant data fields in ZXWDiagram. For example, in #77 and #72, it was suggested that ZXLayout is not necessary. I agree with this point and went ahead to remove ZXLayout from ZXWDiagram for now. @ChenZhao44 please let me know if this raises a concern and I would be happy to add those features back.

ChenZhao44 · 2023-06-19T13:44:34Z

Since we want to separate the original implementation, we can also use algebraic data types to represent the node type and its parameters. An algebraic data type is a type that combines several data types in a type-stable way. An implementation of ADTs can be found in Expronicon. By using ADT pattern matching, as implemented in MLStyle, we can replace the if else statements during matching calculus rules in an elegant way. We can discuss this in more detail during our next meeting.

exAClior · 2023-06-23T14:13:36Z

The latest commits on ADT of Parameters used to represent parameters for spider didn't pass the CI because YaoHIR and CompilerPluginTools are restricting Expronicon to be 0.6.0. I have already made a PR in YaoHIR to partially solve the problem. I am temporarily removing CompilerPluginTools from Project.toml since Roger said he wants to rewrite CompilerPluginTools instead of fixing it.

exAClior · 2023-07-01T09:17:40Z

Hello, @ChenZhao44 I have finished correcting for ZXWDiagram, and Parameter and copied from your branch the implementation of converting a ZXWDiagram to eincode and then to Matrix. I am waiting for @Roger-luo 's comment on my edits on CompilerPluginTools. For the sake of passing CI, I have removed all tests related to CompilerPluginTools.

ChenZhao44

This PR looks great. I only have two minor suggestions. Once you fix this, you can merge it.

ChenZhao44 · 2023-07-02T05:41:20Z

src/parameter.jl

+        (PiUnit(pu1, _), PiUnit(pu2, _)) && if pu1 isa Number && pu2 isa Number
+        end => Parameter(Val(:PiUnit), pu1 + pu2)
+        (PiUnit(pu1, _), PiUnit(pu2, _)) && if !(pu1 isa Number) || !(pu2 isa Number)
+        end => Parameter(Val(:PiUnit), Expr(:call, :+, pu1, pu2))


Here we should include the number type of the expr. See https://github.com/QuantumBFS/ZXCalculus.jl/blob/bbc19ab5ec0f1eb0b09ffa7a6e2976f60b625fbc/src/phase.jl#L30C35-L30C35

Thank you very much! I corrected the Expr part. For the pattern matched above that, I declared the constructor of Parameter as a parametric method. The type of pu should be automatically matched like in the previous implementation link The test passed alright, I will merge the changes for now.

My apologies, I just realized that I didn't push my last change to the branch before merging. I will add those changes to next branch's update.

ChenZhao44 · 2023-07-02T05:43:28Z

src/parameter.jl

+        end => Parameter(Val(:PiUnit), pu1 - pu2)
+        (PiUnit(pu1, pu_t1), PiUnit(pu2, pu_t2)) &&
+            if !(pu1 isa Number) || !(pu2 isa Number)
+            end => Parameter(Val(:PiUnit), Expr(:call, :-, pu1, pu2))


Same as above

Changed here too.

exAClior added 6 commits June 17, 2023 22:59

start implement ZXW

1ec4a88

reposition round_phase! and add test

eb5d07a

compatcity _round_phase_dict!, add more tests

030b10f

remove round_phase! def at other files

476ad89

finish porting ZX function to ZXW until printing

c8119d3

add test until add_spider!()

2bcb844

exAClior added 3 commits June 19, 2023 12:18

create new module for holding SType of ZXW

92b4d8f

revert change, avoid affecting prev implemention

2b96beb

separated zxw implementation,checked tests

84303c0

exAClior added 4 commits June 23, 2023 16:55

implement ADT's construction & test

ee788e8

add io & test

1468540

implement + and its test

527d300

add Expronicon and temporarily remove CompilerPlug

62ff45c

exAClior added 11 commits June 24, 2023 21:24

finish implementing @adt public Parameter & test

fb3639d

implement ADT SpiderType

0883df8

updated zxw to support spidertype with ADT

fdf836a

fix ADT affected ZXWDiagram utility funcs

544eea6

implemented ein sum only, no test

ff9af93

update project toml and start correct Parameter

885c907

brief update before leaving

3fbe55b

correcting upto adding parameters

df27ac0

finish fixing parameter, remove * and / rules

19e1958

fix zxw_diagram and util for new Parameter

e93d4bd

finish reimplementing add gates

1e9f07d

exAClior added 2 commits July 1, 2023 16:55

add test for eincode

54c29a7

temporarily remove CompilerPluginTools tests

1f5787b

exAClior marked this pull request as ready for review July 1, 2023 09:17

exAClior requested a review from ChenZhao44 July 1, 2023 09:18

exAClior changed the title ~~[WIP] ZXW Diagram implementation~~ ZXW Diagram implementation Jul 1, 2023

ChenZhao44 approved these changes Jul 2, 2023

View reviewed changes

exAClior merged commit 5161a51 into QuantumBFS:master Jul 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ZXW Diagram implementation #92

ZXW Diagram implementation #92

exAClior commented Jun 18, 2023

codecov bot commented Jun 18, 2023 •

edited

Loading

ChenZhao44 commented Jun 18, 2023

exAClior commented Jun 19, 2023

exAClior commented Jun 19, 2023

ChenZhao44 commented Jun 19, 2023

exAClior commented Jun 23, 2023

exAClior commented Jul 1, 2023

ChenZhao44 left a comment

ChenZhao44 Jul 2, 2023

exAClior Jul 2, 2023

exAClior Jul 3, 2023

ChenZhao44 Jul 2, 2023

exAClior Jul 2, 2023

ZXW Diagram implementation #92

ZXW Diagram implementation #92

Conversation

exAClior commented Jun 18, 2023

codecov bot commented Jun 18, 2023 • edited Loading

Codecov Report

ChenZhao44 commented Jun 18, 2023

exAClior commented Jun 19, 2023

exAClior commented Jun 19, 2023

ChenZhao44 commented Jun 19, 2023

exAClior commented Jun 23, 2023

exAClior commented Jul 1, 2023

ChenZhao44 left a comment

Choose a reason for hiding this comment

ChenZhao44 Jul 2, 2023

Choose a reason for hiding this comment

exAClior Jul 2, 2023

Choose a reason for hiding this comment

exAClior Jul 3, 2023

Choose a reason for hiding this comment

ChenZhao44 Jul 2, 2023

Choose a reason for hiding this comment

exAClior Jul 2, 2023

Choose a reason for hiding this comment

codecov bot commented Jun 18, 2023 •

edited

Loading