Merge pull request #396 from gdsfactory/gdsfactory8

Gdsfactory8

.gitignore

@@ -11,6 +11,7 @@ ubcpdk/tests/test_components.gds/gds_diff/
 .dvc/
 .virtual_documents
 tests/ref/*.oas
+ubcpdk/gds/*.oas
 
 # C extensions
 *.so

docs/notebooks/00_layout.ipynb

@@ -215,7 +215,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "component_fiber_array = uc.add_fiber_array(component=mzi)\n",
+    "component_fiber_array = uc.add_fiber_array(component=mzi, fanout_length=5)\n",
     "component_fiber_array.plot()"
    ]
   },
@@ -278,16 +278,11 @@
    "outputs": [],
    "source": [
     "from functools import partial\n",
-    "from pathlib import Path\n",
-    "\n",
     "import gdsfactory as gf\n",
     "\n",
-    "import ubcpdk\n",
     "import ubcpdk.components as uc\n",
-    "from ubcpdk import tech\n",
     "from ubcpdk.tech import LAYER\n",
     "\n",
-    "\n",
     "size = (440, 470)\n",
     "add_gc = uc.add_fiber_array\n",
     "\n",
@@ -317,7 +312,6 @@
     "    return c\n",
     "\n",
     "\n",
-    "gf.clear_cache()\n",
     "c = EBeam_JoaquinMatres_1()\n",
     "c.show()  # show in klayout\n",
     "c.plot()  # plot in notebook"
@@ -330,34 +324,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "@gf.cell\n",
     "def EBeam_JoaquinMatres_2() -> gf.Component:\n",
     "    \"\"\"spirals for extracting straight waveguide loss\"\"\"\n",
-    "    N = 12\n",
-    "    radius = 10\n",
     "\n",
     "    e = [\n",
-    "        uc.add_fiber_array(\n",
-    "            component=uc.spiral(\n",
-    "                N=N,\n",
-    "                radius=radius,\n",
-    "                y_straight_inner_top=0,\n",
-    "                x_inner_length_cutback=0,\n",
-    "            )\n",
-    "        )\n",
+    "        uc.add_fiber_array(component=uc.spiral(n_loops=8, length=length))\n",
+    "        for length in [0, 100, 200]\n",
     "    ]\n",
     "\n",
-    "    e.append(\n",
-    "        uc.add_fiber_array(\n",
-    "            component=uc.spiral(\n",
-    "                N=N,\n",
-    "                radius=radius,\n",
-    "                y_straight_inner_top=0,\n",
-    "                x_inner_length_cutback=185,\n",
-    "            )\n",
-    "        )\n",
-    "    )\n",
-    "\n",
     "    c = gf.Component()\n",
     "    _ = c << gf.pack(e, max_size=size, spacing=2)[0]\n",
     "    _ = c << gf.components.rectangle(size=size, layer=LAYER.FLOORPLAN)\n",
@@ -376,23 +350,20 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "@gf.cell\n",
     "def EBeam_JoaquinMatres_3() -> gf.Component:\n",
-    "    \"\"\"contains mirror cavities and structures inside a resonator\"\"\"\n",
+    "    \"\"\"Contains mirror cavities and structures inside a resonator.\"\"\"\n",
     "    e = []\n",
     "    e += [add_gc(uc.ebeam_crossing4())]\n",
     "    e += [add_gc(uc.ebeam_adiabatic_te1550(), optical_routing_type=1)]\n",
     "    e += [add_gc(uc.ebeam_bdc_te1550())]\n",
     "    e += [add_gc(uc.ebeam_y_1550(), optical_routing_type=1)]\n",
-    "    e += [add_gc(uc.ebeam_y_adiabatic_tapers(), optical_routing_type=1)]\n",
     "    e += [add_gc(uc.straight(), component_name=f\"straight_{i}\") for i in range(2)]\n",
     "    c = gf.Component()\n",
     "    _ = c << gf.pack(e, max_size=size, spacing=2)[0]\n",
     "    _ = c << gf.components.rectangle(size=size, layer=LAYER.FLOORPLAN)\n",
     "    return c\n",
     "\n",
     "\n",
-    "gf.clear_cache()\n",
     "c = EBeam_JoaquinMatres_3()\n",
     "c.show()  # show in klayout\n",
     "c.plot()  # plot in notebook"
@@ -405,12 +376,13 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "@gf.cell\n",
     "def EBeam_JoaquinMatres_4() -> gf.Component:\n",
     "    \"\"\"MZI interferometers.\"\"\"\n",
     "    mzi = partial(gf.components.mzi, splitter=uc.ebeam_y_1550)\n",
     "    mzis = [mzi(delta_length=delta_length) for delta_length in [10, 40, 100]]\n",
-    "    mzis_gc = [uc.add_fiber_array(mzi) for mzi in mzis]\n",
+    "    mzis_gc = [\n",
+    "        uc.add_fiber_array(mzi, optical_routing_type=2, fanout_length=5) for mzi in mzis\n",
+    "    ]\n",
     "\n",
     "    mzis = [uc.mzi_heater(delta_length=delta_length) for delta_length in [40]]\n",
     "    mzis_heater_gc = [\n",
@@ -425,7 +397,6 @@
     "    return c\n",
     "\n",
     "\n",
-    "gf.clear_cache()\n",
     "c = EBeam_JoaquinMatres_4()\n",
     "c.show()  # show in klayout\n",
     "c.plot()  # plot in notebook"
@@ -438,20 +409,21 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "@gf.cell\n",
     "def EBeam_JoaquinMatres_5() -> gf.Component:\n",
     "    \"\"\"Ring resonators.\"\"\"\n",
-    "    rings = [uc.ring_single_heater(length_x=length_x) for length_x in [4, 6]]\n",
-    "    rings = [gf.functions.rotate180(ring) for ring in rings]\n",
-    "    rings_gc = [uc.add_fiber_array_pads_rf(ring) for ring in rings]\n",
+    "\n",
+    "    rings = []\n",
+    "    for length_x in [4, 6]:\n",
+    "        ring = uc.ring_single_heater(length_x=length_x)\n",
+    "        ring_gc = uc.add_fiber_array_pads_rf(ring)\n",
+    "        rings.append(ring_gc)\n",
     "\n",
     "    c = gf.Component()\n",
-    "    _ = c << gf.pack(rings_gc, max_size=size, spacing=2)[0]\n",
+    "    _ = c << gf.pack(rings, max_size=size, spacing=2)[0]\n",
     "    _ = c << gf.components.rectangle(size=size, layer=LAYER.FLOORPLAN)\n",
     "    return c\n",
     "\n",
     "\n",
-    "gf.clear_cache()\n",
     "c = EBeam_JoaquinMatres_5()\n",
     "c.show()  # show in klayout\n",
     "c.plot()  # plot in notebook"

docs/notebooks/11_sparameters.ipynb

@@ -17,7 +17,7 @@
    "id": "1",
    "metadata": {},
    "source": [
-"Meep is open source and does not require a license. However, both tidy3d and Lumerical require licenses to use.\n",
+    "Meep is open source and does not require a license. However, both tidy3d and Lumerical require licenses to use.\n",
     "\n",
     "## Tidy3d\n",
     "\n",
@@ -150,7 +150,7 @@
     "    pdk.ebeam_crossing4,\n",
     "]:\n",
     "    component = f()\n",
-    "    component.plot_klayout()\n",
+    "    component.plot()\n",
     "    # ls.write_sparameters_lumerical(component=component)"
    ]
   },

docs/notebooks/11_sparameters_gratings.ipynb

@@ -153,22 +153,6 @@
    "source": [
     "help(gt.write_sparameters_grating_coupler)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "10",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "11",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

docs/notebooks/12_sim_plugins_tidy3d.ipynb

@@ -161,7 +161,7 @@
     "circuit, _ = sax.circuit(\n",
     "    netlist=netlist,\n",
     "    models={\n",
-    "        \"bend_euler_sc\": bend_euler,\n",
+    "        \"bend_euler\": bend_euler,\n",
     "        \"ebeam_y_1550\": ebeam_y_1550,\n",
     "        \"straight\": straight,\n",
     "    },\n",
@@ -208,7 +208,7 @@
     "circuit, _ = sax.circuit(\n",
     "    netlist=netlist,\n",
     "    models={\n",
-    "        \"bend_euler_sc\": bend_euler,\n",
+    "        \"bend_euler\": bend_euler,\n",
     "        \"ebeam_y_1550\": ebeam_y_1550,\n",
     "        \"straight\": straight,\n",
     "    },\n",
@@ -232,22 +232,6 @@
     "plt.grid(True)\n",
     "plt.show()"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "17",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "18",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

docs/notebooks/14_sax_tidy3d.ipynb

@@ -359,7 +359,7 @@
    "outputs": [],
    "source": [
     "netlist = mzi.get_netlist()\n",
-    "pprint(netlist[\"connections\"])"
+    "pprint(netlist[\"nets\"])"
    ]
   },
   {
@@ -631,7 +631,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "mzi_yaml = mzi_component.get_netlist_yaml()\n",
+    "mzi_yaml = mzi_component.get_netlist()\n",
     "mzi_component2 = gf.read.from_yaml(mzi_yaml)\n",
     "fig = mzi_component2.plot()"
    ]
@@ -830,12 +830,6 @@
    "source": [
     "As you can see two couplers have more broadband response"
    ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "53",
-   "metadata": {},
-   "source": []
   }
  ],
  "metadata": {

docs/notebooks/sdl_demo.pic.yml

@@ -26,19 +26,19 @@ placements:
     mirror: null}
 routes:
   r0:
-    routing_strategy: get_bundle
+    routing_strategy: route_bundle
     settings: {cross_section: xs_sc, separation: 5.0}
     links: {'mmi1,o2': 's1,o1'}
   r1:
-    routing_strategy: get_bundle
+    routing_strategy: route_bundle
     settings: {cross_section: xs_sc, separation: 5.0}
     links: {'mmi2,o2': 's1,o2'}
   r2:
-    routing_strategy: get_bundle
+    routing_strategy: route_bundle
     settings: {cross_section: xs_sc, separation: 5.0}
     links: {'mmi1,o3': 's2,o1'}
   r3:
-    routing_strategy: get_bundle
+    routing_strategy: route_bundle
     settings: {cross_section: xs_sc, separation: 5.0}
     links: {'mmi2,o1': 's2,o2'}
 ports: {o1: 'mmi1,o1', o2: 'mmi2,o3', o3: 'mmi2,o4'}

pyproject.toml

@@ -15,8 +15,8 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory~=7.26.1",
-  "gplugins[tidy3d,sax,schematic]>=0.13,<0.14"
+  "gdsfactory~=8.5.1",
+  "gplugins[sax]>=1,<2"
 ]
 description = "ubcpdk pdk"
 keywords = ["python"]

tests/test_components.py

@@ -17,13 +17,16 @@
     "dbg",
     "add_pins_bbox_siepic",
     "add_pads",
+    "add_pads_bot",
+    "add_pads_top",
     "add_pins_bbox_siepic_remove_layers",
     "import_gds",
     "import_gc",
     "mzi",
     "ebeam_adiabatic_tm1550",
     "ebeam_swg_edgecoupler",
     "ebeam_BondPad",
+    "add_fiber_array",
 }
 cell_names = set(cells.keys()) - set(skip_test)
 dirpath_ref = pathlib.Path(__file__).absolute().parent / "ref"
@@ -44,7 +47,3 @@ def test_pdk_settings(
 ) -> None:
     """Avoid regressions when exporting settings."""
     data_regression.check(component.to_dict(with_ports=False))
-
-
-def test_assert_ports_on_grid(component: Component) -> None:
-    component.assert_ports_on_grid()

tests/test_components/test_pdk_settings_add_fiber_array_.yml

@@ -1,28 +1,17 @@
-function: add_fiber_array
 info:
-  length: 1.0
-  route_info_length: 1.0
-  route_info_type: xs_sc
-  route_info_weight: 1.0
-  route_info_xs_sc_length: 1.0
+  length: 1
+  route_info_length: 1
+  route_info_type: xs_34e31a19
+  route_info_weight: 1
+  route_info_xs_34e31a19_length: 1
   width: 0.5
-module: ubcpdk.components
-name: add_fiber_array_add_fiber_array__ubcpdkpcomponents
+name: add_fiber_array_Cstraig_d8738009
 settings:
-  component:
-    function: straight
-  component_name: null
+  component: straight
   cross_section: xs_sc
-  fanout_length: 0.0
+  fanout_length: 0
   gc_port_name: o1
-  get_input_labels_function:
-    function: get_input_labels
-  grating_coupler:
-    function: gc_te1550
-  layer_label:
-  - 10
-  - 0
-  optical_routing_type: 0
-  straight:
-    function: straight
+  grating_coupler: gc_te1550
+  optical_routing_type: 1
+  straight: straight
   with_loopback: false

tests/test_components/test_pdk_settings_add_pads_bot_.yml

@@ -0,0 +1,4 @@
+info:
+  resistance: 0
+name: Unnamed_32
+settings: {}

tests/test_components/test_pdk_settings_add_pads_dc_.yml

@@ -4,9 +4,9 @@ module: gdsfactory.routing.add_electrical_pads_top_dc
 name: ring_single_heater_add_electrical_pads_top_dc_984bbf2d
 settings:
   component: ring_single_heater
-  get_bundle_function:
-    function: get_bundle
-    module: gdsfactory.routing.get_bundle
+  route_bundle_function:
+    function: route_bundle
+    module: gdsfactory.routing.route_bundle
     settings:
       bend:
         function: wire_corner