Commit Graph

13418 Commits (2c854e554a8757c3b07090d1e0b556b914a680d8)

Author SHA1 Message Date
Khalid Shakir 2c854e554a Refactored maven directories and java packages replacing "sting" with "gatk".
To reduce merge conflicts, this commit modifies contents of files, while file renamings are in previous commit.
See previous commit message for list of changes.
2014-05-19 17:36:39 -04:00
Khalid Shakir 4e6d43d003 Refactored maven directories and java packages replacing "sting" with "gatk".
To reduce merge conflicts, this commit only renames files, while file modifications are in next commit.
Some updates/fixes here are actually included in the next commit.
= Maven updates
Moved artifacts to new package names:
* private/queue-private -> private/gatk-queue-private
* private/gatk-private -> private/gatk-tools-private
* public/gatk-package -> protected/gatk-package-distribution
* public/queue-package -> protected/gatk-queue-package-distribution
* protected/gatk-protected -> protected/gatk-tools-protected
* public/queue-framework -> public/gatk-queue
* public/gatk-framework -> public/gatk-tools-public
New poms for new artifacts and packages:
* private/gatk-package-internal
* private/gatk-queue-package-internal
* private/gatk-queue-extensions-internal
* protected/gatk-queue-extensions-distribution
* public/gatk-engine
Updated references to StingText.properties to GATKText.properties.
Updated ant-bridge.sh to use gatk.* properties instead of sting.*.
= Engine updates
Renaming files containing engine parts from o.b.gatk.tools to o.b.gatk.engine.
Changed package references from tools to engine for CommandLineGATK, GenomeAnalysisEngine, ReadMetrics, ReadProperties, and WalkerManager.
Changed package reference tools.phonehome to engine.phonehome.
Renamed classes *Sting* to *GATK*, such as ReviewedGATKException.
= Test updates
Moved gatk example resources.
Moved test engine files from tools to engine packages.
Moved resources for phonehome to proper package.
Moved test classes under o.b.gatk into packages:
* o.b.g.utils.{BaseTest,ExampleToCopyUnitTest,GATKTextReporter,MD5DB,MD5Mismatch,TestNGTestTransformer}
* o.b.g.engine.walkers.WalkerTest
Updated package names in DependencyAnalyzerOutputLoaderUnitTest's data.
= Queue updates
Moving queue scripts to location where generated extensions can be used.
Renamed *.q to *.scala, updating licenses previously missed by git hooks.
Moved queue extensions to new artifact gatk-queue-extensions.
Fixed import statments frequently merge-conflicting on FullProcessingPipeline.scala.
= BWA
Added README on how to obtain and include bwa as a library.
Updated libbwa build.
Fixed packaged names under bwa/java implementation.
Updated contents of BWCAligner native implementation.
= Other fixes
Don't duplicate the resource bundle entries by both unpacking *and* appending.
(partial fix) Staged engine and utils poms to build GATKText.properties, once Utils random generator dependency on GATK engine is fixed.
Re-enabled custom testng listeners/reporters and moved testng dependencies to the gatk-root.
Updated comments referencing Sting with GATK.
Moved a couple untangled classes from gatk-tools-public to gatk-utils and gatk-engine.
2014-05-19 16:43:47 -04:00
Eric Banks 6dff219bb1 Merge pull request #634 from broadinstitute/ldg_newSingleSampleScript
Updated single sample exome calling script to use HaplotypeCaller and Ge...
2014-05-19 15:14:16 -04:00
Laura Gauthier 3dea8fed63 Updated single sample exome calling script to use HaplotypeCaller and GenotypeGVCFs 2014-05-19 15:08:51 -04:00
jmthibault79 d15dbadeca Merge pull request #631 from broadinstitute/pd_queue_final_status_line
Revised final Queue status line to display number of jobs in each state ...
2014-05-16 12:03:28 -04:00
Phillip Dexheimer a5abc079dc Revised final Queue status line to display number of jobs in each state when the script fails
* Addresses PT 61552466
* Included a simple scala script in private/testdata that will always fail
2014-05-15 21:30:44 -04:00
Eric Banks 1b2d6ae5e4 Merge pull request #629 from broadinstitute/jg_add_gather_bqsr
Add a (picard) command line wrapper around BQSRGatherer
2014-05-14 12:09:15 -04:00
jmthibault79 78560212d0 Merge pull request #630 from broadinstitute/pd_blank_lines_in_listfile
Allow blank lines in a (non-BAM) list file
2014-05-14 11:32:44 -04:00
droazen 8297cd1a1a Merge pull request #619 from broadinstitute/pd_intervalmerge_doc
Made IntervalSharder respect the IntervalMergingRule specified on the co...
2014-05-14 11:22:18 -04:00
Phillip Dexheimer 77449961ab Allow blank lines in a (non-BAM) list file
* Addresses PT Bug 67841052
 * Added Unit Test
