|
15 | 15 | #ifndef ENSMALLEN_HPP |
16 | 16 | #define ENSMALLEN_HPP |
17 | 17 |
|
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 |
22 | 22 | #endif |
23 | 23 |
|
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 |
25 | 30 |
|
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" |
30 | 33 | #endif |
31 | 34 |
|
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" |
34 | 39 | #endif |
35 | 40 |
|
36 | 41 | #include <cctype> |
|
66 | 71 | #include "ensmallen_bits/utility/any.hpp" |
67 | 72 | #include "ensmallen_bits/utility/arma_traits.hpp" |
68 | 73 | #include "ensmallen_bits/utility/indicators/epsilon.hpp" |
| 74 | +#include "ensmallen_bits/utility/indicators/igd.hpp" |
69 | 75 | #include "ensmallen_bits/utility/indicators/igd_plus.hpp" |
70 | 76 |
|
71 | 77 | // Contains traits, must be placed before report callback. |
|
98 | 104 | #include "ensmallen_bits/bigbatch_sgd/bigbatch_sgd.hpp" |
99 | 105 | #include "ensmallen_bits/cmaes/cmaes.hpp" |
100 | 106 | #include "ensmallen_bits/cmaes/active_cmaes.hpp" |
| 107 | +#include "ensmallen_bits/cmaes/pop_cmaes.hpp" |
101 | 108 | #include "ensmallen_bits/cd/cd.hpp" |
102 | 109 | #include "ensmallen_bits/cne/cne.hpp" |
103 | 110 | #include "ensmallen_bits/de/de.hpp" |
|
111 | 118 | #include "ensmallen_bits/katyusha/katyusha.hpp" |
112 | 119 | #include "ensmallen_bits/lbfgs/lbfgs.hpp" |
113 | 120 | #include "ensmallen_bits/lookahead/lookahead.hpp" |
| 121 | +#include "ensmallen_bits/agemoea/agemoea.hpp" |
114 | 122 | #include "ensmallen_bits/moead/moead.hpp" |
115 | 123 | #include "ensmallen_bits/nsga2/nsga2.hpp" |
116 | 124 | #include "ensmallen_bits/padam/padam.hpp" |
|
0 commit comments