diff --git a/NEWS b/NEWS index 74c286026f6d814ca5ba60e9bd8cef2b098db708..ac37493fb9b8d2dbdaa0ccb1c5b7866186369af0 100644 --- a/NEWS +++ b/NEWS @@ -15,7 +15,8 @@ documents those changes that are of interest to users and admins. -- Multi-core support in sinfo, squeue, and scontrol. -- Memory can be treated as a consumable resource. -- New srun options --ntasks-per-[node|socket|core]. - -- patch from HP patch.1.2.0.pre4.061017.crcore_hints + -- Patch from HP patch.1.2.0.pre4.061017.crcore_hints, supports cores as consumable + resource. * Changes in SLURM 1.2.0-pre3 ============================= diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1 index ed9063fb8e63cc3fd08c4ce1f75a1622c6ec56d2..eea7dfd649d1d33f22472a5d86a40e0b3157469b 100644 --- a/doc/man/man1/srun.1 +++ b/doc/man/man1/srun.1 @@ -1080,7 +1080,13 @@ are: .TP \fBSLURM_CPUS_ON_NODE\fR -Count of processors available to the job on this node +Count of processors available to the job on this node. +Note the select/linear plugin allocates entire nodes to +jobs, so the value indicates the total count of CPUs on the node. +The select/cons_res plugin allocates individual processors +to jobs, so this number indicates the number of processors +on this node allocated to the job. + .TP \fBSLURM_JOBID\fR Job id of the executing job diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c index 5d16cd2211f471bdeccd73366c342c5e330f27b5..bb0d1d1a2e0fe09949dce6e09656fb88d2249f64 100644 --- a/src/plugins/select/bluegene/plugin/bluegene.c +++ b/src/plugins/select/bluegene/plugin/bluegene.c @@ -287,7 +287,6 @@ extern void process_nodes(bg_record_t *bg_record) if(!bg_record->bg_block_list) { bg_record->bg_block_list = list_create(destroy_ba_node); - info("got here"); } bg_record->bp_count = 0; @@ -445,7 +444,6 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record) if(fir_record->bg_block_list) { itr = list_iterator_create(fir_record->bg_block_list); while((ba_node = list_next(itr))) { - info("got here 2"); new_ba_node = ba_copy_node(ba_node); list_push(sec_record->bg_block_list, new_ba_node); }