Repository: systemml Updated Branches: refs/heads/master f627d07e4 -> f4efd99a4
[HOTFIX][SYSTEMML-2068] Fix corrupted merge of cell bitwAnd operations Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/f4efd99a Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/f4efd99a Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/f4efd99a Branch: refs/heads/master Commit: f4efd99a45d57c1b2c36f62eab7470d9bd61347e Parents: f627d07 Author: Matthias Boehm <[email protected]> Authored: Sun Feb 11 14:44:15 2018 -0800 Committer: Matthias Boehm <[email protected]> Committed: Sun Feb 11 14:44:15 2018 -0800 ---------------------------------------------------------------------- src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeBinary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/f4efd99a/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeBinary.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeBinary.java b/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeBinary.java index c6e0c36..89ddde4 100644 --- a/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeBinary.java +++ b/src/main/java/org/apache/sysml/hops/codegen/cplan/CNodeBinary.java @@ -210,7 +210,7 @@ public class CNodeBinary extends CNode case XOR: return " double %TMP% = ( (%IN1% != 0) != (%IN2% != 0) ) ? 1 : 0;\n"; case BITWAND: - return " double %TMP% = LibSpoofPrimitives.intDiv(%IN1%, %IN2%);\n"; + return " double %TMP% = LibSpoofPrimitives.bwAnd(%IN1%, %IN2%);\n"; default: throw new RuntimeException("Invalid binary type: "+this.toString());
