Armadillo 15.6.1

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2026-10-02  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/armadillo*: Armadillo 15.6.1
+
 2026-09-07  Dirk Eddelbuettel  <edd@debian.org>
 
 	* inst/include/armadillo*: Armadillo 15.6.0

inst/include/armadillo_bits/arma_version.hpp

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

inst/include/armadillo_bits/glue_cubemul_bones.hpp

@@ -38,6 +38,9 @@ struct glue_cubemul
   template<typename eT, bool do_strans_A, bool do_htrans_A, bool do_strans_B, bool do_htrans_B>
   inline static void apply_noalias(Cube<eT>& out, const Cube<eT>& A, const Mat<eT>& B);
 
+  template<typename eT, bool do_strans_A, bool do_htrans_A, bool do_strans_B, bool do_htrans_B>
+  inline static void apply_noalias_single(Cube<eT>& out, const Cube<eT>& A);
+  
   //
 
   template<typename T1, typename T2>

inst/include/armadillo_bits/glue_cubemul_meat.hpp

@@ -162,6 +162,17 @@ glue_cubemul::apply_noalias(Cube<eT>& out, const Cube<eT>& A, const Cube<eT>& B)
   {
   arma_debug_sigprint();
 
+  constexpr bool has_xtrans = (do_strans_A || do_htrans_A || do_strans_B || do_htrans_B);
+  
+  if( has_xtrans && (&A == &B) )
+    {
+    arma_debug_print("optimisation for symmetric/hermitian result");
+    
+    glue_cubemul::apply_noalias_single<eT, do_strans_A, do_htrans_A, do_strans_B, do_htrans_B>(out, A);
+    
+    return;
+    }
+  
   const uword A_n_slices = A.n_slices;
 
   arma_conform_check( (A_n_slices != B.n_slices), "cubemul(): given cubes must have the same number of slices" );
@@ -226,6 +237,76 @@ glue_cubemul::apply_noalias(Cube<eT>& out, const Cube<eT>& A, const Cube<eT>& B)
 
 
 
+template<typename eT, bool do_strans_A, bool do_htrans_A, bool do_strans_B, bool do_htrans_B>
+inline
+void
+glue_cubemul::apply_noalias_single(Cube<eT>& out, const Cube<eT>& A)
+  {
+  arma_debug_sigprint();
+  
+  const uword A_n_slices = A.n_slices;
+  
+  constexpr bool do_xtrans_A = (do_strans_A || do_htrans_A);
+  constexpr bool do_xtrans_B = (do_strans_B || do_htrans_B);
+  
+  const uword final_A_n_rows = (do_xtrans_A == false) ? A.n_rows : A.n_cols;
+  const uword final_A_n_cols = (do_xtrans_A == false) ? A.n_cols : A.n_rows;
+  
+  const uword final_B_n_rows = (do_xtrans_B == false) ? A.n_rows : A.n_cols;
+  const uword final_B_n_cols = (do_xtrans_B == false) ? A.n_cols : A.n_rows;
+  
+  if( (arma_config::check_conform) && (final_A_n_cols != final_B_n_rows) )
+    {
+    std::ostringstream tmp;
+    
+    tmp << "cubemul(): incompatible dimensions: " << final_A_n_rows << 'x' << final_A_n_cols << 'x' << A_n_slices << " and " << final_B_n_rows << 'x' << final_B_n_cols << 'x' << A_n_slices;
+    
+    arma_stop_logic_error(tmp.str());
+    }
+  
+  out.set_size(final_A_n_rows, final_B_n_cols, A_n_slices);
+  
+  if(out.is_empty())  { return; }
+  
+  if(A.is_empty())  { out.zeros(); return; }
+  
+  for(uword s=0; s < A_n_slices; ++s)
+    {
+    const Mat<eT> A_slice_s(const_cast<eT*>(A.slice_memptr(s)), A.n_rows, A.n_cols, false, true);
+    
+    Mat<eT> out_slice_s(out.slice_memptr(s), final_A_n_rows, final_B_n_cols, false, true);
+    
+    // glue_times has optimised handling for A*A' and A'*A 
+    
+    if( (do_xtrans_A == false) && (do_xtrans_B == false) )
+      {
+      out_slice_s = A_slice_s * A_slice_s;
+      }
+    else
+    if( (do_xtrans_A == false) && (do_xtrans_B == true ) )
+      {
+           if(do_strans_B)  { out_slice_s = A_slice_s * strans(A_slice_s); }
+      else if(do_htrans_B)  { out_slice_s = A_slice_s * htrans(A_slice_s); }
+      }
+    else
+    if( (do_xtrans_A == true ) && (do_xtrans_B == false) )
+      {
+           if(do_strans_A)  { out_slice_s = strans(A_slice_s) * A_slice_s; }
+      else if(do_htrans_A)  { out_slice_s = htrans(A_slice_s) * A_slice_s; }
+      }
+    else
+    if( (do_xtrans_A == true ) && (do_xtrans_B == true ) )
+      {
+           if( (do_strans_A) && (do_strans_B) )  { out_slice_s = strans(A_slice_s) * strans(A_slice_s); }
+      else if( (do_strans_A) && (do_htrans_B) )  { out_slice_s = strans(A_slice_s) * htrans(A_slice_s); }
+      else if( (do_htrans_A) && (do_strans_B) )  { out_slice_s = htrans(A_slice_s) * strans(A_slice_s); }
+      else if( (do_htrans_A) && (do_htrans_B) )  { out_slice_s = htrans(A_slice_s) * htrans(A_slice_s); }
+      }
+    }
+  }
+
+
+
 //
 
 

inst/include/armadillo_bits/op_pinv_meat.hpp

@@ -306,7 +306,7 @@ op_pinv::apply_gen(Mat<eT>& out, Mat<eT>& A, typename get_pod_type<eT>::result t
     }
   else
     {
-    auxlib::svd_econ(U, s, V, A, 'b');
+    status = auxlib::svd_econ(U, s, V, A, 'b');
     }
 
   if(status == false)  { return false; }