Commit Graph

124 Commits (c2ec2891d1e185b4cc0f30e2dfd18991e2837b69)

Author SHA1 Message Date
hanna cde2b409a7 Oops. Failed to add DbSnpMatchMetrics to Picard private jar.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5994 348d0f76-0448-11de-a6fe-93d51630548a
2011-06-14 15:14:19 +00:00
hanna 1b1aefc385 Move fingerprinting metrics reader into our Picard private extract.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5990 348d0f76-0448-11de-a6fe-93d51630548a
2011-06-14 00:13:10 +00:00
kshakir dab269160b Added cofoja to the Queue package. Although BCEL doesn't think they're needed the scala compiler respectfully disagrees.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5879 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-26 17:42:34 +00:00
kshakir ed6da6f72d Added JavaMail dependencies to Queue package since bcel wasn't picking them up.
Added the ability to add a file path to a package.
Checking for missing files when packaging.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5685 348d0f76-0448-11de-a6fe-93d51630548a
2011-04-23 20:48:40 +00:00
kshakir 798178b167 Another case of just because you can do something doesn't mean you should.
Scala type inference for the implicit return types on implicit methods was a little too much for poor IntelliJ IDEA to handle, and it was breaking things like copy/paste, auto-complete, etc.
Also updated the Queue package to include all Sting utils.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5646 348d0f76-0448-11de-a6fe-93d51630548a
2011-04-15 15:39:56 +00:00
kshakir abf4b5afbb Fixed inclusion of GATKEngine into the Queue package.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5552 348d0f76-0448-11de-a6fe-93d51630548a
2011-04-01 17:45:46 +00:00
kshakir f3e94ef2be Walkers can now specify a class extending from Gatherer to merge custom output formats. Add @Gather(MyGatherer.class) to the walker @Output.
JavaCommandLineFunctions can now specify the classpath+mainclass as an alternative to specifying a path to an executable jar.
JCLF by default pass on the current classpath and only require the mainclass be specified by the developer extending the JCLF, relieving the QScript author from having to explicitly specify the jar.
Like the Picard MergeSamFiles, GATK engine by default is now run from the current classpath. The GATK can still be overridden via .jarFile or .javaClasspath.
Walkers from the GATK package are now also embedded into the Queue package.
Updated AnalyzeCovariates to make it easier to guess the main class, AnalyzeCovariates instead of AnalyzeCovariatesCLP.
Removed the GATK jar argument from the example QScripts.
Removed one of the most FAQ when getting started with Scala/Queue, the use of Option[_] in QScripts:
1) Fixed mistaken assumption with java enums. In java enums can be null so they don't need nullable wrappers.
2) Added syntactic sugar for Nullable primitives to the QScript trait. Any variable defined as Option[Int] can just be assigned an Int value or None, ex: myFunc.memoryLimit = 3
Removed other unused code.
Re-fixed dry run function ordering.
Re-ordered the QCommandline companion object so that IntelliJ doesn't complain about missing main methods.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5504 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-24 14:03:51 +00:00
kshakir f6d4b0aaf5 Using an embedded version of Picard for merging un-indexed bam files after scatter/gather instead of requiring the QScripts to specify the picard JAR. May do this for the GATK jar too.
Fixed initialization of pending counts when using -startFromScratch so the count doesn't start at zero and end at -<#njobs>.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5483 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-21 18:20:01 +00:00
kshakir 298dce2940 Adding the native jna support libraries from the jna.jar to the Queue package jar.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4965 348d0f76-0448-11de-a6fe-93d51630548a
2011-01-08 10:48:30 +00:00
hanna cd4883f4da Be certain to include core GATK reference metadata features and codecs in the
final package.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4892 348d0f76-0448-11de-a6fe-93d51630548a
2010-12-21 21:30:07 +00:00
kshakir 8101f8f301 Simplified the Queue package definition so that BCEL doesn't miss any dependent queue classes or those loaded via reflection.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4859 348d0f76-0448-11de-a6fe-93d51630548a
2010-12-16 18:17:48 +00:00
kshakir e21a66d876 Updated the Queue GATK generator and packaging to include more dependencies for fullCallingPipeline.q.
Set the -bigMemQueue in the FullCallingPipelineTest to GSA to avoid waiting for the week queue when it is busy.
Fixed the package definition of PipelineTest so that scalac won't recompile it every time.



