Numpy 2.0 support

.github/workflows/pytest.yml

@@ -20,14 +20,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -U \
-          matplotlib \
-          scipy \
-          rectpack \
-          klayout \
-          freetype-py \
-          pytest
-        pip install -e .
+        pip install -e '.[test]'
     - name: Run test
       uses: GabrielBB/xvfb-action@v1
       with:

README.md

@@ -23,8 +23,12 @@ If you found PHIDL useful, please consider citing it in (just one!) of your publ
 
 # Installation / requirements
 - Install or upgrade with `pip install -U phidl`
+- Install with `pip install -U phidl[all]` to include optional dependencies (e.g. freetype-py, klayout, rectpack)
 - Python version >=3.6
 
+## Testing
+- Install with test dependencies with `pip install -U phidl[test]` (includes `all` extras as well)
+- Run tests with `pytest` (or `python -m pytest`)
 
 # About PHIDL
 

phidl/device_layout.py

@@ -354,7 +354,8 @@ def _line_distances(points, start, end):
         return np.linalg.norm(points - start, axis=1)
 
     vec = end - start
-    cross = np.cross(vec, start - points)
+    vec2 = start - points
+    cross = vec[..., 0] * vec2[..., 1] - vec[..., 1] * vec2[..., 0]
     return np.divide(abs(cross), np.linalg.norm(vec))
 
 
@@ -2728,7 +2729,7 @@ def append(self, path):
             and np.issubdtype(np.array(path).dtype, np.number)
             and (np.shape(path)[1] == 2)
         ):
-            points = np.asfarray(path)
+            points = np.asarray(path, dtype=np.float64)
             nx1, ny1 = points[1] - points[0]
             start_angle = np.arctan2(ny1, nx1) / np.pi * 180
             nx2, ny2 = points[-1] - points[-2]

phidl/geometry.py

@@ -943,7 +943,7 @@ def _merge_floating_point_errors(polygons, tol=1e-10):
         Set of corrected polygons.
     """
     if len(polygons) == 0:
-        return np.asfarray([])
+        return np.asarray([], dtype=np.float64)
     stacked_polygons = np.vstack(polygons)
     x = stacked_polygons[:, 0]
     y = stacked_polygons[:, 1]
@@ -1488,7 +1488,7 @@ def _kl_region_to_device(kl_region, layer, name, precision):
     for polygon in kl_region.each():
         polygon = polygon.to_simple_polygon()
         points = _kl_polygon_to_array(polygon)
-        points = np.asfarray(points) * precision
+        points = np.asarray(points, dtype=np.float64) * precision
         D.add_polygon(points, layer=layer)
     return D
 
@@ -2225,7 +2225,7 @@ def import_gds(filename, cellname=None, flatten=False):
                     rotation = 0
                 l = D.add_label(
                     text=label.text,
-                    position=np.asfarray(label.position),
+                    position=np.asarray(label.position, dtype=np.float64),
                     magnification=label.magnification,
                     rotation=rotation * 180 / np.pi,
                     layer=(label.layer, label.texttype),

phidl/path.py

@@ -1,3 +1,5 @@
+import math
+
 import numpy as np
 
 from phidl.device_layout import CrossSection, Path, _rotate_points
@@ -74,8 +76,8 @@ def _fresnel(R0, s, num_pts, n_iter=8):
     y = np.zeros(num_pts)
 
     for n in range(0, n_iter):
-        x += (-1) ** n * t ** (4 * n + 1) / (np.math.factorial(2 * n) * (4 * n + 1))
-        y += (-1) ** n * t ** (4 * n + 3) / (np.math.factorial(2 * n + 1) * (4 * n + 3))
+        x += (-1) ** n * t ** (4 * n + 1) / (math.factorial(2 * n) * (4 * n + 1))
+        y += (-1) ** n * t ** (4 * n + 3) / (math.factorial(2 * n + 1) * (4 * n + 3))
 
     return np.array([np.sqrt(2) * R0 * x, np.sqrt(2) * R0 * y])
 
@@ -142,7 +144,7 @@ def euler(radius=3, angle=90, p=1.0, use_eff=False, num_pts=720):
         dx = xp - Rp * np.sin(p * alpha / 2)
         dy = yp - Rp * (1 - np.cos(p * alpha / 2))
     else:
-        xbend1 = ybend1 = np.asfarray([])
+        xbend1 = ybend1 = np.array([], dtype=np.float64)
         dx = 0
         dy = 0
 
@@ -293,7 +295,7 @@ def spiral(num_turns=5, gap=1, inner_gap=2, num_pts=10000):
 
 
 def _compute_segments(points):
-    points = np.asfarray(points)
+    points = np.asarray(points, dtype=np.float64)
     normals = np.diff(points, axis=0)
     normals = (normals.T / np.linalg.norm(normals, axis=1)).T
     dx = np.diff(points[:, 0])

requirements.txt

@@ -1,4 +1,6 @@
-six
+gdspy
+klayout
 numpy
 matplotlib
-gdspy
+rectpack
+six

ruff.toml

@@ -1,7 +1,7 @@
 line-length = 88
 
 [lint]
-select = ["C", "E", "F", "B", "B9", "UP", "I"]
+select = ["C", "E", "F", "B", "B9", "UP", "I", "NPY201"]
 ignore = [
     "E203",
     "E266",

setup.py

@@ -10,6 +10,10 @@
     "matplotlib",
 ]
 
+extras_require = {}
+extras_require["all"] = ["freetype-py", "klayout", "rectpack", "scipy"]
+extras_require["test"] = extras_require["all"] + ["pytest"]
+
 # read the contents of your README file
 
 this_directory = path.abspath(path.dirname(__file__))
@@ -24,6 +28,7 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     install_requires=install_requires,
+    extras_require=extras_require,
     author="Adam McCaughan",
     author_email="[email protected]",
     packages=["phidl"],

tests/test_geometry.py

@@ -207,8 +207,9 @@ def test_text():
 
 
 def test_truetype():
-    _ = pytest.importorskip(
-        "phidl.font", reason="Testing of ttf/otf fonts requires the freetype package."
+    pytest.importorskip(
+        "phidl.font", reason="Testing of ttf/otf fonts requires the freetype package.",
+        exc_type=ImportError,
     )
     from os import path
 
@@ -229,8 +230,9 @@ def test_truetype():
 
 @pytest.mark.skipif(sys.version_info < (3, 0), reason="unicode test requires python3")
 def test_unicode():
-    _ = pytest.importorskip(
-        "phidl.font", reason="Testing of ttf/otf fonts requires the freetype package."
+    pytest.importorskip(
+        "phidl.font", reason="Testing of ttf/otf fonts requires the freetype package.",
+        exc_type=ImportError,
     )
     from os import path