Skip to content

Commit 7b4bd34

Browse files
authored
Merge pull request #458 from RcppCore/feature/arma_14.2.0rc
RcppArmadillo 14.2.0-1 with Armadillo 14.2.0
2 parents bb5aab7 + cacf478 commit 7b4bd34

Some content is hidden

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

70 files changed

+1654
-694
lines changed

ChangeLog

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
2024-11-16 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): RcppArmadillo 14.2.0-1
4+
* inst/NEWS.Rd: Idem
5+
* configure.ac: Idem
6+
* configure: Idem
7+
8+
2024-11-14 Dirk Eddelbuettel <[email protected]>
9+
10+
* inst/include/armadillo_bits/: Re-sync Armadillo 14.2.0-rc1
11+
12+
2024-11-07 Dirk Eddelbuettel <[email protected]>
13+
14+
* DESCRIPTION (Depends): Increase to Rcpp (>= 1.0.12) as it supplies
15+
the required printf format change more current R versions need
16+
17+
* inst/include/armadillo_bits/: Re-sync Armadillo 14.2.0-rc0
18+
19+
2024-11-05 Dirk Eddelbuettel <[email protected]>
20+
21+
* inst/include/armadillo_bits/: Re-sync Armadillo 14.2.0-rc0
22+
23+
2024-11-03 Dirk Eddelbuettel <[email protected]>
24+
25+
* inst/include/armadillo_bits/: Armadillo 14.2.0-rc0
26+
127
2024-09-29 Dirk Eddelbuettel <[email protected]>
228

329
* inst/include/RcppArmadillo/interface/RcppArmadilloAs.h: Add icube

DESCRIPTION

Lines changed: 3 additions & 3 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.0.2-1.1
5-
Date: 2024-09-10
4+
Version: 14.2.0-1
5+
Date: 2024-11-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",
@@ -29,7 +29,7 @@ License: GPL (>= 2)
2929
LazyLoad: yes
3030
Depends: R (>= 3.3.0)
3131
LinkingTo: Rcpp
32-
Imports: Rcpp (>= 1.0.8), stats, utils, methods
32+
Imports: Rcpp (>= 1.0.12), stats, utils, methods
3333
Suggests: tinytest, Matrix (>= 1.3.0), pkgKitten, reticulate, slam
3434
URL: https://github.com/RcppCore/RcppArmadillo, https://dirk.eddelbuettel.com/code/rcpp.armadillo.html
3535
BugReports: https://github.com/RcppCore/RcppArmadillo/issues

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.71 for RcppArmadillo 14.0.2-0.
3+
# Generated by GNU Autoconf 2.71 for RcppArmadillo 14.2.0-1.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -610,8 +610,8 @@ MAKEFLAGS=
610610
# Identity of this package.
611611
PACKAGE_NAME='RcppArmadillo'
612612
PACKAGE_TARNAME='rcpparmadillo'
613-
PACKAGE_VERSION='14.0.2-0'
614-
PACKAGE_STRING='RcppArmadillo 14.0.2-0'
613+
PACKAGE_VERSION='14.2.0-1'
614+
PACKAGE_STRING='RcppArmadillo 14.2.0-1'
615615
PACKAGE_BUGREPORT='[email protected]'
616616
PACKAGE_URL=''
617617

