Commit Graph

105 Commits (fe3f78e1d3f5f3586d058ec1b812c29cb85b91e5)

Author SHA1 Message Date
hanna 2f8057bf24 Cleanup for multithreading memory leak during integration tests...unregister MXBean at end
of traversal to avoid holding a reference to the microscheduler, which holds a reference to
the engine, which in turn holds a reference to the walker, which itself holds a reference to
all the data aggregated during the course of the traversal.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4594 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-28 18:37:42 +00:00
kshakir db47230dd9 Wrapping ScatterGatherableFunctions with a facade instead of using slower clone library. Will require keeping Clone's facade code in sync with CommandLineFunction but runs *much* faster.
Shell invoking scripts so that even really long shell scripts make it through LSF.
Using the truncated (up to 1000 characters) of the command line for the job name for use with bjobs.
Switched the default from re-running everything to re-running only files that need to be regenerated.  --skip_up_to_date replaced with --start_clean for those who want to regenerate everything.
Updated logging to let users know when the scatter gather generator is running, which still takes a while but is orders of magnatudes faster for large lists of functions.  (40s for a 100 function graph exploding to a 2500 function graph)


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4448 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-07 01:19:18 +00:00
kshakir bb44044ce0 Fixed re-builds of queue so that previously compiled classes are included. Fixes redundant case of "ant queue test" vs. "ant test".
Refactored temp directory utils.



git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4426 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-04 21:12:07 +00:00
kshakir 4dfed62e7d Generating the Queue GATK extensions using java, then compiling all the Queue scala code at once to allow circular dependencies between existing and generated scala code.
Will see how this behaves for those using IntelliJ as generated source code will disappear during an ant clean.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4425 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-04 19:38:29 +00:00
kshakir cf01f6d58a Renamed conflicting 'package.dir' in build.xml to 'package.xml.dir'.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4417 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-04 00:46:47 +00:00
kiran 62f5383859 * Added an R package, "gsalib", providing a place to store common, useful, documented R methods. To use this module, you must follow three steps:
1) Build the module with the following command:
$ ant gsalib

2) Add the module path to your ~/.Rprofile file:
.libPaths("/path/to/Sting/trunk/R/")

3) At the top of each R script that will use the library, include the line:
library(gsalib)

You can now use the package like any other R package.  To get high-level documentation, supply the following command to R:
help(gsalib)

The methods contained herein are:

    getargs         : A method to easily provide arguments to interactive and non-interactive scripts.
                        Prints out a help message specifying how the script should be run if no arguments
                        or "-h" is provided.  Very helpful when you're writing an R-script piecemeal in
                        interactive mode, then want to make it a command-line program.
    plot.venn       : Plots a two-way or three-way proportional Venn diagram.
    read.eval       : Reads VariantEval output that's formatted in R style.
    read.gatkreport : Reads GATKReport output.
    gsa.message     : Emits a message with the prefix "[gsalib]" to stdout.
    gsa.warn        : Emits a warning message with the prefix "[gsalib] Warning:" to stdout.
    gsa.error       : Emits an error message with the prefix "[gsalib] Error: to stdout, calls traceback()
                        and halts execution.

Documentation on each of these methods can be obtained by typing "help(method_name)" at the R prompt.

* Retired GATKReport.R, as that functionality has now been moved to gsalib.
* Retired gsacommons, as that functionality has been split between gsalib and VariantReport.R.
* Modified VariantReport.R to make use of gsalib.  The script now uses the getargs() method to provide the user with some information as to the proper way to run the script.  Documentation on how to prepare output is given at http://www.broadinstitute.org/gsa/wiki/index.php/VariantEval .
* Added 'gsalib' target to build.xml file.  Running "ant gsalib" will compile this module and place the R-ready package in R/gsalib .



git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4416 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-04 00:27:59 +00:00
hanna 399e6f1463 Make package dir configurable.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4408 348d0f76-0448-11de-a6fe-93d51630548a
2010-10-01 22:25:17 +00:00
kshakir 027241e1ca Moved the test classes from java/classes/testclasses to java/testclasses. Update your IntelliJ settings!
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4395 348d0f76-0448-11de-a6fe-93d51630548a
2010-09-30 20:42:41 +00:00
hanna 6ebca5d219 Enhancements to build external projects for walker sharing.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4348 348d0f76-0448-11de-a6fe-93d51630548a
2010-09-24 21:17:16 +00:00
kshakir 192757d1e0 Added the new pipeline classes to the StingUtils.jar so that ant test picks them up.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4331 348d0f76-0448-11de-a6fe-93d51630548a
2010-09-22 20:05:22 +00:00
hanna d9b8fa2acc Up the memory required for integrationtests until we can figure out why
memory isn't being freed correctly when multiple integration tests run as 
part of a single class.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4328 348d0f76-0448-11de-a6fe-93d51630548a
2010-09-22 18:54:24 +00:00
asivache 21a34daf2e add playground classes to the jar (if they are compiled). Thanks, Khalid!
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4317 348d0f76-0448-11de-a6fe-93d51630548a
2010-09-20 22:28:08 +00:00
hanna 6c27a9bfc6 - Include the fasta index builder in the package.
- Unit/integration  test against the jars built to the dist directory, so that 
  the tests reveal classes that don't exist in the final jars.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4234 348d0f76-0448-11de-a6fe-93d51630548a
