Commit Graph

177 Commits (b8db0510e0eb1ed2ae4970e79b698dc1d372fc9b)

Author SHA1 Message Date
Mark DePristo 7420ed098e Semi-working version of extraDocs tag in annotation to refer to one capability being accessible in another
Required a significant refactoring of the GATKDoclet, which now has a unified place where the ClassDoc, class, annotation, and handler are all stored together.
2011-07-23 22:07:30 -04:00
Mark DePristo 999acacfa1 Merge branch 'master' into help 2011-07-23 20:19:33 -04:00
Mark DePristo e262f4e10b gatkdoc now generalized to use @Annotation. Multiple subsystems now use annotation to receive docs
Index expanded to use summary() annotation field
UserExceptions, ReadFilters, GATK engine all use the system to generate docs
Doclet expanded to handle lots of new cases
2011-07-23 20:00:35 -04:00
Khalid Shakir 1f8fc4a041 Added edu.mit.broad.picard to Queue packaged jar.
Added hack to workaround EDU.oswego namespace and staging on mac case-insensitive filesystems.
2011-07-23 14:40:29 -04:00
Mark DePristo f0be7348be Generalized handler to allow it to be used with any arbitrary class structure.
DocumentedGATKFeature now includes a field for the group name.
Build.xml works with public / private now.
2011-07-22 14:07:40 -04:00
Mark DePristo e892489696 V2 of the document system.
Now uses GATKDoc class to organize documentation for arguments.
Arguments now listed by feature (required, optional, hidden, etc) and link to detailed information about the argument in the html
Lots of code moving between Class and ClassDoc objects.  Should be refactored into a single static utility class.
2011-07-21 15:20:34 -04:00
Mark DePristo 6fa17d86ae Completely hacked together version of a FreeMarker + javadoc + custom doclet walker documentation generator 2011-07-21 00:18:07 -04:00
Mauricio Carneiro 0cac5e9ebe Merged bug fix from Stable into Unstable 2011-07-15 19:38:20 -04:00
Mauricio Carneiro 1e4798d5d0 Added targets to build.xml to re-run only tests that have failed (integration, unit, performance or pipeline tests).
This is very useful and easy. After running any test (for example ant integrationtest) and seeing failures, you can rerun ONLY THE TESTS THAT FAILED by using one of the following commands:

ant failed-integration
ant failed-pipeline
ant failed-test
ant failed-performance

obviously matching whatever tests you were running and got failures on.

This should run only the failed tests, and you can keep using this command until you have fixed everything.

(Thanks to David Roazen for major help with ANT)
2011-07-15 19:34:14 -04:00
Mark DePristo f313e14e4e Now deletes the dump directory on ant clean
Moving diffengine tests from private to public
2011-07-12 08:50:58 -04:00
David Roazen 68e19edf59 Merged bug fix from Stable into Unstable, and resolved merge conflicts.
Conflicts:
	build.xml
	settings/ivysettings.xml
2011-07-08 15:50:31 -04:00
David Roazen a3c9d9c3ff Fixing Contracts for Java, and enabling contracts by default for unit/integration tests.
The NullPointerException we were seeing when trying to run with contracts enabled was being caused
by an outdated version of the asm library.

To run tests without contracts and disable their compilation, pass in "-Duse.contracts=false" to ant.

