Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Armadillo 14.0.0 #445

Merged
merged 7 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2024-06-23 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): RcppArmadillo 0.12.8.4.0.14.4 ie the
fourth test package of the 14.0.0 development branch

* inst/include/armadillo_bits/: Armadillo 14.0.0 rc1

2024-05-30 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): RcppArmadillo 0.12.8.4.0
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: RcppArmadillo
Type: Package
Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
Version: 0.12.8.4.0
Date: 2024-05-30
Version: 0.12.8.4.0.14.4
Date: 2024-06-23
Author: Dirk Eddelbuettel, Romain Francois, Doug Bates, Binxiang Ni, and Conrad Sanderson
Maintainer: Dirk Eddelbuettel <[email protected]>
Description: 'Armadillo' is a templated C++ linear algebra library (by Conrad
Expand Down
44 changes: 28 additions & 16 deletions inst/include/armadillo
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ namespace arma
#include "armadillo_bits/OpCube_bones.hpp"
#include "armadillo_bits/SpOp_bones.hpp"
#include "armadillo_bits/SpToDOp_bones.hpp"
#include "armadillo_bits/mtSpReduceOp_bones.hpp"

#include "armadillo_bits/eOp_bones.hpp"
#include "armadillo_bits/eOpCube_bones.hpp"
Expand Down Expand Up @@ -314,12 +315,22 @@ namespace arma
#include "armadillo_bits/op_roots_bones.hpp"
#include "armadillo_bits/op_cond_bones.hpp"
#include "armadillo_bits/op_rcond_bones.hpp"
#include "armadillo_bits/op_sp_plus_bones.hpp"
#include "armadillo_bits/op_sp_minus_bones.hpp"
#include "armadillo_bits/op_powmat_bones.hpp"
#include "armadillo_bits/op_rank_bones.hpp"
#include "armadillo_bits/op_row_as_mat_bones.hpp"
#include "armadillo_bits/op_col_as_mat_bones.hpp"
#include "armadillo_bits/op_sp_plus_bones.hpp"
#include "armadillo_bits/op_sp_minus_bones.hpp"
#include "armadillo_bits/op_sp_sum_bones.hpp"
#include "armadillo_bits/op_sp_max_bones.hpp"
#include "armadillo_bits/op_sp_min_bones.hpp"
#include "armadillo_bits/op_sp_mean_bones.hpp"
#include "armadillo_bits/op_sp_var_bones.hpp"
#include "armadillo_bits/op_sp_stddev_bones.hpp"
#include "armadillo_bits/op_sp_vecnorm_bones.hpp"
#include "armadillo_bits/op_sp_diagvec_bones.hpp"
#include "armadillo_bits/op_sp_nonzeros_bones.hpp"
#include "armadillo_bits/op_sp_as_dense_bones.hpp"

#include "armadillo_bits/glue_times_bones.hpp"
#include "armadillo_bits/glue_times_misc_bones.hpp"
Expand Down Expand Up @@ -352,24 +363,19 @@ namespace arma
#include "armadillo_bits/gmm_diag_bones.hpp"
#include "armadillo_bits/gmm_full_bones.hpp"

#include "armadillo_bits/spop_max_bones.hpp"
#include "armadillo_bits/spop_min_bones.hpp"
#include "armadillo_bits/spop_sum_bones.hpp"
#include "armadillo_bits/spop_strans_bones.hpp"
#include "armadillo_bits/spop_htrans_bones.hpp"
#include "armadillo_bits/spop_misc_bones.hpp"
#include "armadillo_bits/spop_diagmat_bones.hpp"
#include "armadillo_bits/spop_mean_bones.hpp"
#include "armadillo_bits/spop_var_bones.hpp"
#include "armadillo_bits/spop_trimat_bones.hpp"
#include "armadillo_bits/spop_symmat_bones.hpp"
#include "armadillo_bits/spop_normalise_bones.hpp"
#include "armadillo_bits/spop_reverse_bones.hpp"
#include "armadillo_bits/spop_repmat_bones.hpp"
#include "armadillo_bits/spop_vectorise_bones.hpp"
#include "armadillo_bits/spop_norm_bones.hpp"
#include "armadillo_bits/spop_vecnorm_bones.hpp"
#include "armadillo_bits/spop_shift_bones.hpp"
#include "armadillo_bits/spop_relational_bones.hpp"

#include "armadillo_bits/spglue_plus_bones.hpp"
#include "armadillo_bits/spglue_minus_bones.hpp"
Expand Down Expand Up @@ -624,6 +630,7 @@ namespace arma
#include "armadillo_bits/mtOp_meat.hpp"
#include "armadillo_bits/mtOpCube_meat.hpp"
#include "armadillo_bits/mtSpOp_meat.hpp"
#include "armadillo_bits/mtSpReduceOp_meat.hpp"

#include "armadillo_bits/Glue_meat.hpp"
#include "armadillo_bits/GlueCube_meat.hpp"
Expand Down Expand Up @@ -762,12 +769,22 @@ namespace arma
#include "armadillo_bits/op_roots_meat.hpp"
#include "armadillo_bits/op_cond_meat.hpp"
#include "armadillo_bits/op_rcond_meat.hpp"
#include "armadillo_bits/op_sp_plus_meat.hpp"
#include "armadillo_bits/op_sp_minus_meat.hpp"
#include "armadillo_bits/op_powmat_meat.hpp"
#include "armadillo_bits/op_rank_meat.hpp"
#include "armadillo_bits/op_row_as_mat_meat.hpp"
#include "armadillo_bits/op_col_as_mat_meat.hpp"
#include "armadillo_bits/op_sp_plus_meat.hpp"
#include "armadillo_bits/op_sp_minus_meat.hpp"
#include "armadillo_bits/op_sp_sum_meat.hpp"
#include "armadillo_bits/op_sp_max_meat.hpp"
#include "armadillo_bits/op_sp_min_meat.hpp"
#include "armadillo_bits/op_sp_mean_meat.hpp"
#include "armadillo_bits/op_sp_var_meat.hpp"
#include "armadillo_bits/op_sp_stddev_meat.hpp"
#include "armadillo_bits/op_sp_vecnorm_meat.hpp"
#include "armadillo_bits/op_sp_diagvec_meat.hpp"
#include "armadillo_bits/op_sp_nonzeros_meat.hpp"
#include "armadillo_bits/op_sp_as_dense_meat.hpp"

#include "armadillo_bits/glue_times_meat.hpp"
#include "armadillo_bits/glue_times_misc_meat.hpp"
Expand Down Expand Up @@ -800,24 +817,19 @@ namespace arma
#include "armadillo_bits/gmm_diag_meat.hpp"
#include "armadillo_bits/gmm_full_meat.hpp"

#include "armadillo_bits/spop_max_meat.hpp"
#include "armadillo_bits/spop_min_meat.hpp"
#include "armadillo_bits/spop_sum_meat.hpp"
#include "armadillo_bits/spop_strans_meat.hpp"
#include "armadillo_bits/spop_htrans_meat.hpp"
#include "armadillo_bits/spop_misc_meat.hpp"
#include "armadillo_bits/spop_diagmat_meat.hpp"
#include "armadillo_bits/spop_mean_meat.hpp"
#include "armadillo_bits/spop_var_meat.hpp"
#include "armadillo_bits/spop_trimat_meat.hpp"
#include "armadillo_bits/spop_symmat_meat.hpp"
#include "armadillo_bits/spop_normalise_meat.hpp"
#include "armadillo_bits/spop_reverse_meat.hpp"
#include "armadillo_bits/spop_repmat_meat.hpp"
#include "armadillo_bits/spop_vectorise_meat.hpp"
#include "armadillo_bits/spop_norm_meat.hpp"
#include "armadillo_bits/spop_vecnorm_meat.hpp"
#include "armadillo_bits/spop_shift_meat.hpp"
#include "armadillo_bits/spop_relational_meat.hpp"

#include "armadillo_bits/spglue_plus_meat.hpp"
#include "armadillo_bits/spglue_minus_meat.hpp"
Expand Down
42 changes: 21 additions & 21 deletions inst/include/armadillo_bits/BaseCube_meat.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ inline
void
BaseCube<elem_type,derived>::print(const std::string extra_text) const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

const unwrap_cube<derived> tmp( (*this).get_ref() );

Expand All @@ -59,7 +59,7 @@ inline
void
BaseCube<elem_type,derived>::print(std::ostream& user_stream, const std::string extra_text) const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

const unwrap_cube<derived> tmp( (*this).get_ref() );

Expand All @@ -82,7 +82,7 @@ inline
void
BaseCube<elem_type,derived>::raw_print(const std::string extra_text) const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

const unwrap_cube<derived> tmp( (*this).get_ref() );

Expand All @@ -105,7 +105,7 @@ inline
void
BaseCube<elem_type,derived>::raw_print(std::ostream& user_stream, const std::string extra_text) const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

const unwrap_cube<derived> tmp( (*this).get_ref() );

Expand All @@ -128,7 +128,7 @@ inline
void
BaseCube<elem_type,derived>::brief_print(const std::string extra_text) const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

const unwrap_cube<derived> tmp( (*this).get_ref() );

Expand All @@ -151,7 +151,7 @@ inline
void
BaseCube<elem_type,derived>::brief_print(std::ostream& user_stream, const std::string extra_text) const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

const unwrap_cube<derived> tmp( (*this).get_ref() );

Expand Down Expand Up @@ -200,7 +200,7 @@ BaseCube<elem_type,derived>::index_min() const

if(P.get_n_elem() == 0)
{
arma_debug_check(true, "index_min(): object has no elements");
arma_conform_check(true, "index_min(): object has no elements");
}
else
{
Expand All @@ -223,7 +223,7 @@ BaseCube<elem_type,derived>::index_max() const

if(P.get_n_elem() == 0)
{
arma_debug_check(true, "index_max(): object has no elements");
arma_conform_check(true, "index_max(): object has no elements");
}
else
{
Expand All @@ -240,11 +240,11 @@ inline
bool
BaseCube<elem_type,derived>::is_zero(const typename get_pod_type<elem_type>::result tol) const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

typedef typename get_pod_type<elem_type>::result T;

arma_debug_check( (tol < T(0)), "is_zero(): parameter 'tol' must be >= 0" );
arma_conform_check( (tol < T(0)), "is_zero(): parameter 'tol' must be >= 0" );

if(ProxyCube<derived>::use_at || is_Cube<typename ProxyCube<derived>::stored_type>::value)
{
Expand Down Expand Up @@ -292,7 +292,7 @@ inline
bool
BaseCube<elem_type,derived>::is_empty() const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

const ProxyCube<derived> P( (*this).get_ref() );

Expand All @@ -306,9 +306,9 @@ inline
bool
BaseCube<elem_type,derived>::is_finite() const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

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

if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
{
Expand Down Expand Up @@ -342,9 +342,9 @@ inline
bool
BaseCube<elem_type,derived>::has_inf() const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

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

if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
{
Expand Down Expand Up @@ -378,9 +378,9 @@ inline
bool
BaseCube<elem_type,derived>::has_nan() const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

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

if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
{
Expand Down Expand Up @@ -414,9 +414,9 @@ inline
bool
BaseCube<elem_type,derived>::has_nonfinite() const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

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

if(is_Cube<typename ProxyCube<derived>::stored_type>::value)
{
Expand Down Expand Up @@ -473,7 +473,7 @@ arma_inline
const derived&
BaseCube_eval_Cube<elem_type, derived>::eval() const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

return static_cast<const derived&>(*this);
}
Expand All @@ -488,7 +488,7 @@ inline
Cube<elem_type>
BaseCube_eval_expr<elem_type, derived>::eval() const
{
arma_extra_debug_sigprint();
arma_debug_sigprint();

return Cube<elem_type>( static_cast<const derived&>(*this) );
}
Expand Down
Loading