Skip to content

Commit 8159eae

Browse files
committed
RcppArmadillo 14.6.0-1
1 parent 334397e commit 8159eae

File tree

7 files changed

+46
-20
lines changed

7 files changed

+46
-20
lines changed

ChangeLog

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2025-07-02 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): RcppArmadillo 14.6.0-1
4+
* inst/NEWS.Rd: Idem
5+
* configure.ac: Idem
6+
* configure: Idem
7+
8+
* inst/include/armadillo/: Armadillo 14.6.0
9+
* inst/include/armadillo_bits/: Idem
10+
11+
2025-07-01 Dirk Eddelbuettel <[email protected]>
12+
13+
* DESCRIPTION (Version, Date): RcppArmadillo 14.5.92-1
14+
* inst/NEWS.Rd: Idem
15+
* configure.ac: Idem
16+
* configure: Idem
17+
18+
* inst/include/armadillo/: Armadillo 14.5.92 as RC2 for 14.6.0
19+
* inst/include/armadillo_bits/: Idem
20+
121
2025-06-30 Dirk Eddelbuettel <[email protected]>
222

323
* DESCRIPTION (Version, Date): RcppArmadillo 14.5.91-1

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RcppArmadillo
22
Type: Package
33
Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
4-
Version: 14.5.91-1
5-
Date: 2025-06-30
4+
Version: 14.6.0-1
5+
Date: 2025-07-02
66
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
77
comment = c(ORCID = "0000-0001-6419-907X")),
88
person("Romain", "Francois", role = "aut",

configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.72 for RcppArmadillo 14.5.91-1.
3+
# Generated by GNU Autoconf 2.72 for RcppArmadillo 14.6.0-1.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -603,8 +603,8 @@ MAKEFLAGS=
603603
# Identity of this package.
604604
PACKAGE_NAME='RcppArmadillo'
605605
PACKAGE_TARNAME='rcpparmadillo'
606-
PACKAGE_VERSION='14.5.91-1'
607-
PACKAGE_STRING='RcppArmadillo 14.5.91-1'
606+
PACKAGE_VERSION='14.6.0-1'
607+
PACKAGE_STRING='RcppArmadillo 14.6.0-1'
608608
PACKAGE_BUGREPORT='[email protected]'
609609
PACKAGE_URL=''
610610

@@ -1222,7 +1222,7 @@ if test "$ac_init_help" = "long"; then
12221222
# Omit some internal or obsolete options to make the list less imposing.
12231223
# This message is too long to be a string in the A/UX 3.1 sh.
12241224
cat <<_ACEOF
1225-
'configure' configures RcppArmadillo 14.5.91-1 to adapt to many kinds of systems.
1225+
'configure' configures RcppArmadillo 14.6.0-1 to adapt to many kinds of systems.
12261226
12271227
Usage: $0 [OPTION]... [VAR=VALUE]...
12281228
@@ -1284,7 +1284,7 @@ fi
12841284

12851285
if test -n "$ac_init_help"; then
12861286
case $ac_init_help in
1287-
short | recursive ) echo "Configuration of RcppArmadillo 14.5.91-1:";;
1287+
short | recursive ) echo "Configuration of RcppArmadillo 14.6.0-1:";;
12881288
esac
12891289
cat <<\_ACEOF
12901290
@@ -1365,7 +1365,7 @@ fi
13651365
test -n "$ac_init_help" && exit $ac_status
13661366
if $ac_init_version; then
13671367
cat <<\_ACEOF
1368-
RcppArmadillo configure 14.5.91-1
1368+
RcppArmadillo configure 14.6.0-1
13691369
generated by GNU Autoconf 2.72
13701370
13711371
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1481,7 +1481,7 @@ cat >config.log <<_ACEOF
14811481
This file contains any messages produced by compilers while
14821482
running configure, to aid debugging if configure makes a mistake.
14831483
1484-
It was created by RcppArmadillo $as_me 14.5.91-1, which was
1484+
It was created by RcppArmadillo $as_me 14.6.0-1, which was
14851485
generated by GNU Autoconf 2.72. Invocation command line was
14861486
14871487
$ $0$ac_configure_args_raw
@@ -3980,7 +3980,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
39803980
# report actual input values of CONFIG_FILES etc. instead of their
39813981
# values after options handling.
39823982
ac_log="
3983-
This file was extended by RcppArmadillo $as_me 14.5.91-1, which was
3983+
This file was extended by RcppArmadillo $as_me 14.6.0-1, which was
39843984
generated by GNU Autoconf 2.72. Invocation command line was
39853985
39863986
CONFIG_FILES = $CONFIG_FILES
@@ -4035,7 +4035,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
40354035
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
40364036
ac_cs_config='$ac_cs_config_escaped'
40374037
ac_cs_version="\\
4038-
RcppArmadillo config.status 14.5.91-1
4038+
RcppArmadillo config.status 14.6.0-1
40394039
configured by $0, generated by GNU Autoconf 2.72,
40404040
with options \\"\$ac_cs_config\\"
40414041

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
AC_PREREQ([2.69])
1212