2014-05-13 23:14:15 -04:00
geoffjentry 88ae203075 Add a (picard) command line wrapper around BQSRGatherer 2014-05-13 11:39:38 -04:00
kshakir cca3d167db Merge pull request #627 from broadinstitute/ks_picard_htsjdk_package_rename
picard/htsjdk package rename
2014-05-08 13:12:22 -04:00
Khalid Shakir 67e44985b1 Java/Scala imports updated for new package names.
Fourth of four commits for picard/htsjdk package rename.
2014-05-08 19:13:31 +08:00
Khalid Shakir cc3f1f2b96 Revved picard libraries.
Third of four commits for picard/htsjdk package rename.
2014-05-08 19:13:27 +08:00
Khalid Shakir a894a2dddb Updates to GATK classes and POMs that need updating, plus RodSystemValidation md5 updates.
GATK classes accessing package protected htsjdk classes changed to new package names.
POMs updated to support merging of sam/tribble/variant -> htsjdk and changes to picard artifact.
RodSystemValidation outputs changed due to variant codec packages changes, requiring test md5 updates.
Second of four commits for picard/htsjdk package rename.
2014-05-08 19:13:27 +08:00
Khalid Shakir 3ce3e27aa1 Moved GATK classes and POMs that will need updating.
GATK classes accessing package protected htsjdk classes will need new package names.
POMs will merge sam/tribble/variant into htsjdk.
Move only, contents updated in next commit.
First of four commits for picard/htsjdk package rename.
2014-05-08 19:13:27 +08:00
ldgauthier 53b2364cf8 Merge pull request #623 from broadinstitute/ldg_concordanceSites
Add ability to output to a file discordant loci and their respective gen...
2014-05-07 10:19:09 -04:00
Laura Gauthier bf7b97393e Add ability to output to a file discordant loci and their respective genotypes for each sample 2014-05-07 10:12:45 -04:00
MauricioCarneiro f03a12263a Merge pull request #625 from broadinstitute/intel_updateCell_inlined
(Optional) Inlined the code from updateCell
2014-05-07 10:11:09 -04:00
MauricioCarneiro bd33c3334e Merge pull request #626 from broadinstitute/intel_pairhmm
Removed scary warning messages for VectorPairHMM
2014-05-06 19:23:35 -04:00
Karthik Gururaj d9c489f928 Removed scary warning messages for VectorPairHMM 2014-05-06 10:59:24 -07:00
Karthik Gururaj fb8578ec8e Inlined the code from updateCell - helps Java JIT to detect hotspots and
produce good native code
2014-05-06 10:37:10 -07:00
MauricioCarneiro 587e81fbd9 Merge pull request #573 from broadinstitute/intel_pairhmm
Intel pairhmm
2014-05-05 16:27:04 -04:00
Karthik Gururaj f6ea25b4d1 Parallel version of the JNI for the PairHMM
The JNI treats shared memory as critical memory and doesn't allow any
parallel reads or writes to it until the native code finishes. This is
not a problem *per se* it is the right thing to do, but we need to
enable **-nct** when running the haplotype caller and with it have
multiple native PairHMM running for each map call.

Move to a copy based memory sharing where the JNI simply copies the
memory over to C++ and then has no blocked critical memory when running,
allowing -nct to work.

