Repository: systemml Updated Branches: refs/heads/master 2a6fa063e -> 1cc9a5e9a
[HOTFIX] Fix max/min spark binary builtin instructions parsing Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/1cc9a5e9 Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/1cc9a5e9 Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/1cc9a5e9 Branch: refs/heads/master Commit: 1cc9a5e9a5b8d06369461361d66a78f76e548d95 Parents: 2a6fa06 Author: Matthias Boehm <[email protected]> Authored: Fri Jan 5 11:02:57 2018 -0800 Committer: Matthias Boehm <[email protected]> Committed: Fri Jan 5 11:02:57 2018 -0800 ---------------------------------------------------------------------- .../sysml/runtime/instructions/SPInstructionParser.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/1cc9a5e9/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java b/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java index 1f1cb4d..268d37b 100644 --- a/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java +++ b/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java @@ -198,6 +198,12 @@ public class SPInstructionParser extends InstructionParser String2SPInstructionType.put( "map||" , SPType.Binary); String2SPInstructionType.put( "mapxor" , SPType.Binary); + // Builtin Instruction Opcodes + String2SPInstructionType.put( "max" , SPType.Binary); + String2SPInstructionType.put( "min" , SPType.Binary); + String2SPInstructionType.put( "mapmax" , SPType.Binary); + String2SPInstructionType.put( "mapmin" , SPType.Binary); + // REBLOCK Instruction Opcodes String2SPInstructionType.put( "rblk" , SPType.Reblock); String2SPInstructionType.put( "csvrblk", SPType.CSVReblock); @@ -210,12 +216,6 @@ public class SPInstructionParser extends InstructionParser String2SPInstructionType.put( "log" , SPType.Builtin); String2SPInstructionType.put( "log_nz" , SPType.Builtin); - // Boolean Binary builtin - String2SPInstructionType.put( "max" , SPType.Builtin); - String2SPInstructionType.put( "min" , SPType.Builtin); - String2SPInstructionType.put( "mapmax" , SPType.Builtin); - String2SPInstructionType.put( "mapmin" , SPType.Builtin); - String2SPInstructionType.put( "exp" , SPType.Unary); String2SPInstructionType.put( "abs" , SPType.Unary); String2SPInstructionType.put( "sin" , SPType.Unary);
