Repository: incubator-systemml Updated Branches: refs/heads/master d3968fee4 -> eea72ce57
[HOTFIX][SYSTEMML-1621] Fix value type inference log (int/int-double) Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/eea72ce5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/eea72ce5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/eea72ce5 Branch: refs/heads/master Commit: eea72ce577d96fc00d5548df45672b1eb9360a9f Parents: d3968fe Author: Matthias Boehm <[email protected]> Authored: Wed May 24 09:51:04 2017 -0700 Committer: Matthias Boehm <[email protected]> Committed: Wed May 24 09:51:04 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/sysml/parser/BuiltinFunctionExpression.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/eea72ce5/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java index ca359d1..5efa3e9 100644 --- a/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java +++ b/src/main/java/org/apache/sysml/parser/BuiltinFunctionExpression.java @@ -1173,7 +1173,7 @@ public class BuiltinFunctionExpression extends DataIdentifier break; } default: - if (this.isMathFunction()) { + if( isMathFunction() ) { checkMathFunctionParam(); //unary operations if( getSecondExpr() == null ) { @@ -1186,6 +1186,9 @@ public class BuiltinFunctionExpression extends DataIdentifier //binary operations else { setBinaryOutputProperties(output); + // override computed value type for special cases + if( getOpCode() == BuiltinFunctionOp.LOG ) + output.setValueType(ValueType.DOUBLE); } } else {
