[systemds] branch master updated: [MINOR] fix log instruction parsing for builtin

[baunsgaard]

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

baunsgaard 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 0ca9d79  [MINOR] fix log instruction parsing for builtin
0ca9d79 is described below

commit 0ca9d79718161b99678a6bf4b0fb927428f1daeb
Author: baunsgaard <baunsga...@tugraz.at>
AuthorDate: Thu Feb 11 11:46:18 2021 +0100

    [MINOR] fix log instruction parsing for builtin
---
 .../org/apache/sysds/runtime/instructions/CPInstructionParser.java  | 6 ++++--
 .../apache/sysds/runtime/instructions/fed/BinaryFEDInstruction.java | 4 +---
 .../test/functions/federated/primitives/FederatedNegativeTest.java  | 2 +-
 3 files changed, 6 insertions(+), 6 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 0a7e28d..509f4c1 100644
--- 
a/src/main/java/org/apache/sysds/runtime/instructions/CPInstructionParser.java
+++ 
b/src/main/java/org/apache/sysds/runtime/instructions/CPInstructionParser.java
@@ -413,12 +413,14 @@ public class CPInstructionParser extends InstructionParser
                        case Builtin: 
                                String[] parts = 
InstructionUtils.getInstructionPartsWithValueType(str);
                                if ( parts[0].equals("log") || 
parts[0].equals("log_nz") ) {
-                                       if ( parts.length == 3 || (parts.length 
== 5 &&
+                                       
UtilFunctions.isIntegerNumber(parts[parts.length-1]);
+                                       if ( parts.length == 4 || (parts.length 
== 6 &&
                                                
UtilFunctions.isIntegerNumber(parts[3])) ) {
                                                // B=log(A), y=log(x)
                                                return 
UnaryCPInstruction.parseInstruction(str);
-                                       } else if ( parts.length == 4 ) {
+                                       } else if ( parts.length == 5 ) {
                                                // B=log(A,10), y=log(x,10)
+                                               
                                                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 994b2e1..98b1325 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
@@ -26,7 +26,7 @@ import org.apache.sysds.runtime.instructions.cp.CPOperand;
 import org.apache.sysds.runtime.matrix.operators.Operator;
 
 public abstract class BinaryFEDInstruction extends ComputationFEDInstruction {
-       
+
        protected BinaryFEDInstruction(FEDInstruction.FEDType type, Operator op,
                CPOperand in1, CPOperand in2, CPOperand out, String opcode, 
String istr) {
                super(type, op, in1, in2, out, opcode, istr);
@@ -39,8 +39,6 @@ public abstract class BinaryFEDInstruction extends 
ComputationFEDInstruction {
                CPOperand in1 = new CPOperand(parts[1]);
                CPOperand in2 = new CPOperand(parts[2]);
                CPOperand out = new CPOperand(parts[3]);
-               // threads to use 
-               int k = Integer.parseInt(parts[4]);
 
 
                checkOutputDataType(in1, in2, out);
diff --git 
a/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedNegativeTest.java
 
b/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedNegativeTest.java
index 4c170e2..f5fba16 100644
--- 
a/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedNegativeTest.java
+++ 
b/src/test/java/org/apache/sysds/test/functions/federated/primitives/FederatedNegativeTest.java
@@ -47,7 +47,7 @@ public class FederatedNegativeTest {
                try{
                        String[] args = {"-w", Integer.toString(port)};
                        t = AutomatedTestBase.startLocalFedWorkerWithArgs(args);
-                       Thread.sleep(1000);
+                       Thread.sleep(2000);
                } catch(Exception e){
                        NegativeTest1();
                }