This is an automated email from the ASF dual-hosted git repository.
mboehm7 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 70bca7f840 [MINOR] Cleanup append tests for proper exec type handling
70bca7f840 is described below
commit 70bca7f840e414ec3339af6d93f1278be4bcdf26
Author: Matthias Boehm <[email protected]>
AuthorDate: Sat Mar 22 19:04:57 2025 +0100
[MINOR] Cleanup append tests for proper exec type handling
---
.../test/functions/append/AppendChainTest.java | 11 ++---------
.../test/functions/append/AppendMatrixTest.java | 13 +++----------
.../test/functions/append/AppendVectorTest.java | 12 ++----------
.../functions/append/RBindCBindMatrixTest.java | 22 +++++-----------------
4 files changed, 12 insertions(+), 46 deletions(-)
diff --git
a/src/test/java/org/apache/sysds/test/functions/append/AppendChainTest.java
b/src/test/java/org/apache/sysds/test/functions/append/AppendChainTest.java
index 70fed4a3d8..86cbd9ba12 100644
--- a/src/test/java/org/apache/sysds/test/functions/append/AppendChainTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/append/AppendChainTest.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.sysds.api.DMLScript;
import org.apache.sysds.common.Types.ExecMode;
import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
import org.apache.sysds.test.AutomatedTestBase;
@@ -104,15 +103,10 @@ public class AppendChainTest extends AutomatedTestBase
public void commonAppendTest(ExecMode platform, int rows, int cols1,
int cols2, int cols3, boolean sparse)
{
TestConfiguration config =
getAndLoadTestConfiguration(TEST_NAME);
- ExecMode prevPlfm=rtplatform;
- boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
+ ExecMode prevPlfm=setExecMode(platform);
try
{
- rtplatform = platform;
- if( rtplatform == ExecMode.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
config.addVariable("rows", rows);
config.addVariable("cols", cols1);
@@ -150,8 +144,7 @@ public class AppendChainTest extends AutomatedTestBase
}
}
finally {
- rtplatform = prevPlfm;
- DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
+ resetExecMode(prevPlfm);
}
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/append/AppendMatrixTest.java
b/src/test/java/org/apache/sysds/test/functions/append/AppendMatrixTest.java
index 41f9e3a310..04fb230658 100644
--- a/src/test/java/org/apache/sysds/test/functions/append/AppendMatrixTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/append/AppendMatrixTest.java
@@ -24,7 +24,6 @@ import java.util.Random;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.sysds.api.DMLScript;
import org.apache.sysds.common.Types.ExecMode;
import org.apache.sysds.hops.BinaryOp;
import org.apache.sysds.hops.OptimizerUtils;
@@ -146,18 +145,14 @@ public class AppendMatrixTest extends AutomatedTestBase
public void commonAppendTest(ExecMode platform, int rows, int cols1,
int cols2, boolean sparse, AppendMethod forcedAppendMethod)
{
TestConfiguration config =
getAndLoadTestConfiguration(TEST_NAME);
- ExecMode prevPlfm=rtplatform;
+ ExecMode prevPlfm=setExecMode(platform);
double sparsity = (sparse) ? sparsity2 : sparsity1;
- boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
try {
if(forcedAppendMethod != null) {
BinaryOp.FORCED_APPEND_METHOD =
forcedAppendMethod;
}
- rtplatform = platform;
- if( rtplatform == ExecMode.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
+
config.addVariable("rows", rows);
config.addVariable("cols", cols1);
@@ -192,9 +187,7 @@ public class AppendMatrixTest extends AutomatedTestBase
}
}
finally {
- //reset execution platform
- rtplatform = prevPlfm;
- DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
+ resetExecMode(prevPlfm);
BinaryOp.FORCED_APPEND_METHOD = null;
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/append/AppendVectorTest.java
b/src/test/java/org/apache/sysds/test/functions/append/AppendVectorTest.java
index cf97df58a8..4938f774fd 100644
--- a/src/test/java/org/apache/sysds/test/functions/append/AppendVectorTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/append/AppendVectorTest.java
@@ -24,7 +24,6 @@ import java.util.Random;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.sysds.api.DMLScript;
import org.apache.sysds.common.Types.ExecMode;
import org.apache.sysds.hops.OptimizerUtils;
import org.apache.sysds.runtime.matrix.data.MatrixValue.CellIndex;
@@ -76,14 +75,8 @@ public class AppendVectorTest extends AutomatedTestBase
public void commonAppendTest(ExecMode platform, int rows, int cols)
{
TestConfiguration config =
getAndLoadTestConfiguration(TEST_NAME);
-
- ExecMode prevPlfm=rtplatform;
+ ExecMode prevPlfm = setExecMode(platform);
- rtplatform = platform;
- boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == ExecMode.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
try {
config.addVariable("rows", rows);
config.addVariable("cols", cols);
@@ -121,8 +114,7 @@ public class AppendVectorTest extends AutomatedTestBase
}
}
finally {
- rtplatform = prevPlfm;
- DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
+ resetExecMode(prevPlfm);
}
}
}
diff --git
a/src/test/java/org/apache/sysds/test/functions/append/RBindCBindMatrixTest.java
b/src/test/java/org/apache/sysds/test/functions/append/RBindCBindMatrixTest.java
index a0123facab..50fe0a26e5 100644
---
a/src/test/java/org/apache/sysds/test/functions/append/RBindCBindMatrixTest.java
+++
b/src/test/java/org/apache/sysds/test/functions/append/RBindCBindMatrixTest.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import org.apache.sysds.common.Opcodes;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.sysds.api.DMLScript;
import org.apache.sysds.common.Types.ExecMode;
import org.apache.sysds.common.Types.ExecType;
import org.apache.sysds.runtime.instructions.Instruction;
@@ -103,23 +102,15 @@ public class RBindCBindMatrixTest extends
AutomatedTestBase
public void runRBindTest(String testname, boolean sparse, ExecType et)
{
- ExecMode platformOld = rtplatform;
- switch( et ){
- case SPARK: rtplatform = ExecMode.SPARK; break;
- default: rtplatform = ExecMode.HYBRID; break;
- }
-
- boolean sparkConfigOld = DMLScript.USE_LOCAL_SPARK_CONFIG;
- if( rtplatform == ExecMode.SPARK )
- DMLScript.USE_LOCAL_SPARK_CONFIG = true;
-
+ ExecMode platformOld = setExecMode(et);
+
String TEST_NAME = testname;
TestConfiguration config = getTestConfiguration(TEST_NAME);
loadTestConfiguration(config);
double sparsity = (sparse) ? sparsity2 : sparsity1;
try
- {
+ {
String RI_HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = RI_HOME + TEST_NAME + ".dml";
//stats required for opcode checks
@@ -151,11 +142,8 @@ public class RBindCBindMatrixTest extends AutomatedTestBase
Assert.assertTrue("Rewrite not applied",
!Statistics.getCPHeavyHitterOpCodes().contains(opcode) );
}
}
- finally
- {
- //reset execution platform
- rtplatform = platformOld;
- DMLScript.USE_LOCAL_SPARK_CONFIG = sparkConfigOld;
+ finally {
+ resetExecMode(platformOld);
}
}
}
