From 6d179b237228b00cc7a484d7fa01dc49db88a7ef Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Fri, 29 May 2020 14:32:14 +0200
Subject: [PATCH] various fixes

---
 cxxbase.cc                     | 3 ++-
 pyHealpix/pyHealpix.cc         | 2 +-
 pyinterpol_ng/pyinterpol_ng.cc | 4 ++--
 pysharp/pysharp.cc             | 2 +-
 setup.py                       | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cxxbase.cc b/cxxbase.cc
index d72ecc5..7350802 100644
--- a/cxxbase.cc
+++ b/cxxbase.cc
@@ -3,6 +3,7 @@
 #include "mr_util/infra/threading.cc"
 #include "mr_util/math/pointing.cc"
 #include "mr_util/math/geom_utils.cc"
+#include "mr_util/math/space_filling.cc"
 #include "mr_util/sharp/sharp.cc"
 #include "mr_util/sharp/sharp_almhelpers.cc"
 #include "mr_util/sharp/sharp_core.cc"
@@ -20,7 +21,7 @@
 
 using namespace mr;
 
-PYBIND11_MODULE(cxxbase1, m)
+PYBIND11_MODULE(PKGNAME, m)
   {
   add_pypocketfft(m);
   add_pysharp(m);
diff --git a/pyHealpix/pyHealpix.cc b/pyHealpix/pyHealpix.cc
index 39c1178..c1fdb9c 100644
--- a/pyHealpix/pyHealpix.cc
+++ b/pyHealpix/pyHealpix.cc
@@ -351,7 +351,7 @@ void add_pyHealpix(py::module &msup)
   auto m = msup.def_submodule("pyHealpix");
   m.doc() = pyHealpix_DS;
 
-  py::class_<Pyhpbase> (m, "Healpix_Base")
+  py::class_<Pyhpbase> (m, "Healpix_Base", py::module_local())
     .def(py::init<int,const string &>(),"nside"_a,"scheme"_a)
     .def("order", [](Pyhpbase &self)
       { return self.base.Order(); }, order_DS)
diff --git a/pyinterpol_ng/pyinterpol_ng.cc b/pyinterpol_ng/pyinterpol_ng.cc
index f2cb322..65baf01 100644
--- a/pyinterpol_ng/pyinterpol_ng.cc
+++ b/pyinterpol_ng/pyinterpol_ng.cc
@@ -242,7 +242,7 @@ void add_pyinterpol_ng(py::module &msup)
   m.doc() = pyinterpol_ng_DS;
 
   using inter_d = PyInterpolator<double>;
-  py::class_<inter_d> (m, "PyInterpolator", pyinterpolator_DS)
+  py::class_<inter_d> (m, "PyInterpolator", py::module_local(), pyinterpolator_DS)
     .def(py::init<const py::array &, const py::array &, bool, int64_t, int64_t, double, double, int>(),
       initnormal_DS, "sky"_a, "beam"_a, "separate"_a, "lmax"_a, "kmax"_a, "epsilon"_a, "ofactor"_a=1.5,
       "nthreads"_a=0)
@@ -253,7 +253,7 @@ void add_pyinterpol_ng(py::module &msup)
     .def ("getSlm", &inter_d::pygetSlm, getSlm_DS, "beam"_a)
     .def ("support", &inter_d::support);
   using inter_f = PyInterpolator<float>;
-  py::class_<inter_f> (m, "PyInterpolator_f", pyinterpolator_DS)
+  py::class_<inter_f> (m, "PyInterpolator_f", py::module_local(), pyinterpolator_DS)
     .def(py::init<const py::array &, const py::array &, bool, int64_t, int64_t, float, float, int>(),
       initnormal_DS, "sky"_a, "beam"_a, "separate"_a, "lmax"_a, "kmax"_a, "epsilon"_a, "ofactor"_a=1.5f,
       "nthreads"_a=0)
diff --git a/pysharp/pysharp.cc b/pysharp/pysharp.cc
index 61b1deb..afecbe1 100644
--- a/pysharp/pysharp.cc
+++ b/pysharp/pysharp.cc
@@ -274,7 +274,7 @@ void add_pysharp(py::module &msup)
   auto m = msup.def_submodule("pysharp");
   m.doc() = pysharp_DS;
 
-  py::class_<py_sharpjob<double>> (m, "sharpjob_d")
+  py::class_<py_sharpjob<double>> (m, "sharpjob_d", py::module_local())
     .def(py::init<>())
     .def("set_nthreads", &py_sharpjob<double>::set_nthreads, "nthreads"_a)
     .def("set_gauss_geometry", &py_sharpjob<double>::set_gauss_geometry,
diff --git a/setup.py b/setup.py
index d642967..1105215 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ include_dirs = ['./src/',
                 _deferred_pybind11_include()]
 extra_compile_args = ['--std=c++17', '-march=native', '-ffast-math', '-O3']
 python_module_link_args = []
-define_macros = []
+define_macros = [("PKGNAME", pkgname)]
 
 if sys.platform == 'darwin':
     import distutils.sysconfig
-- 
GitLab