1313
## Process this file with autoconf to produce a configure script.
14-
AC_INIT([RcppArmadillo],[14.5.91-1],[[email protected]])
14+
AC_INIT([RcppArmadillo],[14.6.0-1],[[email protected]])
1515

1616
## Set R_HOME, respecting an environment variable if one is set
1717
: ${R_HOME=$(R RHOME)}

inst/NEWS.Rd

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
\newcommand{\ghpr}{\href{https://github.com/RcppCore/RcppArmadillo/pull/#1}{##1}}
44
\newcommand{\ghit}{\href{https://github.com/RcppCore/RcppArmadillo/issues/#1}{##1}}
55

6-
\section{Changes in RcppArmadillo version 14.5.91-1 (2025-06-30) (GitHub Only)}{
6+
\section{Changes in RcppArmadillo version 14.6.0-1 (2025-07-02)}{
77
\itemize{
8-
\item Upgraded to Armadillo release 14.5.91 (14.6-RC1)
8+
\item Upgraded to Armadillo release 14.6.0 (Caffe Mocha)
99
\itemize{
10-
\item Changes list to follow
10+
\item Added \code{balance()} to transform matrices so that column and
11+
row norms are roughly the same
12+
\item Added \code{omit_nan()} and \code{omit_nonfinite()} to extract
13+
elements while omitting NaN and non-finite values
14+
\item Added \code{find_nonnan()} for finding indices of non-NaN elements
15+
\item Added standalone \code{replace()} function
1116
}
1217
\item The \code{fastLm()} help page now mentions that options to
13-
\code{solve} can control behavior.
18+
\code{solve()} can control its behavior.
1419
}
1520
}
1621

inst/include/armadillo_bits/arma_version.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323

2424
#define ARMA_VERSION_MAJOR 14
25-
#define ARMA_VERSION_MINOR 5
26-
#define ARMA_VERSION_PATCH 91
27-
#define ARMA_VERSION_NAME "14.6-RC1"
25+
#define ARMA_VERSION_MINOR 6
26+
#define ARMA_VERSION_PATCH 0
27+
#define ARMA_VERSION_NAME "Caffe Mocha"
2828

2929

3030

inst/include/armadillo_bits/op_mean_meat.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ op_mean::apply(Cube<typename T1::elem_type>& out, const OpCube<T1,op_mean>& in)
130130
typedef typename T1::elem_type eT;
131131

132132
const uword dim = in.aux_uword_a;
133+
133134
arma_conform_check( (dim > 2), "mean(): parameter 'dim' must be 0 or 1 or 2" );
134135

135136
const unwrap_cube<T1> U(in.m);
@@ -211,7 +212,7 @@ op_mean::apply_noalias(Cube<eT>& out, const Cube<eT>& X, const uword dim)
211212

212213
if(arma_isnonfinite(old_mean))
213214
{
214-
tmp_vec.copy(tmp_mat, row);
215+
tmp_vec.copy_row(tmp_mat, row);
215216

216217
out_mem[row] = op_mean::direct_mean_robust(old_mean, tmp_vec.memptr(), tmp_vec.n_elem);
217218
}

0 commit comments

Comments
 (0)