RcppArmadillo 0.11.2.3.0 with Armadillo 11.2.3

ChangeLog

@@ -1,3 +1,13 @@
+2022-07-12  Dirk Eddelbuettel  <edd@debian.org>
+
+	* DESCRIPTION (Version): RcppArmadillo 0.11.2.3.0
+        * inst/NEWS.Rd: Idem
+        * configure.ac: Idem
+        * configure: Idem
+
+	* inst/include/armadillo: Armadillo 11.2.3
+	* inst/include/armadillo_bits/: Idem
+
 2022-07-04  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version): RcppArmadillo 0.11.2.2.0

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 0.11.2.2.0
-Date: 2022-07-04
+Version: 0.11.2.3.0
+Date: 2022-07-12
 Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
 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.2.0.
+# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.11.2.3.0.
 #
 # Report bugs to <edd@debian.org>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='RcppArmadillo'
 PACKAGE_TARNAME='rcpparmadillo'
-PACKAGE_VERSION='0.11.2.2.0'
-PACKAGE_STRING='RcppArmadillo 0.11.2.2.0'
+PACKAGE_VERSION='0.11.2.3.0'
+PACKAGE_STRING='RcppArmadillo 0.11.2.3.0'
 PACKAGE_BUGREPORT='edd@debian.org'
 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.2.0 to adapt to many kinds of systems.
+\`configure' configures RcppArmadillo 0.11.2.3.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.2.0:";;
+     short | recursive ) echo "Configuration of RcppArmadillo 0.11.2.3.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.2.0
+RcppArmadillo configure 0.11.2.3.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.2.0, which was
+It was created by RcppArmadillo $as_me 0.11.2.3.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.2.0, which was
+This file was extended by RcppArmadillo $as_me 0.11.2.3.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.2.0
+RcppArmadillo config.status 0.11.2.3.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.2.0],[edd@debian.org])
+AC_INIT([RcppArmadillo],[0.11.2.3.0],[edd@debian.org])
 
 ## Set R_HOME, respecting an environment variable if one is set
 : ${R_HOME=$(R RHOME)}

inst/NEWS.Rd

@@ -3,6 +3,15 @@
 \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.2.3.0 (2022-07-12) (GitHub Only)}{
+  \itemize{
+    \item Upgraded to Armadillo release 11.2.3 (Classic Roast)
+    \itemize{
+      \item fix \code{Cube::insert_slices()} to accept \code{Cube::slice()} as input
+    }
+  }
+}
+
 \section{Changes in RcppArmadillo version 0.11.2.2.0 (2022-07-04) (GitHub Only)}{
   \itemize{
     \item Upgraded to Armadillo release 11.2.2 (Classic Roast)

inst/include/armadillo_bits/Cube_bones.hpp

@@ -208,6 +208,7 @@ class Cube : public BaseCube< eT, Cube<eT> >
   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);
   template<typename T1> inline void insert_slices(const uword slice_num, const BaseCube<eT,T1>& X);
+  template<typename T1> inline void insert_slices(const uword slice_num, const     Base<eT,T1>& X);
 
 
   template<typename gen_type> inline             Cube(const GenCube<eT, gen_type>& X);

inst/include/armadillo_bits/Cube_meat.hpp

@@ -2534,6 +2534,23 @@ Cube<eT>::insert_slices(const uword slice_num, const BaseCube<eT,T1>& X)
 
 
 
+template<typename eT>
+template<typename T1>
+inline
+void
+Cube<eT>::insert_slices(const uword slice_num, const Base<eT,T1>& X)
+  {
+  arma_extra_debug_sigprint();
+
+  const quasi_unwrap<T1> U(X.get_ref());
+
+  const Cube<eT> C(const_cast<eT*>(U.M.memptr()), U.M.n_rows, U.M.n_cols, uword(1), false, true);
+
+  (*this).insert_slices(slice_num, C);
+  }
+
+
+
 //! create a cube from GenCube, ie. run the previously delayed element generation operations
 template<typename eT>
 template<typename gen_type>

inst/include/armadillo_bits/arma_version.hpp

@@ -23,7 +23,7 @@
 
 #define ARMA_VERSION_MAJOR 11
 #define ARMA_VERSION_MINOR 2
-#define ARMA_VERSION_PATCH 2
+#define ARMA_VERSION_PATCH 3
 #define ARMA_VERSION_NAME  "Classic Roast"
 
 

inst/include/armadillo_bits/config.hpp

@@ -159,8 +159,8 @@
   //// Comment out the above line if you don't want automatic checking for nonfinite matrices
 #endif
 
-// #define ARMA_USE_HDF5_ALT
-#if defined(ARMA_USE_HDF5_ALT) && defined(ARMA_USE_WRAPPER)
+// #define ARMA_USE_HDF5_CMAKE
+#if defined(ARMA_USE_HDF5_CMAKE) && defined(ARMA_USE_WRAPPER)
   #undef  ARMA_USE_HDF5
   #define ARMA_USE_HDF5
 
@@ -263,7 +263,7 @@
 
 #if defined(ARMA_DONT_USE_WRAPPER)
   #undef ARMA_USE_WRAPPER
-  #undef ARMA_USE_HDF5_ALT
+  #undef ARMA_USE_HDF5_CMAKE
 #endif
 
 #if defined(ARMA_DONT_USE_FORTRAN_HIDDEN_ARGS)
@@ -310,7 +310,7 @@
 
 #if defined(ARMA_DONT_USE_HDF5)
   #undef ARMA_USE_HDF5
-  #undef ARMA_USE_HDF5_ALT
+  #undef ARMA_USE_HDF5_CMAKE
 #endif
 
 #if defined(ARMA_DONT_OPTIMISE_BAND) || defined(ARMA_DONT_OPTIMISE_SOLVE_BAND)

inst/include/armadillo_bits/def_hdf5.hpp

@@ -18,7 +18,7 @@
 
 #if defined(ARMA_USE_HDF5)
 
-#if !defined(ARMA_USE_HDF5_ALT)
+#if !defined(ARMA_USE_HDF5_CMAKE)
 
   // macros needed if the wrapper run-time library is not being used
 

inst/include/armadillo_bits/include_hdf5.hpp

@@ -27,7 +27,7 @@
         #include <hdf5.h>
       #else
         #undef ARMA_USE_HDF5
-        #undef ARMA_USE_HDF5_ALT
+        #undef ARMA_USE_HDF5_CMAKE
         #pragma message ("WARNING: use of HDF5 disabled; hdf5.h header not found")
       #endif
     #else
@@ -48,7 +48,7 @@
         #include ARMA_INCFILE_WRAP(ARMA_HDF5_HEADER)
       #else
         #undef ARMA_USE_HDF5
-        #undef ARMA_USE_HDF5_ALT
+        #undef ARMA_USE_HDF5_CMAKE
         #pragma message ("WARNING: use of HDF5 disabled; hdf5.h header not found")
       #endif
     #else
@@ -60,10 +60,10 @@
     #undef ARMA_HDF5_HEADER
   #endif
 
-  #if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT) || defined(H5_USE_18_API) || defined(H5_USE_18_API_DEFAULT) 
-    #pragma message ("WARNING: use of HDF5 disabled; incompatible configuration: H5_USE_16_API or H5_USE_18_API")
+  #if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)
+    #pragma message ("WARNING: use of HDF5 disabled; incompatible configuration: H5_USE_16_API or H5_USE_16_API_DEFAULT")
     #undef ARMA_USE_HDF5
-    #undef ARMA_USE_HDF5_ALT
+    #undef ARMA_USE_HDF5_CMAKE
   #endif
 
 #endif