Merge pull request #2371 from gouarin/view-perf

JohanMabille · web-flow · commit 3127ecc14411 · 2021-05-03T09:10:37.000+02:00
fix data_offset method in xview to compute the strides only once
diff --git a/include/xtensor/xview.hpp b/include/xtensor/xview.hpp
@@ -534,7 +534,7 @@ namespace xt
         template <class T = xexpression_type>
         std::enable_if_t<has_data_interface<T>::value && is_strided_view, const_storage_iterator>
         storage_end() const;
-        
+
         template <class T = xexpression_type>
         std::enable_if_t<has_data_interface<T>::value && is_strided_view, const_storage_iterator>
         storage_cbegin() const;
@@ -1331,6 +1331,7 @@ namespace xt
         if (!m_strides_computed)
         {
             compute_strides(std::integral_constant<bool, has_trivial_strides>{});
+            m_strides_computed = true;
         }
         return m_data_offset;
     }

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,7 @@ namespace xt`
`534`	`534`	`template <class T = xexpression_type>`
`535`	`535`	`std::enable_if_t<has_data_interface<T>::value && is_strided_view, const_storage_iterator>`
`536`	`536`	`storage_end() const;`
`537`		`-`
	`537`	`+`
`538`	`538`	`template <class T = xexpression_type>`
`539`	`539`	`std::enable_if_t<has_data_interface<T>::value && is_strided_view, const_storage_iterator>`
`540`	`540`	`storage_cbegin() const;`
`@@ -1331,6 +1331,7 @@ namespace xt`
`1331`	`1331`	`if (!m_strides_computed)`
`1332`	`1332`	`{`
`1333`	`1333`	`compute_strides(std::integral_constant<bool, has_trivial_strides>{});`
	`1334`	`+ m_strides_computed = true;`
`1334`	`1335`	`}`
`1335`	`1336`	`return m_data_offset;`
`1336`	`1337`	`}`