[systemds] branch master updated: [SYSTEMDS-2856] Cleanup binary matrix-matrix/scalar instruction parsing

[mboehm7]

This is an automated email from the ASF dual-hosted git repository.

mboehm7 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f39d9b  [SYSTEMDS-2856] Cleanup binary matrix-matrix/scalar 
instruction parsing
2f39d9b is described below

commit 2f39d9bda04b44d95ed44093fe34a939607388a4
Author: Matthias Boehm <mboe...@gmail.com>
AuthorDate: Thu Feb 11 14:52:21 2021 +0100

    [SYSTEMDS-2856] Cleanup binary matrix-matrix/scalar instruction parsing
---
 .../apache/sysds/runtime/instructions/CPInstructionParser.java    | 8 ++++----
 .../sysds/runtime/instructions/fed/BinaryFEDInstruction.java      | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/CPInstructionParser.java 
b/src/main/java/org/apache/sysds/runtime/instructions/CPInstructionParser.java
index 509f4c1..273e59a 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/CPInstructionParser.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/CPInstructionParser.java
@@ -413,14 +413,14 @@ public class CPInstructionParser extends InstructionParser
                        case Builtin: 
                                String[] parts = 
InstructionUtils.getInstructionPartsWithValueType(str);
                                if ( parts[0].equals("log") || 
parts[0].equals("log_nz") ) {
-                                       
UtilFunctions.isIntegerNumber(parts[parts.length-1]);
-                                       if ( parts.length == 4 || (parts.length 
== 6 &&
+                                       if ( parts.length == 3 || (parts.length 
== 5 &&
                                                
UtilFunctions.isIntegerNumber(parts[3])) ) {
                                                // B=log(A), y=log(x)
                                                return 
UnaryCPInstruction.parseInstruction(str);
-                                       } else if ( parts.length == 5 ) {
+                                       } else if ( parts.length == 4 || 
(parts.length == 5 &&
+                                               
UtilFunctions.isIntegerNumber(parts[4])) ) {
                                                // B=log(A,10), y=log(x,10)
-                                               
+                                               // num threads non-existing for 
scalar-scalar
                                                return 
BinaryCPInstruction.parseInstruction(str);
                                        }
                                }
diff --git 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/BinaryFEDInstruction.java
 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/BinaryFEDInstruction.java
index 98b1325..bfe0c27 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/fed/BinaryFEDInstruction.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/fed/BinaryFEDInstruction.java
@@ -40,7 +40,6 @@ public abstract class BinaryFEDInstruction extends 
ComputationFEDInstruction {
                CPOperand in2 = new CPOperand(parts[2]);
                CPOperand out = new CPOperand(parts[3]);
 
-
                checkOutputDataType(in1, in2, out);
                Operator operator = 
InstructionUtils.parseBinaryOrBuiltinOperator(opcode, in1, in2);