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
commit d8dd694e723b3f71709812606a43677dce07b5af
Author: Mark Dokter <m...@dokter.cc>
AuthorDate: Mon Jun 14 13:32:58 2021 +0200
[MINOR] Various unit test related small corrections and improvements
* Move some maven surefire plugin settings to the properties section (with
same defaults as before) to make them settable from command line (need to
reduce thread count for GPU tests)
* provide an integer when appending "-stats" to a test run (used to crash
some tests without it)
* Conv2DTest requests "recompile_runtime" explain mode without adding
"-explain" so output would not print
Closes #1317.
---
pom.xml | 10 +++++++---
src/test/java/org/apache/sysds/test/AutomatedTestBase.java | 4 +++-
.../java/org/apache/sysds/test/functions/dnn/Conv2DTest.java | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index b7c64c0..c372542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,9 @@
<java.level>1.8</java.level>
<!-->Testing settings<!-->
<maven.test.skip>true</maven.test.skip>
+ <test-parallel>classes</test-parallel>
+ <test-threadCount>2</test-threadCount>
+ <test-forkCount>1C</test-forkCount>
<rerun.failing.tests.count>2</rerun.failing.tests.count>
<jacoco.skip>true</jacoco.skip>
<jacoco.include>**</jacoco.include>
@@ -294,9 +297,10 @@
<version>3.0.0-M5</version>
<configuration>
<skipTests>${maven.test.skip}</skipTests>
- <parallel>classes</parallel>
- <threadCount>2</threadCount>
- <forkCount>1C</forkCount>
+ <parallel>${test-parallel}</parallel>
+
<threadCount>${test-threadCount}</threadCount>
+ <!-- 1C means the number of threads
times 1 possible maximum forks for testing-->
+ <forkCount>${test-forkCount}</forkCount>
<reuseForks>false</reuseForks>
<reportFormat>brief</reportFormat>
<trimStackTrace>true</trimStackTrace>
diff --git a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
index 6b21cd6..41ba0f5 100644
--- a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
@@ -1522,8 +1522,10 @@ public abstract class AutomatedTestBase {
if(TEST_GPU)
args.add("-gpu");
- if(VERBOSE_STATS)
+ if(VERBOSE_STATS) {
args.add("-stats");
+ args.add("100");
+ }
}
public static int getRandomAvailablePort() {
diff --git a/src/test/java/org/apache/sysds/test/functions/dnn/Conv2DTest.java
b/src/test/java/org/apache/sysds/test/functions/dnn/Conv2DTest.java
index 5921e44..176ad87 100644
--- a/src/test/java/org/apache/sysds/test/functions/dnn/Conv2DTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/dnn/Conv2DTest.java
@@ -269,7 +269,7 @@ public class Conv2DTest extends AutomatedTestBase
String RI_HOME = SCRIPT_DIR + TEST_DIR;
fullDMLScriptName = RI_HOME + TEST_NAME + ".dml";
- programArgs = new String[] {"recompile_runtime",
"-args",
+ programArgs = new String[] {"-explain",
"recompile_runtime", "-args",
String.valueOf(imgSize),
String.valueOf(numImg),
String.valueOf(numChannels),
String.valueOf(numFilters),
String.valueOf(filterSize),
String.valueOf(stride), String.valueOf(pad),
