Merge pull request #420 from RcppCore/feature/arma_12.6.2

RcppArmadillo 0.12.6.2.0

ChangeLog

@@ -1,3 +1,13 @@
+2023-08-08  Dirk Eddelbuettel  <[email protected]>
+
+	* DESCRIPTION (Version, Date): RcppArmadillo 0.12.6.2.0
+        * inst/NEWS.Rd: Idem
+        * configure.ac: Idem
+        * configure: Idem
+
+ 	* inst/include/armadillo: Armadillo 12.6.2
+ 	* inst/include/armadillo_bits/: Idem
+
 2023-07-26  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION (Version, Date): RcppArmadillo 0.12.6.1.0

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 0.12.6.1.0
-Date: 2024-07-26
+Version: 0.12.6.2.0
+Date: 2024-08-08
 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.1.0.
+# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.12.6.2.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.1.0'
-PACKAGE_STRING='RcppArmadillo 0.12.6.1.0'
+PACKAGE_VERSION='0.12.6.2.0'
+PACKAGE_STRING='RcppArmadillo 0.12.6.2.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.1.0 to adapt to many kinds of systems.
+\`configure' configures RcppArmadillo 0.12.6.2.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.1.0:";;
+     short | recursive ) echo "Configuration of RcppArmadillo 0.12.6.2.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.1.0
+RcppArmadillo configure 0.12.6.2.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.1.0, which was
+It was created by RcppArmadillo $as_me 0.12.6.2.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.1.0, which was
+This file was extended by RcppArmadillo $as_me 0.12.6.2.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.1.0
+RcppArmadillo config.status 0.12.6.2.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.1.0],[[email protected]])
+AC_INIT([RcppArmadillo],[0.12.6.2.0],[[email protected]])
 
 ## Set R_HOME, respecting an environment variable if one is set
 : ${R_HOME=$(R RHOME)}

inst/NEWS.Rd

@@ -3,6 +3,22 @@
 \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.1.0 (2023-08-08)}{
+  \itemize{
+    \item Upgraded to Armadillo release 12.6.2 (Cortisol Retox)
+    \itemize{
+      \item use thread-safe Mersenne Twister as the default RNG on all
+      platforms
+      \item use unique RNG seed for each thread within multi-threaded
+      execution (such as OpenMP)
+      \item explicitly document \code{arma_rng::set_seed()} and
+      \code{arma_rng::set_seed_random() }
+    }
+    \itemize None of the changes above affect R use as \pkg{RcppArmadillo}
+    connects the RNGs used by R to Armadillo
+  }
+}
+
 \section{Changes in RcppArmadillo version 0.12.6.1.0 (2023-07-26)}{
   \itemize{
     \item Upgraded to Armadillo release 12.6.1 (Cortisol Retox)

inst/include/armadillo

@@ -50,10 +50,10 @@
 #include <random>
 #include <functional>
 #include <chrono>
+#include <atomic>
 
 #if !defined(ARMA_DONT_USE_STD_MUTEX)
   #include <mutex>
-  #include <atomic>
 #endif
 
 // #if defined(ARMA_HAVE_CXX17)

inst/include/armadillo_bits/SpValProxy_bones.hpp

@@ -28,9 +28,9 @@ template<typename T1>
 class SpValProxy
   {
   public:
-
+  
   typedef typename T1::elem_type eT; // Convenience typedef
-
+  
   friend class SpMat<eT>;
   friend class SpSubview<eT>;
 
@@ -49,16 +49,17 @@ class SpValProxy
   //! Overload all of the potential operators.
 
   //! First, the ones that could modify a value.
-  arma_inline SpValProxy& operator=(const eT rhs);
-  arma_inline SpValProxy& operator+=(const eT rhs);
-  arma_inline SpValProxy& operator-=(const eT rhs);
-  arma_inline SpValProxy& operator*=(const eT rhs);
-  arma_inline SpValProxy& operator/=(const eT rhs);
-
-  arma_inline SpValProxy& operator++();
-  arma_inline SpValProxy& operator--();
-  arma_inline eT operator++(const int);
-  arma_inline eT operator--(const int);
+  inline SpValProxy& operator= (const eT rhs);
+  inline SpValProxy& operator+=(const eT rhs);
+  inline SpValProxy& operator-=(const eT rhs);
+  inline SpValProxy& operator*=(const eT rhs);
+  inline SpValProxy& operator/=(const eT rhs);
+
+  inline SpValProxy& operator++();
+  inline SpValProxy& operator--();
+
+  inline eT          operator++(const int);
+  inline eT          operator--(const int);
 
   //! This will work for any other operations that do not modify a value.
   arma_inline operator eT() const;