Skip to content

Commit

Permalink
update_gdsfactory9
Browse files Browse the repository at this point in the history
  • Loading branch information
joamatab committed Feb 19, 2025
1 parent 5727179 commit dd74d4b
Show file tree
Hide file tree
Showing 39 changed files with 360 additions and 647 deletions.
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ authors = [
]
classifiers = [
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Operating System :: OS Independent"
]
dependencies = [
"gdsfactory~=8.18.0",
"gplugins[sax]>=1,<2"
"gdsfactory~=9.0.0",
"gplugins[sax,tidy3d]~=1.2.4"
]
description = "ubcpdk pdk"
keywords = ["python"]
license = {file = "LICENSE"}
name = "ubcpdk"
readme = "README.md"
requires-python = ">=3.10"
requires-python = ">=3.11,<3.13"
version = "2.7.0"

[project.optional-dependencies]
dev = [
"pytest",
"pytest-cov",
"pytest_regressions",
"pytest-github-actions-annotate-failures",
"pre-commit"
]
docs = [
Expand Down
Binary file added tests/ref/coupler90_coupler90_G0p_591568bb.gds
Binary file not shown.
Binary file added tests/ref/coupler_coupler_G0p236__a8bdff39.gds
Binary file not shown.
Binary file modified tests/ref/dbr_cavity_te_dbr_cavit_edb4408e.gds
Binary file not shown.
Binary file modified tests/ref/gc_te1310.gds
Binary file not shown.
Binary file modified tests/ref/gc_te1310_8deg.gds
Binary file not shown.
Binary file modified tests/ref/gc_te1310_broadband.gds
Binary file not shown.
Binary file modified tests/ref/gc_te1550.gds
Binary file not shown.
Binary file modified tests/ref/gc_te1550_90nmSlab.gds
Binary file not shown.
Binary file modified tests/ref/gc_te1550_broadband.gds
Binary file not shown.
Binary file modified tests/ref/gc_tm1550.gds
Binary file not shown.
Binary file added tests/ref/pad_array_pad_array_PFp_5efb8756.gds
Binary file not shown.
Binary file added tests/ref/pad_pad_S75_75_LM2_ROUT_a24a937f.gds
Binary file not shown.
Binary file added tests/ref/straight_straight_L10_N_ecd66c66.gds
Binary file not shown.
Binary file added tests/ref/taper_taper_L10_W0p5_WN_5cc09a85.gds
Binary file not shown.
4 changes: 2 additions & 2 deletions tests/test_components/test_pdk_settings_bend_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ info:
route_info_length: 16.637
route_info_min_bend_radius: 7.061
route_info_n_bend_90: 1
route_info_type: xs_c8b8e980
route_info_strip_length: 16.637
route_info_type: strip
route_info_weight: 16.637
route_info_xs_c8b8e980_length: 16.637
width: 0.5
name: bend_euler_CSstrip
settings:
Expand Down
4 changes: 2 additions & 2 deletions tests/test_components/test_pdk_settings_bend_euler180_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ info:
route_info_length: 42.817
route_info_min_bend_radius: 9.086
route_info_n_bend_90: 2
route_info_type: xs_c8b8e980
route_info_strip_length: 42.817
route_info_type: strip
route_info_weight: 42.817
route_info_xs_c8b8e980_length: 42.817
width: 0.5
name: bend_euler_CSstrip_A180
settings:
Expand Down
4 changes: 2 additions & 2 deletions tests/test_components/test_pdk_settings_bend_euler_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ info:
route_info_length: 16.637
route_info_min_bend_radius: 7.061
route_info_n_bend_90: 1
route_info_type: xs_c8b8e980
route_info_strip_length: 16.637
route_info_type: strip
route_info_weight: 16.637
route_info_xs_c8b8e980_length: 16.637
width: 0.5
name: bend_euler_CSstrip
settings:
Expand Down
3 changes: 1 addition & 2 deletions tests/test_components/test_pdk_settings_coupler90_.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
info: {}
name: coupler90_G0p2_R10_Bben_11d57add
name: coupler90_G0p2_RNone_Bb_9c88eb65
settings:
bend: bend_euler
cross_section: strip
gap: 0.2
radius: 10
straight: straight
3 changes: 2 additions & 1 deletion tests/test_components/test_pdk_settings_ebeam_dc_te1550_.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
info:
length: 10.186
min_bend_radius: 11.857
name: coupler_G0p236_L20_D4_D_83b94450
name: coupler_G0p236_L20_D4_D_b138340a
settings:
allow_min_radius_violation: false
bend: bend_s
cross_section: strip
dx: 10
dy: 4
Expand Down
3 changes: 2 additions & 1 deletion tests/test_components/test_pdk_settings_pad_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
- 75
xsize: 75
ysize: 75
name: pad_S75_75_LM2_ROUTER_B_109b8fd8
name: pad_S75_75_LM2_ROUTER_B_a6f49d52
settings:
bbox_layers:
- PAD_OPEN
Expand All @@ -18,6 +18,7 @@ settings:
- 90
- 0
- -90
port_type: pad
size:
- 75
- 75
10 changes: 5 additions & 5 deletions tests/test_components/test_pdk_settings_pad_array_.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
info: {}
name: pad_array_PFpad_Mgdsfac_1ba46877
name: pad_array_PFpad_Mgdsfac_f7490298
settings:
auto_rename_ports: false
centered_ports: false
column_pitch: 125
columns: 6
layer: MTOP
pad: Fpad_Mgdsfactorypcomponentsppad_SS75_75_LM2_ROUTER_BLPAD_OPEN_BOm1p8
pad: Fpad_Mgdsfactorypcomponentsppadsppad_SS75_75_LM2_ROUTER_BLPAD_OPEN_BOm1p8
port_orientation: 0
row_pitch: 125
rows: 1
size:
- 100
- 100
spacing:
- 125
- 125
6 changes: 3 additions & 3 deletions tests/test_components/test_pdk_settings_straight_.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
info:
length: 10
route_info_length: 10
route_info_type: xs_c8b8e980
route_info_strip_length: 10
route_info_type: strip
route_info_weight: 10
route_info_xs_c8b8e980_length: 10
width: 0.5
name: straight_L10_N2_CSstrip
name: straight_L10_N2_CSstrip_WNone
settings:
cross_section: strip
length: 10
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
info:
length: 320
resistance: 0
name: straight_heater_metal_L_32c21700
settings:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_components/test_pdk_settings_taper_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ info:
length: 10
width1: 0.5
width2: 0.5
name: taper_L10_W0p5_WNone_PN_19aa93b7
name: taper_L10_W0p5_WNone_LN_08b35698
settings:
cross_section: strip
length: 10
Expand Down
29 changes: 15 additions & 14 deletions tests/test_netlists/test_netlists_coupler90_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances:
bend_euler_CSstrip_R10_0_700:
bend_euler_CSstrip_RNone_0_700:
component: bend_euler
info:
dy: 10
Expand All @@ -9,41 +9,42 @@ instances:
route_info_length: 16.637
route_info_min_bend_radius: 7.061
route_info_n_bend_90: 1
route_info_type: xs_c8b8e980
route_info_strip_length: 16.637
route_info_type: strip
route_info_weight: 16.637
route_info_xs_c8b8e980_length: 16.637
width: 0.5
settings:
cross_section: strip
radius: 10
straight_L10_N2_CSstrip_0_0:
radius: null
straight_L10_N2_CSstrip_WNone_0_0:
component: straight
info:
length: 10
route_info_length: 10
route_info_type: xs_c8b8e980
route_info_strip_length: 10
route_info_type: strip
route_info_weight: 10
route_info_xs_c8b8e980_length: 10
width: 0.5
settings:
cross_section: strip
length: 10
npoints: 2
name: coupler90_G0p2_R10_Bben_11d57add
width: null
name: coupler90_G0p2_RNone_Bb_9c88eb65
nets: []
placements:
bend_euler_CSstrip_R10_0_700:
bend_euler_CSstrip_RNone_0_700:
mirror: false
rotation: 0
x: 0
y: 0.7
straight_L10_N2_CSstrip_0_0:
straight_L10_N2_CSstrip_WNone_0_0:
mirror: false
rotation: 0
x: 0
y: 0
ports:
o1: straight_L10_N2_CSstrip_0_0,o1
o2: bend_euler_CSstrip_R10_0_700,o1
o3: bend_euler_CSstrip_R10_0_700,o2
o4: straight_L10_N2_CSstrip_0_0,o2
o1: straight_L10_N2_CSstrip_WNone_0_0,o1
o2: bend_euler_CSstrip_RNone_0_700,o1
o3: bend_euler_CSstrip_RNone_0_700,o2
o4: straight_L10_N2_CSstrip_WNone_0_0,o2
26 changes: 14 additions & 12 deletions tests/test_netlists/test_netlists_coupler_straight_.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,47 @@
instances:
straight_L10_N2_CSstrip_0_0:
straight_L10_N2_CSstrip_WNone_0_0:
component: straight
info:
length: 10
route_info_length: 10
route_info_type: xs_c8b8e980
route_info_strip_length: 10
route_info_type: strip
route_info_weight: 10
route_info_xs_c8b8e980_length: 10
width: 0.5
settings:
cross_section: strip
length: 10
npoints: 2
straight_L10_N2_CSstrip_0_700:
width: null
straight_L10_N2_CSstrip_WNone_0_700:
component: straight
info:
length: 10
route_info_length: 10
route_info_type: xs_c8b8e980
route_info_strip_length: 10
route_info_type: strip
route_info_weight: 10
route_info_xs_c8b8e980_length: 10
width: 0.5
settings:
cross_section: strip
length: 10
npoints: 2
width: null
name: coupler_straight_L10_G0_202c9430
nets: []
placements:
straight_L10_N2_CSstrip_0_0:
straight_L10_N2_CSstrip_WNone_0_0:
mirror: false
rotation: 0
x: 0
y: 0
straight_L10_N2_CSstrip_0_700:
straight_L10_N2_CSstrip_WNone_0_700:
mirror: false
rotation: 0
x: 0
y: 0.7
ports:
o1: straight_L10_N2_CSstrip_0_0,o1
o2: straight_L10_N2_CSstrip_0_700,o1
o3: straight_L10_N2_CSstrip_0_700,o2
o4: straight_L10_N2_CSstrip_0_0,o2
o1: straight_L10_N2_CSstrip_WNone_0_0,o1
o2: straight_L10_N2_CSstrip_WNone_0_700,o1
o3: straight_L10_N2_CSstrip_WNone_0_700,o2
o4: straight_L10_N2_CSstrip_WNone_0_0,o2
2 changes: 1 addition & 1 deletion tests/test_netlists/test_netlists_ebeam_dc_te1550_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: coupler_G0p236_L20_D4_D_83b94450
name: coupler_G0p236_L20_D4_D_b138340a
nets: []
placements: {}
ports: {}
2 changes: 1 addition & 1 deletion tests/test_netlists/test_netlists_pad_.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
instances: {}
name: pad_S75_75_LM2_ROUTER_B_109b8fd8
name: pad_S75_75_LM2_ROUTER_B_a6f49d52
nets: []
placements: {}
ports: {}
26 changes: 14 additions & 12 deletions tests/test_netlists/test_netlists_ring_double_.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,44 @@ instances:
length_x: 4
radius: 10
straight: straight
straight_L0p6_N2_CSstrip_10000_11300:
straight_L0p6_N2_CSstrip_WNone_10000_11300:
component: straight
info:
length: 0.6
route_info_length: 0.6
route_info_type: xs_c8b8e980
route_info_strip_length: 0.6
route_info_type: strip
route_info_weight: 0.6
route_info_xs_c8b8e980_length: 0.6
width: 0.5
settings:
cross_section: strip
length: 0.6
npoints: 2
straight_L0p6_N2_CSstrip_m14000_10700:
width: null
straight_L0p6_N2_CSstrip_WNone_m14000_10700:
component: straight
info:
length: 0.6
route_info_length: 0.6
route_info_type: xs_c8b8e980
route_info_strip_length: 0.6
route_info_type: strip
route_info_weight: 0.6
route_info_xs_c8b8e980_length: 0.6
width: 0.5
settings:
cross_section: strip
length: 0.6
npoints: 2
width: null
name: ring_double_G0p2_R10_LX4_LY0p6
nets:
- p1: coupler_ring_G0p2_R10_L_13fd066c_0_0,o2
p2: straight_L0p6_N2_CSstrip_m14000_10700,o1
p2: straight_L0p6_N2_CSstrip_WNone_m14000_10700,o1
- p1: coupler_ring_G0p2_R10_L_13fd066c_0_0,o3
p2: straight_L0p6_N2_CSstrip_10000_11300,o2
p2: straight_L0p6_N2_CSstrip_WNone_10000_11300,o2
- p1: coupler_ring_G0p2_R10_L_13fd066c_m4000_22000,o2
p2: straight_L0p6_N2_CSstrip_10000_11300,o1
p2: straight_L0p6_N2_CSstrip_WNone_10000_11300,o1
- p1: coupler_ring_G0p2_R10_L_13fd066c_m4000_22000,o3
p2: straight_L0p6_N2_CSstrip_m14000_10700,o2
p2: straight_L0p6_N2_CSstrip_WNone_m14000_10700,o2
placements:
coupler_ring_G0p2_R10_L_13fd066c_0_0:
mirror: false
Expand All @@ -68,12 +70,12 @@ placements:
rotation: 180
x: -4
y: 22
straight_L0p6_N2_CSstrip_10000_11300:
straight_L0p6_N2_CSstrip_WNone_10000_11300:
mirror: false
rotation: 270
x: 10
y: 11.3
straight_L0p6_N2_CSstrip_m14000_10700:
straight_L0p6_N2_CSstrip_WNone_m14000_10700:
mirror: false
rotation: 90
x: -14
Expand Down
Loading

0 comments on commit dd74d4b

Please sign in to comment.