Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to gdsfactory 8.5.2 #53

Merged
merged 9 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions cspdk/si220/cells.py
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,6 @@ def heater() -> Component:
def crossing_so() -> Component:
"""SOI220nm_1310nm_TE_STRIP_Waveguide_Crossing fixed cell."""
c = gf.import_gds(PATH.gds / "SOI220nm_1310nm_TE_STRIP_Waveguide_Crossing.gds")
c.flatten()

xc = 493.47
dx = 8.47 / 2
x = xc - dx
Expand All @@ -613,7 +611,6 @@ def crossing_so() -> Component:
def crossing_rc() -> Component:
"""SOI220nm_1550nm_TE_RIB_Waveguide_Crossing fixed cell."""
c = gf.import_gds(PATH.gds / "SOI220nm_1550nm_TE_RIB_Waveguide_Crossing.gds")
c.flatten()
xc = 404.24
dx = 9.24 / 2
x = xc - dx
Expand All @@ -634,7 +631,6 @@ def crossing_rc() -> Component:
def crossing_sc() -> Component:
"""SOI220nm_1550nm_TE_STRIP_Waveguide_Crossing fixed cell."""
c = gf.import_gds(PATH.gds / "SOI220nm_1550nm_TE_STRIP_Waveguide_Crossing.gds")
c.flatten()
xc = 494.24
yc = 800
dx = 9.24 / 2
Expand Down Expand Up @@ -674,5 +670,5 @@ def array(


if __name__ == "__main__":
t = grating_coupler_rectangular_rc()
t = crossing_sc()
t.show()
2 changes: 1 addition & 1 deletion cspdk/si220/samples/circuit_simulations_sc_with_routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
mzi2 = c << cells.mzi_sc(delta_length=100)
mzi2.dmove((200, 200))
# route = tech.route_single_sc(c, mzi1.ports["o2"], mzi2.ports["o1"])
route = tech.route_bundle_sc(c, [mzi1.ports["o2"]], [mzi2.ports["o1"]])
route = tech.route_bundle(c, [mzi1.ports["o2"]], [mzi2.ports["o1"]])
c.add_port(name="o1", port=mzi1.ports["o1"])
c.add_port(name="o2", port=mzi2.ports["o2"])
c.show()
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ classifiers = [
"Operating System :: OS Independent"
]
dependencies = [
"gdsfactory~=8.5.0",
"gdsfactory~=8.5.2",
"gplugins[sax]>=1,<2"
]
description = "CornerStone PDK"
Expand Down
Binary file modified tests/gds_ref_si220/array.gds
Binary file not shown.
Binary file modified tests/gds_ref_si220/straight_sc.oas
Binary file not shown.
Binary file modified tests/gds_ref_si500/mmi1x2.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mmi1x2_rc.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mmi1x2_ro.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mmi2x2.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mmi2x2_rc.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mmi2x2_ro.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mzi.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mzi_rc.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/mzi_ro.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/taper.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/taper_rc.gds
Binary file not shown.
Binary file modified tests/gds_ref_si500/taper_ro.gds
Binary file not shown.
1 change: 0 additions & 1 deletion tests/test_netlists_si220.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
@pytest.fixture(autouse=True)
def activate_pdk():
PDK.activate()
gf.clear_cache()


cells = PDK.cells
Expand Down
2 changes: 0 additions & 2 deletions tests/test_netlists_si500.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

@pytest.fixture(autouse=True)
def activate_pdk():
gf.clear_cache()
PDK.activate()
gf.clear_cache()


cells = PDK.cells
Expand Down
168 changes: 84 additions & 84 deletions tests/test_netlists_si500/test_netlists_mzi_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances:
bend_euler_RNone_A90_P0_ddb8ac70_122712_-50098:
bend_euler_RNone_A90_P0_ddb8ac70_115412_-47683:
component: bend_euler
info:
dy: 25
Expand All @@ -16,7 +16,7 @@ instances:
angle: 90
cross_section: xs_rc
p: 0.5
bend_euler_RNone_A90_P0_ddb8ac70_125212_42597:
bend_euler_RNone_A90_P0_ddb8ac70_117912_40182:
component: bend_euler
info:
dy: 25
Expand All @@ -33,7 +33,7 @@ instances:
angle: 90
cross_section: xs_rc
p: 0.5
bend_euler_RNone_A90_P0_ddb8ac70_139987_10837:
bend_euler_RNone_A90_P0_ddb8ac70_137687_13402:
component: bend_euler
info:
dy: 25
Expand All @@ -50,7 +50,7 @@ instances:
angle: 90
cross_section: xs_rc
p: 0.5
bend_euler_RNone_A90_P0_ddb8ac70_142487_-8338:
bend_euler_RNone_A90_P0_ddb8ac70_140187_-10903:
component: bend_euler
info:
dy: 25
Expand All @@ -67,7 +67,7 @@ instances:
angle: 90
cross_section: xs_rc
p: 0.5
bend_euler_RNone_A90_P0_ddb8ac70_72612_-8873:
bend_euler_RNone_A90_P0_ddb8ac70_65312_-11458:
component: bend_euler
info:
dy: 25
Expand All @@ -84,7 +84,7 @@ instances:
angle: 90
cross_section: xs_rc
p: 0.5
bend_euler_RNone_A90_P0_ddb8ac70_72612_8872:
bend_euler_RNone_A90_P0_ddb8ac70_65312_11457:
component: bend_euler
info:
dy: 25
Expand All @@ -101,7 +101,7 @@ instances:
angle: 90
cross_section: xs_rc
p: 0.5
bend_euler_RNone_A90_P0_ddb8ac70_89887_-47598:
bend_euler_RNone_A90_P0_ddb8ac70_87587_-45183:
component: bend_euler
info:
dy: 25
Expand All @@ -118,7 +118,7 @@ instances:
angle: 90
cross_section: xs_rc
p: 0.5
bend_euler_RNone_A90_P0_ddb8ac70_92387_45097:
bend_euler_RNone_A90_P0_ddb8ac70_90087_42682:
component: bend_euler
info:
dy: 25
Expand All @@ -140,8 +140,8 @@ instances:
info: {}
settings:
cross_section: xs_rc
gap_mmi: 1.47
length_mmi: 37.5
gap_mmi: 1.64
length_mmi: 32.7
length_taper: 20
width_mmi: 6
width_taper: 1.5
Expand All @@ -150,35 +150,35 @@ instances:
info: {}
settings:
cross_section: xs_rc
gap_mmi: 0.4
length_mmi: 5.5
length_taper: 50.2
gap_mmi: 0.53
length_mmi: 44.8
length_taper: 20
width_mmi: 6
width_taper: 1.5
straight_L1p53500000000_9b430bf6_132600_26717:
straight_L1p555_WNone_CSxs_rc_127800_26792:
component: straight
info:
length: 1.535
route_info_length: 1.535
length: 1.555
route_info_length: 1.555
route_info_type: xs_rc
route_info_weight: 1.535
route_info_xs_rc_length: 1.535
route_info_weight: 1.555
route_info_xs_rc_length: 1.555
width: 0.45
settings:
cross_section: xs_rc
length: 1.535
straight_L6p535_WNone_CSxs_rc_132600_-29218:
length: 1.555
straight_L6p555_WNone_CSxs_rc_127800_-29293:
component: straight
info:
length: 6.535
route_info_length: 6.535
length: 6.555
route_info_length: 6.555
route_info_type: xs_rc
route_info_weight: 6.535
route_info_xs_rc_length: 6.535
route_info_weight: 6.555
route_info_xs_rc_length: 6.555
width: 0.45
settings:
cross_section: xs_rc
length: 6.535
length: 6.555
sxb:
component: straight
info:
Expand Down Expand Up @@ -229,79 +229,79 @@ instances:
length: 1
name: mzi_DL10_Bbend_rc_Sstra_02ff743c
nets:
- p1: bend_euler_RNone_A90_P0_ddb8ac70_122712_-50098,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_115412_-47683,o1
p2: sxb,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_122712_-50098,o2
p2: straight_L6p535_WNone_CSxs_rc_132600_-29218,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_125212_42597,o1
p2: straight_L1p53500000000_9b430bf6_132600_26717,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_125212_42597,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_115412_-47683,o2
p2: straight_L6p555_WNone_CSxs_rc_127800_-29293,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_117912_40182,o1
p2: straight_L1p555_WNone_CSxs_rc_127800_26792,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_117912_40182,o2
p2: sxt,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_139987_10837,o1
p2: straight_L1p53500000000_9b430bf6_132600_26717,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_139987_10837,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_137687_13402,o1
p2: straight_L1p555_WNone_CSxs_rc_127800_26792,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_137687_13402,o2
p2: cp2,o3
- p1: bend_euler_RNone_A90_P0_ddb8ac70_142487_-8338,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_140187_-10903,o1
p2: cp2,o4
- p1: bend_euler_RNone_A90_P0_ddb8ac70_142487_-8338,o2
p2: straight_L6p535_WNone_CSxs_rc_132600_-29218,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_72612_-8873,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_140187_-10903,o2
p2: straight_L6p555_WNone_CSxs_rc_127800_-29293,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_65312_-11458,o1
p2: cp1,o3
- p1: bend_euler_RNone_A90_P0_ddb8ac70_72612_-8873,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_65312_-11458,o2
p2: syl,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_72612_8872,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_65312_11457,o1
p2: cp1,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_72612_8872,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_65312_11457,o2
p2: sytl,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_89887_-47598,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_87587_-45183,o1
p2: syl,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_89887_-47598,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_87587_-45183,o2
p2: sxb,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_92387_45097,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_90087_42682,o1
p2: sxt,o1
- p1: bend_euler_RNone_A90_P0_ddb8ac70_92387_45097,o2
- p1: bend_euler_RNone_A90_P0_ddb8ac70_90087_42682,o2
p2: sytl,o2
placements:
bend_euler_RNone_A90_P0_ddb8ac70_122712_-50098:
bend_euler_RNone_A90_P0_ddb8ac70_115412_-47683:
mirror: false
rotation: 0
x: 107.6
y: -57.485
bend_euler_RNone_A90_P0_ddb8ac70_125212_42597:
x: 102.8
y: -57.57
bend_euler_RNone_A90_P0_ddb8ac70_117912_40182:
mirror: false
rotation: 90
x: 132.6
y: 27.485
bend_euler_RNone_A90_P0_ddb8ac70_139987_10837:
x: 127.8
y: 27.57
bend_euler_RNone_A90_P0_ddb8ac70_137687_13402:
mirror: false
rotation: 270
x: 132.6
y: 25.95
bend_euler_RNone_A90_P0_ddb8ac70_142487_-8338:
x: 127.8
y: 26.015
bend_euler_RNone_A90_P0_ddb8ac70_140187_-10903:
mirror: false
rotation: 180
x: 157.6
y: -0.95
bend_euler_RNone_A90_P0_ddb8ac70_72612_-8873:
x: 152.8
y: -1.015
bend_euler_RNone_A90_P0_ddb8ac70_65312_-11458:
mirror: true
rotation: 0
x: 57.5
y: -1.485
bend_euler_RNone_A90_P0_ddb8ac70_72612_8872:
x: 52.7
y: -1.57
bend_euler_RNone_A90_P0_ddb8ac70_65312_11457:
mirror: false
rotation: 0
x: 57.5
y: 1.485
bend_euler_RNone_A90_P0_ddb8ac70_89887_-47598:
x: 52.7
y: 1.57
bend_euler_RNone_A90_P0_ddb8ac70_87587_-45183:
mirror: false
rotation: 270
x: 82.5
y: -32.485
bend_euler_RNone_A90_P0_ddb8ac70_92387_45097:
x: 77.7
y: -32.57
bend_euler_RNone_A90_P0_ddb8ac70_90087_42682:
mirror: false
rotation: 180
x: 107.5
y: 52.485
x: 102.7
y: 52.57
cp1:
mirror: false
rotation: 0
Expand All @@ -310,38 +310,38 @@ placements:
cp2:
mirror: true
rotation: 180
x: 213.3
x: 217.6
y: 0
straight_L1p53500000000_9b430bf6_132600_26717:
straight_L1p555_WNone_CSxs_rc_127800_26792:
mirror: false
rotation: 90
x: 132.6
y: 25.95
straight_L6p535_WNone_CSxs_rc_132600_-29218:
x: 127.8
y: 26.015
straight_L6p555_WNone_CSxs_rc_127800_-29293:
mirror: false
rotation: 90
x: 132.6
y: -32.485
x: 127.8
y: -32.57
sxb:
mirror: false
rotation: 0
x: 107.5
y: -57.485
x: 102.7
y: -57.57
sxt:
mirror: false
rotation: 0
x: 107.5
y: 52.485
x: 102.7
y: 52.57
syl:
mirror: false
rotation: 270
x: 82.5
y: -26.485
x: 77.7
y: -26.57
sytl:
mirror: false
rotation: 90
x: 82.5
y: 26.485
x: 77.7
y: 26.57
ports:
o1: cp1,o1
o2: cp2,o2
Expand Down
Loading
Loading