From 723decd206ba7d90b03e25f5bb540d2a33875e7b Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 21 Mar 2008 18:17:38 +0000
Subject: [PATCH] svn merge -r13680:13689
https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
---
NEWS | 3 +++
doc/html/quickstart.shtml | 4 ++--
src/slurmd/slurmd/slurmd.c | 19 ++++---------------
src/slurmd/slurmd/slurmd.h | 1 -
4 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/NEWS b/NEWS
index c222129ed0f..e8f07cc9133 100644
--- a/NEWS
+++ b/NEWS
@@ -196,6 +196,9 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 1.2.26
=========================
+ -- Export "slurm_*" symbols in libpmi.
+ -- Correct number of sockets/cores/threads reported by slurmd (from
+ Par Andersson, National Supercomputer Centre, Sweden).
* Changes in SLURM 1.2.25
=========================
diff --git a/doc/html/quickstart.shtml b/doc/html/quickstart.shtml
index b9357f81d1a..77823712aec 100644
--- a/doc/html/quickstart.shtml
+++ b/doc/html/quickstart.shtml
@@ -298,7 +298,7 @@ host and port information at startup. (The system administrator can add
these option to the mpicc and mpif77 commands directly, so the user will not
need to bother). For example:
<pre>
-$ mpicc -L<path_to_slurm_lib> -lpmi ...
+$ mpicc -L<path_to_slurm_lib> -lpmi -lslurm ...
$ srun -n20 a.out
</pre>
<b>NOTES:</b>
@@ -361,7 +361,7 @@ host and port information at startup. (The system administrator can add
these option to the mpicc and mpif77 commands directly, so the user will not
need to bother). <b>Do not use SLURM's MVAPICH plugin for MVAPICH2.</b>
<pre>
-$ mpicc -L<path_to_slurm_lib> -lpmi ...
+$ mpicc -L<path_to_slurm_lib> -lpmi -lslurm ...
$ srun -n16 --mpi=none a.out
</pre>
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index af1881ac2d1..f736d5f0a85 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -573,8 +573,6 @@ _read_config()
conf->cr_type = cf->select_type_param;
- conf->fast_schedule = cf->fast_schedule;
-
path_pubkey = xstrdup(cf->job_credential_public_certificate);
if (!conf->logfile)
@@ -611,17 +609,10 @@ _read_config()
&conf->block_map_size,
&conf->block_map, &conf->block_map_inv);
- if (conf->fast_schedule) {
- conf->cpus = conf->conf_cpus;
- conf->sockets = conf->conf_sockets;
- conf->cores = conf->conf_cores;
- conf->threads = conf->conf_threads;
- } else {
- conf->cpus = conf->actual_cpus;
- conf->sockets = conf->actual_sockets;
- conf->cores = conf->actual_cores;
- conf->threads = conf->actual_threads;
- }
+ conf->cpus = conf->actual_cpus;
+ conf->sockets = conf->actual_sockets;
+ conf->cores = conf->actual_cores;
+ conf->threads = conf->actual_threads;
get_memory(&conf->real_memory_size);
@@ -750,7 +741,6 @@ _print_conf()
debug3("TaskEpilog = `%s'", conf->task_epilog);
debug3("Use CPUSETS = %u", conf->use_cpusets);
debug3("Use PAM = %u", conf->use_pam);
- debug3("Fast Sched = %u", conf->fast_schedule);
slurm_conf_unlock();
}
@@ -792,7 +782,6 @@ _init_conf()
conf->spooldir = xstrdup(DEFAULT_SPOOLDIR);
conf->use_pam = 0;
conf->use_cpusets = 0;
- conf->fast_schedule = 0;
slurm_mutex_init(&conf->config_mutex);
return;
diff --git a/src/slurmd/slurmd/slurmd.h b/src/slurmd/slurmd/slurmd.h
index 14a2e5923ed..69871ab57d8 100644
--- a/src/slurmd/slurmd/slurmd.h
+++ b/src/slurmd/slurmd/slurmd.h
@@ -123,7 +123,6 @@ typedef struct slurmd_config {
uint16_t use_pam;
uint16_t use_cpusets; /* Use cpusets, if available */
uint16_t propagate_prio; /* PropagatePrioProcess flag */
- uint16_t fast_schedule; /* use config from file/slurmctld */
} slurmd_conf_t;
extern slurmd_conf_t * conf;
--
GitLab