From 4e505b80dc15d6d78835823c90fae785576d2e84 Mon Sep 17 00:00:00 2001 From: Matt Guthaus Date: Fri, 18 Nov 2016 11:30:14 -0800 Subject: [PATCH] Convert gds to on grid. Remove view from tests. --- compiler/router/tests/02_blockages_test.py | 2 +- .../router/tests/03_same_layer_pins_test.py | 2 +- compiler/router/tests/ABCD_two_nets.gds | Bin 4096 -> 4096 bytes compiler/router/tests/AB_blockages.gds | Bin 2048 -> 2048 bytes compiler/router/tests/AB_diff_layer_pins.gds | Bin 4096 -> 4096 bytes compiler/router/tests/AB_no_blockages.gds | Bin 2048 -> 2048 bytes compiler/router/tests/AB_same_layer_pins.gds | Bin 4096 -> 4096 bytes 7 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/router/tests/02_blockages_test.py b/compiler/router/tests/02_blockages_test.py index 900462b0..485b39f6 100644 --- a/compiler/router/tests/02_blockages_test.py +++ b/compiler/router/tests/02_blockages_test.py @@ -49,7 +49,7 @@ class no_blockages_test(unittest.TestCase): r=router.router(gdsname+".gds") layer_stack =("metal1","via1","metal2") path=r.route(layer_stack,src="A",dest="B") - #r.rg.view() + r.rg.view() self.add_wire(layer_stack,path) diff --git a/compiler/router/tests/03_same_layer_pins_test.py b/compiler/router/tests/03_same_layer_pins_test.py index 6a20ef3a..c8b10142 100644 --- a/compiler/router/tests/03_same_layer_pins_test.py +++ b/compiler/router/tests/03_same_layer_pins_test.py @@ -49,7 +49,7 @@ class no_blockages_test(unittest.TestCase): r=router.router(gdsname+".gds") layer_stack =("metal1","via1","metal2") path=r.route(layer_stack,src="A",dest="B") - #r.rg.view() + r.rg.view() self.add_wire(layer_stack,path) diff --git a/compiler/router/tests/ABCD_two_nets.gds b/compiler/router/tests/ABCD_two_nets.gds index 07596ec610406d8705b9ed968ac99b271d42471a..736bdb91d0c7b0bd71732ad9dd2f6b147002b41f 100644 GIT binary patch delta 375 zcmYL?Jxjw-6oyZ3a?{)Rti@_m7EmA6l*dauRE)oz05h(?wI+TJ-T}!9VmUj_c zb*mt_7ANUeaPS|vNWo3qG~OlzhnMG^7tV7!cE`TX?#xk^3S=?8etvO!)oc;XtK73+ zZtvd@zqi+`i?6{0qgBpmiA>6nB~zklInPpb+pB%@Xu!VWqQ#f7#!Rg6j2IAUE)g4` z$cy;WoQ*L284`(h%ycCTfBQrUlU}q*o9SIHprQH5$&A%q^i>ZH$-Ly4$({LVG7mYn ziK>!=#+6;{%0!m)&!ktnXd49##T4q|3`e32Te$czTs#`q)0@cae~98@+5i9m delta 376 zcmYL@F-QVo7>2+9zx%yAJ+ws1z~m4Vg2TZmY&ovOErK8j5s?CGY6^pJa**ca1((99 zmZ+9?Cx^y{kcMb!X=xL;y#6$EczE9Lh415QSPko9d6Q^`R>|an>fzDB>2ZxHrU=LC zUEX}`4mVQe#pmsNlM;ecoI(^KQ?f>LGDm5=+p2ttalj7Cqb8!z#ZtOX6zob0M4{`M zjlW)6ohOu-je(lMm6~mx#86QkBvcRYii?iopsaXEO22Ur9WH0?+P?qYBQoj}2MfMG zy8XRB@wETHpTv-5aK|Es{6@_a@h*BShcmWqlJ!@j5mGG)L xXlovdnv1y1{eX+MWKXgn>5DARg@b`^TC13w$wW{Cg* diff --git a/compiler/router/tests/AB_blockages.gds b/compiler/router/tests/AB_blockages.gds index 8c445e1806afab0dd5bfd58d36ad01f493fbece1..943699d903ec3a86365a908f58236db42a1ccefd 100644 GIT binary patch literal 2048 zcmeH@y-EW?6opSV*-607kJ(^$lVB80rT7Cvu+c;WK?@tJ6hflW!UP+A0Xywe1VPhT z*$Wn0iC`gUCHM#mK7sK}HshLN3;SJ|`7USY%-nk*pg|xP(2&3o;z+^9RIg6LgoPOx zn%J%HRgW7-Kq{y&l~0Qs4_6?s_x4P2QutF(I1swZ`GjL3O{5kO7FO z#{XhO1M74^?isloS-oVp+Z~oL5%Tx9X#chX?XCQYA zC@P)w@OQi4pY*pJnv)!`2q-FDw7mR4zQit{9HuJ3!Wr-AQ|Y9~`#}5=uwES&YCs{$ z)u+-)Prr7}x3>Vv@i#y}ajA5&=l@Uo!FyorOQv5QOg{?Yrk~$rdY9~gG}kzN+ojUU zzugb`HQCYyyC+Sq^qfnjlb-%4yR_~A$-*))G3rw3WX~Vw93l9hpMal$pMal$lfVzr CqgJ2* literal 2048 zcmeH^y-EW?6ot=DvXg+DAK8$&NgxRl8v`ncVk3#9(#FC{L`XDR7_o_OU?W%yQIK?Y z)+xop!a~GSd;+oX5j?YD98;`dzYBN1%h^3Mcg{jWK%!^~q%naMGVn0#_i4DOuy=&q z?;NyFyFDNiu~!@C%NvikpDWGb+~9hYS42DrRvg;)~$t-t|E^#W?(UEnB|__x>5LU{v~ZIRXP&osFk4w;Y6(*y=Wd?YXR+Q zKH1zOHK4xgQOLI0BgJ2dN;Rm z{+;YfHyY%rUv5~7nJh;9;!f;tskRIpQrf~(Y#t2laoK7i#Qs@$xY)GTO1yq!+`_u+wdFyMRC=Gh5~@RZtou)?w!<*fr4R4zjJ-_ zy8XFaj>n%j?#58EbWFg-Ao7YO45{4PCe=5m7rCj;^3*IQXYO2JjgC$(nMYhkVy0+giX_dEJr8!!S!uz$bf)Ejwha zC@H#D$d(ncsyt~)cFkzU-37EJ@N0cR{aXHazt@_)5|Z;G;H6mPj#%Nes4#UZ9?k)K SM4btkj>3F=5mOF7g!u!ENLQc$ diff --git a/compiler/router/tests/AB_no_blockages.gds b/compiler/router/tests/AB_no_blockages.gds index 339f8b1864ac1b834e682dcde909165db1c3d3a3..471153ac36bd590d26b31294bbcdd8362834a134 100644 GIT binary patch delta 222 zcmZn=Xb_kn>nO}1#lXYB!^D=7nwD6aQ^LR?!pv&t*lF&4Z222YmmT^GW=Bad$gnao z2rzIn@H2=2)kD}q3}C$z<5U$VGB79zF)%OyX~h@@2F`^D8X`V%No?v`1_t>M1_mY| zt$34xfwc)i!^D9!iy#973kL%O8!r>kJ~lokps_jv%nS^YmwnOmW!63lE!^D=7nwD6aQ^LR?!pv&t*lF&4Z222YmmT^GW=H8T$gna2 zRdF-$Gl(!qF+kWtKoOwciE*lmeGCi=LJSNHKw2@5fq`=lf`*7sToRkQj)6fwgn@wx zNGslAU|?-Q&@gcz%_7Laz{0`6z{bl2w2zIC323a205b!F#R*(9+@KI~?x4+*YksJDXe_qY8O6OSUj~b{pF#*)fr;8*%OB z;_74lcVTL?`nGaolV=DTrxJ~l&CFAobALDA`n38HYg&X?Igy{1kjXGVauLcHT|LFE zo}j762snR<7}p|2lO2e3ro2p~zKIHt+z~n6(1V^Wo&2EcOOr_B!NNkZ--jObZ0Qg- zv?W{`4(6=s{J}-njL|kzWM+bZbH_-~X7(7L>Bta=Dmqso8mf*!MfkBIJX!ThulKjl TKl;U4k`^N$@71b>XC?muYEn$A delta 320 zcmZorXi%6S?JUS3#30JR$H2qHmXey5SejG9z#ziRYNv2y_R`0}-z=44#4q@+6=RTL zWnz$E;AY@w-~nP&1_2-&qL+VS+-r6yb8-Nq#pGiwk`pU=HCb2~7#O`67(g@=6Og`u zpkd-bnniG8zPP4<8v_H!2L=WZ&AEbsK~M-m!^D9!NU`YTH_T3x*D>2o&H>VTK>7_6 zkk16<18F@bhsp04?Iy2b)SDc`=sH=R-E#5`wxG$Y*c>Kj0kIYkzhZTmyo%Lnat@Hz zVYQq5ibZd70f)sT4!y}~943>sIIJdrVYisPhuuPup`C$&O&Dk|(EaQnzii&f;mIIJieZ