Skip to content

Commit

Permalink
bugfix: the stack shouldn't automatically be set the emitting job has…
Browse files Browse the repository at this point in the history 
… no parent

Also updated the test data to reflect the fixed behaviour of dataflow_output_id.
I've manually checked that LongMult Client/Server and QuadPipe still work
as intended. This fixes ENSCORESW-2616
  • Loading branch information
@muffato
muffato committed Apr 18, 2018
1 parent fd152a5 commit e1ed9a2
Show file tree
Hide file tree
Showing 28 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion modules/Bio/EnsEMBL/Hive/AnalysisJob.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ sub dataflow_output_id {

foreach my $df_target (@$df_targets) {

my $extend_param_stack = $hive_use_param_stack || $df_target->extend_param_stack || !$self->prev_job; # this boolean is df_target-specific
my $extend_param_stack = $hive_use_param_stack || $df_target->extend_param_stack; # this boolean is df_target-specific
my $default_param_hash = $extend_param_stack ? {} : $input_id; # this is what undefs will turn into

my @pre_substituted_output_ids = map { $_ // $default_param_hash } @$filtered_output_ids;
Expand Down
2 changes: 1 addition & 1 deletion t/03.scripts/visualize_jobs/long_mult/long_mult_jobs_02.dot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ digraph test {
ratio="compress"; name = "JobDependencyGraph"; pad = "0"; ranksep = "1.4"; remincross = "true";
job_1__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>1</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_2__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>2</i></td></tr><tr><td>a_multiplier:</td><td> 327358788</td></tr><tr><td>b_multiplier:</td><td> 9650156169</td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_4__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>4</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 2</td></tr></table>>, shape="box3d", style="filled"];
job_5__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>5</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 3</td></tr></table>>, shape="box3d", style="filled"];
job_6__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>6</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 5</td></tr></table>>, shape="box3d", style="filled"];
Expand Down
4 changes: 2 additions & 2 deletions t/03.scripts/visualize_jobs/long_mult/long_mult_jobs_03.dot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ digraph test {
job_12__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>12</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>2</i></td></tr><tr><td>digit:</td><td> 9</td></tr></table>>, shape="box3d", style="filled"];
job_1__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>1</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_2__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>2</i></td></tr><tr><td>a_multiplier:</td><td> 327358788</td></tr><tr><td>b_multiplier:</td><td> 9650156169</td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_4__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>4</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 2</td></tr></table>>, shape="box3d", style="filled"];
job_5__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>5</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 3</td></tr></table>>, shape="box3d", style="filled"];
job_6__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>6</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 5</td></tr></table>>, shape="box3d", style="filled"];
job_7__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>7</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 7</td></tr></table>>, shape="box3d", style="filled"];
job_8__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>8</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 8</td></tr></table>>, shape="box3d", style="filled"];
job_9__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>9</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>2</i></td></tr></table>>, shape="box3d", style="filled"];
job_9__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>9</i></td></tr><tr><td>a_multiplier:</td><td> 327358788</td></tr><tr><td>b_multiplier:</td><td> 9650156169</td></tr></table>>, shape="box3d", style="filled"];
semaphore_1__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td colspan="3"><font color="brown"><b><i>local: 5</i></b></font></td></tr></table>>, margin="0,0", shape="house", style="filled"];
semaphore_2__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td colspan="3"><font color="brown"><b><i>local: 3</i></b></font></td></tr></table>>, margin="0,0", shape="house", style="filled"];
job_10__long_mult -> semaphore_2__long_mult [arrowhead="tee", color="red", style="dashed"];
Expand Down
4 changes: 2 additions & 2 deletions t/03.scripts/visualize_jobs/long_mult/long_mult_jobs_04.dot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ digraph test {
job_12__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>12</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>2</i></td></tr><tr><td>digit:</td><td> 9</td></tr></table>>, shape="box3d", style="filled"];
job_1__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>1</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_2__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>2</i></td></tr><tr><td>a_multiplier:</td><td> 327358788</td></tr><tr><td>b_multiplier:</td><td> 9650156169</td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_4__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>4</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 2</td></tr></table>>, shape="box3d", style="filled"];
job_5__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>5</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 3</td></tr></table>>, shape="box3d", style="filled"];
job_6__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>6</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 5</td></tr></table>>, shape="box3d", style="filled"];
job_7__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>7</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 7</td></tr></table>>, shape="box3d", style="filled"];
job_8__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>8</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 8</td></tr></table>>, shape="box3d", style="filled"];
job_9__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>9</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>2</i></td></tr></table>>, shape="box3d", style="filled"];
job_9__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>9</i></td></tr><tr><td>a_multiplier:</td><td> 327358788</td></tr><tr><td>b_multiplier:</td><td> 9650156169</td></tr></table>>, shape="box3d", style="filled"];
semaphore_1__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td colspan="3"><font color="brown"><b><i>local: 4</i></b></font></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td></td><td><b><u>partial_product</u></b></td><td></td></tr><tr><td port="semaphore_1__long_mult_partial_product_4">{2}</td><td>&nbsp;<b>--&gt;</b>&nbsp;</td><td>&quot;19300312338&quot;</td></tr></table>>, margin="0,0", shape="house", style="filled"];
semaphore_2__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td colspan="3"><font color="brown"><b><i>local: 3</i></b></font></td></tr></table>>, margin="0,0", shape="house", style="filled"];
job_10__long_mult -> semaphore_2__long_mult [arrowhead="tee", color="red", style="dashed"];
Expand Down
4 changes: 2 additions & 2 deletions t/03.scripts/visualize_jobs/long_mult/long_mult_jobs_05.dot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ digraph test {
job_12__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>12</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>2</i></td></tr><tr><td>digit:</td><td> 9</td></tr></table>>, shape="box3d", style="filled"];
job_1__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>1</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_2__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>2</i></td></tr><tr><td>a_multiplier:</td><td> 327358788</td></tr><tr><td>b_multiplier:</td><td> 9650156169</td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr></table>>, shape="box3d", style="filled"];
job_3__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>3</i></td></tr><tr><td>a_multiplier:</td><td> 9650156169</td></tr><tr><td>b_multiplier:</td><td> 327358788</td></tr></table>>, shape="box3d", style="filled"];
job_4__long_mult [fillcolor="DeepSkyBlue", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>4</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 2</td></tr></table>>, shape="box3d", style="filled"];
job_5__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>5</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 3</td></tr></table>>, shape="box3d", style="filled"];
job_6__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>6</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 5</td></tr></table>>, shape="box3d", style="filled"];
job_7__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>7</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 7</td></tr></table>>, shape="box3d", style="filled"];
job_8__long_mult [fillcolor="green", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>8</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>1</i></td></tr><tr><td>digit:</td><td> 8</td></tr></table>>, shape="box3d", style="filled"];
job_9__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>9</i></td></tr><tr><td><u><i>params from:</i></u></td><td><i>2</i></td></tr></table>>, shape="box3d", style="filled"];
job_9__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td><u><i>job_id:</i></u></td><td><i>9</i></td></tr><tr><td>a_multiplier:</td><td> 327358788</td></tr><tr><td>b_multiplier:</td><td> 9650156169</td></tr></table>>, shape="box3d", style="filled"];
semaphore_1__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td colspan="3"><font color="brown"><b><i>local: 4</i></b></font></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td></td><td><b><u>partial_product</u></b></td><td></td></tr><tr><td port="semaphore_1__long_mult_partial_product_4">{2}</td><td>&nbsp;<b>--&gt;</b>&nbsp;</td><td>&quot;19300312338&quot;</td></tr></table>>, margin="0,0", shape="house", style="filled"];
semaphore_2__long_mult [fillcolor="grey", label=<<table border="0" cellborder="0" cellspacing="0" cellpadding="1"><tr><td colspan="3"><font color="brown"><b><i>local: 1</i></b></font></td></tr><tr><td colspan="3">&nbsp;</td></tr><tr><td></td><td><b><u>partial_product</u></b></td><td></td></tr><tr><td port="semaphore_2__long_mult_partial_product_10">{5}</td><td>&nbsp;<b>--&gt;</b>&nbsp;</td><td>&quot;1636793940&quot;</td></tr><tr><td port="semaphore_2__long_mult_partial_product_11">{6}</td><td>&nbsp;<b>--&gt;</b>&nbsp;</td><td>&quot;1964152728&quot;</td></tr></table>>, margin="0,0", shape="house", style="filled"];
job_10__long_mult -> semaphore_2__long_mult [arrowhead="none", color="darkgreen", style="dashed"];
Expand Down

0 comments on commit e1ed9a2

Please sign in to comment.