Skip to content

Commit

Permalink
[ADAM-475] Removed code that has migrated to bdg-utils.
Browse files Browse the repository at this point in the history
  • Loading branch information
fnothaft committed Jan 28, 2015
1 parent f40838a commit 64e2752
Show file tree
Hide file tree
Showing 23 changed files with 19 additions and 1,011 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package org.bdgenomics.adam.apis.java

import org.apache.spark.SparkContext
import org.apache.spark.api.java.JavaSparkContext
import org.bdgenomics.adam.instrumentation.ADAMMetricsListener
import org.bdgenomics.adam.predicates.ADAMPredicate
import org.bdgenomics.adam.rdd.ADAMContext
import org.bdgenomics.adam.rdd.ADAMContext._
Expand Down
18 changes: 12 additions & 6 deletions adam-cli/src/main/scala/org/bdgenomics/adam/cli/ADAMCommand.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@
*/
package org.bdgenomics.adam.cli

import java.io.{ PrintStream, ByteArrayOutputStream }

import java.io.{
ByteArrayOutputStream,
PrintStream,
PrintWriter
}
import org.apache.hadoop.mapreduce.Job
import org.apache.spark.{ SparkConf, Logging, SparkContext }
import org.bdgenomics.adam.instrumentation.ADAMMetrics
import org.bdgenomics.adam.util.HadoopUtil
import org.bdgenomics.utils.instrumentation.{ DurationFormatting, MetricsListener }
import org.bdgenomics.utils.instrumentation.{
DurationFormatting,
MetricsListener,
RecordedMetrics
}

trait ADAMCommandCompanion {
val commandName: String
Expand All @@ -48,7 +54,7 @@ trait ADAMSparkCommand[A <: Args4jBase] extends ADAMCommand with Logging {

def run() {
val start = System.nanoTime()
val metricsListener = if (args.printMetrics) Some(new MetricsListener(new ADAMMetrics())) else None
val metricsListener = if (args.printMetrics) Some(new MetricsListener(new RecordedMetrics())) else None
val conf = new SparkConf().setAppName("adam: " + companion.commandName)
if (conf.getOption("spark.master").isEmpty) {
conf.setMaster("local[%d]".format(Runtime.getRuntime.availableProcessors()))
Expand All @@ -70,7 +76,7 @@ trait ADAMSparkCommand[A <: Args4jBase] extends ADAMCommand with Logging {
out.println()
out.println("Overall Duration: " + DurationFormatting.formatNanosecondDuration(totalTime))
out.println()
listener.metrics.sparkMetrics.print(out)
listener.metrics.sparkMetrics.print(new PrintWriter(out))
logInfo("Metrics:" + bytes.toString("UTF-8"))
})
}
Expand Down
12 changes: 4 additions & 8 deletions adam-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bdgenomics.bdg-utils</groupId>
<artifactId>bdg-utils-parquet</artifactId>
</dependency>
<dependency>
<groupId>org.bdgenomics.bdg-utils</groupId>
<artifactId>bdg-utils-metrics</artifactId>
Expand Down Expand Up @@ -182,14 +186,6 @@
<artifactId>scalatest_${scala.artifact.suffix}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>
Expand Down
50 changes: 0 additions & 50 deletions adam-core/src/main/scala/org/bdgenomics/adam/io/ByteAccess.scala

This file was deleted.

This file was deleted.

This file was deleted.

52 changes: 0 additions & 52 deletions adam-core/src/main/scala/org/bdgenomics/adam/io/FileLocator.scala

This file was deleted.

This file was deleted.

Loading

0 comments on commit 64e2752

Please sign in to comment.