Skip to content

Commit

Permalink
fixes for minimap grid support
Browse files Browse the repository at this point in the history
  • Loading branch information
skoren committed Mar 9, 2017
1 parent 35a6573 commit c29cbb6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/pipelines/canu/Configure.pm
Original file line number Diff line number Diff line change
Expand Up @@ -685,15 +685,15 @@ sub configureAssembler () {
($err, $all) = getAllowedResources("", "meryl", $err, $all);

($err, $all) = getAllowedResources("cor", "mhap", $err, $all) if (getGlobal("corOverlapper") eq "mhap");
($err, $all) = getAllowedResources("cor", "mmap", $err, $all) if (getGlobal("corOverlapper") eq "minihap");
($err, $all) = getAllowedResources("cor", "mmap", $err, $all) if (getGlobal("corOverlapper") eq "minimap");
($err, $all) = getAllowedResources("cor", "ovl", $err, $all) if (getGlobal("corOverlapper") eq "ovl");

($err, $all) = getAllowedResources("obt", "mhap", $err, $all) if (getGlobal("obtOverlapper") eq "mhap");
($err, $all) = getAllowedResources("obt", "mmap", $err, $all) if (getGlobal("obtOverlapper") eq "minihap");
($err, $all) = getAllowedResources("obt", "mmap", $err, $all) if (getGlobal("obtOverlapper") eq "minimap");
($err, $all) = getAllowedResources("obt", "ovl", $err, $all) if (getGlobal("obtOverlapper") eq "ovl");

($err, $all) = getAllowedResources("utg", "mhap", $err, $all) if (getGlobal("utgOverlapper") eq "mhap");
($err, $all) = getAllowedResources("utg", "mmap", $err, $all) if (getGlobal("utgOverlapper") eq "minihap");
($err, $all) = getAllowedResources("utg", "mmap", $err, $all) if (getGlobal("utgOverlapper") eq "minimap");
($err, $all) = getAllowedResources("utg", "ovl", $err, $all) if (getGlobal("utgOverlapper") eq "ovl");

($err, $all) = getAllowedResources("", "cor", $err, $all);
Expand Down
2 changes: 1 addition & 1 deletion src/pipelines/canu/Defaults.pm
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ sub setDefaults () {
$global{"useGrid"} = 1;
$synops{"useGrid"} = "If 'true', enable grid-based execution; if 'false', run all jobs on the local machine; if 'remote', create jobs for grid execution but do not submit; default 'true'";

foreach my $c (qw(BAT CNS COR MERYL CORMHAP CORMMAP COROVL OBTMHAP OBTOVL OEA OVB OVS RED UTGMHAP UTGMMAP UTGOVL)) {
foreach my $c (qw(BAT CNS COR MERYL CORMHAP CORMMAP COROVL OBTMHAP OBTMMAP OBTOVL OEA OVB OVS RED UTGMHAP UTGMMAP UTGOVL)) {
$global{"useGrid$c"} = 1;
$synops{"useGrid$c"} = "If 'true', run module $c under grid control; if 'false' run locally.";
}
Expand Down

0 comments on commit c29cbb6

Please sign in to comment.