Commit 104f5418 authored by Matthew Letter's avatar Matthew Letter
Browse files

Revert "updated based on pyexpander output"

This reverts commit 6908952f
parent 6908952f
...@@ -2347,7 +2347,12 @@ static inline VTKM_EXEC_CONT vtkm::Float32 RemainderQuotient(vtkm::Float32 numer ...@@ -2347,7 +2347,12 @@ static inline VTKM_EXEC_CONT vtkm::Float32 RemainderQuotient(vtkm::Float32 numer
QType& quotient) QType& quotient)
{ {
int iQuotient; int iQuotient;
vtkm::Float32 result = std::remquo(numerator, denominator, &iQuotient); #ifdef VTKM_CUDA
const vtkm::Float64 result =
VTKM_CUDA_MATH_FUNCTION_32(remquo)(numerator, denominator, &iQuotient);
#else
const vtkm::Float32 result = std::remquo(numerator, denominator, &iQuotient);
#endif
quotient = iQuotient; quotient = iQuotient;
return result; return result;
} }
...@@ -2357,7 +2362,12 @@ static inline VTKM_EXEC_CONT vtkm::Float64 RemainderQuotient(vtkm::Float64 numer ...@@ -2357,7 +2362,12 @@ static inline VTKM_EXEC_CONT vtkm::Float64 RemainderQuotient(vtkm::Float64 numer
QType& quotient) QType& quotient)
{ {
int iQuotient; int iQuotient;
vtkm::Float64 result = std::remquo(numerator, denominator, &iQuotient); #ifdef VTKM_CUDA
const vtkm::Float64 result =
VTKM_CUDA_MATH_FUNCTION_64(remquo)(numerator, denominator, &iQuotient);
#else
const vtkm::Float64 result = std::remquo(numerator, denominator, &iQuotient);
#endif
quotient = iQuotient; quotient = iQuotient;
return result; return result;
} }
......
...@@ -274,8 +274,6 @@ template <typename R, ...@@ -274,8 +274,6 @@ template <typename R,
typename P11> typename P11>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -304,8 +302,6 @@ template <typename R, ...@@ -304,8 +302,6 @@ template <typename R,
typename P12> typename P12>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -336,8 +332,6 @@ template <typename R, ...@@ -336,8 +332,6 @@ template <typename R,
typename P13> typename P13>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -370,8 +364,6 @@ template <typename R, ...@@ -370,8 +364,6 @@ template <typename R,
typename P14> typename P14>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -406,8 +398,6 @@ template <typename R, ...@@ -406,8 +398,6 @@ template <typename R,
typename P15> typename P15>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -444,8 +434,6 @@ template <typename R, ...@@ -444,8 +434,6 @@ template <typename R,
typename P16> typename P16>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -484,8 +472,6 @@ template <typename R, ...@@ -484,8 +472,6 @@ template <typename R,
typename P17> typename P17>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -526,8 +512,6 @@ template <typename R, ...@@ -526,8 +512,6 @@ template <typename R,
typename P18> typename P18>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -570,8 +554,6 @@ template <typename R, ...@@ -570,8 +554,6 @@ template <typename R,
typename P19> typename P19>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
...@@ -616,8 +598,6 @@ template <typename R, ...@@ -616,8 +598,6 @@ template <typename R,
typename P20> typename P20>
struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20)> struct ParameterContainer<R(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20)>
{ {
VTKM_SUPPRESS_EXEC_WARNINGS
~ParameterContainer() = default;
P1 Parameter1; P1 Parameter1;
P2 Parameter2; P2 Parameter2;
P3 Parameter3; P3 Parameter3;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment