From 6f6e140c6f14b38b814ce092e6d4b75ef3de1077 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 15 Dec 2008 22:55:32 +0000
Subject: [PATCH] Remove ntasks_per_socket/core and plane_size from
launch_tasks_request_msg
---
slurm/slurm.h.in | 4 ----
src/api/step_launch.c | 4 ----
src/common/slurm_protocol_defs.h | 5 -----
src/common/slurm_protocol_pack.c | 8 --------
src/slurmd/slurmstepd/slurmstepd_job.c | 5 -----
src/slurmd/slurmstepd/slurmstepd_job.h | 3 +--
src/slurmd/slurmstepd/task.c | 1 -
src/srun/srun.c | 3 ---
8 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index f49d3f8da74..d76ced5b75e 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -820,11 +820,7 @@ typedef struct {
uint16_t max_cores;
uint16_t max_threads;
uint16_t cpus_per_task;
- uint16_t ntasks_per_node;
- uint16_t ntasks_per_socket;
- uint16_t ntasks_per_core;
uint16_t task_dist;
- uint16_t plane_size;
bool preserve_env;
char *mpi_plugin_name;
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index e793c9a8421..088e21c4076 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -222,11 +222,7 @@ int slurm_step_launch (slurm_step_ctx_t *ctx,
launch.max_cores = params->max_cores;
launch.max_threads = params->max_threads;
launch.cpus_per_task = params->cpus_per_task;
- launch.ntasks_per_node = params->ntasks_per_node;
- launch.ntasks_per_socket= params->ntasks_per_socket;
- launch.ntasks_per_core = params->ntasks_per_core;
launch.task_dist = params->task_dist;
- launch.plane_size = params->plane_size;
launch.pty = params->pty;
launch.ckpt_path = params->ckpt_path;
launch.acctg_freq = params->acctg_freq;
diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index fe3d6e8977d..71f488ae9a0 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -486,9 +486,6 @@ typedef struct launch_tasks_request_msg {
uint16_t max_cores;
uint16_t max_threads;
uint16_t cpus_per_task;
- uint16_t ntasks_per_node;
- uint16_t ntasks_per_socket;
- uint16_t ntasks_per_core;
char **env;
char **argv;
char *cwd;
@@ -501,8 +498,6 @@ typedef struct launch_tasks_request_msg {
/* Distribution at the lowest level of logical processor (lllp) */
uint16_t task_dist; /* --distribution=, -m dist */
- uint16_t plane_size; /* lllp distribution -> plane_size for
- * when -m plane=<# of lllp per plane> */
uint16_t task_flags;
uint32_t **global_task_ids;
slurm_addr orig_addr; /* where message really came from for io */
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 0e8d55f3d4a..d2d96b24648 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -3279,11 +3279,7 @@ _pack_launch_tasks_request_msg(launch_tasks_request_msg_t * msg, Buf buffer)
pack16(msg->max_cores, buffer);
pack16(msg->max_threads, buffer);
pack16(msg->cpus_per_task, buffer);
- pack16(msg->ntasks_per_node, buffer);
- pack16(msg->ntasks_per_socket, buffer);
- pack16(msg->ntasks_per_core, buffer);
pack16(msg->task_dist, buffer);
- pack16(msg->plane_size, buffer);
slurm_cred_pack(msg->cred, buffer);
for(i=0; i<msg->nnodes; i++) {
@@ -3353,11 +3349,7 @@ _unpack_launch_tasks_request_msg(launch_tasks_request_msg_t **
safe_unpack16(&msg->max_cores, buffer);
safe_unpack16(&msg->max_threads, buffer);
safe_unpack16(&msg->cpus_per_task, buffer);
- safe_unpack16(&msg->ntasks_per_node, buffer);
- safe_unpack16(&msg->ntasks_per_socket, buffer);
- safe_unpack16(&msg->ntasks_per_core, buffer);
safe_unpack16(&msg->task_dist, buffer);
- safe_unpack16(&msg->plane_size, buffer);
if (!(msg->cred = slurm_cred_unpack(buffer)))
goto unpack_error;
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.c b/src/slurmd/slurmstepd/slurmstepd_job.c
index dc8a4359e3c..209da28b176 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.c
+++ b/src/slurmd/slurmstepd/slurmstepd_job.c
@@ -203,7 +203,6 @@ job_create(launch_tasks_request_msg_t *msg)
job->gid = (gid_t) msg->gid;
job->cwd = xstrdup(msg->cwd);
job->task_dist = msg->task_dist;
- job->plane_size = msg->plane_size;
job->cpu_bind_type = msg->cpu_bind_type;
job->cpu_bind = xstrdup(msg->cpu_bind);
@@ -232,8 +231,6 @@ job_create(launch_tasks_request_msg_t *msg)
job->envtp->nodeid = -1;
job->envtp->distribution = 0;
- job->envtp->plane_size = 0;
-
job->envtp->cpu_bind_type = 0;
job->envtp->cpu_bind = NULL;
job->envtp->mem_bind_type = 0;
@@ -356,8 +353,6 @@ job_batch_job_create(batch_job_launch_msg_t *msg)
job->envtp->nodeid = -1;
job->envtp->distribution = 0;
- job->envtp->plane_size = 0;
-
job->envtp->cpu_bind_type = 0;
job->envtp->cpu_bind = NULL;
job->envtp->mem_bind_type = 0;
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.h b/src/slurmd/slurmstepd/slurmstepd_job.h
index d21613a8f99..ccb19ebb264 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.h
+++ b/src/slurmd/slurmstepd/slurmstepd_job.h
@@ -124,8 +124,7 @@ typedef struct slurmd_job {
char **env; /* job environment */
char **argv; /* job argument vector */
char *cwd; /* path to current working directory */
- task_dist_states_t task_dist;/* -m distribution */
- uint32_t plane_size; /* -m plane=plane_size */
+ task_dist_states_t task_dist;/* -m distribution */
char *node_name; /* node name of node running job
* needed for front-end systems */
cpu_bind_type_t cpu_bind_type; /* --cpu_bind= */
diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index cf666b54ea3..21ef5c866a5 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -344,7 +344,6 @@ exec_task(slurmd_job_t *job, int i, int waitfd)
job->envtp->localid = task->id;
job->envtp->task_pid = getpid();
job->envtp->distribution = job->task_dist;
- job->envtp->plane_size = job->plane_size;
job->envtp->cpu_bind = xstrdup(job->cpu_bind);
job->envtp->cpu_bind_type = job->cpu_bind_type;
job->envtp->mem_bind = xstrdup(job->mem_bind);
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 7709ad8daa5..a64137254a6 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -370,9 +370,6 @@ int srun(int ac, char **av)
launch_params.max_cores = opt.max_cores_per_socket;
launch_params.max_threads = opt.max_threads_per_core;
launch_params.cpus_per_task = opt.cpus_per_task;
- launch_params.ntasks_per_node = opt.ntasks_per_node;
- launch_params.ntasks_per_socket = opt.ntasks_per_socket;
- launch_params.ntasks_per_core = opt.ntasks_per_core;
launch_params.task_dist = opt.distribution;
launch_params.ckpt_path = xstrdup(opt.ckpt_path);
launch_params.preserve_env = opt.preserve_env;
--
GitLab