From cd9ed72904f54c521f1ffa689c84c2ce38ee7ec7 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 13 Jun 2008 00:23:10 +0000
Subject: [PATCH] treat task_dist arbitrary for a job the same as a block
distribution. it should only apply to a job step resource allocation.
---
src/plugins/select/cons_res/dist_tasks.c | 2 +-
src/plugins/select/cons_res/select_cons_res.c | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/plugins/select/cons_res/dist_tasks.c b/src/plugins/select/cons_res/dist_tasks.c
index 1a9dc8492df..7a4fafe861d 100644
--- a/src/plugins/select/cons_res/dist_tasks.c
+++ b/src/plugins/select/cons_res/dist_tasks.c
@@ -437,7 +437,7 @@ extern int cr_dist(struct select_cr_job *job, int cyclic,
job->job_id, host_index, this_cr_node->node_ptr->name,
job->alloc_cpus[job_index]);
for(i=0; !cr_cpu && i<job->num_sockets[job_index];i+=2) {
- info("cons_res: _cr_dist: %u "
+ info("cons_res: _cr_dist: job %u "
"alloc_cores[%d][%d]=%u, [%d][%d]=%u",
job->job_id,
job_index, i, job->alloc_cores[job_index][i],
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index 2afd1034e1e..d4c564c491b 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -2629,6 +2629,7 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
case SLURM_DIST_CYCLIC_BLOCK:
error_code = cr_dist(job, 0, cr_type);
break;
+ case SLURM_DIST_ARBITRARY:
case SLURM_DIST_BLOCK:
case SLURM_DIST_CYCLIC:
case SLURM_DIST_BLOCK_CYCLIC:
@@ -2639,11 +2640,6 @@ static int _job_test(struct job_record *job_ptr, bitstr_t *bitmap,
case SLURM_DIST_PLANE:
error_code = cr_plane_dist(job, mc_ptr->plane_size, cr_type);
break;
- case SLURM_DIST_ARBITRARY:
- error_code = compute_c_b_task_dist(job);
- if (error_code != SLURM_SUCCESS)
- error("Error in compute_c_b_task_dist");
- break;
default:
error("select/cons_res: invalid dist_type");
error_code = SLURM_ERROR;
--
GitLab