Merge pull request #93 from lsst/tickets/DM-14834

DM-14834: Use pybind11's native Eigen wrapping instead of ndarray EigenView
lsst · Jun 29, 2018 · 90dae03 · 90dae03
2 parents a2cb10d + 26cdf22
commit 90dae03
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ config.log
 .cache
 .pytest_cache
 pytest_session.txt
+.coverage
 bin/*.py
 doc/html
 doc/xml

diff --git a/python/lsst/jointcal/astrometryMappings.cc b/python/lsst/jointcal/astrometryMappings.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 
 #include "lsst/jointcal/Gtransfo.h"
 #include "lsst/jointcal/AstrometryMapping.h"

diff --git a/python/lsst/jointcal/astrometryModels.cc b/python/lsst/jointcal/astrometryModels.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 #include "pybind11/stl.h"
 #include "ndarray/pybind11.h"
 #include "ndarray/eigen.h"

diff --git a/python/lsst/jointcal/gtransfo.cc b/python/lsst/jointcal/gtransfo.cc
@@ -22,6 +22,7 @@
 
 #include "astshim.h"
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 #include "ndarray/pybind11.h"
 #include "ndarray/eigen.h"
 #include "Eigen/Core"

diff --git a/python/lsst/jointcal/photometryMappings.cc b/python/lsst/jointcal/photometryMappings.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 #include "pybind11/stl.h"
 #include "ndarray/pybind11.h"
 #include "ndarray/eigen.h"

diff --git a/python/lsst/jointcal/photometryModels.cc b/python/lsst/jointcal/photometryModels.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 #include "pybind11/stl.h"
 #include "ndarray/pybind11.h"
 #include "ndarray/eigen.h"

diff --git a/python/lsst/jointcal/photometryTransfo.cc b/python/lsst/jointcal/photometryTransfo.cc
@@ -21,6 +21,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 #include "ndarray/pybind11.h"
 #include "ndarray/eigen.h"
 #include "Eigen/Core"

diff --git a/tests/test_photometryMapping.py b/tests/test_photometryMapping.py
@@ -53,8 +53,8 @@ def test_transformFlux(self):
 
     def test_offsetParams(self):
         """Test offsetting; note that offsetParams offsets by `-delta`."""
-        delta = np.array(0.0)
-        self._test_offsetParams(delta, np.array(self.scale))
+        delta = np.array([0.0])
+        self._test_offsetParams(delta, np.array([self.scale]))
         delta -= 1
         self._test_offsetParams(delta, self.scale-delta)