aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/scala/parallelai/spyglass/base
diff options
context:
space:
mode:
authorSaad Rashid <saad373@gmail.com>2014-02-20 16:21:06 +0000
committerSaad Rashid <saad373@gmail.com>2014-02-20 16:21:06 +0000
commitb4f423438e9726d9c5efdb295552e8e737e2ca8f (patch)
tree034697ffad913a4d311d7e28f15172f21071ab3b /src/main/scala/parallelai/spyglass/base
parent8efafea5338dd4204897af085de7a5a14288652e (diff)
downloadSpyGlass-b4f423438e9726d9c5efdb295552e8e737e2ca8f.tar.gz
SpyGlass-b4f423438e9726d9c5efdb295552e8e737e2ca8f.zip
Update Scalding and Cascading latest release and pom versions. Now
SpyGlass supports scalding (0.9.0rc4) and cascading (2.2.1). Its a release candidate.
Diffstat (limited to 'src/main/scala/parallelai/spyglass/base')
-rw-r--r--src/main/scala/parallelai/spyglass/base/JobBase.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/scala/parallelai/spyglass/base/JobBase.scala b/src/main/scala/parallelai/spyglass/base/JobBase.scala
index 7040fa7..6cb79cd 100644
--- a/src/main/scala/parallelai/spyglass/base/JobBase.scala
+++ b/src/main/scala/parallelai/spyglass/base/JobBase.scala
@@ -6,12 +6,13 @@ import org.apache.hadoop.fs.Path
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.FileSystem
import org.apache.hadoop.filecache.DistributedCache
-import com.twitter.scalding.Mode
import com.twitter.scalding.HadoopMode
import com.typesafe.config.ConfigFactory
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import com.twitter.scalding.NullSource
+import parallelai.spyglass.base._
+import com.twitter.scalding.Mode
class JobBase(args: Args) extends Job(args) {
def getOrElseString(key: String, default: String): String = {
@@ -46,14 +47,14 @@ class JobBase(args: Args) extends Job(args) {
val log = LoggerFactory.getLogger(getOrElseString("app.log.name", this.getClass().getName()))
def modeString(): String = {
- Mode.mode match {
+ Mode.getMode(args) match {
case x:HadoopMode => "--hdfs"
case _ => "--local"
}
}
// Execute at instantiation
- Mode.mode match {
+ Mode.getMode(args) match {
case x:HadoopMode => {
log.info("In Hadoop Mode")
JobLibLoader.loadJars(getString("job.lib.path"), AppConfig.jobConfig);