[MINOR] Split parfor function tests (avoid timeouts in github actions)
diff --git a/.github/workflows/functionsTests.yml b/.github/workflows/functionsTests.yml
index b9d4794..a49e6fc 100644
--- a/.github/workflows/functionsTests.yml
+++ b/.github/workflows/functionsTests.yml
@@ -67,7 +67,8 @@
mlcontext,
nary,
paramserv,
- parfor,
+ parfor.misc,
+ parfor.partition,
pipelines,
privacy,
quaternary,
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ForLoopPredicateTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ForLoopPredicateTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ForLoopPredicateTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ForLoopPredicateTest.java
index eb16b26..14c9a7f 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ForLoopPredicateTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ForLoopPredicateTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForAccumulatorResultMergeTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForAccumulatorResultMergeTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForAccumulatorResultMergeTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForAccumulatorResultMergeTest.java
index 18a4691..8c979e6 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForAccumulatorResultMergeTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForAccumulatorResultMergeTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForAdversarialLiteralsTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForAdversarialLiteralsTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForAdversarialLiteralsTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForAdversarialLiteralsTest.java
index 96d6e67..cbd755b 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForAdversarialLiteralsTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForAdversarialLiteralsTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForFunctionSerializationTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForFunctionSerializationTest.java
similarity index 97%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForFunctionSerializationTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForFunctionSerializationTest.java
index 22a4041..ca5ffef 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForFunctionSerializationTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForFunctionSerializationTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForImageBrightnessTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForImageBrightnessTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForImageBrightnessTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForImageBrightnessTest.java
index 0c43b8e..37b5c24 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForImageBrightnessTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForImageBrightnessTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import org.junit.Test;
import org.apache.sysds.common.Types;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForImageMirrorTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForImageMirrorTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForImageMirrorTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForImageMirrorTest.java
index 3ea40ec..499efbb 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForImageMirrorTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForImageMirrorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import org.junit.Test;
import org.apache.sysds.common.Types;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForListResultVarsTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForListResultVarsTest.java
similarity index 97%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForListResultVarsTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForListResultVarsTest.java
index af7b4f9..28d9852 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForListResultVarsTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForListResultVarsTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import org.junit.Assert;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForNaNResultMergeTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForNaNResultMergeTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForNaNResultMergeTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForNaNResultMergeTest.java
index 6b918fc..78fd83e 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForNaNResultMergeTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForNaNResultMergeTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
import java.util.Map.Entry;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForParallelRemoteResultMergeTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForParallelRemoteResultMergeTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForParallelRemoteResultMergeTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForParallelRemoteResultMergeTest.java
index 3d6c6a3..dd10a24 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForParallelRemoteResultMergeTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForParallelRemoteResultMergeTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForReplaceThreadIDRecompileTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForReplaceThreadIDRecompileTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForReplaceThreadIDRecompileTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForReplaceThreadIDRecompileTest.java
index a99f240..bc97b78 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForReplaceThreadIDRecompileTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForReplaceThreadIDRecompileTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForRulebasedOptimizerTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForRulebasedOptimizerTest.java
similarity index 99%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForRulebasedOptimizerTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForRulebasedOptimizerTest.java
index 6ac047e..f32d78e 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForRulebasedOptimizerTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForRulebasedOptimizerTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForSerialRemoteResultMergeTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForSerialRemoteResultMergeTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForSerialRemoteResultMergeTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForSerialRemoteResultMergeTest.java
index e856d86..b349996 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForSerialRemoteResultMergeTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/misc/ParForSerialRemoteResultMergeTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.misc;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForBlockwiseDataPartitioningTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForBlockwiseDataPartitioningTest.java
similarity index 99%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForBlockwiseDataPartitioningTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForBlockwiseDataPartitioningTest.java
index af0d5ed..487889c 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForBlockwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForBlockwiseDataPartitioningTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.partition;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForColwiseDataPartitioningTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForColwiseDataPartitioningTest.java
similarity index 99%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForColwiseDataPartitioningTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForColwiseDataPartitioningTest.java
index 192e774..0f5f4cf 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForColwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForColwiseDataPartitioningTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.partition;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForDataPartitionExecuteTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForDataPartitionExecuteTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForDataPartitionExecuteTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForDataPartitionExecuteTest.java
index a918234..b3a2527 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForDataPartitionExecuteTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForDataPartitionExecuteTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.partition;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForDataPartitionLeftIndexingTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForDataPartitionLeftIndexingTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForDataPartitionLeftIndexingTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForDataPartitionLeftIndexingTest.java
index 3b0d47e..62b5ef2 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForDataPartitionLeftIndexingTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForDataPartitionLeftIndexingTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.partition;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForMultipleDataPartitioningTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForMultipleDataPartitioningTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForMultipleDataPartitioningTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForMultipleDataPartitioningTest.java
index f8a6367..5a8e269 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForMultipleDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForMultipleDataPartitioningTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.partition;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForRepeatedOptimizationTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForRepeatedOptimizationTest.java
similarity index 98%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForRepeatedOptimizationTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForRepeatedOptimizationTest.java
index 9f11686..86ab64a 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForRepeatedOptimizationTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForRepeatedOptimizationTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.partition;
import java.util.HashMap;
@@ -36,7 +36,7 @@
import org.apache.sysds.test.TestUtils;
import org.apache.sysds.utils.Statistics;
-public class ParForRepeatedOptimizationTest extends AutomatedTestBase
+public class ParForRepeatedOptimizationTest extends AutomatedTestBase
{
private final static String TEST_NAME1 = "parfor_repeatedopt1";
private final static String TEST_NAME2 = "parfor_repeatedopt2";
diff --git a/src/test/java/org/apache/sysds/test/functions/parfor/ParForRowwiseDataPartitioningTest.java b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForRowwiseDataPartitioningTest.java
similarity index 99%
rename from src/test/java/org/apache/sysds/test/functions/parfor/ParForRowwiseDataPartitioningTest.java
rename to src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForRowwiseDataPartitioningTest.java
index 2867dd2..83ad64e 100644
--- a/src/test/java/org/apache/sysds/test/functions/parfor/ParForRowwiseDataPartitioningTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/parfor/partition/ParForRowwiseDataPartitioningTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.sysds.test.functions.parfor;
+package org.apache.sysds.test.functions.parfor.partition;
import java.util.HashMap;
