-> C++17
This commit is contained in:
parent
48084b2a5e
commit
64c5c2b4f3
3 changed files with 2 additions and 37 deletions
|
@ -10,7 +10,7 @@ else()
|
||||||
message(WARNING "compiler ${CMAKE_CXX_COMPILER_ID} officially not supported")
|
message(WARNING "compiler ${CMAKE_CXX_COMPILER_ID} officially not supported")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -Wpedantic -Ofast -march=native -faligned-new -funroll-loops -fopenmp")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++17 -Wpedantic -Ofast -march=native -faligned-new -funroll-loops -fopenmp")
|
||||||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -g -Wpedantic -Ofast -march=native -faligned-new -funroll-loops -fopenmp -ftemplate-backtrace-limit=0")
|
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -g -Wpedantic -Ofast -march=native -faligned-new -funroll-loops -fopenmp -ftemplate-backtrace-limit=0")
|
||||||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -g -Wpedantic -O0 -march=native -faligned-new -funroll-loops -fopenmp")
|
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++14 -g -Wpedantic -O0 -march=native -faligned-new -funroll-loops -fopenmp")
|
||||||
|
|
||||||
|
|
|
@ -2,29 +2,5 @@
|
||||||
#ifdef regFunc1
|
#ifdef regFunc1
|
||||||
|
|
||||||
regFunc1(exp)
|
regFunc1(exp)
|
||||||
regFunc1(exp2)
|
|
||||||
regFunc1(expm1)
|
|
||||||
regFunc1(log)
|
|
||||||
regFunc1(log10)
|
|
||||||
regFunc1(log2)
|
|
||||||
regFunc1(log1p)
|
|
||||||
regFunc1(sqrt)
|
|
||||||
regFunc1(cbrt)
|
|
||||||
regFunc1(sin)
|
|
||||||
regFunc1(cos)
|
|
||||||
regFunc1(tan)
|
|
||||||
regFunc1(asin)
|
|
||||||
regFunc1(acos)
|
|
||||||
regFunc1(atan)
|
|
||||||
regFunc1(sinh)
|
|
||||||
regFunc1(cosh)
|
|
||||||
regFunc1(tanh)
|
|
||||||
regFunc1(asinh)
|
|
||||||
regFunc1(acosh)
|
|
||||||
regFunc1(atanh)
|
|
||||||
regFunc1(erf)
|
|
||||||
regFunc1(erfc)
|
|
||||||
regFunc1(tgamma)
|
|
||||||
regFunc1(lgamma)
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -102,18 +102,6 @@ namespace MultiArrayTools
|
||||||
friend OperationClass;
|
friend OperationClass;
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class Op>
|
|
||||||
size_t sumRootNum()
|
|
||||||
{
|
|
||||||
return typename Op::rootNum();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Op1, class Op2, class... Ops>
|
|
||||||
size_t sumRootNum()
|
|
||||||
{
|
|
||||||
return typename Op1::rootNum() + sumRootNum<Op2,Ops...>();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <size_t N>
|
template <size_t N>
|
||||||
struct RootSumN
|
struct RootSumN
|
||||||
{
|
{
|
||||||
|
@ -190,6 +178,7 @@ namespace MultiArrayTools
|
||||||
template <class... Ops>
|
template <class... Ops>
|
||||||
struct RootSum
|
struct RootSum
|
||||||
{
|
{
|
||||||
|
//static constexpr size_t SIZE = (... + Ops::SIZE);
|
||||||
static constexpr size_t SIZE = RootSumN<sizeof...(Ops)-1>::template rs<Ops...>::SIZE;
|
static constexpr size_t SIZE = RootSumN<sizeof...(Ops)-1>::template rs<Ops...>::SIZE;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue