Commit Graph

13057 Commits (16e82b8c2c788fce0b919c68af9fc587af6edf77)

Author SHA1 Message Date
kshakir 16e82b8c2c Merge pull request #519 from broadinstitute/ks_nc6_checkpoint_patch
Updates to timer, supporting checkpoint mechanisms
2014-02-14 21:47:34 +08:00
Nicholas Clarke 7ae19953f5 Squashed commit of the following:
commit 5e73b94eed3d1fc75c88863c2cf07d5972eb348b
Merge: e12593a d04a585
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Fri Feb 14 09:25:22 2014 +0000

    Merge pull request #1 from broadinstitute/checkpoint

    SimpleTimer passes tests, with formatting

commit d04a58533f1bf5e39b0b43018c9db3302943d985
Author: kshakir <github@kshakir.org>
Date:   Fri Feb 14 14:46:01 2014 +0800

    SimpleTimer passes tests, with formatting

    Fixed getNanoOffset() to offset nano to nano, instead of nano to seconds.
    Updated warning message with comma separated numbers, and exact values of offsets.

commit e12593ae66a5e6f0819316f2a580dbc7ae5896ad
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Wed Feb 12 13:27:07 2014 +0000

    Remove instance of 'Timer'.

commit 47a73e0b123d4257b57cfc926a5bdd75d709fcf9
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Wed Feb 12 12:19:00 2014 +0000

    Revert a couple of changes that survived somehow.

    - CheckpointableTimer,Timer -> SimpleTimer

commit d86d9888ae93400514a8119dc2024e0a101f7170
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Mon Jan 20 14:13:09 2014 +0000

    Revised commits following comments.

    - All utility merged into `SimpleTimer`.
    - All tests merged into `SimpleTimerUnitTest`.
    - Behaviour of `getElapsedTime` should now be consistent with `stop`.
    - Use 'TimeUnit' class for all unit conversions.
    - A bit more tidying.

commit 354ee49b7fc880e944ff9df4343a86e9a5d477c7
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Fri Jan 17 17:04:39 2014 +0000

    Add a new CheckpointableTimerUnitTest.

    Revert SimpleTimerUnitTest to the version before any changes were made.

commit 2ad1b6c87c158399ededd706525c776372bbaf6e
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Tue Jan 14 16:11:18 2014 +0000

    Add test specifically checking behaviour under checkpoint/restart.

    Slight alteration to the checkpointable timer based on observations
    during the testing - it seems that there's a fair amount of drift
    between the sources anyway, so each time we stop we resynchronise the
    offset. Hopefully this should avoid gradual drift building up and
    presenting as checkpoint/restart drift.

commit 1c98881594dc51e4e2365ac95b31d410326d8b53
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Tue Jan 14 14:11:31 2014 +0000

    Should use consistent time units

commit 6f70d42d660b31eee4c2e9d918e74c4129f46036
Author: Nicholas Clarke <nc6@sanger.ac.uk>
Date:   Tue Jan 14 14:01:10 2014 +0000

    Add a new timer supporting checkpoint mechanisms.

    The issue with this is that the current timer is locked to JVM nanoTime. This can be reset after
    a checkpoint/restart and result in negative elapsed times, which causes an error.

    This patch addresses the issue in two ways:
     - Moves the check on timer information in GenomeAnalysisEngine.java to only occur if a time limit has been
    set.
     - Create a new timer (CheckpointableTimer) which keeps track of the relation between system and nano time. If
    this changes drastically, then the assumption is that there has been a JVM restart owing to checkpoint/restart.
    Any time straddling a checkpoint/restart event will not be counted towards total running time.

Signed-off-by: Khalid Shakir <kshakir@broadinstitute.org>
2014-02-14 21:45:47 +08:00
Eric Banks 602fc0ca4d Merge pull request #509 from broadinstitute/ldg_empty_bam_list_error
Check for empty BAM lists in command line input
2014-02-14 08:27:20 -05:00
Laura Gauthier 29bb3d4dc1 Check for empty BAM lists in command line input 2014-02-14 08:09:47 -05:00
Eric Banks 7095a60c8e Merge pull request #516 from broadinstitute/dr_reenable_tests_failing_due_to_java_update
Re-enable tests that were failing post-maven due to changes in Java's Math.pow() implementation
2014-02-13 21:05:18 -05:00
kshakir 238bf4e71d Merge pull request #515 from broadinstitute/ks_picard_maven_update_svn
Updated picard build script to run svn up, removed usage of rt.jar
2014-02-13 23:32:56 +08:00
Khalid Shakir 78e492e17c Removed use of rt.jar now that com.sun annotations are no longer used. 2014-02-13 12:16:26 +08:00
Khalid Shakir 7457fc2c6d Switched svn up invocation from buildnumber-maven-plugin to maven-antrun-plugin, due to mixed revisions by running svn up <dir> instead of just svn up.
Removed unused scm element that was required by buildnumber.
2014-02-13 09:07:11 +08:00
droazen 1c3c20ece3 Merge pull request #514 from broadinstitute/dr_update_nightly_build_script_for_maven
Update nightly build script for maven
2014-02-12 17:43:40 -05:00
David Roazen 0d07121a8d Update nightly build script for maven 2014-02-12 17:14:26 -05:00
Eric Banks a1f191ce45 Merge pull request #507 from jsilter/master
Add ability to read dbSpec over http
2014-02-12 16:15:09 -05:00
David Roazen 4b4b93ad1b Re-enable tests that were failing post-maven due to changes in Java's Math.pow() implementation
After extensive detective work, Joel determined that these tests were failing
due to changes in the implementation of Math.pow() in newer versions of
Java 1.7.

