Cleanup pybind11

lsst-dm · Mar 25, 2017 · c27a480 · c27a480
1 parent 895cba8
commit c27a480
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/python/lsst/coadd/chisquared/SConscript b/python/lsst/coadd/chisquared/SConscript
@@ -1,3 +1,3 @@
 ## -*- python -*-
 from lsst.sconsUtils import scripts
-scripts.BasicSConscript.pybind11(["addToCoadd"])
+scripts.BasicSConscript.pybind11(["addToCoadd"], addUnderscore=False)
diff --git a/python/lsst/coadd/chisquared/__init__.py b/python/lsst/coadd/chisquared/__init__.py
@@ -19,7 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import
-from .chisquaredLib import *
+from __future__ import absolute_import, division, print_function
+from .addToCoadd import *
 from .coadd import *
 from .version import *
diff --git a/python/lsst/coadd/chisquared/addToCoadd.cc b/python/lsst/coadd/chisquared/addToCoadd.cc
@@ -19,9 +19,9 @@
  * the GNU General Public License along with this program.  If not,
  * see <https://www.lsstcorp.org/LegalNotices/>.
  */
-#include <cstdint>
+#include "pybind11/pybind11.h"
 
-#include <pybind11/pybind11.h>
+#include <cstdint>
 
 #include "lsst/coadd/chisquared/addToCoadd.h"
 
@@ -49,8 +49,8 @@ void declareAddToCoadd(py::module& mod) {
 
 }  // namespace lsst::coadd::chisquared::<anonymous>
 
-PYBIND11_PLUGIN(_addToCoadd) {
-    py::module mod("_addToCoadd", "Python wrapper for _addToCoadd library");
+PYBIND11_PLUGIN(addToCoadd) {
+    py::module mod("addToCoadd");
 
     declareAddToCoadd<double, double>(mod);
     declareAddToCoadd<double, float>(mod);
@@ -63,6 +63,7 @@ PYBIND11_PLUGIN(_addToCoadd) {
 
     return mod.ptr();
 }
-}
-}
-}  // namespace lsst::coadd::chisquared
+
+}  // chisquared
+}  // coadd
+}  // lsst
diff --git a/python/lsst/coadd/chisquared/chisquaredLib.py b/python/lsst/coadd/chisquared/chisquaredLib.py
diff --git a/python/lsst/coadd/chisquared/coadd.py b/python/lsst/coadd/chisquared/coadd.py
@@ -19,7 +19,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import
+from __future__ import absolute_import, division, print_function
 
 import lsst.coadd.utils as coaddUtils
 from . import chisquaredLib