Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sacado: Check for zero base in pow(Fad,Const) #4443

Merged
merged 1 commit into from
Feb 20, 2019
Merged

Sacado: Check for zero base in pow(Fad,Const) #4443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/sacado/src/Sacado_CacheFad_Ops.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,7 +1814,7 @@ namespace Sacado {
const value_type_1 v1 = expr1.val();
const value_type_2 v2 = expr2.val();
v = std::pow(v1,v2);
if (v2 == value_type_2(0)) {
if (v1 == value_type_1(0) || v2 == value_type_2(0)) {
a = value_type(0);
}
else {
Expand Down
2 changes: 1 addition & 1 deletion packages/sacado/src/Sacado_ELRCacheFad_Ops.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2573,7 +2573,7 @@ namespace Sacado {
const value_type_1 v1 = expr1.val();
const value_type_2 v2 = expr2.val();
v = std::pow(v1,v2);
if (v1 == scalar_type(0.0)) {
if (v1 == scalar_type(0.0) || v2 == scalar_type(0.0)) {
a = scalar_type(0.0);
}
else {
Expand Down
4 changes: 2 additions & 2 deletions packages/sacado/src/Sacado_ELRFad_Ops.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,9 +895,9 @@ FAD_BINARYOP_MACRO(pow,
expr1.val() == value_type(0) ? value_type(0) : value_type((expr2.dx(i)*std::log(expr1.val())+expr2.val()*expr1.dx(i)/expr1.val())*std::pow(expr1.val(),expr2.val())),
expr1.val() == value_type(0) ? value_type(0.0) : value_type((expr2.fastAccessDx(i)*std::log(expr1.val())+expr2.val()*expr1.fastAccessDx(i)/expr1.val())*std::pow(expr1.val(),expr2.val())),
expr1.val() == value_type(0) ? value_type(0) : value_type(expr2.dx(i)*std::log(expr1.val())*std::pow(expr1.val(),expr2.val())),
expr2.val() == scalar_type(0) ? value_type(0.0) : value_type(expr2.val()*expr1.dx(i)*std::pow(expr1.val(),expr2.val()-scalar_type(1.0))),
expr2.val() == scalar_type(0) || expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(expr2.val()*expr1.dx(i)*std::pow(expr1.val(),expr2.val()-scalar_type(1.0))),
expr1.val() == value_type(0) ? value_type(0) : value_type(expr2.fastAccessDx(i)*std::log(expr1.val())*std::pow(expr1.val(),expr2.val())),
expr2.val() == scalar_type(0) ? value_type(0.0) : value_type(expr2.val()*expr1.fastAccessDx(i)*std::pow(expr1.val(),expr2.val()-scalar_type(1.0))))
expr2.val() == scalar_type(0) || expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(expr2.val()*expr1.fastAccessDx(i)*std::pow(expr1.val(),expr2.val()-scalar_type(1.0))))
FAD_BINARYOP_MACRO(max,
MaxOp,
expr1.val() >= expr2.val() ? expr1.val() : expr2.val(),
Expand Down
8 changes: 4 additions & 4 deletions packages/sacado/src/Sacado_Fad_Ops.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1159,15 +1159,15 @@ namespace Sacado {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return if_then_else( c.val() == scalar_type(0.0), value_type(0.0), value_type(c.val()*expr1.dx(i)*pow(expr1.val(),c.val()-scalar_type(1.0))) );
return if_then_else( c.val() == scalar_type(0.0) || expr1.val() == value_type(0.0), value_type(0.0), value_type(c.val()*expr1.dx(i)*pow(expr1.val(),c.val()-scalar_type(1.0))) );
}

KOKKOS_INLINE_FUNCTION
const value_type fastAccessDx(int i) const {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return if_then_else( c.val() == scalar_type(0.0), value_type(0.0), value_type(c.val()*expr1.fastAccessDx(i)*pow(expr1.val(),c.val()-scalar_type(1.0))) );
return if_then_else( c.val() == scalar_type(0.0) || expr1.val() == value_type(0.0), value_type(0.0), value_type(c.val()*expr1.fastAccessDx(i)*pow(expr1.val(),c.val()-scalar_type(1.0))) );
}

protected:
Expand Down Expand Up @@ -1383,15 +1383,15 @@ namespace Sacado {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return c.val() == scalar_type(0.0) ? value_type(0.0) : value_type(c.val()*expr1.dx(i)*pow(expr1.val(),c.val()-scalar_type(1.0)));
return c.val() == scalar_type(0.0) || expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(c.val()*expr1.dx(i)*pow(expr1.val(),c.val()-scalar_type(1.0)));
}

KOKKOS_INLINE_FUNCTION
const value_type fastAccessDx(int i) const {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return c.val() == scalar_type(0.0) ? value_type(0.0) : value_type(c.val()*expr1.fastAccessDx(i)*pow(expr1.val(),c.val()-scalar_type(1.0)));
return c.val() == scalar_type(0.0) || expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(c.val()*expr1.fastAccessDx(i)*pow(expr1.val(),c.val()-scalar_type(1.0)));
}

protected:
Expand Down
12 changes: 6 additions & 6 deletions packages/sacado/src/new_design/Sacado_Fad_Exp_Ops.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ namespace Sacado {
return if_then_else( expr1.val() == value_type(0.0), value_type(0.0), value_type((expr2.dx(i)*log(expr1.val())+expr2.val()*expr1.dx(i)/expr1.val())*pow(expr1.val(),expr2.val())) );
else if (sz1 > 0)
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
return if_then_else( expr2.val() == value_type(0.0), value_type(0.0), value_type(expr2.val()*expr1.dx(i)*pow(expr1.val(),expr2.val()-value_type(1.0))) );
return if_then_else( expr2.val() == value_type(0.0) || expr1.val() == value_type(0.0), value_type(0.0), value_type(expr2.val()*expr1.dx(i)*pow(expr1.val(),expr2.val()-scalar_type(1.0))) );
else
return if_then_else( expr1.val() == value_type(0.0), value_type(0.0), value_type(expr2.dx(i)*log(expr1.val())*pow(expr1.val(),expr2.val())) );
}
Expand Down Expand Up @@ -798,15 +798,15 @@ namespace Sacado {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return if_then_else( c == scalar_type(0.0), value_type(0.0), value_type(c*expr1.dx(i)*pow(expr1.val(),c-scalar_type(1.0))) );
return if_then_else( c == scalar_type(0.0) || expr1.val() == value_type(0.0), value_type(0.0), value_type(c*expr1.dx(i)*pow(expr1.val(),c-scalar_type(1.0))) );
}

KOKKOS_INLINE_FUNCTION
value_type fastAccessDx(int i) const {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return if_then_else( c == scalar_type(0.0), value_type(0.0), value_type(c*expr1.fastAccessDx(i)*pow(expr1.val(),c-scalar_type(1.0))) );
return if_then_else( c == scalar_type(0.0) || expr1.val() == value_type(0.0), value_type(0.0), value_type(c*expr1.fastAccessDx(i)*pow(expr1.val(),c-scalar_type(1.0))) );
}

protected:
Expand Down Expand Up @@ -917,7 +917,7 @@ namespace Sacado {
return expr1.val() == value_type(0.0) ? value_type(0.0) : value_type((expr2.dx(i)*log(expr1.val())+expr2.val()*expr1.dx(i)/expr1.val())*pow(expr1.val(),expr2.val()));
else if (sz1 > 0)
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
return expr2.val() == value_type(0.0) ? value_type(0.0) : value_type(expr2.val()*expr1.dx(i)*pow(expr1.val(),expr2.val()-value_type(1.0)));
return expr2.val() == value_type(0.0) || expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(expr2.val()*expr1.dx(i)*pow(expr1.val(),expr2.val()-scalar_type(1.0)));
else
return expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(expr2.dx(i)*log(expr1.val())*pow(expr1.val(),expr2.val()));
}
Expand Down Expand Up @@ -972,15 +972,15 @@ namespace Sacado {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return c == scalar_type(0.0) ? value_type(0.0) : value_type(c*expr1.dx(i)*pow(expr1.val(),c-scalar_type(1.0)));
return c == scalar_type(0.0) || expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(c*expr1.dx(i)*pow(expr1.val(),c-scalar_type(1.0)));
}

KOKKOS_INLINE_FUNCTION
value_type fastAccessDx(int i) const {
using std::pow;
// Use formula (a(x)^b)' = b*a(x)^{b-1}*a'(x), check for b == 0 case
// Use scalar_type in (b-1) to prevent promoting to Fad when nesting
return c == scalar_type(0.0) ? value_type(0.0) : value_type(c*expr1.fastAccessDx(i)*pow(expr1.val(),c-scalar_type(1.0)));
return c == scalar_type(0.0) || expr1.val() == value_type(0.0) ? value_type(0.0) : value_type(c*expr1.fastAccessDx(i)*pow(expr1.val(),c-scalar_type(1.0)));
}

protected:
Expand Down
7 changes: 1 addition & 6 deletions packages/sacado/test/TestSuite/NestedFadUnitTests.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,19 +377,14 @@ class FadFadOpsUnitTest : public CppUnit::TestFixture {
b = 3.456;
c = pow(a, b);
cc.val() = 0.0;
#ifdef SACADO_NEW_FAD_DESIGN_IS_DEFAULT
for (int i=0; i<n1; ++i)
cc.fastAccessDx(i) = FadType(n2,0.0);
#else
for (int i=0; i<n1; ++i)
cc.fastAccessDx(i) = 0.0;
#endif
COMPARE_NESTED_FADS(c, cc);

// a == 0 and constant scalar b
c = pow(a, b.val());
for (int i=0; i<n1; ++i)
cc.fastAccessDx(i) = FadType(n2,0.0);
cc.fastAccessDx(i) = 0.0;
COMPARE_NESTED_FADS(c, cc);
c = pow(a, b.val().val());
COMPARE_NESTED_FADS(c, cc);
Expand Down