refactor Python extension to use new PyArray.hpp header

PDAL · Jun 19, 2017 · 1608bae · 1608bae
1 parent 1f233eb
commit 1608bae
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 77 deletions.
diff --git a/plugins/python/plang/Array.hpp → pdal/PyArray.hpp b/plugins/python/plang/Array.hpp → pdal/PyArray.hpp
@@ -47,14 +47,15 @@
 #undef tolower
 #undef isspace
 
-
+#ifndef PY_ARRAY_UNIQUE_SYMBOL
 #define PY_ARRAY_UNIQUE_SYMBOL PDALARRAY_ARRAY_API
-#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+#endif
+
 #include <numpy/arrayobject.h>
 
 namespace pdal
 {
-namespace plang
+namespace python
 {
 
 
@@ -212,6 +213,6 @@ class PDAL_DLL Array
     Array& operator=(Array const& rhs);
 };
 
-} // namespace plang
+} // namespace python
 } // namespace pdal
 
diff --git a/plugins/python/plang/Array.cpp b/plugins/python/plang/Array.cpp
diff --git a/plugins/python/plang/CMakeLists.txt b/plugins/python/plang/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 set(plang_srcs
-    Array.cpp
     Invocation.cpp
     Environment.cpp
     Redirector.cpp

diff --git a/plugins/python/test/PythonFilterTest.cpp b/plugins/python/test/PythonFilterTest.cpp
@@ -40,7 +40,7 @@
 #include <filters/StatsFilter.hpp>
 
 #include "../plang/Invocation.hpp"
-#include "../plang/Array.hpp"
+#include <pdal/PyArray.hpp>
 #include "../plang/Environment.hpp"
 
 #include <pdal/StageWrapper.hpp>
@@ -993,7 +993,7 @@ TEST(PLangTest, PLangTest_array)
     PointTable table;
     PointViewPtr view = makeTestView(table, 40);
 
-    plang::Array array;
+    python::Array array;
     array.update(view);
     verifyTestView(*view.get(), 4);
 

diff --git a/python/pdal/PyPipeline.cpp b/python/pdal/PyPipeline.cpp
@@ -91,7 +91,7 @@ std::vector<PArray> Pipeline::getArrays() const
 
     for (auto i: pvset)
     {
-        PArray array = new pdal::plang::Array;
+        PArray array = new pdal::python::Array;
         array->update(i);
         output.push_back(array);
     }

diff --git a/python/pdal/PyPipeline.hpp b/python/pdal/PyPipeline.hpp
@@ -37,7 +37,7 @@
 #include <pdal/PipelineManager.hpp>
 #include <pdal/PipelineWriter.hpp>
 #include <pdal/util/FileUtils.hpp>
-#include <pdal/plang/Array.hpp>
+#include <pdal/PyArray.hpp>
 #include <pdal/PipelineExecutor.hpp>
 
 #include <string>
@@ -46,7 +46,9 @@
 #undef tolower
 #undef isspace
 
+#ifndef PY_ARRAY_UNIQUE_SYMBOL
 #define PY_ARRAY_UNIQUE_SYMBOL LIBPDALPYTHON_ARRAY_API
+#endif
 
 #include <numpy/arrayobject.h>
 
@@ -61,7 +63,7 @@ class python_error : public std::runtime_error
         {}
 };
 
-    typedef pdal::plang::Array* PArray;
+    typedef pdal::python::Array* PArray;
 
 class Pipeline {
 public:

diff --git a/python/pdal/libpdalpython.pyx b/python/pdal/libpdalpython.pyx
@@ -12,7 +12,7 @@ from cpython cimport PyObject, Py_INCREF
 from cython.operator cimport dereference as deref, preincrement as inc
 
 
-cdef extern from "pdal/plang/Array.hpp" namespace "pdal::plang":
+cdef extern from "pdal/PyArray.hpp" namespace "pdal::python":
     cdef cppclass Array:
         void* getPythonArray() except+
 

diff --git a/python/setup.py b/python/setup.py
@@ -145,7 +145,6 @@ def get_pdal_config(option):
 
 include_dirs.append(numpy.get_include())
 extra_compile_args = ['-std=c++11',]
-libraries.append('pdal_plang')
 
 DEBUG=False
 if DEBUG: