Merge pull request #20 from lsst/tickets/DM-9190

DM-9190: Cleanup pybind11 remaining code
lsst · Apr 6, 2017 · bddb874 · bddb874
2 parents 396a35e + 3e6efb1
commit bddb874
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 40 deletions.
diff --git a/bin.src/psfex.py b/bin.src/psfex.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import range
 import argparse
 import os

diff --git a/config/psfex.py b/config/psfex.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 import sys
 from lsst.meas.extensions.psfex import PsfExStarSelectorTask
 

diff --git a/python/lsst/meas/extensions/psfex/SConscript b/python/lsst/meas/extensions/psfex/SConscript
@@ -3,4 +3,4 @@ from lsst.sconsUtils import scripts
 scripts.BasicSConscript.pybind11(["psfexPsf",
                                   "psf",
                                   "field",
-                                  "prefs"])
+                                  "prefs"], addUnderscore=False)
diff --git a/python/lsst/meas/extensions/psfex/__init__.py b/python/lsst/meas/extensions/psfex/__init__.py
@@ -22,5 +22,9 @@
 
 """lsst.meas.extensions.psfex
 """
-from __future__ import absolute_import
-from .psfexLib import *
+from __future__ import absolute_import, division, print_function
+
+from .field import *
+from .prefs import *
+from .psf import *
+from .psfexPsf import *
diff --git a/python/lsst/meas/extensions/psfex/field.cc b/python/lsst/meas/extensions/psfex/field.cc
@@ -18,8 +18,8 @@
  * the GNU General Public License along with this program.  If not, 
  * see <https://www.lsstcorp.org/LegalNotices/>.
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 #include "lsst/meas/extensions/psfex/Field.hh"
 
@@ -35,8 +35,8 @@ namespace meas {
 namespace extensions {
 namespace psfex {
 
-PYBIND11_PLUGIN(_field) {
-    py::module mod("_field", "Python wrapper for the meas_extensions_psfex _field library");
+PYBIND11_PLUGIN(field) {
+    py::module mod("field");
 
     py::class_<Field, std::shared_ptr<Field>> clsField(mod, "Field");
 
@@ -54,4 +54,7 @@ PYBIND11_PLUGIN(_field) {
     return mod.ptr();
 }
 
-}}}} // lsst::meas::extensions::fieldex
+}  // fieldex
+}  // extensions
+}  // meas
+}  // lsst
diff --git a/python/lsst/meas/extensions/psfex/prefs.cc b/python/lsst/meas/extensions/psfex/prefs.cc
@@ -19,8 +19,8 @@
  * the GNU General Public License along with this program.  If not, 
  * see <https://www.lsstcorp.org/LegalNotices/>.
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 #include "lsst/afw/table/io/python.h"  // for declarePersistableFacade
 
@@ -35,8 +35,8 @@ namespace meas {
 namespace extensions {
 namespace psfex {
 
-PYBIND11_PLUGIN(_prefs) {
-    py::module mod("_prefs", "Python wrapper for _prefs library");
+PYBIND11_PLUGIN(prefs) {
+    py::module mod("prefs");
 
     py::class_<Prefs> clsPrefs(mod, "Prefs");
 
@@ -75,4 +75,7 @@ PYBIND11_PLUGIN(_prefs) {
     return mod.ptr();
 }
 
-}}}} // lsst::meas::extensions::psfex
+}  // psfex
+}  // extensions
+}  // meas
+}  // lsst
diff --git a/python/lsst/meas/extensions/psfex/psf.cc b/python/lsst/meas/extensions/psfex/psf.cc
@@ -19,12 +19,11 @@
  * the GNU General Public License along with this program.  If not, 
  * see <https://www.lsstcorp.org/LegalNotices/>.
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
 
 #include "numpy/arrayobject.h"
 #include "ndarray/pybind11.h"
-#include "ndarray/converter.h"
 
 #include "lsst/meas/extensions/psfex/psf.hh"
 
