Merge pull request #363 from gdsfactory/simpler_pdk

simpler pdk init
gdsfactory · Mar 24, 2024 · 9cfb205 · 9cfb205
2 parents f7b326f + 2a4cb44
commit 9cfb205
Show file tree

Hide file tree

Showing 136 changed files with 8,003 additions and 751 deletions.
diff --git a/docs/components.rst b/docs/components.rst
@@ -68,6 +68,7 @@ Cells summary
    ring_with_crossing
    spiral
    straight
+   straight_heater_metal
    straight_one_pin
    taper
    terminator_short

diff --git a/docs/components_plot.rst b/docs/components_plot.rst
@@ -182,7 +182,7 @@ bend_s
 
   import ubcpdk
 
-  c = ubcpdk.components.bend_s(size=(11.0, 1.8), npoints=99, cross_section='xs_sc', with_bbox=True, add_pins=True)
+  c = ubcpdk.components.bend_s(size=(11.0, 1.8), npoints=99, cross_section='xs_sc')
   c.plot()
 
 
@@ -707,7 +707,7 @@ mmi1x2
 
   import ubcpdk
 
-  c = ubcpdk.components.mmi1x2(width_taper=1.0, length_taper=10.0, length_mmi=5.5, width_mmi=2.5, gap_mmi=0.25, with_bbox=True)
+  c = ubcpdk.components.mmi1x2(width_taper=1.0, length_taper=10.0, length_mmi=5.5, width_mmi=2.5, gap_mmi=0.25)
   c.plot()
 
 
@@ -902,7 +902,22 @@ straight
 
   import ubcpdk
 
-  c = ubcpdk.components.straight(length=10.0, npoints=2, add_pins=True, cross_section='xs_sc')
+  c = ubcpdk.components.straight(length=10.0, npoints=2, cross_section='xs_sc', post_process=(functools.partial(<function add_padding at 0x7f87372dd440>, layers=((68, 0),), default=0, top=0.5, bottom=0.5),))
+  c.plot()
+
+
+
+straight_heater_metal
+----------------------------------------------------
+
+.. autofunction:: ubcpdk.components.straight_heater_metal
+
+.. plot::
+  :include-source:
+
+  import ubcpdk
+
+  c = ubcpdk.components.straight_heater_metal(length=320.0, length_undercut_spacing=6.0, length_undercut=30.0, length_straight=0.1, length_straight_input=15.0, cross_section='xs_sc', cross_section_heater='xs_heater_metal', cross_section_waveguide_heater='xs_sc_heater_metal', cross_section_heater_undercut='xs_sc_heater_metal_undercut', with_undercut=False, via_stack='via_stack_heater_mtop', heater_taper_length=5.0)
   c.plot()
 
 
@@ -932,7 +947,7 @@ taper
 
   import ubcpdk
 
-  c = ubcpdk.components.taper(length=10.0, width1=0.5, with_bbox=True, with_two_ports=True, cross_section='xs_sc', port_order_name=('o1', 'o2'), port_order_types=('optical', 'optical'), add_pins=True)
+  c = ubcpdk.components.taper(length=10.0, width1=0.5, with_two_ports=True, cross_section='xs_sc', port_order_name=('o1', 'o2'), port_order_types=('optical', 'optical'))
   c.plot()
 
 

diff --git a/docs/notebooks/00_layout.ipynb b/docs/notebooks/00_layout.ipynb
@@ -343,7 +343,6 @@
     "                radius=radius,\n",
     "                y_straight_inner_top=0,\n",
     "                x_inner_length_cutback=0,\n",
-    "                info=dict(does=[\"spiral\", \"te1550\"]),\n",
     "            )\n",
     "        )\n",
     "    ]\n",

diff --git a/docs/notebooks/12_sim_plugins_tidy3d.ipynb b/docs/notebooks/12_sim_plugins_tidy3d.ipynb
@@ -240,6 +240,14 @@
    "metadata": {},
    "outputs": [],
    "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c5e44e25",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

diff --git a/pyproject.toml b/pyproject.toml
@@ -15,8 +15,8 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory==7.18.0",
-  "gplugins[tidy3d,sax,schematic]>=0.10.2,<0.11"
+  "gdsfactory==7.22.2",
+  "gplugins[tidy3d,sax,schematic]>=0.11,<0.12"
 ]
 description = "ubcpdk pdk"
 keywords = ["python"]

