Merge pull request #424 from RcppCore/feature/armadillo_12.6.5

RcppArmadillo 0.12.6.5.0 with Armadillo 12.6.5

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2023-10-14  Dirk Eddelbuettel  <[email protected]>
+
+	* DESCRIPTION (Version, Date): RcppArmadillo 0.12.6.5.0
+
 2023-09-06  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION (Version, Date): RcppArmadillo 0.12.6.4.0
@@ -231,10 +235,6 @@
 	* configure.ac: Support new location of generated config
 	* configure: Idem
 	* cleanup: Idem
-2022-10-19  Dirk Eddelbuettel  <[email protected]>
-
-	* inst/tinytest/test_sparseConversion.R: Refine one conversion as
-	suggested by the 'Matrix' team
 
 2022-10-10  Dirk Eddelbuettel  <[email protected]>
 

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 0.12.6.4.0
-Date: 2023-09-06
+Version: 0.12.6.5.0
+Date: 2023-10-14
 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.12.6.4.0.
+# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.12.6.5.0.
 #
 # Report bugs to <[email protected]>.
 #
@@ -610,8 +610,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='RcppArmadillo'
 PACKAGE_TARNAME='rcpparmadillo'
-PACKAGE_VERSION='0.12.6.4.0'
-PACKAGE_STRING='RcppArmadillo 0.12.6.4.0'
+PACKAGE_VERSION='0.12.6.5.0'
+PACKAGE_STRING='RcppArmadillo 0.12.6.5.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.12.6.4.0 to adapt to many kinds of systems.
+\`configure' configures RcppArmadillo 0.12.6.5.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.12.6.4.0:";;
+     short | recursive ) echo "Configuration of RcppArmadillo 0.12.6.5.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.12.6.4.0
+RcppArmadillo configure 0.12.6.5.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.12.6.4.0, which was
+It was created by RcppArmadillo $as_me 0.12.6.5.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.12.6.4.0, which was
+This file was extended by RcppArmadillo $as_me 0.12.6.5.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.12.6.4.0
+RcppArmadillo config.status 0.12.6.5.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.12.6.4.0],[[email protected]])
+AC_INIT([RcppArmadillo],[0.12.6.5.0],[[email protected]])
 
 ## Set R_HOME, respecting an environment variable if one is set
 : ${R_HOME=$(R RHOME)}

inst/NEWS.Rd

@@ -3,6 +3,16 @@
 \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.12.6.5.0 (2023-10-14)}{
+  \itemize{
+    \item Upgraded to Armadillo release 12.6.5 (Cortisol Retox)
+    \itemize{
+      \item Fix for corner-case bug in handling sparse matrices with no
+      non-zero elements
+    }
+  }
+}
+
 \section{Changes in RcppArmadillo version 0.12.6.4.0 (2023-09-06)}{
   \itemize{
     \item Upgraded to Armadillo release 12.6.4 (Cortisol Retox)

inst/include/armadillo_bits/Mat_meat.hpp

@@ -2657,6 +2657,8 @@ Mat<eT>::operator=(const SpBase<eT, T1>& m)
 
   (*this).zeros(x.n_rows, x_n_cols);
 
+  if(x.n_nonzero == 0)  { return *this; }
+  
   const    eT* x_values      = x.values;
   const uword* x_row_indices = x.row_indices;
   const uword* x_col_ptrs    = x.col_ptrs;

inst/include/armadillo_bits/SpMat_meat.hpp

@@ -2971,12 +2971,11 @@ SpMat<eT>::swap_cols(const uword in_col1, const uword in_col2)
 
   // TODO: this is a rudimentary implementation
 
-  SpMat<eT> tmp = (*this);
+  const SpMat<eT> tmp1 = (*this).col(in_col1);
+  const SpMat<eT> tmp2 = (*this).col(in_col2);
 
-  tmp.col(in_col1) = (*this).col(in_col2);
-  tmp.col(in_col2) = (*this).col(in_col1);
-  
-  steal_mem(tmp);
+  (*this).col(in_col2) = tmp1;
+  (*this).col(in_col1) = tmp2;
 
   // for(uword lrow = 0; lrow < n_rows; ++lrow)
   //   {
@@ -4099,9 +4098,14 @@ SpMat<eT>::zeros()
   {
   arma_extra_debug_sigprint();
 
-  const bool already_done = ( (sync_state != 1) && (n_nonzero == 0) );
-  
-  if(already_done == false)  { init(n_rows, n_cols); }
+  if((n_nonzero == 0) && (values != nullptr))
+    {
+    invalidate_cache();
+    }
+  else
+    {
+    init(n_rows, n_cols);
+    }
 
   return *this;
   }
@@ -4136,9 +4140,14 @@ SpMat<eT>::zeros(const uword in_rows, const uword in_cols)
   {
   arma_extra_debug_sigprint();
 
-  const bool already_done = ( (sync_state != 1) && (n_nonzero == 0) && (n_rows == in_rows) && (n_cols == in_cols) );
-  
-  if(already_done == false)  { init(in_rows, in_cols); }
+  if((n_nonzero == 0) && (n_rows == in_rows) && (n_cols == in_cols) && (values != nullptr))
+    {
+    invalidate_cache();
+    }
+  else
+    {
+    init(in_rows, in_cols);
+    }
 
   return *this;
   }
@@ -5197,11 +5206,21 @@ SpMat<eT>::init_simple(const SpMat<eT>& x)
 
   if(this == &x)  { return; }
 
-  init(x.n_rows, x.n_cols, x.n_nonzero);
+  if((x.n_nonzero == 0) && (n_nonzero == 0) && (n_rows == x.n_rows) && (n_cols == x.n_cols) && (values != nullptr))
+    {
+    invalidate_cache();
+    }
+  else
+    {
+    init(x.n_rows, x.n_cols, x.n_nonzero);
+    }
 
-  if(x.values     )  { arrayops::copy(access::rwp(values),      x.values,      x.n_nonzero + 1); }
-  if(x.row_indices)  { arrayops::copy(access::rwp(row_indices), x.row_indices, x.n_nonzero + 1); }
-  if(x.col_ptrs   )  { arrayops::copy(access::rwp(col_ptrs),    x.col_ptrs,    x.n_cols    + 1); }
+  if(x.n_nonzero != 0)
+    {
+    if(x.values     )  { arrayops::copy(access::rwp(values),      x.values,      x.n_nonzero + 1); }
+    if(x.row_indices)  { arrayops::copy(access::rwp(row_indices), x.row_indices, x.n_nonzero + 1); }
+    if(x.col_ptrs   )  { arrayops::copy(access::rwp(col_ptrs),    x.col_ptrs,    x.n_cols    + 1); }
+    }
   }
 
 

inst/include/armadillo_bits/arma_version.hpp

@@ -23,7 +23,7 @@
 
 #define ARMA_VERSION_MAJOR 12
 #define ARMA_VERSION_MINOR 6
-#define ARMA_VERSION_PATCH 4
+#define ARMA_VERSION_PATCH 5
 #define ARMA_VERSION_NAME  "Cortisol Retox"