Also did some minor unrelated cleanup in build.xml
2011-07-08 15:34:39 -04:00
Mark DePristo 8add2a3866 Merge branch 'master' into diffengine 2011-07-08 09:15:54 -04:00
Khalid Shakir 515553c801 Merged bug fix from Stable into Unstable 2011-07-06 11:34:13 -04:00
Khalid Shakir c93d0b37a8 Fixed namespace of the pipeline classes. 2011-07-06 11:32:46 -04:00
Khalid Shakir 7b699f8b17 Switched GridEngine from looking from environment variable to using embedded jar. 2011-07-05 21:59:00 -04:00
Mark A. DePristo 080875d5da Refactored DiffNode/DiffElement/DiffValue class structure. DiffElement is now a pair of Name -> Value, where value is either a DiffValue or its subclass DiffNode. Code cleaned up, more tests added. DiffEngine is now working, with tests. DiffObjectWalker can now take two VCFs and itemize the difference between the two files correctly and concisely. 2011-07-05 16:13:39 -04:00
David Roazen 4b17f34640 Fixes to the packaging system to work with the new directory structure.
Also added a few R scripts to the list of files to include in the resources
directory of the binary distribution, at Ryan's request.
2011-06-30 18:27:17 -04:00
Matt Hanna 9a22d78e48 Fix up gsalib target to work with new public/private directory structure. 2011-06-29 14:48:10 -04:00
David Roazen 7e243fae6e Bug fixes for build.xml related to the public/private restructuring. 2011-06-28 12:55:18 -04:00
David Roazen 139c6b84a1 Modified build.xml and the help extractor doclet to use the output of "git
describe" as an absolute version number (if the repository has at least one
tag), using the raw SHA-1 hash value as a fallback version number in the case
where there are no tags.
2011-06-28 08:37:05 -04:00
David Roazen 3c9497788e Reorganized the codebase beneath top-level public and private directories,
removing the playground and oneoffprojects directories in the process. Updated
build.xml accordingly.
2011-06-28 06:55:19 -04:00
ebanks c2ec2891d1 Other people besides Mark also wanted VariantContext moved to the GATK, so I listened. I am moving VariantContext and all codecs that rely on it (VCF, SoapSNP, HapMap, and CGvar) to the GATK - including relevant unit tests and data files. Additionally, Matt has modified build.xml to generate the necessary jar files so that people can use our VCF codec with Tribble.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@6077 348d0f76-0448-11de-a6fe-93d51630548a
2011-06-24 16:56:04 +00:00
depristo e87c40d89c Fix for CoFoJa exception by upgrading to latest version
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5971 348d0f76-0448-11de-a6fe-93d51630548a
2011-06-09 17:49:15 +00:00
hanna 6c4f2f1b36 Temporarily disable contracts during integrationtest, take 2.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5968 348d0f76-0448-11de-a6fe-93d51630548a
2011-06-09 16:36:31 +00:00
hanna 44b98bed8c Killed sonatype repository; it's failed me too many times at this point.
Temporarily disabled contracts in integrationtests until we can find the cause
of the new error that's cropping up for Ryan.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5967 348d0f76-0448-11de-a6fe-93d51630548a
2011-06-09 16:07:02 +00:00
depristo 311dfa0998 Now builds examples, as I expected. GATKPaperGenotyper lives again.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5953 348d0f76-0448-11de-a6fe-93d51630548a
2011-06-07 00:13:44 +00:00
kshakir 77cae39c8e Step towards tribble precompiled jar, support in build.xml for source with fallback to the checked in jar.
Current tribble-129M.jar in SVN does not work with current version of GATK code.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5897 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-27 21:04:27 +00:00
depristo a02ab4028b Build for tests now includes path to contracts
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5840 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-22 19:44:49 +00:00
depristo 0095aa2627 Contracts for java now enabled by default in GATK build. The contract checking is automatically enabled when running tests and integrationtests. If you want to run the GATK with Contract checking enabled, add -javaagent:lib/cofoja.jar to your jvm args
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5826 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-20 02:53:42 +00:00
depristo 218354e338 Contracts for Java (http://code.google.com/p/cofoja/) infrastructure enabled. No piece of code actually uses this, so it's possible to remove easily. Does not build by default (you must modify build.xml). Really an intermediate commit so I can play around with the system in my java classes and revert safely. Very much looking forward to DVCS
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5815 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-18 18:05:59 +00:00
kshakir ec443e89cf Added pass-throughs for -Djava.io.tmpdir to javac and testng.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5791 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-11 20:56:35 +00:00
hanna c2e8c460cb Factor out all testing dependencies into a separate test configuration and
only download that test configuration when running unit/integration tests.
This means that the build will (hopefully) never break because it can't
fetch a file that isn't required for the GATK to run.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5775 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-05 22:42:11 +00:00
kshakir f7d9f0a1f3 Removing QPipeline directory as there's no one to support it at the moment.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5757 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-04 18:36:02 +00:00
kshakir 08f0509a5c Disabling the queue/pipeline package by default so that scala code can build. If it's not going to be fixed the package should be removed. If it is going to be fixed this patch to build.xml should be reverted.
Also added the old model of indel calling to the FCP.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5749 348d0f76-0448-11de-a6fe-93d51630548a
2011-05-04 12:17:33 +00:00
kshakir 0a58d7aa1a Marked boolean SAMFileWriterATD arguments as flags so scala generator maps them to Boolean instead of Option[Boolean].
Using the VCFWriterATD isCompressed to check if the VCF index will be auto generated.
Tracking BAM and Tribble indexes as @Inputs and @Outputs in generated QFunctions.
Updates to the BamGatherFunction to disable the index during merge when disable_bam_indexing = true.
Made a shortcut for live-running pipelinetest, pipelinetestrun.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5606 348d0f76-0448-11de-a6fe-93d51630548a
2011-04-08 18:44:32 +00:00
droazen cb3e8aec5e Modified the buildfile and help extractor doclet so that help text is only
extracted from source files that have been modified since the help resource
file was last generated. This significantly speeds up builds where only a few 
source files have been modified, at the expense of making clean builds take 
slightly longer. Here's some performance data gathered by testing the old and 
new versions of extracthelp in isolation and averaging across 10 runs:
old extracthelp, 1 modified source file: 20.1 seconds
new extracthelp, 1 modified source file: 7.2 seconds <-- woohoo! :)
old extracthelp, clean build: 17.8 seconds
new extracthelp, clean build: 20.5 seconds


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5590 348d0f76-0448-11de-a6fe-93d51630548a
2011-04-07 18:40:53 +00:00
depristo 11822da578 Stand alone, GATK dependent tool that Reads a list of BAM files and slices all of them into a single merged BAM file containing reads in overlapping chr:start-stop interval. Highly efficient when working with thousands of BAM files. Can merge 1MB of sequence of 1600 4x BAMs in 4g in only 2 hours.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5558 348d0f76-0448-11de-a6fe-93d51630548a
2011-04-02 13:41:29 +00:00
kshakir d5ac822e97 When @Gather annotation is missing (probably due to an unclean build) printing out the full field+class name for debugging purposes.
Custom gatherer prints out the class name in the logs.
Try to retrieve mail domain from /etc/mailname before falling back to the hostname.
Building oneoff jars during ant oneoffs.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5540 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-30 21:43:37 +00:00
depristo 18002abb1f Build.xml contained references to tools now in picard
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5463 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-17 18:29:46 +00:00
kshakir 272fab582f Added another erroronmissingdir="false" for packging external dirs.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5445 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-14 21:26:28 +00:00
kshakir 93de326066 Added a new @PartitionBy for walkers to specify how to cut up their inputs.
Now building all javadoc.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5428 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-12 01:33:08 +00:00
kshakir 2058fc12bc Small bug fixes:
Added a property to allow generating Queue extensions around an external version of the GATK.
Updated argument order in -help.
Restored the ability to use QScript trait imported annotations in constructors.
Removing line feeds from email password files.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5416 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-10 19:54:14 +00:00
kshakir 63e1625cc5 Instead of just looking for $SGE_ROOT specifically hunting for $SGE_ROOT/lib/drmaa.jar to enable early grid engine builds.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5407 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-08 18:27:08 +00:00
kshakir c03341aec1 JobRunner can be specified on the command line. -bsub is currently short form of -jobRunner Lsf706.
Added an empty wrapper for a GridEngine job runner which is only activated when SGE_ROOT is detected.
Refactored a bit more common code into CommandLineJobRunner / JobRunner / FunctionEdge.
Status for analyisNames now includes the number of functions in state.


git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5399 348d0f76-0448-11de-a6fe-93d51630548a
2011-03-07 23:52:48 +00:00
kcibul d9ea7daa73 fixed problem with Matt re: packaging commands from external walker codebases
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5311 348d0f76-0448-11de-a6fe-93d51630548a
2011-02-24 21:11:38 +00:00
depristo 1a5d296737 ReplaceReadGroups. Fixes BAM files without read group info. MissingReadGroup points people to this tool now. Please point users on the forum to this tool now. Will migrate to Picard.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5284 348d0f76-0448-11de-a6fe-93d51630548a
2011-02-21 14:02:41 +00:00
depristo 7323b05dc1 A simple utility for reordering a BAM file based on a new reference sequence. This tool can be used to efficiently correct a lexicographically sorted BAM file
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5280 348d0f76-0448-11de-a6fe-93d51630548a
2011-02-19 23:24:42 +00:00
kshakir 49931b12fb Ignore missing external directory, take two.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5263 348d0f76-0448-11de-a6fe-93d51630548a
2011-02-17 20:00:00 +00:00
kshakir 188c4f67b0 Ignore missing external directory.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@5262 348d0f76-0448-11de-a6fe-93d51630548a
2011-02-17 19:22:21 +00:00