From 486a1db717c8e39e7f9f0b5722eeac48a9f8323c Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 22 Sep 2015 12:49:27 -0700
Subject: [PATCH] rename src/common/mpi.h to slurm_mpi.h
The file is not installed, but this should eliminate any possible
confusion in its use.
---
src/api/step_launch.c | 2 +-
src/api/step_launch.h | 6 +++---
src/common/Makefile.am | 2 +-
src/common/Makefile.in | 24 ++++++++++++------------
src/common/mpi.c | 4 ++--
src/common/{mpi.h => slurm_mpi.h} | 2 +-
src/plugins/mpi/lam/lam.h | 2 +-
src/plugins/mpi/mpich1_p4/mpich1_p4.c | 2 +-
src/plugins/mpi/mpichgm/mpichgm.c | 4 ++--
src/plugins/mpi/mpichgm/mpichgm.h | 2 +-
src/plugins/mpi/mpichmx/mpichmx.c | 4 ++--
src/plugins/mpi/mpichmx/mpichmx.h | 2 +-
src/plugins/mpi/mvapich/mvapich.h | 2 +-
src/plugins/mpi/none/mpi_none.c | 2 +-
src/plugins/mpi/openmpi/mpi_openmpi.c | 2 +-
src/plugins/mpi/pmi2/agent.c | 2 +-
src/plugins/mpi/pmi2/mpi_pmi2.c | 2 +-
src/plugins/mpi/pmi2/setup.c | 6 +++---
src/plugins/mpi/pmi2/setup.h | 4 ++--
src/sattach/opt.c | 9 ++++-----
src/slurmd/slurmstepd/mgr.c | 4 ++--
src/slurmd/slurmstepd/slurmstepd.c | 4 ++--
src/slurmd/slurmstepd/task.c | 7 +++----
src/srun/libsrun/opt.c | 2 +-
24 files changed, 50 insertions(+), 52 deletions(-)
rename src/common/{mpi.h => slurm_mpi.h} (99%)
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index 9aa2c23f8d9..486c3ba61f0 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -69,11 +69,11 @@
#include "src/common/fd.h"
#include "src/common/forward.h"
#include "src/common/hostlist.h"
-#include "src/common/mpi.h"
#include "src/common/net.h"
#include "src/common/plugstack.h"
#include "src/common/slurm_auth.h"
#include "src/common/slurm_cred.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/slurm_protocol_api.h"
#include "src/common/slurm_protocol_defs.h"
#include "src/common/slurm_time.h"
diff --git a/src/api/step_launch.h b/src/api/step_launch.h
index 277cc7c012f..e2890a5f1c9 100644
--- a/src/api/step_launch.h
+++ b/src/api/step_launch.h
@@ -51,10 +51,10 @@
#include "slurm/slurm.h"
-#include "src/common/slurm_step_layout.h"
-#include "src/common/eio.h"
#include "src/common/bitstring.h"
-#include "src/common/mpi.h"
+#include "src/common/eio.h"
+#include "src/common/slurm_mpi.h"
+#include "src/common/slurm_step_layout.h"
#include "src/api/step_io.h"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 353ec526346..9b78fe59944 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -49,7 +49,7 @@ libcommon_la_SOURCES = \
cbuf.c cbuf.h \
safeopen.c safeopen.h \
bitstring.c bitstring.h \
- mpi.c mpi.h \
+ mpi.c slurm_mpi.h \
pack.c pack.h \
parse_config.c parse_config.h \
parse_value.c parse_value.h \
diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index db471a01c9d..092d1d6fac5 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -154,17 +154,17 @@ am__libcommon_la_SOURCES_DIST = cpu_frequency.c cpu_frequency.h \
strnatcmp.h forward.c forward.h msg_aggr.c msg_aggr.h \
strlcpy.c strlcpy.h list.c list.h xtree.c xtree.h xhash.c \
xhash.h net.c net.h log.c log.h cbuf.c cbuf.h safeopen.c \
- safeopen.h bitstring.c bitstring.h mpi.c mpi.h pack.c pack.h \
- parse_config.c parse_config.h parse_value.c parse_value.h \
- parse_spec.c parse_spec.h plugin.c plugin.h plugrack.c \
- plugrack.h power.c power.h print_fields.c print_fields.h \
- read_config.c read_config.h node_select.c node_select.h env.c \
- env.h fd.c fd.h slurm_cred.h slurm_cred.c slurm_errno.c \
- slurm_ext_sensors.c slurm_ext_sensors.h slurm_priority.c \
- slurm_priority.h slurm_protocol_api.c slurm_protocol_api.h \
- slurm_protocol_pack.c slurm_protocol_pack.h \
- slurm_protocol_util.c slurm_protocol_util.h \
- slurm_protocol_socket_implementation.c \
+ safeopen.h bitstring.c bitstring.h mpi.c slurm_mpi.h pack.c \
+ pack.h parse_config.c parse_config.h parse_value.c \
+ parse_value.h parse_spec.c parse_spec.h plugin.c plugin.h \
+ plugrack.c plugrack.h power.c power.h print_fields.c \
+ print_fields.h read_config.c read_config.h node_select.c \
+ node_select.h env.c env.h fd.c fd.h slurm_cred.h slurm_cred.c \
+ slurm_errno.c slurm_ext_sensors.c slurm_ext_sensors.h \
+ slurm_priority.c slurm_priority.h slurm_protocol_api.c \
+ slurm_protocol_api.h slurm_protocol_pack.c \
+ slurm_protocol_pack.h slurm_protocol_util.c \
+ slurm_protocol_util.h slurm_protocol_socket_implementation.c \
slurm_protocol_socket_common.h slurm_protocol_common.h \
slurm_protocol_interface.h slurm_protocol_defs.c \
slurm_protocol_defs.h slurm_rlimits_info.h \
@@ -597,7 +597,7 @@ libcommon_la_SOURCES = \
cbuf.c cbuf.h \
safeopen.c safeopen.h \
bitstring.c bitstring.h \
- mpi.c mpi.h \
+ mpi.c slurm_mpi.h \
pack.c pack.h \
parse_config.c parse_config.h \
parse_value.c parse_value.h \
diff --git a/src/common/mpi.c b/src/common/mpi.c
index 7cd6e3b072f..a87cf2aac8b 100644
--- a/src/common/mpi.c
+++ b/src/common/mpi.c
@@ -43,11 +43,11 @@
#include <unistd.h>
#include <stdlib.h>
+#include "src/common/env.h"
#include "src/common/macros.h"
#include "src/common/plugin.h"
#include "src/common/plugrack.h"
-#include "src/common/env.h"
-#include "src/common/mpi.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
diff --git a/src/common/mpi.h b/src/common/slurm_mpi.h
similarity index 99%
rename from src/common/mpi.h
rename to src/common/slurm_mpi.h
index 49552d47c3b..12c01212341 100644
--- a/src/common/mpi.h
+++ b/src/common/slurm_mpi.h
@@ -1,5 +1,5 @@
/*****************************************************************************\
- * src/common/mpi.h - Generic mpi selector for slurm
+ * src/common/slurm_mpi.h - Generic mpi selector for slurm
*****************************************************************************
* Copyright (C) 2002-2006 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
diff --git a/src/plugins/mpi/lam/lam.h b/src/plugins/mpi/lam/lam.h
index 13c3cd43217..a052a89c86c 100644
--- a/src/plugins/mpi/lam/lam.h
+++ b/src/plugins/mpi/lam/lam.h
@@ -41,7 +41,7 @@
#endif
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
#include "src/common/env.h"
+#include "src/common/slurm_mpi.h"
//extern int lam_thr_create(mpi_plugin_client_info_t *job);
diff --git a/src/plugins/mpi/mpich1_p4/mpich1_p4.c b/src/plugins/mpi/mpich1_p4/mpich1_p4.c
index 443190797b0..d065409b023 100644
--- a/src/plugins/mpi/mpich1_p4/mpich1_p4.c
+++ b/src/plugins/mpi/mpich1_p4/mpich1_p4.c
@@ -51,8 +51,8 @@
#include "src/common/env.h"
#include "src/common/fd.h"
#include "src/common/hostlist.h"
-#include "src/common/mpi.h"
#include "src/common/net.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
diff --git a/src/plugins/mpi/mpichgm/mpichgm.c b/src/plugins/mpi/mpichgm/mpichgm.c
index caa78418f16..fe493a6af87 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpichgm.c
@@ -53,10 +53,10 @@
#include <strings.h>
#include "src/common/slurm_xlator.h"
+#include "src/common/net.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
-#include "src/common/net.h"
-#include "src/common/mpi.h"
#include "src/plugins/mpi/mpichgm/mpichgm.h"
diff --git a/src/plugins/mpi/mpichgm/mpichgm.h b/src/plugins/mpi/mpichgm/mpichgm.h
index b60c2b6974b..3aad4033995 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.h
+++ b/src/plugins/mpi/mpichgm/mpichgm.h
@@ -41,8 +41,8 @@
#endif
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
#include "src/common/env.h"
+#include "src/common/slurm_mpi.h"
typedef struct gmpi_state gmpi_state_t;
diff --git a/src/plugins/mpi/mpichmx/mpichmx.c b/src/plugins/mpi/mpichmx/mpichmx.c
index de24a3a31aa..adf0a32529e 100644
--- a/src/plugins/mpi/mpichmx/mpichmx.c
+++ b/src/plugins/mpi/mpichmx/mpichmx.c
@@ -52,10 +52,10 @@
#include <strings.h>
#include "src/common/slurm_xlator.h"
+#include "src/common/net.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
-#include "src/common/net.h"
-#include "src/common/mpi.h"
#include "src/plugins/mpi/mpichmx/mpichmx.h"
diff --git a/src/plugins/mpi/mpichmx/mpichmx.h b/src/plugins/mpi/mpichmx/mpichmx.h
index b897b8d5fc2..59b90bed00d 100644
--- a/src/plugins/mpi/mpichmx/mpichmx.h
+++ b/src/plugins/mpi/mpichmx/mpichmx.h
@@ -41,8 +41,8 @@
#endif
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
#include "src/common/env.h"
+#include "src/common/slurm_mpi.h"
typedef struct gmpi_state gmpi_state_t;
diff --git a/src/plugins/mpi/mvapich/mvapich.h b/src/plugins/mpi/mvapich/mvapich.h
index 22481bb6b7d..5ac5f6f71b2 100644
--- a/src/plugins/mpi/mvapich/mvapich.h
+++ b/src/plugins/mpi/mvapich/mvapich.h
@@ -45,8 +45,8 @@
#endif
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
#include "src/common/env.h"
+#include "src/common/slurm_mpi.h"
typedef struct mvapich_state mvapich_state_t;
diff --git a/src/plugins/mpi/none/mpi_none.c b/src/plugins/mpi/none/mpi_none.c
index 572cf0e97b3..c340799ae50 100644
--- a/src/plugins/mpi/none/mpi_none.c
+++ b/src/plugins/mpi/none/mpi_none.c
@@ -48,8 +48,8 @@
#include "slurm/slurm_errno.h"
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
#include "src/common/env.h"
+#include "src/common/slurm_mpi.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
/*
diff --git a/src/plugins/mpi/openmpi/mpi_openmpi.c b/src/plugins/mpi/openmpi/mpi_openmpi.c
index 917a3bf1628..86f386aa7ac 100644
--- a/src/plugins/mpi/openmpi/mpi_openmpi.c
+++ b/src/plugins/mpi/openmpi/mpi_openmpi.c
@@ -48,8 +48,8 @@
#include "slurm/slurm_errno.h"
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
#include "src/common/env.h"
+#include "src/common/slurm_mpi.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
/*
diff --git a/src/plugins/mpi/pmi2/agent.c b/src/plugins/mpi/pmi2/agent.c
index 32a85f59858..f4adf2c75ef 100644
--- a/src/plugins/mpi/pmi2/agent.c
+++ b/src/plugins/mpi/pmi2/agent.c
@@ -56,7 +56,7 @@
#include "src/common/slurm_xlator.h"
#include "src/common/eio.h"
-#include "src/common/mpi.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/xstring.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
diff --git a/src/plugins/mpi/pmi2/mpi_pmi2.c b/src/plugins/mpi/pmi2/mpi_pmi2.c
index dce8824ff6a..332ef296d7e 100644
--- a/src/plugins/mpi/pmi2/mpi_pmi2.c
+++ b/src/plugins/mpi/pmi2/mpi_pmi2.c
@@ -48,7 +48,7 @@
#include <slurm/slurm_errno.h>
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
+#include "src/common/slurm_mpi.h"
#include "setup.h"
#include "agent.h"
diff --git a/src/plugins/mpi/pmi2/setup.c b/src/plugins/mpi/pmi2/setup.c
index 63573880d3a..1d1845550c0 100644
--- a/src/plugins/mpi/pmi2/setup.c
+++ b/src/plugins/mpi/pmi2/setup.c
@@ -57,10 +57,10 @@
#include <dlfcn.h>
#include "src/common/slurm_xlator.h"
-#include "src/common/mpi.h"
-#include "src/common/xstring.h"
-#include "src/common/proc_args.h"
#include "src/common/net.h"
+#include "src/common/proc_args.h"
+#include "src/common/slurm_mpi.h"
+#include "src/common/xstring.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
#include "src/slurmd/common/reverse_tree_math.h"
diff --git a/src/plugins/mpi/pmi2/setup.h b/src/plugins/mpi/pmi2/setup.h
index 408993f87a8..0e0a91cedde 100644
--- a/src/plugins/mpi/pmi2/setup.h
+++ b/src/plugins/mpi/pmi2/setup.h
@@ -56,9 +56,9 @@
#include <slurm/slurm_errno.h>
#include "src/common/slurm_xlator.h"
-#include "src/common/xstring.h"
#include "src/common/pack.h"
-#include "src/common/mpi.h"
+#include "src/common/slurm_mpi.h"
+#include "src/common/xstring.h"
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
diff --git a/src/sattach/opt.c b/src/sattach/opt.c
index edf4bf5fe78..6f2ff7da415 100644
--- a/src/sattach/opt.c
+++ b/src/sattach/opt.c
@@ -65,18 +65,17 @@
#include "src/common/list.h"
#include "src/common/log.h"
#include "src/common/parse_time.h"
+#include "src/common/proc_args.h"
+#include "src/common/read_config.h" /* contains getnodename() */
+#include "src/common/slurm_mpi.h"
#include "src/common/slurm_protocol_api.h"
+#include "src/common/slurm_rlimits_info.h"
#include "src/common/uid.h"
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
-#include "src/common/slurm_rlimits_info.h"
-#include "src/common/read_config.h" /* contains getnodename() */
-#include "src/common/proc_args.h"
#include "src/sattach/opt.h"
-#include "src/common/mpi.h"
-
/* generic getopt_long flags, integers and *not* valid characters */
#define LONG_OPT_LAYOUT_ONLY 0x100
#define LONG_OPT_DEBUGGER_TEST 0x101
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index bd69c413f75..6ddb8ee1b73 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -93,12 +93,12 @@
#include "src/common/gres.h"
#include "src/common/hostlist.h"
#include "src/common/log.h"
-#include "src/common/mpi.h"
#include "src/common/node_select.h"
#include "src/common/plugstack.h"
#include "src/common/safeopen.h"
-#include "src/common/slurm_jobacct_gather.h"
#include "src/common/slurm_acct_gather_profile.h"
+#include "src/common/slurm_jobacct_gather.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/switch.h"
#include "src/common/util-net.h"
#include "src/common/xmalloc.h"
diff --git a/src/slurmd/slurmstepd/slurmstepd.c b/src/slurmd/slurmstepd/slurmstepd.c
index 3762675ed56..6b6f9d3802d 100644
--- a/src/slurmd/slurmstepd/slurmstepd.c
+++ b/src/slurmd/slurmstepd/slurmstepd.c
@@ -49,16 +49,16 @@
#include "src/common/cpu_frequency.h"
#include "src/common/gres.h"
-#include "src/common/mpi.h"
#include "src/common/node_select.h"
+#include "src/common/plugstack.h"
#include "src/common/slurm_jobacct_gather.h"
#include "src/common/slurm_acct_gather_profile.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/slurm_rlimits_info.h"
#include "src/common/stepd_api.h"
#include "src/common/switch.h"
#include "src/common/xmalloc.h"
#include "src/common/xsignal.h"
-#include "src/common/plugstack.h"
#include "src/slurmd/common/core_spec_plugin.h"
#include "src/slurmd/common/slurmstepd_init.h"
diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index 72a56eb5fff..5f497aeeb7c 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -78,15 +78,14 @@
#include "src/common/gres.h"
#include "src/common/fd.h"
#include "src/common/log.h"
-#include "src/common/mpi.h"
#include "src/common/plugstack.h"
-#include "src/slurmd/common/proctrack.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/switch.h"
-#include "src/slurmd/common/task_plugin.h"
#include "src/common/xsignal.h"
#include "src/common/xstring.h"
#include "src/common/xmalloc.h"
-
+#include "src/slurmd/common/proctrack.h"
+#include "src/slurmd/common/task_plugin.h"
#include "src/slurmd/slurmd/slurmd.h"
#include "src/slurmd/slurmstepd/pdebug.h"
#include "src/slurmd/slurmstepd/task.h"
diff --git a/src/srun/libsrun/opt.c b/src/srun/libsrun/opt.c
index b24c0295276..75bafe9ccfb 100644
--- a/src/srun/libsrun/opt.c
+++ b/src/srun/libsrun/opt.c
@@ -76,11 +76,11 @@
#include "src/common/cpu_frequency.h"
#include "src/common/list.h"
#include "src/common/log.h"
-#include "src/common/mpi.h"
#include "src/common/optz.h"
#include "src/common/parse_time.h"
#include "src/common/plugstack.h"
#include "src/common/proc_args.h"
+#include "src/common/slurm_mpi.h"
#include "src/common/slurm_protocol_api.h"
#include "src/common/slurm_protocol_interface.h"
#include "src/common/slurm_rlimits_info.h"
--
GitLab