Merge pull request #384 from RcppCore/feature/Armadill_11.2.2

RcppArmadillo 0.11.2.2.0 with Armadillo 11.2.2

ChangeLog

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

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
-Version: 0.11.2.1.0
-Date: 2022-06-28
+Version: 0.11.2.2.0
+Date: 2022-07-04
 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.1.0.
+# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.11.2.2.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.1.0'
-PACKAGE_STRING='RcppArmadillo 0.11.2.1.0'
+PACKAGE_VERSION='0.11.2.2.0'
+PACKAGE_STRING='RcppArmadillo 0.11.2.2.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.1.0 to adapt to many kinds of systems.
+\`configure' configures RcppArmadillo 0.11.2.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.11.2.1.0:";;
+     short | recursive ) echo "Configuration of RcppArmadillo 0.11.2.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.11.2.1.0
+RcppArmadillo configure 0.11.2.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.11.2.1.0, which was
+It was created by RcppArmadillo $as_me 0.11.2.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.11.2.1.0, which was
+This file was extended by RcppArmadillo $as_me 0.11.2.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.11.2.1.0
+RcppArmadillo config.status 0.11.2.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.11.2.1.0],[edd@debian.org])
+AC_INIT([RcppArmadillo],[0.11.2.2.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,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.2.2.0 (2022-07-04) (GitHub Only)}{
+  \itemize{
+    \item Upgraded to Armadillo release 11.2.2 (Classic Roast)
+    \itemize{
+      \item fix incorrect and/or slow convergence in single-threaded
+      versions of \code{kmeans()}, \code{gmm_diag::learn()},
+      \code{gmm_full::learn()}
+    }
+  }
+}
+
 \section{Changes in RcppArmadillo version 0.11.2.1.0 (2022-06-28) (GitHub Only)}{
   \itemize{
     \item Upgraded to Armadillo release 11.2.1 (Classic Roast)

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 1
+#define ARMA_VERSION_PATCH 2
 #define ARMA_VERSION_NAME  "Classic Roast"
 
 

inst/include/armadillo_bits/gmm_diag_meat.hpp

@@ -2159,6 +2159,10 @@ gmm_diag<eT>::km_iterate(const Mat<eT>& X, const uword max_iter, const bool verb
       }
     #else
       {
+      acc_hefts.zeros();
+      acc_means.zeros();
+      last_indx.zeros();
+
       uword* acc_hefts_mem = acc_hefts.memptr();
       uword* last_indx_mem = last_indx.memptr();
 

inst/include/armadillo_bits/gmm_full_meat.hpp

@@ -2188,6 +2188,10 @@ gmm_full<eT>::km_iterate(const Mat<eT>& X, const uword max_iter, const bool verb
       }
     #else
       {
+      acc_hefts.zeros();
+      acc_means.zeros();
+      last_indx.zeros();
+
       uword* acc_hefts_mem = acc_hefts.memptr();
       uword* last_indx_mem = last_indx.memptr();