Skip to content

Commit

Permalink
Merge pull request #108 from weiya711/sparse_merge_fixes
Browse files Browse the repository at this point in the history 
Sparse merge fixes
  • Loading branch information
@bobcheng15
bobcheng15 authored Jan 12, 2024
2 parents 0a24c86 + 2e58788 commit 7d5cc49
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 18 deletions.
12 changes: 3 additions & 9 deletions compiler/sam-outputs/onyx-dot/matmul_ijk_crddrop_relu.gv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ digraph SAM {
0 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*C1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*C1_dim" sink="true"]
6 [comment="type=arrayvals,tensor=C" label="Array Vals: C" color=green2 shape=box style=filled type="arrayvals" tensor="C"]
9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=compressed,src=true,root=false" label="FiberLookup k: C0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="compressed" src="true" root="false"]
18 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"]
19 [comment="type=crddrop,outer=j,inner=k" label="CrdDrop j,k" color=orange shape=box style=filled type="crddrop" outer="j" inner="k"]
20 [comment="type=max" label="Max 0" color=brown shape=box style=filled type="max"]
21 [comment="type=crddrop,outer=j,inner=val,mode=0" label="CrdDrop Compression j, val" color=orange style=filled type="crddrop" outer="j" inner="val" mode="0"]
22 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"]
Expand All @@ -42,17 +40,13 @@ digraph SAM {
9 -> 7 [label="ref_in-C" style=bold type="ref" comment="in-C"]
17 -> 10 [label="ref" style=bold type="ref" comment=""]

4 -> 19 [label="val_inner-k" type="val" comment="inner-k"]
12 -> 19 [label="crd_outer-j" style=dashed type="crd" comment="outer-j"]
19 -> 3 [label="val_inner-k" type="val" comment="inner-k"]
4 -> 3 [label="val" type="val"]
12 -> 21 [label="crd_outer-j" style=dashed type="crd" comment="outer-j"]
3 -> 20 [label="val" type="val" comment="val"]
20 -> 21 [label="val" type="val" comment="inner-val"]
18 -> 21 [label="crd_inner-j" style=dashed type="crd" comment="outer-j"]
21 -> 22 [label="crd_inner-j" style=dashed type="crd" comment="outer-j"]
18 -> 22 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]

19 -> 18 [label="crd_inner-j" style=dashed type="crd" comment="inner-j"]
16 -> 18 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]
16 -> 22 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]
21 -> 0 [label="val" type="val" comment="inner-val"]

22 -> 2 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]
Expand Down
12 changes: 3 additions & 9 deletions compiler/sam-outputs/onyx-dot/spmm_ijk_crddrop_relu.gv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ digraph SAM {
0 [comment="type=fiberwrite,mode=vals,tensor=X,size=1*B0_dim*C1_dim,sink=true" label="FiberWrite Vals: X" color=green3 shape=box style=filled type="fiberwrite" tensor="X" mode="vals" size="1*B0_dim*C1_dim" sink="true"]
6 [comment="type=arrayvals,tensor=C" label="Array Vals: C" color=green2 shape=box style=filled type="arrayvals" tensor="C"]
9 [comment="type=fiberlookup,index=k,tensor=C,mode=0,format=compressed,src=true,root=false" label="FiberLookup k: C0\ncompressed" color=green4 shape=box style=filled type="fiberlookup" index="k" tensor="C" mode="0" format="compressed" src="true" root="false"]
18 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"]
19 [comment="type=crddrop,outer=j,inner=k" label="CrdDrop j,k" color=orange shape=box style=filled type="crddrop" outer="j" inner="k"]
20 [comment="type=max" label="Max 0" color=brown shape=box style=filled type="max"]
21 [comment="type=crddrop,outer=j,inner=val,mode=0" label="CrdDrop Compression j, val" color=orange style=filled type="crddrop" outer="j" inner="val" mode="0"]
22 [comment="type=crddrop,outer=i,inner=j" label="CrdDrop i,j" color=orange shape=box style=filled type="crddrop" outer="i" inner="j"]
Expand All @@ -42,17 +40,13 @@ digraph SAM {
9 -> 7 [label="ref_in-C" style=bold type="ref" comment="in-C"]
17 -> 10 [label="ref" style=bold type="ref" comment=""]

4 -> 19 [label="val_inner-k" type="val" comment="inner-k"]
12 -> 19 [label="crd_outer-j" style=dashed type="crd" comment="outer-j"]
19 -> 3 [label="val_inner-k" type="val" comment="inner-k"]
4 -> 3 [label="val" type="val"]
12 -> 21 [label="crd_outer-j" style=dashed type="crd" comment="outer-j"]
3 -> 20 [label="val" type="val" comment="val"]
20 -> 21 [label="val" type="val" comment="inner-val"]
18 -> 21 [label="crd_inner-j" style=dashed type="crd" comment="outer-j"]
21 -> 22 [label="crd_inner-j" style=dashed type="crd" comment="outer-j"]
18 -> 22 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]

19 -> 18 [label="crd_inner-j" style=dashed type="crd" comment="inner-j"]
16 -> 18 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]
16 -> 22 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]
21 -> 0 [label="val" type="val" comment="inner-val"]

22 -> 2 [label="crd_outer-i" style=dashed type="crd" comment="outer-i"]
Expand Down

0 comments on commit 7d5cc49

Please sign in to comment.