diff --git a/Makefile.in b/Makefile.in
index 07c96bb7964e34ea96fe3de89c52196194a08ff9..66a51e5fa154837add08df6a540aeb7767579c48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -121,6 +121,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -149,6 +150,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/NEWS b/NEWS
index 1dea125cd2686d4d82232c74f759cbbe64e862f6..3f78e6d58227e85bcbd7da7dd17a194246c9b480 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,12 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 1.2.3
========================
+ -- task/affinity using cpusets logic added, from Don Albert, Bull.
+ Cpuset libary must be installed and set "TaskPluginParam=cpusets"
+ in slurm.conf to enable.
+ NOTE: Currently disabled until additional testing is performed.
+ Enable by changing "HAVE_CPUSETTS_EXP" to "HAVE_CPUSETS" in
+ src/plugins/task/affinity/*.[ch].
* Changes in SLURM 1.2.2
========================
diff --git a/auxdir/Makefile.in b/auxdir/Makefile.in
index 4d1309ade50971e49dd1f79030851eb94b56addf..75f5489b00a300dc92e61087fa5bfbc42f196223 100644
--- a/auxdir/Makefile.in
+++ b/auxdir/Makefile.in
@@ -87,6 +87,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -115,6 +116,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/auxdir/x_ac_affinity.m4 b/auxdir/x_ac_affinity.m4
index 638a6175ee29788cc923f45ca498343b070e4148..a7c2a04a304d552a0c1d71f917f2c575b02e9cc4 100644
--- a/auxdir/x_ac_affinity.m4
+++ b/auxdir/x_ac_affinity.m4
@@ -60,6 +60,21 @@ AC_DEFUN([X_AC_AFFINITY], [
fi
+#
+# Test for CPUSET library functions and set the definitions
+#
+ AC_CHECK_LIB([cpuset],
+ [cs_init],
+ [ac_have_cpuset=yes; CPUSET_LIBS="-lcpuset"])
+
+ AC_SUBST(CPUSET_LIBS)
+ AM_CONDITIONAL(HAVE_CPUSETS, test "x$ac_have_cpuset" = "xyes")
+ if test "x$ac_have_cpuset" = "xyes"; then
+ AC_DEFINE(HAVE_CPUSETS, 1, [define if you have the cpuset library])
+ else
+ AC_MSG_WARN([Unable to locate CPUSET memory affinity functions])
+ fi
+
#
# Test for other affinity functions as appropriate
# TBD
diff --git a/config.h.in b/config.h.in
index f470066dff338d9754fd1066aa10cc33d68ee3c8..de2686b6abb240885fa45e7a3d2bdd4987b3b948 100644
--- a/config.h.in
+++ b/config.h.in
@@ -21,6 +21,9 @@
/* Define to 1 if have Blue Gene files */
#undef HAVE_BG_FILES
+/* define if you have the cpuset library */
+#undef HAVE_CPUSETS
+
/* Define to 1 if you have the <curses.h> header file. */
#undef HAVE_CURSES_H
diff --git a/configure b/configure
index 073035831216d8ec56d6aa5806760e4230bf55c4..3f22d808b69d2d78a297fd3dce3aa5249130ef20 100755
--- a/configure
+++ b/configure
@@ -885,6 +885,9 @@ NUMA_LIBS
HAVE_NUMA_TRUE
HAVE_NUMA_FALSE
PLPA_LIBS
+CPUSET_LIBS
+HAVE_CPUSETS_TRUE
+HAVE_CPUSETS_FALSE
HAVE_SCHED_SETAFFINITY_TRUE
HAVE_SCHED_SETAFFINITY_FALSE
PAM_LIBS
@@ -7501,7 +7504,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7504 "configure"' > conftest.$ac_ext
+ echo '#line 7507 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9383,11 +9386,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9386: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9389: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9390: \$? = $ac_status" >&5
+ echo "$as_me:9393: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9651,11 +9654,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9654: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9657: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9658: \$? = $ac_status" >&5
+ echo "$as_me:9661: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9755,11 +9758,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9758: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9761: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9762: \$? = $ac_status" >&5
+ echo "$as_me:9765: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12196,7 +12199,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12199 "configure"
+#line 12202 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12296,7 +12299,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12299 "configure"
+#line 12302 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14664,11 +14667,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14670: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14671: \$? = $ac_status" >&5
+ echo "$as_me:14674: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14768,11 +14771,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14771: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14774: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14775: \$? = $ac_status" >&5
+ echo "$as_me:14778: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16329,11 +16332,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16332: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16335: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16336: \$? = $ac_status" >&5
+ echo "$as_me:16339: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16433,11 +16436,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16436: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16439: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16440: \$? = $ac_status" >&5
+ echo "$as_me:16443: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18652,11 +18655,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18655: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18658: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18659: \$? = $ac_status" >&5
+ echo "$as_me:18662: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18920,11 +18923,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18923: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18926: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18927: \$? = $ac_status" >&5
+ echo "$as_me:18930: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19024,11 +19027,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19027: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19030: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19031: \$? = $ac_status" >&5
+ echo "$as_me:19034: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -23106,6 +23109,113 @@ echo "$as_me: WARNING: Unable to locate PLPA processor affinity functions" >&2;}
fi
+#
+# Test for CPUSET library functions and set the definitions
+#
+ { echo "$as_me:$LINENO: checking for cs_init in -lcpuset" >&5
+echo $ECHO_N "checking for cs_init in -lcpuset... $ECHO_C" >&6; }
+if test "${ac_cv_lib_cpuset_cs_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcpuset $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cs_init ();
+int
+main ()
+{
+return cs_init ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_cpuset_cs_init=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_cpuset_cs_init=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_cpuset_cs_init" >&5
+echo "${ECHO_T}$ac_cv_lib_cpuset_cs_init" >&6; }
+if test $ac_cv_lib_cpuset_cs_init = yes; then
+ ac_have_cpuset=yes; CPUSET_LIBS="-lcpuset"
+fi
+
+
+
+
+
+if test "x$ac_have_cpuset" = "xyes"; then
+ HAVE_CPUSETS_TRUE=
+ HAVE_CPUSETS_FALSE='#'
+else
+ HAVE_CPUSETS_TRUE='#'
+ HAVE_CPUSETS_FALSE=
+fi
+
+ if test "x$ac_have_cpuset" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CPUSETS 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: WARNING: Unable to locate CPUSET memory affinity functions" >&5
+echo "$as_me: WARNING: Unable to locate CPUSET memory affinity functions" >&2;}
+ fi
+
#
# Test for other affinity functions as appropriate
# TBD
@@ -27638,6 +27748,13 @@ echo "$as_me: error: conditional \"HAVE_NUMA\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_CPUSETS_TRUE}" && test -z "${HAVE_CPUSETS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CPUSETS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_CPUSETS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${HAVE_SCHED_SETAFFINITY_TRUE}" && test -z "${HAVE_SCHED_SETAFFINITY_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_SCHED_SETAFFINITY\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -28491,6 +28608,9 @@ NUMA_LIBS!$NUMA_LIBS$ac_delim
HAVE_NUMA_TRUE!$HAVE_NUMA_TRUE$ac_delim
HAVE_NUMA_FALSE!$HAVE_NUMA_FALSE$ac_delim
PLPA_LIBS!$PLPA_LIBS$ac_delim
+CPUSET_LIBS!$CPUSET_LIBS$ac_delim
+HAVE_CPUSETS_TRUE!$HAVE_CPUSETS_TRUE$ac_delim
+HAVE_CPUSETS_FALSE!$HAVE_CPUSETS_FALSE$ac_delim
HAVE_SCHED_SETAFFINITY_TRUE!$HAVE_SCHED_SETAFFINITY_TRUE$ac_delim
HAVE_SCHED_SETAFFINITY_FALSE!$HAVE_SCHED_SETAFFINITY_FALSE$ac_delim
PAM_LIBS!$PAM_LIBS$ac_delim
@@ -28544,7 +28664,7 @@ WITH_AUTHD_FALSE!$WITH_AUTHD_FALSE$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d83f48633fa99e84944d07f537f6713b5464bafe..d606401fdb722290c84a480cd89e6b8bb1d51bad 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -95,6 +95,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -123,6 +124,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index f9cef1993c5d06db31023b6d411df30600045256..9412c4683c2da11ea74e85f5724d3507c49c71fd 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index ada9a403160ac43e805e7deb6db5d146f28bf24f..4a0e1349d03f3f965d97acee0889d30c2539d919 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -94,6 +94,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -122,6 +123,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/Makefile.in b/src/Makefile.in
index c3f0d59f3424c03900a46d3118fef3a6a01ce525..424e4a7b33933a37ea68f104208d3d6fdbea63dc 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -95,6 +95,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -123,6 +124,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index 7118398f75646c19d395fb7b954c8e796b812510..7dacb0dc2046775ecfe4f29de9f6f13dd26a745d 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -131,6 +131,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -159,6 +160,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index eb901a3d6a53c2cabeba4a60d3a6795a4b28519e..b1f701ede8d916610e4ad1e453b801c374e1cf6c 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -161,6 +161,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -189,6 +190,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index b52f35ec6da528acfb35fa22ae68f506562b9bb9..85028f18abb04e60c87d0b397751b860b3bc6982 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -95,6 +95,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -123,6 +124,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/auth/Makefile.in b/src/plugins/auth/Makefile.in
index eda07aeb7fd2d1fcea35d9de2df9c58885340a82..cdb5ed94ce7c0224e5564da47cf36fc4cbfcec93 100644
--- a/src/plugins/auth/Makefile.in
+++ b/src/plugins/auth/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/auth/authd/Makefile.in b/src/plugins/auth/authd/Makefile.in
index f8f6ff5e89f6c4cf159a26c7b2b4db6a3cb47d5c..478d79161ad2e9a93877ca876515ae352fe65972 100644
--- a/src/plugins/auth/authd/Makefile.in
+++ b/src/plugins/auth/authd/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/auth/munge/Makefile.in b/src/plugins/auth/munge/Makefile.in
index 14292eeb5f3c358cc7b9e5db823b50a338981fc7..5ed32945f5158e0b8709b905bce7984a0fb564f0 100644
--- a/src/plugins/auth/munge/Makefile.in
+++ b/src/plugins/auth/munge/Makefile.in
@@ -116,6 +116,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -144,6 +145,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/auth/none/Makefile.in b/src/plugins/auth/none/Makefile.in
index a77438ad5ae2f09ba75ed4b2c0e0d264404d0754..1acefc98480e7e4e34dd59e44ba2fe6543485929 100644
--- a/src/plugins/auth/none/Makefile.in
+++ b/src/plugins/auth/none/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/checkpoint/Makefile.in b/src/plugins/checkpoint/Makefile.in
index 67f4f0b6092eb4b630a7724983bbd7de5b1a2958..aa106e3d9824202ad4515c183e5e00ace53494cb 100644
--- a/src/plugins/checkpoint/Makefile.in
+++ b/src/plugins/checkpoint/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/checkpoint/aix/Makefile.in b/src/plugins/checkpoint/aix/Makefile.in
index c4e99f4a0af8165f588b7e3525843c345c5b66d6..972e899c330f53757408fd0b473060f6af26755f 100644
--- a/src/plugins/checkpoint/aix/Makefile.in
+++ b/src/plugins/checkpoint/aix/Makefile.in
@@ -119,6 +119,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -147,6 +148,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/checkpoint/none/Makefile.in b/src/plugins/checkpoint/none/Makefile.in
index 5ebf76200646ac897cba98a88e5d33d38fc8ad57..3fc74fc67f1ea08da809cf63f830ecb884a26601 100644
--- a/src/plugins/checkpoint/none/Makefile.in
+++ b/src/plugins/checkpoint/none/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobacct/Makefile.in b/src/plugins/jobacct/Makefile.in
index a3ede772c966be1cb50447ca318d9bc70d39892e..3b04b386939fcb4a1de14d89d31cc0241408d3b6 100644
--- a/src/plugins/jobacct/Makefile.in
+++ b/src/plugins/jobacct/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobacct/aix/Makefile.in b/src/plugins/jobacct/aix/Makefile.in
index caf65b265ea2154b91002cd7db49ede924d42361..8565e6c775b82299e51ea3c086b1d7da291d8aef 100644
--- a/src/plugins/jobacct/aix/Makefile.in
+++ b/src/plugins/jobacct/aix/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobacct/linux/Makefile.in b/src/plugins/jobacct/linux/Makefile.in
index 3e5a298b30e1b517444faaaba01b663a2c56417f..2407e9404cdc8c276a9a17c983cf7b250fd687b2 100644
--- a/src/plugins/jobacct/linux/Makefile.in
+++ b/src/plugins/jobacct/linux/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobacct/none/Makefile.in b/src/plugins/jobacct/none/Makefile.in
index cd5757b013d1f214c14db037e2a39695ac76d406..ddcb56ae826faf68e6c53cf9e6643d7f6380730d 100644
--- a/src/plugins/jobacct/none/Makefile.in
+++ b/src/plugins/jobacct/none/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobcomp/Makefile.in b/src/plugins/jobcomp/Makefile.in
index ac417d086df76e9aa438e236650592a079df98b2..cea4e05c774f7b9543da089e3a2740585f621568 100644
--- a/src/plugins/jobcomp/Makefile.in
+++ b/src/plugins/jobcomp/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobcomp/filetxt/Makefile.in b/src/plugins/jobcomp/filetxt/Makefile.in
index 2b4fdba80478c1bc8022112058d844c490700af5..23166820df9a1a23b1fec224811c32fd0b76f890 100644
--- a/src/plugins/jobcomp/filetxt/Makefile.in
+++ b/src/plugins/jobcomp/filetxt/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobcomp/none/Makefile.in b/src/plugins/jobcomp/none/Makefile.in
index e656c58c8ea70cd013eecac0b4acbf02f900c207..801f0b4ec34de78cd03a99811ac62cfac3fb4686 100644
--- a/src/plugins/jobcomp/none/Makefile.in
+++ b/src/plugins/jobcomp/none/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/jobcomp/script/Makefile.in b/src/plugins/jobcomp/script/Makefile.in
index 871dba84763a4f6b4b1f7258d8705bf0e92c9b56..7e3655f2e153d645c267c93f4b91c831d3258190 100644
--- a/src/plugins/jobcomp/script/Makefile.in
+++ b/src/plugins/jobcomp/script/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/mpi/Makefile.in b/src/plugins/mpi/Makefile.in
index 223ebbff58d84638f1b048f9c79c754495f5c25a..415064414ae1c0e142a7a63b3846b301af3bda40 100644
--- a/src/plugins/mpi/Makefile.in
+++ b/src/plugins/mpi/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/mpi/lam/Makefile.in b/src/plugins/mpi/lam/Makefile.in
index 2b6b6adc0e4a4149c4e2aec17bab22cce30b4bbc..0725313d8269f353badb0bce2c66919001bca10e 100644
--- a/src/plugins/mpi/lam/Makefile.in
+++ b/src/plugins/mpi/lam/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/mpi/mpichgm/Makefile.in b/src/plugins/mpi/mpichgm/Makefile.in
index 1c571181f5c1d7574fe6dc00a59b7d6bb83be09d..ebe193e17e36740fb6c8edccf3eb225565bdf914 100644
--- a/src/plugins/mpi/mpichgm/Makefile.in
+++ b/src/plugins/mpi/mpichgm/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/mpi/mvapich/Makefile.in b/src/plugins/mpi/mvapich/Makefile.in
index 99c9c380d02b7b1135a37e8b1cda683166114180..b1916c17e1ddd520f5e911df91b2436eff4f7cbf 100644
--- a/src/plugins/mpi/mvapich/Makefile.in
+++ b/src/plugins/mpi/mvapich/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/mpi/none/Makefile.in b/src/plugins/mpi/none/Makefile.in
index 6bc6c33c09ef478bd4a087d41215a496c3429c73..d456e58ca342e4da7b9fd78ff79bd97886567b87 100644
--- a/src/plugins/mpi/none/Makefile.in
+++ b/src/plugins/mpi/none/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/mpi/openmpi/Makefile.in b/src/plugins/mpi/openmpi/Makefile.in
index a81d6d91eaa44492cd11dd94c036771610a82eba..9906d2447f2790c8cd2e372b6dbff86e6b8f540c 100644
--- a/src/plugins/mpi/openmpi/Makefile.in
+++ b/src/plugins/mpi/openmpi/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/proctrack/Makefile.in b/src/plugins/proctrack/Makefile.in
index a9b4fc0c4f82f48aba30cf5b8b8f32ae67d63d27..00543188ff4ac9daca2824147f2e39ea140575e9 100644
--- a/src/plugins/proctrack/Makefile.in
+++ b/src/plugins/proctrack/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/proctrack/aix/Makefile.in b/src/plugins/proctrack/aix/Makefile.in
index 827bbf4468a40750517dc17429b1c9086eeb2b7a..6200463bc943813983dc36d3cff0c8b0dea376cf 100644
--- a/src/plugins/proctrack/aix/Makefile.in
+++ b/src/plugins/proctrack/aix/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/proctrack/linuxproc/Makefile.in b/src/plugins/proctrack/linuxproc/Makefile.in
index 4429810c3e9c00e6e434bed998634abc0fd52b4f..7e2c8922c4be0099bc987dc58ef9ed11afed7de8 100644
--- a/src/plugins/proctrack/linuxproc/Makefile.in
+++ b/src/plugins/proctrack/linuxproc/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/proctrack/pgid/Makefile.in b/src/plugins/proctrack/pgid/Makefile.in
index ac60fb454edcea87d110c86d95ea41e522570389..75de7d2d56288e27c3b8ba2e6804255fe96958a6 100644
--- a/src/plugins/proctrack/pgid/Makefile.in
+++ b/src/plugins/proctrack/pgid/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/proctrack/rms/Makefile.in b/src/plugins/proctrack/rms/Makefile.in
index 4dd637f1679f087383111ace62f574ce2f4f28c6..2946154b5275e85ddecd06f5112b1fe8365679a3 100644
--- a/src/plugins/proctrack/rms/Makefile.in
+++ b/src/plugins/proctrack/rms/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/proctrack/sgi_job/Makefile.in b/src/plugins/proctrack/sgi_job/Makefile.in
index 97846679d728d71022bab872cac4a91ddda23152..1c7285d3d4c79fd188d0c7441226b2f1cf4b344a 100644
--- a/src/plugins/proctrack/sgi_job/Makefile.in
+++ b/src/plugins/proctrack/sgi_job/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/sched/Makefile.in b/src/plugins/sched/Makefile.in
index a776a50a41baad3cb90314270974eae7925adf94..0b5aa9e28be8acd91dd535c85bef6f3fa22938e2 100644
--- a/src/plugins/sched/Makefile.in
+++ b/src/plugins/sched/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/sched/backfill/Makefile.in b/src/plugins/sched/backfill/Makefile.in
index 252a2cabbc1626f903493e7434ffe38cedff89b8..87402ec9d0f68d9f84d2bfc91c8fb174545c3b02 100644
--- a/src/plugins/sched/backfill/Makefile.in
+++ b/src/plugins/sched/backfill/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/sched/builtin/Makefile.in b/src/plugins/sched/builtin/Makefile.in
index 10037fe6ce3e52836c4465a7f6e0700ace34c881..e8ec35b24aa1db964950306d311b77bb9518141d 100644
--- a/src/plugins/sched/builtin/Makefile.in
+++ b/src/plugins/sched/builtin/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/sched/gang/Makefile.in b/src/plugins/sched/gang/Makefile.in
index 2ab48c3005fd2a79e9e9fcf300bbce48096b6ec6..13d3b0b841e8a0994210d54aa5b93cf1c196b5ec 100644
--- a/src/plugins/sched/gang/Makefile.in
+++ b/src/plugins/sched/gang/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/sched/hold/Makefile.in b/src/plugins/sched/hold/Makefile.in
index 1b3de86f0a9aea6103f00974dc58ebcfbbefad9c..348445ae7de70da257d3f546e8a869a6e3308499 100644
--- a/src/plugins/sched/hold/Makefile.in
+++ b/src/plugins/sched/hold/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/sched/wiki/Makefile.in b/src/plugins/sched/wiki/Makefile.in
index 0bcb08384d39d0c2954bb19d684463c2bc046101..0e1c334d4eca1be7a23ca0576971a08ebfe98a1c 100644
--- a/src/plugins/sched/wiki/Makefile.in
+++ b/src/plugins/sched/wiki/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/sched/wiki2/Makefile.in b/src/plugins/sched/wiki2/Makefile.in
index d17542d4760fd6c6bc890e1d0fea22b9fb5a7ff4..8535b875c2c8921ea09905e77d2dd50f68f57c12 100644
--- a/src/plugins/sched/wiki2/Makefile.in
+++ b/src/plugins/sched/wiki2/Makefile.in
@@ -118,6 +118,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -146,6 +147,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/select/Makefile.in b/src/plugins/select/Makefile.in
index d4cf64bbcd962872cd5645f2d1e3911d85547da9..a9f25fc33d26b6c35186a6e5413e0616144a5926 100644
--- a/src/plugins/select/Makefile.in
+++ b/src/plugins/select/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/select/bluegene/Makefile.in b/src/plugins/select/bluegene/Makefile.in
index 1725110904f6cbc974df56974b334365c752d8f7..76934b2a0f4b96c8d5ff1f198c4367f342978782 100644
--- a/src/plugins/select/bluegene/Makefile.in
+++ b/src/plugins/select/bluegene/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/select/bluegene/block_allocator/Makefile.in b/src/plugins/select/bluegene/block_allocator/Makefile.in
index e21a68ce71f7dd9fcab56bf49c9f9d4c81157277..3b2d88d2c760914c5a07329dfb6040640a3f4c9a 100644
--- a/src/plugins/select/bluegene/block_allocator/Makefile.in
+++ b/src/plugins/select/bluegene/block_allocator/Makefile.in
@@ -107,6 +107,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -135,6 +136,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/select/bluegene/plugin/Makefile.in b/src/plugins/select/bluegene/plugin/Makefile.in
index b2fb831627b8ad1378db3e68932cd3814f85dedd..a29db9edb09a4cc4f010cde78ae33ad67d97ed86 100644
--- a/src/plugins/select/bluegene/plugin/Makefile.in
+++ b/src/plugins/select/bluegene/plugin/Makefile.in
@@ -142,6 +142,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = -DBLUEGENE_CONFIG_FILE=\"$(sysconfdir)/bluegene.conf\"
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -170,6 +171,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/select/cons_res/Makefile.in b/src/plugins/select/cons_res/Makefile.in
index c2c4cb9d2d78578b185faf6a97d2281e467cff0c..cbb2d1a1e877ab53a86cba94328f48dea972c27c 100644
--- a/src/plugins/select/cons_res/Makefile.in
+++ b/src/plugins/select/cons_res/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/select/linear/Makefile.in b/src/plugins/select/linear/Makefile.in
index 339b366c47f9c04774d530a0c87c9bf640a249fc..d7fe33bc9b761a4ea16b26270d237b12d2ede4ae 100644
--- a/src/plugins/select/linear/Makefile.in
+++ b/src/plugins/select/linear/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/switch/Makefile.in b/src/plugins/switch/Makefile.in
index 27f77609378aa343f16beeebcb08893be673d35d..4c9220364fee8655f00197a60fecb79775818a99 100644
--- a/src/plugins/switch/Makefile.in
+++ b/src/plugins/switch/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/switch/elan/Makefile.in b/src/plugins/switch/elan/Makefile.in
index 78214c62bc2906c032d8e8321d13c38054baa2b8..7698c008c762b68ac97ed73bfad45fd9e6bf667b 100644
--- a/src/plugins/switch/elan/Makefile.in
+++ b/src/plugins/switch/elan/Makefile.in
@@ -120,6 +120,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -148,6 +149,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/switch/federation/Makefile.in b/src/plugins/switch/federation/Makefile.in
index 2ee80ba915dcf13d77a407b3ea4b0f84d1ef7f9b..376e4e13f9ef23842f73ae2ae513378c63e47732 100644
--- a/src/plugins/switch/federation/Makefile.in
+++ b/src/plugins/switch/federation/Makefile.in
@@ -124,6 +124,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = -DFEDERATION_CONFIG_FILE=\"$(sysconfdir)/federation.conf\"
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -152,6 +153,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/switch/none/Makefile.in b/src/plugins/switch/none/Makefile.in
index e3f951ce3483d590494b931ebbcd3615e1056f0a..eb70b643936186456dfcffbd12f7609062a98f46 100644
--- a/src/plugins/switch/none/Makefile.in
+++ b/src/plugins/switch/none/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/task/Makefile.in b/src/plugins/task/Makefile.in
index 1595f6455ffb889c4736c9abf5ab65493869adf5..12a6c6ccaa9f9f1c30325586ec532cd445780e44 100644
--- a/src/plugins/task/Makefile.in
+++ b/src/plugins/task/Makefile.in
@@ -97,6 +97,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -125,6 +126,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/plugins/task/affinity/Makefile.am b/src/plugins/task/affinity/Makefile.am
index 604aa2aaa804532b93fb4f38cf4f9605bc260427..36552680c360f7943a092d071dce7c0e1dc08ead 100644
--- a/src/plugins/task/affinity/Makefile.am
+++ b/src/plugins/task/affinity/Makefile.am
@@ -15,7 +15,7 @@ task_affinity_la_SOURCES = \
numa.c \
schedutils.c \
task_affinity.c
-task_affinity_la_LDFLAGS = $(SO_LDFLAGS) $(NUMA_LIBS) $(PLPA_LIBS) $(PLUGIN_FLAGS)
+task_affinity_la_LDFLAGS = $(SO_LDFLAGS) $(NUMA_LIBS) $(PLPA_LIBS) $(CPUSET_LIBS) $(PLUGIN_FLAGS)
task_affinity_la_LIBADD = $(top_builddir)/src/common/libcommon.la
else
pkglib_LTLIBRARIES =
diff --git a/src/plugins/task/affinity/Makefile.in b/src/plugins/task/affinity/Makefile.in
index 684bbec4137c264689b18360a914a1a687e0b4de..0329e66c82f6ce76c4e2c2067523b2d951ec6d06 100644
--- a/src/plugins/task/affinity/Makefile.in
+++ b/src/plugins/task/affinity/Makefile.in
@@ -124,6 +124,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -152,6 +153,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
@@ -302,7 +305,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
@HAVE_SCHED_SETAFFINITY_TRUE@ schedutils.c \
@HAVE_SCHED_SETAFFINITY_TRUE@ task_affinity.c
-@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_LDFLAGS = $(SO_LDFLAGS) $(NUMA_LIBS) $(PLPA_LIBS) $(PLUGIN_FLAGS)
+@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_LDFLAGS = $(SO_LDFLAGS) $(NUMA_LIBS) $(PLPA_LIBS) $(CPUSET_LIBS) $(PLUGIN_FLAGS)
@HAVE_SCHED_SETAFFINITY_TRUE@task_affinity_la_LIBADD = $(top_builddir)/src/common/libcommon.la
@HAVE_SCHED_SETAFFINITY_FALSE@EXTRA_task_affinity_la_SOURCES = \
@HAVE_SCHED_SETAFFINITY_FALSE@ affinity.c \
diff --git a/src/plugins/task/affinity/affinity.c b/src/plugins/task/affinity/affinity.c
index 1548c997ca12c08be95468c8bff80d09987e1388..03103649da3199933d80f3a83f8245abea5de9c1 100644
--- a/src/plugins/task/affinity/affinity.c
+++ b/src/plugins/task/affinity/affinity.c
@@ -217,3 +217,262 @@ int slurm_getaffinity(pid_t pid, size_t size, cpu_set_t *mask)
return (rval);
}
+#ifdef HAVE_CPUSETS_EXP
+int get_cpuset_mask(cs_cpumask_t *mask, slurmd_job_t *job)
+{
+ int nbr_task_cpus;
+ int nummasks, i, j;
+ char *curstr, *selstr;
+ char mstr[1 + CPU_SETSIZE / 4];
+ int local_id = job->envtp->localid;
+
+ debug2("get_cpuset_mask bind_type = %d, bind_list = %s\n",
+ job->cpu_bind_type, job->cpu_bind);
+
+ if ((!job->cpu_bind_type) || (job->cpu_bind_type & CPU_BIND_NONE)) {
+ return false;
+ }
+
+ nbr_task_cpus = job->cpus / job->ntasks;
+
+ if (job->cpu_bind_type & CPU_BIND_RANK) {
+ for (i=0;i<nbr_task_cpus;i++){
+ cs_cpumask_add(mask, local_id * nbr_task_cpus + i);
+ }
+ return true;
+ }
+
+ nummasks = 0;
+ selstr = NULL;
+
+ if (job->cpu_bind_type & CPU_BIND_MAPCPU) {
+ unsigned int mycpu = 0;
+ /* find first entry for this task */
+ curstr = job->cpu_bind;
+ while (*curstr) {
+ if (nummasks == local_id*nbr_task_cpus) {
+ selstr = curstr;
+ break;
+ }
+ if (*curstr == ',')
+ nummasks++;
+ curstr++;
+ }
+ /* check if we found a cpu entry */
+ if (!selstr){
+ error("not enough entries in map_cpu:<list>");
+ return false;
+ }
+ /* add cpus to mask from list for "nbr_task_cpus" */
+ for (i=0;i<nbr_task_cpus;i++){
+ if (!*selstr){
+ error("not enough entries in map_cpu:<list>");
+ return false;
+ }
+ /* extract the selected mask from the list */
+ j = 0;
+ curstr = mstr;
+ while ((*selstr && *selstr != ',') && (j++ < (CPU_SETSIZE/4)))
+ *curstr++ = *selstr++;
+ *curstr = '\0';
+ if (*selstr == ',')
+ selstr++;
+ if (strncmp(mstr, "0x", 2) == 0) {
+ mycpu = strtoul (&(mstr[2]), NULL, 16);
+ } else {
+ mycpu = strtoul (mstr, NULL, 10);
+ }
+ cs_cpumask_add(mask, mycpu);
+ }
+ return true;
+ }
+
+ if (job->cpu_bind_type & CPU_BIND_MASKCPU) {
+ /* find mask entry for this task */
+ curstr = job->cpu_bind;
+ while (*curstr) {
+ if (nummasks == local_id) {
+ selstr = curstr;
+ break;
+ }
+ if (*curstr == ',')
+ nummasks++;
+ curstr++;
+ }
+ /* check if we found a cpu entry */
+ if (!selstr){
+ error("not enough entries in mask_cpu:<list>");
+ return false;
+ }
+ /* extract the selected mask from the list */
+ j = 0;
+ curstr = mstr;
+ while ((*selstr && *selstr != ',') && (j++ < (CPU_SETSIZE/4)))
+ *curstr++ = *selstr++;
+ *curstr = '\0';
+ /* convert mask string into cpu_set_t mask */
+ if (str_to_cpuset( (cpu_set_t *) mask, mstr) < 0) {
+ error("str_to_cpuset %s", mstr);
+ return false;
+ }
+ return true;
+ }
+
+ return false;
+}
+
+int get_memset_mask(cs_memmask_t *mem_mask, cs_cpumask_t *cpu_mask, slurmd_job_t *job)
+{
+ cs_cpumask_t cur_mask, tst_mask;
+ int nbr_nodes, nummasks, i, j;
+ char *curstr, *selstr;
+ char mstr[1 + CPU_SETSIZE / 4];
+ int local_id = job->envtp->localid;
+
+ debug2("get_memset_mask bind_type = %d, bind_list = %s\n",
+ job->mem_bind_type, job->mem_bind);
+
+ /* If "not specified" or "None" or "Rank", do not set a new memory mask in the CPUset */
+ if ((!job->mem_bind_type) || (job->mem_bind_type & (MEM_BIND_NONE | MEM_BIND_RANK)))
+ return false;
+
+ /* For now, make LOCAL and MAP_CPU the same */
+ if (job->mem_bind_type & (MEM_BIND_LOCAL | MEM_BIND_MAPCPU)) {
+ nbr_nodes = cs_nr_nodes();
+ for (i=0; i<nbr_nodes; i++) {
+ cs_get_node_cpus(i, &cur_mask);
+ cs_cpumask_and(&tst_mask, &cur_mask, cpu_mask);
+ if (!cs_cpumask_empty(&tst_mask)) {
+ cs_memmask_add(mem_mask, i);
+ debug2("added node = %d to mem mask %08x \n",i,*mem_mask);
+ }
+ }
+
+ return true;
+ }
+
+ /* allow user to set specific memory masks */
+ if (job->mem_bind_type & MEM_BIND_MASKCPU) {
+ /* find mask entry for this task */
+ nummasks = 0;
+ selstr = NULL;
+
+ curstr = job->mem_bind;
+ while (*curstr) {
+ if (nummasks == local_id) {
+ selstr = curstr;
+ break;
+ }
+ if (*curstr == ',')
+ nummasks++;
+ curstr++;
+ }
+ /* check if we found a mem entry */
+ if (!selstr){
+ error("not enough entries in mask_mem:<list>");
+ return false;
+ }
+ /* extract the selected mask from the list */
+ j = 0;
+ curstr = mstr;
+ while ((*selstr && *selstr != ',') && (j++ < (CPU_SETSIZE/4)))
+ *curstr++ = *selstr++;
+ *curstr = '\0';
+ /* convert mask string into cpu_set_t mask */
+ if (str_to_cpuset( (cpu_set_t *) mem_mask, mstr) < 0) {
+ error("str_to_cpuset %s", mstr);
+ return false;
+ }
+ return true;
+ }
+ return false;
+}
+
+int make_task_cpuset(slurmd_job_t *job, cs_cpumask_t *cpu_mask, cs_memmask_t *mem_mask){
+
+ char path[PATH_MAX];
+ char *current_cs = NULL;
+ int retval = 0;
+ int success = 0;
+
+ info("cpuset - cs_init called");
+ cs_init();
+
+ current_cs = cs_get_current();
+ if (!current_cs)
+ return -ENOMEM;
+
+ int l = snprintf(path, PATH_MAX, "%sslurm%u_%d", current_cs, job->jobid,
+ job->envtp->localid);
+ if (l > PATH_MAX) {
+ retval = -ENAMETOOLONG;
+ goto out;
+ }
+
+ debug("cpuset path = %s",path);
+
+ retval = cs_create(path);
+ if (retval < 0)
+ goto out;
+ retval = cs_set_autoclean(path, CS_AUTOCLEAN);
+ if (retval < 0)
+ goto out;
+
+ cs_lock_libcpuset();
+ retval = cs_set_cpus(path, *cpu_mask);
+ if (retval < 0)
+ debug3("cpuset - error on cs_set_cpus = %d %s",retval,cs_strerror(retval));
+ success = 1;
+
+ if (cs_supports_mem()) {
+
+ /* Check for mem_bind options */
+ if (get_memset_mask(mem_mask, cpu_mask, job)) {
+ debug("cpuset - mem_mask = %d (decimal) and %08x (hex)",
+ *mem_mask, *mem_mask);
+ retval = cs_set_mems(path, *mem_mask);
+ if (retval < 0) {
+ debug3("cpuset - error on cs_set_mems = %d %s",
+ retval,cs_strerror(retval));
+ success = 0;
+ goto out_created;
+ }
+ } else {
+ /* Copy parent of new cpuset (i.e current) mems mask */
+ retval = cs_get_mems(current_cs, mem_mask);
+ if (retval < 0) {
+ debug3("cpuset - error on cs_get_mems = %d %s",
+ retval,cs_strerror(retval));
+ success = 0;
+ goto out_created;
+ }
+ retval = cs_set_mems(path, *mem_mask);
+ if (retval < 0) {
+ debug3("cpuset - error on cs_set_mems = %d %s",
+ retval,cs_strerror(retval));
+ success = 0;
+ goto out_created;
+ }
+ }
+ }
+
+ retval = cs_add_task(path, job->envtp->task_pid);
+ if (retval < 0) {
+ debug3("cpuset - error on cs_add_task = %d %s",retval,cs_strerror(retval));
+ }
+
+ out_created:
+ if (!success)
+ cs_destroy(path);
+ cs_unlock_libcpuset();
+
+ out:
+ free(current_cs);
+
+ current_cs = cs_get_current();
+ debug("cpuset - exit make_task_cpuset retval = %d cpuset = %s",retval,current_cs);
+ free(current_cs);
+
+ return retval;
+}
+#endif
diff --git a/src/plugins/task/affinity/affinity.h b/src/plugins/task/affinity/affinity.h
index 6e5968b70c868d826a79d1aca5354a4fb99392c2..cad2f1cca5c6a65f22706a6f24243937074bae1f 100644
--- a/src/plugins/task/affinity/affinity.h
+++ b/src/plugins/task/affinity/affinity.h
@@ -63,10 +63,14 @@
#define __USE_GNU
#include <sched.h> /* SMB */
-#if HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
+#ifdef HAVE_CPUSETS_EXP
+# include <cpuset.h>
+#endif
+
#include <slurm/slurm_errno.h>
#include "src/common/slurm_xlator.h"
#include "src/slurmd/slurmd/slurmd.h"
@@ -91,6 +95,11 @@ void slurm_chkaffinity(cpu_set_t *mask, slurmd_job_t *job, int statval);
int get_cpuset(cpu_set_t *mask, slurmd_job_t *job);
int slurm_setaffinity(pid_t pid, size_t size, const cpu_set_t *mask);
int slurm_getaffinity(pid_t pid, size_t size, cpu_set_t *mask);
+#ifdef HAVE_CPUSETS_EXP
+int get_cpuset_mask(cs_cpumask_t *mask, slurmd_job_t *job);
+int get_memset_mask(cs_memmask_t *mem_mask, cs_cpumask_t *cpu_mask, slurmd_job_t *job);
+int make_task_cpuset(slurmd_job_t *job, cs_cpumask_t *cpu_mask, cs_memmask_t *mem_mask);
+#endif
/*** from numa.c ***/
#ifdef HAVE_NUMA
diff --git a/src/plugins/task/affinity/task_affinity.c b/src/plugins/task/affinity/task_affinity.c
index edb9ac7623652d911110fb31bdbc6fc1568f60e8..f0bcfda663b81aef015aa116d6f07fe8369e758f 100644
--- a/src/plugins/task/affinity/task_affinity.c
+++ b/src/plugins/task/affinity/task_affinity.c
@@ -156,6 +156,10 @@ int task_pre_launch ( slurmd_job_t *job )
debug("affinity task_pre_launch: %u.%u, task %d",
job->jobid, job->stepid, job->envtp->procid);
+#ifdef HAVE_CPUSETS_EXP
+ if (!conf->use_cpusets) {
+ info("Using sched_affinity for tasks");
+#endif
/*** CPU binding support ***/
if (job->cpu_bind_type) {
cpu_set_t new_mask, cur_mask;
@@ -189,7 +193,30 @@ int task_pre_launch ( slurmd_job_t *job )
slurm_chk_memset(&cur_mask, job);
}
#endif
-
+#ifdef HAVE_CPUSETS_EXP
+ }
+ else {
+ cs_cpumask_t cpu_mask;
+ cs_memmask_t mem_mask;
+
+ info("Using cpuset affinity for tasks");
+ debug("from job structure - nprocs=%u, ntasks=%u, cpus=%u",
+ job->nprocs, job->ntasks, job->cpus);
+ debug("from job->envtp - procid=%d, localid=%d, pid=%d",
+ job->envtp->procid, job->envtp->localid, job->envtp->task_pid);
+
+ cs_cpumask_clear(&cpu_mask);
+ cs_memmask_clear(&mem_mask);
+ if (get_cpuset_mask(&cpu_mask, job)) {
+ debug2("cpu_mask = %d (decimal) and %08x (hex)", cpu_mask, cpu_mask);
+ make_task_cpuset(job, &cpu_mask, &mem_mask);
+ }
+ slurm_chkaffinity(&cpu_mask, job, 0);
+#ifdef HAVE_NUMA
+ slurm_chk_memset(&mem_mask, job);
+#endif
+ }
+#endif
return SLURM_SUCCESS;
}
diff --git a/src/plugins/task/none/Makefile.in b/src/plugins/task/none/Makefile.in
index e2dbec3f668530d7b27a44cd713b2d0e006c3e61..751ce1a0bcf16e9d687ce03e9fbfdbe64a730cda 100644
--- a/src/plugins/task/none/Makefile.in
+++ b/src/plugins/task/none/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/sacct/Makefile.in b/src/sacct/Makefile.in
index c2dbb405010762c36c2c6b885aabc09abcbbd1a1..40a16dd5c9aed7826a866c1bf4f76295dbfd9635 100644
--- a/src/sacct/Makefile.in
+++ b/src/sacct/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/salloc/Makefile.in b/src/salloc/Makefile.in
index dd193ce81f6bc819b99e92a6e28fb6eecc5d8d3f..3cad5b368b6b49a1eabcb30c1214df371bc1b2fe 100644
--- a/src/salloc/Makefile.in
+++ b/src/salloc/Makefile.in
@@ -110,6 +110,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -138,6 +139,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/sattach/Makefile.in b/src/sattach/Makefile.in
index da503720737587da687d0b88bbe2b36e245af398..3ef7ba1f93d09c446c04fed08c12e8bfe17fe7bb 100644
--- a/src/sattach/Makefile.in
+++ b/src/sattach/Makefile.in
@@ -111,6 +111,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -139,6 +140,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/sbatch/Makefile.in b/src/sbatch/Makefile.in
index 6c869b2a98c326bd2bb16265d40e5ebcf0ce1360..cfe9147a0750088bef6e1f820e3c23e146a2f1a8 100644
--- a/src/sbatch/Makefile.in
+++ b/src/sbatch/Makefile.in
@@ -110,6 +110,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -138,6 +139,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/sbcast/Makefile.in b/src/sbcast/Makefile.in
index bd72a459215331b2f87ee510f3ca511d3679b63c..05f2f8246cda0435a44f37f8010c676a8dff91c7 100644
--- a/src/sbcast/Makefile.in
+++ b/src/sbcast/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/scancel/Makefile.in b/src/scancel/Makefile.in
index bc59c6482bee9edcd665dad6d618c36e6c32f501..6dd39734a5a11ea0f939ed990e69a4fc3ec98f8a 100644
--- a/src/scancel/Makefile.in
+++ b/src/scancel/Makefile.in
@@ -113,6 +113,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -141,6 +142,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/scontrol/Makefile.in b/src/scontrol/Makefile.in
index a6a56838392011637c6e759297beaf5f185476c5..736c041305fa59338559fba57fec29605e5de461 100644
--- a/src/scontrol/Makefile.in
+++ b/src/scontrol/Makefile.in
@@ -113,6 +113,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -141,6 +142,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/sinfo/Makefile.in b/src/sinfo/Makefile.in
index 20dde97862db2fe468939f820a9b568f9f65d1f4..d16b829821f4fbddb56b2832addc39cb06f86f44 100644
--- a/src/sinfo/Makefile.in
+++ b/src/sinfo/Makefile.in
@@ -115,6 +115,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -143,6 +144,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/slaunch/Makefile.in b/src/slaunch/Makefile.in
index c3073dff9b457646f427ee915b849150f539e8cc..0203d7789b65f03161fcc7fbab5f60dbbaa7df47 100644
--- a/src/slaunch/Makefile.in
+++ b/src/slaunch/Makefile.in
@@ -112,6 +112,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -140,6 +141,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/slurmctld/Makefile.in b/src/slurmctld/Makefile.in
index a26fcd931bb2114865494bcd8ee4a1fdb8509a5f..f2ec3854936720d2df66e496a96df7f706bb4257 100644
--- a/src/slurmctld/Makefile.in
+++ b/src/slurmctld/Makefile.in
@@ -117,6 +117,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -145,6 +146,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/slurmd/Makefile.in b/src/slurmd/Makefile.in
index e0ff9986d00410ad9c3f08ec7307480ddee2f16e..a515e91437d2259ce9caf82085401c49e74a5192 100644
--- a/src/slurmd/Makefile.in
+++ b/src/slurmd/Makefile.in
@@ -95,6 +95,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -123,6 +124,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/slurmd/common/slurmstepd_init.c b/src/slurmd/common/slurmstepd_init.c
index 987799cc5d4ca417ef6c717682ab1353e301a133..903520a8d34f337bca198e1a27ef359b5a92dab8 100644
--- a/src/slurmd/common/slurmstepd_init.c
+++ b/src/slurmd/common/slurmstepd_init.c
@@ -55,6 +55,7 @@ extern void pack_slurmd_conf_lite(slurmd_conf_t *conf, Buf buffer)
pack32(conf->daemonize, buffer);
pack32((uint32_t)conf->slurm_user_id, buffer);
pack16(conf->use_pam, buffer);
+ pack16(conf->use_cpusets, buffer);
}
extern int unpack_slurmd_conf_lite_no_alloc(slurmd_conf_t *conf, Buf buffer)
@@ -79,6 +80,7 @@ extern int unpack_slurmd_conf_lite_no_alloc(slurmd_conf_t *conf, Buf buffer)
safe_unpack32(&uint32_tmp, buffer);
conf->slurm_user_id = (uid_t)uint32_tmp;
safe_unpack16(&conf->use_pam, buffer);
+ safe_unpack16(&conf->use_cpusets, buffer);
return SLURM_SUCCESS;
unpack_error:
diff --git a/src/slurmd/slurmd/Makefile.in b/src/slurmd/slurmd/Makefile.in
index cec831bbf6e81cb8a7ef83fb890e2c14775d0bad..7fe185b29055142df388f568d9821b83d40b2d8e 100644
--- a/src/slurmd/slurmd/Makefile.in
+++ b/src/slurmd/slurmd/Makefile.in
@@ -127,6 +127,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = -DLIBSLURM_SO=\"$(libdir)/libslurm.so\"
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -155,6 +156,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 733e8a257a4ff22e1ebde7856bb093ff653b58e0..e1295e9720b9d31cc290def9ed5e382c26799434 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -619,7 +619,10 @@ _read_config()
if (cf->slurmctld_port == 0)
fatal("Unable to establish controller port");
conf->use_pam = cf->use_pam;
-
+
+ if (cf->task_plugin_param & TASK_PARAM_CPUSETS)
+ conf->use_cpusets = 1;
+
slurm_mutex_unlock(&conf->config_mutex);
slurm_conf_unlock();
}
@@ -663,19 +666,19 @@ _print_conf()
debug3("CacheGroups = %d", cf->cache_groups);
debug3("Confile = `%s'", conf->conffile);
debug3("Debug = %d", cf->slurmd_debug);
- debug3("CPUs = %-2d (CF: %2d, HW: %2d)",
+ debug3("CPUs = %-2u (CF: %2u, HW: %2u)",
conf->cpus,
conf->conf_cpus,
conf->actual_cpus);
- debug3("Sockets = %-2d (CF: %2d, HW: %2d)",
+ debug3("Sockets = %-2u (CF: %2u, HW: %2u)",
conf->sockets,
conf->conf_sockets,
conf->actual_sockets);
- debug3("Cores = %-2d (CF: %2d, HW: %2d)",
+ debug3("Cores = %-2u (CF: %2u, HW: %2u)",
conf->cores,
conf->conf_cores,
conf->actual_cores);
- debug3("Threads = %-2d (CF: %2d, HW: %2d)",
+ debug3("Threads = %-2u (CF: %2u, HW: %2u)",
conf->threads,
conf->conf_threads,
conf->actual_threads);
@@ -683,7 +686,7 @@ _print_conf()
str[0] = '\0';
for (i = 0; i < conf->block_map_size; i++) {
char id[10];
- sprintf(id, "%d,", conf->block_map[i]);
+ sprintf(id, "%u,", conf->block_map[i]);
strcat(str, id);
}
str[strlen(str)-1] = '\0'; /* trim trailing "," */
@@ -691,14 +694,14 @@ _print_conf()
str[0] = '\0';
for (i = 0; i < conf->block_map_size; i++) {
char id[10];
- sprintf(id, "%d,", conf->block_map_inv[i]);
+ sprintf(id, "%u,", conf->block_map_inv[i]);
strcat(str, id);
}
str[strlen(str)-1] = '\0'; /* trim trailing "," */
debug3("Inverse Map = %s", str);
xfree(str);
- debug3("RealMemory = %d", conf->real_memory_size);
- debug3("TmpDisk = %d", conf->tmp_disk_space);
+ debug3("RealMemory = %u", conf->real_memory_size);
+ debug3("TmpDisk = %u", conf->tmp_disk_space);
debug3("Epilog = `%s'", conf->epilog);
debug3("Logfile = `%s'", cf->slurmd_logfile);
debug3("NodeName = %s", conf->node_name);
@@ -711,8 +714,9 @@ _print_conf()
debug3("Slurm UID = %u", conf->slurm_user_id);
debug3("TaskProlog = `%s'", conf->task_prolog);
debug3("TaskEpilog = `%s'", conf->task_epilog);
- debug3("Use PAM = %d", conf->use_pam);
- debug3("Fast Sched = %d", conf->fast_schedule);
+ debug3("Use CPUSETS = %u", conf->use_cpusets);
+ debug3("Use PAM = %u", conf->use_pam);
+ debug3("Fast Sched = %u", conf->fast_schedule);
slurm_conf_unlock();
}
@@ -752,6 +756,7 @@ _init_conf()
conf->pidfile = xstrdup(DEFAULT_SLURMD_PIDFILE);
conf->spooldir = xstrdup(DEFAULT_SPOOLDIR);
conf->use_pam = 0;
+ conf->use_cpusets = 0;
conf->fast_schedule = 0;
slurm_mutex_init(&conf->config_mutex);
diff --git a/src/slurmd/slurmd/slurmd.h b/src/slurmd/slurmd/slurmd.h
index 6a8823fe9de53e1f12e24c20232519298b1b9668..37797fd7a749efee62f6106937bf17ebc1c921ff 100644
--- a/src/slurmd/slurmd/slurmd.h
+++ b/src/slurmd/slurmd/slurmd.h
@@ -122,7 +122,8 @@ typedef struct slurmd_config {
pthread_mutex_t config_mutex; /* lock for slurmd_config access */
uint16_t job_acct_freq;
uint16_t use_pam;
- uint16_t propagate_prio; /* PropagatePrioProcess flag */
+ 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;
diff --git a/src/slurmd/slurmstepd/Makefile.in b/src/slurmd/slurmstepd/Makefile.in
index e568b7f7e15d154d0f19dbce595d86f20a2fcc7d..d7708709c314c9fc8b6be53569d961bbd5f409ac 100644
--- a/src/slurmd/slurmstepd/Makefile.in
+++ b/src/slurmd/slurmstepd/Makefile.in
@@ -121,6 +121,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -149,6 +150,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 9122bc777bc402c6bc5959489413f3c4a92f42eb..7a7c171004ccd0bf5c19f7fc2c81f18dd65cf6d3 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -126,6 +126,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -154,6 +155,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/squeue/Makefile.in b/src/squeue/Makefile.in
index f78fb31916c0dfcec515abd25d76bcc813148feb..4c9f1e1560ba80122cc083bf43271636f592602d 100644
--- a/src/squeue/Makefile.in
+++ b/src/squeue/Makefile.in
@@ -116,6 +116,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -144,6 +145,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/srun/Makefile.in b/src/srun/Makefile.in
index 3f98e470888f10836e51c9b299ed9203fc5eb466..71b5e9af46f00f4f049f3d7a8da2ecc2acf3b9fc 100644
--- a/src/srun/Makefile.in
+++ b/src/srun/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/strigger/Makefile.in b/src/strigger/Makefile.in
index aa6548f170b6eb828070c403503ba9584566cf0b..fc0db3c138485e2bbce928791ca8137fd6773bf9 100644
--- a/src/strigger/Makefile.in
+++ b/src/strigger/Makefile.in
@@ -114,6 +114,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -142,6 +143,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/src/sview/Makefile.in b/src/sview/Makefile.in
index f7f1bf4574a383b60607884c2ab2a293853ef935..faf6c71723788390e740a4db739770e67dd61eb2 100644
--- a/src/sview/Makefile.in
+++ b/src/sview/Makefile.in
@@ -130,6 +130,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -158,6 +159,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 1b5d6833ed34adad93745ed9b9697e26fe68afd0..cc379de8ff5c128c1127b75bf2b647139b0ff9b8 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -102,6 +102,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -130,6 +131,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index ef42e436e8b9e2e0ff9bf40a00b785b0fafa1101..daa7a3baad6a3cc06a868c677963c285bccc4c36 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -86,6 +86,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -114,6 +115,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/slurm_unit/Makefile.in b/testsuite/slurm_unit/Makefile.in
index 88e7e9a69bba2f2b018e8878777b7df6b75cdf51..1cfdf222ace4536eddeade7fff7a7f0a5d29c461 100644
--- a/testsuite/slurm_unit/Makefile.in
+++ b/testsuite/slurm_unit/Makefile.in
@@ -95,6 +95,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -123,6 +124,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/slurm_unit/api/Makefile.in b/testsuite/slurm_unit/api/Makefile.in
index 1a65bd8b8abc9766f0d40bfa2545f0c10656a89c..a6cbd9464f186ec9a0bc08a1f1e8044bbaa76984 100644
--- a/testsuite/slurm_unit/api/Makefile.in
+++ b/testsuite/slurm_unit/api/Makefile.in
@@ -113,6 +113,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -141,6 +142,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/slurm_unit/api/manual/Makefile.in b/testsuite/slurm_unit/api/manual/Makefile.in
index 00d68b6bd28f6916a3270669104b94f335df104d..2671add3e4e6d62646609b15bd0afa0aa35759d6 100644
--- a/testsuite/slurm_unit/api/manual/Makefile.in
+++ b/testsuite/slurm_unit/api/manual/Makefile.in
@@ -139,6 +139,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -167,6 +168,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/slurm_unit/common/Makefile.in b/testsuite/slurm_unit/common/Makefile.in
index b846b4d1abce4e9ed96e24cb4686fb1ca5a34387..286bd9457426b8e790afedbd94b8d508ba69bb88 100644
--- a/testsuite/slurm_unit/common/Makefile.in
+++ b/testsuite/slurm_unit/common/Makefile.in
@@ -124,6 +124,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -152,6 +153,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/slurm_unit/slurmctld/Makefile.in b/testsuite/slurm_unit/slurmctld/Makefile.in
index 71259404af0e9c20149b0c6ddb1ae49a859915c3..9e3fec96f72174f9ba561dba99b286e314631c80 100644
--- a/testsuite/slurm_unit/slurmctld/Makefile.in
+++ b/testsuite/slurm_unit/slurmctld/Makefile.in
@@ -88,6 +88,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -116,6 +117,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@
diff --git a/testsuite/slurm_unit/slurmd/Makefile.in b/testsuite/slurm_unit/slurmd/Makefile.in
index 978dfbb65431fe21556af6346b2cc2b489c1c1fc..47d17c454de2d2e6b5dd2657bc99a0b7227f57c5 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.in
+++ b/testsuite/slurm_unit/slurmd/Makefile.in
@@ -88,6 +88,7 @@ CFLAGS = @CFLAGS@
CMD_LDFLAGS = @CMD_LDFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPUSET_LIBS = @CPUSET_LIBS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -116,6 +117,8 @@ HAVE_AIX_FALSE = @HAVE_AIX_FALSE@
HAVE_AIX_PROCTRACK_FALSE = @HAVE_AIX_PROCTRACK_FALSE@
HAVE_AIX_PROCTRACK_TRUE = @HAVE_AIX_PROCTRACK_TRUE@
HAVE_AIX_TRUE = @HAVE_AIX_TRUE@
+HAVE_CPUSETS_FALSE = @HAVE_CPUSETS_FALSE@
+HAVE_CPUSETS_TRUE = @HAVE_CPUSETS_TRUE@
HAVE_ELAN = @HAVE_ELAN@
HAVE_ELAN_FALSE = @HAVE_ELAN_FALSE@
HAVE_ELAN_TRUE = @HAVE_ELAN_TRUE@