From acd2a5fcad85d77dcddbc2e62d14510f84e2124b Mon Sep 17 00:00:00 2001 From: conrad Date: Fri, 17 Jan 2025 13:37:58 +1000 Subject: [PATCH] optimisations for common cases --- include/armadillo_bits/op_reshape_meat.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/armadillo_bits/op_reshape_meat.hpp b/include/armadillo_bits/op_reshape_meat.hpp index e6a43651..47b8ec7d 100644 --- a/include/armadillo_bits/op_reshape_meat.hpp +++ b/include/armadillo_bits/op_reshape_meat.hpp @@ -213,7 +213,11 @@ op_reshape::apply_cube_inplace(Cube& A, const uword new_n_rows, const uword if(A.is_empty()) { A.zeros(new_n_rows, new_n_cols, new_n_slices); return; } - if( (A.n_rows == new_n_cols) && (A.n_cols == new_n_rows) && (A.n_slices == new_n_slices) ) { A.set_size(new_n_rows, new_n_cols, new_n_slices); return; } + const bool is_into_colvec = ( (new_n_cols == uword(1)) && (new_n_rows == A.n_elem) && (new_n_slices == uword(1) ); + const bool is_into_rowvec = ( (new_n_rows == uword(1)) && (new_n_cols == A.n_elem) && (new_n_slices == uword(1) ); + const bool is_rowcol_swap = ( (A.n_rows == new_n_cols) && (A.n_cols == new_n_rows) && (A.n_slices == new_n_slices) ); + + if(is_into_colvec || is_into_rowvec || is_rowcol_swap) { A.set_size(new_n_rows, new_n_cols, new_n_slices); return; } Cube B(new_n_rows, new_n_cols, new_n_slices, arma_nozeros_indicator());