Commit 8d8aa6ac authored by Paul Rich's avatar Paul Rich
Browse files

Merge branch 'develop'

parents ebce003e da96b175
= Changes from previous Cobalt Versions =
== Changes to 1.0.15 ==
* Fix for an issue on Cray systems where Cobalt was not properly passing
a job's node list into the ALPS re-reservation. This could cause a mismatch
in the nodes that Cobalt was actually running a job on and what it thought the job
was running on.
== Changes to 1.0.14 ==
* Fix for cluster systems where nodes that weren't numbered could cause
showres/qstat to fail to error out when displaying locations.
......
......@@ -10,7 +10,7 @@ import Cobalt.Components.pg_forker
PGChild = Cobalt.Components.pg_forker.PGChild
PGForker = Cobalt.Components.pg_forker.PGForker
import Cobalt.Util
from Cobalt.Util import init_cobalt_config, get_config_option
from Cobalt.Util import init_cobalt_config, get_config_option, expand_num_list
from cray_messaging import BasilRequest
from cray_messaging import parse_response, ALPSError
......@@ -119,7 +119,7 @@ class ALPSScriptChild (PGChild):
params['batch_id'] = self.pg.jobid
params['width'] = int(self.pg.nodect) * int(DEFAULT_DEPTH)
params['nppn'] = int(DEFAULT_DEPTH) #FIXME fix this. Pass this in from qsub. FIXME
params['node_id_list'] = self.pg.location[0]
params['node_list'] = expand_num_list(self.pg.location[0])
params['depth'] = None
params['npps'] = None
params['nspn'] = None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment