You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by du...@apache.org on 2016/09/28 17:31:24 UTC
incubator-systemml git commit: [HOTFIX] Fixing Python mllearn tests
due to incorrect conversions.
Repository: incubator-systemml
Updated Branches:
refs/heads/master 2636d4556 -> 0d3f97256
[HOTFIX] Fixing Python mllearn tests due to incorrect conversions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/0d3f9725
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/0d3f9725
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/0d3f9725
Branch: refs/heads/master
Commit: 0d3f9725667292fd19019395256c1b187b294d34
Parents: 2636d45
Author: Mike Dusenberry <mw...@us.ibm.com>
Authored: Wed Sep 28 10:29:44 2016 -0700
Committer: Mike Dusenberry <mw...@us.ibm.com>
Committed: Wed Sep 28 10:29:44 2016 -0700
----------------------------------------------------------------------
.../scala/org/apache/sysml/api/ml/BaseSystemMLClassifier.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/0d3f9725/src/main/scala/org/apache/sysml/api/ml/BaseSystemMLClassifier.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/org/apache/sysml/api/ml/BaseSystemMLClassifier.scala b/src/main/scala/org/apache/sysml/api/ml/BaseSystemMLClassifier.scala
index 67926a5..87046b3 100644
--- a/src/main/scala/org/apache/sysml/api/ml/BaseSystemMLClassifier.scala
+++ b/src/main/scala/org/apache/sysml/api/ml/BaseSystemMLClassifier.scala
@@ -110,7 +110,7 @@ trait BaseSystemMLClassifier extends BaseSystemMLEstimator {
val isSingleNode = false
val ml = new MLContext(df.rdd.sparkContext)
val mcXin = new MatrixCharacteristics()
- val Xin = RDDConverterUtils.dataFrameToBinaryBlock(sc, df.asInstanceOf[DataFrame], mcXin, false, true)
+ val Xin = RDDConverterUtils.dataFrameToBinaryBlock(sc, df.asInstanceOf[DataFrame].select("features"), mcXin, false, true)
val revLabelMapping = new java.util.HashMap[Int, String]
val yin = PredictionUtils.fillLabelMapping(df, revLabelMapping)
val ret = getTrainingScript(isSingleNode)
@@ -142,7 +142,7 @@ trait BaseSystemMLClassifierModel extends BaseSystemMLEstimatorModel {
val isSingleNode = false
val ml = new MLContext(sc)
val mcXin = new MatrixCharacteristics()
- val Xin = RDDConverterUtils.dataFrameToBinaryBlock(df.rdd.sparkContext, df.asInstanceOf[DataFrame], mcXin, false, true)
+ val Xin = RDDConverterUtils.dataFrameToBinaryBlock(df.rdd.sparkContext, df.asInstanceOf[DataFrame].select("features"), mcXin, false, true)
val script = getPredictionScript(mloutput, isSingleNode)
val Xin_bin = new BinaryBlockMatrix(Xin, mcXin)
val modelPredict = ml.execute(script._1.in(script._2, Xin_bin))
@@ -159,4 +159,4 @@ trait BaseSystemMLClassifierModel extends BaseSystemMLEstimatorModel {
}
}
-}
\ No newline at end of file
+}