Merge pull request #86 from gdsfactory/fix_yaml_sample

improve sample

Author: joamatab

Makefile

@@ -7,9 +7,9 @@ test:
 	pytest -s tests/test_sin300.py
 
 test-force:
-	pytest -s tests/test_si220.py --force-regen
-	pytest -s tests/test_si500.py --force-regen
-	pytest -s tests/test_sin300.py --force-regen
+	uv run pytest -s tests/test_si220.py --force-regen
+	uv run pytest -s tests/test_si500.py --force-regen
+	uv run pytest -s tests/test_sin300.py --force-regen
 
 test-fail-fast:
 	pytest -s tests/test_si220.py -x

cspdk/si220/cells/containers.py

@@ -56,7 +56,7 @@ def add_fiber_array_sc(
         routing_method: route_single.
         optical_routing_type: None: auto, 0: no extension, 1: standard, 2: check.
         input_port_indexes: to connect.
-        fiber_spacing: in um.
+        pitch: in um.
         radius: optional radius of the bend. Defaults to the cross_section.
         radius_loopback: optional radius of the loopback bend. Defaults to the cross_section.
         route_backwards: route from component to grating coupler or vice-versa.
@@ -191,7 +191,7 @@ def add_pads_top(
     pad: ComponentSpec = "pad",
     bend: ComponentSpec = "wire_corner",
     straight_separation: float = 15.0,
-    pad_spacing: float | str = "pad_spacing",
+    pad_pitch: float = 100.0,
     taper: ComponentSpec | None = None,
     port_type: str = "electrical",
     allow_width_mismatch: bool = True,
@@ -210,7 +210,7 @@ def add_pads_top(
         pad: pad function.
         bend: bend function.
         straight_separation: from edge to edge.
-        pad_spacing: spacing between pads.
+        pad_pitch: spacing between pads.
         taper: taper function.
         port_type: port type.
         allow_width_mismatch: if True, allows width mismatch.
@@ -244,7 +244,7 @@ def add_pads_top(
         pad=pad,
         bend=bend,
         straight_separation=straight_separation,
-        pad_spacing=pad_spacing,
+        pad_pitch=pad_pitch,
         taper=taper,
         port_type=port_type,
         allow_width_mismatch=allow_width_mismatch,

cspdk/si220/samples/component_from_yaml_sc.py

@@ -2,7 +2,6 @@
 
 sample_pads = """
 name: pads
-pdk: cspdk.si220
 
 instances:
     bl:
@@ -17,39 +16,38 @@
 placements:
     tl:
         x: -200
-        y: 500
+        y: 200
 
     br:
-        x: 400
-        y: 400
+        x: 900
+        y: 500
 
     tr:
-        x: 400
-        y: 600
+        x: 900
+        y: 900
 
 
 routes:
     electrical:
         settings:
             cross_section: metal_routing
             separation: 20
-            width: 10
+            route_width: 5
             end_straight_length: 100
+            radius: 5
         links:
             tl,e3: tr,e1
             bl,e3: br,e1
-    optical:
-        settings:
-            cross_section: xs_sc
-            radius: 100
-        links:
-            bl,e4: br,e3
 
 """
 
 
 if __name__ == "__main__":
     import gdsfactory as gf
 
+    from cspdk.si220 import PDK
+
+    PDK.activate()
+
     c = gf.read.from_yaml(sample_pads)
     c.show()

pyproject.toml

@@ -15,7 +15,7 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory~=8.25.1",
+  "gdsfactory~=8.27.0",
   "gplugins[sax]>=1,<2"
 ]
 description = "CornerStone PDK"
@@ -29,9 +29,11 @@ version = "0.12.0"
 [project.optional-dependencies]
 dev = [
   "pre-commit",
+  "jsondiff",
   "pytest",
   "pytest-cov",
-  "pytest_regressions"
+  "pytest_regressions",
+  "pytest-github-actions-annotate-failures"
 ]
 docs = [
   "jupytext",

tests/test_si220/test_netlists_die_.yml

@@ -991,34 +991,30 @@ ports:
   e7: pad_m2650000_m2250000,e2
   e8: pad_m2350000_m2250000,e2
   e9: pad_m2050000_m2250000,e2
-  o1: grating_coupler_array_G_8c417699_5181975_0,o0
-  o10: grating_coupler_array_G_8c417699_5181975_0,o9
-  o11: grating_coupler_array_G_8c417699_5181975_0,o10
-  o12: grating_coupler_array_G_8c417699_5181975_0,o11
-  o13: grating_coupler_array_G_8c417699_5181975_0,o12
-  o14: grating_coupler_array_G_8c417699_5181975_0,o13
-  o15: grating_coupler_array_G_8c417699_m5181975_0,o0
-  o16: grating_coupler_array_G_8c417699_m5181975_0,o1
-  o17: grating_coupler_array_G_8c417699_m5181975_0,o2
-  o18: grating_coupler_array_G_8c417699_m5181975_0,o3
-  o19: grating_coupler_array_G_8c417699_m5181975_0,o4
-  o2: grating_coupler_array_G_8c417699_5181975_0,o1
-  o20: grating_coupler_array_G_8c417699_m5181975_0,o5
-  o21: grating_coupler_array_G_8c417699_m5181975_0,o6
-  o22: grating_coupler_array_G_8c417699_m5181975_0,o7
-  o23: grating_coupler_array_G_8c417699_m5181975_0,o8
-  o24: grating_coupler_array_G_8c417699_m5181975_0,o9
-  o25: grating_coupler_array_G_8c417699_m5181975_0,o10
-  o26: grating_coupler_array_G_8c417699_m5181975_0,o11
-  o27: grating_coupler_array_G_8c417699_m5181975_0,o12
-  o28: grating_coupler_array_G_8c417699_m5181975_0,o13
-  o3: grating_coupler_array_G_8c417699_5181975_0,o2
-  o4: grating_coupler_array_G_8c417699_5181975_0,o3
-  o5: grating_coupler_array_G_8c417699_5181975_0,o4
-  o6: grating_coupler_array_G_8c417699_5181975_0,o5
-  o7: grating_coupler_array_G_8c417699_5181975_0,o6
-  o8: grating_coupler_array_G_8c417699_5181975_0,o7
-  o9: grating_coupler_array_G_8c417699_5181975_0,o8
+  o1: grating_coupler_array_G_8c417699_5181975_0,o1
+  o10: grating_coupler_array_G_8c417699_5181975_0,o10
+  o11: grating_coupler_array_G_8c417699_5181975_0,o11
+  o12: grating_coupler_array_G_8c417699_5181975_0,o12
+  o13: grating_coupler_array_G_8c417699_m5181975_0,o1
+  o14: grating_coupler_array_G_8c417699_m5181975_0,o2
+  o15: grating_coupler_array_G_8c417699_m5181975_0,o3
+  o16: grating_coupler_array_G_8c417699_m5181975_0,o4
+  o17: grating_coupler_array_G_8c417699_m5181975_0,o5
+  o18: grating_coupler_array_G_8c417699_m5181975_0,o6
+  o19: grating_coupler_array_G_8c417699_m5181975_0,o7
+  o2: grating_coupler_array_G_8c417699_5181975_0,o2
+  o20: grating_coupler_array_G_8c417699_m5181975_0,o8
+  o21: grating_coupler_array_G_8c417699_m5181975_0,o9
+  o22: grating_coupler_array_G_8c417699_m5181975_0,o10
+  o23: grating_coupler_array_G_8c417699_m5181975_0,o11
+  o24: grating_coupler_array_G_8c417699_m5181975_0,o12
+  o3: grating_coupler_array_G_8c417699_5181975_0,o3
+  o4: grating_coupler_array_G_8c417699_5181975_0,o4
+  o5: grating_coupler_array_G_8c417699_5181975_0,o5
+  o6: grating_coupler_array_G_8c417699_5181975_0,o6
+  o7: grating_coupler_array_G_8c417699_5181975_0,o7
+  o8: grating_coupler_array_G_8c417699_5181975_0,o8
+  o9: grating_coupler_array_G_8c417699_5181975_0,o9
 warnings:
   electrical:
     unconnected_ports:

tests/test_si220/test_netlists_die_rc_.yml

@@ -991,34 +991,30 @@ ports:
   e7: pad_m2650000_m2250000,e2
   e8: pad_m2350000_m2250000,e2
   e9: pad_m2050000_m2250000,e2
-  o1: grating_coupler_array_G_17922af5_5149750_0,o0
-  o10: grating_coupler_array_G_17922af5_5149750_0,o9
-  o11: grating_coupler_array_G_17922af5_5149750_0,o10
-  o12: grating_coupler_array_G_17922af5_5149750_0,o11
-  o13: grating_coupler_array_G_17922af5_5149750_0,o12
-  o14: grating_coupler_array_G_17922af5_5149750_0,o13
-  o15: grating_coupler_array_G_17922af5_m5149750_0,o0
-  o16: grating_coupler_array_G_17922af5_m5149750_0,o1
-  o17: grating_coupler_array_G_17922af5_m5149750_0,o2
-  o18: grating_coupler_array_G_17922af5_m5149750_0,o3
-  o19: grating_coupler_array_G_17922af5_m5149750_0,o4
-  o2: grating_coupler_array_G_17922af5_5149750_0,o1
-  o20: grating_coupler_array_G_17922af5_m5149750_0,o5
-  o21: grating_coupler_array_G_17922af5_m5149750_0,o6
-  o22: grating_coupler_array_G_17922af5_m5149750_0,o7
-  o23: grating_coupler_array_G_17922af5_m5149750_0,o8
-  o24: grating_coupler_array_G_17922af5_m5149750_0,o9
-  o25: grating_coupler_array_G_17922af5_m5149750_0,o10
-  o26: grating_coupler_array_G_17922af5_m5149750_0,o11
-  o27: grating_coupler_array_G_17922af5_m5149750_0,o12
-  o28: grating_coupler_array_G_17922af5_m5149750_0,o13
-  o3: grating_coupler_array_G_17922af5_5149750_0,o2
-  o4: grating_coupler_array_G_17922af5_5149750_0,o3
-  o5: grating_coupler_array_G_17922af5_5149750_0,o4
-  o6: grating_coupler_array_G_17922af5_5149750_0,o5
-  o7: grating_coupler_array_G_17922af5_5149750_0,o6
-  o8: grating_coupler_array_G_17922af5_5149750_0,o7
-  o9: grating_coupler_array_G_17922af5_5149750_0,o8
+  o1: grating_coupler_array_G_17922af5_5149750_0,o1
+  o10: grating_coupler_array_G_17922af5_5149750_0,o10
+  o11: grating_coupler_array_G_17922af5_5149750_0,o11
+  o12: grating_coupler_array_G_17922af5_5149750_0,o12
+  o13: grating_coupler_array_G_17922af5_m5149750_0,o1
+  o14: grating_coupler_array_G_17922af5_m5149750_0,o2
+  o15: grating_coupler_array_G_17922af5_m5149750_0,o3
+  o16: grating_coupler_array_G_17922af5_m5149750_0,o4
+  o17: grating_coupler_array_G_17922af5_m5149750_0,o5
+  o18: grating_coupler_array_G_17922af5_m5149750_0,o6
+  o19: grating_coupler_array_G_17922af5_m5149750_0,o7
+  o2: grating_coupler_array_G_17922af5_5149750_0,o2
+  o20: grating_coupler_array_G_17922af5_m5149750_0,o8
+  o21: grating_coupler_array_G_17922af5_m5149750_0,o9
+  o22: grating_coupler_array_G_17922af5_m5149750_0,o10
+  o23: grating_coupler_array_G_17922af5_m5149750_0,o11
+  o24: grating_coupler_array_G_17922af5_m5149750_0,o12
+  o3: grating_coupler_array_G_17922af5_5149750_0,o3
+  o4: grating_coupler_array_G_17922af5_5149750_0,o4
+  o5: grating_coupler_array_G_17922af5_5149750_0,o5
+  o6: grating_coupler_array_G_17922af5_5149750_0,o6
+  o7: grating_coupler_array_G_17922af5_5149750_0,o7
+  o8: grating_coupler_array_G_17922af5_5149750_0,o8
+  o9: grating_coupler_array_G_17922af5_5149750_0,o9
 warnings:
   electrical:
     unconnected_ports:

tests/test_si220/test_netlists_die_ro_.yml

@@ -991,34 +991,30 @@ ports:
   e7: pad_m2650000_m2250000,e2
   e8: pad_m2350000_m2250000,e2
   e9: pad_m2050000_m2250000,e2
-  o1: grating_coupler_array_G_c6cbbf80_5139750_0,o0
-  o10: grating_coupler_array_G_c6cbbf80_5139750_0,o9
-  o11: grating_coupler_array_G_c6cbbf80_5139750_0,o10
-  o12: grating_coupler_array_G_c6cbbf80_5139750_0,o11
-  o13: grating_coupler_array_G_c6cbbf80_5139750_0,o12
-  o14: grating_coupler_array_G_c6cbbf80_5139750_0,o13
-  o15: grating_coupler_array_G_c6cbbf80_m5139750_0,o0
-  o16: grating_coupler_array_G_c6cbbf80_m5139750_0,o1
-  o17: grating_coupler_array_G_c6cbbf80_m5139750_0,o2
-  o18: grating_coupler_array_G_c6cbbf80_m5139750_0,o3
-  o19: grating_coupler_array_G_c6cbbf80_m5139750_0,o4
-  o2: grating_coupler_array_G_c6cbbf80_5139750_0,o1
-  o20: grating_coupler_array_G_c6cbbf80_m5139750_0,o5
-  o21: grating_coupler_array_G_c6cbbf80_m5139750_0,o6
-  o22: grating_coupler_array_G_c6cbbf80_m5139750_0,o7
-  o23: grating_coupler_array_G_c6cbbf80_m5139750_0,o8
-  o24: grating_coupler_array_G_c6cbbf80_m5139750_0,o9
-  o25: grating_coupler_array_G_c6cbbf80_m5139750_0,o10
-  o26: grating_coupler_array_G_c6cbbf80_m5139750_0,o11
-  o27: grating_coupler_array_G_c6cbbf80_m5139750_0,o12
-  o28: grating_coupler_array_G_c6cbbf80_m5139750_0,o13
-  o3: grating_coupler_array_G_c6cbbf80_5139750_0,o2
-  o4: grating_coupler_array_G_c6cbbf80_5139750_0,o3
-  o5: grating_coupler_array_G_c6cbbf80_5139750_0,o4
-  o6: grating_coupler_array_G_c6cbbf80_5139750_0,o5
-  o7: grating_coupler_array_G_c6cbbf80_5139750_0,o6
-  o8: grating_coupler_array_G_c6cbbf80_5139750_0,o7
-  o9: grating_coupler_array_G_c6cbbf80_5139750_0,o8
+  o1: grating_coupler_array_G_c6cbbf80_5139750_0,o1
+  o10: grating_coupler_array_G_c6cbbf80_5139750_0,o10
+  o11: grating_coupler_array_G_c6cbbf80_5139750_0,o11
+  o12: grating_coupler_array_G_c6cbbf80_5139750_0,o12
+  o13: grating_coupler_array_G_c6cbbf80_m5139750_0,o1
+  o14: grating_coupler_array_G_c6cbbf80_m5139750_0,o2
+  o15: grating_coupler_array_G_c6cbbf80_m5139750_0,o3
+  o16: grating_coupler_array_G_c6cbbf80_m5139750_0,o4
+  o17: grating_coupler_array_G_c6cbbf80_m5139750_0,o5
+  o18: grating_coupler_array_G_c6cbbf80_m5139750_0,o6
+  o19: grating_coupler_array_G_c6cbbf80_m5139750_0,o7
+  o2: grating_coupler_array_G_c6cbbf80_5139750_0,o2
+  o20: grating_coupler_array_G_c6cbbf80_m5139750_0,o8
+  o21: grating_coupler_array_G_c6cbbf80_m5139750_0,o9
+  o22: grating_coupler_array_G_c6cbbf80_m5139750_0,o10
+  o23: grating_coupler_array_G_c6cbbf80_m5139750_0,o11
+  o24: grating_coupler_array_G_c6cbbf80_m5139750_0,o12
+  o3: grating_coupler_array_G_c6cbbf80_5139750_0,o3
+  o4: grating_coupler_array_G_c6cbbf80_5139750_0,o4
+  o5: grating_coupler_array_G_c6cbbf80_5139750_0,o5
+  o6: grating_coupler_array_G_c6cbbf80_5139750_0,o6
+  o7: grating_coupler_array_G_c6cbbf80_5139750_0,o7
+  o8: grating_coupler_array_G_c6cbbf80_5139750_0,o8
+  o9: grating_coupler_array_G_c6cbbf80_5139750_0,o9
 warnings:
   electrical:
     unconnected_ports:

tests/test_si220/test_netlists_die_sc_.yml

@@ -991,34 +991,30 @@ ports:
   e7: pad_m2650000_m2250000,e2
   e8: pad_m2350000_m2250000,e2
   e9: pad_m2050000_m2250000,e2
-  o1: grating_coupler_array_G_8c417699_5181975_0,o0
-  o10: grating_coupler_array_G_8c417699_5181975_0,o9
-  o11: grating_coupler_array_G_8c417699_5181975_0,o10
-  o12: grating_coupler_array_G_8c417699_5181975_0,o11
-  o13: grating_coupler_array_G_8c417699_5181975_0,o12
-  o14: grating_coupler_array_G_8c417699_5181975_0,o13
-  o15: grating_coupler_array_G_8c417699_m5181975_0,o0
-  o16: grating_coupler_array_G_8c417699_m5181975_0,o1
-  o17: grating_coupler_array_G_8c417699_m5181975_0,o2
-  o18: grating_coupler_array_G_8c417699_m5181975_0,o3
-  o19: grating_coupler_array_G_8c417699_m5181975_0,o4
-  o2: grating_coupler_array_G_8c417699_5181975_0,o1
-  o20: grating_coupler_array_G_8c417699_m5181975_0,o5
-  o21: grating_coupler_array_G_8c417699_m5181975_0,o6
-  o22: grating_coupler_array_G_8c417699_m5181975_0,o7
-  o23: grating_coupler_array_G_8c417699_m5181975_0,o8
-  o24: grating_coupler_array_G_8c417699_m5181975_0,o9
-  o25: grating_coupler_array_G_8c417699_m5181975_0,o10
-  o26: grating_coupler_array_G_8c417699_m5181975_0,o11
-  o27: grating_coupler_array_G_8c417699_m5181975_0,o12
-  o28: grating_coupler_array_G_8c417699_m5181975_0,o13
-  o3: grating_coupler_array_G_8c417699_5181975_0,o2
-  o4: grating_coupler_array_G_8c417699_5181975_0,o3
-  o5: grating_coupler_array_G_8c417699_5181975_0,o4
-  o6: grating_coupler_array_G_8c417699_5181975_0,o5
-  o7: grating_coupler_array_G_8c417699_5181975_0,o6
-  o8: grating_coupler_array_G_8c417699_5181975_0,o7
-  o9: grating_coupler_array_G_8c417699_5181975_0,o8
+  o1: grating_coupler_array_G_8c417699_5181975_0,o1
+  o10: grating_coupler_array_G_8c417699_5181975_0,o10
+  o11: grating_coupler_array_G_8c417699_5181975_0,o11
+  o12: grating_coupler_array_G_8c417699_5181975_0,o12
+  o13: grating_coupler_array_G_8c417699_m5181975_0,o1
+  o14: grating_coupler_array_G_8c417699_m5181975_0,o2
+  o15: grating_coupler_array_G_8c417699_m5181975_0,o3
+  o16: grating_coupler_array_G_8c417699_m5181975_0,o4
+  o17: grating_coupler_array_G_8c417699_m5181975_0,o5
+  o18: grating_coupler_array_G_8c417699_m5181975_0,o6
+  o19: grating_coupler_array_G_8c417699_m5181975_0,o7
+  o2: grating_coupler_array_G_8c417699_5181975_0,o2
+  o20: grating_coupler_array_G_8c417699_m5181975_0,o8
+  o21: grating_coupler_array_G_8c417699_m5181975_0,o9
+  o22: grating_coupler_array_G_8c417699_m5181975_0,o10
+  o23: grating_coupler_array_G_8c417699_m5181975_0,o11
+  o24: grating_coupler_array_G_8c417699_m5181975_0,o12
+  o3: grating_coupler_array_G_8c417699_5181975_0,o3
+  o4: grating_coupler_array_G_8c417699_5181975_0,o4
+  o5: grating_coupler_array_G_8c417699_5181975_0,o5
+  o6: grating_coupler_array_G_8c417699_5181975_0,o6
+  o7: grating_coupler_array_G_8c417699_5181975_0,o7
+  o8: grating_coupler_array_G_8c417699_5181975_0,o8
+  o9: grating_coupler_array_G_8c417699_5181975_0,o9
 warnings:
   electrical:
     unconnected_ports: