Move libpdalpython.Pipeline.get_meshio to pure Python Pipeline

Author: gsakkis

.github/workflows/build.yml

@@ -38,7 +38,7 @@ jobs:
 
     - name: Dependencies
       shell: bash -l {0}
-      run: mamba install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} cython pdal pytest
+      run: mamba install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} cython pdal pytest meshio
 
     - name: Install
       shell: bash -l {0}
@@ -78,7 +78,7 @@ jobs:
       shell: cmd /C CALL "{0}"
       run: |
         call conda activate test
-        conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} cython pdal pytest
+        conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} cython pdal pytest meshio
 
     - name: Install
       shell: cmd /C CALL "{0}"
@@ -121,7 +121,7 @@ jobs:
 
     - name: Dependencies
       shell: bash -l {0}
-      run: mamba install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} cython pdal pytest
+      run: mamba install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} cython pdal
 
     - name: sdist
       shell: bash -l {0}

pdal/libpdalpython.pyx

@@ -12,7 +12,6 @@ from libcpp.set cimport set as cpp_set
 from libcpp.string cimport string
 from libcpp.vector cimport vector
 
-import numpy as np
 cimport numpy as np
 np.import_array()
 
@@ -192,23 +191,6 @@ cdef class Pipeline:
             Py_DECREF(output[-1])
         return output
 
-    def get_meshio(self, idx):
-        try:
-            from meshio import Mesh
-        except ModuleNotFoundError:
-            raise RuntimeError(
-                "The get_meshio function can only be used if you have installed meshio. "
-                "Try pip install meshio"
-            )
-        array = self.arrays[idx]
-        mesh = self.meshes[idx]
-        if len(mesh) == 0:
-            return None
-        return Mesh(
-            np.stack((array["X"], array["Y"], array["Z"]), 1),
-            [("triangle", np.stack((mesh["A"], mesh["B"], mesh["C"]), 1))],
-        )
-
     #========= validation & execution methods ============================================
 
     def validate(self):

pdal/pipeline.py

@@ -6,6 +6,10 @@
 from typing import Any, Container, Dict, Iterator, List, Optional, Sequence, Union, cast
 
 import numpy as np
+try:
+    from meshio import Mesh
+except ModuleNotFoundError:
+    Mesh = None
 
 from . import libpdalpython
 
@@ -75,6 +79,21 @@ def __copy__(self) -> Pipeline:
         clone |= self
         return clone
 
+    def get_meshio(self, idx: int) -> Mesh:
+        if Mesh is None:
+            raise RuntimeError(
+                "The get_meshio function can only be used if you have installed meshio. "
+                "Try pip install meshio"
+            )
+        array = self.arrays[idx]
+        mesh = self.meshes[idx]
+        if len(mesh) == 0:
+            return None
+        return Mesh(
+            np.stack((array["X"], array["Y"], array["Z"]), 1),
+            [("triangle", np.stack((mesh["A"], mesh["B"], mesh["C"]), 1))],
+        )
+
     @property
     def _json(self) -> str:
         options_list = []

test/test_pipeline.py

@@ -324,3 +324,12 @@ def test_mesh(self, filename):
         assert str(m.dtype) == "[('A', '<u4'), ('B', '<u4'), ('C', '<u4')]"
         assert len(m) == 134
         assert m[0][0] == 29
+
+    @pytest.mark.parametrize("filename", ["mesh.json", "mesh.py"])
+    def test_meshio(self, filename):
+        r = get_pipeline(filename)
+        r.execute()
+        mesh = r.get_meshio(0)
+        triangles = mesh.cells_dict["triangle"]
+        assert len(triangles) == 134
+        assert triangles[0][0] == 29