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/08/25 11:40:49 UTC
[systemds] branch master updated: [MINOR] Cleaning Pipelines
cleanups (test fixes, formatting etc.)
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 8167a3d [MINOR] Cleaning Pipelines cleanups (test fixes, formatting etc.)
8167a3d is described below
commit 8167a3d90cfc939e5c8312febda258755a322a1a
Author: Shafaq Siddiqi <sh...@tugraz.at>
AuthorDate: Wed Aug 25 13:40:20 2021 +0200
[MINOR] Cleaning Pipelines cleanups (test fixes, formatting etc.)
---
.../test/functions/pipelines/BuiltinExecutePipelineTest.java | 6 ------
.../test/functions/pipelines/BuiltinTopkEvaluateTest.java | 1 -
.../pipelines/intermediates/classification/bestAcc.csv | 2 +-
.../functions/pipelines/intermediates/classification/hp.csv | 4 ++--
.../functions/pipelines/intermediates/classification/lp.csv | 2 +-
.../functions/pipelines/intermediates/classification/pip.csv | 2 +-
.../functions/pipelines/topkcleaningRegressionTest.dml | 12 +++++++++++-
7 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinExecutePipelineTest.java b/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinExecutePipelineTest.java
index 866070b..e8d573c 100644
--- a/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinExecutePipelineTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinExecutePipelineTest.java
@@ -65,10 +65,4 @@ public class BuiltinExecutePipelineTest extends AutomatedTestBase {
resetExecMode(modeOld);
}
}
-
-
- public static void main(String[] args) {
- String s = null;
- System.out.println("length is "+s.length());
- }
}
diff --git a/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkEvaluateTest.java b/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkEvaluateTest.java
index 2476fb2..acfd032 100644
--- a/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkEvaluateTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkEvaluateTest.java
@@ -24,7 +24,6 @@ import org.apache.sysds.test.AutomatedTestBase;
import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
public class BuiltinTopkEvaluateTest extends AutomatedTestBase {
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv b/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv
index 6b9c512..789b32a 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv
@@ -1,3 +1,3 @@
-85.58558558558559
+84.68468468468468
82.88288288288288
82.88288288288288
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv b/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv
index b6b88f8..fcbeead 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv
@@ -1,3 +1,3 @@
-36.0,3.0,3.0,2.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-36.0,3.0,7.0,1.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+36.0,3.0,2.0,2.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
36.0,3.0,1.0,1.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+36.0,3.0,7.0,2.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv b/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv
index ec8927d..0ba2cb8 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv
@@ -1 +1 @@
-ED,EC,CI,DUMMY
+ED,MVI,CI,DUMMY
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv b/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv
index db5a7e6..11bb383 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv
@@ -1,3 +1,3 @@
outlierBySd,imputeByMedian,wtomeklink,dummycoding
-outlierBySd,imputeByMedian,wtomeklink,dummycoding
outlierBySd,imputeByMean,wtomeklink,dummycoding
+outlierBySd,imputeByMedian,wtomeklink,dummycoding
diff --git a/src/test/scripts/functions/pipelines/topkcleaningRegressionTest.dml b/src/test/scripts/functions/pipelines/topkcleaningRegressionTest.dml
index b1f0310..a797db2 100644
--- a/src/test/scripts/functions/pipelines/topkcleaningRegressionTest.dml
+++ b/src/test/scripts/functions/pipelines/topkcleaningRegressionTest.dml
@@ -60,12 +60,22 @@ write(result, $O)
# choice of parameters provided by API, X, Y, clone_X, evalFunHp (hyper-param), trainML (boolean for optimizing hp internally or passed by externally )
evalRegression = function(Matrix[Double] X, Matrix[Double] Y, Matrix[Double] Xtest, Matrix[Double] Ytest, Matrix[Double] Xorig=as.matrix(0),
Matrix[Double] evalFunHp, Boolean trainML = FALSE)
-return(Matrix[Double] accuracy)
+return(Matrix[Double] output)
{
+ if(trainML == 1)
+ {
+ # do the gridsearch for hyper-parameters
+ params = list("icpt","reg", "tol", "maxi");
+ paramRanges = list(seq(0,2),10^seq(0,-4), 10^seq(-6,-12), 10^seq(1,3));
+ [B1, opt] = utils::topk_gridSearch(X=X, y=Y, train="lm", predict="wmape",
+ numB=ncol(X)+1, cv=TRUE, params=params, paramValues=paramRanges, verbose=FALSE);
+ evalFunHp = as.matrix(opt)
+ }
beta = lm(X=X, y=Y, icpt=as.scalar(evalFunHp[1,1]), reg=as.scalar(evalFunHp[1,2]), tol=as.scalar(evalFunHp[1,3]),
maxi=as.scalar(evalFunHp[1,4]));
acc = wmape(Xtest, Ytest, beta, as.scalar(evalFunHp[1,1]))
accuracy = (1 - acc)
+ output = cbind(accuracy, evalFunHp)
}
wmape = function(Matrix[Double] X, Matrix[Double] y, Matrix[Double] B, Integer icpt) return (Matrix[Double] loss) {