All GSA members should ensure that they're using a JDK that is at least
as current as the one in the Java-1.7 dotkit on the Broad servers
(build 1.7.0_51-b13).
2014-02-12 16:08:16 -05:00
Jacob Silterra 400800e676 Add ability to read dbSpec over http 2014-02-12 16:02:31 -05:00
Eric Banks 10716ca17b Merge pull request #510 from broadinstitute/dr_phone_home_script_updates
Bring live versions of phone home scripts under version control
2014-02-12 15:40:41 -05:00
Eric Banks 5bde7fbf37 Merge pull request #511 from broadinstitute/dr_enable_exclusions_in_maven_package_tests
Exclude all transitive dependencies in maven package-tests
2014-02-12 15:38:39 -05:00
Eric Banks b8db5a9502 Merge pull request #512 from broadinstitute/jt_multi_allele_fix
Fix the broken AD field for multi-allelic variants
2014-02-12 15:38:02 -05:00
Eric Banks bc3d1addee Merge pull request #508 from broadinstitute/rp_ROCCurveNA12878_plot_filtered_status
Adding the filter field to the output of ROCCurveNA12878
2014-02-12 15:33:15 -05:00
Joel Thibault ef87b051b0 Rev Picard to 1.107.1683 (4 jars) 2014-02-12 15:25:50 -05:00
David Roazen 6f12c8b0dc Exclude all transitive dependencies in maven package-tests
This change should allow us to test that the GATK jar has been
correctly packaged at release time, by ensuring that only the
packaged jar + a few test-related dependencies are on the classpath
when tests are run.

Note that we still need to actually test that this works as intended
before we can make this live in the Bamboo release plan.
2014-02-12 14:59:05 -05:00
David Roazen 3b8670490d Use s3funnel instead of s3cmd for listing/downloading/deleting 2014-02-12 14:35:24 -05:00
David Roazen 9ef3f5663f Phone home script updates
-Add support for multiple S3 accounts

-Add chunking for downloads so that we never try to store/process
 too many files at once

-Process chunks asynchronously in parallel to greatly speed up
 downloading/parsing of phone home reports
2014-02-12 14:35:06 -05:00
Joel Thibault cc9477aedb Minimal test for the multi-allelic reordering bug 2014-02-12 13:38:32 -05:00
Ryan Poplin 1fcca8c5c0 Adding the filter field to the output of ROCCurveNA12878 2014-02-12 12:46:30 -05:00
Eric Banks 6facf695ab Merge pull request #506 from broadinstitute/eb_quick_fixes_to_single_sample_pipeline
Several improvements to the single sample combining steps.
2014-02-12 11:30:48 -05:00
Eric Banks 300b474c96 Several improvements to the single sample combining steps.
1. updated QualByDepth not to use AD-restricted depth if it is zero.
Added unit test this change.

2. Fixed small bug in CombineGVCFs where spanning deletions were not being treated consistently throughout.
Added test for this situation.

3. Make sure GenotypeGVCFs puts in the required headers.
Updated test files to make sure this is covered.

4. Have GenotypeGVCFs propagate up the MLEAC/AF (which were getting clobbered out).
Tests updated to account for this.
2014-02-12 10:15:12 -05:00
Eric Banks ff8c9575b0 Merge pull request #505 from broadinstitute/ks_build_na12878kb-utils
Ported na12878kb.jar assembly from Ant's build.xml to Maven
2014-02-12 10:10:52 -05:00
Khalid Shakir 403ce7bfb7 Ported na12878kb.jar assembly from Ant's build.xml to Maven at request of jsilter 2014-02-12 06:01:32 +08:00
droazen 3cfcfa4fa0 Merge pull request #504 from broadinstitute/dr_enable_kb_tests_in_maven
Add ability to run *KnowledgeBaseTests to maven
2014-02-11 15:32:24 -05:00
David Roazen 95e1402d21 Add ability to run *KnowledgeBaseTests to maven
Run with: mvn verify -Dsting.knowledgebasetests.skipped=false
2014-02-11 14:08:24 -05:00
droazen cc9a3b68fc Merge pull request #503 from broadinstitute/ks_maven_gatkdocs_patch
Patched PluginManager to ignore null classes
2014-02-11 13:28:24 -05:00
Eric Banks 96e29d3d94 Merge pull request #500 from broadinstitute/eb_make_qd_more_robust
Adding smarts to the QD annotation
2014-02-11 12:57:50 -05:00
Eric Banks 303a60c8c6 Adding smarts to the QD annotation:
when the AD annotation is present for a given genotype then we only use its depth for QD if the variant depth > 1.

