Skip to content

Commit 3df665d

Browse files
eddelbuetteleddelbuettel
committed
Armadillo 15.0.*
1 parent 9ce7952 commit 3df665d

File tree

645 files changed

+6093
-5293
lines changed

Some content is hidden

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

645 files changed

+6093
-5293
lines changed

‎inst/include/armadillo‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -54,14 +54,33 @@
5454
#include <atomic>
5555

5656
#if defined(ARMA_USE_STD_MUTEX)
57-
#include <mutex>
57+
#if defined(__has_include)
58+
#if __has_include(<mutex>)
59+
#include <mutex>
60+
#else
61+
#undef ARMA_USE_STD_MUTEX
62+
#pragma message ("WARNING: use of std::mutex disabled; mutex header not found")
63+
#endif
64+
#else
65+
#include <mutex>
66+
#endif
5867
#endif
5968

6069
// #if defined(ARMA_HAVE_CXX17)
6170
// #include <charconv>
6271
// #include <system_error>
6372
// #endif
6473

74+
#if defined(ARMA_HAVE_CXX23)
75+
#if defined(__has_include)
76+
#if __has_include(<stdfloat>)
77+
#include <stdfloat>
78+
#endif
79+
#else
80+
#include <stdfloat>
81+
#endif
82+
#endif
83+
6584
#if ( defined(__unix__) || defined(__unix) || defined(_POSIX_C_SOURCE) || (defined(__APPLE__) && defined(__MACH__)) ) && !defined(_WIN32)
6685
#include <unistd.h>
6786
#endif
@@ -139,6 +158,7 @@ namespace arma
139158
#include "armadillo_bits/constants_old.hpp"
140159
#include "armadillo_bits/mp_misc.hpp"
141160
#include "armadillo_bits/arma_rel_comparators.hpp"
161+
#include "armadillo_bits/cond_rel.hpp"
142162
#include "armadillo_bits/fill.hpp"
143163

144164
#if defined(ARMA_RNG_ALT)
@@ -171,7 +191,6 @@ namespace arma
171191
#include "armadillo_bits/translate_superlu.hpp"
172192
#include "armadillo_bits/translate_fftw3.hpp"
173193

174-
#include "armadillo_bits/cond_rel_bones.hpp"
175194
#include "armadillo_bits/arrayops_bones.hpp"
176195
#include "armadillo_bits/podarray_bones.hpp"
177196
#include "armadillo_bits/auxlib_bones.hpp"
@@ -275,7 +294,7 @@ namespace arma
275294
#include "armadillo_bits/op_resize_bones.hpp"
276295
#include "armadillo_bits/op_cov_bones.hpp"
277296
#include "armadillo_bits/op_cor_bones.hpp"
278-
#include "armadillo_bits/op_shift_bones.hpp"
297+
#include "armadillo_bits/op_circshift_bones.hpp"
279298
#include "armadillo_bits/op_shuffle_bones.hpp"
280299
#include "armadillo_bits/op_prod_bones.hpp"
281300
#include "armadillo_bits/op_pinv_bones.hpp"
@@ -321,6 +340,7 @@ namespace arma
321340
#include "armadillo_bits/op_rank_bones.hpp"
322341
#include "armadillo_bits/op_row_as_mat_bones.hpp"
323342
#include "armadillo_bits/op_col_as_mat_bones.hpp"
343+
#include "armadillo_bits/op_accu_bones.hpp"
324344
#include "armadillo_bits/op_sp_plus_bones.hpp"
325345
#include "armadillo_bits/op_sp_minus_bones.hpp"
326346
#include "armadillo_bits/op_sp_sum_bones.hpp"
@@ -376,9 +396,10 @@ namespace arma
376396
#include "armadillo_bits/spop_repmat_bones.hpp"
377397
#include "armadillo_bits/spop_vectorise_bones.hpp"
378398
#include "armadillo_bits/spop_norm_bones.hpp"
379-
#include "armadillo_bits/spop_shift_bones.hpp"
399+
#include "armadillo_bits/spop_circshift_bones.hpp"
380400
#include "armadillo_bits/spop_relational_bones.hpp"
381401
#include "armadillo_bits/spop_omit_bones.hpp"
402+
#include "armadillo_bits/spop_accu_bones.hpp"
382403

383404
#include "armadillo_bits/spglue_plus_bones.hpp"
384405
#include "armadillo_bits/spglue_minus_bones.hpp"
@@ -525,7 +546,7 @@ namespace arma
525546
#include "armadillo_bits/fn_resize.hpp"
526547
#include "armadillo_bits/fn_cov.hpp"
527548
#include "armadillo_bits/fn_cor.hpp"
528-
#include "armadillo_bits/fn_shift.hpp"
549+
#include "armadillo_bits/fn_circshift.hpp"
529550
#include "armadillo_bits/fn_shuffle.hpp"
530551
#include "armadillo_bits/fn_prod.hpp"
531552
#include "armadillo_bits/fn_eps.hpp"
@@ -662,7 +683,6 @@ namespace arma
662683
#include "armadillo_bits/eop_core_meat.hpp"
663684
#include "armadillo_bits/eglue_core_meat.hpp"
664685

