View | Details | Raw Unified | Return to ticket 3879 | Differences between
and this patch

Collapse All | Expand All

(-)src/plugins/select/cons_res/job_test.c (-3 / +3 lines)
Lines 3776-3794 Link Here
3776
3776
3777
	/* load memory allocated array */
3777
	/* load memory allocated array */
3778
	save_mem = details_ptr->pn_min_memory;
3778
	save_mem = details_ptr->pn_min_memory;
3779
	if (save_mem & MEM_PER_CPU) {
3779
	if (save_mem & MEM_PER_CPU && job_ptr->details->whole_node != 1) {
3780
		/* memory is per-cpu */
3780
		/* memory is per-cpu */
3781
		save_mem &= (~MEM_PER_CPU);
3781
		save_mem &= (~MEM_PER_CPU);
3782
		for (i = 0; i < job_res->nhosts; i++) {
3782
		for (i = 0; i < job_res->nhosts; i++) {
3783
			job_res->memory_allocated[i] = job_res->cpus[i] *
3783
			job_res->memory_allocated[i] = job_res->cpus[i] *
3784
						       save_mem;
3784
						       save_mem;
3785
		}
3785
		}
3786
	} else if (save_mem) {
3786
	} else if (save_mem && job_ptr->details->whole_node != 1) {
3787
		/* memory is per-node */
3787
		/* memory is per-node */
3788
		for (i = 0; i < job_res->nhosts; i++) {
3788
		for (i = 0; i < job_res->nhosts; i++) {
3789
			job_res->memory_allocated[i] = save_mem;
3789
			job_res->memory_allocated[i] = save_mem;
3790
		}
3790
		}
3791
	} else {	/* --mem=0, allocate job all memory on node */
3791
	} else {	/* --mem=0 or exclusive, allocate job all memory on node */
3792
		uint64_t avail_mem, lowest_mem = 0;
3792
		uint64_t avail_mem, lowest_mem = 0;
3793
		first = bit_ffs(job_res->node_bitmap);
3793
		first = bit_ffs(job_res->node_bitmap);
3794
		if (first != -1)
3794
		if (first != -1)

Return to ticket 3879