Skip to content

Commit d947d71

Browse files
authored
Sync with Armadillo 15.2-rc1 (#492)
* Sync with Armadillo 15.2-rc1 * Micro-release (GitHub-only) 15.1.99-1
1 parent 9c42bac commit d947d71

File tree

136 files changed

+2624
-596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+2624
-596
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2025-10-16 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): RcppArmadillo 15.1.99-1
4+
* inst/NEWS.Rd: Idem
5+
* configure.ac: Idem
6+
* configure: Idem
7+
8+
* inst/include/current/: Sync with Armadillo 15.2-rc1
9+
110
2025-09-21 Dirk Eddelbuettel <[email protected]>
211

312
* inst/include/current/: Sync with Armadillo 15.0.3

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-2
5-
Date: 2025-09-18
4+
Version: 15.1.99-1
5+
Date: 2025-10-16
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 15.0.2-2.
3+
# Generated by GNU Autoconf 2.72 for RcppArmadillo 15.1.99-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='15.0.2-2'
607-
PACKAGE_STRING='RcppArmadillo 15.0.2-2'
606+
PACKAGE_VERSION='15.1.99-1'
607+
PACKAGE_STRING='RcppArmadillo 15.1.99-1'
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-2 to adapt to many kinds of systems.
1224+
'configure' configures RcppArmadillo 15.1.99-1 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-2:";;
1286+
short | recursive ) echo "Configuration of RcppArmadillo 15.1.99-1:";;
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-2
1367+
RcppArmadillo configure 15.1.99-1
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-2, which was
1483+
It was created by RcppArmadillo $as_me 15.1.99-1, 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-2, which was
3980+
This file was extended by RcppArmadillo $as_me 15.1.99-1, 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-2
4035+
RcppArmadillo config.status 15.1.99-1
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-2],[[email protected]])
14+
AC_INIT([RcppArmadillo],[15.1.99-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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
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.1.99-1 (2025-10-16) (GitHub Only)}{
7+
\itemize{
8+
\item Upgraded to Armadillo release 15.2.0 (RC1 right now)
9+
}
10+
}
11+
612
\section{Changes in RcppArmadillo version 15.0.2-2 (2025-09-18)}{
713
\itemize{
814
\item Minor update to skeleton \code{Makevars},\code{Makevars.win}

inst/include/current/armadillo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@ namespace arma
581581
#include "armadillo_bits/fn_inplace_trans.hpp"
582582
#include "armadillo_bits/fn_randi.hpp"
583583
#include "armadillo_bits/fn_randg.hpp"
584+
#include "armadillo_bits/fn_rande.hpp"
584585
#include "armadillo_bits/fn_cond_rcond.hpp"
585586
#include "armadillo_bits/fn_normalise.hpp"
586587
#include "armadillo_bits/fn_clamp.hpp"

inst/include/current/armadillo_bits/Base_meat.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ Base<elem_type,derived>::is_finite() const
667667

668668
if(arma_config::fast_math_warn) { arma_warn(1, "is_finite(): detection of non-finite values is not reliable in fast math mode"); }
669669

670-
if(is_Mat<typename Proxy<derived>::stored_type>::value)
670+
if( (quasi_unwrap<derived>::has_orig_mem) || (is_Mat<typename Proxy<derived>::stored_type>::value) )
671671
{
672672
const quasi_unwrap<derived> U( (*this).get_ref() );
673673

@@ -715,7 +715,7 @@ Base<elem_type,derived>::has_inf() const
715715

716716
if(arma_config::fast_math_warn) { arma_warn(1, "has_inf(): detection of non-finite values is not reliable in fast math mode"); }
717717

718-
if(is_Mat<typename Proxy<derived>::stored_type>::value)
718+
if( (quasi_unwrap<derived>::has_orig_mem) || (is_Mat<typename Proxy<derived>::stored_type>::value) )
719719
{
720720
const quasi_unwrap<derived> U( (*this).get_ref() );
721721

@@ -763,7 +763,7 @@ Base<elem_type,derived>::has_nan() const
763763

764764
if(arma_config::fast_math_warn) { arma_warn(1, "has_nan(): detection of non-finite values is not reliable in fast math mode"); }
765765

766-
if(is_Mat<typename Proxy<derived>::stored_type>::value)
766+
if( (quasi_unwrap<derived>::has_orig_mem) || (is_Mat<typename Proxy<derived>::stored_type>::value) )
767767
{
768768
const quasi_unwrap<derived> U( (*this).get_ref() );
769769

@@ -811,7 +811,7 @@ Base<elem_type,derived>::has_nonfinite() const
811811

812812
if(arma_config::fast_math_warn) { arma_warn(1, "has_nonfinite(): detection of non-finite values is not reliable in fast math mode"); }
813813

814-
if(is_Mat<typename Proxy<derived>::stored_type>::value)
814+
if( (quasi_unwrap<derived>::has_orig_mem) || (is_Mat<typename Proxy<derived>::stored_type>::value) )
815815
{
816816
const quasi_unwrap<derived> U( (*this).get_ref() );
817817

inst/include/current/armadillo_bits/Col_bones.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class Col : public Mat<eT>
142142
template<typename T1> inline void shed_rows(const Base<uword, T1>& indices);
143143

144144
[[deprecated]] inline void insert_rows(const uword row_num, const uword N, const bool set_to_zero);
145-
inline void insert_rows(const uword row_num, const uword N);
145+
inline void insert_rows(const uword row_num, const uword N);
146146

147147
template<typename T1> inline void insert_rows(const uword row_num, const Base<eT,T1>& X);
148148

@@ -154,6 +154,11 @@ class Col : public Mat<eT>
154154
arma_warn_unused arma_inline const eT& at(const uword in_row, const uword in_col) const;
155155

156156

157+
inline constexpr bool is_vec() const { return true; }
158+
inline constexpr bool is_rowvec() const { return false; }
159+
inline constexpr bool is_colvec() const { return true; }
160+
161+
157162
typedef eT* row_iterator;
158163
typedef const eT* const_row_iterator;
159164

inst/include/current/armadillo_bits/Col_meat.hpp

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ Col<eT>::operator=(Col<eT>&& X)
483483
// if(X.n_cols != 1) { const Mat<eT>& XX = X; Mat<eT>::operator=(XX); return *this; }
484484
//
485485
// (*this).steal_mem(X, true);
486-
//
486+
//
487487
// return *this;
488488
// }
489489

@@ -521,11 +521,9 @@ template<typename eT>
521521
template<typename T1>
522522
inline
523523
Col<eT>::Col(const Base<eT,T1>& X)
524-
: Mat<eT>(arma_vec_indicator(), 1)
524+
: Mat<eT>(X.get_ref(), arma_vec_indicator(), 1)
525525
{
526-
arma_debug_sigprint();
527-
528-
Mat<eT>::operator=(X.get_ref());
526+
arma_debug_sigprint_this(this);
529527
}
530528

531529

@@ -549,11 +547,9 @@ template<typename eT>
549547
template<typename T1>
550548
inline
551549
Col<eT>::Col(const SpBase<eT,T1>& X)
552-
: Mat<eT>(arma_vec_indicator(), 1)
550+
: Mat<eT>(X.get_ref(), arma_vec_indicator(), 1)
553551
{
554552
arma_debug_sigprint_this(this);
555-
556-
Mat<eT>::operator=(X.get_ref());
557553
}
558554

559555

@@ -607,12 +603,9 @@ Col<eT>::Col
607603
const Base<typename Col<eT>::pod_type, T1>& A,
608604
const Base<typename Col<eT>::pod_type, T2>& B
609605
)
606+
: Mat<eT>(A.get_ref(), B.get_ref(), arma_vec_indicator(), 1)
610607
{
611-
arma_debug_sigprint();
612-
613-
access::rw(Mat<eT>::vec_state) = 1;
614-
615-
Mat<eT>::init(A,B);
608+
arma_debug_sigprint_this(this);
616609
}
617610

618611

@@ -621,12 +614,9 @@ template<typename eT>
621614
template<typename T1>
622615
inline
623616
Col<eT>::Col(const BaseCube<eT,T1>& X)
617+
: Mat<eT>(X.get_ref(), arma_vec_indicator(), 1)
624618
{
625-
arma_debug_sigprint();
626-
627-
access::rw(Mat<eT>::vec_state) = 1;
628-
629-
Mat<eT>::operator=(X);
619+
arma_debug_sigprint_this(this);
630620
}
631621

632622

@@ -649,12 +639,9 @@ Col<eT>::operator=(const BaseCube<eT,T1>& X)
649639
template<typename eT>
650640
inline
651641
Col<eT>::Col(const subview_cube<eT>& X)
642+
: Mat<eT>(X, arma_vec_indicator(), 1)
652643
{
653-
arma_debug_sigprint();
654-
655-
access::rw(Mat<eT>::vec_state) = 1;
656-
657-
Mat<eT>::operator=(X);
644+
arma_debug_sigprint_this(this);
658645
}
659646

660647

0 commit comments

Comments
 (0)