You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2017/02/02 22:22:44 UTC
[1/2] mahout git commit: [MAHOUT-1934],
[MAHOUT-1911]: Clean up getMahoutContext() and surroundnig functions
Repository: mahout
Updated Branches:
refs/heads/master b67034e22 -> fa8975370
[MAHOUT-1934],[MAHOUT-1911]: Clean up getMahoutContext() and surroundnig functions
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/991583ab
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/991583ab
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/991583ab
Branch: refs/heads/master
Commit: 991583abf6534a0a7118bfea3af60bf3170397d3
Parents: b67034e
Author: Andrew Palumbo <ap...@apache.org>
Authored: Thu Feb 2 14:11:46 2017 -0800
Committer: Andrew Palumbo <ap...@apache.org>
Committed: Thu Feb 2 14:11:46 2017 -0800
----------------------------------------------------------------------
.../org/apache/mahout/sparkbindings/package.scala | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/991583ab/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
----------------------------------------------------------------------
diff --git a/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala b/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
index 7da4729..2e3f528 100644
--- a/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
+++ b/spark/src/main/scala/org/apache/mahout/sparkbindings/package.scala
@@ -68,24 +68,24 @@ package object sparkbindings {
// to load all mahout jars
// will need to handle this somehow.
- // if (addMahoutJars) {
+ if (addMahoutJars) {
// context specific jars
val mcjars = findMahoutContextJars(closeables)
-// if (log.isDebugEnabled) {
+ if (log.isDebugEnabled) {
log.debug("Mahout jars:")
mcjars.foreach(j => log.debug(j))
-// }
+ }
sparkConf.setJars(jars = mcjars.toSeq ++ customJars)
if (!(customJars.size > 0)) sparkConf.setJars(customJars.toSeq)
-// } else {
+ } else {
// In local mode we don't care about jars, do we?
// yes adding jars always now since we are not including the artifacts
- // sparkConf.setJars(customJars.toSeq)
-// }
+ sparkConf.setJars(customJars.toSeq)
+ }
sparkConf.setAppName(appName).setMaster(masterUrl).set("spark.serializer",
"org.apache.spark.serializer.KryoSerializer").set("spark.kryo.registrator",
@@ -274,9 +274,9 @@ package object sparkbindings {
!n.matches(".*/.m2/.*")
)
/* verify jar passed to context */
-// info("\n\n\n")
-// mcjars.foreach(j => info(j))
-// info("\n\n\n")
+ info("\n\n\n")
+ mcjars.foreach(j => info(j))
+ info("\n\n\n")
/**/
mcjars
}
[2/2] mahout git commit: closes apache/mahout#272
Posted by ap...@apache.org.
closes apache/mahout#272
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/fa897537
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/fa897537
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/fa897537
Branch: refs/heads/master
Commit: fa89753707d3ad8eba4f4328e164b832d4f699b6
Parents: 991583a
Author: Andrew Palumbo <ap...@apache.org>
Authored: Thu Feb 2 14:22:07 2017 -0800
Committer: Andrew Palumbo <ap...@apache.org>
Committed: Thu Feb 2 14:22:07 2017 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------