Skip to content

Commit

Permalink
fix some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
joamatab committed Jul 8, 2024
1 parent 53b5ea8 commit 9ef60a2
Show file tree
Hide file tree
Showing 133 changed files with 7,106 additions and 10,691 deletions.
2 changes: 1 addition & 1 deletion cspdk/sin300/cells.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def mmi1x2(
def mmi2x2(
width: float | None = None,
width_taper: float = 5.5,
length_taper: float = 232.0,
length_taper: float = 50.0,
length_mmi: float = 5.5,
width_mmi: float = 12.0,
gap_mmi: float = 0.4,
Expand Down
1 change: 0 additions & 1 deletion cspdk/sin300/tech.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@


class LayerMapCornerstone(LayerMap):
# TODO: how can we make this pass type checking?
WG: Layer = (3, 0) # type: ignore
SLAB: Layer = (5, 0) # type: ignore
FLOORPLAN: Layer = (99, 0) # type: ignore
Expand Down
Binary file modified tests/gds_ref_si220/coupler.gds
Binary file not shown.
Binary file modified tests/gds_ref_si220/grating_coupler_rectangular.gds
Binary file not shown.
Binary file modified tests/gds_ref_si220/mzi.gds
Binary file not shown.
Binary file modified tests/gds_ref_si220/mzi_sc.gds
Binary file not shown.
Binary file modified tests/gds_ref_si220/mzi_so.gds
Binary file not shown.
Binary file modified tests/gds_ref_si220/taper_so.gds
Binary file not shown.
Binary file modified tests/gds_ref_sin300/die_nc.gds
Binary file not shown.
Binary file modified tests/gds_ref_sin300/die_no.gds
Binary file not shown.
Binary file modified tests/gds_ref_sin300/grating_coupler_array.gds
Binary file not shown.
Binary file modified tests/gds_ref_sin300/grating_coupler_rectangular_nc.gds
Binary file not shown.
72 changes: 33 additions & 39 deletions tests/test_netlists_si220/test_netlists_array_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances:
pad_S100_100_LPAD_BLNon_30fba49c_375000_0:
pad_375000_0:
component: pad
dax: 150
day: 0
Expand All @@ -13,49 +13,43 @@ instances:
ysize: 100
na: 6
nb: 1
settings:
layer: PAD
port_inclusion: 0
port_orientation: 0
size:
- 100
- 100
settings: {}
name: array_Cpad_S150_150_C6__0e3de41c
nets: []
placements:
pad_S100_100_LPAD_BLNon_30fba49c_375000_0:
pad_375000_0:
mirror: false
rotation: 0
x: 0
y: 0
ports:
e1_1_1: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<0.0>,e1
e1_1_2: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<1.0>,e1
e1_1_3: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<2.0>,e1
e1_1_4: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<3.0>,e1
e1_1_5: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<4.0>,e1
e1_1_6: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<5.0>,e1
e2_1_1: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<0.0>,e2
e2_1_2: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<1.0>,e2
e2_1_3: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<2.0>,e2
e2_1_4: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<3.0>,e2
e2_1_5: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<4.0>,e2
e2_1_6: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<5.0>,e2
e3_1_1: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<0.0>,e3
e3_1_2: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<1.0>,e3
e3_1_3: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<2.0>,e3
e3_1_4: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<3.0>,e3
e3_1_5: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<4.0>,e3
e3_1_6: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<5.0>,e3
e4_1_1: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<0.0>,e4
e4_1_2: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<1.0>,e4
e4_1_3: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<2.0>,e4
e4_1_4: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<3.0>,e4
e4_1_5: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<4.0>,e4
e4_1_6: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<5.0>,e4
pad_1_1: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<0.0>,pad
pad_1_2: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<1.0>,pad
pad_1_3: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<2.0>,pad
pad_1_4: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<3.0>,pad
pad_1_5: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<4.0>,pad
pad_1_6: pad_S100_100_LPAD_BLNon_30fba49c_375000_0<5.0>,pad
e1_1_1: pad_375000_0<0.0>,e1
e1_1_2: pad_375000_0<1.0>,e1
e1_1_3: pad_375000_0<2.0>,e1
e1_1_4: pad_375000_0<3.0>,e1
e1_1_5: pad_375000_0<4.0>,e1
e1_1_6: pad_375000_0<5.0>,e1
e2_1_1: pad_375000_0<0.0>,e2
e2_1_2: pad_375000_0<1.0>,e2
e2_1_3: pad_375000_0<2.0>,e2
e2_1_4: pad_375000_0<3.0>,e2
e2_1_5: pad_375000_0<4.0>,e2
e2_1_6: pad_375000_0<5.0>,e2
e3_1_1: pad_375000_0<0.0>,e3
e3_1_2: pad_375000_0<1.0>,e3
e3_1_3: pad_375000_0<2.0>,e3
e3_1_4: pad_375000_0<3.0>,e3
e3_1_5: pad_375000_0<4.0>,e3
e3_1_6: pad_375000_0<5.0>,e3
e4_1_1: pad_375000_0<0.0>,e4
e4_1_2: pad_375000_0<1.0>,e4
e4_1_3: pad_375000_0<2.0>,e4
e4_1_4: pad_375000_0<3.0>,e4
e4_1_5: pad_375000_0<4.0>,e4
e4_1_6: pad_375000_0<5.0>,e4
pad_1_1: pad_375000_0<0.0>,pad
pad_1_2: pad_375000_0<1.0>,pad
pad_1_3: pad_375000_0<2.0>,pad
pad_1_4: pad_375000_0<3.0>,pad
pad_1_5: pad_375000_0<4.0>,pad
pad_1_6: pad_375000_0<5.0>,pad
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_bend_euler_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: bend_euler_RNone_A90_P0_836efce1
name: bend_euler_RNone_A90_P0_7c94df4d
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_bend_rc_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: bend_euler_RNone_A90_P0_14653c05
name: bend_euler_RNone_A90_P0_ddb8ac70
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_bend_ro_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: bend_euler_RNone_A90_P0_e45badad
name: bend_euler_RNone_A90_P0_3e63eab5
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_bend_s_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: bend_s_S11_1p8_N99_CSxs_9d1e6395
name: bend_s_S11_1p8_CSxs_sc
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_bend_sc_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: bend_euler_RNone_A90_P0_836efce1
name: bend_euler_RNone_A90_P0_7c94df4d
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_bend_so_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: bend_euler_RNone_A90_P0_c66059ab
name: bend_euler_RNone_A90_P0_aec1b638
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_coupler_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: coupler_G0p236_L20_D4_D_e8f9c7a8
name: coupler_G0p234_L20_D4_D_31574093
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_coupler_rc_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: coupler_G0p236_L20_D4_D_681368b1
name: coupler_G0p234_L20_D4_D_bdd92370
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_coupler_ro_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: coupler_G0p236_L20_D4_D_4da8fff6
name: coupler_G0p234_L20_D4_D_da0f10e1
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_coupler_sc_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: coupler_G0p236_L20_D4_D_34b49841
name: coupler_G0p234_L20_D4_D_31574093
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists_si220/test_netlists_coupler_so_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: coupler_G0p236_L20_D4_D_6bd80f71
name: coupler_G0p234_L20_D4_D_0ee686c4
nets: []
placements: {}
ports: {}
42 changes: 21 additions & 21 deletions tests/test_netlists_si220/test_netlists_coupler_straight_.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
instances:
straight_L10_N2_CSxs_sc_5000_0:
straight_L20_N2_CSxs_sc_10000_0:
component: straight
info:
length: 10
route_info_length: 10
route_info_type: xs_3edc2673
route_info_weight: 10
route_info_xs_3edc2673_length: 10
length: 20
route_info_length: 20
route_info_type: xs_sc
route_info_weight: 20
route_info_xs_sc_length: 20
width: 0.45
settings:
cross_section: xs_sc
length: 10
length: 20
npoints: 2
straight_L10_N2_CSxs_sc_5000_720:
straight_L20_N2_CSxs_sc_10000_720:
component: straight
info:
length: 10
route_info_length: 10
route_info_type: xs_3edc2673
route_info_weight: 10
route_info_xs_3edc2673_length: 10
length: 20
route_info_length: 20
route_info_type: xs_sc
route_info_weight: 20
route_info_xs_sc_length: 20
width: 0.45
settings:
cross_section: xs_sc
length: 10
length: 20
npoints: 2
name: coupler_straight_L10_G0_0dab0f27
name: coupler_straight_L20_G0_4025574b
nets: []
placements:
straight_L10_N2_CSxs_sc_5000_0:
straight_L20_N2_CSxs_sc_10000_0:
mirror: false
rotation: 0
x: 0
y: 0
straight_L10_N2_CSxs_sc_5000_720:
straight_L20_N2_CSxs_sc_10000_720:
mirror: false
rotation: 0
x: 0
y: 0.72
ports:
o1: straight_L10_N2_CSxs_sc_5000_0,o1
o2: straight_L10_N2_CSxs_sc_5000_720,o1
o3: straight_L10_N2_CSxs_sc_5000_720,o2
o4: straight_L10_N2_CSxs_sc_5000_0,o2
o1: straight_L20_N2_CSxs_sc_10000_0,o1
o2: straight_L20_N2_CSxs_sc_10000_720,o1
o3: straight_L20_N2_CSxs_sc_10000_720,o2
o4: straight_L20_N2_CSxs_sc_10000_0,o2
30 changes: 13 additions & 17 deletions tests/test_netlists_si220/test_netlists_coupler_symmetric_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances:
bend_s_S10_1p658_N99_CS_515ef8bc_5000_-1171:
bend_s_S10_1p658_CSxs_sc_5000_-1171:
component: bend_s
info:
end_angle: 0
Expand All @@ -8,18 +8,16 @@ instances:
route_info_length: 10.192
route_info_min_bend_radius: 11.695
route_info_n_bend_s: 1
route_info_type: xs_3edc2673
route_info_type: xs_sc
route_info_weight: 10.192
route_info_xs_3edc2673_length: 10.192
route_info_xs_sc_length: 10.192
start_angle: 0
settings:
allow_min_radius_violation: false
cross_section: xs_sc
npoints: 99
size:
- 10
- 1.658
bend_s_S10_1p658_N99_CS_515ef8bc_5000_1171:
bend_s_S10_1p658_CSxs_sc_5000_1171:
component: bend_s
info:
end_angle: 0
Expand All @@ -28,32 +26,30 @@ instances:
route_info_length: 10.192
route_info_min_bend_radius: 11.695
route_info_n_bend_s: 1
route_info_type: xs_3edc2673
route_info_type: xs_sc
route_info_weight: 10.192
route_info_xs_3edc2673_length: 10.192
route_info_xs_sc_length: 10.192
start_angle: 0
settings:
allow_min_radius_violation: false
cross_section: xs_sc
npoints: 99
size:
- 10
- 1.658
name: coupler_symmetric_Bbend_68f5befa
name: coupler_symmetric_G0p23_035344b9
nets: []
placements:
bend_s_S10_1p658_N99_CS_515ef8bc_5000_-1171:
bend_s_S10_1p658_CSxs_sc_5000_-1171:
mirror: true
rotation: 0
x: 0
y: -0.342
bend_s_S10_1p658_N99_CS_515ef8bc_5000_1171:
bend_s_S10_1p658_CSxs_sc_5000_1171:
mirror: false
rotation: 0
x: 0
y: 0.342
ports:
o1: bend_s_S10_1p658_N99_CS_515ef8bc_5000_-1171,o1
o2: bend_s_S10_1p658_N99_CS_515ef8bc_5000_1171,o1
o3: bend_s_S10_1p658_N99_CS_515ef8bc_5000_1171,o2
o4: bend_s_S10_1p658_N99_CS_515ef8bc_5000_-1171,o2
o1: bend_s_S10_1p658_CSxs_sc_5000_-1171,o1
o2: bend_s_S10_1p658_CSxs_sc_5000_1171,o1
o3: bend_s_S10_1p658_CSxs_sc_5000_1171,o2
o4: bend_s_S10_1p658_CSxs_sc_5000_-1171,o2
Loading

0 comments on commit 9ef60a2

Please sign in to comment.