2010-09-08 20:37:54 +00:00
aaron 467405094a up the test mem. from 2g to 4g; we're currently hitting the 2g in aggregate across some of the larger tests
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4137 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-27 01:39:05 +00:00
aaron 3dc4d3c3a9 removing the custom reflections library from the libs, and adding a release version. Hopefully this will fix the problem Menachem has been seeing with random JVM crashes. Also
removed the auto-deletion of the reflections jar, and removed the very old OmniPlan document we had checked-in.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4056 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-19 00:42:37 +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
ebanks f36c0ed613 Stop building obsolete VCFTools and CGUtilities
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4030 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-13 19:28:36 +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
kshakir 25a23218c6 Trying a build server fix via google: only running the ivy taskdef once.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4019 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-12 05:10:26 +00:00
kshakir cd5d42618f Killing old version of ivy jar.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4018 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-12 01:32:03 +00:00
kshakir f39dce1082 Exposed CommandLineFunction defaults to the Queue.jar command line (see -help).
Added ability to skip up-to-date jobs where the outputs are older than the inputs.
Changed -T CountDuplicates --quiet to --quietLocus so that Queue GATK extensions can use both short and full argument names.
Short names can be used to set values on Queue GATK extensions, for example: vf.XL :+= myFile
Moved Hidden from the GATK to StingUtils.
Updated ivy from 2.0.0 to 2.2.0-rc1 to fix sha1 issue: http://bit.ly/aX72w7
Added Queue to javadoc and testing build targets.
Added first Queue unit test.
Another pass at avoiding cycles in the DAG thanks to all function I/O being files.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4017 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-11 21:58:26 +00:00
kshakir c66e93d86e Fixed a problem when mixing queue with other targets, such as 'ant clean oneoffs queue' and the STING_BUILD_TYPE environment is set.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3985 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-09 17:59:51 +00:00
kshakir 4f51a02dea Changed logging level to default at INFO instead of WARN.
Changes to StingUtils command line for use in Queue, replacing Queue's use of property files.
Updates to walkers used in existing QScripts to add @Input/@Output.
RMD used in @Required/@Allows now has a new default equal to "any" type.
New QueueGATKExtensions.jar generator for auto wrapping walkers as Queue CommandLineFunctions.
Added hooks to modify the functions that perform the Scattering and Gathering (setting their jar files, other arguments, etc.)
Removed dependency on BroadCore by porting LSF job submitter to scala.
Ivy now pulls down module dependencies from maven.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3984 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-09 16:42:48 +00:00
aaron f3883585d0 removing the build lines I inadvertently committed. As a note: these are the lines you need to add if you want to debug tests, just don't check them in.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3982 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-09 13:48:16 +00:00
aaron 72ae81c6de VariantContext has now moved over to Tribble, and the VCF4 parser is now the only VCF parser in town. Other changes include:
- Tribble is included directly in the GATK repo; those who have access to commit to Tribble can now directly commit from the GATK directory from Intellij; command line users can commit from 
inside the tribble directory.
- Hapmap ROD now in Tribble; all mentions have been switched over.
- VariantContext does not know about GenomeLoc; use VariantContextUtils.getLocation(VariantContext vc) to get a genome loc.
- VariantContext.getSNPSubstitutionType is now in VariantContextUtils.
- This does not include the checked-in project files for Intellij; still running into issues with changes to the iml files being marked as changes by SVN

I'll send out an email to GSAMembers with some more details.



git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3954 348d0f76-0448-11de-a6fe-93d51630548a
2010-08-05 18:47:53 +00:00
hanna 6c93b13428 A Java sizeof, implemented using the Java instrumentation API. Can either get the memory consumed either only by a single
object or by a single object and all the references it contains.  Requires a command-line change to add a Java agent to
the command-line; see the Sizeof.java javadoc for details.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3889 348d0f76-0448-11de-a6fe-93d51630548a
2010-07-27 18:44:15 +00:00
aaron 7ff6106c14 adding Ivy lines for findbug, and adding a build task (to run it locally you need to have installation of findbug). I'll put more information on the wiki when it's up and running.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3744 348d0f76-0448-11de-a6fe-93d51630548a
2010-07-08 19:10:19 +00:00
kshakir 30cf78fdc0 Refactoring for a first version of scatter gather api with basic shell script implementations.
Modified build script so that queue is cleaned during "ant clean".



