Merge pull request #393 from RcppCore/feature/arma_11.4

RcppArmadillo 0.11.4.0.0 with Armadillo 11.4.0

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,18 @@
+2022-09-22  Dirk Eddelbuettel  <[email protected]>
+
+	* DESCRIPTION (Version): RcppArmadillo 0.11.4.0.0
+        * inst/NEWS.Rd: Idem
+        * configure.ac: Idem
+        * configure: Idem
+
+	* inst/include/armadillo: Armadillo 11.4.0
+	* inst/include/armadillo_bits/: Idem
+
+2022-09-19  Dirk Eddelbuettel  <[email protected]>
+
+	* inst/include/armadillo: Armadillo 11.4.rc1
+	* inst/include/armadillo_bits/: Idem
+
 2022-09-09  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION (Version): RcppArmadillo 0.11.2.4.0

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 0.11.2.4.0
-Date: 2022-09-07
+Version: 0.11.4.0.0
+Date: 2022-09-22
 Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson
 Maintainer: Dirk Eddelbuettel <[email protected]>
 Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.11.2.4.0.
+# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.11.4.0.0.
 #
 # Report bugs to <[email protected]>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='RcppArmadillo'
 PACKAGE_TARNAME='rcpparmadillo'
-PACKAGE_VERSION='0.11.2.4.0'
-PACKAGE_STRING='RcppArmadillo 0.11.2.4.0'
+PACKAGE_VERSION='0.11.4.0.0'
+PACKAGE_STRING='RcppArmadillo 0.11.4.0.0'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1229,7 +1229,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RcppArmadillo 0.11.2.4.0 to adapt to many kinds of systems.
+\`configure' configures RcppArmadillo 0.11.4.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1291,7 +1291,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RcppArmadillo 0.11.2.4.0:";;
+     short | recursive ) echo "Configuration of RcppArmadillo 0.11.4.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1372,7 +1372,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-RcppArmadillo configure 0.11.2.4.0
+RcppArmadillo configure 0.11.4.0.0
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1486,7 +1486,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RcppArmadillo $as_me 0.11.2.4.0, which was
+It was created by RcppArmadillo $as_me 0.11.4.0.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3944,7 +3944,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by RcppArmadillo $as_me 0.11.2.4.0, which was
+This file was extended by RcppArmadillo $as_me 0.11.4.0.0, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3999,7 +3999,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-RcppArmadillo config.status 0.11.2.4.0
+RcppArmadillo config.status 0.11.4.0.0
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -11,7 +11,7 @@
 AC_PREREQ([2.69])
 
 ## Process this file with autoconf to produce a configure script.
-AC_INIT([RcppArmadillo],[0.11.2.4.0],[[email protected]])
+AC_INIT([RcppArmadillo],[0.11.4.0.0],[[email protected]])
 
 ## Set R_HOME, respecting an environment variable if one is set
 : ${R_HOME=$(R RHOME)}

inst/NEWS.Rd

@@ -3,6 +3,17 @@
 \newcommand{\ghpr}{\href{https://github.com/RcppCore/RcppArmadillo/pull/#1}{##1}}
 \newcommand{\ghit}{\href{https://github.com/RcppCore/RcppArmadillo/issues/#1}{##1}}
 
+\section{Changes in RcppArmadillo version 0.11.4.0.0 (2022-09-22}{
+  \itemize{
+    \item Upgraded to Armadillo release 11.4.0 (Ship of Theseus)
+    \itemize{
+      \item faster handling of compound expressions by \code{sum()}
+      \item extended \code{pow()} with various forms of element-wise power operations
+      \item added \code{find_nan()} to find indices of NaN elements
+    }
+  }
+}
+
 \section{Changes in RcppArmadillo version 0.11.2.4.0 (2022-09-09}{
   \itemize{
     \item Upgraded to Armadillo release 11.2.4 (Classic Roast)

inst/include/armadillo

@@ -330,6 +330,7 @@ namespace arma
   #include "armadillo_bits/glue_affmul_bones.hpp"
   #include "armadillo_bits/glue_mvnrnd_bones.hpp"
   #include "armadillo_bits/glue_quantile_bones.hpp"
+  #include "armadillo_bits/glue_powext_bones.hpp"
 
   #include "armadillo_bits/gmm_misc_bones.hpp"
   #include "armadillo_bits/gmm_diag_bones.hpp"
@@ -559,6 +560,7 @@ namespace arma
   #include "armadillo_bits/fn_randperm.hpp"
   #include "armadillo_bits/fn_quantile.hpp"
   #include "armadillo_bits/fn_powmat.hpp"
+  #include "armadillo_bits/fn_powext.hpp"
 
   #include "armadillo_bits/fn_speye.hpp"
   #include "armadillo_bits/fn_spones.hpp"
@@ -763,6 +765,7 @@ namespace arma
   #include "armadillo_bits/glue_affmul_meat.hpp"
   #include "armadillo_bits/glue_mvnrnd_meat.hpp"
   #include "armadillo_bits/glue_quantile_meat.hpp"
+  #include "armadillo_bits/glue_powext_meat.hpp"
 
   #include "armadillo_bits/gmm_misc_meat.hpp"
   #include "armadillo_bits/gmm_diag_meat.hpp"

inst/include/armadillo_bits/Col_meat.hpp

@@ -311,10 +311,9 @@ Col<eT>::Col(const std::vector<eT>& x)
   {
   arma_extra_debug_sigprint_this(this);
 
-  if(x.size() > 0)
-    {
-    arrayops::copy( Mat<eT>::memptr(), &(x[0]), uword(x.size()) );
-    }
+  const uword N = uword(x.size());
+  
+  if(N > 0)  { arrayops::copy( Mat<eT>::memptr(), &(x[0]), N ); }
   }
 
 
@@ -327,12 +326,11 @@ Col<eT>::operator=(const std::vector<eT>& x)
   {
   arma_extra_debug_sigprint();
 
-  Mat<eT>::init_warm(uword(x.size()), 1);
+  const uword N = uword(x.size());
 
-  if(x.size() > 0)
-    {
-    arrayops::copy( Mat<eT>::memptr(), &(x[0]), uword(x.size()) );
-    }
+  Mat<eT>::init_warm(N, 1);
+  
+  if(N > 0)  { arrayops::copy( Mat<eT>::memptr(), &(x[0]), N ); }
 
   return *this;
   }
@@ -342,11 +340,13 @@ Col<eT>::operator=(const std::vector<eT>& x)
 template<typename eT>
 inline
 Col<eT>::Col(const std::initializer_list<eT>& list)
-  : Mat<eT>(arma_vec_indicator(), 1)
+  : Mat<eT>(arma_vec_indicator(), uword(list.size()), 1, 1)
   {
-  arma_extra_debug_sigprint();
+  arma_extra_debug_sigprint_this(this);
 
-  (*this).operator=(list);
+  const uword N = uword(list.size());
+  
+  if(N > 0)  { arrayops::copy( Mat<eT>::memptr(), list.begin(), N ); }
   }
 
 
@@ -358,14 +358,11 @@ Col<eT>::operator=(const std::initializer_list<eT>& list)
   {
   arma_extra_debug_sigprint();
 
-  Mat<eT> tmp(list);
-  
-  arma_debug_check( ((tmp.n_elem > 0) && (tmp.is_vec() == false)), "Mat::init(): requested size is not compatible with column vector layout" );
+  const uword N = uword(list.size());
 
-  access::rw(tmp.n_rows) = tmp.n_elem;
-  access::rw(tmp.n_cols) = 1;
+  Mat<eT>::init_warm(N, 1);
 
-  (*this).steal_mem(tmp);
+  if(N > 0)  { arrayops::copy( Mat<eT>::memptr(), list.begin(), N ); }
 
   return *this;
   }
@@ -423,14 +420,6 @@ Col<eT>::operator=(Col<eT>&& X)
 
   (*this).steal_mem(X, true);
 
-  if( (X.mem_state == 0) && (X.n_alloc <= arma_config::mat_prealloc) && (this != &X) )
-    {
-    access::rw(X.n_rows) = 0;
-    access::rw(X.n_cols) = 1;
-    access::rw(X.n_elem) = 0;
-    access::rw(X.mem)    = nullptr;
-    }
-  
   return *this;
   }
 

inst/include/armadillo_bits/Cube_bones.hpp

@@ -201,9 +201,13 @@ class Cube : public BaseCube< eT, Cube<eT> >
 
   template<typename T1> inline void shed_slices(const Base<uword, T1>& indices);
 
-  inline void insert_rows(const uword row_num, const uword N, const bool set_to_zero = true);
-  inline void insert_cols(const uword row_num, const uword N, const bool set_to_zero = true);
-  inline void insert_slices(const uword slice_num, const uword N, const bool set_to_zero = true);
+  arma_deprecated inline void insert_rows(const uword row_num, const uword N, const bool set_to_zero);
+  arma_deprecated inline void insert_cols(const uword row_num, const uword N, const bool set_to_zero);
+  arma_deprecated inline void insert_slices(const uword slice_num, const uword N, const bool set_to_zero);
+  
+  inline void insert_rows(const uword row_num, const uword N);
+  inline void insert_cols(const uword row_num, const uword N);
+  inline void insert_slices(const uword slice_num, const uword N);
 
   template<typename T1> inline void insert_rows(const uword row_num, const BaseCube<eT,T1>& X);
   template<typename T1> inline void insert_cols(const uword col_num, const BaseCube<eT,T1>& X);