zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enabling parallelism in the BaseRecalibrator now that the release is out.

This commit is contained in:
Eric Banks 2012-08-20 21:25:14 -04:00
parent 5b1781fdac
commit 286b658fab
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
protected/java/test/org/broadinstitute/sting/gatk/walkers/bqsr/BQSRIntegrationTest.java
View File

@ -75,11 +75,10 @@ public class BQSRIntegrationTest extends WalkerTest {
Arrays.asList(params.md5)); Arrays.asList(params.md5));
executeTest("testBQSR-"+params.args, spec).getFirst(); executeTest("testBQSR-"+params.args, spec).getFirst();
// TODO -- re-enable once parallelization is fixed in BaseRecalibrator WalkerTestSpec specNT2 = new WalkerTestSpec(
//WalkerTestSpec specNT2 = new WalkerTestSpec( params.getCommandLine() + " -nt 2",
// params.getCommandLine() + " -nt 2", Arrays.asList(params.md5));
// Arrays.asList(params.md5)); executeTest("testBQSR-nt2-"+params.args, specNT2).getFirst();
//executeTest("testBQSR-nt2-"+params.args, specNT2).getFirst();
} }
@Test @Test

4
public/java/src/org/broadinstitute/sting/gatk/walkers/bqsr/BaseRecalibrator.java
View File

@ -136,10 +136,6 @@ public class BaseRecalibrator extends LocusWalker<Long, Long> implements TreeRed
*/ */
public void initialize() { public void initialize() {
// TODO -- remove me after the 2.1 release
if ( getToolkit().getArguments().numberOfThreads > 1 )
throw new UserException("We have temporarily disabled the ability to run BaseRecalibrator multi-threaded for performance reasons. We hope to have this fixed for the next GATK release (2.2) and apologize for the inconvenience.");
// check for unsupported access // check for unsupported access
if (getToolkit().isGATKLite() && !getToolkit().getArguments().disableIndelQuals) if (getToolkit().isGATKLite() && !getToolkit().getArguments().disableIndelQuals)
throw new UserException.NotSupportedInGATKLite("base insertion/deletion recalibration is not supported, please use the --disable_indel_quals argument"); throw new UserException.NotSupportedInGATKLite("base insertion/deletion recalibration is not supported, please use the --disable_indel_quals argument");