From 1be71a741043f4cf4c32dd5593325ea51c8b8cc5 Mon Sep 17 00:00:00 2001
From: Tom de Geus <tom@geus.me>
Date: Tue, 8 Sep 2020 15:32:55 +0200
Subject: [PATCH] Adding rank member

---
 include/xtensor-python/pyarray.hpp  |  3 +-
 include/xtensor-python/pytensor.hpp |  3 +-
 test/CMakeLists.txt                 |  1 +
 test/test_sfinae.cpp                | 53 +++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 test/test_sfinae.cpp

diff --git a/include/xtensor-python/pyarray.hpp b/include/xtensor-python/pyarray.hpp
index 0873399..79de0b5 100644
--- 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
index 906bfff..1dc9e31 100644
--- 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
index 0517e76..7174802 100644
--- 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
new file mode 100644
index 0000000..a614485
--- /dev/null
+++ 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);
+    }
+}

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/xtensor-stack/xtensor-python/pull/241.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/xtensor-stack/xtensor-python/pull/241.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/xtensor-stack/xtensor-python/pull/241.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/xtensor-stack/xtensor-python/pull/241.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>