diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h index 7a1d40d7d..2b5de4f55 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorDimensions.h @@ -401,15 +401,21 @@ template +template struct sizes_match_up_to_dim { + static inline bool run(Dims1& dims1, Dims2& dims2) { + return false; + } +}; +template +struct sizes_match_up_to_dim { static inline bool run(Dims1& dims1, Dims2& dims2) { return (array_get(dims1) == array_get(dims2)) & - sizes_match_up_to_dim::run(dims1, dims2); + sizes_match_up_to_dim::run(dims1, dims2); } }; template -struct sizes_match_up_to_dim { +struct sizes_match_up_to_dim { static inline bool run(Dims1& dims1, Dims2& dims2) { return (array_get<0>(dims1) == array_get<0>(dims2)); } @@ -420,10 +426,7 @@ struct sizes_match_up_to_dim { template bool dimensions_match(Dims1& dims1, Dims2& dims2) { - if (static_cast(internal::array_size::value) != static_cast(internal::array_size::value)) { - return false; - } - return internal::sizes_match_up_to_dim::value-1>::run(dims1, dims2); + return internal::sizes_match_up_to_dim::value-1, internal::array_size::value-1>::run(dims1, dims2); } } // end namespace Eigen diff --git a/unsupported/test/cxx11_tensor_dimension.cpp b/unsupported/test/cxx11_tensor_dimension.cpp index 247d312ae..22c58450c 100644 --- a/unsupported/test/cxx11_tensor_dimension.cpp +++ b/unsupported/test/cxx11_tensor_dimension.cpp @@ -43,6 +43,10 @@ static void test_match() Eigen::DSizes dyn(2,3,7); Eigen::Sizes<2,3,7> stat; VERIFY_IS_EQUAL(Eigen::dimensions_match(dyn, stat), true); + + Eigen::DSizes dyn1(2,3,7); + Eigen::DSizes dyn2(2,3); + VERIFY_IS_EQUAL(Eigen::dimensions_match(dyn, stat), false); }