Adding rank member

tdegeus · tdegeus · commit 1be71a741043 · 2021-05-20T07:17:53.000+02:00
diff --git a/include/xtensor-python/pyarray.hpp b/include/xtensor-python/pyarray.hpp
@@ -158,6 +158,7 @@ namespace xt
         using inner_shape_type = typename base_type::inner_shape_type;
         using inner_strides_type = typename base_type::inner_strides_type;
         using inner_backstrides_type = typename base_type::inner_backstrides_type;
+        constexpr static std::size_t rank = SIZE_MAX;
 
         pyarray();
         pyarray(const value_type& t);
@@ -514,7 +515,7 @@ namespace xt
         {
             return;
         }
-        
+
         m_shape = inner_shape_type(reinterpret_cast<size_type*>(PyArray_SHAPE(this->python_array())),
                                    static_cast<size_type>(PyArray_NDIM(this->python_array())));
         m_strides = inner_strides_type(reinterpret_cast<difference_type*>(PyArray_STRIDES(this->python_array())),
diff --git a/include/xtensor-python/pytensor.hpp b/include/xtensor-python/pytensor.hpp
@@ -168,6 +168,7 @@ namespace xt
         using inner_shape_type = typename base_type::inner_shape_type;
         using inner_strides_type = typename base_type::inner_strides_type;
         using inner_backstrides_type = typename base_type::inner_backstrides_type;
+        constexpr static std::size_t rank = N;
 
         pytensor();
         pytensor(nested_initializer_list_t<T, N> t);
@@ -471,7 +472,7 @@ namespace xt
         {
             return;
         }
-        
+
         if (PyArray_NDIM(this->python_array()) != N)
         {
             throw std::runtime_error("NumPy: ndarray has incorrect number of dimensions");
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -86,6 +86,7 @@ set(XTENSOR_PYTHON_TESTS
     test_pyarray.cpp
     test_pytensor.cpp
     test_pyvectorize.cpp
+    test_sfinae.cpp
 )
 
 add_executable(test_xtensor_python ${XTENSOR_PYTHON_TESTS} ${XTENSOR_PYTHON_HEADERS})
diff --git a/test/test_sfinae.cpp b/test/test_sfinae.cpp
@@ -0,0 +1,53 @@
+/***************************************************************************
+* Copyright (c) Wolf Vollprecht, Johan Mabille and Sylvain Corlay          *
+* Copyright (c) QuantStack                                                 *
+*                                                                          *
+* Distributed under the terms of the BSD 3-Clause License.                 *
+*                                                                          *
+* The full license is in the file LICENSE, distributed with this software. *
+****************************************************************************/
+
+#include <limits>
+
+#include "gtest/gtest.h"
+#include "xtensor-python/pytensor.hpp"
+#include "xtensor-python/pyarray.hpp"
+#include "xtensor/xarray.hpp"
+#include "xtensor/xtensor.hpp"
+
+namespace xt
+{
+    template <class E, std::enable_if_t<!xt::has_fixed_rank_t<E>::value, int> = 0>
+    inline bool sfinae_has_fixed_rank(E&&)
+    {
+        return false;
+    }
+
+    template <class E, std::enable_if_t<xt::has_fixed_rank_t<E>::value, int> = 0>
+    inline bool sfinae_has_fixed_rank(E&&)
+    {
+        return true;
+    }
+
+    TEST(sfinae, fixed_rank)
+    {
+        xt::pyarray<size_t> a = {{9, 9, 9}, {9, 9, 9}};
+        xt::pytensor<size_t, 1> b = {9, 9};
+        xt::pytensor<size_t, 2> c = {{9, 9}, {9, 9}};
+
+        EXPECT_TRUE(sfinae_has_fixed_rank(a) == false);
+        EXPECT_TRUE(sfinae_has_fixed_rank(b) == true);
+        EXPECT_TRUE(sfinae_has_fixed_rank(c) == true);
+    }
+
+    TEST(sfinae, get_rank)
+    {
+        xt::pytensor<double, 1> A = xt::zeros<double>({2});
+        xt::pytensor<double, 2> B = xt::zeros<double>({2, 2});
+        xt::pyarray<double> C = xt::zeros<double>({2, 2});
+
+        EXPECT_TRUE(xt::get_rank<decltype(A)>::value == 1ul);
+        EXPECT_TRUE(xt::get_rank<decltype(B)>::value == 2ul);
+        EXPECT_TRUE(xt::get_rank<decltype(C)>::value == SIZE_MAX);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ namespace xt`
`168`	`168`	`using inner_shape_type = typename base_type::inner_shape_type;`
`169`	`169`	`using inner_strides_type = typename base_type::inner_strides_type;`
`170`	`170`	`using inner_backstrides_type = typename base_type::inner_backstrides_type;`
	`171`	`+ constexpr static std::size_t rank = N;`
`171`	`172`
`172`	`173`	`pytensor();`
`173`	`174`	`pytensor(nested_initializer_list_t<T, N> t);`
`@@ -471,7 +472,7 @@ namespace xt`
`471`	`472`	`{`
`472`	`473`	`return;`
`473`	`474`	`}`
`474`		`-`
	`475`	`+`
`475`	`476`	`if (PyArray_NDIM(this->python_array()) != N)`
`476`	`477`	`{`
`477`	`478`	`throw std::runtime_error("NumPy: ndarray has incorrect number of dimensions");`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ set(XTENSOR_PYTHON_TESTS`
`86`	`86`	`test_pyarray.cpp`
`87`	`87`	`test_pytensor.cpp`
`88`	`88`	`test_pyvectorize.cpp`
	`89`	`+ test_sfinae.cpp`
`89`	`90`	`)`
`90`	`91`
`91`	`92`	`add_executable(test_xtensor_python ${XTENSOR_PYTHON_TESTS} ${XTENSOR_PYTHON_HEADERS})`