git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3611 348d0f76-0448-11de-a6fe-93d51630548a
2010-06-22 18:39:20 +00:00
kiran 804facb0cc Removing these utilities as part of a hostage negotation with Matt. Can I have my journal club paper now?!
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3539 348d0f76-0448-11de-a6fe-93d51630548a
2010-06-11 21:41:29 +00:00
aaron dde93e743f always output a brief test summary to the screen, and xml to disk
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3535 348d0f76-0448-11de-a6fe-93d51630548a
2010-06-11 16:24:50 +00:00
kshakir e9ee55d7dd A cleaned up functioning early, early access version of Queue for others to play with and provide feedback about next steps.
Current version only has syntatic sugar for accessing the graph via rules ex. "bam" -> "bam.bai", "samtools index ${bam}" and DOES NOT have sugar for constructing your own graph.
Usage info on the internal wiki at https://iwww.broadinstitute.org/gsa/wiki/index.php/Queue


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3420 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-23 20:21:09 +00:00
kiran f36726554f Appropriate build statements for 'MarkAllAlignmentsAsPrimary' and 'RepairSeattleBAM' - both one-off tools.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3341 348d0f76-0448-11de-a6fe-93d51630548a
2010-05-10 15:17:51 +00:00
aaron 75c1987a18 fixed the build
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3143 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-09 13:03:31 +00:00
aaron 9f6377f7fb added a performance test build option (for the upcoming performance test suite), and added a sample performance test for VariantEval.
IMPORTANT: it was really redundant that we had -Dsingle and -Dsingleintegration to run single unit tests and integration tests, now you can just use -Dsingle to run a single test for performance, unit, and integration tests.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3136 348d0f76-0448-11de-a6fe-93d51630548a
2010-04-08 15:37:15 +00:00
aaron a6e8687d71 implementing a clean way to import the template files into the GATK jar (they should not always get bundled). All further resources should be added to the gatk.resources path id in the build script.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@3094 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-30 04:20:19 +00:00
hanna 9e107513d0 In the new sharding system, if no read group is present, hallucinate one. Added
for test compatibility, but not sure whether we still need this feature.  TODO: Poll the group about this feature.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2949 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-07 23:01:34 +00:00
hanna adea38fd5e Sharding system fixes for corner cases generally related to lack of coverage
in the BAM file.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2928 348d0f76-0448-11de-a6fe-93d51630548a
2010-03-04 18:59:21 +00:00
hanna c1f154c31f Fully qualify the target for the output file so that external build processes (aka firehose)
won't aren't impacted when building the GATK from outside the base directory.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2696 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-26 23:06:30 +00:00
hanna 169032aa78 Add new 'release' task to push releases into a shared directory and the website.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2695 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-26 22:50:20 +00:00
hanna 022601b1a5 Warnings for walkers w/o Javadoc.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2683 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-25 20:34:50 +00:00
hanna 8dafd26100 Print out the current version number in the application header.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2633 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-19 21:58:36 +00:00
hanna 1488578617 Working with Aaron to get svnversion running within the build system. This change will break the build.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2628 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-19 16:55:42 +00:00
hanna d2961a3a17 Typo in previous commit.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2610 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-16 01:41:42 +00:00
hanna 45de006ca3 Disable extraction of svn info completely.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2609 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-16 01:30:25 +00:00
hanna 8ce79e002c Fix for failed build. Seems to be an issue with Bamboo environment. I'll
discuss w/ Aaron next week.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2608 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-16 01:06:26 +00:00
hanna ac4756db20 Add the svn version on the fly to the version number properties.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2607 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-16 00:28:01 +00:00
hanna 420cef4094 Added version numbers to the help doclet extractor. Since the help system is behaving
more like a resource bundle at this point, changed it over to use the Java ResourceBundle
support classes.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2606 348d0f76-0448-11de-a6fe-93d51630548a
2010-01-15 23:31:29 +00:00
hanna 4617052b3c For Alec, and others at the Broad who want to run our unit/integration tests off of gsa1/gsa2: put a ceiling on the amount of memory that integration tests can use. Reduce the memory footprint of the fasta reader test.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2457 348d0f76-0448-11de-a6fe-93d51630548a
2009-12-28 23:42:46 +00:00
hanna d75d3a361a Clean up some of the walker help output based on additional experience and
feedback received.  Also, add a flag to build.xml to disable generation of
docs on demand (use ant -Ddisable.doc=true to disable docs).


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@2284 348d0f76-0448-11de-a6fe-93d51630548a
2009-12-07 21:33:11 +00:00