Change Pipeline._inputs vector of raw Array pointers to shared_ptr to prevent mem leak on copy

Author: gsakkis

pdal/PyPipeline.cpp

@@ -57,7 +57,7 @@ void readPipeline(PipelineExecutor* executor, std::string json)
 }
 
 
-void addArrayReaders(PipelineExecutor* executor, std::vector<Array*> arrays)
+void addArrayReaders(PipelineExecutor* executor, std::vector<std::shared_ptr<Array>> arrays)
 {
     // Make the symbols in pdal_base global so that they're accessible
     // to PDAL plugins.  Python dlopen's this extension with RTLD_LOCAL,

pdal/PyPipeline.hpp

@@ -46,7 +46,7 @@ namespace python
 class Array;
 
 void readPipeline(PipelineExecutor* executor, std::string json);
-void addArrayReaders(PipelineExecutor* executor, std::vector<Array*> arrays);
+void addArrayReaders(PipelineExecutor* executor, std::vector<std::shared_ptr<Array>> arrays);
 PyArrayObject* viewToNumpyArray(PointViewPtr view);
 PyArrayObject* meshToNumpyArray(const TriangularMesh* mesh);
 std::vector<PyArrayObject*> getArrays(const PipelineExecutor* executor);

pdal/libpdalpython.pyx

@@ -6,6 +6,7 @@ from types import SimpleNamespace
 
 from cpython.ref cimport Py_DECREF
 from libcpp cimport bool
+from libcpp.memory cimport make_shared, shared_ptr
 from libcpp.string cimport string
 from libcpp.vector cimport vector
 
@@ -72,7 +73,7 @@ def infer_writer_driver(driver):
 
 cdef extern from "PyArray.hpp" namespace "pdal::python":
     cdef cppclass Array:
-        Array(np.ndarray) except +
+        Array(np.PyArrayObject*) except +
 
 
 cdef extern from "pdal/PipelineExecutor.hpp" namespace "pdal":
@@ -91,14 +92,14 @@ cdef extern from "pdal/PipelineExecutor.hpp" namespace "pdal":
 
 cdef extern from "PyPipeline.hpp" namespace "pdal::python":
     void readPipeline(PipelineExecutor*, string) except +
-    void addArrayReaders(PipelineExecutor*, vector[Array *]) except +
+    void addArrayReaders(PipelineExecutor*, vector[shared_ptr[Array]]) except +
     vector[np.PyArrayObject*] getArrays(const PipelineExecutor*) except +
     vector[np.PyArrayObject*] getMeshes(const PipelineExecutor*) except +
 
 
 cdef class Pipeline:
     cdef PipelineExecutor* _executor
-    cdef vector[Array*] _inputs
+    cdef vector[shared_ptr[Array]] _inputs
 
     def __dealloc__(self):
         self.inputs = []
@@ -116,7 +117,7 @@ cdef class Pipeline:
     def inputs(self, ndarrays):
         self._inputs.clear()
         for ndarray in ndarrays:
-            self._inputs.push_back(new Array(ndarray))
+            self._inputs.push_back(make_shared[Array](<np.PyArrayObject*>ndarray))
         self._delete_executor()
 
     @property