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 2016/09/10 02:59:10 UTC
incubator-systemml git commit: [HOTFIX] Update MLContextProxy for
getActiveMLContext
Repository: incubator-systemml
Updated Branches:
refs/heads/master b21d73d60 -> b3d193241
[HOTFIX] Update MLContextProxy for getActiveMLContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/b3d19324
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/b3d19324
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/b3d19324
Branch: refs/heads/master
Commit: b3d1932419e32d2f89c1a516044a8da651012ff7
Parents: b21d73d
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Fri Sep 9 19:57:26 2016 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Fri Sep 9 19:57:26 2016 -0700
----------------------------------------------------------------------
.../org/apache/sysml/api/MLContextProxy.java | 11 +++++--
.../api/mlcontext/MLContextConversionUtil.java | 31 ++++++++++----------
2 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b3d19324/src/main/java/org/apache/sysml/api/MLContextProxy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/MLContextProxy.java b/src/main/java/org/apache/sysml/api/MLContextProxy.java
index 8002266..351ea09 100644
--- a/src/main/java/org/apache/sysml/api/MLContextProxy.java
+++ b/src/main/java/org/apache/sysml/api/MLContextProxy.java
@@ -85,17 +85,24 @@ public class MLContextProxy
org.apache.sysml.api.mlcontext.MLContext.getActiveMLContext().getInternalProxy().setAppropriateVarsForRead(source, targetname);
}
}
-
+
public static Object getActiveMLContext() {
if (org.apache.sysml.api.MLContext.getActiveMLContext() != null) {
return org.apache.sysml.api.MLContext.getActiveMLContext();
} else if (org.apache.sysml.api.mlcontext.MLContext.getActiveMLContext() != null) {
return org.apache.sysml.api.mlcontext.MLContext.getActiveMLContext();
}
+ return null;
+ }
+
+ public static Object getActiveMLContextForAPI() {
+ if (org.apache.sysml.api.mlcontext.MLContext.getActiveMLContext() != null) {
+ return org.apache.sysml.api.mlcontext.MLContext.getActiveMLContext();
+ }
throw new MLContextException("No MLContext object is currently active. Have you created one? "
+ "Hint: in Scala, 'val ml = new MLContext(sc)'", true);
}
-
+
public static void setInstructionForMonitoring(Instruction inst) {
Location loc = inst.getLocation();
if (loc == null) {
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/b3d19324/src/main/java/org/apache/sysml/api/mlcontext/MLContextConversionUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/mlcontext/MLContextConversionUtil.java b/src/main/java/org/apache/sysml/api/mlcontext/MLContextConversionUtil.java
index 9d9ee5a..62a4f60 100644
--- a/src/main/java/org/apache/sysml/api/mlcontext/MLContextConversionUtil.java
+++ b/src/main/java/org/apache/sysml/api/mlcontext/MLContextConversionUtil.java
@@ -141,7 +141,7 @@ public class MLContextConversionUtil {
try {
InputStream is = url.openStream();
List<String> lines = IOUtils.readLines(is);
- MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContext();
+ MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContextForAPI();
SparkContext sparkContext = activeMLContext.getSparkContext();
@SuppressWarnings("resource")
JavaSparkContext javaSparkContext = new JavaSparkContext(sparkContext);
@@ -391,7 +391,7 @@ public class MLContextConversionUtil {
}
JavaSparkContext javaSparkContext = MLContextUtil
- .getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ .getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
boolean containsID = isDataFrameWithIDColumn(frameMetadata);
MatrixCharacteristics matrixCharacteristics = frameMetadata.asMatrixCharacteristics();
if (matrixCharacteristics == null) {
@@ -606,7 +606,7 @@ public class MLContextConversionUtil {
public static void determineDataFrameDimensionsIfNeeded(DataFrame dataFrame,
MatrixCharacteristics matrixCharacteristics, boolean vectorBased) {
if (!matrixCharacteristics.dimsKnown(true)) {
- MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContext();
+ MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContextForAPI();
SparkContext sparkContext = activeMLContext.getSparkContext();
@SuppressWarnings("resource")
JavaSparkContext javaSparkContext = new JavaSparkContext(sparkContext);
@@ -703,7 +703,7 @@ public class MLContextConversionUtil {
}
JavaPairRDD<LongWritable, Text> javaPairRDDText = javaPairRDD.mapToPair(new CopyTextInputFunction());
- JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
FrameObject frameObject = new FrameObject(null, new MatrixFormatMetaData(matrixCharacteristics,
OutputInfo.BinaryBlockOutputInfo, InputInfo.BinaryBlockInputInfo));
@@ -771,7 +771,7 @@ public class MLContextConversionUtil {
JavaPairRDD<LongWritable, Text> javaPairRDDText = javaPairRDD.mapToPair(new CopyTextInputFunction());
- JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
FrameObject frameObject = new FrameObject(null, new MatrixFormatMetaData(matrixCharacteristics,
OutputInfo.BinaryBlockOutputInfo, InputInfo.BinaryBlockInputInfo));
@@ -935,7 +935,7 @@ public class MLContextConversionUtil {
public static JavaRDD<String> matrixObjectToJavaRDDStringCSV(MatrixObject matrixObject) {
List<String> list = matrixObjectToListStringCSV(matrixObject);
- MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContext();
+ MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContextForAPI();
SparkContext sc = activeMLContext.getSparkContext();
@SuppressWarnings("resource")
JavaSparkContext jsc = new JavaSparkContext(sc);
@@ -953,7 +953,7 @@ public class MLContextConversionUtil {
public static JavaRDD<String> frameObjectToJavaRDDStringCSV(FrameObject frameObject, String delimiter) {
List<String> list = frameObjectToListStringCSV(frameObject, delimiter);
- JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
JavaRDD<String> javaRDDStringCSV = jsc.parallelize(list);
return javaRDDStringCSV;
}
@@ -969,7 +969,7 @@ public class MLContextConversionUtil {
public static JavaRDD<String> matrixObjectToJavaRDDStringIJV(MatrixObject matrixObject) {
List<String> list = matrixObjectToListStringIJV(matrixObject);
- MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContext();
+ MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContextForAPI();
SparkContext sc = activeMLContext.getSparkContext();
@SuppressWarnings("resource")
JavaSparkContext jsc = new JavaSparkContext(sc);
@@ -987,7 +987,7 @@ public class MLContextConversionUtil {
public static JavaRDD<String> frameObjectToJavaRDDStringIJV(FrameObject frameObject) {
List<String> list = frameObjectToListStringIJV(frameObject);
- JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
JavaRDD<String> javaRDDStringIJV = jsc.parallelize(list);
return javaRDDStringIJV;
}
@@ -1013,7 +1013,7 @@ public class MLContextConversionUtil {
List<String> list = matrixObjectToListStringIJV(matrixObject);
- MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContext();
+ MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContextForAPI();
SparkContext sc = activeMLContext.getSparkContext();
ClassTag<String> tag = scala.reflect.ClassTag$.MODULE$.apply(String.class);
RDD<String> rddString = sc.parallelize(JavaConversions.asScalaBuffer(list), sc.defaultParallelism(), tag);
@@ -1041,7 +1041,7 @@ public class MLContextConversionUtil {
List<String> list = frameObjectToListStringIJV(frameObject);
- SparkContext sc = MLContextUtil.getSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ SparkContext sc = MLContextUtil.getSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
ClassTag<String> tag = scala.reflect.ClassTag$.MODULE$.apply(String.class);
RDD<String> rddString = sc.parallelize(JavaConversions.asScalaBuffer(list), sc.defaultParallelism(), tag);
return rddString;
@@ -1068,7 +1068,7 @@ public class MLContextConversionUtil {
List<String> list = matrixObjectToListStringCSV(matrixObject);
- MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContext();
+ MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContextForAPI();
SparkContext sc = activeMLContext.getSparkContext();
ClassTag<String> tag = scala.reflect.ClassTag$.MODULE$.apply(String.class);
RDD<String> rddString = sc.parallelize(JavaConversions.asScalaBuffer(list), sc.defaultParallelism(), tag);
@@ -1096,7 +1096,7 @@ public class MLContextConversionUtil {
List<String> list = frameObjectToListStringCSV(frameObject, delimiter);
- SparkContext sc = MLContextUtil.getSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ SparkContext sc = MLContextUtil.getSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
ClassTag<String> tag = scala.reflect.ClassTag$.MODULE$.apply(String.class);
RDD<String> rddString = sc.parallelize(JavaConversions.asScalaBuffer(list), sc.defaultParallelism(), tag);
return rddString;
@@ -1323,7 +1323,7 @@ public class MLContextConversionUtil {
.getRDDHandleForMatrixObject(matrixObject, InputInfo.BinaryBlockInputInfo);
MatrixCharacteristics matrixCharacteristics = matrixObject.getMatrixCharacteristics();
- MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContext();
+ MLContext activeMLContext = (MLContext) MLContextProxy.getActiveMLContextForAPI();
SparkContext sc = activeMLContext.getSparkContext();
SQLContext sqlContext = new SQLContext(sc);
DataFrame df = null;
@@ -1357,7 +1357,8 @@ public class MLContextConversionUtil {
.getRDDHandleForFrameObject(frameObject, InputInfo.BinaryBlockInputInfo);
MatrixCharacteristics matrixCharacteristics = frameObject.getMatrixCharacteristics();
- JavaSparkContext jsc = MLContextUtil.getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContext());
+ JavaSparkContext jsc = MLContextUtil
+ .getJavaSparkContext((MLContext) MLContextProxy.getActiveMLContextForAPI());
return FrameRDDConverterUtils.binaryBlockToDataFrame(binaryBlockFrame, matrixCharacteristics, jsc);
} catch (DMLRuntimeException e) {