gplugins 1.1.2__tar.gz → 1.1.3__tar.gz

{gplugins-1.1.2 → gplugins-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: gplugins
-Version: 1.1.2
+Version: 1.1.3
 Summary: gdsfactory plugins
 Keywords: python
 Author-email: gdsfactory <contact@gdsfactory.com>
@@ -14,6 +14,7 @@ Requires-Dist: gdsfactory>=8.5.3
 Requires-Dist: pint
 Requires-Dist: gdstk
 Requires-Dist: tqdm
+Requires-Dist: numpy<3
 Requires-Dist: dagster ; extra == "dagster"
 Requires-Dist: dagit ; extra == "dagster"
 Requires-Dist: pre-commit ; extra == "dev"
@@ -34,7 +35,7 @@ Requires-Dist: tidy3d>=2.5.2,<2.8 ; extra == "devsim"
 Requires-Dist: jupytext ; extra == "docs"
 Requires-Dist: matplotlib ; extra == "docs"
 Requires-Dist: jupyter-book~=1.0 ; extra == "docs"
-Requires-Dist: pyvista[all,trame]<=0.43.8 ; extra == "docs"
+Requires-Dist: pyvista[all, trame]<=0.43.8 ; extra == "docs"
 Requires-Dist: femwell~=0.1.11 ; extra == "femwell"
 Requires-Dist: meshwell~=1.0.7 ; extra == "femwell"
 Requires-Dist: jinja2 ; extra == "gfviz"
@@ -60,7 +61,7 @@ Requires-Dist: tidy3d>=2.5.2,<2.8 ; extra == "meow"
 Requires-Dist: jax>=0.4.26 ; extra == "sax"
 Requires-Dist: jaxlib>=0.4.26 ; extra == "sax"
 Requires-Dist: flax>=0.8.2 ; extra == "sax"
-Requires-Dist: sax~=0.13.1 ; extra == "sax"
+Requires-Dist: sax>=0.13.1,<0.15.0 ; extra == "sax"
 Requires-Dist: scikit-learn ; extra == "sax"
 Requires-Dist: pyvis<=0.3.1 ; extra == "sax"
 Requires-Dist: bokeh ; extra == "schematic"
@@ -85,7 +86,7 @@ Provides-Extra: schematic
 Provides-Extra: tidy3d
 Provides-Extra: vlsir
 
-# gplugins 1.1.2
+# gplugins 1.1.3
 
 [![docs](https://github.com/gdsfactory/gplugins/actions/workflows/pages.yml/badge.svg)](https://gdsfactory.github.io/gplugins/)
 [![PyPI](https://img.shields.io/pypi/v/gplugins)](https://pypi.org/project/gplugins/)

{gplugins-1.1.2 → gplugins-1.1.3}/README.md

@@ -1,4 +1,4 @@
-# gplugins 1.1.2
+# gplugins 1.1.3
 
 [![docs](https://github.com/gdsfactory/gplugins/actions/workflows/pages.yml/badge.svg)](https://gdsfactory.github.io/gplugins/)
 [![PyPI](https://img.shields.io/pypi/v/gplugins)](https://pypi.org/project/gplugins/)

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/__init__.py

@@ -1,6 +1,6 @@
 """gplugins - gdsfactory plugins"""
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 
 import pathlib
 

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/common/utils/get_component_with_net_layers.py

@@ -1,7 +1,7 @@
 import copy
 
 import gdsfactory as gf
-import gdstk
+from gdsfactory.technology import LogicalLayer
 from gdsfactory.typings import Component, LayerStack
 
 
@@ -56,9 +56,9 @@ def get_component_with_net_layers(
         add_to_layerstack: True by default, but can be set to False to disable parsing of the layerstack.
     """
 
-    return NotImplementedError(
-        "Meshing component with net layers not implemented in gdsfactory8 yet."
-    )
+    # return NotImplementedError(
+    #     "Meshing component with net layers not implemented in gdsfactory8 yet."
+    # )
 
     # Initialize returned component
     net_component = component.copy()
@@ -67,17 +67,23 @@ def get_component_with_net_layers(
     for i, portname in enumerate(port_names):
         port = component.ports[portname]
         # Get original port layer polygons, and modify a new component without that layer
-        polygons = net_component.extract(layers=[port.layer]).get_polygons()
-        net_component = net_component.remove_layers(layers=[port.layer])
+        polygons = (
+            net_component.extract(layers=(port.layer,))
+            .get_polygons()
+            .get(port.layer, [])
+        )
+        net_component = net_component.remove_layers(layers=(port.layer,))
         for polygon in polygons:
             # If polygon belongs to port, create a unique new layer, and add the polygon to it
-
-            if gdstk.inside(
-                [port.center],
-                gdstk.offset(gdstk.Polygon(polygon), gf.get_active_pdk().grid_size),
-            )[0]:
+            if polygon.sized(3 * gf.kcl.dbu).inside(port.center):
+                # if gdstk.inside(
+                #     [port.center],
+                #     gdstk.offset(gdstk.Polygon(polygon), gf.get_active_pdk().grid_size),
+                # )[0]:
                 try:
-                    port_layernames = layer_stack.get_layer_to_layername()[port.layer]
+                    port_layernames = layer_stack.get_layer_to_layername()[
+                        LogicalLayer(layer=port.layer)
+                    ]
                 except KeyError as e:
                     raise KeyError(
                         "Make sure your `layer_stack` contains all layers with ports"
@@ -89,10 +95,13 @@ def get_component_with_net_layers(
                     )
                     if add_to_layerstack:
                         new_layer = copy.deepcopy(layer_stack.layers[old_layername])
-                        new_layer.layer = (
-                            new_layers_init[0] + i,
-                            new_layers_init[1] + j,
+                        new_layer.layer = LogicalLayer(
+                            layer=(
+                                new_layers_init[0] + i,
+                                new_layers_init[1] + j,
+                            )
                         )
+                        new_layer.name = f"{old_layername}{delimiter}{portname}"
                         layer_stack.layers[f"{old_layername}{delimiter}{portname}"] = (
                             new_layer
                         )

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/gmeep/get_meep_geometry.py

@@ -44,12 +44,15 @@ def get_meep_geometry_from_component(
     layer_to_polygons = component_with_booleans.get_polygons_points()
 
     ordered_layer_stack_keys = order_layer_stack(layer_stack)[::-1]
+
     for layername in ordered_layer_stack_keys:
         layer = layer_stack.layers[layername].layer
 
         if layer not in layer_to_polygons:
             continue
         polygons = layer_to_polygons[layer]
+        print(f"layer: {layer}, polygons: {polygons}")
+
         if layer in layer_to_thickness and layer in layer_to_material:
             height = layer_to_thickness[layer] if is_3d else mp.inf
             zmin_um = layer_to_zmin[layer] if is_3d else 0

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/gmeep/get_simulation.py

@@ -270,7 +270,7 @@ def get_simulation(
 
     # Add port monitors dict
     monitors = {}
-    for port in component_ref:
+    for port in component_ref.ports:
         port_name = port.name
         angle_rad = np.radians(port.orientation)
         width = port.width + 2 * port_margin

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/gmeep/meep_adjoint_optimization.py

@@ -137,7 +137,7 @@ def get_meep_adjoint_optimizer(
         for monitor in monitors.values()
     ]
 
-    c = component.copy()
+    c = component.dup()
     for design_region, design_variable in zip(design_regions, design_variables):
         sim.geometry.append(
             Block(design_region.size, design_region.center, material=design_variable)

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/gmsh/parse_gds.py

@@ -24,7 +24,6 @@ def round_coordinates(geom, ndigits=4):
 
 def fuse_polygons(component, layer, round_tol=4, simplify_tol=1e-4, offset_tol=None):
     """Take all polygons from a layer, and returns a single (Multi)Polygon shapely object."""
-
     layer_region = layer.get_shapes(component)
 
     # Convert polygons to shapely
@@ -37,7 +36,7 @@ def fuse_polygons(component, layer, round_tol=4, simplify_tol=1e-4, offset_tol=N
             exterior_points.append((point.x / 1000, point.y / 1000))
         for hole_index in range(klayout_polygon.holes()):
             holes_points = []
-            for point in layer_region.each_polygon_hole(hole_index):
+            for point in klayout_polygon.each_point_hole(hole_index):
                 holes_points.append((point.x / 1000, point.y / 1000))
             interior_points.append(holes_points)
 

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/lumerical/write_sparameters_lumerical.py

@@ -241,7 +241,6 @@ def write_sparameters_lumerical(
     component_extended_beyond_pml = gf.components.extension.extend_ports(
         component=component_extended, length=ss.port_extension
     )
-    component_extended_beyond_pml.name = "top"
     gdspath = component_extended_beyond_pml.write_gds()
 
     filepath_npz = get_sparameters_path(
@@ -270,17 +269,17 @@ def write_sparameters_lumerical(
 
     layers_thickness = [
         layer_to_thickness[layer]
-        for layer in component_with_booleans.get_layers()
+        for layer in component_with_booleans.layers
         if layer in layer_to_thickness
     ]
     if not layers_thickness:
         raise ValueError(
-            f"no layers for component {component.get_layers()}"
+            f"no layers for component {component.layers}"
             f"in layer stack {layer_stack}"
         )
     layers_zmin = [
         layer_to_zmin[layer]
-        for layer in component_with_booleans.get_layers()
+        for layer in component_with_booleans.layers
         if layer in layer_to_zmin
     ]
     component_thickness = max(layers_thickness)
@@ -357,7 +356,7 @@ def write_sparameters_lumerical(
         simulation_time=ss.simulation_time,
         simulation_temperature=ss.simulation_temperature,
     )
-    component_layers = component_with_booleans.get_layers()
+    component_layers = component_with_booleans.layers
 
     for layer, thickness in layer_to_thickness.items():
         if layer not in component_layers:
@@ -410,21 +409,21 @@ def write_sparameters_lumerical(
             direction = "Backward"
             injection_axis = "x-axis"
             dxp = 0
-            dyp = 2 * ss.port_margin + port.width
+            dyp = 2 * ss.port_margin + port.dwidth
         elif 45 < deg < 90 + 45:
             direction = "Backward"
             injection_axis = "y-axis"
-            dxp = 2 * ss.port_margin + port.width
+            dxp = 2 * ss.port_margin + port.dwidth
             dyp = 0
         elif 90 + 45 < deg < 180 + 45:
             direction = "Forward"
             injection_axis = "x-axis"
             dxp = 0
-            dyp = 2 * ss.port_margin + port.width
+            dyp = 2 * ss.port_margin + port.dwidth
         elif 180 + 45 < deg < 180 + 45 + 90:
             direction = "Forward"
             injection_axis = "y-axis"
-            dxp = 2 * ss.port_margin + port.width
+            dxp = 2 * ss.port_margin + port.dwidth
             dyp = 0
 
         else:
@@ -545,9 +544,8 @@ def _sample_convergence_wavelength():
 
 
 if __name__ == "__main__":
-    import lumapi
-
-    s = lumapi.FDTD()
+    # import lumapi
+    # s = lumapi.FDTD()
 
     # component = gf.components.straight(length=2.5)
     component = gf.components.mmi1x2()
@@ -557,7 +555,7 @@ if __name__ == "__main__":
         component=component,
         material_name_to_lumerical=material_name_to_lumerical,
         run=False,
-        session=s,
+        # session=s,
     )
     # c = gf.components.coupler_ring(length_x=3)
     # c = gf.components.mmi1x2()

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/path_length_analysis/path_length_analysis_from_gds.py

@@ -8,6 +8,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 import shapely as sh
 import shapely.ops as ops
+from gdsfactory import logger
 from gdsfactory.typings import List, Optional, Tuple
 from klayout.db import DPoint, Polygon
 from scipy.signal import savgol_filter
@@ -89,8 +90,8 @@ def centerline_single_poly_2_ports(poly, under_sampling, port_list) -> np.ndarra
     mid_point_found = _check_midpoint_found(inner_points, outer_points, port_list)
 
     # ==== This is for debugging, keep until this is stable ====
-    # print(len(outer_points))
-    # print(len(inner_points))
+    # logger.debug(len(outer_points))
+    # logger.debug(len(inner_points))
     # input()
 
     # Relatively simple check to make sure that the first half is the outer curve and the
@@ -133,7 +134,7 @@ def centerline_single_poly_2_ports(poly, under_sampling, port_list) -> np.ndarra
         if n_rolls > points.shape[0] and n_fixes_tried < 10 and not mid_point_found:
             # Sometimes it is enough if we make the inner point be +-n elements longer
             n_fixes_tried += 1
-            # print(f"Trying fix {n_fixes_tried}")
+            # logger.debug(f"Trying fix {n_fixes_tried}")
             n_rolls = 0
 
             outer_points = points[: (mid_index + fix_values[n_fixes_tried]), :]
@@ -154,7 +155,7 @@ def centerline_single_poly_2_ports(poly, under_sampling, port_list) -> np.ndarra
 
         elif n_rolls > points.shape[0] and not mid_point_found:
             # We could not find the right inner and outer points
-            print("We could not find the center line correctly")
+            logger.error(f"We could not find the center line correctly for {port_list}")
             mid_point_found = True
             outer_points = points[:mid_index]
             inner_points = points[mid_index:]
@@ -166,18 +167,29 @@ def centerline_single_poly_2_ports(poly, under_sampling, port_list) -> np.ndarra
     inds = np.argsort(outer_points[:, 0])
     outer_points = outer_points[inds, :]
 
-    # Apply undersampling if necessary
-    inner_points = np.append(
-        inner_points[::under_sampling], np.array([inner_points[-1]]), axis=0
-    )
-    outer_points = np.append(
-        outer_points[::under_sampling], np.array([outer_points[-1]]), axis=0
-    )
+    # # (OLD, keep juts in case for now) Apply undersampling if necessary
+    # inner_points = np.append(
+    #     inner_points[::under_sampling], np.array([inner_points[-1]]), axis=0
+    # )
+    # outer_points = np.append(
+    #     outer_points[::under_sampling], np.array([outer_points[-1]]), axis=0
+    # )
+
+    # Apply undersampling if necessary, and add the last point if it is not there
+    last_inner_pt = inner_points[-1]
+    inner_points = inner_points[::under_sampling]
+    if last_inner_pt not in inner_points:
+        inner_points = np.append(inner_points, np.array([last_inner_pt]), axis=0)
+
+    last_outer_pt = outer_points[-1]
+    outer_points = outer_points[::under_sampling]
+    if last_outer_pt not in outer_points:
+        outer_points = np.append(outer_points, np.array([last_outer_pt]), axis=0)
 
     # There is a chance that the length of inner and outer is different
     # Interpolate if that's the case
     if inner_points.shape[0] != outer_points.shape[0]:
-        # print('interpolating')
+        # logger.debug('interpolating')
         if inner_points.shape[0] > outer_points.shape[0]:
             # More points in inner
             outer_pts_x = outer_points[:, 0]
@@ -318,9 +330,13 @@ def extract_paths(
 
         if n_ports == 2:
             # This is the simplest case - a straight or a bend
-            centerline = centerline_single_poly_2_ports(
-                poly, under_sampling, consider_ports
-            )
+
+            if poly[0].is_box():  # only 4 points, no undersampling
+                centerline = centerline_single_poly_2_ports(poly, 1, consider_ports)
+            else:
+                centerline = centerline_single_poly_2_ports(
+                    poly, under_sampling, consider_ports
+                )
             if filter_function is not None:
                 centerline = filter_function(centerline)
             p = gf.Path(centerline)
@@ -652,10 +668,10 @@ def _demo_routes():
 if __name__ == "__main__":
     # c0 = gf.components.bend_euler(npoints=20)
     # c0 = gf.components.bend_euler(cross_section="xs_sc", with_arc_floorplan=True)
-    # c0 = gf.components.bend_circular()
+    c0 = gf.components.bend_circular()
     # c0 = gf.components.bend_s(npoints=50)
     # c0 = gf.components.mmi2x2()
-    c0 = gf.components.coupler()
+    # c0 = gf.components.coupler()
     ev_coupling = True
     # c0 = _demo_routes()
     # ev_coupling = False
@@ -672,7 +688,7 @@ if __name__ == "__main__":
         under_sampling=1,
         evanescent_coupling=ev_coupling,
         # consider_ports=["o2", "o3"],
-        port_positions=[(-10.0, -1.6), (30.0, -1.6)],
+        # port_positions=[(-10.0, -1.6), (30.0, -1.6)],
     )
     r_and_l_dict = get_min_radius_and_length_path_dict(path_dict)
     for ports, (min_radius, length) in r_and_l_dict.items():

{gplugins-1.1.2 → gplugins-1.1.3}/gplugins/sentaurus/sprocess.py

@@ -1,3 +1,4 @@
+import importlib
 import math
 import pathlib
 from pathlib import Path
@@ -15,7 +16,10 @@ from gdsfactory.technology.processes import (
 from gdsfactory.typings import Dict, Tuple
 
 from gplugins.gmsh.parse_gds import cleanup_component_layermap
-from gplugins.sentaurus.mask import get_sentaurus_mask_2D, get_sentaurus_mask_3D
+from gplugins.sentaurus.mask_sprocess import (
+    get_sentaurus_mask_2D,
+    get_sentaurus_mask_3D,
+)
 
 DEFAULT_INIT_LINES = """AdvancedCalibration
 mgoals accuracy=2e-5
@@ -212,6 +216,12 @@ def write_sprocess(
         num_threads (int): for parallelization
     """
 
+    gf_version = importlib.metadata.version("gdsfactory")
+    if int(gf_version.split(".")[0]) >= 8:
+        raise ImportError(
+            "The Sentaurus Process plugin is not compatible with gdsfactory version 8 or above."
+        )
+
     save_directory = (
         Path("./sprocess/") if save_directory is None else Path(save_directory)
     )

{gplugins-1.1.2 → gplugins-1.1.3}/pyproject.toml

@@ -26,7 +26,8 @@ dependencies = [
   "gdsfactory>=8.5.3",
   "pint",
   "gdstk",
-  "tqdm"
+  "tqdm",
+  "numpy<3"
 ]
 description = "gdsfactory plugins"
 keywords = ["python"]
@@ -34,7 +35,7 @@ license = {file = "LICENSE"}
 name = "gplugins"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.1.2"
+version = "1.1.3"
 
 [project.optional-dependencies]
 dagster = ["dagster", "dagit"]
@@ -99,7 +100,7 @@ sax = [
   "jax>=0.4.26",
   "jaxlib>=0.4.26",
   "flax>=0.8.2",
-  "sax~=0.13.1",
+  "sax>=0.13.1,<0.15.0",
   "scikit-learn",
   "pyvis<=0.3.1"
 ]
@@ -123,7 +124,7 @@ ignore-words-list = 'te, te/tm, te, ba, fpr, fpr_spacing, ro, nd, donot, schem,
 skip = 'notebooks/palace_02_fullwave.ipynb'
 
 [tool.mypy]
-python_version = "3.10"
+python_version = "3.11"
 strict = true
 
 [tool.pylsp-mypy]
@@ -210,7 +211,7 @@ message_template = "Bump to {new_version}"
 tag_template = "v{new_version}"
 
 [tool.tbump.version]
-current = "1.1.2"
+current = "1.1.3"
 regex = '''
   (?P<major>\d+)
   \.