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/systemml.git
The following commit(s) were added to refs/heads/master by this push:
new 407f736 [MINOR] Fix l2svm algorithm and cleanup codegen/builtin tests
407f736 is described below
commit 407f736720edc865d9547792c46f982675e292db
Author: Matthias Boehm <[email protected]>
AuthorDate: Sun May 24 16:52:06 2020 +0200
[MINOR] Fix l2svm algorithm and cleanup codegen/builtin tests
This patch makes some minor fixes to the algorithm integration of the
builtin l2svm function (which failed the codegen tests), and cleans up
the codegen and builtin tests via result caching, removed explain
output, and slightly smaller sizes to avoid spurious test failures (for
which reason failures are often ignored without double checking).
---
scripts/algorithms/l2-svm.dml | 8 ++++--
.../apache/sysds/test/applications/ArimaTest.java | 2 +-
.../test/applications/MDABivariateStatsTest.java | 17 ++++++-------
.../test/functions/builtin/BuiltinCVLmTest.java | 2 --
.../functions/builtin/BuiltinComponentsTest.java | 2 +-
.../builtin/BuiltinFactorizationTest.java | 6 ++---
.../test/functions/builtin/BuiltinGLMTest.java | 18 +++++++-------
.../functions/builtin/BuiltinGridSearchTest.java | 2 +-
.../builtin/BuiltinImageBrightnessTest.java | 2 +-
.../functions/builtin/BuiltinImageCropTest.java | 2 +-
.../functions/builtin/BuiltinImageMirrorTest.java | 2 +-
.../test/functions/builtin/BuiltinKmeansTest.java | 2 +-
.../test/functions/builtin/BuiltinL2SVMTest.java | 4 +--
.../functions/builtin/BuiltinLmPredictTest.java | 2 +-
.../test/functions/builtin/BuiltinLmTest.java | 2 +-
.../builtin/BuiltinMultiLogRegPredictTest.java | 2 +-
.../builtin/BuiltinMulticlassSVMTest.java | 2 +-
.../functions/builtin/BuiltinNaiveBayesTest.java | 1 -
.../functions/builtin/BuiltinNormalizeTest.java | 2 +-
.../test/functions/builtin/BuiltinOutlierTest.java | 2 +-
.../test/functions/builtin/BuiltinSTEPLmTest.java | 2 +-
.../test/functions/builtin/BuiltinScaleTest.java | 29 +++++++++++++++++++---
.../test/functions/builtin/BuiltinSigmoidTest.java | 2 +-
.../functions/builtin/BuiltinSliceFinderTest.java | 2 +-
.../functions/builtin/BuiltinToOneHotTest.java | 2 +-
.../functions/builtin/BuiltinWinsorizeTest.java | 2 +-
.../functions/builtin/MultipleBuiltinsTest.java | 2 +-
.../codegenalg/partone/AlgorithmKMeans.java | 2 +-
.../codegenalg/partone/AlgorithmL2SVM.java | 14 +++++------
.../codegenalg/parttwo/AlgorithmDatagen.java | 2 +-
.../functions/codegenalg/parttwo/AlgorithmGLM.java | 2 +-
.../parttwo/AlgorithmStepwiseRegression.java | 2 +-
.../scripts/functions/codegenalg/Algorithm_L2SVM.R | 8 +++---
33 files changed, 87 insertions(+), 66 deletions(-)
diff --git a/scripts/algorithms/l2-svm.dml b/scripts/algorithms/l2-svm.dml
index 04d6524..1c2fb9d 100644
--- a/scripts/algorithms/l2-svm.dml
+++ b/scripts/algorithms/l2-svm.dml
@@ -57,15 +57,19 @@ verbose = ifdef($verbose, FALSE)
X = read($X)
Y = read($Y)
+positive_label = max(Y)
+negative_label = min(Y)
+dimensions = ncol(X)
+
w = l2svm(X=X, Y=Y, intercept=intercept,
- epsilon=epsilon, lambda=labmda,
+ epsilon=epsilon, lambda=lambda,
maxIterations=maxIterations,
verbose=verbose)
extra_model_params = matrix(0, 4, 1)
extra_model_params[1,1] = positive_label
extra_model_params[2,1] = negative_label
-extra_model_params[3,1] = intercept
+extra_model_params[3,1] = as.double(intercept)
extra_model_params[4,1] = dimensions
w = rbind(w, extra_model_params)
diff --git a/src/test/java/org/apache/sysds/test/applications/ArimaTest.java
b/src/test/java/org/apache/sysds/test/applications/ArimaTest.java
index c9ab019..020ffb6 100644
--- a/src/test/java/org/apache/sysds/test/applications/ArimaTest.java
+++ b/src/test/java/org/apache/sysds/test/applications/ArimaTest.java
@@ -130,7 +130,7 @@ public class ArimaTest extends AutomatedTestBase {
rCmd = getRCmd(inputDir(), Integer.toString(max_func_invoc),
Integer.toString(p), Integer.toString(d), Integer.toString(q),
Integer.toString(P),
Integer.toString(D), Integer.toString(Q),
Integer.toString(s), Integer.toString(include_mean),
Integer.toString(useJacobi), expectedDir());
- int timeSeriesLength = 5000;
+ int timeSeriesLength = 3000;
double[][] timeSeries = getRandomMatrix(timeSeriesLength, 1, 1,
5, 0.9, System.currentTimeMillis());
MatrixCharacteristics mc = new
MatrixCharacteristics(timeSeriesLength,1,-1,-1);
diff --git
a/src/test/java/org/apache/sysds/test/applications/MDABivariateStatsTest.java
b/src/test/java/org/apache/sysds/test/applications/MDABivariateStatsTest.java
index 34bb996..b438ba5 100644
---
a/src/test/java/org/apache/sysds/test/applications/MDABivariateStatsTest.java
+++
b/src/test/java/org/apache/sysds/test/applications/MDABivariateStatsTest.java
@@ -38,7 +38,6 @@ import org.apache.sysds.test.TestUtils;
@net.jcip.annotations.NotThreadSafe
public class MDABivariateStatsTest extends AutomatedTestBase
{
-
protected final static String TEST_DIR = "applications/mdabivar/";
protected final static String TEST_NAME = "MDABivariateStats";
protected String TEST_CLASS_DIR = TEST_DIR +
MDABivariateStatsTest.class.getSimpleName() + "/";
@@ -51,15 +50,15 @@ public class MDABivariateStatsTest extends AutomatedTestBase
this.label_index = li;
this.label_measurement_level = lml;
}
-
+
@Parameters
- public static Collection<Object[]> data() {
- Object[][] data = new Object[][] { { 10000, 100, 1, 1 }, { 10000,
100, 100, 0},
- { 100000, 100, 1, 1 }, {
100000, 100, 100, 0}
-
};
- return Arrays.asList(data);
- }
-
+ public static Collection<Object[]> data() {
+ Object[][] data = new Object[][] {
+ { 1000, 100, 1, 1 }, { 1000, 100, 100, 0},
+ { 10000, 100, 1, 1 }, { 10000, 100, 100, 0}};
+ return Arrays.asList(data);
+ }
+
@Override
public void setUp() {
addTestConfiguration(TEST_CLASS_DIR, TEST_NAME);
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCVLmTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCVLmTest.java
index 2fa7dd4..1ffcff1 100644
--- a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCVLmTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinCVLmTest.java
@@ -54,8 +54,6 @@ public class BuiltinCVLmTest extends AutomatedTestBase
List<String> proArgs = new ArrayList<>();
int k = 3;
- proArgs.add("-explain");
- proArgs.add("-stats");
proArgs.add("-args");
proArgs.add(input("X"));
proArgs.add(input("y"));
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinComponentsTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinComponentsTest.java
index ca54528..e541f9d 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinComponentsTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinComponentsTest.java
@@ -68,7 +68,7 @@ public class BuiltinComponentsTest extends AutomatedTestBase {
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{ "-explain", "-stats",
"-args", input("X"), output("R")};
+ programArgs = new String[]{ "-args", input("X"),
output("R")};
//generate actual dataset (3 components)
double[][] X = new double[numVertices-3][2];
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
index 31c6418..6510b6d 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinFactorizationTest.java
@@ -37,8 +37,8 @@ public class BuiltinFactorizationTest extends
AutomatedTestBase
private final static String TEST_DIR = "functions/builtin/";
private static final String TEST_CLASS_DIR = TEST_DIR +
BuiltinFactorizationTest.class.getSimpleName() + "/";
- private final static int rows = 3210;
- private final static int cols = 4012;
+ private final static int rows = 1210;
+ private final static int cols = 2012;
private final static int rank = 50;
private final static double sparsity = 0.01;
private final static double max_iter = 10;
@@ -104,7 +104,7 @@ public class BuiltinFactorizationTest extends
AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + testname + ".dml";
- programArgs = new String[]{ "-explain", "-stats",
+ programArgs = new String[]{ "-stats",
"-args", input("X"), output("W"), output("H"),
String.valueOf(rank), String.valueOf(max_iter)};
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGLMTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGLMTest.java
index a6a3939..8225303 100644
--- a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGLMTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGLMTest.java
@@ -231,36 +231,36 @@ public class BuiltinGLMTest extends AutomatedTestBase
Object[][] data = new Object[][] {
// #RECS #FTRS DFM VPOW LNK LPOW LFVD
AVGLT STDLT DISP
// Both DML and R work and compute close
results:
- { 100000, 50, 1, 0.0, 1, 0.0, 3.0,
10.0, 2.0, 2.5 }, // Gaussian.log
+ { 10000, 50, 1, 0.0, 1, 0.0, 3.0,
10.0, 2.0, 2.5 }, // Gaussian.log
//{ 10000, 100, 1, 0.0, 1, 1.0, 3.0,
0.0, 2.0, 2.5 }, // Gaussian.id
//{ 20000, 100, 1, 0.0, 1, -1.0, 0.0,
0.2, 0.03, 2.5 }, // Gaussian.inverse
- { 10000, 100, 1, 1.0, 1, 0.0, 3.0,
0.0, 1.0, 2.5 }, // Poisson.log
+ { 1000, 100, 1, 1.0, 1, 0.0, 3.0,
0.0, 1.0, 2.5 }, // Poisson.log
//{ 100000, 10, 1, 1.0, 1, 0.0, 3.0,
0.0, 50.0, 2.5 }, // Poisson.log // Pr[0|x] gets near 1
//{ 20000, 100, 1, 1.0, 1, 0.5, 3.0,
10.0, 2.0, 2.5 }, // Poisson.sqrt
//{ 20000, 100, 1, 1.0, 1, 1.0, 3.0,
50.0, 10.0, 2.5 }, // Poisson.id
- { 100000, 50, 1, 2.0, 1, 0.0, 3.0,
0.0, 2.0, 2.5 }, // Gamma.log
+ { 10000, 50, 1, 2.0, 1, 0.0, 3.0, 0.0,
2.0, 2.5 }, // Gamma.log
//{ 100000, 50, 1, 2.0, 1, -1.0, 1.0,
2.0, 0.4, 1.5 }, // Gamma.inverse
//{ 10000, 100, 1, 3.0, 1, -2.0, 3.0,
50.0, 7.0, 1.7 }, // InvGaussian.1/mu^2
//{ 10000, 100, 1, 3.0, 1, -1.0, 3.0,
10.0, 2.0, 2.5 }, // InvGaussian.inverse
//{ 100000, 50, 1, 3.0, 1, 0.0, 2.0,
-2.0, 1.0, 1.7 }, // InvGaussian.log
//{ 100000, 50, 1, 3.0, 1, 1.0, 1.0,
0.2, 0.04, 1.7 }, // InvGaussian.id
- { 100000, 50, 2, -1.0, 1, 0.0, 3.0,
-5.0, 1.0, 1.0 }, // Bernoulli {-1, 1}.log // Note: Y is sparse
+ { 10000, 50, 2, -1.0, 1, 0.0, 3.0, -5.0,
1.0, 1.0 }, // Bernoulli {-1, 1}.log // Note: Y is sparse
//{ 100000, 50, 2, -1.0, 1, 1.0, 1.0,
0.6, 0.1, 1.0 }, // Bernoulli {-1, 1}.id
//{ 100000, 50, 2, -1.0, 1, 0.5, 0.0,
0.4, 0.05, 1.0 }, // Bernoulli {-1, 1}.sqrt
- { 10000, 100, 2, -1.0, 2, 0.0, 3.0,
0.0, 2.0, 1.0 }, // Bernoulli {-1, 1}.logit
+ { 1000, 100, 2, -1.0, 2, 0.0, 3.0, 0.0,
2.0, 1.0 }, // Bernoulli {-1, 1}.logit
//{ 10000, 100, 2, -1.0, 2, 0.0, 3.0,
0.0, 50.0, 1.0 }, // Bernoulli {-1, 1}.logit // Pr[y|x] near 0, 1
- { 20000, 100, 2, -1.0, 3, 0.0, 3.0,
0.0, 2.0, 1.0 }, // Bernoulli {-1, 1}.probit
+ { 2000, 100, 2, -1.0, 3, 0.0, 3.0, 0.0,
2.0, 1.0 }, // Bernoulli {-1, 1}.probit
//{ 100000, 10, 2, -1.0, 3, 0.0, 3.0,
0.0, 50.0, 1.0 }, // Bernoulli {-1, 1}.probit // Pr[y|x] near 0, 1
//{ 10000, 100, 2, -1.0, 4, 0.0, 3.0,
-2.0, 1.0, 1.0 }, // Bernoulli {-1, 1}.cloglog
//{ 50000, 20, 2, -1.0, 4, 0.0, 3.0,
-2.0, 50.0, 1.0 }, // Bernoulli {-1, 1}.cloglog // Pr[y|x] near 0, 1
//{ 50000, 100, 2, -1.0, 5, 0.0, 3.0,
0.0, 2.0, 1.0 }, // Bernoulli {-1, 1}.cauchit
- { 100000, 50, 2, 1.0, 1, 0.0, 3.0,
-5.0, 1.0, 2.5 }, // Binomial two-column.log // Note: Y is sparse
+ { 10000, 50, 2, 1.0, 1, 0.0, 3.0, -5.0,
1.0, 2.5 }, // Binomial two-column.log // Note: Y is sparse
//{ 10000, 100, 2, 1.0, 1, 1.0, 0.0,
0.4, 0.05, 2.5 }, // Binomial two-column.id
//{ 100000, 50, 2, 1.0, 1, 0.5, 0.0,
0.4, 0.05, 2.5 }, // Binomial two-column.sqrt
- { 10000, 100, 2, 1.0, 2, 0.0, 3.0,
0.0, 2.0, 2.5 }, // Binomial two-column.logit
- { 20000, 100, 2, 1.0, 3, 0.0, 3.0,
0.0, 2.0, 2.5 }, // Binomial two-column.probit
+ { 1000, 100, 2, 1.0, 2, 0.0, 3.0, 0.0,
2.0, 2.5 }, // Binomial two-column.logit
+ { 2000, 100, 2, 1.0, 3, 0.0, 3.0, 0.0,
2.0, 2.5 }, // Binomial two-column.probit
//{ 10000, 100, 2, 1.0, 4, 0.0, 3.0,
-2.0, 1.0, 2.5 }, // Binomial two-column.cloglog
//{ 20000, 100, 2, 1.0, 5, 0.0, 3.0,
0.0, 2.0, 2.5 }, // Binomial two-column.cauchit
};
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGridSearchTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGridSearchTest.java
index 232db2f..661b4c3 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGridSearchTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinGridSearchTest.java
@@ -61,7 +61,7 @@ public class BuiltinGridSearchTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[] {"-explain","-args",
input("X"), input("y"), output("R")};
+ programArgs = new String[] {"-args", input("X"),
input("y"), output("R")};
double[][] X = getRandomMatrix(rows, cols, 0, 1, 0.8,
-1);
double[][] y = getRandomMatrix(rows, 1, 0, 1, 0.8, -1);
writeInputMatrixWithMTD("X", X, true);
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageBrightnessTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageBrightnessTest.java
index a0e3281..5524d3d 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageBrightnessTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageBrightnessTest.java
@@ -73,7 +73,7 @@ public class BuiltinImageBrightnessTest extends
AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-stats",
"-nvargs",
+ programArgs = new String[]{"-nvargs",
"in_file=" + input("A"),
"out_file=" + output("B"),
};
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageCropTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageCropTest.java
index be82543..49485e5 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageCropTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageCropTest.java
@@ -76,7 +76,7 @@ public class BuiltinImageCropTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-stats",
"-nvargs",
+ programArgs = new String[]{"-nvargs",
"in_file=" + input("A"), "out_file=" +
output("B"),
"size=" + size, "x_offset=" + x_offset,
"y_offset=" + y_offset, "width=" + cols, "height=" + rows
};
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageMirrorTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageMirrorTest.java
index ee5c83f..206c5c0 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageMirrorTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinImageMirrorTest.java
@@ -73,7 +73,7 @@ public class BuiltinImageMirrorTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-stats",
"-nvargs",
+ programArgs = new String[]{"-nvargs",
"in_file=" + input("A"),
"x_out_file=" + output("Bx"),
"y_out_file=" + output("By"),
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinKmeansTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinKmeansTest.java
index 874a8aa..f320729 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinKmeansTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinKmeansTest.java
@@ -143,7 +143,7 @@ public class BuiltinKmeansTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{ "-explain", "-stats",
+ programArgs = new String[]{
"-nvargs", "X=" + input("X"), "Y=" +
output("Y"), "C=" + output("C"),
"k=" + centroids, "runs=" + runs,
"eps=" + eps, "max_iter=" + max_iter};
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinL2SVMTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinL2SVMTest.java
index 1ae5a52..12593f6 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinL2SVMTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinL2SVMTest.java
@@ -40,7 +40,7 @@ public class BuiltinL2SVMTest extends AutomatedTestBase {
private final static double eps = 0.001;
private final static int rows = 1000;
- private final static int colsX = 500;
+ private final static int colsX = 200;
private final static double spSparse = 0.01;
private final static double spDense = 0.7;
private final static int max_iter = 10;
@@ -107,7 +107,7 @@ public class BuiltinL2SVMTest extends AutomatedTestBase {
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{ "-explain", "-stats",
+ programArgs = new String[]{
"-nvargs", "X=" + input("X"), "Y=" +
input("Y"), "model=" + output("model"),
"inc=" +
String.valueOf(intercept).toUpperCase(),"eps=" + eps, "lam=" + lambda, "max=" +
run};
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmPredictTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmPredictTest.java
index 86a2281..d1fcd94 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmPredictTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmPredictTest.java
@@ -79,7 +79,7 @@ public class BuiltinLmPredictTest extends AutomatedTestBase
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), input("B"), input("C"), output("D") };
+ programArgs = new String[]{"-args", input("A"),
input("B"), input("C"), output("D") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmTest.java
index d2e4fde..7ae14e4 100644
--- a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinLmTest.java
@@ -130,7 +130,7 @@ public class BuiltinLmTest extends AutomatedTestBase
fullDMLScriptName = HOME + dml_test_name + ".dml";
- programArgs = new String[]{"-explain", "-stats",
"-args", input("A"), input("B"), output("C") };
+ programArgs = new String[]{"-args", input("A"),
input("B"), output("C") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMultiLogRegPredictTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMultiLogRegPredictTest.java
index ccdf528..a3483d8 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMultiLogRegPredictTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMultiLogRegPredictTest.java
@@ -69,7 +69,7 @@ public class BuiltinMultiLogRegPredictTest extends
AutomatedTestBase {
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), input("B"), input("C"), input("D"), output("O") };
+ programArgs = new String[]{"-args", input("A"),
input("B"), input("C"), input("D"), output("O") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMulticlassSVMTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMulticlassSVMTest.java
index 56ceda1..b5b21a5 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMulticlassSVMTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinMulticlassSVMTest.java
@@ -38,7 +38,7 @@ public class BuiltinMulticlassSVMTest extends
AutomatedTestBase {
private final static double eps = 0.001;
private final static int rows = 1000;
- private final static int colsX = 500;
+ private final static int colsX = 200;
private final static double spSparse = 0.01;
private final static double spDense = 0.7;
private final static int max_iter = 10;
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNaiveBayesTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNaiveBayesTest.java
index fb6c158..07b1070 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNaiveBayesTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNaiveBayesTest.java
@@ -72,7 +72,6 @@ public class BuiltinNaiveBayesTest extends AutomatedTestBase
double laplace_correction = 1;
List<String> proArgs = new ArrayList<>();
- proArgs.add("-stats");
proArgs.add("-args");
proArgs.add(input("X"));
proArgs.add(input("Y"));
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNormalizeTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNormalizeTest.java
index 68cb359..88a525c 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNormalizeTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinNormalizeTest.java
@@ -77,7 +77,7 @@ public class BuiltinNormalizeTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), output("B") };
+ programArgs = new String[]{"-args", input("A"),
output("B") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierTest.java
index aeb6372..5d21b18 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinOutlierTest.java
@@ -97,7 +97,7 @@ public class BuiltinOutlierTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"),
+ programArgs = new String[]{"-args", input("A"),
String.valueOf(opposite).toUpperCase(),
output("B") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " "
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSTEPLmTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSTEPLmTest.java
index 5f5c416..baae1a3 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSTEPLmTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSTEPLmTest.java
@@ -85,7 +85,7 @@ public class BuiltinSTEPLmTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + dml_test_name + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), input("B"), output("C"), output("S")};
+ programArgs = new String[]{"-args", input("A"),
input("B"), output("C"), output("S")};
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinScaleTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinScaleTest.java
index d021b80..48b9921 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinScaleTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinScaleTest.java
@@ -21,6 +21,8 @@ package org.apache.sysds.test.functions.builtin;
import java.util.HashMap;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.sysds.common.Types.ExecMode;
import org.apache.sysds.lops.LopProperties.ExecType;
@@ -44,6 +46,23 @@ public class BuiltinScaleTest extends AutomatedTestBase
@Override
public void setUp() {
addTestConfiguration(TEST_NAME,new
TestConfiguration(TEST_CLASS_DIR, TEST_NAME,new String[]{"B"}));
+
+ if (TEST_CACHE_ENABLED) {
+ setOutAndExpectedDeletionDisabled(true);
+ }
+ }
+
+ @BeforeClass
+ public static void init() {
+ TestUtils.clearDirectory(TEST_DATA_DIR + TEST_CLASS_DIR);
+ }
+
+
+ @AfterClass
+ public static void cleanUp() {
+ if (TEST_CACHE_ENABLED) {
+ TestUtils.clearDirectory(TEST_DATA_DIR +
TEST_CLASS_DIR);
+ }
}
@Test
@@ -132,11 +151,14 @@ public class BuiltinScaleTest extends AutomatedTestBase
try
{
- loadTestConfiguration(getTestConfiguration(TEST_NAME));
-
+ TestConfiguration config =
getTestConfiguration(TEST_NAME);
+ String TEST_CACHE_DIR = TEST_CACHE_ENABLED ?
+ TEST_CACHE_DIR = sparse + "_" + center + "_" +
scale + "/" : "";
+ loadTestConfiguration(config, TEST_CACHE_DIR);
+
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"),
+ programArgs = new String[]{"-args", input("A"),
String.valueOf(center).toUpperCase(),
String.valueOf(scale).toUpperCase(),
output("B") };
fullRScriptName = HOME + TEST_NAME + ".R";
@@ -160,5 +182,4 @@ public class BuiltinScaleTest extends AutomatedTestBase
rtplatform = platformOld;
}
}
-
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSigmoidTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSigmoidTest.java
index 8d00200..373c12d 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSigmoidTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSigmoidTest.java
@@ -87,7 +87,7 @@ public class BuiltinSigmoidTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), output("B") };
+ programArgs = new String[]{"-args", input("A"),
output("B") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSliceFinderTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSliceFinderTest.java
index 17ea402..6bcf37b 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSliceFinderTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinSliceFinderTest.java
@@ -70,7 +70,7 @@ public class BuiltinSliceFinderTest extends AutomatedTestBase
{
try {
loadTestConfiguration(getTestConfiguration(TEST_NAME));
fullDMLScriptName = HOME + dml_test_name + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), input("B"), input("Y0"), output("C")};
+ programArgs = new String[]{"-args", input("A"),
input("B"), input("Y0"), output("C")};
double[][] A = TestUtils.ceil(getRandomMatrix(rows,
cols, 0, 10, 1, 7));
double[][] B = TestUtils.ceil(getRandomMatrix(10, 1, 0,
10, 1.0, 3));
double[][] As = new double[rows][cols];
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinToOneHotTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinToOneHotTest.java
index 852f420..4fff5cc 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinToOneHotTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinToOneHotTest.java
@@ -76,7 +76,7 @@ public class BuiltinToOneHotTest extends AutomatedTestBase {
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"),
+ programArgs = new String[]{"-args", input("A"),
String.format("%d", numClassesPassed),
output("B") };
runTest(true, false, null, -1);
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinWinsorizeTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinWinsorizeTest.java
index 6cee661..7a204d4 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinWinsorizeTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/BuiltinWinsorizeTest.java
@@ -64,7 +64,7 @@ public class BuiltinWinsorizeTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), output("B") };
+ programArgs = new String[]{"-args", input("A"),
output("B") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/builtin/MultipleBuiltinsTest.java
b/src/test/java/org/apache/sysds/test/functions/builtin/MultipleBuiltinsTest.java
index 3103f69..6502f4a 100644
---
a/src/test/java/org/apache/sysds/test/functions/builtin/MultipleBuiltinsTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/builtin/MultipleBuiltinsTest.java
@@ -64,7 +64,7 @@ public class MultipleBuiltinsTest extends AutomatedTestBase
String HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = HOME + TEST_NAME + ".dml";
- programArgs = new String[]{"-explain", "-args",
input("A"), output("B") };
+ programArgs = new String[]{"-args", input("A"),
output("B") };
fullRScriptName = HOME + TEST_NAME + ".R";
rCmd = "Rscript" + " " + fullRScriptName + " " +
inputDir() + " " + expectedDir();
diff --git
a/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmKMeans.java
b/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmKMeans.java
index 6c8b7b8..153ae64 100644
---
a/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmKMeans.java
+++
b/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmKMeans.java
@@ -39,7 +39,7 @@ public class AlgorithmKMeans extends AutomatedTestBase
//private final static double eps = 1e-5;
- private final static int rows = 3972;
+ private final static int rows = 2972;
private final static int cols = 972;
private final static double sparsity1 = 0.7; //dense
diff --git
a/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmL2SVM.java
b/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmL2SVM.java
index 053741b..5fb1ade 100644
---
a/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmL2SVM.java
+++
b/src/test/java/org/apache/sysds/test/functions/codegenalg/partone/AlgorithmL2SVM.java
@@ -34,21 +34,21 @@ import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
public class AlgorithmL2SVM extends AutomatedTestBase
-{
+{
private final static String TEST_NAME1 = "Algorithm_L2SVM";
private final static String TEST_DIR = "functions/codegenalg/";
private final static String TEST_CLASS_DIR = TEST_DIR +
AlgorithmL2SVM.class.getSimpleName() + "/";
private final static double eps = 1e-5;
- private final static int rows = 3468;
+ private final static int rows = 2468;
private final static int cols1 = 1007;
private final static int cols2 = 987;
private final static double sparsity1 = 0.7; //dense
private final static double sparsity2 = 0.1; //sparse
- private final static int intercept = 0;
+ private final static boolean intercept = false;
private final static double epsilon = 0.000000001;
private final static double maxiter = 10;
@@ -162,11 +162,11 @@ public class AlgorithmL2SVM extends AutomatedTestBase
fullDMLScriptName = "scripts/algorithms/l2-svm.dml";
programArgs = new String[]{ "-stats", "-nvargs",
"X="+input("X"), "Y="+input("Y"),
- "icpt="+String.valueOf(intercept),
"tol="+String.valueOf(epsilon), "reg=0.001",
- "maxiter="+String.valueOf(maxiter),
"model="+output("w"), "Log= "};
+
"icpt="+String.valueOf(intercept).toUpperCase(), "tol="+String.valueOf(epsilon),
+ "reg=0.001",
"maxiter="+String.valueOf(maxiter), "model="+output("w"), "Log= "};
- rCmd = getRCmd(inputDir(),
String.valueOf(intercept),String.valueOf(epsilon),
- String.valueOf(maxiter), expectedDir());
+ rCmd = getRCmd(inputDir(),
String.valueOf(intercept).toUpperCase(),
+ String.valueOf(epsilon),
String.valueOf(maxiter), expectedDir());
OptimizerUtils.ALLOW_ALGEBRAIC_SIMPLIFICATION =
rewrites;
diff --git
a/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmDatagen.java
b/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmDatagen.java
index 3a7fc09..531e035 100644
---
a/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmDatagen.java
+++
b/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmDatagen.java
@@ -37,7 +37,7 @@ public class AlgorithmDatagen extends AutomatedTestBase
private final static String TEST_DIR = "functions/codegenalg/";
private final static String TEST_CLASS_DIR = TEST_DIR +
AlgorithmDatagen.class.getSimpleName() + "/";
- private final static int rows = 2468;
+ private final static int rows = 1468;
private final static int cols = 200;
private final static double sparsity1 = 0.9; //dense
diff --git
a/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmGLM.java
b/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmGLM.java
index bdaa74c..06f8615 100644
---
a/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmGLM.java
+++
b/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmGLM.java
@@ -39,7 +39,7 @@ public class AlgorithmGLM extends AutomatedTestBase
//private final static double eps = 1e-5;
- private final static int rows = 2468;
+ private final static int rows = 1468;
private final static int cols = 1007;
private final static double sparsity1 = 0.7; //dense
diff --git
a/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmStepwiseRegression.java
b/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmStepwiseRegression.java
index 1d96edc..cd228f6 100644
---
a/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmStepwiseRegression.java
+++
b/src/test/java/org/apache/sysds/test/functions/codegenalg/parttwo/AlgorithmStepwiseRegression.java
@@ -37,7 +37,7 @@ public class AlgorithmStepwiseRegression extends
AutomatedTestBase
private final static String TEST_DIR = "functions/codegenalg/";
private final static String TEST_CLASS_DIR = TEST_DIR +
AlgorithmStepwiseRegression.class.getSimpleName() + "/";
- private final static int rows = 2468;
+ private final static int rows = 1468;
private final static int cols = 200;
private final static double sparsity1 = 0.7; //dense
diff --git a/src/test/scripts/functions/codegenalg/Algorithm_L2SVM.R
b/src/test/scripts/functions/codegenalg/Algorithm_L2SVM.R
index 68fe3e5..2e9f509 100644
--- a/src/test/scripts/functions/codegenalg/Algorithm_L2SVM.R
+++ b/src/test/scripts/functions/codegenalg/Algorithm_L2SVM.R
@@ -24,7 +24,7 @@ library("Matrix")
X = readMM(paste(args[1], "X.mtx", sep=""));
Y = readMM(paste(args[1], "Y.mtx", sep=""));
-intercept = as.integer(args[2]);
+intercept = as.logical(args[2]);
epsilon = as.double(args[3]);
lambda = 0.001;
maxiterations = as.integer(args[4]);
@@ -42,7 +42,7 @@ if(num_min + num_max != nrow(Y)){
dimensions = ncol(X)
-if (intercept == 1) {
+if (intercept) {
ones = matrix(1, rows=num_samples, cols=1)
X = cbind(X, ones);
}
@@ -100,9 +100,9 @@ while(continue && iter < maxiterations){
extra_model_params = matrix(0, 4, 1)
extra_model_params[1,1] = positive_label
extra_model_params[2,1] = negative_label
-extra_model_params[3,1] = intercept
+extra_model_params[3,1] = as.numeric(intercept)
extra_model_params[4,1] = dimensions
-w = t(cbind(t(w), t(extra_model_params)))
+w = rbind(w, extra_model_params)
writeMM(as(w,"CsparseMatrix"), paste(args[5], "w", sep=""));
