Fix pytensor overload resolution in pybind11.

zhujun98 · zhujun98 · commit 025d1e5aacef · 2019-08-06T20:51:36.000+02:00
diff --git a/include/xtensor-python/pytensor.hpp b/include/xtensor-python/pytensor.hpp
@@ -58,7 +58,14 @@ namespace pybind11
                     }
                 }
 
-                value = type::ensure(src);
+                try
+                {
+                    value = type::ensure(src);
+                }
+                catch (const std::runtime_error&)
+                {
+                    return false;
+                }
                 return static_cast<bool>(value);
             }
 
diff --git a/test_python/main.cpp b/test_python/main.cpp
@@ -253,4 +253,7 @@ PYBIND11_MODULE(xtensor_python_test, m)
 
     m.def("simple_array", [](xt::pyarray<int>) { return 1; } );
     m.def("simple_tensor", [](xt::pytensor<int, 1>) { return 2; } );
+
+    m.def("diff_shape_overload", [](xt::pytensor<int, 1> a) { return 1; });
+    m.def("diff_shape_overload", [](xt::pytensor<int, 2> a) { return 2; });
 }
diff --git a/test_python/test_pyarray.py b/test_python/test_pyarray.py
@@ -135,13 +135,13 @@ def test_col_row_major(self):
         with self.assertRaises(RuntimeError):
             xt.col_major_array(var)
 
-        with self.assertRaises(RuntimeError):
+        with self.assertRaises(TypeError):
             xt.row_major_tensor(var.T)
 
-        with self.assertRaises(RuntimeError):
+        with self.assertRaises(TypeError):
             xt.row_major_tensor(var[:, ::2, ::2])
 
-        with self.assertRaises(RuntimeError):
+        with self.assertRaises(TypeError):
             # raise for wrong dimension
             xt.row_major_tensor(var[0, 0, :])
 
@@ -157,6 +157,15 @@ def test_bad_argument_call(self):
         with self.assertRaises(TypeError):
             xt.simple_tensor("foo")
 
+    def test_diff_shape_overload(self):
+        self.assertEqual(1, xt.diff_shape_overload(np.ones(2)))
+        self.assertEqual(2, xt.diff_shape_overload(np.ones((2, 2))))
+
+        with self.assertRaises(TypeError):
+            # FIXME: the TypeError information is not informative
+            xt.diff_shape_overload(np.ones((2, 2, 2)))
+
+
 class AttributeTest(TestCase):
 
     def setUp(self):

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,14 @@ namespace pybind11`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- value = type::ensure(src);`
	`61`	`+ try`
	`62`	`+ {`
	`63`	`+ value = type::ensure(src);`
	`64`	`+ }`
	`65`	`+ catch (const std::runtime_error&)`
	`66`	`+ {`
	`67`	`+ return false;`
	`68`	`+ }`
`62`	`69`	`return static_cast<bool>(value);`
`63`	`70`	`}`
`64`	`71`
Original file line number	Diff line number	Diff line change
`@@ -253,4 +253,7 @@ PYBIND11_MODULE(xtensor_python_test, m)`
`253`	`253`
`254`	`254`	`m.def("simple_array", [](xt::pyarray<int>) { return 1; } );`
`255`	`255`	`m.def("simple_tensor", [](xt::pytensor<int, 1>) { return 2; } );`
	`256`	`+`
	`257`	`+ m.def("diff_shape_overload", [](xt::pytensor<int, 1> a) { return 1; });`
	`258`	`+ m.def("diff_shape_overload", [](xt::pytensor<int, 2> a) { return 2; });`
`256`	`259`	`}`