This version is slightly (almost unnoticeably) slower with -nct 1, but
scales better with -nct 2-4 (we haven't tested anything beyond that
because we know the GATK falls apart with higher levels of parallelism

* Make VECTOR_LOGLESS_CACHING the default implementation for PairHMM.
* Changed version number in pom.xml under public/VectorPairHMM
* VectorPairHMM can now be compiled using gcc 4.8.x
* Modified define-* to get rid of gcc warnings for extra tokens after #undefs
* Added a Linux kernel version check for AVX - gcc's __builtin_cpu_supports function does not check whether the kernel supports AVX or not.
* Updated PairHMM profiling code to update and print numbers only in single-thread mode
* Edited README.md, pom.xml and Makefile for users to pass path to gcc 4.8.x if necessary
* Moved all cpuid inline assembly to single function Changed info message to clog from cinfo
* Modified version in pom.xml in VectorPairHMM from 3.1 to 3.2
* Deleted some unnecessary code
* Modified C++ sandbox to print per interval timing
2014-05-02 19:12:48 -04:00
Ryan Poplin 38b7cfbda9 Merge pull request #621 from broadinstitute/vrr_combine_gvcf_bugfix
Fix for CombineGVCFs and GenotypeGVCFs recurrent exception about missing...
2014-05-02 11:52:32 -04:00
Ryan Poplin 4957359963 Merge pull request #620 from broadinstitute/ldg_fixCGL
Fixed GP annotation reading bug and updated integration test
2014-05-02 11:38:06 -04:00
Valentin Ruano-Rubio d563072282 Fix for CombineGVCFs and GenotypeGVCFs recurrent exception about missing PLs
Story:

  https://www.pivotaltracker.com/story/show/68220438

Changes:

   - PL-less input genotypes are now uncalled and so non-variant sites when combining GVCFs.
   - HC GVCF/BP_RESOLUTION Mode now outputs non-variant sites in sites covered by deletions.
   - Fixed existing tests

Test:

   - HaplotypeCallerGVCFIntegrationTest
   - ReferenceConfidenceModelUnitTest
   - CombineGVCFsIntegrationTest
2014-05-02 09:21:06 -04:00
Laura Gauthier e64479d4f5 Fixed GP annotation reading bug and updated integration test 2014-05-02 09:08:28 -04:00
jmthibault79 cb97afd7d8 Merge pull request #618 from broadinstitute/mm_java_8
Java 8 compatability fix: `Reflections` NPE.
2014-05-01 10:33:31 -04:00
Phillip Dexheimer 7a2b70a10f Made IntervalSharder respect the IntervalMergingRule specified on the command line
* This addresses PT Bug 69741902
* Added a required IMR argument to FilePointer, BAMScheduler, IntervalSharder, and SAMDataSource
* This rule is used by FilePointer.combine and FilePointer.union
* Added unit and integration tests
2014-04-30 22:07:22 -04:00
Michael McCowan fe3c68cb2d Java 8 compatability fix: `Reflections` NPE bugfix. 2014-04-29 13:34:03 -04:00
Valentin Ruano Rubio 4ce09d8693 Merge pull request #617 from broadinstitute/rp_GenotypeGVCF_trimAD
When we subset PLs because Alleles are removed during genotyping we also...
2014-04-28 19:53:41 -04:00
Ryan Poplin 41d3069213 When we subset PLs because Alleles are removed during genotyping we also need to subset AD. 2014-04-28 15:52:26 -04:00
kshakir 10ee35eafa Merge pull request #616 from broadinstitute/ks_cjav_pbsengine_no_default_queue
Removed setting of a default queue in PbsEngineJobRunner.
2014-04-28 14:24:51 -04:00
Ryan Poplin 06dbe74a23 Merge pull request #609 from kcibul/kc_cancersimreads
extended SimulateReadsForVariants to optionally use the AF field to indi...
2014-04-28 13:31:56 -04:00
Ryan Poplin 8d5a7d412b Merge pull request #615 from broadinstitute/ami-createCigarDNFilter
create a new read filter (transformer) that refactor NDN cigar elements ...
2014-04-28 13:31:04 -04:00
Carlos Borroto b7a59e01aa Removed setting of a default queue in PbsEngineJobRunner. Discussed here: http://gatkforums.broadinstitute.org/discussion/3959/would-it-be-possible-for-pbsengine-jobrunner-not-to-set-a-default-queue
Signed-off-by: Khalid Shakir <kshakir@broadinstitute.org>
2014-04-29 00:44:12 +08:00
Ami Levy-Moonshine 13dd755468 create a new read transformer that refactor NDN cigar elements to one N element.
story:
https://www.pivotaltracker.com/story/show/69648104

description:
This read transformer will refactor cigar strings that contain N-D-N elements to one N element (with total length of the three refactored elements).
This is intended primarily for users of RNA-Seq data handling programs such as TopHat2.
Currently we consider that the internal N-D-N motif is illegal and we error out when we encounter it. By refactoring the cigar string of
those specific reads, users of TopHat and other tools can circumvent this problem without affecting the rest of their dataset.

edit: address review comments - change the tool's name and change the tool to be a readTransformer instead of read filter
2014-04-28 11:29:00 -04:00
Eric Banks 385fe5fb56 Merge pull request #614 from broadinstitute/rp_fix_GenotypeGVCF_VCF_headers
GenotypeGVCF was pulling the headers from all input rods including DBsnp...
2014-04-25 15:36:35 -04:00
Ryan Poplin 221b999cb0 GenotypeGVCF was pulling the headers from all input rods including DBsnp. Now it pulls from just the input variant rods. 2014-04-25 13:16:28 -04:00
ldgauthier 147ae21253 Merge pull request #606 from broadinstitute/ldg_CalibrateLikelihoodsForCGP
Improvements to CalculateGenotypePosteriors and CalibrateGenotypeLikelih...
2014-04-24 10:58:40 -04:00
Laura Gauthier 9f3cbb2ef1 Improvements to CalculateGenotypePosteriors and CalibrateGenotypeLikelihoods
CalculateGenotypePosteriors now only computes posterior probs for SNP sites with SNP priors
(other sites have flat priors applied)

CalibrateGenotypeLikelihoods had originally applied HOM_REF/HET/HOM_VAR frequencies in callset as priors before empirical quality analysis. Now has option (-noPriors) to not apply/apply flat priors. Also takes in new external probabilities files, such as those generated by CGP, from which the genotype posterior probability qualities will be read.

Integration test was changed to account for new SNP-only behavior and default behavior to not use missing priors.

(Also, new numRefIfMissing is 0, which should only matter in cases using few samples when you probably don't want to be doing that anyway!)
2014-04-24 08:49:42 -04:00
amilev 92a3aa35d5 Merge pull request #613 from broadinstitute/ami-RNAEdttingTool
create a new tool CountMutationTypes
2014-04-23 17:17:02 -04:00
Ami Levy-Moonshine 9e5333f1d1 create a new tool CountMutationTypes
The new tool gets an VCF file as an input and create a GATK report with the percentages of each mutation type (e.g. A->G, A->T...).
It allow the user to filter sites that will be count based of JXEL or based on the varait quals
A user can aslo print 12 VCF files (one for each mutation) with the VCF line of the mutations that were counted.
2014-04-23 14:22:33 -04:00
droazen 58c8b2dd84 Merge pull request #611 from broadinstitute/mm_otf_sample_rename_support_whitespacing_sample_names
Allow for whitespace in sample names when performing on-the-fly sample-renaming.
2014-04-22 13:01:15 -04:00
Michael McCowan 8290d3c8ac Allow for non-tab whitespace in sample names when performing on-the-fly sample-renaming. 2014-04-22 11:07:13 -04:00
Valentin Ruano Rubio d38835822e Merge pull request #612 from broadinstitute/vrr_integration_test_error_quickfix
Fixed integration test problems from previous premature merge
2014-04-20 18:40:22 -04:00
Valentin Ruano-Rubio e610373169 Fixed integration test problems from previous premature merge 2014-04-20 17:11:51 -04:00
MauricioCarneiro f03e5ffeb1 Merge pull request #604 from broadinstitute/vrr_hc_omniploidy_general_api
Disentangle UG and HC Genotyper engines.
2014-04-20 07:43:23 -04:00
Valentin Ruano-Rubio 4e5850966a Reengineer engine constructors 2014-04-19 17:58:14 -04:00