@@ -1229,7 +1229,7 @@ if test "$ac_init_help" = "long"; then
12291229
# Omit some internal or obsolete options to make the list less imposing.
12301230
# This message is too long to be a string in the A/UX 3.1 sh.
12311231
cat <<_ACEOF
1232-
\`configure' configures RcppArmadillo 14.0.2-0 to adapt to many kinds of systems.
1232+
\`configure' configures RcppArmadillo 14.2.0-1 to adapt to many kinds of systems.
12331233
12341234
Usage: $0 [OPTION]... [VAR=VALUE]...
12351235
@@ -1291,7 +1291,7 @@ fi
12911291

12921292
if test -n "$ac_init_help"; then
12931293
case $ac_init_help in
1294-
short | recursive ) echo "Configuration of RcppArmadillo 14.0.2-0:";;
1294+
short | recursive ) echo "Configuration of RcppArmadillo 14.2.0-1:";;
12951295
esac
12961296
cat <<\_ACEOF
12971297
@@ -1372,7 +1372,7 @@ fi
13721372
test -n "$ac_init_help" && exit $ac_status
13731373
if $ac_init_version; then
13741374
cat <<\_ACEOF
1375-
RcppArmadillo configure 14.0.2-0
1375+
RcppArmadillo configure 14.2.0-1
13761376
generated by GNU Autoconf 2.71
13771377
13781378
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1486,7 +1486,7 @@ cat >config.log <<_ACEOF
14861486
This file contains any messages produced by compilers while
14871487
running configure, to aid debugging if configure makes a mistake.
14881488
1489-
It was created by RcppArmadillo $as_me 14.0.2-0, which was
1489+
It was created by RcppArmadillo $as_me 14.2.0-1, which was
14901490
generated by GNU Autoconf 2.71. Invocation command line was
14911491
14921492
$ $0$ac_configure_args_raw
@@ -3944,7 +3944,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
39443944
# report actual input values of CONFIG_FILES etc. instead of their
39453945
# values after options handling.
39463946
ac_log="
3947-
This file was extended by RcppArmadillo $as_me 14.0.2-0, which was
3947+
This file was extended by RcppArmadillo $as_me 14.2.0-1, which was
39483948
generated by GNU Autoconf 2.71. Invocation command line was
39493949
39503950
CONFIG_FILES = $CONFIG_FILES
@@ -3999,7 +3999,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
39993999
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
40004000
ac_cs_config='$ac_cs_config_escaped'
40014001
ac_cs_version="\\
4002-
RcppArmadillo config.status 14.0.2-0
4002+
RcppArmadillo config.status 14.2.0-1
40034003
configured by $0, generated by GNU Autoconf 2.71,
40044004
with options \\"\$ac_cs_config\\"
40054005

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.0.2-0],[[email protected]])
14+
AC_INIT([RcppArmadillo],[14.2.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: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,23 @@
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.2.0-1 (2024-11-16)}{
7+
\itemize{
8+
\item Upgraded to Armadillo release 14.2.0 (Smooth Caffeine)
9+
\itemize{
10+
\item Faster handling of symmetric matrices by \code{inv()} and
11+
\code{rcond()}
12+
\item Faster handling of hermitian matrices by \code{inv()},
13+
\code{rcond()}, \code{cond()}, \code{pinv()}, \code{rank()}
14+
\item Added \code{solve_opts::force_sym} option to \code{solve()} to
15+
force the use of the symmetric solver
16+
\item More efficient handling of compound expressions by \code{solve()}
17+
}
18+
\item Added exporter specialisation for \code{icube} for the
19+
\code{ARMA_64BIT_WORD} case
20+
}
21+
}
22+
623
\section{Changes in RcppArmadillo version 14.0.2-1 (2024-09-11)}{
724
\itemize{
825
\item Upgraded to Armadillo release 14.0.2 (Stochastic Parrot)

inst/include/armadillo_bits/Base_bones.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ struct Base
127127
arma_warn_unused inline elem_type min() const;
128128
arma_warn_unused inline elem_type max() const;
129129

130-
inline elem_type min(uword& index_of_min_val) const;
131-
inline elem_type max(uword& index_of_max_val) const;
130+
arma_frown("use .index_min() instead") inline elem_type min(uword& index_of_min_val) const;
131+
arma_frown("use .index_max() instead") inline elem_type max(uword& index_of_max_val) const;
132132

133-
inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
134-
inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
133+
arma_deprecated inline elem_type min(uword& row_of_min_val, uword& col_of_min_val) const;
134+
arma_deprecated inline elem_type max(uword& row_of_max_val, uword& col_of_max_val) const;
135135

136136
arma_warn_unused inline uword index_min() const;
137137
arma_warn_unused inline uword index_max() const;

inst/include/armadillo_bits/CubeToMatOp_bones.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ class CubeToMatOp : public Base< typename T1::elem_type, CubeToMatOp<T1, op_type
3636
arma_aligned const T1& m; //!< the operand; must be derived from BaseCube
3737
arma_aligned uword aux_uword; //!< auxiliary data, uword format
3838

39+
template<typename eT2>
40+
constexpr bool is_alias(const Mat<eT2>&) const { return false; }
41+
3942
static constexpr bool is_row = op_type::template traits<T1>::is_row;
4043
static constexpr bool is_col = op_type::template traits<T1>::is_col;
4144
static constexpr bool is_xvec = op_type::template traits<T1>::is_xvec;

inst/include/armadillo_bits/Cube_bones.hpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,11 @@ class Cube : public BaseCube< eT, Cube<eT> >
387387
arma_warn_unused inline eT min() const;
388388
arma_warn_unused inline eT max() const;
389389

390-
inline eT min(uword& index_of_min_val) const;
391-
inline eT max(uword& index_of_max_val) const;
392-
393-
inline eT min(uword& row_of_min_val, uword& col_of_min_val, uword& slice_of_min_val) const;
394-
inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const;
390+
arma_frown("use .index_min() instead") inline eT min(uword& index_of_min_val) const;
391+
arma_frown("use .index_max() instead") inline eT max(uword& index_of_max_val) const;
395392

393+
arma_deprecated inline eT min(uword& row_of_min_val, uword& col_of_min_val, uword& slice_of_min_val) const;
394+
arma_deprecated inline eT max(uword& row_of_max_val, uword& col_of_max_val, uword& slice_of_max_val) const;
396395

397396
arma_cold inline bool save(const std::string name, const file_type type = arma_binary) const;
398397
arma_cold inline bool save(const hdf5_name& spec, const file_type type = hdf5_binary) const;

inst/include/armadillo_bits/Gen_bones.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ class Gen
5454
inline void apply_inplace_div (Mat<elem_type>& out) const;
5555

5656
inline void apply(subview<elem_type>& out) const;
57+
58+
template<typename eT2>
59+
constexpr bool is_alias(const Mat<eT2>&) const { return false; }
5760
};
5861

5962

inst/include/armadillo_bits/Glue_bones.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ class Glue
5656
inline Glue(const T1& in_A, const T2& in_B, const uword in_aux_uword);
5757
inline ~Glue();
5858

59+
template<typename eT2>
60+
inline bool is_alias(const Mat<eT2>& X) const;
61+
5962
const T1& A; //!< first operand; must be derived from Base
6063
const T2& B; //!< second operand; must be derived from Base
6164
uword aux_uword; //!< storage of auxiliary data, uword format

0 commit comments

Comments
 (0)