Add scipy to 'all' extra, fix deprecation of np.cross for 2D vectors

amccaugh · Jun 10, 2024 · 71b1384 · 71b1384
1 parent 593a870
commit 71b1384
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/phidl/device_layout.py b/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))
 
 

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 ]
 
 extras_require = {}
-extras_require["all"] = ["freetype-py", "klayout", "rectpack"]
+extras_require["all"] = ["freetype-py", "klayout", "rectpack", "scipy"]
 extras_require["test"] = extras_require["all"] + ["pytest"]
 
 # read the contents of your README file