Armadillo 15.2

eddelbuettel · eddelbuettel · commit 305fe0dfdde2 · 2025-10-20T07:25:14.000-05:00
diff --git a/inst/include/current/armadillo_bits/Col_meat.hpp b/inst/include/current/armadillo_bits/Col_meat.hpp
@@ -1264,6 +1264,13 @@ Col<eT>::end_row(const uword row_num) const
 
 
 
+
+
+
+//
+
+
+
 template<typename eT>
 template<uword fixed_n_elem>
 arma_inline
@@ -1859,6 +1866,10 @@ Col<eT>::fixed<fixed_n_elem>::ones()
 
 
 
+//
+
+
+
 template<typename eT>
 inline
 Col<eT>::Col(const arma_fixed_indicator&, const uword in_n_elem, const eT* in_mem)
diff --git a/inst/include/current/armadillo_bits/Cube_meat.hpp b/inst/include/current/armadillo_bits/Cube_meat.hpp
@@ -3148,7 +3148,7 @@ Cube<eT>::Cube(const GlueCube<T1, T2, glue_type>& X)
   {
   arma_debug_sigprint_this(this);
   
-  this->operator=(X);
+  (*this).operator=(X);
   }
 
 
diff --git a/inst/include/current/armadillo_bits/Mat_bones.hpp b/inst/include/current/armadillo_bits/Mat_bones.hpp
@@ -120,7 +120,7 @@ class Mat : public Base< eT, Mat<eT> >
   template<typename T1, typename T2> inline explicit Mat(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B, const arma_vec_indicator&, const uhword in_vec_state);
   template<typename T1, typename T2> inline explicit Mat(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B);
   
-  inline explicit    Mat(const subview<eT>& X, const bool use_colmem);  // only to be used by the quasi_unwrap class
+  inline explicit    Mat(const subview<eT>& X, const bool reuse_mem);  // only to be used by quasi_unwrap and partial_unwrap
   
   inline             Mat(const subview<eT>& X, const arma_vec_indicator&, const uhword in_vec_state);
   inline             Mat(const subview<eT>& X);
