Skip to content

Commit c28e542

Browse files
ChenZhao44ChenZhao44
authored
Refactoring ZX implementation (#114)
* comments for refactoring * group tests * phase interface * restrict phase type * fix test for restricted phase type * update phase interface * restrict abstract type * fix test * clifford check * phase interface * complete test * reorganize rules * rename fusion * rename rules * decouple layout for ZXGraph * rename rule * decouple inputs and outputs * move inputs outputs * rm layouts from ZXGraph * fix add edge * fusion rule for ZXGraph * polish test * fix test * H-box to edge * rename * test HBoxRule * fix upto rules.jl * fix upto zx_graph * import Chain * fix circuit simplification * fix circuit extraction * move some interface to ZXCircuit * identity removal for ZXCircuit * fix equality test * polish rule id rm * fix p3 rule * pivot 2 for ZXCircuit * ZXCircuit for pivot gadget * fix pivot on the boundary * rename vars * fix pivot on the boundary * fix tests * rm printing * fix pivot 2 phase id check * zxgraph test * rm comments * two-level abstract type * ZXCircuit <-> ZXDiagram * fix test * deprecating ZXDiagram * polish interface * fix ZW test * reorganize ZX module * rm Interfaces * use conventional Julia interface * interface docstrings * polish docstrings * migrate to ZXCircuit * composition for ZXCircuit * add DocStringExtensions * fix push gate * to html plot * fix circuit implementation * fix plot interface * reorganize import * add todo * add edge check * add edge checks * edge check for :pab * edge check for p2 * edge check for p3 * edge check for id and pivot gadget * fix id * fix typing * add todo * rm comments * tests for ir * rm proposal * modularize tests * fix imports * fix test * test layout * refactor interface * fix import * polish interface docstring * tests for abstract ZX circuit * move conversion * rename * rename files * move files * move files * ZXGraph tests * add assertions * test parallel edge and self-loop handling * add assertion * rename files * polish tests * decompose rule tests * decompose files * add place holders * eincode for ZX * fix to_eincode * rm useless tests * add nin nout into interface * add matrix check test * rename * rename * fix tests * rm redundant tests * fix tests * test printing * weak deps * check if tracking phase * add TODO * refactor simplification * update docs * fix tests * fix IdentityRemoval * update interface * export new interface * fix import warning * fix including ordering * using base_zx_graph * update interfaces * delegate to underlying graph * update add_edge! * add_spider! with specified edge type connections * adapt new add_spider! interface * ZToXRule * add layout kwargs * use API * fix scalar
1 parent 5823be3 commit c28e542

File tree

114 files changed

+6105
-4024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+6105
-4024
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
/docs/Manifest.toml
1010
.vscode
1111
.JuliaFormatter.toml
12+
lcov.info

‎Project.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
name = "ZXCalculus"
22
uuid = "3525faa3-032d-4235-a8d4-8c2939a218dd"
3-
authors = ["Chen Zhao and contributors"]
43
version = "0.7.1"
4+
authors = ["Chen Zhao and contributors"]
55

66
[deps]
7+
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
78
Expronicon = "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"
89
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
10+
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
911
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1012
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
1113
Multigraphs = "7ebac608-6c66-46e6-9856-b5f43e107bac"
@@ -23,8 +25,10 @@ ZXCalculusExt = ["Vega", "DataFrames"]
2325

2426
[compat]
2527
DataFrames = "1"
28+
DocStringExtensions = "0.9.5"
2629
Expronicon = "0.10.3"
2730
Graphs = "1"
31+
JSON = "0.21.4"
2832
MLStyle = "0.4"
2933
Multigraphs = "0.3"
3034
OMEinsum = "0.7, 0.8, 0.9"

‎Proposal.pdf‎

-45.1 KB
Binary file not shown.

‎docs/src/examples.md‎

Lines changed: 124 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,33 @@ This example can be found in the appendix of [Clifford simplification](https://a
1010
using ZXCalculus
1111

1212
function generate_example_1()
13-
zxd = ZXDiagram(4)
14-
push_gate!(zxd, Val(:Z), 1, 3//2)
15-
push_gate!(zxd, Val(:H), 1)
16-
push_gate!(zxd, Val(:Z), 1, 1//2)
17-
push_gate!(zxd, Val(:H), 4)
18-
push_gate!(zxd, Val(:CZ), 4, 1)
19-
push_gate!(zxd, Val(:CNOT), 1, 4)
20-
push_gate!(zxd, Val(:H), 1)
21-
push_gate!(zxd, Val(:H), 4)
22-
push_gate!(zxd, Val(:Z), 1, 1//4)
23-
push_gate!(zxd, Val(:Z), 4, 3//2)
24-
push_gate!(zxd, Val(:X), 4, 1//1)
25-
push_gate!(zxd, Val(:H), 1)
26-
push_gate!(zxd, Val(:Z), 4, 1//2)
27-
push_gate!(zxd, Val(:X), 4, 1//1)
28-
push_gate!(zxd, Val(:Z), 2, 1//2)
29-
push_gate!(zxd, Val(:CNOT), 3, 2)
30-
push_gate!(zxd, Val(:H), 2)
31-
push_gate!(zxd, Val(:CNOT), 3, 2)
32-
push_gate!(zxd, Val(:Z), 2, 1//4)
33-
push_gate!(zxd, Val(:Z), 3, 1//2)
34-
push_gate!(zxd, Val(:H), 2)
35-
push_gate!(zxd, Val(:H), 3)
36-
push_gate!(zxd, Val(:Z), 3, 1//2)
37-
push_gate!(zxd, Val(:CNOT), 3, 2)
38-
39-
return zxd
13+
zxc = ZXCircuit(4)
14+
push_gate!(zxc, Val(:Z), 1, 3//2)
15+
push_gate!(zxc, Val(:H), 1)
16+
push_gate!(zxc, Val(:Z), 1, 1//2)
17+
push_gate!(zxc, Val(:H), 4)
18+
push_gate!(zxc, Val(:CZ), 4, 1)
19+
push_gate!(zxc, Val(:CNOT), 1, 4)
20+
push_gate!(zxc, Val(:H), 1)
21+
push_gate!(zxc, Val(:H), 4)
22+
push_gate!(zxc, Val(:Z), 1, 1//4)
23+
push_gate!(zxc, Val(:Z), 4, 3//2)
24+
push_gate!(zxc, Val(:X), 4, 1//1)
25+
push_gate!(zxc, Val(:H), 1)
26+
push_gate!(zxc, Val(:Z), 4, 1//2)
27+
push_gate!(zxc, Val(:X), 4, 1//1)
28+
push_gate!(zxc, Val(:Z), 2, 1//2)
29+
push_gate!(zxc, Val(:CNOT), 3, 2)
30+
push_gate!(zxc, Val(:H), 2)
31+
push_gate!(zxc, Val(:CNOT), 3, 2)
32+
push_gate!(zxc, Val(:Z), 2, 1//4)
33+
push_gate!(zxc, Val(:Z), 3, 1//2)
34+
push_gate!(zxc, Val(:H), 2)
35+
push_gate!(zxc, Val(:H), 3)
36+
push_gate!(zxc, Val(:Z), 3, 1//2)
37+
push_gate!(zxc, Val(:CNOT), 3, 2)
38+
39+
return zxc
4040
end
4141
ex1 = generate_example_1()
4242
```
@@ -46,17 +46,16 @@ using YaoPlots
4646
plot(ex1)
4747
```
4848
![the circuit of example 1](imgs/ex1.svg)
49-
To simplify `zxd`, one can simply use
49+
To simplify `ex1`, one can simply use
5050
```julia
5151
simplified_ex1 = clifford_simplification(ex1)
5252
```
53-
or explicitly use
53+
or explicitly apply the simplification rules:
5454
```julia
55-
zxg = ZXGraph(ex1)
56-
simplify!(Rule{:lc}(), zxg)
57-
simplify!(Rule{:p1}(), zxg)
58-
replace!(Rule{:pab}(), zxg)
59-
simplified_ex1 = circuit_extraction(zxg)
55+
simplify!(LocalCompRule(), ex1)
56+
simplify!(Pivot1Rule(), ex1)
57+
replace!(PivotBoundaryRule(), ex1)
58+
simplified_ex1 = circuit_extraction(ex1)
6059
```
6160
And we draw the simplified circuit.
6261
```julia
@@ -72,77 +71,77 @@ We first build up the circuit.
7271
```julia
7372
using ZXCalculus, YaoPlots
7473
function generate_example2()
75-
cir = ZXDiagram(5)
76-
push_gate!(cir, Val(:X), 5, 1//1)
77-
push_gate!(cir, Val(:H), 5)
78-
push_gate!(cir, Val(:Z), 5)
79-
push_gate!(cir, Val(:CNOT), 5, 4)
80-
push_gate!(cir, Val(:Z), 5, 7//4)
81-
push_gate!(cir, Val(:CNOT), 5, 1)
82-
push_gate!(cir, Val(:Z), 5, 1//4)
83-
push_gate!(cir, Val(:CNOT), 5, 4)
84-
push_gate!(cir, Val(:Z), 4, 1//4)
85-
push_gate!(cir, Val(:Z), 5, 7//4)
86-
push_gate!(cir, Val(:CNOT), 5, 1)
87-
push_gate!(cir, Val(:CNOT), 4, 1)
88-
push_gate!(cir, Val(:Z), 5, 1//4)
89-
push_gate!(cir, Val(:Z), 1, 1//4)
90-
push_gate!(cir, Val(:Z), 4, 7//4)
91-
push_gate!(cir, Val(:CNOT), 4, 1)
92-
push_gate!(cir, Val(:CNOT), 5, 4)
93-
push_gate!(cir, Val(:Z), 5, 7//4)
94-
push_gate!(cir, Val(:CNOT), 5, 3)
95-
push_gate!(cir, Val(:Z), 5, 1//4)
96-
push_gate!(cir, Val(:CNOT), 5, 4)
97-
push_gate!(cir, Val(:Z), 4, 1//4)
98-
push_gate!(cir, Val(:Z), 5, 7//4)
99-
push_gate!(cir, Val(:CNOT), 5, 3)
100-
push_gate!(cir, Val(:CNOT), 4, 3)
101-
push_gate!(cir, Val(:Z), 5, 1//4)
102-
push_gate!(cir, Val(:Z), 3, 1//4)
103-
push_gate!(cir, Val(:Z), 4, 7//4)
104-
push_gate!(cir, Val(:H), 5)
105-
push_gate!(cir, Val(:Z), 5)
106-
push_gate!(cir, Val(:CNOT), 4, 3)
107-
push_gate!(cir, Val(:CNOT), 5, 4)
108-
push_gate!(cir, Val(:H), 5)
109-
push_gate!(cir, Val(:Z), 5)
110-
push_gate!(cir, Val(:CNOT), 5, 3)
111-
push_gate!(cir, Val(:Z), 5, 7//4)
112-
push_gate!(cir, Val(:CNOT), 5, 2)
113-
push_gate!(cir, Val(:Z), 5, 1//4)
114-
push_gate!(cir, Val(:CNOT), 5, 3)
115-
push_gate!(cir, Val(:Z), 3, 1//4)
116-
push_gate!(cir, Val(:Z), 5, 7//4)
117-
push_gate!(cir, Val(:CNOT), 5, 2)
118-
push_gate!(cir, Val(:CNOT), 3, 2)
119-
push_gate!(cir, Val(:Z), 5, 1//4)
120-
push_gate!(cir, Val(:H), 5)
121-
push_gate!(cir, Val(:Z), 2, 1//4)
122-
push_gate!(cir, Val(:Z), 3, 7//4)
123-
push_gate!(cir, Val(:Z), 5)
124-
push_gate!(cir, Val(:CNOT), 3, 2)
125-
push_gate!(cir, Val(:CNOT), 5, 3)
126-
push_gate!(cir, Val(:H), 5)
127-
push_gate!(cir, Val(:Z), 5)
128-
push_gate!(cir, Val(:CNOT), 5, 2)
129-
push_gate!(cir, Val(:Z), 5, 7//4)
130-
push_gate!(cir, Val(:CNOT), 5, 1)
131-
push_gate!(cir, Val(:Z), 5, 1//4)
132-
push_gate!(cir, Val(:CNOT), 5, 2)
133-
push_gate!(cir, Val(:Z), 2, 1//4)
134-
push_gate!(cir, Val(:Z), 5, 7//4)
135-
push_gate!(cir, Val(:CNOT), 5, 1)
136-
push_gate!(cir, Val(:CNOT), 2, 1)
137-
push_gate!(cir, Val(:Z), 5, 1//4)
138-
push_gate!(cir, Val(:Z), 1, 1//4)
139-
push_gate!(cir, Val(:Z), 2, 7//4)
140-
push_gate!(cir, Val(:H), 5)
141-
push_gate!(cir, Val(:Z), 5)
142-
push_gate!(cir, Val(:CNOT), 2, 1)
143-
push_gate!(cir, Val(:CNOT), 5, 2)
144-
push_gate!(cir, Val(:CNOT), 5, 1)
145-
return cir
74+
zxc = ZXCircuit(5)
75+
push_gate!(zxc, Val(:X), 5, 1//1)
76+
push_gate!(zxc, Val(:H), 5)
77+
push_gate!(zxc, Val(:Z), 5)
78+
push_gate!(zxc, Val(:CNOT), 5, 4)
79+
push_gate!(zxc, Val(:Z), 5, 7//4)
80+
push_gate!(zxc, Val(:CNOT), 5, 1)
81+
push_gate!(zxc, Val(:Z), 5, 1//4)
82+
push_gate!(zxc, Val(:CNOT), 5, 4)
83+
push_gate!(zxc, Val(:Z), 4, 1//4)
84+
push_gate!(zxc, Val(:Z), 5, 7//4)
85+
push_gate!(zxc, Val(:CNOT), 5, 1)
86+
push_gate!(zxc, Val(:CNOT), 4, 1)
87+
push_gate!(zxc, Val(:Z), 5, 1//4)
88+
push_gate!(zxc, Val(:Z), 1, 1//4)
89+
push_gate!(zxc, Val(:Z), 4, 7//4)
90+
push_gate!(zxc, Val(:CNOT), 4, 1)
91+
push_gate!(zxc, Val(:CNOT), 5, 4)
92+
push_gate!(zxc, Val(:Z), 5, 7//4)
93+
push_gate!(zxc, Val(:CNOT), 5, 3)
94+
push_gate!(zxc, Val(:Z), 5, 1//4)
95+
push_gate!(zxc, Val(:CNOT), 5, 4)
96+
push_gate!(zxc, Val(:Z), 4, 1//4)
97+
push_gate!(zxc, Val(:Z), 5, 7//4)
98+
push_gate!(zxc, Val(:CNOT), 5, 3)
99+
push_gate!(zxc, Val(:CNOT), 4, 3)
100+
push_gate!(zxc, Val(:Z), 5, 1//4)
101+
push_gate!(zxc, Val(:Z), 3, 1//4)
102+
push_gate!(zxc, Val(:Z), 4, 7//4)
103+
push_gate!(zxc, Val(:H), 5)
104+
push_gate!(zxc, Val(:Z), 5)
105+
push_gate!(zxc, Val(:CNOT), 4, 3)
106+
push_gate!(zxc, Val(:CNOT), 5, 4)
107+
push_gate!(zxc, Val(:H), 5)
108+
push_gate!(zxc, Val(:Z), 5)
109+
push_gate!(zxc, Val(:CNOT), 5, 3)
110+
push_gate!(zxc, Val(:Z), 5, 7//4)
111+
push_gate!(zxc, Val(:CNOT), 5, 2)
112+
push_gate!(zxc, Val(:Z), 5, 1//4)
113+
push_gate!(zxc, Val(:CNOT), 5, 3)
114+
push_gate!(zxc, Val(:Z), 3, 1//4)
115+
push_gate!(zxc, Val(:Z), 5, 7//4)
116+
push_gate!(zxc, Val(:CNOT), 5, 2)
117+
push_gate!(zxc, Val(:CNOT), 3, 2)
118+
push_gate!(zxc, Val(:Z), 5, 1//4)
119+
push_gate!(zxc, Val(:H), 5)
120+
push_gate!(zxc, Val(:Z), 2, 1//4)
121+
push_gate!(zxc, Val(:Z), 3, 7//4)
122+
push_gate!(zxc, Val(:Z), 5)
123+
push_gate!(zxc, Val(:CNOT), 3, 2)
124+
push_gate!(zxc, Val(:CNOT), 5, 3)
125+
push_gate!(zxc, Val(:H), 5)
126+
push_gate!(zxc, Val(:Z), 5)
127+
push_gate!(zxc, Val(:CNOT), 5, 2)
128+
push_gate!(zxc, Val(:Z), 5, 7//4)
129+
push_gate!(zxc, Val(:CNOT), 5, 1)
130+
push_gate!(zxc, Val(:Z), 5, 1//4)
131+
push_gate!(zxc, Val(:CNOT), 5, 2)
132+
push_gate!(zxc, Val(:Z), 2, 1//4)
133+
push_gate!(zxc, Val(:Z), 5, 7//4)
134+
push_gate!(zxc, Val(:CNOT), 5, 1)
135+
push_gate!(zxc, Val(:CNOT), 2, 1)
136+
push_gate!(zxc, Val(:Z), 5, 1//4)
137+
push_gate!(zxc, Val(:Z), 1, 1//4)
138+
push_gate!(zxc, Val(:Z), 2, 7//4)
139+
push_gate!(zxc, Val(:H), 5)
140+
push_gate!(zxc, Val(:Z), 5)
141+
push_gate!(zxc, Val(:CNOT), 2, 1)
142+
push_gate!(zxc, Val(:CNOT), 5, 2)
143+
push_gate!(zxc, Val(:CNOT), 5, 1)
144+
return zxc
146145
end
147146
ex2 = generate_example2()
148147
plot(ex2)
@@ -166,25 +165,30 @@ we can see that the number of T gates has decreased from 28 to 8.
166165

167166
## Other usages
168167

169-
In the previous sections, we introduced how to use `ZXCalculus.jl` for ZX-diagrams which represent quantum circuits. Sometimes, one may wish to use it for general ZX-diagrams. It is possible.
168+
In the previous sections, we introduced how to use `ZXCalculus.jl` for quantum circuits using `ZXCircuit`. Sometimes, one may wish to work with the lower-level graph representation directly.
169+
170+
### Working with ZXGraph directly
171+
172+
For advanced users who need direct access to the graph structure, you can work with `ZXGraph`. However, for most use cases, `ZXCircuit` is the recommended interface.
170173

171-
One can create a `ZXDiagram` by building up its `Multigraph` and other information. For example,
172174
```julia
173175
using ZXCalculus, YaoPlots, Graphs
174-
g = Multigraph(6)
175-
add_edge!(g, 1, 2)
176-
add_edge!(g, 2, 3)
177-
add_edge!(g, 3, 4)
178-
add_edge!(g, 3, 5)
179-
add_edge!(g, 3, 6)
180-
ps = [0, 1, 1//2, 0, 0, 0]
181-
v_t = [SpiderType.In, SpiderType.X, SpiderType.Z, SpiderType.Out, SpiderType.Out, SpiderType.Out]
182-
zxd = ZXDiagram(g, v_t, ps)
176+
177+
# Create a ZXCircuit first
178+
zxc = ZXCircuit(3)
179+
push_gate!(zxc, Val(:H), 1)
180+
push_gate!(zxc, Val(:CNOT), 1, 2)
181+
182+
# Access the underlying ZXGraph if needed for low-level operations
183+
zxg = zxc.zxd # The internal ZXGraph
184+
185+
# Apply graph-based rules
186+
simplify!(LocalCompRule(), zxc)
183187
```
184-
Because the information of vertices locations of a general ZX-diagram is not provided, its plot will have a random layout.
185188

186-
We can manipulate `zxd` by using ZX-calculus [`Rule`](@ref)s.
189+
### Deprecated: ZXDiagram
190+
191+
**Note:** `ZXDiagram` is deprecated. For circuit-based operations, use `ZXCircuit` instead. If you have existing code using `ZXDiagram`, you can convert it:
187192
```julia
188-
matches = match(Rule{:pi}(), zxd)
189-
rewrite!(Rule{:pi}(), zxd, matches)
193+
zxc = ZXCircuit(old_zxd) # Convert deprecated ZXDiagram to ZXCircuit
190194
```

0 commit comments

Comments
 (0)