You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2015/12/04 19:04:25 UTC

[4/5] incubator-systemml git commit: Fix spark instruction parsing log/log_nz (updated sanity checks)

Fix spark instruction parsing log/log_nz (updated sanity checks)

Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/59d4a150
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/59d4a150
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/59d4a150

Branch: refs/heads/master
Commit: 59d4a15000e9d531dfe35294556f3f1ef08be393
Parents: 0215a5a
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Thu Dec 3 19:18:41 2015 -0800
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Thu Dec 3 19:18:41 2015 -0800

----------------------------------------------------------------------
 .../apache/sysml/runtime/instructions/SPInstructionParser.java    | 2 +-
 .../instructions/spark/MatrixScalarBuiltinSPInstruction.java      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/59d4a150/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 bd4d9d0..3fe1f09 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/SPInstructionParser.java
@@ -326,7 +326,7 @@ public class SPInstructionParser extends InstructionParser {
 			
 			case Builtin: 
 				parts = InstructionUtils.getInstructionPartsWithValueType(str);
-				if ( parts[0].equals("log") ) {
+				if ( parts[0].equals("log") || parts[0].equals("log_nz") ) {
 					if ( parts.length == 3 ) {
 						// B=log(A), y=log(x)
 						return (SPInstruction) BuiltinUnarySPInstruction.parseInstruction(str);

http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/59d4a150/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
index 2e47801..72f5f5d 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/MatrixScalarBuiltinSPInstruction.java
@@ -37,7 +37,8 @@ public class MatrixScalarBuiltinSPInstruction extends BuiltinBinarySPInstruction
 	{	
 		//sanity check opcode
 		String opcode = getOpcode();
-		if ( !(opcode.equalsIgnoreCase("max") || opcode.equalsIgnoreCase("min")) ) 
+		if ( !(opcode.equalsIgnoreCase("max") || opcode.equalsIgnoreCase("min"))
+			 ||opcode.equalsIgnoreCase("log") || opcode.equalsIgnoreCase("log_nz") ) 
 		{
 			throw new DMLRuntimeException("Unknown opcode in instruction: " + opcode);
 		}