Armadillo 15.0.1

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2025-08-22  Dirk Eddelbuettel  <[email protected]>
+
+	* inst/include/current/: Armadillo 15.0.1
+
 2025-08-21  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION (Version, Date): RcppArmadillo 15.0.0-1

inst/include/current/armadillo_bits/arma_version.hpp

@@ -23,7 +23,7 @@
 
 #define ARMA_VERSION_MAJOR 15
 #define ARMA_VERSION_MINOR 0
-#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_PATCH 1
 #define ARMA_VERSION_NAME  "Medium Roast"
 
 

inst/include/current/armadillo_bits/fn_repmat.hpp

@@ -61,4 +61,34 @@ repcube(const BaseCube<typename T1::elem_type,T1>& A, const uword r, const uword
 
 
 
+template<typename T1>
+arma_warn_unused
+inline
+Cube<typename T1::elem_type>
+repcube(const Base<typename T1::elem_type,T1>& A, const uword copies_per_row, const uword copies_per_col, const uword copies_per_slice)
+  {
+  arma_debug_sigprint();
+  
+  typedef typename T1::elem_type eT;
+  
+  const Mat<eT> B = arma::repmat(A.get_ref(), copies_per_row, copies_per_col);
+  
+  const eT*   B_mem    = B.memptr();
+  const uword B_n_elem = B.n_elem;
+  
+  Cube<eT> out(B.n_rows, B.n_cols, copies_per_slice);
+  
+  if( (B_n_elem > 0) && (out.n_elem > 0) )
+    {
+    for(uword s=0; s < copies_per_slice; ++s)
+      {
+      arrayops::copy(out.slice_memptr(s), B_mem, B_n_elem);
+      }
+    }
+  
+  return out;
+  }
+
+
+
 //! @}

inst/include/current/armadillo_bits/op_dot_bones.hpp

@@ -30,10 +30,10 @@ struct op_dot
   typename arma_not_cx<eT>::result
   direct_dot_generic(const uword n_elem, const eT* const A, const eT* const B);
 
-  template<typename eT>
-  arma_hot inline static
-  typename arma_not_cx<eT>::result
-  direct_dot_generic_force_optimise(const uword n_elem, const eT* const A, const eT* const B);
+  // template<typename eT>
+  // arma_hot inline static
+  // typename arma_not_cx<eT>::result
+  // direct_dot_generic_force_optimise(const uword n_elem, const eT* const A, const eT* const B);
 
   template<typename eT>
   arma_hot inline static

inst/include/current/armadillo_bits/op_dot_meat.hpp

@@ -62,47 +62,53 @@ op_dot::direct_dot_generic(const uword n_elem, const eT* const A, const eT* cons
 
 
 
-//! generic version for non-complex values with forced optimisation under GCC
-template<typename eT>
-#if defined(ARMA_REAL_GCC) && !defined(ARMA_DONT_FORCE_OPTIMISE_DOT)
-__attribute__((optimize("O3", "fast-math")))
-#endif
-inline
-typename arma_not_cx<eT>::result
-op_dot::direct_dot_generic_force_optimise(const uword n_elem, const eT* const A, const eT* const B)
-  {
-  arma_debug_sigprint();
-  
-  #if defined(__FAST_MATH__)
-    {
-    eT val = eT(0);
-    
-    for(uword i=0; i < n_elem; ++i)  { val += (A[i] * B[i]); }
-    
-    return val;
-    }
-  #else
-    {
-    eT val1 = eT(0);
-    eT val2 = eT(0);
-    
-    uword i, j;
-    
-    for(i=0, j=1; j < n_elem; i+=2, j+=2)
-      {
-      val1 += (A[i] * B[i]);
-      val2 += (A[j] * B[j]);
-      }
-    
-    if(i < n_elem)
-      {
-      val1 += (A[i] * B[i]);
-      }
-    
-    return (val1 + val2);
-    }
-  #endif
-  }
+// //! generic version for non-complex values with forced SIMD optimisation under OpenMP
+// template<typename eT>
+// inline
+// typename arma_not_cx<eT>::result
+// op_dot::direct_dot_generic_force_optimise(const uword n_elem, const eT* const A, const eT* const B)
+//   {
+//   arma_debug_sigprint();
+//   
+//   #if defined(ARMA_USE_OPENMP)
+//     {
+//     eT val = eT(0);
+//     
+//     #pragma omp simd
+//     for(uword i=0; i < n_elem; ++i)  { val += (A[i] * B[i]); }
+//     
+//     return val;
+//     }
+//   #elif defined(__FAST_MATH__)
+//     {
+//     eT val = eT(0);
+//     
+//     for(uword i=0; i < n_elem; ++i)  { val += (A[i] * B[i]); }
+//     
+//     return val;
+//     }
+//   #else
+//     {
+//     eT val1 = eT(0);
+//     eT val2 = eT(0);
+//     
+//     uword i, j;
+//     
+//     for(i=0, j=1; j < n_elem; i+=2, j+=2)
+//       {
+//       val1 += (A[i] * B[i]);
+//       val2 += (A[j] * B[j]);
+//       }
+//     
+//     if(i < n_elem)
+//       {
+//       val1 += (A[i] * B[i]);
+//       }
+//     
+//     return (val1 + val2);
+//     }
+//   #endif
+//   }
 
 
 
@@ -209,7 +215,9 @@ op_dot::direct_dot(const uword n_elem, const eT* const A, const eT* const B)
   {
   arma_debug_sigprint();
 
-  return (n_elem <= 32u) ? op_dot::direct_dot_generic(n_elem, A, B) : op_dot::direct_dot_generic_force_optimise(n_elem, A, B);
+  // return (n_elem <= 32u) ? op_dot::direct_dot_generic(n_elem, A, B) : op_dot::direct_dot_generic_force_optimise(n_elem, A, B);
+  
+  return op_dot::direct_dot_generic(n_elem, A, B);
   }