@@ -36,8 +35,8 @@ namespace meas {
 namespace extensions {
 namespace psfex {
 
-PYBIND11_PLUGIN(_psf) {
-    py::module mod("_psf", "Python wrapper for _psf library");
+PYBIND11_PLUGIN(psf) {
+    py::module mod("psf");
 
     if (_import_array() < 0) {
             PyErr_SetString(PyExc_ImportError, "numpy.core.multiarray failed to import");
@@ -46,7 +45,6 @@ PYBIND11_PLUGIN(_psf) {
 
     py::class_<Context> clsContext(mod, "Context");
 
-//    enum { KEEPHIDDEN=CONTEXT_KEEPHIDDEN, REMOVEHIDDEN=CONTEXT_REMOVEHIDDEN };
     clsContext.attr("KEEPHIDDEN") = py::cast(static_cast<int>(Context::KEEPHIDDEN));
     clsContext.attr("REMOVEHIDDEN") = py::cast(static_cast<int>(Context::REMOVEHIDDEN));
 
@@ -129,4 +127,7 @@ PYBIND11_PLUGIN(_psf) {
     return mod.ptr();
 }
 
-}}}} // lsst::meas::extensions::psfex
+}  // psfex
+}  // extensions
+}  // meas
+}  // lsst
diff --git a/python/lsst/meas/extensions/psfex/psfex.py b/python/lsst/meas/extensions/psfex/psfex.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 from builtins import input
 from builtins import str

diff --git a/python/lsst/meas/extensions/psfex/psfexLib.py b/python/lsst/meas/extensions/psfex/psfexLib.py
diff --git a/python/lsst/meas/extensions/psfex/psfexPsf.cc b/python/lsst/meas/extensions/psfex/psfexPsf.cc
@@ -19,9 +19,8 @@
  * the GNU General Public License along with this program.  If not, 
  * see <https://www.lsstcorp.org/LegalNotices/>.
  */
-#include <pybind11/pybind11.h>
-//#include <pybind11/stl.h>
-//
+#include "pybind11/pybind11.h"
+
 #include "lsst/afw/table/io/python.h"  // for declarePersistableFacade
 
 #include "define.h"
@@ -48,9 +47,11 @@ namespace meas {
 namespace extensions {
 namespace psfex {
 
+PYBIND11_PLUGIN(psfexPsf) {
+    py::module::import("lsst.afw.table");
+    py::module::import("lsst.meas.algorithms");
 
-PYBIND11_PLUGIN(_psfexPsf) {
-    py::module mod("_psfexPsf", "Python wrapper for afw _psfexPsf library");
+    py::module mod("psfexPsf");
 
     mod.attr("BIG") = py::cast(BIG);
     mod.attr("INTERPFAC") = py::cast(INTERPFAC);
@@ -63,7 +64,6 @@ PYBIND11_PLUGIN(_psfexPsf) {
     clsPsfexPsf.def(py::init<lsst::meas::extensions::psfex::Psf const&, lsst::afw::geom::Point2D const &>(),
             "psf"_a, "averagePosition"_a=lsst::afw::geom::Point2D());
 
-
     /* Members */
     clsPsfexPsf.def("clone", &PsfexPsf::clone);
     clsPsfexPsf.def("getAveragePosition", &PsfexPsf::getAveragePosition);
@@ -75,4 +75,7 @@ PYBIND11_PLUGIN(_psfexPsf) {
     return mod.ptr();
 }
 
-}}}} // lsst::meas::extensions::psfex
+}  // psfex
+}  // extensions
+}  // meas
+}  // lsst
diff --git a/python/lsst/meas/extensions/psfex/psfexPsfDeterminer.py b/python/lsst/meas/extensions/psfex/psfexPsfDeterminer.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import range
 #
 # LSST Data Management System

diff --git a/python/lsst/meas/extensions/psfex/psfexStarSelector.py b/python/lsst/meas/extensions/psfex/psfexStarSelector.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 from builtins import input
 from builtins import object

diff --git a/python/lsst/meas/extensions/psfex/utils.py b/python/lsst/meas/extensions/psfex/utils.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import absolute_import, division, print_function
 from builtins import input
 from builtins import range
 import re

diff --git a/tests/testPsfexPsf.py b/tests/testPsfexPsf.py
@@ -21,7 +21,7 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import print_function, division
+from __future__ import absolute_import, division, print_function
 from builtins import zip
 from builtins import range
 import math