Misc tweaks

Author: gsakkis

.github/workflows/build.yml

@@ -43,19 +43,17 @@ jobs:
     - name: Install
       shell: bash -l {0}
       run: |
-        python setup.py install -- -G "Ninja" -DWITH_TESTS=ON
+        python setup.py develop -- -G "Ninja" -DWITH_TESTS=ON
         pdal --drivers
 
     - name: Test
       shell: bash -l {0}
       run: |
-        pip install  -e .
         SKPATH=$(python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())")/cmake-build
         export PDAL_DRIVER_PATH=$SKPATH
-        ls $SKPATH
         $SKPATH/pdal_filters_python_test
         $SKPATH/pdal_io_numpy_test
-        py.test
+        py.test -v
 
   windows:
     name: ${{ matrix.os }} - ${{ matrix.python-version }}
@@ -84,21 +82,19 @@ jobs:
       shell: cmd /C CALL "{0}"
       run: |
         call conda activate test
-        where python
         python setup.py develop -- -G "Ninja" -DWITH_TESTS=ON
+        pdal --drivers
 
     - name: Test
       shell: cmd /C CALL "{0}"
       run: |
         call conda activate test
         set PYTHONHOME=%CONDA_PREFIX%
-        py.test
         for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i
         set PDAL_DRIVER_PATH=%SKPATH%\cmake-build
         %SKPATH%\cmake-build\pdal_filters_python_test.exe
         %SKPATH%\cmake-build\pdal_io_numpy_test.exe
-        pdal --version
-        pdal --drivers
+        py.test -v
 
   dist:
     name: Distribution

pdal/CMakeLists.txt

@@ -1,24 +1,10 @@
-set(EXTENSION_SRC
-    PyArray.cpp
-    PyArray.hpp
-    PyDimension.hpp
-    PyPipeline.cpp
-    PyPipeline.hpp)
+set(EXTENSION_SRC PyArray.cpp PyPipeline.cpp)
 
 set(extension "libpdalpython")
 add_cython_target(${extension} "libpdalpython.pyx" CXX PY3)
-
 add_library(${extension} MODULE ${EXTENSION_SRC} libpdalpython)
-target_include_directories( ${extension}
-    PRIVATE
-    .
-    ${PDAL_INCLUDE_DIRS}
-    ${Python3_INCLUDE_DIRS}
-    ${Python3_NumPy_INCLUDE_DIRS})
-
+target_include_directories(${extension} PRIVATE . ${Python3_NumPy_INCLUDE_DIRS})
 target_link_libraries(${extension} ${PDAL_LIBRARIES})
 python_extension_module(${extension})
 
 install(TARGETS ${extension} LIBRARY DESTINATION "pdal")
-
-

pdal/__init__.py

@@ -1,12 +1,12 @@
 __version__ = "2.4.2"
 __all__ = ["Pipeline", "Stage", "Reader", "Filter", "Writer", "dimensions", "info"]
 
+from . import libpdalpython
 from .drivers import inject_pdal_drivers
-from .libpdalpython import getDimensions, getInfo
 from .pipeline import Filter, Pipeline, Reader, Stage, Writer
 
 inject_pdal_drivers()
-dimensions = getDimensions()
-info = getInfo()
+dimensions = libpdalpython.getDimensions()
+info = libpdalpython.getInfo()
 
-del inject_pdal_drivers, getDimensions, getInfo
+del inject_pdal_drivers, libpdalpython

pdal/libpdalpython.pyx

@@ -119,14 +119,6 @@ cdef class Pipeline:
     cdef vector[shared_ptr[Array]] _inputs
     cdef int _loglevel
 
-    def __dealloc__(self):
-        self.inputs = []
-
-    def __copy__(self):
-        cdef Pipeline clone = self.__class__()
-        clone._inputs = self._inputs
-        return clone
-
     def execute(self):
         return self._get_executor().execute()
 
@@ -194,23 +186,25 @@ cdef class Pipeline:
 
     #========= non-public properties & methods ===========================================
 
-    @property
-    def _json(self):
-        raise NotImplementedError("Abstract property")
+    def _get_json(self):
+        raise NotImplementedError("Abstract method")
 
     @property
     def _has_inputs(self):
         return not self._inputs.empty()
 
+    def _copy_inputs(self, Pipeline other):
+        self._inputs = other._inputs
+
     def _del_executor(self):
         self._executor.reset()
 
     cdef PipelineExecutor* _get_executor(self) except NULL:
         if not self._executor:
-            json_bytes = self._json.encode("UTF-8")
-            executor = new PipelineExecutor(json_bytes)
+            json = self._get_json()
+            executor = new PipelineExecutor(json)
             executor.setLogLevel(self._loglevel)
-            readPipeline(executor, json_bytes)
+            readPipeline(executor, json)
             addArrayReaders(executor, self._inputs)
             self._executor.reset(executor)
         return self._executor.get()

pdal/pipeline.py

@@ -6,14 +6,14 @@
 from typing import Any, Container, Dict, Iterator, List, Optional, Sequence, Union, cast
 
 import numpy as np
+
 try:
     from meshio import Mesh
-except ModuleNotFoundError:
+except ModuleNotFoundError:  # pragma: no cover
     Mesh = None
 
 from . import libpdalpython
 
-
 LogLevelToPDAL = {
     logging.ERROR: 0,
     logging.WARNING: 1,
@@ -30,6 +30,7 @@ def __init__(
         arrays: Sequence[np.ndarray] = (),
         loglevel: int = logging.ERROR,
     ):
+        super().__init__()
         self._stages: List[Stage] = []
         if spec:
             stages = _parse_stages(spec) if isinstance(spec, str) else spec
@@ -79,12 +80,13 @@ def __or__(self, other: Union[Stage, Pipeline]) -> Pipeline:
         return new
 
     def __copy__(self) -> Pipeline:
-        clone = cast(Pipeline, super().__copy__())
+        clone = self.__class__(loglevel=self.loglevel)
+        clone._copy_inputs(self)
         clone |= self
         return clone
 
-    def get_meshio(self, idx: int) -> Mesh:
-        if Mesh is None:
+    def get_meshio(self, idx: int) -> Optional[Mesh]:
+        if Mesh is None:  # pragma: no cover
             raise RuntimeError(
                 "The get_meshio function can only be used if you have installed meshio. "
                 "Try pip install meshio"
@@ -98,8 +100,7 @@ def get_meshio(self, idx: int) -> Mesh:
             [("triangle", np.stack((mesh["A"], mesh["B"], mesh["C"]), 1))],
         )
 
-    @property
-    def _json(self) -> str:
+    def _get_json(self) -> str:
         options_list = []
         stage2tag: Dict[Stage, str] = {}
         for stage in self._stages:
@@ -134,8 +135,8 @@ def inputs(self) -> List[Union[Stage, str]]:
     def options(self) -> Dict[str, Any]:
         return dict(self._options)
 
-    def pipeline(self, *arrays: np.ndarray) -> Pipeline:
-        return Pipeline((self,), arrays)
+    def pipeline(self, *arrays: np.ndarray, loglevel: int = logging.ERROR) -> Pipeline:
+        return Pipeline((self,), arrays, loglevel)
 
     def __or__(self, other: Union[Stage, Pipeline]) -> Pipeline:
         return Pipeline((self, other))