This is an automated email from the ASF dual-hosted git repository.
janardhan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/main by this push:
new 9a295c0 [SYSTEMDS-3240] Fix IOGEN test path if the iogen directory
doesn't exist
9a295c0 is described below
commit 9a295c02091fa0b401fa11d8750643441d6cb7f2
Author: Saeed Fathollahzadeh <[email protected]>
AuthorDate: Tue Dec 7 12:46:23 2021 +0100
[SYSTEMDS-3240] Fix IOGEN test path if the iogen directory doesn't exist
* Also, bad format data generated due to generateRandomData() method
is fixed which lead to failures in
`org.apache.sysds.test.functions.iogen.FrameGenerateReaderCSVTest`
Closes #1475.
---
.../sysds/test/functions/iogen/FrameGenerateReaderCSVTest.java | 6 +++---
.../sysds/test/functions/iogen/FrameGenerateReaderLibSVMTest.java | 8 ++++----
.../sysds/test/functions/iogen/GenerateReaderFrameTest.java | 7 +++++++
.../sysds/test/functions/iogen/GenerateReaderMatrixTest.java | 5 +++++
.../sysds/test/functions/iogen/MatrixGenerateReaderCSVTest.java | 2 +-
.../test/functions/iogen/MatrixGenerateReaderLibSVMTest.java | 2 +-
.../functions/iogen/MatrixGenerateReaderMatrixMarketTest.java | 4 ++--
7 files changed, 23 insertions(+), 11 deletions(-)
diff --git
a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCSVTest.java
b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCSVTest.java
index 2a2aa8b..04ab058 100644
---
a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCSVTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderCSVTest.java
@@ -86,7 +86,7 @@ public class FrameGenerateReaderCSVTest extends
GenerateReaderFrameTest {
public void test5() {
String[] naStrings = {"NULL", "inf", "NaN"};
String separator = ",,,,";
- generateRandomData(10, 10, -10, 10, 0.2, naStrings);
+ generateRandomData(10, 10, -10, 10, 0.5, naStrings);
extractSampleRawCSV(separator);
runGenerateReaderTest();
}
@@ -95,7 +95,7 @@ public class FrameGenerateReaderCSVTest extends
GenerateReaderFrameTest {
public void test6() {
String[] naStrings = {"NULL", "inf", "NaN"};
String separator = "**";
- generateRandomData(1000, 100, -10, 10, 0.2, naStrings);
+ generateRandomData(1000, 100, -10, 10, 0.4, naStrings);
extractSampleRawCSV(separator);
runGenerateReaderTest();
}
@@ -113,7 +113,7 @@ public class FrameGenerateReaderCSVTest extends
GenerateReaderFrameTest {
public void test8() {
String[] naStrings = {"NULL", "inf", "NaN"};
String separator = "**";
- generateRandomData(100000, 100, -10, 10, 0.5, naStrings);
+ generateRandomData(10000, 100, -10, 10, 0.5, naStrings);
extractSampleRawCSV(separator);
runGenerateReaderTest();
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderLibSVMTest.java
b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderLibSVMTest.java
index 204645d..722498f 100644
---
a/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderLibSVMTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/iogen/FrameGenerateReaderLibSVMTest.java
@@ -85,7 +85,7 @@ public class FrameGenerateReaderLibSVMTest extends
GenerateReaderFrameTest {
String[] naStrings = {"NULL", "inf", "NaN"};
String separator = ",";
String indexSeparator = ":";
- generateRandomData(5, 10, -100, 100, 1, naStrings);
+ generateRandomData(10, 10, -100, 100, 1, naStrings);
extractSampleRawLibSVM(0,separator, indexSeparator);
runGenerateReaderTest();
}
@@ -115,7 +115,7 @@ public class FrameGenerateReaderLibSVMTest extends
GenerateReaderFrameTest {
String[] naStrings = {"NULL", "inf", "NaN"};
String separator = ",,,,,,";
String indexSeparator = ":";
- generateRandomData(10, 10, -10, 10, 0.5, naStrings);
+ generateRandomData(20, 20, -100, 100, 0.6, naStrings);
extractSampleRawLibSVM(0,separator, indexSeparator);
runGenerateReaderTest();
}
@@ -125,7 +125,7 @@ public class FrameGenerateReaderLibSVMTest extends
GenerateReaderFrameTest {
String[] naStrings = {"NULL", "inf", "NaN"};
String separator = ",,,,,";
String indexSeparator = ":";
- generateRandomData(100, 10, -100, 100, 0.7, naStrings);
+ generateRandomData(100, 50, -100, 100, 0.5, naStrings);
extractSampleRawLibSVM(0,separator, indexSeparator);
runGenerateReaderTest();
}
@@ -135,7 +135,7 @@ public class FrameGenerateReaderLibSVMTest extends
GenerateReaderFrameTest {
String[] naStrings = {"NULL", "inf", "NaN"};
String separator = ",,,,,";
String indexSeparator = ":";
- generateRandomData(10, 1000, -100, 100, 0.5, naStrings);
+ generateRandomData(10, 1000, -100, 100, 0.7, naStrings);
extractSampleRawLibSVM(1,separator, indexSeparator);
runGenerateReaderTest();
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java
b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java
index 891890c..6d8f206 100644
---
a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderFrameTest.java
@@ -31,6 +31,7 @@ import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Random;
@@ -141,6 +142,8 @@ public abstract class GenerateReaderFrameTest extends
AutomatedTestBase {
Random rn = new Random();
int rnt = rn.nextInt(types.length);
+ if(i == 0|| i==ncols-1)
+ rnt = 3;
schema[i] = types[rnt];
if(types[rnt] == Types.ValueType.STRING)
@@ -167,6 +170,10 @@ public abstract class GenerateReaderFrameTest extends
AutomatedTestBase {
FrameBlock sampleFrame = new FrameBlock(schema, names,
data);
String HOME = SCRIPT_DIR + TEST_DIR;
+ File directory = new File(HOME);
+ if (! directory.exists()){
+ directory.mkdir();
+ }
String dataPath = HOME + "frame_data.raw";
int clen = data[0].length;
writeRawString(sampleRaw, dataPath);
diff --git
a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java
b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java
index 1b4375a..7541b71 100644
---
a/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/iogen/GenerateReaderMatrixTest.java
@@ -31,6 +31,7 @@ import org.apache.sysds.test.TestConfiguration;
import org.apache.sysds.test.TestUtils;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -81,6 +82,10 @@ public abstract class GenerateReaderMatrixTest extends
AutomatedTestBase {
MatrixBlock sampleMB =
DataConverter.convertToMatrixBlock(sampleMatrix);
String HOME = SCRIPT_DIR + TEST_DIR;
+ File directory = new File(HOME);
+ if (! directory.exists()){
+ directory.mkdir();
+ }
String dataPath = HOME + "matrix_data.raw";
int clen = sampleMatrix[0].length;
writeRawString(sampleRaw, dataPath);
diff --git
a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderCSVTest.java
b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderCSVTest.java
index 0a49706..ff32ada 100644
---
a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderCSVTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderCSVTest.java
@@ -145,7 +145,7 @@ public class MatrixGenerateReaderCSVTest extends
GenerateReaderMatrixTest {
@Test
public void test13() {
String[] naString = {"Nan", "NAN", "", "inf", "null", "NULL"};
- generateRandomCSV(1000, 2000, -10, 10, 0.5, ",,", naString);
+ generateRandomCSV(1000, 500, -10, 10, 0.5, ",,", naString);
runGenerateReaderTest();
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderLibSVMTest.java
b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderLibSVMTest.java
index cc8c5b9..272ce98 100644
---
a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderLibSVMTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderLibSVMTest.java
@@ -116,7 +116,7 @@ public class MatrixGenerateReaderLibSVMTest extends
GenerateReaderMatrixTest {
@Test
public void test0_6() {
- sampleRaw = "+1 2.0:3.0 4:5. 6.:7\n" + "-1 8.0:9.0E0 10.0:11e0";
+ sampleRaw = "+1 2:3.0 4:5. 6:7\n" + "-1 8:9.0E0 10:11e0";
sampleMatrix = new double[][] {{0, 0, 3, 0, 5, 0, 7, 0, 0, 0,
0, +1}, {0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 11, -1}};
runGenerateReaderTest();
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMatrixMarketTest.java
b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMatrixMarketTest.java
index 0213489..b25b2d1 100644
---
a/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMatrixMarketTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/iogen/MatrixGenerateReaderMatrixMarketTest.java
@@ -198,13 +198,13 @@ public class MatrixGenerateReaderMatrixMarketTest extends
GenerateReaderMatrixTe
@Test
public void SymmetricTest1_3() {
- generateRandomSymmetricMM(1, 100, -5, 5, 1, ",", false, false);
+ generateRandomSymmetricMM(1, 50, -5, 5, 1, ",", false, false);
runGenerateReaderTest();
}
@Test
public void SymmetricTest1_4() {
- generateRandomSymmetricMM(1, 200, -100, 100, 1, " ", false,
false);
+ generateRandomSymmetricMM(1, 70, -100, 100, 1, " ", false,
false);
runGenerateReaderTest();
}
