Skip to content

Commit 84f286d

Browse files
Upgrade ensmallen to 2.22.0 (#65)
* Upgrade ensmallen to 2.22.0 * Add local patch of changes sent upstream * Add revdep check update --------- Co-authored-by: coatless <[email protected]> Co-authored-by: [email protected] <[email protected]>
1 parent 8101425 commit 84f286d

38 files changed

+4801
-87
lines changed

ChangeLog

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2024-11-29 James Balamuta <[email protected]>
2+
3+
* inst/include/ensmallen_bits/agemoea/agemoea.hpp: removed unused private field variable
4+
* inst/include/problems/dtlz/dtlz2_function.hpp: removed unused variable.
5+
* inst/include/problems/dtlz/dtlz4_function.hpp: ditto
6+
* inst/include/problems/dtlz/dtlz5_function.hpp: ditto
7+
* inst/include/problems/dtlz/dtlz6_function.hpp: ditto
8+
* inst/include/problems/dtlz/dtlz7_function.hpp: ditto
9+
* inst/include/problems/maf/maf5_function.hpp: ditto
10+
* inst/include/problems/maf/maf6_function.hpp: ditto
11+
12+
* DESCRIPTION (Version): Release 2.22.0
13+
* NEWS.md: Update for Ensmallen release 2.22.0
14+
* inst/include/ensmallen_bits: Upgraded to Ensmallen 2.22.0
15+
* inst/include/ensmallen.hpp: ditto
16+
117
2024-02-16 James Balamuta <[email protected]>
218

319
* DESCRIPTION (Version): Release 2.21.1

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: RcppEnsmallen
22
Title: Header-Only C++ Mathematical Optimization Library for 'Armadillo'
3-
Version: 0.2.21.1.1
3+
Version: 0.2.22.0.1
44
Authors@R: c(
55
person("James Joseph", "Balamuta", email = "[email protected]",
66
role = c("aut", "cre", "cph"),

NEWS.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# RcppEnsmallen 0.2.22.0.1
2+
3+
- Upgraded to ensmallen 2.22.0: "E-Bike Excitement" (2024-11-29)
4+
- Update to C++14 standard
5+
([#400](https://github.com/mlpack/ensmallen/pull/400)).
6+
- Bump minimum Armadillo version to 10.8
7+
([#404](https://github.com/mlpack/ensmallen/pull/404)).
8+
- For Armadillo 14.2.0 switch to `.index_min()` and `.index_max()`
9+
([#409](https://github.com/mlpack/ensmallen/pull/409)).
10+
- Added IPOP and BIPOP restart mechanisms for CMA-ES.
11+
([#403](https://github.com/mlpack/ensmallen/pull/403)).
12+
- Addressed uninitialized variable and private field warnings
13+
([#65](https://github.com/coatless-rpkg/rcppensmallen/pull/65))
14+
115
# RcppEnsmallen 0.2.21.1.1
216

317
- Upgraded to ensmallen 2.21.1: "Bent Antenna" (2024-02-16)

inst/include/ensmallen.hpp

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,27 @@
1515
#ifndef ENSMALLEN_HPP
1616
#define ENSMALLEN_HPP
1717

18-
// certain compilers are way behind the curve
19-
#if (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L))
20-
#undef ARMA_USE_CXX11
21-
#define ARMA_USE_CXX11
18+
#undef ENS_HAVE_CXX14
19+
20+
#if (__cplusplus >= 201402L)
21+
#define ENS_HAVE_CXX14
2222
#endif
2323

24-
#include <armadillo>
24+
#if defined(_MSVC_LANG)
25+
#if (_MSVC_LANG >= 201402L)
26+
#undef ENS_HAVE_CXX14
27+
#define ENS_HAVE_CXX14
28+
#endif
29+
#endif
2530

26-
#if !defined(ARMA_USE_CXX11)
27-
// armadillo automatically enables ARMA_USE_CXX11
28-
// when a C++11/C++14/C++17/etc compiler is detected
29-
#error "please enable C++11/C++14 mode in your compiler"
31+
#if !defined(ENS_HAVE_CXX14)
32+
#error "*** C++14 compiler required; enable C++14 mode in your compiler, or use an earlier version of ensmallen"
3033
#endif
3134

32-
#if ((ARMA_VERSION_MAJOR < 9) || ((ARMA_VERSION_MAJOR == 9) && (ARMA_VERSION_MINOR < 800)))
33-
#error "need Armadillo version 9.800 or later"
35+
#include <armadillo>
36+
37+
#if ((ARMA_VERSION_MAJOR < 10) || ((ARMA_VERSION_MAJOR == 10) && (ARMA_VERSION_MINOR < 8)))
38+
#error "need Armadillo version 10.8 or newer"
3439
#endif
3540

3641
#include <cctype>
@@ -66,6 +71,7 @@
6671
#include "ensmallen_bits/utility/any.hpp"
6772
#include "ensmallen_bits/utility/arma_traits.hpp"
6873
#include "ensmallen_bits/utility/indicators/epsilon.hpp"
74+
#include "ensmallen_bits/utility/indicators/igd.hpp"
6975
#include "ensmallen_bits/utility/indicators/igd_plus.hpp"
7076

7177
// Contains traits, must be placed before report callback.
@@ -98,6 +104,7 @@
98104
#include "ensmallen_bits/bigbatch_sgd/bigbatch_sgd.hpp"
99105
#include "ensmallen_bits/cmaes/cmaes.hpp"
100106
#include "ensmallen_bits/cmaes/active_cmaes.hpp"
107+
#include "ensmallen_bits/cmaes/pop_cmaes.hpp"
101108
#include "ensmallen_bits/cd/cd.hpp"
102109
#include "ensmallen_bits/cne/cne.hpp"
103110
#include "ensmallen_bits/de/de.hpp"
@@ -111,6 +118,7 @@
111118
#include "ensmallen_bits/katyusha/katyusha.hpp"
112119
#include "ensmallen_bits/lbfgs/lbfgs.hpp"
113120
#include "ensmallen_bits/lookahead/lookahead.hpp"
121+
#include "ensmallen_bits/agemoea/agemoea.hpp"
114122
#include "ensmallen_bits/moead/moead.hpp"
115123
#include "ensmallen_bits/nsga2/nsga2.hpp"
116124
#include "ensmallen_bits/padam/padam.hpp"

0 commit comments

Comments
 (0)