diff --git a/...ref/add_electrical_pads_top_dc_ring_single_heater_add_electrical_pads_top_dc_984bbf2d.gds b/...ref/add_electrical_pads_top_dc_ring_single_heater_add_electrical_pads_top_dc_984bbf2d.gds
diff --git a/tests/ref/add_electrical_pads_top_ring_single_heater_add_electrical_pads_top_984bbf2d.gds b/tests/ref/add_electrical_pads_top_ring_single_heater_add_electrical_pads_top_984bbf2d.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array.gds
diff --git a/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_componentdbr_cavity.gds b/tests/ref/add_fiber_array_add_fiber_array_add_fiber_array_componentdbr_cavity.gds
diff --git a/tests/ref/add_fiber_array_pads_rf.gds b/tests/ref/add_fiber_array_pads_rf.gds
diff --git a/tests/ref/coupler.gds b/tests/ref/coupler.gds
diff --git a/tests/ref/coupler_coupler1.gds b/tests/ref/coupler_coupler1.gds
diff --git a/tests/ref/coupler_coupler_e0bb2bc4.gds b/tests/ref/coupler_coupler_e0bb2bc4.gds
diff --git a/tests/ref/coupler_ring.gds b/tests/ref/coupler_ring.gds
diff --git a/tests/ref/coupler_ring_coupler_ring1.gds b/tests/ref/coupler_ring_coupler_ring1.gds
diff --git a/tests/ref/coupler_ring_coupler_ring_e0bb2bc4.gds b/tests/ref/coupler_ring_coupler_ring_e0bb2bc4.gds
diff --git a/tests/ref/dbr_cavity.gds b/tests/ref/dbr_cavity.gds
diff --git a/tests/ref/ebeam_y_adiabatic_tapers.gds b/tests/ref/ebeam_y_adiabatic_tapers.gds
diff --git a/tests/ref/gc_te1310.gds b/tests/ref/gc_te1310.gds
diff --git a/tests/ref/gc_te1310_8deg.gds b/tests/ref/gc_te1310_8deg.gds
diff --git a/tests/ref/gc_te1310_broadband.gds b/tests/ref/gc_te1310_broadband.gds
diff --git a/tests/ref/gc_te1550.gds b/tests/ref/gc_te1550.gds
diff --git a/tests/ref/gc_te1550_90nmSlab.gds b/tests/ref/gc_te1550_90nmSlab.gds
diff --git a/tests/ref/gc_te1550_broadband.gds b/tests/ref/gc_te1550_broadband.gds
diff --git a/tests/ref/gc_tm1550.gds b/tests/ref/gc_tm1550.gds
diff --git a/tests/ref/mmi1x2_mmi1x21.gds b/tests/ref/mmi1x2_mmi1x21.gds
diff --git a/tests/ref/mmi1x2_mmi1x2_e0bb2bc4.gds b/tests/ref/mmi1x2_mmi1x2_e0bb2bc4.gds
diff --git a/tests/ref/mzi_mzi_a1fe9d55.gds b/tests/ref/mzi_mzi_a1fe9d55.gds
diff --git a/tests/ref/mzi_mzi_f5c6fc9f.gds b/tests/ref/mzi_mzi_f5c6fc9f.gds
diff --git a/tests/ref/pad_array_pad_array_25dc0e38.gds b/tests/ref/pad_array_pad_array_25dc0e38.gds
diff --git a/tests/ref/pad_pad_0210fbc6.gds b/tests/ref/pad_pad_0210fbc6.gds
diff --git a/tests/ref/ring_double_heater_ring_double_heater_dde86d0f.gds b/tests/ref/ring_double_heater_ring_double_heater_dde86d0f.gds
diff --git a/tests/ref/ring_double_heater_ring_double_heater_f261383d.gds b/tests/ref/ring_double_heater_ring_double_heater_f261383d.gds
diff --git a/tests/ref/ring_double_ring_double_64b48b6b.gds b/tests/ref/ring_double_ring_double_64b48b6b.gds
diff --git a/tests/ref/ring_double_ring_double_a459ac5d.gds b/tests/ref/ring_double_ring_double_a459ac5d.gds
diff --git a/tests/ref/ring_single_dut_ring_single_dut_26538df6.gds b/tests/ref/ring_single_dut_ring_single_dut_26538df6.gds
diff --git a/tests/ref/ring_single_dut_ring_single_dut_5f7261fe.gds b/tests/ref/ring_single_dut_ring_single_dut_5f7261fe.gds
diff --git a/tests/ref/ring_single_heater_ring_single_heater_59bd74a4.gds b/tests/ref/ring_single_heater_ring_single_heater_59bd74a4.gds
diff --git a/tests/ref/ring_single_heater_ring_single_heater_cc91df46.gds b/tests/ref/ring_single_heater_ring_single_heater_cc91df46.gds
diff --git a/tests/ref/ring_single_ring_single_382b19ee.gds b/tests/ref/ring_single_ring_single_382b19ee.gds
diff --git a/tests/ref/ring_single_ring_single_7ee9a328.gds b/tests/ref/ring_single_ring_single_7ee9a328.gds
diff --git a/tests/ref/straight.gds b/tests/ref/straight.gds
diff --git a/.../ref/straight_heater_metal_undercut_straight_heater_metal_undercut_with_undercutFalse.gds b/.../ref/straight_heater_metal_undercut_straight_heater_metal_undercut_with_undercutFalse.gds
diff --git a/tests/test_components.py b/tests/test_components.py
@@ -18,6 +18,8 @@
     "add_pins_bbox_siepic",
     "add_pads",
     "add_pins_bbox_siepic_remove_layers",
