2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7ac5c2aca2b7/
Changeset: 7ac5c2aca2b7
User: jmchilton
Date: 2013-03-24 17:36:16
Summary: For task parallelism if no shared_inputs attribute is defined just assume all variables that are not being split are being shared. I cannot think of a good reason not to do this.
Affected #: 1 file
diff -r f6743b36ce0a54e49acf06d09e03d01584d55514 -r 7ac5c2aca2b7024f6d1444ab46d562bb838fed6d lib/galaxy/jobs/splitters/multi.py
--- a/lib/galaxy/jobs/splitters/multi.py
+++ b/lib/galaxy/jobs/splitters/multi.py
@@ -19,8 +19,10 @@
split_inputs = [x.strip() for x in split_inputs.split(",")]
shared_inputs=parallel_settings.get("shared_inputs")
+ auto_shared_inputs = False
if shared_inputs is None:
shared_inputs = []
+ auto_shared_inputs = True
else:
shared_inputs = [x.strip() for x in shared_inputs.split(",")]
illegal_inputs = [x for x in shared_inputs if x in split_inputs]
@@ -45,6 +47,8 @@
type_to_input_map.setdefault(input.dataset.datatype, []).append(input.name)
elif input.name in shared_inputs:
pass # pass original file name
+ elif auto_shared_inputs:
+ shared_inputs.append(input.name)
else:
log_error = "The input '%s' does not define a method for implementing parallelism" % str(input.name)
log.exception(log_error)
https://bitbucket.org/galaxy/galaxy-central/commits/c7fae25b9fa3/
Changeset: c7fae25b9fa3
User: dannon
Date: 2013-04-04 14:58:16
Summary: Merged in jmchilton/galaxy-central-library-refactoring (pull request #142)
Small Task Splitting Simpliciation
Affected #: 1 file
diff -r b7a05dcaa5211ac29af0d3aa201a526e51eb0bfa -r c7fae25b9fa35533afb15df6a6fdb47d677f8110 lib/galaxy/jobs/splitters/multi.py
--- a/lib/galaxy/jobs/splitters/multi.py
+++ b/lib/galaxy/jobs/splitters/multi.py
@@ -19,8 +19,10 @@
split_inputs = [x.strip() for x in split_inputs.split(",")]
shared_inputs=parallel_settings.get("shared_inputs")
+ auto_shared_inputs = False
if shared_inputs is None:
shared_inputs = []
+ auto_shared_inputs = True
else:
shared_inputs = [x.strip() for x in shared_inputs.split(",")]
illegal_inputs = [x for x in shared_inputs if x in split_inputs]
@@ -45,6 +47,8 @@
type_to_input_map.setdefault(input.dataset.datatype, []).append(input.name)
elif input.name in shared_inputs:
pass # pass original file name
+ elif auto_shared_inputs:
+ shared_inputs.append(input.name)
else:
log_error = "The input '%s' does not define a method for implementing parallelism" % str(input.name)
log.exception(log_error)
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7de5ccb2b253/
Changeset: 7de5ccb2b253
User: dannon
Date: 2013-04-03 23:46:19
Summary: Workflow Editor: Fix for last-remaining-workflow-output-unremovable. Clarify declaration (actually a bug, one was undefined, one was false).
Affected #: 1 file
diff -r dca01d90de51a758859ee0feec69cde38592bb2c -r 7de5ccb2b253d24dc3d9cc5b681ee3662d57d565 static/scripts/galaxy.workflow_editor.canvas.js
--- a/static/scripts/galaxy.workflow_editor.canvas.js
+++ b/static/scripts/galaxy.workflow_editor.canvas.js
@@ -491,7 +491,8 @@
},
rectify_workflow_outputs : function() {
// Find out if we're using workflow_outputs or not.
- var using_workflow_outputs, has_existing_pjas = false;
+ var using_workflow_outputs = false;
+ var has_existing_pjas = false;
$.each( this.nodes, function ( k, node ) {
if (node.workflow_outputs && node.workflow_outputs.length > 0){
using_workflow_outputs = true;
@@ -517,7 +518,7 @@
pjas_to_rem.push(pja_id);
}
});
- if (pjas_to_rem.length > 0 && node == workflow.active_node) {
+ if (pjas_to_rem.length > 0 ) {
$.each(pjas_to_rem, function(i, pja_name){
node_changed = true;
delete node.post_job_actions[pja_name];
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.