665-
#include "armadillo_bits/cond_rel_meat.hpp"
666686
#include "armadillo_bits/arrayops_meat.hpp"
667687
#include "armadillo_bits/podarray_meat.hpp"
668688
#include "armadillo_bits/auxlib_meat.hpp"
@@ -733,7 +753,7 @@ namespace arma
733753
#include "armadillo_bits/op_resize_meat.hpp"
734754
#include "armadillo_bits/op_cov_meat.hpp"
735755
#include "armadillo_bits/op_cor_meat.hpp"
736-
#include "armadillo_bits/op_shift_meat.hpp"
756+
#include "armadillo_bits/op_circshift_meat.hpp"
737757
#include "armadillo_bits/op_shuffle_meat.hpp"
738758
#include "armadillo_bits/op_prod_meat.hpp"
739759
#include "armadillo_bits/op_pinv_meat.hpp"
@@ -779,6 +799,7 @@ namespace arma
779799
#include "armadillo_bits/op_rank_meat.hpp"
780800
#include "armadillo_bits/op_row_as_mat_meat.hpp"
781801
#include "armadillo_bits/op_col_as_mat_meat.hpp"
802+
#include "armadillo_bits/op_accu_meat.hpp"
782803
#include "armadillo_bits/op_sp_plus_meat.hpp"
783804
#include "armadillo_bits/op_sp_minus_meat.hpp"
784805
#include "armadillo_bits/op_sp_sum_meat.hpp"
@@ -834,9 +855,10 @@ namespace arma
834855
#include "armadillo_bits/spop_repmat_meat.hpp"
835856
#include "armadillo_bits/spop_vectorise_meat.hpp"
836857
#include "armadillo_bits/spop_norm_meat.hpp"
837-
#include "armadillo_bits/spop_shift_meat.hpp"
858+
#include "armadillo_bits/spop_circshift_meat.hpp"
838859
#include "armadillo_bits/spop_relational_meat.hpp"
839860
#include "armadillo_bits/spop_omit_meat.hpp"
861+
#include "armadillo_bits/spop_accu_meat.hpp"
840862

841863
#include "armadillo_bits/spglue_plus_meat.hpp"
842864
#include "armadillo_bits/spglue_minus_meat.hpp"

‎inst/include/armadillo_bits/BaseCube_bones.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,

‎inst/include/armadillo_bits/BaseCube_meat.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,

‎inst/include/armadillo_bits/Base_bones.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -109,7 +109,7 @@ struct Base_trans<derived, false> { typedef Base_trans_default<derived> result;
109109

110110
template<typename elem_type, typename derived>
111111
struct Base
112-
: public Base_extra<elem_type, derived, is_supported_blas_type<elem_type>::value>::result
112+
: public Base_extra<elem_type, derived, is_blas_type<elem_type>::value>::result
113113
, public Base_eval<elem_type, derived, is_Mat<derived>::value>::result
114114
, public Base_trans<derived, is_cx<elem_type>::value>::result
115115
{

‎inst/include/armadillo_bits/Base_meat.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,

‎inst/include/armadillo_bits/Col_bones.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,

‎inst/include/armadillo_bits/Col_meat.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,

‎inst/include/armadillo_bits/CubeToMatOp_bones.hpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,10 +22,8 @@
2222

2323

2424
template<typename T1, typename op_type>
25-
class CubeToMatOp : public Base< typename T1::elem_type, CubeToMatOp<T1, op_type> >
25+
struct CubeToMatOp : public Base< typename T1::elem_type, CubeToMatOp<T1, op_type> >
2626
{
27-
public:
28-
2927
typedef typename T1::elem_type elem_type;
3028
typedef typename get_pod_type<elem_type>::result pod_type;
3129

‎inst/include/armadillo_bits/CubeToMatOp_meat.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,

‎inst/include/armadillo_bits/Cube_bones.hpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// SPDX-License-Identifier: Apache-2.0
22
//
3-
// Copyright 2008-2016 Conrad Sanderson (http://conradsanderson.id.au)
3+
// Copyright 2008-2016 Conrad Sanderson (https://conradsanderson.id.au)
44
// Copyright 2008-2016 National ICT Australia (NICTA)
55
//
66
// Licensed under the Apache License, Version 2.0 (the "License");
77
// you may not use this file except in compliance with the License.
88
// You may obtain a copy of the License at
9-
// http://www.apache.org/licenses/LICENSE-2.0
9+
// https://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing, software
1212
// distributed under the License is distributed on an "AS IS" BASIS,
@@ -464,11 +464,12 @@ class Cube : public BaseCube< eT, Cube<eT> >
464464
inline Mat<eT>* create_mat_ptr(const uword in_slice) const;
465465
inline Mat<eT>* get_mat_ptr(const uword in_slice) const;
466466

467-
friend class glue_join;
468-
friend class op_reshape;
469-
friend class op_resize;
470467
friend class subview_cube<eT>;
471468

469+
friend struct glue_join;
470+
friend struct op_reshape;
471+
friend struct op_resize;
472+
472473

473474
public:
474475

0 commit comments

Comments
 (0)