+    "import_gds",
+    "mzi",
 }
 cell_names = set(cells.keys()) - set(skip_test)
 dirpath_ref = pathlib.Path(__file__).absolute().parent / "ref"

diff --git a/tests/test_components/test_pdk_settings_add_fiber_array_.yml b/tests/test_components/test_pdk_settings_add_fiber_array_.yml
@@ -1,29 +1,16 @@
 function: add_fiber_array
 info:
-  length: 10.0
-  route_info_length: 10.0
+  length: 1.0
+  route_info_length: 1.0
   route_info_type: xs_sc
-  route_info_weight: 10.0
-  route_info_xs_sc_length: 10.0
+  route_info_weight: 1.0
+  route_info_xs_sc_length: 1.0
   width: 0.5
 module: ubcpdk.components
 name: add_fiber_array_add_fiber_array
 settings:
   component:
     function: straight
-    module: gdsfactory.components.straight
-    settings:
-      cross_section: xs_sc
-      post_process:
-      - function: add_padding
-        module: gdsfactory.add_padding
-        settings:
-          bottom: 0.5
-          default: 0
-          layers:
-          - - 68
-            - 0
-          top: 0.5
   component_name: null
   cross_section: xs_sc
   fanout_length: 0.0
@@ -32,25 +19,10 @@ settings:
     function: get_input_labels
   grating_coupler:
     function: gc_te1550
-  info: null
   layer_label:
   - 10
   - 0
   optical_routing_type: 0
-  post_process: null
   straight:
     function: straight
-    module: gdsfactory.components.straight
-    settings:
-      cross_section: xs_sc
-      post_process:
-      - function: add_padding
-        module: gdsfactory.add_padding
-        settings:
-          bottom: 0.5
-          default: 0
-          layers:
-          - - 68
-            - 0
-          top: 0.5
   with_loopback: false
diff --git a/tests/test_components/test_pdk_settings_add_pads_dc_.yml b/tests/test_components/test_pdk_settings_add_pads_dc_.yml
@@ -1,7 +1,7 @@
 function: add_electrical_pads_top_dc
 info: {}
 module: gdsfactory.routing.add_electrical_pads_top_dc
-name: ring_single_heater_add_electrical_pads_top_dc_cc2475fe
+name: ring_single_heater_add_electrical_pads_top_dc_984bbf2d
 settings:
   component: ring_single_heater
   get_bundle_function:
@@ -11,7 +11,6 @@ settings:
       bend:
         function: wire_corner
       cross_section: xs_metal_routing
-  info: null
   pad_array:
     function: pad_array
     module: gdsfactory.components.pad
@@ -28,22 +27,13 @@ settings:
           layer:
           - 12
           - 0
-          post_process:
-            function: add_pins_siepic
-            module: ubcpdk.tech
-            settings:
-              layer_pin:
-              - 1
-              - 11
-              port_type: placement
           size:
           - 75
           - 75
       spacing:
       - 125
       - 125
   port_names: null
-  post_process: null
   select_ports:
     function: select_ports
     module: gdsfactory.port

diff --git a/tests/test_components/test_pdk_settings_add_pads_rf_.yml b/tests/test_components/test_pdk_settings_add_pads_rf_.yml
@@ -1,11 +1,10 @@
 function: add_electrical_pads_top
 info: {}
 module: gdsfactory.routing.add_electrical_pads_top
-name: ring_single_heater_add_electrical_pads_top_cc2475fe
+name: ring_single_heater_add_electrical_pads_top_984bbf2d
 settings:
   component: ring_single_heater
   direction: top
-  info: null
   layer: MTOP
   pad_array:
     function: pad_array
@@ -23,22 +22,13 @@ settings:
           layer:
           - 12
           - 0
-          post_process:
-            function: add_pins_siepic
-            module: ubcpdk.tech
-            settings:
-              layer_pin:
-              - 1
-              - 11
-              port_type: placement
           size:
           - 75
           - 75
       spacing:
       - 125
       - 125
   port_names: null
