From 4a1f7b65c984c9d1e6dbe4a12067217c77b60c2d Mon Sep 17 00:00:00 2001 From: Saeed Fathollahzadeh Date: Mon, 6 Dec 2021 15:35:25 +0100 Subject: [PATCH 1/2] Fixed IOGEN Test Path --- .../sysds/test/functions/iogen/GenerateReaderFrameTest.java | 5 +++++ .../sysds/test/functions/iogen/GenerateReaderMatrixTest.java | 5 +++++ 2 files changed, 10 insertions(+) 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 891890c8b8f..b4d455f524f 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.TestUtils; import java.io.BufferedWriter; +import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.Random; @@ -167,6 +168,10 @@ protected void runGenerateReaderTest() { 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 1b4375a3a8d..7541b7182e2 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.TestUtils; import java.io.BufferedWriter; +import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -81,6 +82,10 @@ protected void runGenerateReaderTest() { 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); From 97ccbcf8d6044bc6d714e769d829bd27422fcba0 Mon Sep 17 00:00:00 2001 From: Saeed Fathollahzadeh Date: Tue, 7 Dec 2021 11:33:36 +0100 Subject: [PATCH 2/2] Fixed IOGEN Tests --- .../test/functions/iogen/FrameGenerateReaderCSVTest.java | 6 +++--- .../functions/iogen/FrameGenerateReaderLibSVMTest.java | 8 ++++---- .../test/functions/iogen/GenerateReaderFrameTest.java | 2 ++ .../test/functions/iogen/MatrixGenerateReaderCSVTest.java | 2 +- .../functions/iogen/MatrixGenerateReaderLibSVMTest.java | 2 +- .../iogen/MatrixGenerateReaderMatrixMarketTest.java | 4 ++-- 6 files changed, 13 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 2a2aa8b67e6..04ab05895b7 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 void test4() { 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 void test5() { 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 void test7() { 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 204645d9a39..722498f7b95 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 void test1() { 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 void test4() { 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 void test5() { 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 void test6() { 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 b4d455f524f..6d8f20628b7 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 @@ -142,6 +142,8 @@ protected void generateRandomData(int nrows, int ncols, double min, double max, 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) 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 0a4970623c5..ff32ada6b14 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 void test12() { @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 cc8c5b93596..272ce9865ea 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 void test0_5() { @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 02134892711..b25b2d15d7a 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 void SymmetricTest1_2() { @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(); }