diff --git a/NEWS b/NEWS
index 12f0e6c952d456fb13383220bdddd7f6891db848..456c66ce8316ffe0a5eadad6cdcf5573472ebe39 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,11 @@ documents those changes that are of interest to users and admins.
-- Add ReconfigFlags value of KeepPartState. See "man slurm.conf" for details.
-- Modify the task/cgroup plugin adding a task_pre_launch_priv function and
move slurmstepd outside of the step's cgroup. Work by Matthieu Hautreux.
+ -- Intel MIC processor support added using gres/mic plugin. BIG thanks to
+ Olli-Pekka Lehto, CSC-IT Center for Science Ltd.
+ -- Accounting - Change empty jobacctinfo structs to not actually be used
+ instead of putting 0's into the database we put NO_VALS and have sacct
+ figure out jobacct_gather wasn't used.
* Changes in SLURM 2.5.0.pre3
=============================
@@ -109,6 +114,10 @@ documents those changes that are of interest to users and admins.
-- BGQ - Fix for printing realtime server debug correctly.
-- BGQ - Cleaner handling of cnode failures when reported through the runjob
interface instead of through the normal method.
+ -- smap - spread node information across multiple lines for larger systems.
+ -- Cray - Defer salloc until after PrologSlurmctld completes.
+ -- Correction to slurmdbd communications failure handling logic, incorrect
+ error codes returned in some cases.
* Changes in SLURM 2.4.3
========================
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index ed844e80a2fbc785268f25b87c0425590c1b98b0..8c8abc343ec494d83c06cbe1ffbee7750c724389 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -32,6 +32,8 @@ HIGHLIGHTS
nodes.
- Added srun option "--cpu-freq" to enable user control over the job's CPU
frequency and thus it's power consumption.
+- Added priority/multifactor2 plugin supporting ticket based shares.
+- Added gres/mic plugin supporting Intel Many Integrated Core (MIC) processors.
CONFIGURATION FILE CHANGES (see "man slurm.conf" for details)
=============================================================
diff --git a/configure b/configure
index 60adb907cf669543fd26530ab293eb3777513fed..fc87264b671e585d61001050346226095dad85be 100755
--- a/configure
+++ b/configure
@@ -22230,7 +22230,7 @@ fi
-ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/arrayrun/Makefile contribs/cray/Makefile contribs/cray/opt_modulefiles_slurm contribs/lua/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/init.d.slurm etc/init.d.slurmdbd src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sdiag/Makefile src/sprio/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/poe/Makefile src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/launch/Makefile src/plugins/launch/poe/Makefile src/plugins/launch/runjob/Makefile src/plugins/launch/slurm/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/priority/multifactor2/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/select/serial/Makefile src/plugins/switch/Makefile src/plugins/switch/none/Makefile src/plugins/switch/nrt/Makefile src/plugins/switch/nrt/libpermapi/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
+ac_config_files="$ac_config_files Makefile config.xml auxdir/Makefile contribs/Makefile contribs/arrayrun/Makefile contribs/cray/Makefile contribs/cray/opt_modulefiles_slurm contribs/lua/Makefile contribs/pam/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/torque/Makefile contribs/phpext/Makefile contribs/phpext/slurm_php/config.m4 contribs/sjobexit/Makefile contribs/slurmdb-direct/Makefile doc/Makefile doc/man/Makefile doc/man/man1/Makefile doc/man/man3/Makefile doc/man/man5/Makefile doc/man/man8/Makefile doc/html/Makefile doc/html/configurator.html doc/html/configurator.easy.html etc/init.d.slurm etc/init.d.slurmdbd src/Makefile src/api/Makefile src/common/Makefile src/db_api/Makefile src/database/Makefile src/sacct/Makefile src/sacctmgr/Makefile src/sreport/Makefile src/sstat/Makefile src/sshare/Makefile src/salloc/Makefile src/sbatch/Makefile src/sattach/Makefile src/sdiag/Makefile src/sprio/Makefile src/srun/Makefile src/srun/libsrun/Makefile src/srun_cr/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmctld/Makefile src/sbcast/Makefile src/scontrol/Makefile src/scancel/Makefile src/squeue/Makefile src/sinfo/Makefile src/smap/Makefile src/strigger/Makefile src/sview/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/filetxt/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/pgsql/Makefile src/plugins/accounting_storage/none/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/auth/Makefile src/plugins/auth/authd/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/checkpoint/Makefile src/plugins/checkpoint/aix/Makefile src/plugins/checkpoint/blcr/Makefile src/plugins/checkpoint/blcr/cr_checkpoint.sh src/plugins/checkpoint/blcr/cr_restart.sh src/plugins/checkpoint/none/Makefile src/plugins/checkpoint/ompi/Makefile src/plugins/checkpoint/poe/Makefile src/plugins/crypto/Makefile src/plugins/crypto/munge/Makefile src/plugins/crypto/openssl/Makefile src/plugins/gres/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/mic/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobacct_gather/aix/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/none/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/none/Makefile src/plugins/jobcomp/script/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/pgsql/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/cnode/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/launch/Makefile src/plugins/launch/poe/Makefile src/plugins/launch/runjob/Makefile src/plugins/launch/slurm/Makefile src/plugins/preempt/Makefile src/plugins/preempt/none/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/priority/multifactor2/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/aix/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/sgi_job/Makefile src/plugins/proctrack/lua/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/sched/hold/Makefile src/plugins/sched/wiki/Makefile src/plugins/sched/wiki2/Makefile src/plugins/select/Makefile src/plugins/select/bluegene/Makefile src/plugins/select/bluegene/ba/Makefile src/plugins/select/bluegene/ba_bgq/Makefile src/plugins/select/bluegene/bl/Makefile src/plugins/select/bluegene/bl_bgq/Makefile src/plugins/select/bluegene/sfree/Makefile src/plugins/select/cons_res/Makefile src/plugins/select/cray/Makefile src/plugins/select/cray/libalps/Makefile src/plugins/select/cray/libemulate/Makefile src/plugins/select/linear/Makefile src/plugins/select/serial/Makefile src/plugins/switch/Makefile src/plugins/switch/none/Makefile src/plugins/switch/nrt/Makefile src/plugins/switch/nrt/libpermapi/Makefile src/plugins/mpi/Makefile src/plugins/mpi/mpich1_p4/Makefile src/plugins/mpi/mpich1_shmem/Makefile src/plugins/mpi/mpichgm/Makefile src/plugins/mpi/mpichmx/Makefile src/plugins/mpi/mvapich/Makefile src/plugins/mpi/lam/Makefile src/plugins/mpi/none/Makefile src/plugins/mpi/openmpi/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/none/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/node_rank/Makefile src/plugins/topology/none/Makefile src/plugins/topology/tree/Makefile testsuite/Makefile testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/api/Makefile testsuite/slurm_unit/api/manual/Makefile testsuite/slurm_unit/common/Makefile"
cat >confcache <<\_ACEOF
@@ -23594,6 +23594,7 @@ do
"src/plugins/gres/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/gres/Makefile" ;;
"src/plugins/gres/gpu/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/gres/gpu/Makefile" ;;
"src/plugins/gres/nic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/gres/nic/Makefile" ;;
+ "src/plugins/gres/mic/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/gres/mic/Makefile" ;;
"src/plugins/jobacct_gather/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/jobacct_gather/Makefile" ;;
"src/plugins/jobacct_gather/linux/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/jobacct_gather/linux/Makefile" ;;
"src/plugins/jobacct_gather/aix/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/jobacct_gather/aix/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index e9af3642a42ef9800dcf0b33b142e635ab741a73..ef696e0a98bb204c491edf91c39c562652d6d647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,6 +486,7 @@ AC_CONFIG_FILES([Makefile
src/plugins/gres/Makefile
src/plugins/gres/gpu/Makefile
src/plugins/gres/nic/Makefile
+ src/plugins/gres/mic/Makefile
src/plugins/jobacct_gather/Makefile
src/plugins/jobacct_gather/linux/Makefile
src/plugins/jobacct_gather/aix/Makefile
diff --git a/doc/html/gres.shtml b/doc/html/gres.shtml
index e88795421411db65b3d3664499d702dd49da382e..276a2ca781bda504c2ac2105d18d65aada501026 100644
--- a/doc/html/gres.shtml
+++ b/doc/html/gres.shtml
@@ -2,10 +2,9 @@
<h1>Generic Resource (GRES) Scheduling</h1>
-<P>Beginning in SLURM version 2.2 generic resource (Gres) scheduling is
-supported through a flexible plugin mechanism. Support is initially provided
-for Graphics Processing Units (GPUs), although support for any resources is
-possible.</P>
+<P>Generic resource (GRES) scheduling is supported through a flexible plugin
+mechanism. Support is currently provided for Graphics Processing Units (GPUs)
+and Intel® Many Integrated Core (MIC) processors.</P>
<!-------------------------------------------------------------------------->
<h2>Configuration</h2>
@@ -17,10 +16,10 @@ interest are:</P>
<UL>
<LI><B>GresTypes</B> a comma delimited list of generic resources to be
-managed (e.g. <I>GresTypes=gpu,nic</I>). This name may be that of an
+managed (e.g. <I>GresTypes=gpu,mic</I>). This name may be that of an
optional plugin providing additional control over the resources.</LI>
<LI><B>Gres</B> the specific generic resource and their count associated with
-each node (e.g. <I>NodeName=linux[0-999] Gres=gpu:8,nic:2</I>).</LI>
+each node (e.g. <I>NodeName=linux[0-999] Gres=gpu:1,mic:2</I>).</LI>
</UL>
<P>Note that the Gres specification for each node works in the same fashion
@@ -53,7 +52,7 @@ Multiple CPUs may be specified using a comma delimited list or a range may be
specified using a "-" separator (e.g. "0,1,2,3" or "0-3").
If not specified, then any CPU can be used with the resources.
If any CPU can be used with the resources, then do not specify the
-<B>CPUs</B> option for improved speed in the SLURM scheduling logic.
+CPUs option for improved speed in the SLURM scheduling logic.
<LI><B>File</B> Fully qualified pathname of the device files associated with a
resource.
@@ -62,10 +61,10 @@ The name can include a numberic range suffix to be interpretted by SLURM
This field is generally required if enforcement of generic resource
allocations is to be supported (i.e. prevents a users from making
use of resources allocated to a different user).
-If <B>File</B> is specified then <B>Count</B> must be either set to the number
+If File is specified then Count must be either set to the number
of file names specified or not set (the default value is the number of files
specified).
-NOTE: If you specify the <B>File</B> parameter for a resource on some node,
+NOTE: If you specify the File parameter for a resource on some node,
the option must be specified on all nodes and SLURM will track the assignment
of each specific resource on each node. Otherwise SLURM will only track a
count of allocated resources rather than the state of each individual device
@@ -150,7 +149,28 @@ JobStep=1234.2 CUDA_VISIBLE_DEVICES=3
<P>NOTE: Be sure to specify the <I>File</I> parameters in the <I>gres.conf</I>
file and insure they are in the increasing numeric order.</P>
<!-------------------------------------------------------------------------->
+<h2>MIC Management</h2>
+
+<P>SLURM can be used to provide resource management for systems with the
+Intel® Many Integrated Core (MIC) processor.
+SLURM sets an OFFLOAD_DEVICES environment variable, which controls the
+selection of MICs available to a job step.
+The OFFLOAD_DEVICES environment variable is used by both Intel
+LEO (Language Extensioins for Offload) and the MKL (Math Kernel Library)
+automatic offload.
+(This is very similar to how the CUDA_VISIBLE_DEVICES environment variable is
+used to control which GPUs can be used by CUDA™ software.)
+If no MICs are reserved via GRES, the OFFLOAD_DEVICES variable is set to
+-1. This causes the code to ignore the offload directives and run MKL
+routines on the CPU. The code will still run but only on the CPU. This
+also gives a somewhat cryptic warning:</P>
+<pre>offload warning: OFFLOAD_DEVICES device number -1 does not correspond
+to a physical device</pre>
+<P>The offloading is automatically scaled to all the devices, (e.g. if
+--gres=mic:2 is defined) then all offloads use two MICs unless
+explicitly defined in the offload pragmas.</P>
+<!-------------------------------------------------------------------------->
-<p style="text-align: center;">Last modified 2 July 2012</p>
+<p style="text-align: center;">Last modified 25 October 2012</p>
</body></html>
diff --git a/doc/html/news.shtml b/doc/html/news.shtml
index d00a3f292ced31acabad3bff2a914ef15bdb300a..57bd72dd00630860dc336712037417068cd9abfb 100644
--- a/doc/html/news.shtml
+++ b/doc/html/news.shtml
@@ -15,6 +15,7 @@
<p>SLURM Version 2.5 was release in November 2012.
Major enhancements include:
<ul>
+<li>Support for Intel® Many Integrated Core (MIC) processors.</li>
<li>User control over CPU frequency of each job step.</li>
<li>Recording power usage information for each job.</li>
<li>Advanced reservation of cores rather than whole nodes.</li>
@@ -84,6 +85,6 @@ trojan library, then that library will be used by the SLURM daemon with
unpredictable results. This was fixed in SLURM version 2.1.14.</li>
</ul>
-<p style="text-align:center;">Last modified 2 October 2012</p>
+<p style="text-align:center;">Last modified 5 October 2012</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 54e4da24a486bfed2065e165fecf13a693f69456..2f3c93817c68e8e110cc7794640814223b0eda48 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -69,6 +69,7 @@ organizations. Lead SLURM developers are:
<li>Sam Lang</li>
<li>Puenlap Lee (Bull)</li>
<li>Dennis Leepow</li>
+<li>Olli-Pekka Lehto (CSC-IT Center for Science Ltd., Finland)</li>
<li>Bernard Li (Genome Sciences Centre, Canada)</li>
<li>Eric Lin (Bull)</li>
<li>Donald Lipari (Lawrence Livermore National Laboratory)</li>
@@ -121,6 +122,6 @@ organizations. Lead SLURM developers are:
<!-- INDIVIDUALS, PLEASE KEEP IN ALPHABETICAL ORDER -->
</ul>
-<p style="text-align:center;">Last modified 24 September 2012</p>
+<p style="text-align:center;">Last modified 25 October 2012</p>
<!--#include virtual="footer.txt"-->
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index cc704cbbc227d5c3f1eb8cc30ff7bbc26192439e..1ebd7ef1eb88bbc9441de4e3090cf30c05be9efe 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -1,4 +1,4 @@
-.TH "salloc" "1" "SLURM 2.5" "June 2012" "SLURM Commands"
+.TH "salloc" "1" "SLURM 2.5" "October 2012" "SLURM Commands"
.SH "NAME"
salloc \- Obtain a SLURM job allocation (a set of nodes), execute a command,
@@ -1121,13 +1121,13 @@ each dimension (i.e. M,T,T,T will give you a torus connection is all
dimensions expect the first).
.TP
-\fB\-g\fR, \fB\-\-geometry\fR=<\fIXxYxZ\fR>
-Specify the geometry requirements for the job. The three numbers
-represent the required geometry giving dimensions in the X, Y and
-Z directions. For example "\-\-geometry=2x3x4", specifies a block
-of nodes having 2 x 3 x 4 = 24 nodes (actually midplanes on
-Blue Gene). On a BGQ system the dimensions are AxXxYxZ, and can not
-be used to allocation sub-blocks.
+\fB\-g\fR, \fB\-\-geometry\fR=<\fIXxYxZ\fR> | <\fIAxXxYxZ\fR>
+Specify the geometry requirements for the job. On BlueGene/L and BlueGene/P
+systems there are three numbers giving dimensions in the X, Y and Z directions,
+while on BlueGene/Q systems there are four numbers giving dimensions in the
+A, X, Y and Z directions and can not be used to allocate sub-blocks.
+For example "\-\-geometry=1x2x3x4", specifies a block of nodes having
+1 x 2 x 3 x 4 = 24 nodes (actually midplanes on BlueGene).
.TP
\fB\-\-ioload\-image\fR=<\fIpath\fR>
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 025ad3e369488d6782788884a82615821d6ea59d..e1c0e869afd6a8e2af7c9b9fcd35a66c51e7760c 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -1,4 +1,4 @@
-.TH "sbatch" "1" "SLURM 2.5" "June 2012" "SLURM Commands"
+.TH "sbatch" "1" "SLURM 2.5" "October 2012" "SLURM Commands"
.SH "NAME"
sbatch \- Submit a batch script to SLURM.
@@ -1247,13 +1247,13 @@ each dimension (i.e. M,T,T,T will give you a torus connection is all
dimensions expect the first).
.TP
-\fB\-g\fR, \fB\-\-geometry\fR=<\fIXxYxZ\fR>
-Specify the geometry requirements for the job. The three numbers
-represent the required geometry giving dimensions in the X, Y and
-Z directions. For example "\-\-geometry=2x3x4", specifies a block
-of nodes having 2 x 3 x 4 = 24 nodes (actually midplanes on
-Blue Gene). On a BGQ system the dimensions are AxXxYxZ, and can not
-be used to allocation sub-blocks.
+\fB\-g\fR, \fB\-\-geometry\fR=<\fIXxYxZ\fR> | <\fIAxXxYxZ\fR>
+Specify the geometry requirements for the job. On BlueGene/L and BlueGene/P
+systems there are three numbers giving dimensions in the X, Y and Z directions,
+while on BlueGene/Q systems there are four numbers giving dimensions in the
+A, X, Y and Z directions and can not be used to allocate sub-blocks.
+For example "\-\-geometry=1x2x3x4", specifies a block of nodes having
+1 x 2 x 3 x 4 = 24 nodes (actually midplanes on BlueGene).
.TP
\fB\-\-ioload\-image\fR=<\fIpath\fR>
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index ea5dac57e14ced7f75920401f626a80728731fcc..4a9f6efa1a9e6dc5bed3bcc904ad354723e46833 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -1,4 +1,4 @@
-.TH "srun" "1" "SLURM 2.5" "July 2012" "SLURM Commands"
+.TH "srun" "1" "SLURM 2.5" "October 2012" "SLURM Commands"
.SH "NAME"
srun \- Run parallel jobs
@@ -1448,13 +1448,13 @@ each dimension (i.e. M,T,T,T will give you a torus connection is all
dimensions expect the first).
.TP
-\fB\-g\fR, \fB\-\-geometry\fR=<\fIXxYxZ\fR>
-Specify the geometry requirements for the job. The three numbers
-represent the required geometry giving dimensions in the X, Y and
-Z directions. For example "\-\-geometry=2x3x4", specifies a block
-of nodes having 2 x 3 x 4 = 24 nodes (actually midplanes on
-Blue Gene). On a BGQ system the dimensions are AxXxYxZ, and can not
-be used to allocation sub-blocks.
+\fB\-g\fR, \fB\-\-geometry\fR=<\fIXxYxZ\fR> | <\fIAxXxYxZ\fR>
+Specify the geometry requirements for the job. On BlueGene/L and BlueGene/P
+systems there are three numbers giving dimensions in the X, Y and Z directions,
+while on BlueGene/Q systems there are four numbers giving dimensions in the
+A, X, Y and Z directions and can not be used to allocate sub-blocks.
+For example "\-\-geometry=1x2x3x4", specifies a block of nodes having
+1 x 2 x 3 x 4 = 24 nodes (actually midplanes on BlueGene).
.TP
\fB\-\-ioload\-image\fR=<\fIpath\fR>
diff --git a/doc/man/man5/gres.conf.5 b/doc/man/man5/gres.conf.5
index 09413dc52c4ea81e7c942861690515ff32f17e96..023cdf93ef8325fb269e5f70ec7fa5f3b5c68731 100644
--- a/doc/man/man5/gres.conf.5
+++ b/doc/man/man5/gres.conf.5
@@ -73,6 +73,9 @@ Graphics Processing Unit
.TP
\fBnic\fR
Network Interface Card
+.TP
+\fBmic\fR
+Intel Many Integrated Core (MIC) processor
.RE
diff --git a/src/common/slurm_jobacct_gather.c b/src/common/slurm_jobacct_gather.c
index 029a767215d2606e6bcf0080d793eebe8380bbb7..d5b1c4ef405e14c44bebbe0dcc68f5c056eb7bb5 100644
--- a/src/common/slurm_jobacct_gather.c
+++ b/src/common/slurm_jobacct_gather.c
@@ -106,6 +106,7 @@ static pthread_mutex_t task_list_lock = PTHREAD_MUTEX_INITIALIZER;
static bool jobacct_shutdown = true;
static bool jobacct_suspended = 0;
+static bool plugin_polling = true;
static uint32_t jobacct_job_id = 0;
static uint32_t jobacct_step_id = 0;
@@ -147,8 +148,8 @@ static void _pack_jobacct_id(jobacct_id_t *jobacct_id,
pack32((uint32_t) jobacct_id->nodeid, buffer);
pack16((uint16_t) jobacct_id->taskid, buffer);
} else {
- pack32((uint32_t) 0, buffer);
- pack16((uint16_t) 0, buffer);
+ pack32((uint32_t) NO_VAL, buffer);
+ pack16((uint16_t) NO_VAL, buffer);
}
}
@@ -226,8 +227,10 @@ extern int jobacct_gather_init(void)
goto done;
}
- if (!strcasecmp(type, "jobacct_gather/none"))
+ if (!strcasecmp(type, "jobacct_gather/none")) {
+ plugin_polling = false;
goto done;
+ }
plugin_type = type;
type = slurm_get_proctrack_type();
@@ -277,6 +280,9 @@ extern int jobacct_gather_startpoll(uint16_t frequency)
pthread_attr_t attr;
pthread_t _watch_tasks_thread_id;
+ if (!plugin_polling)
+ return SLURM_SUCCESS;
+
if (jobacct_gather_init() < 0)
return SLURM_ERROR;
@@ -291,7 +297,7 @@ extern int jobacct_gather_startpoll(uint16_t frequency)
task_list = list_create(jobacctinfo_destroy);
if (frequency == 0) { /* don't want dynamic monitoring? */
- debug2("jobacct AIX dynamic logging disabled");
+ debug2("jobacct_gather dynamic logging disabled");
return retval;
}
@@ -302,11 +308,11 @@ extern int jobacct_gather_startpoll(uint16_t frequency)
if (pthread_create(&_watch_tasks_thread_id, &attr,
&_watch_tasks, NULL)) {
- debug("jobacct-gather failed to create _watch_tasks "
+ debug("jobacct_gather failed to create _watch_tasks "
"thread: %m");
frequency = 0;
} else
- debug3("jobacct-gather AIX dynamic logging enabled");
+ debug3("jobacct_gather dynamic logging enabled");
slurm_attr_destroy(&attr);
return retval;
@@ -336,7 +342,7 @@ extern void jobacct_gather_change_poll(uint16_t frequency)
if (jobacct_gather_init() < 0)
return;
- if (freq == 0 && frequency != 0) {
+ if (plugin_polling && freq == 0 && frequency != 0) {
pthread_attr_t attr;
pthread_t _watch_tasks_thread_id;
/* create polling thread */
@@ -381,6 +387,9 @@ extern int jobacct_gather_add_task(pid_t pid, jobacct_id_t *jobacct_id)
if (jobacct_gather_init() < 0)
return SLURM_ERROR;
+ if (!plugin_polling)
+ return SLURM_SUCCESS;
+
if (jobacct_shutdown)
return SLURM_ERROR;
@@ -413,7 +422,7 @@ error:
extern jobacctinfo_t *jobacct_gather_stat_task(pid_t pid)
{
- if (jobacct_shutdown)
+ if (!plugin_polling || jobacct_shutdown)
return NULL;
else if (pid) {
struct jobacctinfo *jobacct = NULL;
@@ -460,7 +469,7 @@ extern jobacctinfo_t *jobacct_gather_remove_task(pid_t pid)
struct jobacctinfo *jobacct = NULL;
ListIterator itr = NULL;
- if (jobacct_shutdown)
+ if (!plugin_polling || jobacct_shutdown)
return NULL;
slurm_mutex_lock(&task_list_lock);
@@ -490,7 +499,7 @@ error:
extern int jobacct_gather_set_proctrack_container_id(uint64_t id)
{
- if (pgid_plugin)
+ if (!plugin_polling || pgid_plugin)
return SLURM_SUCCESS;
if (cont_id != (uint64_t)NO_VAL)
@@ -511,6 +520,9 @@ extern int jobacct_gather_set_proctrack_container_id(uint64_t id)
extern int jobacct_gather_set_mem_limit(uint32_t job_id, uint32_t step_id,
uint32_t mem_limit)
{
+ if (!plugin_polling)
+ return SLURM_SUCCESS;
+
if ((job_id == 0) || (mem_limit == 0)) {
error("jobacct_gather_set_mem_limit: jobid:%u mem_limit:%u",
job_id, mem_limit);
@@ -528,6 +540,9 @@ extern int jobacct_gather_set_mem_limit(uint32_t job_id, uint32_t step_id,
extern void jobacct_gather_handle_mem_limit(
uint32_t total_job_mem, uint32_t total_job_vsize)
{
+ if (!plugin_polling)
+ return;
+
if (jobacct_mem_limit) {
if (jobacct_step_id == NO_VAL) {
debug("Job %u memory used:%u limit:%u KB",
@@ -568,7 +583,12 @@ extern void jobacct_gather_handle_mem_limit(
extern jobacctinfo_t *jobacctinfo_create(jobacct_id_t *jobacct_id)
{
- struct jobacctinfo *jobacct = xmalloc(sizeof(struct jobacctinfo));
+ struct jobacctinfo *jobacct;
+
+ if (!plugin_polling)
+ return NULL;
+
+ jobacct = xmalloc(sizeof(struct jobacctinfo));
if (!jobacct_id) {
jobacct_id_t temp_id;
@@ -614,6 +634,9 @@ extern int jobacctinfo_setinfo(jobacctinfo_t *jobacct,
jobacct_id_t *jobacct_id = (jobacct_id_t *) data;
struct jobacctinfo *send = (struct jobacctinfo *) data;
+ if (!plugin_polling)
+ return SLURM_SUCCESS;
+
switch (type) {
case JOBACCT_DATA_TOTAL:
memcpy(jobacct, send, sizeof(struct jobacctinfo));
@@ -682,6 +705,9 @@ extern int jobacctinfo_getinfo(
struct rusage *rusage = (struct rusage *)data;
struct jobacctinfo *send = (struct jobacctinfo *) data;
+ if (!plugin_polling)
+ return SLURM_SUCCESS;
+
switch (type) {
case JOBACCT_DATA_TOTAL:
memcpy(send, jobacct, sizeof(struct jobacctinfo));
@@ -746,6 +772,9 @@ extern void jobacctinfo_pack(jobacctinfo_t *jobacct,
{
int i = 0;
+ if (!plugin_polling && (protocol_type != PROTOCOL_TYPE_DBD))
+ return;
+
/* The function can take calls from both DBD and from regular
* SLURM functions. We choose to standardize on using the
* SLURM_PROTOCOL_VERSION here so if PROTOCOL_TYPE_DBD comes
@@ -759,9 +788,10 @@ extern void jobacctinfo_pack(jobacctinfo_t *jobacct,
if (protocol_type == PROTOCOL_TYPE_DBD)
rpc_version = slurmdbd_translate_rpc(rpc_version);
- if (!jobacct) {
+ /* pack an empty record */
+ if (!jobacct || (jobacct->min_cpu == NO_VAL)) {
for (i = 0; i < 12; i++)
- pack32((uint32_t) 0, buffer);
+ pack32((uint32_t)NO_VAL, buffer);
for (i = 0; i < 4; i++)
_pack_jobacct_id(NULL, rpc_version, buffer);
return;
@@ -792,6 +822,9 @@ extern int jobacctinfo_unpack(jobacctinfo_t **jobacct,
{
uint32_t uint32_tmp;
+ if (!plugin_polling && (protocol_type != PROTOCOL_TYPE_DBD))
+ return SLURM_SUCCESS;
+
/* The function can take calls from both DBD and from regular
* SLURM functions. We choose to standardize on using the
* SLURM_PROTOCOL_VERSION here so if PROTOCOL_TYPE_DBD comes
@@ -847,9 +880,12 @@ unpack_error:
extern void jobacctinfo_aggregate(jobacctinfo_t *dest, jobacctinfo_t *from)
{
+ if (!plugin_polling)
+ return;
+
xassert(dest);
- if (!from)
+ if (!from || (from->min_cpu == (uint32_t)NO_VAL))
return;
if (dest->max_vsize < from->max_vsize) {
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_job.c b/src/plugins/accounting_storage/mysql/as_mysql_job.c
index 43256e35b681a9a1f877168a9199390c102114ef..7255a36d56b81d0bb3cb5328443e3cfb6f029ae1 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_job.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_job.c
@@ -931,8 +931,8 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
int cpus = 0;
struct jobacctinfo *jobacct = (struct jobacctinfo *)step_ptr->jobacct;
struct jobacctinfo dummy_jobacct;
- double ave_vsize = 0, ave_rss = 0, ave_pages = 0;
- double ave_cpu = 0, ave_cpu2 = 0;
+ double ave_vsize = NO_VAL, ave_rss = NO_VAL, ave_pages = NO_VAL;
+ double ave_cpu = (double)NO_VAL;
char *query = NULL;
int rc =SLURM_SUCCESS;
uint32_t exit_code = 0;
@@ -991,7 +991,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
}
/* figure out the ave of the totals sent */
- if (cpus > 0) {
+ if ((jobacct->min_cpu != NO_VAL) && cpus > 0) {
ave_vsize = (double)jobacct->tot_vsize;
ave_vsize /= (double)cpus;
ave_rss = (double)jobacct->tot_rss;
@@ -1002,10 +1002,6 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
ave_cpu /= (double)cpus;
}
- if (jobacct->min_cpu != NO_VAL) {
- ave_cpu2 = (double)jobacct->min_cpu;
- }
-
if (!step_ptr->job_ptr->db_index) {
if (!(step_ptr->job_ptr->db_index =
_get_db_index(mysql_conn,
@@ -1037,7 +1033,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
"max_rss_node=%u, ave_rss=%f, "
"max_pages=%u, max_pages_task=%u, "
"max_pages_node=%u, ave_pages=%f, "
- "min_cpu=%f, min_cpu_task=%u, "
+ "min_cpu=%u, min_cpu_task=%u, "
"min_cpu_node=%u, ave_cpu=%f "
"where job_db_inx=%d and id_step=%d",
mysql_conn->cluster_name, step_table, (int)now,
@@ -1064,7 +1060,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
jobacct->max_pages_id.taskid, /* max pages task */
jobacct->max_pages_id.nodeid, /* max pages node */
ave_pages, /* ave pages */
- ave_cpu2, /* min cpu */
+ jobacct->min_cpu, /* min cpu */
jobacct->min_cpu_id.taskid, /* min cpu task */
jobacct->min_cpu_id.nodeid, /* min cpu node */
ave_cpu, /* ave cpu */
diff --git a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
index 1de13dc4fa1086594df62fe7bc1ae61027ec1e5d..bfa529b3aa1030eb8ec94380275169b7baf5bd0a 100644
--- a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
+++ b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
@@ -1297,7 +1297,7 @@ extern int acct_storage_p_remove_reservation(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if ((rc == SLURM_SUCCESS) && (resp_code != SLURM_SUCCESS))
rc = resp_code;
return rc;
diff --git a/src/plugins/gres/Makefile.am b/src/plugins/gres/Makefile.am
index 5692af2d9a4d369d0d4b0f4f4dc43bec35ebffe5..77ccf5ee3375091aab235c91034fc84c385f5dff 100644
--- a/src/plugins/gres/Makefile.am
+++ b/src/plugins/gres/Makefile.am
@@ -1,3 +1,3 @@
# Makefile for gres plugins
-SUBDIRS = gpu nic
+SUBDIRS = gpu nic mic
diff --git a/src/plugins/gres/Makefile.in b/src/plugins/gres/Makefile.in
index 2b628e40c9cc97702c49323a967ece3aeccd4a92..25a094398e53c43d3e998510d90f935277d2a912 100644
--- a/src/plugins/gres/Makefile.in
+++ b/src/plugins/gres/Makefile.in
@@ -327,7 +327,7 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = gpu nic
+SUBDIRS = gpu nic mic
all: all-recursive
.SUFFIXES:
diff --git a/src/plugins/gres/gpu/gres_gpu.c b/src/plugins/gres/gpu/gres_gpu.c
index ef7aeef2d005c508d45d117fc0963e60d2e7eb90..d05641ff8350b32db9183328d824e78a91348785 100644
--- a/src/plugins/gres/gpu/gres_gpu.c
+++ b/src/plugins/gres/gpu/gres_gpu.c
@@ -130,8 +130,6 @@ extern int node_config_load(List gres_conf_list)
iter = list_iterator_create(gres_conf_list);
if (iter == NULL)
fatal("list_iterator_create: malloc failure");
-
- iter = list_iterator_create(gres_conf_list);
while ((gres_slurmd_conf = list_next(iter))) {
if (strcmp(gres_slurmd_conf->name, gres_name))
continue;
@@ -153,6 +151,8 @@ extern int node_config_load(List gres_conf_list)
}
iter = list_iterator_create(gres_conf_list);
+ if (iter == NULL)
+ fatal("list_iterator_create: malloc failure");
while ((gres_slurmd_conf = list_next(iter))) {
if ((strcmp(gres_slurmd_conf->name, gres_name) == 0) &&
gres_slurmd_conf->file) {
diff --git a/src/plugins/gres/mic/Makefile.am b/src/plugins/gres/mic/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..3c145cf6afe128d5953accbbfe909afc26c0133c
--- /dev/null
+++ b/src/plugins/gres/mic/Makefile.am
@@ -0,0 +1,14 @@
+# Makefile for gres/mic plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS)
+
+pkglib_LTLIBRARIES = gres_mic.la
+
+# Gres MIC plugin.
+gres_mic_la_SOURCES = gres_mic.c
+gres_mic_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(HWLOC_LDFLAGS)
+gres_mic_la_LIBADD = $(HWLOC_LIBS)
diff --git a/src/plugins/gres/mic/Makefile.in b/src/plugins/gres/mic/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..db305b7b4fea21a232f4e5dfe6c4ca8558653a0b
--- /dev/null
+++ b/src/plugins/gres/mic/Makefile.in
@@ -0,0 +1,663 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Makefile for gres/mic plugin
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/plugins/gres/mic
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/auxdir/acx_pthread.m4 \
+ $(top_srcdir)/auxdir/libtool.m4 \
+ $(top_srcdir)/auxdir/ltoptions.m4 \
+ $(top_srcdir)/auxdir/ltsugar.m4 \
+ $(top_srcdir)/auxdir/ltversion.m4 \
+ $(top_srcdir)/auxdir/lt~obsolete.m4 \
+ $(top_srcdir)/auxdir/slurm.m4 \
+ $(top_srcdir)/auxdir/x_ac__system_configuration.m4 \
+ $(top_srcdir)/auxdir/x_ac_affinity.m4 \
+ $(top_srcdir)/auxdir/x_ac_aix.m4 \
+ $(top_srcdir)/auxdir/x_ac_blcr.m4 \
+ $(top_srcdir)/auxdir/x_ac_bluegene.m4 \
+ $(top_srcdir)/auxdir/x_ac_cflags.m4 \
+ $(top_srcdir)/auxdir/x_ac_cray.m4 \
+ $(top_srcdir)/auxdir/x_ac_databases.m4 \
+ $(top_srcdir)/auxdir/x_ac_debug.m4 \
+ $(top_srcdir)/auxdir/x_ac_dlfcn.m4 \
+ $(top_srcdir)/auxdir/x_ac_env.m4 \
+ $(top_srcdir)/auxdir/x_ac_gpl_licensed.m4 \
+ $(top_srcdir)/auxdir/x_ac_hwloc.m4 \
+ $(top_srcdir)/auxdir/x_ac_iso.m4 \
+ $(top_srcdir)/auxdir/x_ac_lua.m4 \
+ $(top_srcdir)/auxdir/x_ac_man2html.m4 \
+ $(top_srcdir)/auxdir/x_ac_munge.m4 \
+ $(top_srcdir)/auxdir/x_ac_ncurses.m4 \
+ $(top_srcdir)/auxdir/x_ac_nrt.m4 \
+ $(top_srcdir)/auxdir/x_ac_pam.m4 \
+ $(top_srcdir)/auxdir/x_ac_printf_null.m4 \
+ $(top_srcdir)/auxdir/x_ac_ptrace.m4 \
+ $(top_srcdir)/auxdir/x_ac_readline.m4 \
+ $(top_srcdir)/auxdir/x_ac_setpgrp.m4 \
+ $(top_srcdir)/auxdir/x_ac_setproctitle.m4 \
+ $(top_srcdir)/auxdir/x_ac_sgi_job.m4 \
+ $(top_srcdir)/auxdir/x_ac_slurm_ssl.m4 \
+ $(top_srcdir)/auxdir/x_ac_srun.m4 \
+ $(top_srcdir)/auxdir/x_ac_sun_const.m4 \
+ $(top_srcdir)/auxdir/x_ac_xcpu.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/slurm/slurm.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+gres_mic_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_gres_mic_la_OBJECTS = gres_mic.lo
+gres_mic_la_OBJECTS = $(am_gres_mic_la_OBJECTS)
+gres_mic_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(gres_mic_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
+depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(gres_mic_la_SOURCES)
+DIST_SOURCES = $(gres_mic_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTHD_CFLAGS = @AUTHD_CFLAGS@
+AUTHD_LIBS = @AUTHD_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BGL_LOADED = @BGL_LOADED@
+BGQ_LOADED = @BGQ_LOADED@
+BG_INCLUDES = @BG_INCLUDES@
+BG_LDFLAGS = @BG_LDFLAGS@
+BG_L_P_LOADED = @BG_L_P_LOADED@
+BLCR_CPPFLAGS = @BLCR_CPPFLAGS@
+BLCR_HOME = @BLCR_HOME@
+BLCR_LDFLAGS = @BLCR_LDFLAGS@
+BLCR_LIBS = @BLCR_LIBS@
+BLUEGENE_LOADED = @BLUEGENE_LOADED@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CMD_LDFLAGS = @CMD_LDFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+HAVEMYSQLCONFIG = @HAVEMYSQLCONFIG@
+HAVEPGCONFIG = @HAVEPGCONFIG@
+HAVE_AIX = @HAVE_AIX@
+HAVE_MAN2HTML = @HAVE_MAN2HTML@
+HAVE_NRT = @HAVE_NRT@
+HAVE_OPENSSL = @HAVE_OPENSSL@
+HAVE_SOME_CURSES = @HAVE_SOME_CURSES@
+HWLOC_CPPFLAGS = @HWLOC_CPPFLAGS@
+HWLOC_LDFLAGS = @HWLOC_LDFLAGS@
+HWLOC_LIBS = @HWLOC_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_LDFLAGS = @LIB_LDFLAGS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MUNGE_CPPFLAGS = @MUNGE_CPPFLAGS@
+MUNGE_DIR = @MUNGE_DIR@
+MUNGE_LDFLAGS = @MUNGE_LDFLAGS@
+MUNGE_LIBS = @MUNGE_LIBS@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_LIBS = @MYSQL_LIBS@
+NCURSES = @NCURSES@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NRT_CPPFLAGS = @NRT_CPPFLAGS@
+NRT_LDFLAGS = @NRT_LDFLAGS@
+NUMA_LIBS = @NUMA_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PAM_DIR = @PAM_DIR@
+PAM_LIBS = @PAM_LIBS@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PROCTRACKDIR = @PROCTRACKDIR@
+PROJECT = @PROJECT@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
+REAL_BGQ_LOADED = @REAL_BGQ_LOADED@
+REAL_BG_L_P_LOADED = @REAL_BG_L_P_LOADED@
+RELEASE = @RELEASE@
+RUNJOB_LDFLAGS = @RUNJOB_LDFLAGS@
+SED = @SED@
+SEMAPHORE_LIBS = @SEMAPHORE_LIBS@
+SEMAPHORE_SOURCES = @SEMAPHORE_SOURCES@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SLURMCTLD_PORT = @SLURMCTLD_PORT@
+SLURMCTLD_PORT_COUNT = @SLURMCTLD_PORT_COUNT@
+SLURMDBD_PORT = @SLURMDBD_PORT@
+SLURMD_PORT = @SLURMD_PORT@
+SLURM_API_AGE = @SLURM_API_AGE@
+SLURM_API_CURRENT = @SLURM_API_CURRENT@
+SLURM_API_MAJOR = @SLURM_API_MAJOR@
+SLURM_API_REVISION = @SLURM_API_REVISION@
+SLURM_API_VERSION = @SLURM_API_VERSION@
+SLURM_MAJOR = @SLURM_MAJOR@
+SLURM_MICRO = @SLURM_MICRO@
+SLURM_MINOR = @SLURM_MINOR@
+SLURM_PREFIX = @SLURM_PREFIX@
+SLURM_VERSION_NUMBER = @SLURM_VERSION_NUMBER@
+SLURM_VERSION_STRING = @SLURM_VERSION_STRING@
+SO_LDFLAGS = @SO_LDFLAGS@
+SSL_CPPFLAGS = @SSL_CPPFLAGS@
+SSL_LDFLAGS = @SSL_LDFLAGS@
+SSL_LIBS = @SSL_LIBS@
+STRIP = @STRIP@
+UTIL_LIBS = @UTIL_LIBS@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_have_man2html = @ac_have_man2html@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lua_CFLAGS = @lua_CFLAGS@
+lua_LIBS = @lua_LIBS@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common $(HWLOC_CPPFLAGS)
+pkglib_LTLIBRARIES = gres_mic.la
+
+# Gres MIC plugin.
+gres_mic_la_SOURCES = gres_mic.c
+gres_mic_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) $(HWLOC_LDFLAGS)
+gres_mic_la_LIBADD = $(HWLOC_LIBS)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/plugins/gres/mic/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign src/plugins/gres/mic/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
+ @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+ }
+
+uninstall-pkglibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+ done
+
+clean-pkglibLTLIBRARIES:
+ -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+ @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+gres_mic.la: $(gres_mic_la_OBJECTS) $(gres_mic_la_DEPENDENCIES) $(EXTRA_gres_mic_la_DEPENDENCIES)
+ $(gres_mic_la_LINK) -rpath $(pkglibdir) $(gres_mic_la_OBJECTS) $(gres_mic_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gres_mic.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+ for dir in "$(DESTDIR)$(pkglibdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+ mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkglibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkglibLTLIBRARIES \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/plugins/gres/mic/gres_mic.c b/src/plugins/gres/mic/gres_mic.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8c143c9ae84c6e3fc3b415d8f78681c22607413
--- /dev/null
+++ b/src/plugins/gres/mic/gres_mic.c
@@ -0,0 +1,290 @@
+/*****************************************************************************\
+ * gres_mic.c - Support MICs as a generic resources.
+ *****************************************************************************
+ * Copyright (C) 2012 CSC-IT Center for Science Ltd.
+ * Written by Olli-Pekka Lehto
+ * Based upon gres_gpu.c with the copyright notice shown below:
+ * Copyright (C) 2010 Lawrence Livermore National Security.
+ * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+ * Written by Morris Jette <jette1@llnl.gov>
+ *
+ * This file is part of SLURM, a resource management program.
+ * For details, see <http://www.schedmd.com/slurmdocs/>.
+ * Please also read the included file: DISCLAIMER.
+ *
+ * SLURM is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * In addition, as a special exception, the copyright holders give permission
+ * to link the code of portions of this program with the OpenSSL library under
+ * certain conditions as described in each individual source file, and
+ * distribute linked combinations including the two. You must obey the GNU
+ * General Public License in all respects for all of the code used other than
+ * OpenSSL. If you modify file(s) with this exception, you may extend this
+ * exception to your version of the file(s), but you are not obligated to do
+ * so. If you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files in
+ * the program, then also delete it here.
+ *
+ * SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with SLURM; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+\*****************************************************************************/
+
+#if HAVE_CONFIG_H
+# include "config.h"
+# if STDC_HEADERS
+# include <string.h>
+# endif
+# if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+# endif /* HAVE_SYS_TYPES_H */
+# if HAVE_UNISTD_H
+# include <unistd.h>
+# endif
+# if HAVE_INTTYPES_H
+# include <inttypes.h>
+# else /* ! HAVE_INTTYPES_H */
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+# endif /* HAVE_INTTYPES_H */
+#else /* ! HAVE_CONFIG_H */
+# include <sys/types.h>
+# include <unistd.h>
+# include <stdint.h>
+# include <string.h>
+#endif /* HAVE_CONFIG_H */
+
+#ifdef HAVE_HWLOC
+# include <hwloc.h>
+#endif /* HAVE_HWLOC */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "slurm/slurm.h"
+#include "slurm/slurm_errno.h"
+
+#include "src/common/slurm_xlator.h"
+#include "src/common/bitstring.h"
+#include "src/common/env.h"
+#include "src/common/gres.h"
+#include "src/common/list.h"
+#include "src/common/xstring.h"
+
+/*
+ * These variables are required by the generic plugin interface. If they
+ * are not found in the plugin, the plugin loader will ignore it.
+ *
+ * plugin_name - A string giving a human-readable description of the
+ * plugin. There is no maximum length, but the symbol must refer to
+ * a valid string.
+ *
+ * plugin_type - A string suggesting the type of the plugin or its
+ * applicability to a particular form of data or method of data handling.
+ * If the low-level plugin API is used, the contents of this string are
+ * unimportant and may be anything. SLURM uses the higher-level plugin
+ * interface which requires this string to be of the form
+ *
+ * <application>/<method>
+ *
+ * where <application> is a description of the intended application of
+ * the plugin (e.g., "auth" for SLURM authentication) and <method> is a
+ * description of how this plugin satisfies that application. SLURM will
+ * only load authentication plugins if the plugin_type string has a prefix
+ * of "auth/".
+ *
+ * plugin_version - Specifies the version number of the plugin. This would
+ * typically be the same for all plugins.
+ */
+const char plugin_name[] = "Gres MIC plugin";
+const char plugin_type[] = "gres/mic";
+const uint32_t plugin_version = 110;
+
+static char gres_name[] = "mic";
+
+static int *mic_devices = NULL;
+static int nb_available_files;
+
+/*
+ * We could load gres state or validate it using various mechanisms here.
+ * This only validates that the configuration was specified in gres.conf.
+ * In the general case, no code would need to be changed.
+ */
+extern int node_config_load(List gres_conf_list)
+{
+ int i, rc = SLURM_ERROR;
+ ListIterator iter;
+ gres_slurmd_conf_t *gres_slurmd_conf;
+ int nb_mic = 0; /* Number of MICs in the list */
+ int available_files_index = 0;
+
+ xassert(gres_conf_list);
+ iter = list_iterator_create(gres_conf_list);
+ if (iter == NULL)
+ fatal("list_iterator_create: malloc failure");
+ while ((gres_slurmd_conf = list_next(iter))) {
+ if (strcmp(gres_slurmd_conf->name, gres_name))
+ continue;
+ rc = SLURM_SUCCESS;
+ if (gres_slurmd_conf->file)
+ nb_mic++;
+ }
+ list_iterator_destroy(iter);
+ mic_devices = NULL;
+ nb_available_files = -1;
+
+ /* (Re-)Allocate memory if number of files changed */
+ if (nb_mic != nb_available_files) {
+ xfree(mic_devices); /* No-op if NULL */
+ mic_devices = (int *) xmalloc(sizeof(int) * nb_mic);
+ nb_available_files = nb_mic;
+ for (i = 0; i < nb_available_files; i++)
+ mic_devices[i] = -1;
+ }
+
+ iter = list_iterator_create(gres_conf_list);
+ if (iter == NULL)
+ fatal("list_iterator_create: malloc failure");
+ while ((gres_slurmd_conf = list_next(iter))) {
+ if ((strcmp(gres_slurmd_conf->name, gres_name) == 0) &&
+ gres_slurmd_conf->file) {
+ /* Populate mic_devices array with number
+ * at end of the file name */
+ for (i = 0; gres_slurmd_conf->file[i]; i++) {
+ if (!isdigit(gres_slurmd_conf->file[i]))
+ continue;
+ mic_devices[available_files_index] =
+ atoi(gres_slurmd_conf->file + i);
+ break;
+ }
+ available_files_index++;
+ }
+ }
+ list_iterator_destroy(iter);
+
+ if (rc != SLURM_SUCCESS)
+ fatal("%s failed to load configuration", plugin_name);
+
+ for (i = 0; i < nb_available_files; i++)
+ info("mic %d is device number %d", i, mic_devices[i]);
+
+ return rc;
+}
+
+/*
+ * Set environment variables as appropriate for a job (i.e. all tasks) based
+ * upon the job's GRES state.
+ */
+extern void job_set_env(char ***job_env_ptr, void *gres_ptr)
+{
+ int i, len;
+ char *dev_list = NULL;
+ gres_job_state_t *gres_job_ptr = (gres_job_state_t *) gres_ptr;
+
+ if ((gres_job_ptr != NULL) &&
+ (gres_job_ptr->node_cnt == 1) &&
+ (gres_job_ptr->gres_bit_alloc != NULL) &&
+ (gres_job_ptr->gres_bit_alloc[0] != NULL)) {
+ len = bit_size(gres_job_ptr->gres_bit_alloc[0]);
+ for (i=0; i<len; i++) {
+ if (!bit_test(gres_job_ptr->gres_bit_alloc[0], i))
+ continue;
+ if (!dev_list)
+ dev_list = xmalloc(128);
+ else
+ xstrcat(dev_list, ",");
+ if (mic_devices && (mic_devices[i] >= 0))
+ xstrfmtcat(dev_list, "%d", mic_devices[i]);
+ else
+ xstrfmtcat(dev_list, "%d", i);
+ }
+ }
+ if (dev_list) {
+ env_array_overwrite(job_env_ptr,"OFFLOAD_DEVICES",
+ dev_list);
+ xfree(dev_list);
+ } else {
+ /* The gres.conf file must identify specific device files
+ * in order to set the OFFLOAD_DEVICES env var */
+ error("gres/mic unable to set OFFLOAD_DEVICES, "
+ "no device files configured");
+ }
+}
+
+/*
+ * Set environment variables as appropriate for a job (i.e. all tasks) based
+ * upon the job step's GRES state.
+ */
+extern void step_set_env(char ***job_env_ptr, void *gres_ptr)
+{
+ int i, len;
+ char *dev_list = NULL;
+ gres_step_state_t *gres_step_ptr = (gres_step_state_t *) gres_ptr;
+
+ if ((gres_step_ptr != NULL) &&
+ (gres_step_ptr->node_cnt == 1) &&
+ (gres_step_ptr->gres_bit_alloc != NULL) &&
+ (gres_step_ptr->gres_bit_alloc[0] != NULL)) {
+ len = bit_size(gres_step_ptr->gres_bit_alloc[0]);
+ for (i=0; i<len; i++) {
+ if (!bit_test(gres_step_ptr->gres_bit_alloc[0], i))
+ continue;
+ if (!dev_list)
+ dev_list = xmalloc(128);
+ else
+ xstrcat(dev_list, ",");
+ if (mic_devices && (mic_devices[i] >= 0))
+ xstrfmtcat(dev_list, "%d", mic_devices[i]);
+ else
+ xstrfmtcat(dev_list, "%d", i);
+ }
+ }
+ if (dev_list) {
+ env_array_overwrite(job_env_ptr,"OFFLOAD_DEVICES",
+ dev_list);
+ xfree(dev_list);
+ } else {
+ /* The gres.conf file must identify specific device files
+ * in order to set the OFFLOAD_DEVICES env var */
+ error("gres/mic unable to set OFFLOAD_DEVICES, "
+ "no device files configured");
+ }
+}
+
+/* Send GRES information to slurmstepd on the specified file descriptor*/
+extern void send_stepd(int fd)
+{
+ int i;
+
+ safe_write(fd, &nb_available_files, sizeof(int));
+ for (i = 0; i < nb_available_files; i++)
+ safe_write(fd, &mic_devices[i], sizeof(int));
+ return;
+
+rwfail: error("gres_plugin_send_stepd failed");
+}
+
+/* Receive GRES information from slurmd on the specified file descriptor*/
+extern void recv_stepd(int fd)
+{
+ int i;
+
+ safe_read(fd, &nb_available_files, sizeof(int));
+ if (nb_available_files > 0)
+ mic_devices = xmalloc(sizeof(int) * nb_available_files);
+ for (i = 0; i < nb_available_files; i++)
+ safe_read(fd, &mic_devices[i], sizeof(int));
+ return;
+
+rwfail: error("gres_plugin_recv_stepd failed");
+}
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index 0d53275191dbd5c7becdc2115ee4a9f455f2f587..5f982e1a16bd78b0eef2667428664ec64595d0bf 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -2675,7 +2675,7 @@ static int _get_avail_core_in_node(bitstr_t *core_bitmap, int node)
total_cores = cr_node_num_cores[node];
for (i = 0; i < total_cores; i++)
- if (!bit_test(core_bitmap, coff +i))
+ if (!bit_test(core_bitmap, coff + i))
avail++;
return avail;
}
@@ -2744,23 +2744,23 @@ extern bitstr_t * select_p_resv_test(bitstr_t *avail_bitmap, uint32_t node_cnt,
bit_and(switches_bitmap[i], avail_bitmap);
switches_node_cnt[i] = bit_set_count(switches_bitmap[i]);
- switches_core_bitmap[i] =
+ switches_core_bitmap[i] =
_make_core_bitmap_filtered(switches_bitmap[i], 1);
if (*core_bitmap) {
bit_not(*core_bitmap);
bit_and(switches_core_bitmap[i], *core_bitmap);
bit_not(*core_bitmap);
- }
+ }
bit_fmt(str, sizeof(str), switches_core_bitmap[i]);
debug2("Switch %d can use cores: %s", i, str);
-
+
switches_cpu_cnt[i] = bit_set_count(switches_core_bitmap[i]);
debug2("switch %d looking cores in %d nodes (%d)",
- i, switches_node_cnt[i], switches_cpu_cnt[i]);
- }
-
+ i, switches_node_cnt[i], switches_cpu_cnt[i]);
+ }
+
/* Let's check nodes with less avail cores than needed */
for (j=0; j<switch_record_cnt; j++) {
@@ -2768,12 +2768,11 @@ extern bitstr_t * select_p_resv_test(bitstr_t *avail_bitmap, uint32_t node_cnt,
last = bit_fls(switches_bitmap[j]);
for (i=first; ((i<=last) && (first>=0)); i++) {
int c;
- if (!bit_test(switches_bitmap[j], i)){
+ if (!bit_test(switches_bitmap[j], i))
continue;
- }
-
- if ((c = _get_avail_core_in_node(*core_bitmap, i)) <
- cores_per_node)
+
+ c = _get_avail_core_in_node(*core_bitmap, i);
+ if (c < cores_per_node)
switches_node_cnt[j] -= c;
}
}
@@ -2895,8 +2894,10 @@ extern bitstr_t * select_p_resv_test(bitstr_t *avail_bitmap, uint32_t node_cnt,
if (rem_nodes > 0) /* insufficient resources */
FREE_NULL_BITMAP(avail_nodes_bitmap);
-fini: for (i=0; i<switch_record_cnt; i++)
+fini: for (i=0; i<switch_record_cnt; i++) {
FREE_NULL_BITMAP(switches_bitmap[i]);
+ FREE_NULL_BITMAP(switches_core_bitmap[i]);
+ }
xfree(switches_bitmap);
xfree(switches_core_bitmap);
@@ -2906,8 +2907,8 @@ fini: for (i=0; i<switch_record_cnt; i++)
if (avail_nodes_bitmap && core_cnt) {
/* Reservation is using partial nodes */
- char str[100];
- bitstr_t *exc_core_bitmap;
+ //char str[100];
+ bitstr_t *exc_core_bitmap = NULL;
sp_avail_bitmap = bit_alloc(bit_size(avail_bitmap));
if (sp_avail_bitmap == NULL)
@@ -2940,12 +2941,12 @@ fini: for (i=0; i<switch_record_cnt; i++)
continue;
avail_cores_in_node = 0;
- for (i = 0; i < cr_node_num_cores[inx]; i++){
+ for (i = 0; i < cr_node_num_cores[inx]; i++) {
if (!bit_test(exc_core_bitmap, coff + i)) {
avail_cores_in_node++;
}
- }
-
+ }
+
debug2("Node %d has %d available cores", inx,
avail_cores_in_node);
@@ -2953,7 +2954,7 @@ fini: for (i=0; i<switch_record_cnt; i++)
continue;
avail_cores_in_node = 0;
- for (i = 0; i < cr_node_num_cores[inx]; i++){
+ for (i = 0; i < cr_node_num_cores[inx]; i++) {
if (!bit_test(exc_core_bitmap, coff + i)) {
bit_set(*core_bitmap, coff + i);
core_cnt--;
@@ -2961,7 +2962,7 @@ fini: for (i=0; i<switch_record_cnt; i++)
}
if ((avail_cores_in_node == cores_per_node) ||
- (core_cnt == 0))
+ (core_cnt == 0))
break;
}
@@ -2969,6 +2970,7 @@ fini: for (i=0; i<switch_record_cnt; i++)
bit_set(sp_avail_bitmap, inx);
}
+ FREE_NULL_BITMAP(exc_core_bitmap);
//bit_fmt(str, (sizeof(str) - 1), *core_bitmap);
//info("sequential pick using coremap: %s", str);
diff --git a/src/plugins/task/cgroup/task_cgroup_memory.c b/src/plugins/task/cgroup/task_cgroup_memory.c
index ad8ae53abe55ce16628a323817abed2b13ee3258..8692c827b77f5b232cb5d8a35012d8a5f9ab4bc8 100644
--- a/src/plugins/task/cgroup/task_cgroup_memory.c
+++ b/src/plugins/task/cgroup/task_cgroup_memory.c
@@ -302,7 +302,6 @@ static int memcg_initialize (xcgroup_ns_t *ns, xcgroup_t *cg,
extern int task_cgroup_memory_create(slurmd_job_t *job)
{
- int rc;
int fstatus = SLURM_ERROR;
xcgroup_t memory_cg;
@@ -311,7 +310,6 @@ extern int task_cgroup_memory_create(slurmd_job_t *job)
uint32_t stepid = job->stepid;
uid_t uid = job->uid;
gid_t gid = job->gid;
- pid_t pid;
char* slurm_cgpath ;
diff --git a/src/sacct/options.c b/src/sacct/options.c
index 3a580c9177542b288a48b777e13027168820880f..0fa74aef4da1eb95839f0567652bdc352f7a39f2 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -1237,8 +1237,6 @@ void do_dump(void)
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
- if(job->stats.cpu_min == NO_VAL)
- job->stats.cpu_min = 0;
if(list_count(job->steps)) {
job->stats.cpu_ave /= list_count(job->steps);
@@ -1457,9 +1455,6 @@ void do_list(void)
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
- if(job->stats.cpu_min == NO_VAL)
- job->stats.cpu_min = 0;
-
if(list_count(job->steps)) {
int cnt = list_count(job->steps);
job->stats.cpu_ave /= (double)cnt;
diff --git a/src/sacct/print.c b/src/sacct/print.c
index af1b2246d538dc4642334346a722887303b3a303..d2fc2f896912dfec2b63035a3f84bd73b70cae5a 100644
--- a/src/sacct/print.c
+++ b/src/sacct/print.c
@@ -209,6 +209,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
+
if (!fuzzy_equal(tmp_dub, NO_VAL))
tmp_char = _elapsed_time((long)tmp_dub, 0);
@@ -646,6 +647,8 @@ void print_fields(type_t type, void *object)
tmp_int = NO_VAL;
break;
}
+ if (tmp_int == (uint16_t)NO_VAL)
+ tmp_int = NO_VAL;
field->print_routine(field,
tmp_int,
(curr_inx == field_count));
@@ -709,6 +712,8 @@ void print_fields(type_t type, void *object)
tmp_int = NO_VAL;
break;
}
+ if (tmp_int == (uint16_t)NO_VAL)
+ tmp_int = NO_VAL;
field->print_routine(field,
tmp_int,
(curr_inx == field_count));
@@ -774,6 +779,8 @@ void print_fields(type_t type, void *object)
tmp_int = NO_VAL;
break;
}
+ if (tmp_int == (uint16_t)NO_VAL)
+ tmp_int = NO_VAL;
field->print_routine(field,
tmp_int,
(curr_inx == field_count));
@@ -835,6 +842,8 @@ void print_fields(type_t type, void *object)
tmp_int = NO_VAL;
break;
}
+ if (tmp_int == (uint16_t)NO_VAL)
+ tmp_int = NO_VAL;
field->print_routine(field,
tmp_int,
(curr_inx == field_count));
diff --git a/src/sacct/process.c b/src/sacct/process.c
index 8995803212f3b9c8f7770dc02280847d1dbc67c1..473e60c6f7b9a369654103a883ad447203a4a089 100644
--- a/src/sacct/process.c
+++ b/src/sacct/process.c
@@ -61,29 +61,32 @@ char *find_hostname(uint32_t pos, char *hosts)
void aggregate_stats(slurmdb_stats_t *dest, slurmdb_stats_t *from)
{
- if(dest->vsize_max < from->vsize_max) {
+ /* Means it is a blank record */
+ if (from->cpu_min == NO_VAL)
+ return;
+
+ if (dest->vsize_max < from->vsize_max) {
dest->vsize_max = from->vsize_max;
dest->vsize_max_nodeid = from->vsize_max_nodeid;
dest->vsize_max_taskid = from->vsize_max_taskid;
}
dest->vsize_ave += from->vsize_ave;
- if(dest->rss_max < from->rss_max) {
+ if (dest->rss_max < from->rss_max) {
dest->rss_max = from->rss_max;
dest->rss_max_nodeid = from->rss_max_nodeid;
dest->rss_max_taskid = from->rss_max_taskid;
}
dest->rss_ave += from->rss_ave;
- if(dest->pages_max < from->pages_max) {
+ if (dest->pages_max < from->pages_max) {
dest->pages_max = from->pages_max;
dest->pages_max_nodeid = from->pages_max_nodeid;
dest->pages_max_taskid = from->pages_max_taskid;
}
dest->pages_ave += from->pages_ave;
- if((dest->cpu_min > from->cpu_min)
- || (dest->cpu_min == NO_VAL)) {
+ if ((dest->cpu_min > from->cpu_min) || (dest->cpu_min == NO_VAL)) {
dest->cpu_min = from->cpu_min;
dest->cpu_min_nodeid = from->cpu_min_nodeid;
dest->cpu_min_taskid = from->cpu_min_taskid;
diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c
index e3318f69a53feed94f2f05c3edc850c8eabcc015..05426ea8b582037633a1581607cb42ee0ea66f13 100644
--- a/src/salloc/salloc.c
+++ b/src/salloc/salloc.c
@@ -351,9 +351,9 @@ int main(int argc, char *argv[])
/*
* Allocation granted!
*/
- info("Granted job allocation %u", alloc->job_id);
pending_job_id = alloc->job_id;
#ifdef HAVE_BG
+ info("Granted job allocation %u", alloc->job_id);
if (!_wait_bluegene_block_ready(alloc)) {
if(!allocation_interrupted)
error("Something is wrong with the "
@@ -361,12 +361,15 @@ int main(int argc, char *argv[])
goto relinquish;
}
#else
+ verbose("Granted job allocation %u, waiting for nodes to "
+ "become ready", alloc->job_id);
if (!_wait_nodes_ready(alloc)) {
if (!allocation_interrupted)
error("Something is wrong with the "
"boot of the nodes.");
goto relinquish;
}
+ info("Granted job allocation %u", alloc->job_id);
#endif
}
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 96a2f289c93f4ba8691a1a5a2708db616177c678..f1c3ccdcad0d2b179438c3957daf50e73e1344f2 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -8771,9 +8771,9 @@ extern int job_node_ready(uint32_t job_id, int *ready)
if (rc)
rc = READY_NODE_STATE;
- if (IS_JOB_RUNNING(job_ptr) || IS_JOB_SUSPENDED(job_ptr))
+ if (IS_JOB_RUNNING(job_ptr) || IS_JOB_SUSPENDED(job_ptr) ||
+ (job_ptr->details && job_ptr->details->prolog_running))
rc |= READY_JOB_STATE;
-
if ((rc == (READY_NODE_STATE | READY_JOB_STATE)) &&
job_ptr->alias_list && !strcmp(job_ptr->alias_list, "TBD") &&
job_ptr->node_bitmap &&
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index a66e3926a61e8f055c1fb911cd640322f9b04430..559a1fa662a72ba1d4bf7a2cc04c5f5cf2126f1d 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -2487,7 +2487,8 @@ static void _validate_node_choice(slurmctld_resv_t *resv_ptr)
resv_desc.features = resv_ptr->features;
resv_desc.node_cnt = xmalloc(sizeof(uint32_t) * 2);
resv_desc.node_cnt[0]= resv_ptr->node_cnt - i;
- i = _select_nodes(&resv_desc, &resv_ptr->part_ptr, &tmp_bitmap, &core_bitmap);
+ i = _select_nodes(&resv_desc, &resv_ptr->part_ptr, &tmp_bitmap,
+ &core_bitmap);
xfree(resv_desc.node_cnt);
xfree(resv_desc.node_list);
xfree(resv_desc.partition);
@@ -2495,6 +2496,8 @@ static void _validate_node_choice(slurmctld_resv_t *resv_ptr)
bit_and(resv_ptr->node_bitmap, avail_node_bitmap);
bit_or(resv_ptr->node_bitmap, tmp_bitmap);
FREE_NULL_BITMAP(tmp_bitmap);
+ FREE_NULL_BITMAP(resv_ptr->core_bitmap);
+ resv_ptr->core_bitmap = core_bitmap;
xfree(resv_ptr->node_list);
resv_ptr->node_list = bitmap2node_name(resv_ptr->node_bitmap);
info("modified reservation %s due to unusable nodes, "
@@ -2752,13 +2755,16 @@ static int _resize_resv(slurmctld_resv_t *resv_ptr, uint32_t node_cnt)
resv_desc.flags = resv_ptr->flags;
resv_desc.node_cnt = xmalloc(sizeof(uint32_t) * 2);
resv_desc.node_cnt[0]= 0 - delta_node_cnt;
- i = _select_nodes(&resv_desc, &resv_ptr->part_ptr, &tmp1_bitmap, &core_bitmap);
+ i = _select_nodes(&resv_desc, &resv_ptr->part_ptr, &tmp1_bitmap,
+ &core_bitmap);
xfree(resv_desc.node_cnt);
xfree(resv_desc.node_list);
xfree(resv_desc.partition);
if (i == SLURM_SUCCESS) {
bit_or(resv_ptr->node_bitmap, tmp1_bitmap);
FREE_NULL_BITMAP(tmp1_bitmap);
+ FREE_NULL_BITMAP(resv_ptr->core_bitmap);
+ resv_ptr->core_bitmap = core_bitmap;
xfree(resv_ptr->node_list);
resv_ptr->node_list = bitmap2node_name(resv_ptr->node_bitmap);
resv_ptr->node_cnt = node_cnt;
@@ -3602,9 +3608,10 @@ extern int job_test_resv(struct job_record *job_ptr, time_t *when,
if (*exc_core_bitmap == NULL)
*exc_core_bitmap =
bit_copy(resv_ptr->core_bitmap);
- else
+ } else {
bit_or(*exc_core_bitmap,
resv_ptr->core_bitmap);
+ }
}
}
list_iterator_destroy(iter);
diff --git a/src/smap/grid_functions.c b/src/smap/grid_functions.c
index 2f0fe3ae9900b8931db54f7ace6b4101404bab66..e02af52a204ba296f65975c43d05dedac1af47e9 100644
--- a/src/smap/grid_functions.c
+++ b/src/smap/grid_functions.c
@@ -164,7 +164,7 @@ extern int set_grid_bg(int *start, int *end, int count, int set)
}
/* Build the smap_system_ptr structure from the node records */
-extern void init_grid(node_info_msg_t *node_info_ptr)
+extern void init_grid(node_info_msg_t *node_info_ptr, int cols)
{
int i, j, len;
int default_y_offset = 0;
@@ -265,11 +265,13 @@ extern void init_grid(node_info_msg_t *node_info_ptr)
default_y_offset = (dim_size[3] * dim_size[2]) +
(dim_size[2] - dim_size[3]);
}
+ if (cols == 0)
+ cols = 80;
for (i = 0; i < smap_system_ptr->node_cnt; i++) {
smap_node = smap_system_ptr->grid[i];
if (params.cluster_dims == 1) {
- smap_node->grid_xcord = i + 1;
- smap_node->grid_ycord = 1;
+ smap_node->grid_xcord = (i % cols) + 1;
+ smap_node->grid_ycord = (i / cols) + 1;
} else if (params.cluster_dims == 2) {
smap_node->grid_xcord = smap_node->coord[0] + 1;
smap_node->grid_ycord =
diff --git a/src/smap/smap.c b/src/smap/smap.c
index b4126299b1b56efb799f4ef14f2f98101bfbf6bf..03dd4e760a7e6ae277e40a3642d5485c4b86c1ec 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -139,10 +139,9 @@ int main(int argc, char *argv[])
if (!params.commandline) {
int check_width = min_screen_width;
- init_grid(new_node_ptr);
-
- signal(SIGWINCH, (void (*)(int))_resize_handler);
initscr();
+ init_grid(new_node_ptr, COLS);
+ signal(SIGWINCH, (void (*)(int))_resize_handler);
if (params.cluster_dims == 4) {
height = dim_size[2] * dim_size[3] + dim_size[2] + 3;
diff --git a/src/smap/smap.h b/src/smap/smap.h
index 7839dcae482f265322997863b1e60d9220487963..e887f10cc3a4a6cfecc01a62a3964da32b83f369 100644
--- a/src/smap/smap.h
+++ b/src/smap/smap.h
@@ -182,7 +182,7 @@ extern void parse_command_line(int argc, char *argv[]);
extern smap_system_t *smap_system_ptr;
extern int quiet_flag;
-extern void init_grid(node_info_msg_t *node_info_ptr);
+extern void init_grid(node_info_msg_t *node_info_ptr, int cols);
extern void update_grid(node_info_msg_t *node_info_ptr);
extern void clear_grid(void);
extern void free_grid(void);
diff --git a/testsuite/expect/test17.25 b/testsuite/expect/test17.25
index 15eb701e2edcc49a355264785938692259856993..093059cce4872f92f481bb5f64fd2abca14e935e 100755
--- a/testsuite/expect/test17.25
+++ b/testsuite/expect/test17.25
@@ -101,10 +101,10 @@ if {$matches != 3} {
send_user "\nFAILURE: processed $matches of 3 environment variables\n"
set exit_code 1
}
+cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
send_user "\nSUCCESS\n"
}
-cancel_job $job_id
exit $exit_code
diff --git a/testsuite/expect/test8.3 b/testsuite/expect/test8.3
index 71e8328e91797e945f75b15c41b3ea523bf9ce7f..a39b6d07f418e068ab6620377ac8d6bff8d434d1 100755
--- a/testsuite/expect/test8.3
+++ b/testsuite/expect/test8.3
@@ -51,10 +51,7 @@ if {[test_bluegene] == 0} {
# Delete left-over input script files
# Build input script file
#
-exec $bin_rm -f $file_in
-exec echo "#!$bin_bash" >$file_in
-exec echo "$bin_sleep 1 &" >>$file_in
-exec $bin_chmod 700 $file_in
+make_bash_script $file_in "$bin_sleep 1 &"
#
# Submit a slurm job for blue gene with geometry of 2x1x1