Sync with Armadillo 15.2.3

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2025-12-16  Dirk Eddelbuettel  <[email protected]>
+
+	* inst/include/current/: Sync with Armadillo 15.2.3
+
 2025-12-08  Dirk Eddelbuettel  <[email protected]>
 
 	* .github/workflows/ci.yaml: No longer need to select 'dev' version

inst/include/current/armadillo_bits/Mat_meat.hpp

@@ -49,7 +49,7 @@ Mat<eT>::Mat()
   , n_alloc(0)
   , vec_state(0)
   , mem_state(0)
-  , mem()
+  , mem(nullptr)
   {
   arma_debug_sigprint_this(this);
   }
@@ -312,15 +312,10 @@ Mat<eT>::init_cold()
     const char* error_message = "Mat::init(): requested size is too large; suggest to enable ARMA_64BIT_WORD";
   #endif
 
-  arma_conform_check
-    (
-      (
-      ( (n_rows > ARMA_MAX_UHWORD) || (n_cols > ARMA_MAX_UHWORD) )
-        ? ( (double(n_rows) * double(n_cols)) > double(ARMA_MAX_UWORD) )
-        : false
-      ),
-    error_message
-    );
+  if( (n_rows > ARMA_MAX_UHWORD) || (n_cols > ARMA_MAX_UHWORD) )
+    {
+    arma_conform_check( ( (double(n_rows) * double(n_cols)) > double(ARMA_MAX_UWORD) ), error_message );
+    }
 
   if(n_elem <= arma_config::mat_prealloc)
     {
@@ -383,17 +378,10 @@ Mat<eT>::init_warm(uword in_n_rows, uword in_n_cols)
     const char* error_message_4 = "Mat::init(): requested size is too large; suggest to enable ARMA_64BIT_WORD";
   #endif
 
-  arma_conform_set_error
-    (
-    err_state,
-    err_msg,
-      (
-      ( (in_n_rows > ARMA_MAX_UHWORD) || (in_n_cols > ARMA_MAX_UHWORD) )
-        ? ( (double(in_n_rows) * double(in_n_cols)) > double(ARMA_MAX_UWORD) )
-        : false
-      ),
-    error_message_4
-    );
+  if( (in_n_rows > ARMA_MAX_UHWORD) || (in_n_cols > ARMA_MAX_UHWORD) )
+    {
+    arma_conform_set_error( err_state, err_msg, ( (double(in_n_rows) * double(in_n_cols)) > double(ARMA_MAX_UWORD) ), error_message_4 );
+    }
 
   arma_conform_check(err_state, err_msg);
 
@@ -7580,10 +7568,40 @@ Mat<eT>::resize(const uword new_n_elem)
   {
   arma_debug_sigprint();
 
-  const uword new_n_rows = (vec_state == 2) ? uword(1         ) : uword(new_n_elem);
-  const uword new_n_cols = (vec_state == 2) ? uword(new_n_elem) : uword(1         );
+  const bool reuse_mem = 
+    ( is_vec() && (mem_state == 0) )
+    &&
+    (
+         ( (new_n_elem <= arma_config::mat_prealloc) && (n_elem <= arma_config::mat_prealloc) && (    n_elem >  0      ) )
+      || ( (new_n_elem >  arma_config::mat_prealloc) && (n_elem >  arma_config::mat_prealloc) && (new_n_elem <= n_alloc) )
+    );
+  
+  if(reuse_mem)
+    {
+    arma_debug_print("Mat::resize(): reusing memory");
+    
+    if(new_n_elem > n_elem)
+      {
+      arma_debug_print("Mat::resize(): zeroing memory");
+      
+      eT* t_mem = (*this).memptr();   // the (n_elem > 0) check above ensures that (*this).memptr() is a valid pointer
+      
+      for(uword ii = n_elem; ii < new_n_elem; ++ii)  { t_mem[ii] = eT(0); }
+      }
+    
+    access::rw(n_rows) = (vec_state == 2) ? uword(1         ) : uword(new_n_elem);
+    access::rw(n_cols) = (vec_state == 2) ? uword(new_n_elem) : uword(1         );
+    access::rw(n_elem) = new_n_elem;
+    }
+  else
+    {
+    const uword new_n_rows = (vec_state == 2) ? uword(1         ) : uword(new_n_elem);
+    const uword new_n_cols = (vec_state == 2) ? uword(new_n_elem) : uword(1         );
+    
+    (*this).resize(new_n_rows, new_n_cols);
+    }
 
-  return (*this).resize(new_n_rows, new_n_cols);
+  return (*this);
   }
 
 

inst/include/current/armadillo_bits/arma_version.hpp

@@ -23,7 +23,7 @@
 
 #define ARMA_VERSION_MAJOR 15
 #define ARMA_VERSION_MINOR 2
-#define ARMA_VERSION_PATCH 2
+#define ARMA_VERSION_PATCH 3
 #define ARMA_VERSION_NAME  "Medium Roast Deluxe"
 
 

inst/include/current/armadillo_bits/op_repmat_meat.hpp

@@ -153,15 +153,19 @@ op_repcube::apply_noalias(Cube<eT>& out, const Cube<eT>& X, const uword copies_p
 
   if(out.is_empty())  { return; }
 
-  // TODO: this is a rudimentary implementation
-  
-  const SizeCube X_size = SizeCube(X.n_rows, X.n_cols, X.n_slices);
-  
-  for(uword s = 0; s < out.n_slices; s += X.n_slices)
-  for(uword c = 0; c < out.n_cols;   c += X.n_cols  )
-  for(uword r = 0; r < out.n_rows;   r += X.n_rows  )
+  for(uword s=0; s < X.n_slices; ++s)
     {
-    out.subcube(r, c, s, X_size) = X;
+    // avoid use of Cube::slice() to prevent generating Mat objects that the user may not need
+    
+    const Mat<eT>   X_slice_s(const_cast<eT*>(X.slice_memptr(s)),   X.n_rows,   X.n_cols, false, true);
+          Mat<eT> out_slice_s(              out.slice_memptr(s) , out.n_rows, out.n_cols, false, true);
+    
+    op_repmat::apply_noalias(out_slice_s, X_slice_s, copies_per_row, copies_per_col);
+    
+    for(uword t=1; t < copies_per_slice; ++t)
+      {
+      arrayops::copy(out.slice_memptr(s + (t * X.n_slices)), out_slice_s.memptr(), out_slice_s.n_elem);
+      }
     }
   }
 

inst/include/current/armadillo_bits/op_resize_meat.hpp

@@ -81,7 +81,7 @@ op_resize::apply_mat_inplace(Mat<eT>& A, const uword new_n_rows, const uword new
   arma_conform_check( (A.vec_state == 1) && (new_n_cols != 1), "resize(): requested size is not compatible with column vector layout" );
   arma_conform_check( (A.vec_state == 2) && (new_n_rows != 1), "resize(): requested size is not compatible with row vector layout"    );
 
-  if(A.is_empty())  { A.zeros(new_n_rows, new_n_cols); return; }
+  if( A.is_empty() || (new_n_rows == 0) || (new_n_cols == 0) )  { A.zeros(new_n_rows, new_n_cols); return; }
 
   Mat<eT> B(new_n_rows, new_n_cols, arma_nozeros_indicator());