Added new unit tests for QualByDepth.
2014-02-11 12:56:49 -05:00
Khalid Shakir 1666bb7e3a Patched PluginManager to ignore null classes, that will allow gatkdocs to build successfully when running from the source root directory, due to its hardcoded paths. 2014-02-12 00:48:58 +08:00
Eric Banks b33d9d9105 Merge pull request #502 from broadinstitute/eb_make_combine_gvcfs_faster
Refactoring of CombineGVCFs to make it run a lot faster.
2014-02-11 09:03:16 -05:00
Eric Banks 2e36dd9001 Refactoring of CombineGVCFs to make it run a lot faster.
Creating new VariantContexts each time we broke up a block was very expensive because we break up
blocks so often.  Also, calling into GATKVariantContextUtils.simpleMerge was really hurting performance.

MD5 changes because we no longer propogate any INFO fields (except for END) for reference blocks; the tests
have the now unused BLOCK_SIZE field that now get dropped.
2014-02-11 03:18:52 -05:00
Ryan Poplin b81494b704 Merge pull request #499 from broadinstitute/eb_fix_ad_updates
Fixed bug in generating AD values when new alleles are present for genot...
2014-02-09 17:55:00 -05:00
Eric Banks abb67cfa5e Fixed bug in generating AD values when new alleles are present for genotpying GVCFs.
This was a dumb mistake that wasn't well tested (but is now).
2014-02-09 15:15:19 -05:00
Eric Banks c2a2484a18 Merge pull request #498 from broadinstitute/ks_delete_pricard_private
Removed use of picard private.
2014-02-09 10:27:48 -05:00
Khalid Shakir 12bb6fd361 Removed use of picard private.
Updated picard-maven script to tag locally modified builds with -SNAPSHOT.
Removed old picard jars.
2014-02-09 17:08:52 +08:00
Eric Banks 597cc88f33 Merge pull request #497 from broadinstitute/eb_remove_ac0_alleles_PT65118652
Removing parameters that were incorrectly copied over from RegenotypeVariants
2014-02-08 23:46:23 -05:00
Eric Banks abef6cfcb6 Removing parameters that were incorrectly copied over from RegenotypeVariants. 2014-02-08 23:44:32 -05:00
Eric Banks e9189cd471 Merge pull request #496 from broadinstitute/eb_remove_test_for_blocksize
Removing the test for BLOCK_SIZE since we no longer emit it
2014-02-08 21:29:02 -05:00
Eric Banks 659a9f0e79 Removing the test for BLOCK_SIZE since we no longer emit it 2014-02-08 21:28:07 -05:00
Eric Banks a33d7ace11 Merge pull request #495 from broadinstitute/ks_increase_scala_memory
Made scala.maxmemory an argument, and defaulted it to 1g.
2014-02-08 21:13:26 -05:00
Eric Banks 4decb49ecb Merge pull request #494 from broadinstitute/vrr_reference_model_nocall_bugfix
Fixed nocall (./.) without PLs bug in GVCF output
2014-02-08 21:12:45 -05:00
Khalid Shakir 4e0f7521f2 Made scala.maxmemory an argument, and defaulted it to 1g. 2014-02-09 09:24:44 +08:00
Valentin Ruano-Rubio bf630abe88 Fixed nocall (./.) without PLs bug in GVCF output
Story:

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

Additional changes and notes:

1. The fix consist in forcing the output of all PLs by setting the standard flag for that '-allSitePLs'.

2. BP_RESOLUTION was handled differently to GVCF in some aspect that should be common. That has been fixed.
2014-02-07 19:30:26 -05:00
Eric Banks 8c922be684 Merge pull request #491 from broadinstitute/eb_get_AD_back_from_gvcfs
Fixed up some of the genotype-level annotations being propogated in the ...
2014-02-07 12:50:01 -05:00
Eric Banks d689f61005 Fixed up some of the genotype-level annotations being propogated in the single sample HC pipeline.
1. AD values now propogate up (they weren't before).
2. MIN_DP gets transferred over to DP and removed.
3. SB gets removed after FS is calculated.

Also, added a bunch of new integration tests for GenotypeGVCFs.
2014-02-07 12:47:54 -05:00
Eric Banks 0a1385a4d9 Merge pull request #493 from broadinstitute/eb_fix_failing_merge_for_tim
The UG engine can return a null VC if there are tons of alt alleles, cau...
2014-02-07 12:43:40 -05:00