diff --git a/inst/include/current/armadillo_bits/Mat_meat.hpp b/inst/include/current/armadillo_bits/Mat_meat.hpp
@@ -2021,18 +2021,18 @@ Mat<eT>::Mat(const Base<typename Mat<eT>::pod_type,T1>& A, const Base<typename M
 
 template<typename eT>
 inline
-Mat<eT>::Mat(const subview<eT>& X, const bool use_colmem)
+Mat<eT>::Mat(const subview<eT>& X, const bool reuse_mem)
   : n_rows(X.n_rows)
   , n_cols(X.n_cols)
   , n_elem(X.n_elem)
   , n_alloc(0)
   , vec_state(0)
-  , mem_state(use_colmem ? 3 : 0)
-  , mem      (use_colmem ? X.colptr(0) : nullptr)
+  , mem_state(reuse_mem ? 3           : 0      )
+  , mem      (reuse_mem ? X.colptr(0) : nullptr)
   {
   arma_debug_sigprint_this(this);
   
-  if(use_colmem)
+  if(reuse_mem)
     {
     arma_debug_print("Mat::Mat(): using existing memory in a submatrix");
     }
diff --git a/inst/include/current/armadillo_bits/Row_bones.hpp b/inst/include/current/armadillo_bits/Row_bones.hpp
@@ -85,8 +85,6 @@ class Row : public Mat<eT>
   template<typename T1, typename T2>
   inline explicit Row(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B);
   
-  inline explicit Row(const subview<eT>& X, const bool use_colmem);  // only to be used by the quasi_unwrap class
-  
   template<typename T1> inline            Row(const BaseCube<eT,T1>& X);
   template<typename T1> inline Row& operator=(const BaseCube<eT,T1>& X);
   
@@ -171,6 +169,9 @@ class Row : public Mat<eT>
   inline const_row_iterator end_row  (const uword row_num) const;
   
   
+  inline explicit Row(const subview<eT>& X, const bool reuse_mem);  // only to be used by the partial_unwrap class
+  
+  
   template<uword fixed_n_elem> class fixed;
   
   
diff --git a/inst/include/current/armadillo_bits/Row_meat.hpp b/inst/include/current/armadillo_bits/Row_meat.hpp
@@ -610,16 +610,6 @@ Row<eT>::Row
 
 
 
-template<typename eT>
-inline
-Row<eT>::Row(const subview<eT>& X, const bool use_colmem)
-  : Mat<eT>(X, use_colmem)
-  {
-  arma_debug_sigprint();
-  }
-
-
-
 template<typename eT>
 template<typename T1>
 inline
@@ -1274,6 +1264,20 @@ Row<eT>::end_row(const uword row_num) const
 
 
 
+template<typename eT>
+inline
+Row<eT>::Row(const subview<eT>& X, const bool reuse_mem)
+  : Mat<eT>(X, reuse_mem)
+  {
+  arma_debug_sigprint_this(this);
+  }
+
+
+
+//
+
+
+
 template<typename eT>
 template<uword fixed_n_elem>
 arma_inline
@@ -1869,6 +1873,10 @@ Row<eT>::fixed<fixed_n_elem>::ones()
 
 
 
+//
+
+
+
 template<typename eT>
 inline
 Row<eT>::Row(const arma_fixed_indicator&, const uword in_n_elem, const eT* in_mem)
diff --git a/inst/include/current/armadillo_bits/arma_version.hpp b/inst/include/current/armadillo_bits/arma_version.hpp
@@ -22,9 +22,9 @@
 
 
 #define ARMA_VERSION_MAJOR 15
-#define ARMA_VERSION_MINOR 1
-#define ARMA_VERSION_PATCH 91
-#define ARMA_VERSION_NAME  "15.2-RC1"
+#define ARMA_VERSION_MINOR 2
+#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_NAME  "Medium Roast Deluxe"
 
 
 
diff --git a/inst/include/current/armadillo_bits/field_meat.hpp b/inst/include/current/armadillo_bits/field_meat.hpp
@@ -94,7 +94,7 @@ field<oT>::field(const subview_field<oT>& X)
   {
   arma_debug_sigprint_this(this);
   
-  this->operator=(X);
+  (*this).operator=(X);
   }
 
 
diff --git a/inst/include/current/armadillo_bits/op_accu_bones.hpp b/inst/include/current/armadillo_bits/op_accu_bones.hpp
@@ -65,6 +65,9 @@ struct  op_accu_mat
   
   template<typename eT>
   static inline eT apply(const subview_col<eT>& X);
+  
+  template<typename eT>
+  static inline eT apply(const subview_row<eT>& X);
   };
 
 
diff --git a/inst/include/current/armadillo_bits/op_accu_meat.hpp b/inst/include/current/armadillo_bits/op_accu_meat.hpp
@@ -121,20 +121,6 @@ op_accu_mat::apply(const T1& X)
     return arrayops::accumulate(U.M.memptr(), U.M.n_elem);
     }
   
-  if(is_subview_row<T1>::value)
-    {
-    typedef typename T1::elem_type eT;
-    
-    const subview_row<eT>& sv = reinterpret_cast< const subview_row<eT>& >(X);
-    
-    if(sv.m.n_rows == 1)
-      {
-      const eT* sv_mem = &(sv.m.at(sv.aux_col1));
-      
-      return arrayops::accumulate(sv_mem, sv.n_elem);
-      }
-    }
-  
   const Proxy<T1> P(X);
   
   return (Proxy<T1>::use_at) ? op_accu_mat::apply_proxy_at(P) : op_accu_mat::apply_proxy_linear(P);
@@ -616,19 +602,7 @@ op_accu_mat::apply(const subview<eT>& X)
   const uword X_n_rows = X.n_rows;
   const uword X_n_cols = X.n_cols;
   
-  if(X_n_rows == 1)
-    {
-    const Mat<eT>& m = X.m;
-    
-    const uword col_offset = X.aux_col1;
-    const uword row_offset = X.aux_row1;
-    
-    eT val = eT(0);
-    
-    for(uword i=0; i < X_n_cols; ++i)  { val += m.at(row_offset, col_offset + i); }
-    
-    return val;
-    }
+  if(X_n_rows == 1)  { return op_accu_mat::apply( static_cast< const subview_row<eT>& >(X) ); }
   
   if(X_n_cols == 1)  { return arrayops::accumulate( X.colptr(0), X_n_rows ); }
   
@@ -656,6 +630,39 @@ op_accu_mat::apply(const subview_col<eT>& X)
 
 
 
