Skip to content

Commit f5d1e38

Browse files
committed
RcppArmadillo 15.0.2-2
1 parent 4ebf35f commit f5d1e38

File tree

10 files changed

+52
-21
lines changed

10 files changed

+52
-21
lines changed

ChangeLog

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2025-09-18 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): RcppArmadillo 15.0.2-2
4+
* inst/NEWS.Rd: Idem
5+
* configure.ac: Idem
6+
* configure: Idem
7+
8+
2025-09-17 Dirk Eddelbuettel <[email protected]>
9+
10+
* inst/include/RcppArmadillo/interface/RcppArmadilloForward.h: Under
11+
C++14 or newer, default to Armadillo 15.0.2 per discussion with CRAN
12+
* inst/include/RcppArmadillo/version/arma.h: Idem
13+
14+
* inst/include/current/: Sync with upstream Armadillo repo
15+
116
2025-09-16 Dirk Eddelbuettel <[email protected]>
217

318
* src/RcppArmadillo.cpp: Refresh documentation for seed setting function

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: 15.0.2-1
5-
Date: 2025-09-08
4+
Version: 15.0.2-2
5+
Date: 2025-09-18
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",

R/RcppExports.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ armadillo_set_seed_random <- function() {
2020
}
2121

2222
#' @title Set the Armadillo Random Number Generator to given or random value
23-
#'
23+
#' @description Setter functions for the internal Armadillo random number generator
2424
#' @param val The seed used to initialize Armadillo's random number generator.
2525
#' @details
2626
#' Armadillo can switch between two random number generator implementations depending

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 15.0.2-1.
3+
# Generated by GNU Autoconf 2.72 for RcppArmadillo 15.0.2-2.
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='15.0.2-1'
607-
PACKAGE_STRING='RcppArmadillo 15.0.2-1'
606+
PACKAGE_VERSION='15.0.2-2'
607+
PACKAGE_STRING='RcppArmadillo 15.0.2-2'
608608
PACKAGE_BUGREPORT='[email protected]'
609609
PACKAGE_URL=''
610610

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

12841284
if test -n "$ac_init_help"; then
12851285
case $ac_init_help in
1286-
short | recursive ) echo "Configuration of RcppArmadillo 15.0.2-1:";;
1286+
short | recursive ) echo "Configuration of RcppArmadillo 15.0.2-2:";;
12871287
esac
12881288
cat <<\_ACEOF
12891289
@@ -1364,7 +1364,7 @@ fi
13641364
test -n "$ac_init_help" && exit $ac_status
13651365
if $ac_init_version; then
13661366
cat <<\_ACEOF
1367-
RcppArmadillo configure 15.0.2-1
1367+
RcppArmadillo configure 15.0.2-2
13681368
generated by GNU Autoconf 2.72
13691369
13701370
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF
14801480
This file contains any messages produced by compilers while
14811481
running configure, to aid debugging if configure makes a mistake.
14821482
1483-
It was created by RcppArmadillo $as_me 15.0.2-1, which was
1483+
It was created by RcppArmadillo $as_me 15.0.2-2, which was
14841484
generated by GNU Autoconf 2.72. Invocation command line was
14851485
14861486
$ $0$ac_configure_args_raw
@@ -3977,7 +3977,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
39773977
# report actual input values of CONFIG_FILES etc. instead of their
39783978
# values after options handling.
39793979
ac_log="
3980-
This file was extended by RcppArmadillo $as_me 15.0.2-1, which was
3980+
This file was extended by RcppArmadillo $as_me 15.0.2-2, which was
39813981
generated by GNU Autoconf 2.72. Invocation command line was
39823982
39833983
CONFIG_FILES = $CONFIG_FILES
@@ -4032,7 +4032,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
40324032
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
40334033
ac_cs_config='$ac_cs_config_escaped'
40344034
ac_cs_version="\\
4035-
RcppArmadillo config.status 15.0.2-1
4035+
RcppArmadillo config.status 15.0.2-2
40364036
configured by $0, generated by GNU Autoconf 2.72,
40374037
with options \\"\$ac_cs_config\\"
40384038

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],[15.0.2-1],[[email protected]])
14+
AC_INIT([RcppArmadillo],[15.0.2-2],[[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: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
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 15.0.2-2 (2025-09-18)}{
7+
\itemize{
8+
\item Minor update to skeleton \code{Makevars},\code{Makevars.win}
9+
\item Update README.md to mention ldlasb2 repository
10+
\item Minor documentation update (\ghpr{487})
11+
\item Synchronized with Armadillo upstream (\ghpr{488})
12+
\item Refine Armadillo version selection in coordination with CRAN
13+
maintainers to support transition towards Armadillo 15.0.*
14+
}
15+
}
16+
617
\section{Changes in RcppArmadillo version 15.0.2-1 (2025-09-08)}{
718
\itemize{
819
\item Upgraded to Armadillo release 15.0.2-1 (Medium Roast)

inst/include/RcppArmadillo/interface/RcppArmadilloForward.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#define ARMA_DONT_USE_WRAPPER
4949

5050
// See version/arma.h header for the (user and/or compilation) drive selection of these defines
51-
#if defined(ARMA_SELECTED_CURRENT_VERSION)
51+
#if defined(ARMA_SELECTED_CURRENT_VERSION) || (__cplusplus >= 201402L)
5252

5353
// we include Armadillo 15.0.1 here -- but do it quietly
5454
//#pragma message("Using compilation with current Armadillo version.")

inst/include/RcppArmadillo/version/arma.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,15 @@
6767
// Define selector used in RcppArmadilloForward.h
6868
#define ARMA_SELECTED_LEGACY_VERSION
6969
#undef ARMA_SELECTED_CURRENT_VERSION
70-
#else
71-
#pragma message("Using fallback compilation with Armadillo 14.6.3. Please consider defining -DARMA_USE_CURRENT. See GitHub issue #475 for more.")
72-
// Define selector used in RcppArmadilloForward.h
73-
// It is our intention to select current here after transition instead of legacy
74-
#define ARMA_SELECTED_LEGACY_VERSION
75-
#undef ARMA_SELECTED_CURRENT_VERSION
7670
#endif
71+
// -- no longer automatically fall back to legacy version (unless in C++11 mode)
72+
// #else
73+
// #pragma message("Using fallback compilation with Armadillo 14.6.3. Please consider defining -DARMA_USE_CURRENT. See GitHub issue #475 for more.")
74+
// // Define selector used in RcppArmadilloForward.h
75+
// // It is our intention to select current here after transition instead of legacy
76+
// #define ARMA_SELECTED_LEGACY_VERSION
77+
// #undef ARMA_SELECTED_CURRENT_VERSION
78+
// #endif
7779
#endif
7880

7981

man/armadillo_set_seed.Rd

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/RcppArmadillo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void armadillo_set_seed_random() {
5656
}
5757

5858
//' @title Set the Armadillo Random Number Generator to given or random value
59-
//'
59+
//' @description Setter functions for the internal Armadillo random number generator
6060
//' @param val The seed used to initialize Armadillo's random number generator.
6161
//' @details
6262
//' Armadillo can switch between two random number generator implementations depending

0 commit comments

Comments
 (0)