Skip to content

Commit

Permalink
[ADAM-379] Fix the position of the jar path in the submit.
Browse files Browse the repository at this point in the history
This accordingly with the spark documentation: http://spark.apache.org/docs/latest/submitting-applications.html.

That is, the jar must come after the `options` like --master and so on, but mainly --class. Otherwise, no `main` can be found in the JAR.
  • Loading branch information
andypetrella authored and fnothaft committed Sep 16, 2014
1 parent ee9027c commit 28b5da0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
20 changes: 10 additions & 10 deletions adam-cli/src/main/scala/org/bdgenomics/adam/cli/ADAMMain.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ object ADAMMain extends Logging {
private val commandGroups =
List(
CommandGroup("ADAM ACTIONS", List(
CompareADAM,
FindReads,
CalculateDepth,
CountKmers,
PileupAggregator,
Transform,
/* TODO (nealsid): Reimplement in terms of new schema
CompareADAM,
FindReads,
CalculateDepth,
CountKmers,
PileupAggregator,
Transform,
/* TODO (nealsid): Reimplement in terms of new schema
ComputeVariants
*/
PluginExecutor)),
PluginExecutor)),
CommandGroup("CONVERSION OPERATIONS", List(
Bam2ADAM,
Bam2ADAM,
Vcf2FlatGenotype,
Vcf2ADAM,
VcfAnnotation2ADAM,
Expand All @@ -51,7 +51,7 @@ object ADAMMain extends Logging {
MpileupCommand,
Features2ADAM)),
CommandGroup("PRINT", List(
PrintADAM,
PrintADAM,
FlagStat,
VizReads,
PrintTags,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ trait SparkFunSuite extends FunSuite with BeforeAndAfter {
val driverPort = s.getLocalPort
s.close()
val conf = new SparkConf(false)
.setAppName("adam: " + sparkName)
.setMaster("local[4]")
.set("spark.driver.port", driverPort.toString)
.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
.set("spark.kryo.registrator", "org.bdgenomics.adam.serialization.ADAMKryoRegistrator")
.set("spark.kryoserializer.buffer.mb", "4")
.set("spark.kryo.referenceTracking", "true")
.setAppName("adam: " + sparkName)
.setMaster("local[4]")
.set("spark.driver.port", driverPort.toString)
.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
.set("spark.kryo.registrator", "org.bdgenomics.adam.serialization.ADAMKryoRegistrator")
.set("spark.kryoserializer.buffer.mb", "4")
.set("spark.kryo.referenceTracking", "true")
sc = new SparkContext(conf)
}
}
Expand Down
2 changes: 1 addition & 1 deletion bin/adam-submit
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ fi

# submit the job to Spark
"$SPARK_SUBMIT" \
"$ADAM_CLI_JAR" \
--class org.bdgenomics.adam.cli.ADAMMain \
--properties-file "$ADAM_REPO"/bin/adam-spark-defaults.conf
--jars "$ADAM_JARS" \
"$ADAM_CLI_JAR" \
"$@"

0 comments on commit 28b5da0

Please sign in to comment.