Include nlohmann before PDAL. (#12)

* Include nlohmann before PDAL.

* use miniforge3 to build

* add our own export.hpp for situations where PDAL didn't provide it

---------

Co-authored-by: Howard Butler <[email protected]>

Author: abellgithub

.github/environment.yml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   - scikit-build-core
   - numpy
-  - pdal
+  - libpdal-core
   - compilers
   - python
   - pip

.github/workflows/build.yml

@@ -24,11 +24,13 @@ jobs:
       fail-fast: true
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        python-version: ['3.9', '3.10', '3.11', '3.12']
-        numpy-version: ['1.26', '2.0', '2.1']
+        python-version: ['3.10', '3.11', '3.12', '3.13']
+        numpy-version: ['1.24', '2.1']
         exclude:
-          - python-version: 3.9
-            numpy-version: 2.1
+          - python-version: '3.12'
+            numpy-version: '1.24'
+          - python-version: '3.13'
+            numpy-version: '1.24'
 
     steps:
     - name: Check out
@@ -37,7 +39,7 @@ jobs:
     - name: Setup micromamba
       uses: conda-incubator/setup-miniconda@v3
       with:
-        miniforge-variant: Mambaforge
+        miniforge-variant: Miniforge3
         miniforge-version: latest
         use-mamba: true
         python-version: ${{ matrix.python-version }}

src/pdal/filters/PythonFilter.cpp

@@ -32,10 +32,10 @@
 * OF SUCH DAMAGE.
 ****************************************************************************/
 
-#include "PythonFilter.hpp"
-
 #include "../nlohmann/json.hpp"
 
+#include "PythonFilter.hpp"
+
 #include <pdal/PointView.hpp>
 #include <pdal/DimUtil.hpp>
 #include <pdal/util/ProgramArgs.hpp>

src/pdal/filters/export.hpp

@@ -0,0 +1,21 @@
+#pragma once
+
+
+#ifdef _WIN32
+#   define PDAL_EXPORT   __declspec(dllexport)
+#   define PDAL_LOCAL
+#   define PDAL_EXPORT_UNIX
+#ifdef __GNUC__
+#   define PDAL_EXPORT_DEPRECATED __attribute__((deprecated)) PDAL_EXPORT
+#else
+#   define PDAL_EXPORT_DEPRECATED   __declspec(deprecated, dllexport)
+#endif
+#else
+#   define PDAL_EXPORT     __attribute__ ((visibility("default")))
+// Keep the PDAL_DLL name around so any external plugins that still might have that defined
+// can still compile and be used
+#   define PDAL_DLL     PDAL_EXPORT
+#   define PDAL_LOCAL   __attribute__((visibility("hidden")))
+#   define PDAL_EXPORT_UNIX   __attribute__ ((visibility("default")))
+#   define PDAL_EXPORT_DEPRECATED   __attribute__((deprecated))
+#endif // _WIN32

src/pdal/test/NumpyReaderTest.cpp

@@ -34,6 +34,8 @@
 
 #include <pdal/pdal_test_main.hpp>
 
+#include "../filters/export.hpp"
+
 #include <pdal/PipelineManager.hpp>
 #include <pdal/StageFactory.hpp>
 #include <pdal/filters/StatsFilter.hpp>

src/pdal/test/PythonFilterTest.cpp

@@ -34,6 +34,8 @@
 
 #include <pdal/pdal_test_main.hpp>
 
+#include "../filters/export.hpp"
+
 #include <pdal/PipelineManager.hpp>
 #include <pdal/StageFactory.hpp>
 #include <pdal/io/FauxReader.hpp>