You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2017/05/12 21:35:43 UTC
incubator-systemml git commit: [SYSTEMML-1470] Reset MLContext stats
between runs
Repository: incubator-systemml
Updated Branches:
refs/heads/master d04d2381f -> 2921f170a
[SYSTEMML-1470] Reset MLContext stats between runs
Update ScriptExecutor to reset stats between executions if needed.
Update resetGlobalFlags to set DMLScript.STATISTICS_COUNT using
DMLOptions.defaultOptions.statsCount rather than hardcoded value.
Closes #493.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/2921f170
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/2921f170
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/2921f170
Branch: refs/heads/master
Commit: 2921f170a3305a66c1465f47c400e4f629e3bbc3
Parents: d04d238
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Fri May 12 14:33:13 2017 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Fri May 12 14:33:13 2017 -0700
----------------------------------------------------------------------
.../org/apache/sysml/api/mlcontext/ScriptExecutor.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/2921f170/src/main/java/org/apache/sysml/api/mlcontext/ScriptExecutor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/mlcontext/ScriptExecutor.java b/src/main/java/org/apache/sysml/api/mlcontext/ScriptExecutor.java
index ed6949f..1451ebb 100644
--- a/src/main/java/org/apache/sysml/api/mlcontext/ScriptExecutor.java
+++ b/src/main/java/org/apache/sysml/api/mlcontext/ScriptExecutor.java
@@ -26,6 +26,7 @@ import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.apache.sysml.api.DMLScript;
import org.apache.sysml.api.ScriptExecutorUtils;
+import org.apache.sysml.api.DMLScript.DMLOptions;
import org.apache.sysml.api.jmlc.JMLCUtils;
import org.apache.sysml.api.mlcontext.MLContext.ExplainLevel;
import org.apache.sysml.conf.ConfigurationManager;
@@ -271,7 +272,7 @@ public class ScriptExecutor {
DMLScript.STATISTICS = oldStatistics;
DMLScript.FORCE_ACCELERATOR = oldForceGPU;
DMLScript.USE_ACCELERATOR = oldGPU;
- DMLScript.STATISTICS_COUNT = 10;
+ DMLScript.STATISTICS_COUNT = DMLOptions.defaultOptions.statsCount;
}
/**
@@ -338,8 +339,9 @@ public class ScriptExecutor {
/**
* Sets the script in the ScriptExecutor, checks that the script has a type
* and string, sets the ScriptExecutor in the script, sets the script string
- * in the Spark Monitor, and globally sets the script type.
- * Also does GPU initialization
+ * in the Spark Monitor, globally sets the script type, sets global flags,
+ * and resets statistics if needed.
+ *
* @param script
* the DML or PYDML script to execute
*/
@@ -350,6 +352,9 @@ public class ScriptExecutor {
// Set global variable indicating the script type
DMLScript.SCRIPT_TYPE = script.getScriptType();
setGlobalFlags();
+ if (statistics) {
+ Statistics.reset();
+ }
}
/**