+template<typename eT>
+inline
+eT
+op_accu_mat::apply(const subview_row<eT>& X)
+  {
+  arma_debug_sigprint();  
+  
+  const uword X_m_n_rows = X.m.n_rows;
+  const uword X_n_cols   = X.n_cols;
+  
+  const eT* row_mem = &(X.m.at(X.aux_row1,X.aux_col1));
+  
+  eT val1 = eT(0);
+  eT val2 = eT(0);
+  
+  uword j;
+  
+  for(j=1; j < X_n_cols; j+=2)
+    {
+    val1 += (*row_mem); row_mem += X_m_n_rows;
+    val2 += (*row_mem); row_mem += X_m_n_rows;
+    }
+  
+  if((j-1) < X_n_cols)
+    {
+    val1 += (*row_mem);
+    }
+  
+  return val1 + val2;
+  }
+
+
+
 //
 
 
diff --git a/inst/include/current/armadillo_bits/subview_bones.hpp b/inst/include/current/armadillo_bits/subview_bones.hpp
@@ -171,8 +171,8 @@ class subview : public Base< eT, subview<eT> >
   inline       subview<eT> rows(const uword in_row1, const uword in_row2);
   inline const subview<eT> rows(const uword in_row1, const uword in_row2) const;
   
-  inline       subview<eT> cols(const uword in_col1, const uword in_col2);
-  inline const subview<eT> cols(const uword in_col1, const uword in_col2) const;
+  inline       subview<eT> cols(const uword in_col1, const uword in_col2);        // deliberately not returning subview_cols
+  inline const subview<eT> cols(const uword in_col1, const uword in_col2) const;  // deliberately not returning subview_cols
   
   inline       subview<eT> submat(const uword in_row1, const uword in_col1, const uword in_row2, const uword in_col2);
   inline const subview<eT> submat(const uword in_row1, const uword in_col1, const uword in_row2, const uword in_col2) const;
diff --git a/inst/include/current/armadillo_bits/unwrap.hpp b/inst/include/current/armadillo_bits/unwrap.hpp
@@ -396,7 +396,7 @@ struct quasi_unwrap< subview_row<eT> >
   static constexpr bool has_orig_mem = false;  // NOTE: set to false as this is the general case; original memory is only used when the subview is a contiguous chunk
   
   template<typename eT2>
-  arma_inline bool is_alias(const Mat<eT2>& X) const { return (sv.m.n_rows == 1) ? (void_ptr(&X) == void_ptr(&(sv.m))) : false; }
+  arma_inline bool is_alias(const Mat<eT2>& X) const { return (is_same_type<eT,eT2>::yes) && ( (sv.m.n_rows == 1) ? (void_ptr(&X) == void_ptr(&(sv.m))) : false ); }
   };
 
 
@@ -1428,7 +1428,7 @@ struct partial_unwrap< subview_cols<eT> >
 template<typename eT>
 struct partial_unwrap< subview_row<eT> >
   {
-  typedef Mat<eT> stored_type;
+  typedef Row<eT> stored_type;
   
   inline
   partial_unwrap(const subview_row<eT>& A)
@@ -1445,10 +1445,10 @@ struct partial_unwrap< subview_row<eT> >
   
   static constexpr bool do_trans = false;
   static constexpr bool do_times = false;
-  static constexpr bool is_fast  = true;
+  static constexpr bool is_fast  = false;  // can't determine at compile time that memory is reused
   
   const subview_row<eT>& sv;
-  const Mat<eT>          M;
+  const Row<eT>          M;
   };
 
 

Original file line number	Diff line number	Diff line change
`@@ -3148,7 +3148,7 @@ Cube<eT>::Cube(const GlueCube<T1, T2, glue_type>& X)`
`3148`	`3148`	`{`
`3149`	`3149`	`arma_debug_sigprint_this(this);`
`3150`	`3150`
`3151`		`- this->operator=(X);`
	`3151`	`+ (*this).operator=(X);`
`3152`	`3152`	`}`
`3153`	`3153`
`3154`	`3154`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ field<oT>::field(const subview_field<oT>& X)`
`94`	`94`	`{`
`95`	`95`	`arma_debug_sigprint_this(this);`
`96`	`96`
`97`		`- this->operator=(X);`
	`97`	`+ (*this).operator=(X);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`