-  post_process: null
   select_ports:
     function: select_ports
     module: gdsfactory.port

diff --git a/tests/test_components/test_pdk_settings_bend_s_.yml b/tests/test_components/test_pdk_settings_bend_s_.yml
@@ -8,9 +8,7 @@ module: gdsfactory.components.bend_s
 name: bend_s
 settings:
   cross_section: xs_sc
-  info: null
   npoints: 99
-  post_process: null
   size:
   - 11.0
   - 1.8
diff --git a/tests/test_components/test_pdk_settings_coupler_.yml b/tests/test_components/test_pdk_settings_coupler_.yml
@@ -3,49 +3,14 @@ info:
   length: 10.186
   min_bend_radius: 11.857
 module: gdsfactory.components.coupler
-name: coupler_4abc60df
+name: coupler
 settings:
   coupler_straight:
     function: coupler_straight
   coupler_symmetric:
     function: coupler_symmetric
-  cross_section:
-    add_pins_function_module: ubcpdk.tech
-    add_pins_function_name: add_pins_siepic
-    auto_widen: false
-    auto_widen_minimum_length: 200.0
-    bbox_layers: null
-    bbox_offsets: null
-    components_along_path: []
-    end_straight_length: 0.01
-    gap: 3.0
-    info: {}
-    min_length: 0.01
-    radius: 10.0
-    radius_min: 5.0
-    sections:
-    - hidden: false
-      insets: null
-      layer: WG
-      name: _default
-      offset: 0.0
-      offset_function: null
-      port_names:
-      - o1
-      - o2
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 0.5
-      width_function: null
-    start_straight_length: 0.01
-    taper_length: 10.0
-    width_wide: null
+  cross_section: xs_sc
   dx: 10.0
   dy: 4.0
   gap: 0.236
-  info: null
   length: 20.0
-  post_process:
-    function: add_pins_bbox_siepic
diff --git a/tests/test_components/test_pdk_settings_coupler_ring_.yml b/tests/test_components/test_pdk_settings_coupler_ring_.yml
@@ -1,52 +1,17 @@
 function: coupler_ring
 info: {}
 module: gdsfactory.components.coupler_ring
-name: coupler_ring_4abc60df
+name: coupler_ring
 settings:
   bend:
     function: bend_euler
   coupler90:
     function: coupler90
   coupler_straight:
     function: coupler_straight
-  cross_section:
-    add_pins_function_module: ubcpdk.tech
-    add_pins_function_name: add_pins_siepic
-    auto_widen: false
-    auto_widen_minimum_length: 200.0
-    bbox_layers: null
-    bbox_offsets: null
-    components_along_path: []
-    end_straight_length: 0.01
-    gap: 3.0
-    info: {}
-    min_length: 0.01
-    radius: 10.0
-    radius_min: 5.0
-    sections:
-    - hidden: false
-      insets: null
-      layer: WG
-      name: _default
-      offset: 0.0
-      offset_function: null
-      port_names:
-      - o1
-      - o2
-      port_types:
-      - optical
-      - optical
-      simplify: null
-      width: 0.5
-      width_function: null
-    start_straight_length: 0.01
-    taper_length: 10.0
-    width_wide: null
+  cross_section: xs_sc
   cross_section_bend: null
   gap: 0.2
-  info: null
   length_extension: 3
   length_x: 4.0
-  post_process:
-    function: add_pins_bbox_siepic
   radius: 5.0
diff --git a/tests/test_components/test_pdk_settings_dbr_cavity_.yml b/tests/test_components/test_pdk_settings_dbr_cavity_.yml
@@ -5,42 +5,5 @@ name: dbr_cavity
 settings:
   coupler:
     function: coupler
-    module: gdsfactory.components.coupler
-    settings:
-      cross_section:
-        add_pins_function_module: ubcpdk.tech
-        add_pins_function_name: add_pins_siepic
-        auto_widen: false
-        auto_widen_minimum_length: 200.0
-        bbox_layers: null
-        bbox_offsets: null
-        components_along_path: []
-        end_straight_length: 0.01
-        gap: 3.0
-        info: {}
-        min_length: 0.01
-        radius: 10.0
-        radius_min: 5.0
-        sections:
-        - hidden: false
-          insets: null
-          layer: WG
-          name: _default
-          offset: 0.0
-          offset_function: null
-          port_names:
-          - o1
-          - o2
-          port_types:
-          - optical
-          - optical
-          simplify: null
-          width: 0.5
-          width_function: null
-        start_straight_length: 0.01
-        taper_length: 10.0
-        width_wide: null
-      post_process:
-        function: add_pins_bbox_siepic
   dbr:
     function: dbr