Commit Graph

14 Commits (c2ec2891d1e185b4cc0f30e2dfd18991e2837b69)

Author SHA1 Message Date
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
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
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