Skip to content

Commit 505b9db

Browse files
authored
Merge pull request #433 from RcppCore/feature/armadillo_12.8.0
RcppArmadillo 0.12.8.0.0
2 parents da81db1 + 609d0cb commit 505b9db

27 files changed

+710
-114
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- name: Checkout
24+
uses: actions/checkout@v4
2425

25-
- name: Script
26-
run: curl -OLs https://eddelbuettel.github.io/r-ci/run.sh && chmod 0755 run.sh
26+
- name: Setup
27+
uses: eddelbuettel/github-actions/r-ci-setup@master
2728

2829
- name: Bootstrap
2930
run: ./run.sh bootstrap

ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2024-02-08 Dirk Eddelbuettel <[email protected]>
2+
3+
* .github/workflows/ci.yaml (jobs): Switch to actions/checkout@v4 and
4+
eddelbuettel/github-actions/r-ci-setup@master
5+
6+
2024-02-06 Dirk Eddelbuettel <[email protected]>
7+
8+
* DESCRIPTION (Version, Date): RcppArmadillo 0.12.8.0.0
9+
* inst/NEWS.Rd: Idem
10+
* configure.ac: Idem
11+
* configure: Idem
12+
13+
* inst/include/armadillo_bits/: Armadillo 12.8.0
14+
115
2024-01-18 Dirk Eddelbuettel <[email protected]>
216

317
* inst/include/RcppArmadilloAs.h: Remove non-user facing include

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: 0.12.6.7.1
5-
Date: 2024-01-18
4+
Version: 0.12.8.0.0
5+
Date: 2024-02-06
66
Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson
77
Maintainer: Dirk Eddelbuettel <[email protected]>
88
Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad

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 0.12.6.7.0.
3+
# Generated by GNU Autoconf 2.71 for RcppArmadillo 0.12.8.0.0.
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='0.12.6.7.0'
614-
PACKAGE_STRING='RcppArmadillo 0.12.6.7.0'
613+
PACKAGE_VERSION='0.12.8.0.0'
614+
PACKAGE_STRING='RcppArmadillo 0.12.8.0.0'
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 0.12.6.7.0 to adapt to many kinds of systems.
1232+
\`configure' configures RcppArmadillo 0.12.8.0.0 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 0.12.6.7.0:";;
1294+
short | recursive ) echo "Configuration of RcppArmadillo 0.12.8.0.0:";;
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 0.12.6.7.0
1375+
RcppArmadillo configure 0.12.8.0.0
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 0.12.6.7.0, which was
1489+
It was created by RcppArmadillo $as_me 0.12.8.0.0, 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 0.12.6.7.0, which was
3947+
This file was extended by RcppArmadillo $as_me 0.12.8.0.0, 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 0.12.6.7.0
4002+
RcppArmadillo config.status 0.12.8.0.0
40034003
configured by $0, generated by GNU Autoconf 2.71,
40044004
with options \\"\$ac_cs_config\\"
40054005

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
##
44
## 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
55
##
6-
## Copyright (C) 2016 - 2023 Dirk Eddelbuettel
6+
## Copyright (C) 2016 - 2024 Dirk Eddelbuettel
77
##
88
## Licensed under GPL-2 or later
99

1010
## require at least autoconf 2.69
1111
AC_PREREQ([2.69])
1212

1313
## Process this file with autoconf to produce a configure script.
14-
AC_INIT([RcppArmadillo],[0.12.6.7.0],[[email protected]])
14+
AC_INIT([RcppArmadillo],[0.12.8.0.0],[[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: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +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 0.12.6.7.1 (unreleased)}{
6+
\section{Changes in RcppArmadillo version 0.12.8.0.0 (2024-02-06)}{
77
\itemize{
8+
\item Upgraded to Armadillo release 12.8.0 (Cortisol Injector)
9+
\itemize{
10+
\item Faster detection of symmetric expressions by \code{pinv()} and \code{rank()}
11+
\item Expanded \code{shift()} to handle sparse matrices
12+
\item Expanded \code{conv_to} for more flexible conversions between
13+
sparse and dense matrices
14+
\item Added \code{cbrt()}
15+
\item More compact representation of integers when saving matrices in CSV format
16+
}
817
\item Five non-user facing top-level include files have been removed
918
(\ghpr{432} closing \ghit{400} and building on \ghpr{395} and \ghpr{396})
1019
}

inst/include/armadillo

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ namespace arma
369369
#include "armadillo_bits/spop_vectorise_bones.hpp"
370370
#include "armadillo_bits/spop_norm_bones.hpp"
371371
#include "armadillo_bits/spop_vecnorm_bones.hpp"
372+
#include "armadillo_bits/spop_shift_bones.hpp"
372373

373374
#include "armadillo_bits/spglue_plus_bones.hpp"
374375
#include "armadillo_bits/spglue_minus_bones.hpp"
@@ -816,6 +817,7 @@ namespace arma
816817
#include "armadillo_bits/spop_vectorise_meat.hpp"
817818
#include "armadillo_bits/spop_norm_meat.hpp"
818819
#include "armadillo_bits/spop_vecnorm_meat.hpp"
820+
#include "armadillo_bits/spop_shift_meat.hpp"
819821

820822
#include "armadillo_bits/spglue_plus_meat.hpp"
821823
#include "armadillo_bits/spglue_minus_meat.hpp"

inst/include/armadillo_bits/arma_config.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,13 @@ struct arma_config
181181
#endif
182182

183183

184+
#if defined(ARMA_HAVE_CXX23)
185+
static constexpr bool cxx23 = true;
186+
#else
187+
static constexpr bool cxx23 = false;
188+
#endif
189+
190+
184191
#if (!defined(ARMA_DONT_USE_STD_MUTEX))
185192
static constexpr bool std_mutex = true;
186193
#else

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 12
25-
#define ARMA_VERSION_MINOR 6
26-
#define ARMA_VERSION_PATCH 7
27-
#define ARMA_VERSION_NAME "Cortisol Retox"
25+
#define ARMA_VERSION_MINOR 8
26+
#define ARMA_VERSION_PATCH 0
27+
#define ARMA_VERSION_NAME "Cortisol Injector"
2828

2929

3030

inst/include/armadillo_bits/compiler_check.hpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#undef ARMA_HAVE_CXX14
2121
#undef ARMA_HAVE_CXX17
2222
#undef ARMA_HAVE_CXX20
23+
#undef ARMA_HAVE_CXX23
2324

2425
#if (__cplusplus >= 201103L)
2526
#define ARMA_HAVE_CXX11
@@ -37,6 +38,10 @@
3738
#define ARMA_HAVE_CXX20
3839
#endif
3940

41+
#if (__cplusplus >= 202302L)
42+
#define ARMA_HAVE_CXX23
43+
#endif
44+
4045

4146
// MS really can't get its proverbial shit together
4247
#if defined(_MSVC_LANG)
@@ -59,6 +64,11 @@
5964
#define ARMA_HAVE_CXX20
6065
#endif
6166

67+
#if (_MSVC_LANG >= 202302L)
68+
#undef ARMA_HAVE_CXX23
69+
#define ARMA_HAVE_CXX23
70+
#endif
71+
6272
#endif
6373

6474

0 commit comments

Comments
 (0)