You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by ma...@apache.org on 2020/09/29 14:08:43 UTC

[systemds] branch master updated (7fb86b9 -> 77010bf)

This is an automated email from the ASF dual-hosted git repository.

markd pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git.


    from 7fb86b9  [SYSTEMDS-2546,2547] Fix Federated rbind/cbind
     new 5461f42  [MINOR][DOC] Added supported versions for MKL and CUDA to documentation
     new 77010bf  [MINOR][TESTS] Added flags to toggle GPU and stats from command line. Also: * Used EXCEPTION_EXPECTED instead of "true" with one test case because it makes the code clearer and silences a warning.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/index.md                                                     | 3 ++-
 docs/site/run.md                                                  | 6 +++---
 pom.xml                                                           | 1 +
 src/test/java/org/apache/sysds/test/AutomatedTestBase.java        | 8 +++++++-
 .../apache/sysds/test/functions/unary/scalar/ExponentTest.java    | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)


[systemds] 01/02: [MINOR][DOC] Added supported versions for MKL and CUDA to documentation

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git

commit 5461f427730656b1e18211907365eea94b32a052
Author: Mark Dokter <ma...@dokter.cc>
AuthorDate: Tue Sep 29 16:02:29 2020 +0200

    [MINOR][DOC] Added supported versions for MKL and CUDA to documentation
---
 docs/index.md    | 3 ++-
 docs/site/run.md | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index 7b09939..0c593d6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -28,7 +28,8 @@ SystemDS's distinguishing characteristics are:
   2. **Multiple execution modes**, including Spark MLContext, Spark Batch, Standalone, and JMLC.
   3. **Automatic optimization** based on data and cluster characteristics to ensure both efficiency and scalability.
 
-This version of SystemDS supports: Java 8+,  Python 3.5+, Hadoop 2.6+ (Not 3.X), and Spark 2.1+ (Not 3.X).
+This version of SystemDS supports: Java 8+,  Python 3.5+, Hadoop 2.6+ (Not 3.X), and Spark 2.1+ (Not 3.X) Nvidia CUDA 10.2
+ (CuDNN 7.x) Intel MKL (<=2019.x).
 
 # Links
 
diff --git a/docs/site/run.md b/docs/site/run.md
index 2b7032b..427da2e 100644
--- a/docs/site/run.md
+++ b/docs/site/run.md
@@ -92,8 +92,8 @@ bin/systemds Univar-Stats.dml -nvargs X=data/haberman.data TYPES=data/types.csv
 
 ## Using Intel MKL native instructions
 
-To use the MKL acceleration download and install the latest MKL library from [1],
-set the environment variables with the MKL-provided script `$ compilervars.sh intel64` and set
-the option `sysds.native.blas` in `SystemDS-config.xml`.
+To use the MKL acceleration download and install the latest supported MKL library (<=2019.5) from [1],
+set the environment variables with the MKL-provided script `. /opt/intel/bin/compilervars.sh intel64` (note the dot and 
+the default install location) and set the option `sysds.native.blas` in `SystemDS-config.xml` to mkl.
 
 [1]: https://software.intel.com/mkl "Intel Math Kernel Library"
\ No newline at end of file


[systemds] 02/02: [MINOR][TESTS] Added flags to toggle GPU and stats from command line. Also: * Used EXCEPTION_EXPECTED instead of "true" with one test case because it makes the code clearer and silences a warning.

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git

commit 77010bf4f77b7ee09595e7562bc72b043e0c1f9b
Author: Mark Dokter <ma...@dokter.cc>
AuthorDate: Tue Sep 29 16:06:10 2020 +0200

    [MINOR][TESTS] Added flags to toggle GPU and stats from command line. Also:
    * Used EXCEPTION_EXPECTED instead of "true" with one test case because it makes the code clearer and silences a warning.
---
 pom.xml                                                           | 1 +
 src/test/java/org/apache/sysds/test/AutomatedTestBase.java        | 8 +++++++-
 .../apache/sysds/test/functions/unary/scalar/ExponentTest.java    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 403a345..39b6cff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
 		<jacoco.skip>true</jacoco.skip>
 		<automatedtestbase.outputbuffering>false</automatedtestbase.outputbuffering>
 		<argLine>-Xms4g -Xmx4g -Xmn400m</argLine>
+		<enableStats>false</enableStats>
 	</properties>
 
 	<repositories>
diff --git a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
index 4e8cdcd..fffe6fe 100644
--- a/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
+++ b/src/test/java/org/apache/sysds/test/AutomatedTestBase.java
@@ -99,7 +99,7 @@ public abstract class AutomatedTestBase {
 	public static final boolean EXCEPTION_NOT_EXPECTED = false;
 
 	// By default: TEST_GPU is set to false to allow developers without Nvidia GPU to run integration test suite
-	public static final boolean TEST_GPU = false;
+	public static boolean TEST_GPU = false;
 	public static final double GPU_TOLERANCE = 1e-9;
 
 	public static final int FED_WORKER_WAIT = 1000; // in ms
@@ -170,6 +170,8 @@ public abstract class AutomatedTestBase {
 
 	protected static final boolean DEBUG = false;
 
+	public static boolean VERBOSE_STATS = false;
+
 	protected String fullDMLScriptName; // utilize for both DML and PyDML, should probably be renamed.
 	// protected String fullPYDMLScriptName;
 	protected String fullRScriptName;
@@ -209,6 +211,8 @@ public abstract class AutomatedTestBase {
 			e.printStackTrace();
 		}
 		outputBuffering = Boolean.parseBoolean(properties.getProperty("automatedtestbase.outputbuffering"));
+		TEST_GPU = Boolean.parseBoolean(properties.getProperty("enableGPU"));
+		VERBOSE_STATS = Boolean.parseBoolean(properties.getProperty("enableStats"));
 	}
 
 	// Timestamp before test start.
@@ -1292,6 +1296,8 @@ public abstract class AutomatedTestBase {
 
 		if(TEST_GPU)
 			args.add("-gpu");
+		if(VERBOSE_STATS)
+			args.add("-stats");
 	}
 
 	public static int getRandomAvailablePort() {
diff --git a/src/test/java/org/apache/sysds/test/functions/unary/scalar/ExponentTest.java b/src/test/java/org/apache/sysds/test/functions/unary/scalar/ExponentTest.java
index 7bda276..ecd26e0 100644
--- a/src/test/java/org/apache/sysds/test/functions/unary/scalar/ExponentTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/unary/scalar/ExponentTest.java
@@ -205,7 +205,7 @@ public class ExponentTest extends AutomatedTestBase
 		
 		createHelperMatrix();
 		
-		runTest(true, LanguageException.class);
+		runTest(EXCEPTION_EXPECTED, LanguageException.class);
 	}
 	
 }