Merge pull request #567 from gdsfactory/fix_tidy3d_holes_and_update

Fix tidy3d holes and update tidy3d

Author: joamatab

.github/workflows/test_code.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         plugin: [femwell, gmsh, meow, sax, tidy3d, klayout, vlsir]
         os: [ubuntu-latest]
-        python-version: [3.11]
+        python-version: [3.12]
         exclude:
           - plugin: femwell
             os: macos-latest

.gitignore

@@ -12,8 +12,6 @@ gplugins/klayout/layers.lyp
 gplugins/klayout/tech.lyt
 notebooks/luminescent_runs/
 
-uv.lock
-
 # C extensions
 *.csv
 *.npz

gplugins/common/base_models/component.py

@@ -248,14 +248,3 @@ def get_layer_bbox(
     def get_layer_center(self, layername: str) -> tuple[float, float, float]:
         bbox = self.get_layer_bbox(layername)
         return tuple(np.mean(bbox, axis=0))
-
-    def get_vertices(self, layer_name: str, buffer: float = 0.0):
-        poly = self.polygons[layer_name].buffer(buffer, join_style="mitre")
-        match poly:
-            case MultiPolygon():
-                verts = tuple(tuple(p.exterior.coords) for p in poly.geoms)
-            case Polygon():
-                verts = (tuple(poly.exterior.coords),)
-            case _:
-                raise TypeError(f"Invalid polygon type: {type(poly)}")
-        return verts

gplugins/tidy3d/component.py

@@ -27,6 +27,7 @@
 from gdsfactory.pdk import get_layer_stack
 from gdsfactory.technology import LayerStack
 from pydantic import NonNegativeFloat
+from tidy3d.components.geometry.base import from_shapely
 from tidy3d.components.types import Symmetry
 from tidy3d.plugins.smatrix import ComponentModeler, Port
 
@@ -80,28 +81,26 @@ class Tidy3DComponent(LayeredComponentBase):
     reference_plane: Literal["bottom", "middle", "top"] = "middle"
 
     @cached_property
-    def polyslabs(self) -> dict[str, tuple[td.PolySlab, ...]]:
+    def polyslabs(self) -> dict[str, tuple[td.Geometry, ...]]:
         """Returns a dictionary of PolySlab instances for each layer in the component.
 
         Returns:
             dict[str, tuple[td.PolySlab, ...]]: A dictionary mapping layer names to tuples of PolySlab instances.
         """
         slabs = {}
         layers = sort_layers(self.geometry_layers, sort_by="mesh_order", reverse=True)
-
         for name, layer in layers.items():
             bbox = self.get_layer_bbox(name)
-            slabs[name] = tuple(
-                td.PolySlab(
-                    vertices=v,
-                    axis=2,
-                    slab_bounds=(bbox[0][2], bbox[1][2]),
-                    sidewall_angle=np.deg2rad(layer.sidewall_angle),
-                    reference_plane=self.reference_plane,
-                    dilation=self.dilation,
-                )
-                for v in self.get_vertices(name)
+            shape = self.polygons[name].buffer(distance=0.0, join_style="mitre")
+            geom = from_shapely(
+                shape,
+                axis=2,
+                slab_bounds=(bbox[0][2], bbox[1][2]),
+                dilation=self.dilation,
+                sidewall_angle=np.deg2rad(layer.sidewall_angle),
+                reference_plane=self.reference_plane,
             )
+            slabs[name] = geom
 
         return slabs
 
@@ -113,19 +112,14 @@ def structures(self) -> list[td.Structure]:
             list[td.Structure]: A list of Structure instances.
         """
         structures = []
-        for name, polys in self.polyslabs.items():
-            structures.extend(
-                [
-                    td.Structure(
-                        geometry=poly,
-                        medium=self.material_mapping[
-                            self.geometry_layers[name].material
-                        ],
-                        name=f"{name}_{idx}",
-                    )
-                    for idx, poly in enumerate(polys)
-                ]
+        for name, poly in self.polyslabs.items():
+            structure = td.Structure(
+                geometry=poly,
+                medium=self.material_mapping[self.geometry_layers[name].material],
+                name=name,
             )
+            structures.append(structure)
+
         return structures
 
     def get_ports(
@@ -366,24 +360,23 @@ def plot_slice(
         for name, layer in layers.items():
             if name not in self.polyslabs:
                 continue
-            polys = self.polyslabs[name]
-
-            for idx, poly in enumerate(polys):
-                axis, position = poly.parse_xyz_kwargs(x=x, y=y, z=z)
-                xlim, ylim = poly._get_plot_limits(axis=axis, buffer=0)
-                xmin, xmax = min(xmin, xlim[0]), max(xmax, xlim[1])
-                ymin, ymax = min(ymin, ylim[0]), max(ymax, ylim[1])
-                for shape in poly.intersections_plane(x=x, y=y, z=z):
-                    _shape = td.Geometry.evaluate_inf_shape(shape)
-                    patch = td.components.viz.polygon_patch(
-                        _shape,
-                        facecolor=colors[name],
-                        edgecolor="k",
-                        linewidth=0.5,
-                        label=name if idx == 0 else None,
-                        zorder=order_map[layer.mesh_order],
-                    )
-                    ax.add_artist(patch)
+            poly = self.polyslabs[name]
+
+            axis, position = poly.parse_xyz_kwargs(x=x, y=y, z=z)
+            xlim, ylim = poly._get_plot_limits(axis=axis, buffer=0)
+            xmin, xmax = min(xmin, xlim[0]), max(xmax, xlim[1])
+            ymin, ymax = min(ymin, ylim[0]), max(ymax, ylim[1])
+            for idx, shape in enumerate(poly.intersections_plane(x=x, y=y, z=z)):
+                _shape = td.Geometry.evaluate_inf_shape(shape)
+                patch = td.components.viz.polygon_patch(
+                    _shape,
+                    facecolor=colors[name],
+                    edgecolor="k",
+                    linewidth=0.5,
+                    label=name if idx == 0 else None,
+                    zorder=order_map[layer.mesh_order],
+                )
+                ax.add_artist(patch)
 
         size = list(self.size)
         cmin = list(self.bbox[0])
@@ -713,8 +706,8 @@ def write_sparameters_batch(
         center_z="core",
         # plot_simulation_x=10,
         # plot_simulation_layer_name="core",
-        # plot_epsilon=True,
-        filepath="straight2",
+        plot_epsilon=True,
+        # filepath="straight2",
         # plot_mode_port_name="o1",
         # plot_mode_index=1,
         # mode_spec=mode_spec,

gplugins/tidy3d/tests/test_plot_simulation_grating_coupler.py

@@ -8,21 +8,6 @@
 fiber_port_name = "o2"
 
 
-def test_plot_simulation_grating_coupler() -> None:
-    """Checks simulation for a grating_coupler_elliptical_arbitrary in 2D."""
-    c = gf.components.grating_coupler_elliptical_arbitrary(
-        widths=(0.343,) * 25, gaps=(0.345,) * 25
-    )
-    gt.write_sparameters_grating_coupler(
-        component=c,
-        is_3d=False,
-        fiber_angle_deg=20,
-        fiber_xoffset=0,
-        dirpath=PATH.sparameters_repo,
-        run=False,
-    )
-
-
 if __name__ == "__main__":
     c = gf.components.grating_coupler_elliptical_arbitrary(
         widths=(0.343,) * 25, gaps=(0.345,) * 25

pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
   "Operating System :: OS Independent"
 ]
 dependencies = [
-  "gdsfactory>=9.0.0",
+  "gdsfactory>=9.3.5",
   "pint",
   "gdstk",
   "tqdm",
@@ -34,10 +34,9 @@ dev = [
   "pytest",
   "pytest-cov",
   "pytest_regressions",
-  "pyswarms",
-  "autograd"
+  "pyswarms"
 ]
-devsim = ["devsim", "pyvista<=0.43.8", "tidy3d>=2.7.8,<2.8"]
+devsim = ["devsim", "pyvista<=0.43.8", "tidy3d>=2.8.2,<2.9"]
 docs = ["jupytext", "matplotlib", "jupyter-book~=1.0", "pyvista[all]<=0.43.8"]
 femwell = ["femwell~=0.1.11", "meshwell~=1.0.7"]
 gfviz = ["jinja2", "fastapi", "shapely", "natsort"]
@@ -59,9 +58,8 @@ meow = [
   "jax>=0.4.26",
   "jaxlib>=0.4.26",
   "flax>=0.8.2",
-  "meow-sim>=0.11,<0.13",
-  "tidy3d>=2.7.8,<2.8",
-  "scipy<=1.14.1"
+  "meow-sim>=0.12,<0.13",
+  "tidy3d>=2.8.2,<2.9"
 ]
 sax = [
   "jax>=0.4.26",
@@ -73,7 +71,7 @@ sax = [
   "ray"
 ]
 schematic = ["bokeh", "ipywidgets", "natsort"]
-tidy3d = ["tidy3d>=2.7.8,<2.8", "meshio", "numpy", "meshwell~=1.0.7"]
+tidy3d = ["tidy3d>=2.8.2,<2.9", "meshio", "numpy", "meshwell~=1.0.7"]
 vlsir = ["vlsir", "vlsirtools"]
 
 [tool.codespell]
@@ -93,7 +91,7 @@ strict = true
 reportUnusedExpression = false
 
 [tool.pytest.ini_options]
-addopts = '--tb=short'
+addopts = "--assert=plain"
 norecursedirs = [
   "extra/*.py",
   'gplugins/devsim',