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

DM-14834: Use pybind11's native Eigen wrapping instead of ndarray EigenView
lsst · Jun 29, 2018 · e920381 · e920381
2 parents a7c72c5 + 43e3864
commit e920381
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ _build.*
 .coverage
 .pytest_cache
 pytest_session.txt
+.coverage
 config.log
 doc/*.tag
 doc/*.inc

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

diff --git a/python/lsst/geom/coordinates/coordinates.cc b/python/lsst/geom/coordinates/coordinates.cc
@@ -20,6 +20,7 @@
  */
 
 #include "pybind11/pybind11.h"
+#include "pybind11/eigen.h"
 #include "ndarray/pybind11.h"
 
 #include "lsst/geom/Point.h"

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

diff --git a/tests/test_coordinates.py b/tests/test_coordinates.py
@@ -244,23 +244,6 @@ def testConstructors(self):
         e2 = geom.Extent3D(e1)
         self.assertAlmostEqual(tuple(e1), tuple(e2))
 
-        # test invalid constructors
-        e1 = geom.Extent2D(1.2, 3.4)
-        with self.assertRaises(TypeError):
-            e2 = geom.Extent2I(e1)
-
-        e1 = geom.Extent3D(1.2, 3.4, 5.6)
-        with self.assertRaises(TypeError):
-            e2 = geom.Extent3I(e1)
-
-        e1 = geom.Point2D(1.2, 3.4)
-        with self.assertRaises(TypeError):
-            e2 = geom.Extent2I(e1)
-
-        e1 = geom.Point3D(1.2, 3.4, 5.6)
-        with self.assertRaises(TypeError):
-            e2 = geom.Extent3I(e1)
-
 
 class OperatorTestCase(lsst.utils.tests.TestCase):