From c00595b1c4a4ca63dad5f101c97760e0277b2bd6 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 3 Dec 2024 14:53:18 -0600 Subject: [PATCH 1/3] Sync with Armadillo 14.2.x branch --- inst/include/armadillo_bits/Col_bones.hpp | 2 ++ inst/include/armadillo_bits/Col_meat.hpp | 10 +++--- inst/include/armadillo_bits/Row_bones.hpp | 2 ++ inst/include/armadillo_bits/Row_meat.hpp | 10 +++--- inst/include/armadillo_bits/sym_helper.hpp | 37 +++++++++++++++++++--- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/inst/include/armadillo_bits/Col_bones.hpp b/inst/include/armadillo_bits/Col_bones.hpp index b3f0ab68..0ff120f5 100644 --- a/inst/include/armadillo_bits/Col_bones.hpp +++ b/inst/include/armadillo_bits/Col_bones.hpp @@ -187,6 +187,8 @@ class Col::fixed : public Col { private: + using Mat::mem_local; + static constexpr bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); arma_align_mem eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; diff --git a/inst/include/armadillo_bits/Col_meat.hpp b/inst/include/armadillo_bits/Col_meat.hpp index bb07f9bb..a5f84ebb 100644 --- a/inst/include/armadillo_bits/Col_meat.hpp +++ b/inst/include/armadillo_bits/Col_meat.hpp @@ -1345,11 +1345,11 @@ Col::fixed::fixed(const fill::fill_class&) { arma_debug_sigprint_this(this); - if(is_same_type::yes) { (*this).zeros(); } - if(is_same_type::yes) { (*this).ones(); } - if(is_same_type::yes) { (*this).eye(); } - if(is_same_type::yes) { (*this).randu(); } - if(is_same_type::yes) { (*this).randn(); } + if(is_same_type::yes) { (*this).zeros(); } + if(is_same_type::yes) { (*this).ones(); } + if(is_same_type::yes) { Mat::eye(); } + if(is_same_type::yes) { Mat::randu(); } + if(is_same_type::yes) { Mat::randn(); } } diff --git a/inst/include/armadillo_bits/Row_bones.hpp b/inst/include/armadillo_bits/Row_bones.hpp index 96dff225..55778bd7 100644 --- a/inst/include/armadillo_bits/Row_bones.hpp +++ b/inst/include/armadillo_bits/Row_bones.hpp @@ -187,6 +187,8 @@ class Row::fixed : public Row { private: + using Mat::mem_local; + static constexpr bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); arma_align_mem eT mem_local_extra[ (use_extra) ? fixed_n_elem : 1 ]; diff --git a/inst/include/armadillo_bits/Row_meat.hpp b/inst/include/armadillo_bits/Row_meat.hpp index 17ff05b8..8aef6156 100644 --- a/inst/include/armadillo_bits/Row_meat.hpp +++ b/inst/include/armadillo_bits/Row_meat.hpp @@ -1345,11 +1345,11 @@ Row::fixed::fixed(const fill::fill_class&) { arma_debug_sigprint_this(this); - if(is_same_type::yes) { (*this).zeros(); } - if(is_same_type::yes) { (*this).ones(); } - if(is_same_type::yes) { (*this).eye(); } - if(is_same_type::yes) { (*this).randu(); } - if(is_same_type::yes) { (*this).randn(); } + if(is_same_type::yes) { (*this).zeros(); } + if(is_same_type::yes) { (*this).ones(); } + if(is_same_type::yes) { Mat::eye(); } + if(is_same_type::yes) { Mat::randu(); } + if(is_same_type::yes) { Mat::randn(); } } diff --git a/inst/include/armadillo_bits/sym_helper.hpp b/inst/include/armadillo_bits/sym_helper.hpp index fa2b2b3a..2134885d 100644 --- a/inst/include/armadillo_bits/sym_helper.hpp +++ b/inst/include/armadillo_bits/sym_helper.hpp @@ -50,19 +50,26 @@ guess_sympd_worker(const Mat& A) const eT* A_mem = A.memptr(); const eT* A_col = A_mem; + bool diag_below_tol = true; + eT max_diag = eT(0); for(uword j=0; j < N; ++j) { const eT A_jj = A_col[j]; - if(A_jj <= eT(0)) { return false; } + if( A_jj <= eT(0)) { return false; } + if(arma_isfinite(A_jj) == false) { return false; } + + if(A_jj >= tol) { diag_below_tol = false; } max_diag = (A_jj > max_diag) ? A_jj : max_diag; A_col += N; } + if(diag_below_tol) { return false; } // assume matrix is suspect if all diagonal elements are close to zero + A_col = A_mem; const uword Nm1 = N-1; @@ -128,6 +135,8 @@ guess_sympd_worker(const Mat& A) const eT* A_mem = A.memptr(); const eT* A_col = A_mem; + bool diag_below_tol = true; + T max_diag = T(0); for(uword j=0; j < N; ++j) @@ -138,15 +147,21 @@ guess_sympd_worker(const Mat& A) const T A_jj_rabs = std::abs(A_jj_r); const T A_jj_iabs = std::abs(A_jj_i); - if(A_jj_r <= T(0) ) { return false; } // real should be positive - if(A_jj_iabs > tol ) { return false; } // imag should be approx zero - if(A_jj_iabs > A_jj_rabs) { return false; } // corner case: real and imag are close to zero, and imag is dominant + if( A_jj_r <= T(0) ) { return false; } // real should be positive + if(arma_isfinite(A_jj_r) == false) { return false; } + + if(A_jj_iabs > tol ) { return false; } // imag should be approx zero + if(A_jj_iabs > A_jj_rabs) { return false; } // corner case: real and imag are close to zero, and imag is dominant + + if(A_jj_r >= tol) { diag_below_tol = false; } max_diag = (A_jj_r > max_diag) ? A_jj_r : max_diag; A_col += N; } + if(diag_below_tol) { return false; } // assume matrix is suspect if all diagonal elements are close to zero + const T square_max_diag = max_diag * max_diag; if(arma_isfinite(square_max_diag) == false) { return false; } @@ -264,15 +279,21 @@ is_approx_sym_worker(const Mat& A) const eT* A_mem = A.memptr(); const eT* A_col = A_mem; + bool diag_below_tol = true; + for(uword j=0; j < N; ++j) { - const eT& A_jj = A_col[j]; + const eT A_jj = A_col[j]; if(arma_isfinite(A_jj) == false) { return false; } + if(std::abs(A_jj) >= tol) { diag_below_tol = false; } + A_col += N; } + if(diag_below_tol) { return false; } // assume matrix is suspect if all diagonal elements are close to zero + A_col = A_mem; const uword Nm1 = N-1; @@ -324,6 +345,8 @@ is_approx_sym_worker(const Mat& A) const eT* A_mem = A.memptr(); const eT* A_col = A_mem; + bool diag_below_tol = true; + // ensure diagonal has approx real-only elements for(uword j=0; j < N; ++j) { @@ -338,9 +361,13 @@ is_approx_sym_worker(const Mat& A) if(arma_isfinite(A_jj_r) == false) { return false; } + if(A_jj_rabs >= tol) { diag_below_tol = false; } + A_col += N; } + if(diag_below_tol) { return false; } // assume matrix is suspect if all diagonal elements are close to zero + A_col = A_mem; const uword Nm1 = N-1; From 7d212c6797e2f3db06250fd873c3ce8c9cb939bf Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 3 Dec 2024 14:54:01 -0600 Subject: [PATCH 2/3] Release 14.2.1-2 --- ChangeLog | 9 +++++++++ DESCRIPTION | 4 ++-- configure | 18 +++++++++--------- configure.ac | 2 +- inst/NEWS.Rd | 9 +++++++++ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7778050f..45becd68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-12-03 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): RcppArmadillo 14.2.1-2 + * inst/NEWS.Rd: Idem + * configure.ac: Idem + * configure: Idem + + * inst/include/armadillo_bits/: Armadillo upstream sync + 2024-11-24 Dirk Eddelbuettel * DESCRIPTION (Version, Date): RcppArmadillo 14.2.1-1 diff --git a/DESCRIPTION b/DESCRIPTION index ab351388..8063c8dc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: RcppArmadillo Type: Package Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library -Version: 14.2.1-1 -Date: 2024-11-24 +Version: 14.2.1-2 +Date: 2024-12-03 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", comment = c(ORCID = "0000-0001-6419-907X")), person("Romain", "Francois", role = "aut", diff --git a/configure b/configure index f992c67b..2df25401 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for RcppArmadillo 14.2.1-1. +# Generated by GNU Autoconf 2.71 for RcppArmadillo 14.2.1-2. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RcppArmadillo' PACKAGE_TARNAME='rcpparmadillo' -PACKAGE_VERSION='14.2.1-1' -PACKAGE_STRING='RcppArmadillo 14.2.1-1' +PACKAGE_VERSION='14.2.1-2' +PACKAGE_STRING='RcppArmadillo 14.2.1-2' 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 14.2.1-1 to adapt to many kinds of systems. +\`configure' configures RcppArmadillo 14.2.1-2 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 14.2.1-1:";; + short | recursive ) echo "Configuration of RcppArmadillo 14.2.1-2:";; 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 14.2.1-1 +RcppArmadillo configure 14.2.1-2 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 14.2.1-1, which was +It was created by RcppArmadillo $as_me 14.2.1-2, 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 14.2.1-1, which was +This file was extended by RcppArmadillo $as_me 14.2.1-2, 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 14.2.1-1 +RcppArmadillo config.status 14.2.1-2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c113184a..4e156795 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_PREREQ([2.69]) ## Process this file with autoconf to produce a configure script. -AC_INIT([RcppArmadillo],[14.2.1-1],[edd@debian.org]) +AC_INIT([RcppArmadillo],[14.2.1-2],[edd@debian.org]) ## Set R_HOME, respecting an environment variable if one is set : ${R_HOME=$(R RHOME)} diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index d36c74e8..f338097a 100644 --- a/inst/NEWS.Rd +++ b/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 14.2.1-2 (2024-12-03) (GitHub Only)}{ + \itemize{ + \item Upgraded to Armadillo release 14.2.1 (Smooth Caffeine) + \itemize{ + Upstream sync to accommodate the yet-unreleased build of gcc 15 + } + } +} + \section{Changes in RcppArmadillo version 14.2.1-1 (2024-11-24) (GitHub Only)}{ \itemize{ \item Upgraded to Armadillo release 14.2.1 (Smooth Caffeine) From 9e6443f40d912f833dcfcfa165ecd34e521ed62e Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Tue, 3 Dec 2024 20:32:24 -0600 Subject: [PATCH 3/3] New Release 14.2.2-1 --- ChangeLog | 6 +++--- DESCRIPTION | 4 ++-- configure | 18 +++++++++--------- configure.ac | 2 +- inst/NEWS.Rd | 9 +++++---- inst/include/armadillo_bits/Cube_bones.hpp | 3 +++ inst/include/armadillo_bits/Cube_meat.hpp | 8 ++++---- inst/include/armadillo_bits/Mat_bones.hpp | 2 ++ inst/include/armadillo_bits/Mat_meat.hpp | 10 +++++----- inst/include/armadillo_bits/arma_version.hpp | 2 +- 10 files changed, 35 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45becd68..efede6aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,11 @@ -2024-12-03 Dirk Eddelbuettel +2024-12-05 Dirk Eddelbuettel - * DESCRIPTION (Version, Date): RcppArmadillo 14.2.1-2 + * DESCRIPTION (Version, Date): RcppArmadillo 14.2.2-1 * inst/NEWS.Rd: Idem * configure.ac: Idem * configure: Idem - * inst/include/armadillo_bits/: Armadillo upstream sync + * inst/include/armadillo_bits/: Armadillo 14.2.2 2024-11-24 Dirk Eddelbuettel diff --git a/DESCRIPTION b/DESCRIPTION index 8063c8dc..a703f477 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: RcppArmadillo Type: Package Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library -Version: 14.2.1-2 -Date: 2024-12-03 +Version: 14.2.2-1 +Date: 2024-12-05 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", comment = c(ORCID = "0000-0001-6419-907X")), person("Romain", "Francois", role = "aut", diff --git a/configure b/configure index 2df25401..6a65ba63 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for RcppArmadillo 14.2.1-2. +# Generated by GNU Autoconf 2.71 for RcppArmadillo 14.2.2-1. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RcppArmadillo' PACKAGE_TARNAME='rcpparmadillo' -PACKAGE_VERSION='14.2.1-2' -PACKAGE_STRING='RcppArmadillo 14.2.1-2' +PACKAGE_VERSION='14.2.2-1' +PACKAGE_STRING='RcppArmadillo 14.2.2-1' 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 14.2.1-2 to adapt to many kinds of systems. +\`configure' configures RcppArmadillo 14.2.2-1 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 14.2.1-2:";; + short | recursive ) echo "Configuration of RcppArmadillo 14.2.2-1:";; 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 14.2.1-2 +RcppArmadillo configure 14.2.2-1 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 14.2.1-2, which was +It was created by RcppArmadillo $as_me 14.2.2-1, 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 14.2.1-2, which was +This file was extended by RcppArmadillo $as_me 14.2.2-1, 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 14.2.1-2 +RcppArmadillo config.status 14.2.2-1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4e156795..5de2c670 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_PREREQ([2.69]) ## Process this file with autoconf to produce a configure script. -AC_INIT([RcppArmadillo],[14.2.1-2],[edd@debian.org]) +AC_INIT([RcppArmadillo],[14.2.2-1],[edd@debian.org]) ## Set R_HOME, respecting an environment variable if one is set : ${R_HOME=$(R RHOME)} diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index f338097a..7b0c6437 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -3,11 +3,12 @@ \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 14.2.1-2 (2024-12-03) (GitHub Only)}{ +\section{Changes in RcppArmadillo version 14.2.2-1 (2024-12-05)}{ \itemize{ - \item Upgraded to Armadillo release 14.2.1 (Smooth Caffeine) + \item Upgraded to Armadillo release 14.2.2 (Smooth Caffeine) \itemize{ - Upstream sync to accommodate the yet-unreleased build of gcc 15 + \item Workarounds for regressions in pre-release versions of GCC 15 + \item More selective detection of symmetric/hermitian matrices by various functions } } } @@ -16,7 +17,7 @@ \itemize{ \item Upgraded to Armadillo release 14.2.1 (Smooth Caffeine) \itemize{ - Fix for \code{index_min()} and \code{index_max()} to ensure that the + \item Fix for \code{index_min()} and \code{index_max()} to ensure that the first index of equal extremum values is found } } diff --git a/inst/include/armadillo_bits/Cube_bones.hpp b/inst/include/armadillo_bits/Cube_bones.hpp index ec452d33..c09a3a06 100644 --- a/inst/include/armadillo_bits/Cube_bones.hpp +++ b/inst/include/armadillo_bits/Cube_bones.hpp @@ -485,6 +485,9 @@ class Cube::fixed : public Cube { private: + using Cube::mat_ptrs_local; + using Cube::mem_local; + static constexpr uword fixed_n_elem = fixed_n_rows * fixed_n_cols * fixed_n_slices; static constexpr uword fixed_n_elem_slice = fixed_n_rows * fixed_n_cols; diff --git a/inst/include/armadillo_bits/Cube_meat.hpp b/inst/include/armadillo_bits/Cube_meat.hpp index aa869bb4..f0f709bf 100644 --- a/inst/include/armadillo_bits/Cube_meat.hpp +++ b/inst/include/armadillo_bits/Cube_meat.hpp @@ -5412,10 +5412,10 @@ Cube::fixed::fixed(const fill::f mem_setup(); - if(is_same_type::yes) { (*this).zeros(); } - if(is_same_type::yes) { (*this).ones(); } - if(is_same_type::yes) { (*this).randu(); } - if(is_same_type::yes) { (*this).randn(); } + if(is_same_type::yes) { Cube::zeros(); } + if(is_same_type::yes) { Cube::ones(); } + if(is_same_type::yes) { Cube::randu(); } + if(is_same_type::yes) { Cube::randn(); } arma_static_check( (is_same_type::yes), "Cube::fixed::fixed(): unsupported fill type" ); } diff --git a/inst/include/armadillo_bits/Mat_bones.hpp b/inst/include/armadillo_bits/Mat_bones.hpp index 7ee55447..950103c4 100644 --- a/inst/include/armadillo_bits/Mat_bones.hpp +++ b/inst/include/armadillo_bits/Mat_bones.hpp @@ -825,6 +825,8 @@ class Mat::fixed : public Mat { private: + using Mat::mem_local; + static constexpr uword fixed_n_elem = fixed_n_rows * fixed_n_cols; static constexpr bool use_extra = (fixed_n_elem > arma_config::mat_prealloc); diff --git a/inst/include/armadillo_bits/Mat_meat.hpp b/inst/include/armadillo_bits/Mat_meat.hpp index 51524abd..a38eaf99 100644 --- a/inst/include/armadillo_bits/Mat_meat.hpp +++ b/inst/include/armadillo_bits/Mat_meat.hpp @@ -9565,11 +9565,11 @@ Mat::fixed::fixed(const fill::fill_class::yes) { (*this).zeros(); } - if(is_same_type::yes) { (*this).ones(); } - if(is_same_type::yes) { (*this).eye(); } - if(is_same_type::yes) { (*this).randu(); } - if(is_same_type::yes) { (*this).randn(); } + if(is_same_type::yes) { (*this).zeros(); } + if(is_same_type::yes) { (*this).ones(); } + if(is_same_type::yes) { Mat::eye(); } + if(is_same_type::yes) { Mat::randu(); } + if(is_same_type::yes) { Mat::randn(); } } diff --git a/inst/include/armadillo_bits/arma_version.hpp b/inst/include/armadillo_bits/arma_version.hpp index 875a7944..8b0158db 100644 --- a/inst/include/armadillo_bits/arma_version.hpp +++ b/inst/include/armadillo_bits/arma_version.hpp @@ -23,7 +23,7 @@ #define ARMA_VERSION_MAJOR 14 #define ARMA_VERSION_MINOR 2 -#define ARMA_VERSION_PATCH 1 +#define ARMA_VERSION_PATCH 2 #define ARMA_VERSION_NAME "Smooth Caffeine"