You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by ss...@apache.org on 2021/01/15 22:26:40 UTC

[systemds] branch master updated: [MINOR] Fixing failed test by reverting the changes in BinaryOp file.

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

ssiddiqi 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 178bdd7  [MINOR] Fixing failed test by reverting the changes in BinaryOp file.
178bdd7 is described below

commit 178bdd7ae292323b7a8d57d5ce2612437958800e
Author: Shafaq Siddiqi <sh...@tugraz.at>
AuthorDate: Fri Jan 15 21:03:08 2021 +0100

    [MINOR] Fixing failed test by reverting the changes in BinaryOp file.
---
 scripts/builtin/mdedup.dml                                     |  4 ++--
 src/main/java/org/apache/sysds/hops/BinaryOp.java              |  8 --------
 .../org/apache/sysds/parser/BuiltinFunctionExpression.java     | 10 ++++++++--
 .../instructions/spark/BinaryFrameScalarSPInstruction.java     |  5 +++++
 .../sysds/test/functions/builtin/BuiltinOutlierByArima.java    |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/scripts/builtin/mdedup.dml b/scripts/builtin/mdedup.dml
index ada174c..9ffb028 100644
--- a/scripts/builtin/mdedup.dml
+++ b/scripts/builtin/mdedup.dml
@@ -113,6 +113,6 @@ detectDuplicates = function(Matrix[Double] LHS_adj, Matrix[Double] RHS_adj)
   n = nrow(LHS_adj)
   adjacency = LHS_adj * RHS_adj  
   # find duplicates
-  colDuplicates = components(G=adjacency, verbose=FALSE)
-  MD = colDuplicates * (rowSums(adjacency) > 0)
+  colDuplicates = components(G=adjacency[1:n, 1:n], verbose=FALSE)
+  MD = colDuplicates * (rowSums(adjacency[1:n, 1:n]) > 0)
 }
diff --git a/src/main/java/org/apache/sysds/hops/BinaryOp.java b/src/main/java/org/apache/sysds/hops/BinaryOp.java
index 379c8f5..cc5d58d 100644
--- a/src/main/java/org/apache/sysds/hops/BinaryOp.java
+++ b/src/main/java/org/apache/sysds/hops/BinaryOp.java
@@ -941,14 +941,6 @@ public class BinaryOp extends MultiThreadedHop
 			setDim1(0);
 			setDim2(0);
 		}
-		else if(getDataType() == DataType.FRAME)
-		{
-			if(getInput().toString().contains("UtilFunctions.jaccardSim"))
-			{
-				setDim1(input1.getDim1());
-				setDim2(input1.getDim1());
-			}
-		}
 		else //MATRIX OUTPUT
 		{
 			//TODO quantile
diff --git a/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java b/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java
index 97ecbc1..ba3fbe3 100644
--- a/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java
+++ b/src/main/java/org/apache/sysds/parser/BuiltinFunctionExpression.java
@@ -1562,8 +1562,14 @@ public class BuiltinFunctionExpression extends DataIdentifier
 			checkMatrixFrameParam(getFirstExpr());
 			checkScalarParam(getSecondExpr());
 			output.setDataType(DataType.FRAME);
-			output.setDimensions(id.getDim1(), 1);
-			output.setValueType(ValueType.STRING);
+			if(_args[1].getText().contains("jaccardSim")) {
+				output.setDimensions(id.getDim1(), id.getDim1());
+				output.setValueType(ValueType.FP64);
+			}
+			else {
+				output.setDimensions(id.getDim1(), 1);
+				output.setValueType(ValueType.STRING);
+			}
 			output.setBlocksize (id.getBlocksize());
 
 			break;
diff --git a/src/main/java/org/apache/sysds/runtime/instructions/spark/BinaryFrameScalarSPInstruction.java b/src/main/java/org/apache/sysds/runtime/instructions/spark/BinaryFrameScalarSPInstruction.java
index a395c16..b5cf078 100644
--- a/src/main/java/org/apache/sysds/runtime/instructions/spark/BinaryFrameScalarSPInstruction.java
+++ b/src/main/java/org/apache/sysds/runtime/instructions/spark/BinaryFrameScalarSPInstruction.java
@@ -44,6 +44,11 @@ public class BinaryFrameScalarSPInstruction extends BinarySPInstruction {
 		// Create local compiled functions (once) and execute on RDD
 		JavaPairRDD<Long, FrameBlock> out = in1.mapValues(new RDDStringProcessing(expression));
 
+		if(expression.contains("jaccardSim")) {
+			long rows = sec.getDataCharacteristics(output.getName()).getRows();
+			sec.getDataCharacteristics(output.getName()).setDimension(rows, rows);
+		}
+
 		sec.setRDDHandleForVariable(output.getName(), out);
 		sec.addLineageRDD(output.getName(), input1.getName());
 	}
diff --git a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierByArima.java b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierByArima.java
index 8830ff2..f18a1a7 100644
--- a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierByArima.java
+++ b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierByArima.java
@@ -111,7 +111,7 @@ public class BuiltinOutlierByArima extends AutomatedTestBase {
 			HashMap<CellIndex, Double> time_series_SYSTEMDS = readDMLMatrixFromOutputDir("result");
 			HashMap<CellIndex, Double> time_series_real = readRMatrixFromExpectedDir("result");
 
-			double tol = Math.pow(10, -14);
+			double tol = Math.pow(10, -12);
 			if (repairMethod == 3)
 				TestUtils.compareScalars(time_series_real.size()-num_outliers, time_series_SYSTEMDS.size(), tol);
 			else