git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4755 348d0f76-0448-11de-a6fe-93d51630548a
2010-11-30 15:29:40 +00:00
hanna 9f356b6cd0 Package all walkers in org/broadinstitute/sting/gatk/walkers directory in release.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4702 348d0f76-0448-11de-a6fe-93d51630548a
2010-11-18 02:33:45 +00:00
aaron fd78ce6c86 include the codecs into the RMD indexer that are available in the GATK, not just Tribble
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4649 348d0f76-0448-11de-a6fe-93d51630548a
2010-11-11 06:35:04 +00:00
aaron cb2e26a004 by request, an indexer tool to create Tribble style indexes outside of the GATK
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4632 348d0f76-0448-11de-a6fe-93d51630548a
2010-11-06 18:59:06 +00:00
ebanks f5b66647ac Include all standard annotations
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4479 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-11 20:52:08 +00:00
ebanks c56c2641a8 /broad/1KG doesn't exist
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4435 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-06 12:54:38 +00:00
ebanks 6448753cf7 Removed the SequenomValidationConvertor and renamed it VariantValidationAssessor since it no longer handles ped/sequenom files (but instead works on vcfs/variantcontexts). Updated all of the wiki docs, including adding instructions on how to convert ped files to vcf, a la Shaun Purcell. We now officially no longer support ped files everyone. Other misc cleanup in the code.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4419 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-04 02:11:38 +00:00
hanna 575c38fc04 Accidental fail to commit missing file.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4405 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-01 20:26:51 +00:00
hanna fe2a0bb3a6 Fix for DoC issue with multiplexer -- will retire use of multiplexer when
GATK reporting structure comes online.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4217 348d0f76-0448-11de-a6fe-93d51630548a
2010-09-07 00:44:07 +00:00
kshakir cb74806bb5 Enabling support for any scala used in QScripts.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4052 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-17 22:05:56 +00:00
kshakir b7c60b9729 Queue now uses its own version instead of the gatk version.
Added a Queue release directory.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4050 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-17 19:34:23 +00:00
kshakir 307c8ca027 Created a new playground script for cleaning bams in Firehose.
Some refactoring of Queue extensions for reusability in scripts.
Putting the extensions into the Queue.jar after building them.
More updates to GATK walker arguments specifying @Input and @Output for Queue.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4032 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-13 23:52:24 +00:00
kshakir 542d394e09 Cleaning up Queue debugging output.
-l DEBUG with local programs now prints out the stdout/stderr of the programs as they are run.
More documentation in the examples with a new even simpler CountReads example.
Took out unused option to build Queue GATK extensions separately.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4025 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-13 15:54:08 +00:00
kshakir 162febdef8 Added Queue packages, which must be run with 'ant queue package'.
To assist with the above no longer removing jars during a new build, so 'ant queue dist' will still have the Queue.jar.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4020 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-12 17:45:53 +00:00
hanna b5b2c19124 Updated resources package descriptor with dbsnp 129 for b37.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3916 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-03 02:42:48 +00:00
ebanks 77cace3aff It's probably a good idea to look carefully at what you've done before actually committing
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3863 348d0f76-0448-11de-a6fe-93d51630548a
2010-07-23 17:06:54 +00:00
ebanks 44f9a631d6 Adding CombineVariants to release. Pining for the days when all of core/playground will be part of release by default...
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3862 348d0f76-0448-11de-a6fe-93d51630548a
2010-07-23 16:53:18 +00:00
chartl ea117957b9 Add CountFunctionalVariants to local release (for firehose)
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3814 348d0f76-0448-11de-a6fe-93d51630548a
2010-07-17 01:36:16 +00:00
hanna c1ecf75dd5 Update to the latest rev of the picard sharding patch. Includes updates reflecting
the imminent move of IlluminaUtil into picard public.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3493 348d0f76-0448-11de-a6fe-93d51630548a
2010-06-06 20:33:21 +00:00
rpoplin 2014837f8a VariantOptimizer package is moved to core, renamed as VariantRecalibration, and added to the binary release package. VariantOptimizer walker is renamed to GenerateVariantClustersWalker and ApplyVariantClustersWalker renamed to VariantRecalibrator. Integration tests added, performance tests still to be done.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3458 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-28 18:20:18 +00:00
aaron 42fa12d9e4 without the *, the package system only took directly referenced files (which pulled in VCF and BED) but skipped dbsnp. Epic star fail...
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3423 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-24 05:19:57 +00:00
aaron 7910a6a7cb adding all of Tribble, not just select codecs, to the package
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3411 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-21 15:48:50 +00:00
aaron 3b52ac67e0 adding the Tribble codecs to the package.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3315 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-06 21:06:15 +00:00
ebanks 0e58fb7cc0 Moved over to be a walker inside the GATK
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3313 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-06 18:28:03 +00:00
ebanks 1a99fb9318 First pass at liftover tool. Passing buck over to Aaron...
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3306 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-05 20:38:19 +00:00
ebanks 3db73e0791 Renaming for consistency
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3221 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-21 03:00:43 +00:00
ebanks bbb83859cd Adding VE modules to package
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3185 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-16 14:44:06 +00:00
chartl 2ca1849df9 Adding HaplotypeScore to the VariantAnnotator package (so it can be used with Firehose)
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3171 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-14 18:37:21 +00:00
aaron 8017fb123f changed the depth of coverage walkers class name, and added a dependency in the packaging system so that RODs will all get imported.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3116 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-02 20:55:19 +00:00
chartl 5a3622b051 Get rid of CoverageStatistics from packages so ant package doesn't go looking for it.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3115 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-02 18:04:33 +00:00
ebanks 699a0ea9d1 adding SequenomValidationConvertor and VariantsToVCF
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3113 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-02 17:27:42 +00:00
chartl 3330666780 Add CoverageStatistics
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3092 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-29 15:45:53 +00:00
hanna 85037ab13f Fix for Kiran's sharding issue (Invalid GZIP header). General cleanup of
Picard patch, including move of some of the Picard private classes we use to Picard public.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3087 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-29 03:21:27 +00:00
ebanks bb7e0c27fd updating the package
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3045 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-19 13:42:31 +00:00
aaron 740238b4fa removing a reference to the VCFValidator, which is gone.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2986 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-11 21:32:17 +00:00
aaron 91b3f9745e removing the package description for the VCF validator
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2910 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-02 15:45:51 +00:00
asivache 9306041cf4 Since IntervalCleaner is gone for good, it is sensible to update the package to refer to the new IndelRealigner instead
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2883 348d0f76-0448-11de-a6fe-93d51630548a
2010-02-24 16:42:56 +00:00
kshakir 3738b76320 Added a playground concordance analyzer for summarizing VariantEval across a group.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2867 348d0f76-0448-11de-a6fe-93d51630548a
2010-02-22 20:28:52 +00:00
asivache 280f38f635 Bringing IndelGenotyper back to life
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2770 348d0f76-0448-11de-a6fe-93d51630548a
2010-02-03 20:12:49 +00:00