nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

depreciate CUDACC

Browse source
This commit is contained in:
Johann Dreo 2020-08-26 12:00:29 +02:00
commit fca55505d8
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
eo/src/eoScalarFitness.h
View file

@ -103,13 +103,18 @@ and minimizing fitness compares with greater. This because we want ordinary
fitness values (doubles) to be equivalent with Maximizing Fitness, and
comparing with less is the default behaviour.
*/
#if defined(__CUDACC__)
typedef eoScalarFitness<float, std::less<float> > eoMaximizingFitness;
typedef eoScalarFitness<float, std::greater<float> > eoMinimizingFitness;
#else
typedef eoScalarFitness<double, std::less<double> > eoMaximizingFitness;
typedef eoScalarFitness<double, std::greater<double> > eoMinimizingFitness;
#endif
// CUDACC is deprecated
// #if defined(__CUDACC__)
// typedef eoScalarFitness<float, std::less<float> > eoMaximizingFitness;
// typedef eoScalarFitness<float, std::greater<float> > eoMinimizingFitness;
// #else
// typedef eoScalarFitness<double, std::less<double> > eoMaximizingFitness;
// typedef eoScalarFitness<double, std::greater<double> > eoMinimizingFitness;
// #endif
using eoMaximizingFitness = eoScalarFitness<double, std::less<double> >;
using eoMinimizingFitness = eoScalarFitness<double, std::greater<double> >;
template <class F, class Cmp>
std::ostream& operator<<(std::ostream& os, const eoScalarFitness<F, Cmp>& f)