From ef8b95e3a423b9b9c0a862b9bbec2735119fa1d6 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Fri, 31 May 2024 08:34:44 -0500 Subject: [PATCH] Release 0.12.8.4.0 with Armadillo 12.8.4 --- ChangeLog | 9 +++++++++ DESCRIPTION | 4 ++-- configure | 18 +++++++++--------- configure.ac | 2 +- inst/include/armadillo_bits/arma_version.hpp | 2 +- inst/include/armadillo_bits/fn_dot.hpp | 2 ++ 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a0dfc24..4bb9a796 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-05-30 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): RcppArmadillo 0.12.8.4.0 + * inst/NEWS.Rd: Idem + * configure.ac: Idem + * configure: Idem + + * inst/include/armadillo_bits/: Armadillo 12.8.4 + 2024-05-29 Dirk Eddelbuettel * DESCRIPTION (Version, Date): RcppArmadillo 0.12.8.3.1 diff --git a/DESCRIPTION b/DESCRIPTION index 59665671..adae0f6e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: RcppArmadillo Type: Package Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library -Version: 0.12.8.3.1 -Date: 2024-05-26 +Version: 0.12.8.4.0 +Date: 2024-05-30 Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson Maintainer: Dirk Eddelbuettel Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad diff --git a/configure b/configure index c597aafb..fa11426e 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 0.12.8.3.1. +# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.12.8.4.0. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RcppArmadillo' PACKAGE_TARNAME='rcpparmadillo' -PACKAGE_VERSION='0.12.8.3.1' -PACKAGE_STRING='RcppArmadillo 0.12.8.3.1' +PACKAGE_VERSION='0.12.8.4.0' +PACKAGE_STRING='RcppArmadillo 0.12.8.4.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.12.8.3.1 to adapt to many kinds of systems. +\`configure' configures RcppArmadillo 0.12.8.4.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.8.3.1:";; + short | recursive ) echo "Configuration of RcppArmadillo 0.12.8.4.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.8.3.1 +RcppArmadillo configure 0.12.8.4.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.8.3.1, which was +It was created by RcppArmadillo $as_me 0.12.8.4.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.8.3.1, which was +This file was extended by RcppArmadillo $as_me 0.12.8.4.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.8.3.1 +RcppArmadillo config.status 0.12.8.4.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e1a03b6c..712a0e94 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],[0.12.8.3.1],[edd@debian.org]) +AC_INIT([RcppArmadillo],[0.12.8.4.0],[edd@debian.org]) ## Set R_HOME, respecting an environment variable if one is set : ${R_HOME=$(R RHOME)} diff --git a/inst/include/armadillo_bits/arma_version.hpp b/inst/include/armadillo_bits/arma_version.hpp index ce15a285..db46be62 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 12 #define ARMA_VERSION_MINOR 8 -#define ARMA_VERSION_PATCH 3 +#define ARMA_VERSION_PATCH 4 #define ARMA_VERSION_NAME "Cortisol Injector" diff --git a/inst/include/armadillo_bits/fn_dot.hpp b/inst/include/armadillo_bits/fn_dot.hpp index e8bb0dc7..55bd05d4 100644 --- a/inst/include/armadillo_bits/fn_dot.hpp +++ b/inst/include/armadillo_bits/fn_dot.hpp @@ -305,6 +305,8 @@ dot arma_debug_assert_same_size(U.M.n_elem, uword(1), yy.n_elem, uword(1), "dot()"); + yy.m.sync(); + return dense_sparse_helper::dot(U.M.memptr(), yy.m, yy.aux_col1); } }