3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/98a10ba60640/ Changeset: 98a10ba60640 Branch: stable User: jmchilton Date: 2013-11-12 17:51:35 Summary: "Fix" GALAXY_SLOTS for SLURM. Your results with slurm may vary and depending how you allocate things you may want to modify this statement. Affected #: 1 file diff -r 00d8ec60fdc02d3918b6896cf4a8d0cee27f350c -r 98a10ba60640eabb7604778a87937aa17e30f73b lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh --- a/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh +++ b/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh @@ -1,6 +1,9 @@ export GALAXY_SLOTS_CONFIGURED="1" -if [ -n "$SLURM_JOB_NUM_NODES" ]; then - GALAXY_SLOTS="$SLURM_JOB_NUM_NODES" +if [ -n "$SLURM_NTASKS" ]; then + # May want to multiply this by ${SLURM_CPUS_PER_TASK:-1}. + # SLURM_NTASKS is total tasks over all nodes so this is + # shouldn't be used for multi-node requests. + GALAXY_SLOTS="$SLURM_NTASKS" elif [ -n "$NSLOTS" ]; then GALAXY_SLOTS="$NSLOTS" elif [ -f "$PBS_NODEFILE" ]; then https://bitbucket.org/galaxy/galaxy-central/commits/4dbb6209fe78/ Changeset: 4dbb6209fe78 User: jmchilton Date: 2013-11-12 17:54:26 Summary: Merge latest stable. Affected #: 1 file diff -r 5e4174bee7de7e29eb6021b2097568a4c8f597b9 -r 4dbb6209fe789752bf0bb587350b024fe8d74e6c lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh --- a/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh +++ b/lib/galaxy/jobs/runners/util/job_script/CLUSTER_SLOTS_STATEMENT.sh @@ -1,6 +1,9 @@ export GALAXY_SLOTS_CONFIGURED="1" -if [ -n "$SLURM_JOB_NUM_NODES" ]; then - GALAXY_SLOTS="$SLURM_JOB_NUM_NODES" +if [ -n "$SLURM_NTASKS" ]; then + # May want to multiply this by ${SLURM_CPUS_PER_TASK:-1}. + # SLURM_NTASKS is total tasks over all nodes so this is + # shouldn't be used for multi-node requests. + GALAXY_SLOTS="$SLURM_NTASKS" elif [ -n "$NSLOTS" ]; then GALAXY_SLOTS="$NSLOTS" elif [ -f "$PBS_NODEFILE" ]; then https://bitbucket.org/galaxy/galaxy-central/commits/b419cadc1283/ Changeset: b419cadc1283 User: jmchilton Date: 2013-11-12 17:55:56 Summary: Automated merge. Affected #: 1 file diff -r 4dbb6209fe789752bf0bb587350b024fe8d74e6c -r b419cadc12831a2071912d40d1d10413801bf64c templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -72,38 +72,40 @@ $('<link href="' + galaxy_config.root + 'static/style/galaxy.frame.masthead.css" rel="stylesheet">').appendTo('head'); ## load galaxy js-modules - require(['galaxy.masthead', 'galaxy.menu', 'galaxy.modal', 'galaxy.frame', 'galaxy.upload'], - function(mod_masthead, mod_menu, mod_modal, mod_frame, mod_upload) - { - ## check if masthead is available - if (Galaxy.masthead) - return; + $(function() { + require(['galaxy.masthead', 'galaxy.menu', 'galaxy.modal', 'galaxy.frame', 'galaxy.upload'], + function(mod_masthead, mod_menu, mod_modal, mod_frame, mod_upload) + { + ## check if masthead is available + if (Galaxy.masthead) + return; - ## get configuration - var masthead_config = ${ h.to_json_string( masthead_config ) }; + ## get configuration + var masthead_config = ${ h.to_json_string( masthead_config ) }; - ## set up the quota meter (And fetch the current user data from trans) - Galaxy.currUser = new User(masthead_config.user.json); + ## set up the quota meter (And fetch the current user data from trans) + Galaxy.currUser = new User(masthead_config.user.json); - ## load global galaxy objects - Galaxy.masthead = new mod_masthead.GalaxyMasthead(masthead_config); - Galaxy.modal = new mod_modal.GalaxyModal(); - Galaxy.frame = new mod_frame.GalaxyFrame(); + ## load global galaxy objects + Galaxy.masthead = new mod_masthead.GalaxyMasthead(masthead_config); + Galaxy.modal = new mod_modal.GalaxyModal(); + Galaxy.frame = new mod_frame.GalaxyFrame(); - ## construct default menu options - Galaxy.menu = new mod_menu.GalaxyMenu({ - masthead: Galaxy.masthead, - config: masthead_config + ## construct default menu options + Galaxy.menu = new mod_menu.GalaxyMenu({ + masthead: Galaxy.masthead, + config: masthead_config + }); + + ## add upload plugin + ##Galaxy.upload = new mod_upload.GalaxyUpload(); + + ## add quota meter to masthead + Galaxy.quotaMeter = new UserQuotaMeter({ + model : Galaxy.currUser, + el : $(Galaxy.masthead.el).find('.quota-meter-container') + }).render(); }); - - ## add upload plugin - ##Galaxy.upload = new mod_upload.GalaxyUpload(); - - ## add quota meter to masthead - Galaxy.quotaMeter = new UserQuotaMeter({ - model : Galaxy.currUser, - el : $(Galaxy.masthead.el).find('.quota-meter-container') - }).render(); }); </script></%def> 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.