diff --git a/doc/html/hdf5_profile_user_guide.shtml b/doc/html/hdf5_profile_user_guide.shtml index 3cb66e5ff2b7a9dd9239b67958c8bc6402c7974c..3be7d85c61e2133c86422b0f2750aee129f3830e 100644 --- a/doc/html/hdf5_profile_user_guide.shtml +++ b/doc/html/hdf5_profile_user_guide.shtml @@ -24,8 +24,8 @@ as a <b>Time Series</b> and also accumulate totals for each statistic for the job.</p> <p>Time Series are energy data collected by an acct_gather_energy plugin, -I/O data from a network interface collected by an acct_gather_infiniband plugin, -I/O data from parallel file systems such as Lustre collected by an +I/O data from a network interface collected by an acct_gather_interconnect +plugin, I/O data from parallel file systems such as Lustre collected by an acct_gather_filesystem plugin, and task performance data such as local disk I/O, cpu consumption, and memory use from a jobacct_gather plugin. Data from other sources may be added in the future.</p> @@ -293,7 +293,7 @@ correlate activity with other sources such as logs.</DD></DT> </DL> <h3>Network (Infiniband Data)</h3> -<p><b>JobAcctInfinibandType</b>=acct_gather_infiniband/ofed<p> +<p><b>JobAcctInfinibandType</b>=acct_gather_interconnect/ofed<p> is required in slurm.conf to collect task data. Appropriately set network=freq in either JobAcctGatherFrequency in slurm.conf or in --acctg-freq on the command line.</p> @@ -348,6 +348,6 @@ correlate activity with other sources such as logs.</DD></DT> -<p style="text-align:center;">Last modified 1 July 2013</p> +<p style="text-align:center;">Last modified 30 January 2020</p> <!--#include virtual="footer.txt"--> diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml index f28406ffefdbbb7b3373f9b548ada96c0b4d965a..a1b81ba9e91da0c575162f5554e2118273c367f4 100644 --- a/doc/html/quickstart_admin.shtml +++ b/doc/html/quickstart_admin.shtml @@ -110,7 +110,7 @@ present. Build dependencies for various plugins and commands are denoted below: <li> <b>IPMI Engergy Consumption</b> The <i>acct_gather_energy/ipmi</i> accouting plugin will be built if the <i>freeimpi</i> development library is present.</li> -<li> <b>InfiniBand Accounting</b> The <i>acct_gather_infiniband/ofed</i> +<li> <b>InfiniBand Accounting</b> The <i>acct_gather_interconnect/ofed</i> InfiniBand accounting plugin will be built if the <i>libibmad</i> and <i>libibumad</i> development libraries are present.</li> @@ -744,6 +744,6 @@ cd /usr/ports/sysutils/slurm-wlm && make install typical compute nodes. Installing from source allows the user to enable options such as mysql and gui tools via a configuration menu.</p> -<p style="text-align:center;">Last modified 26 April 2019</p> +<p style="text-align:center;">Last modified 30 January 2020</p> <!--#include virtual="footer.txt"--> diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1 index c1fd3c7fd133ecebcfac8cc66c02d35ddeda8951..3f0909b1ad11cb624349769bb1c3d477434f36be 100644 --- a/doc/man/man1/salloc.1 +++ b/doc/man/man1/salloc.1 @@ -100,7 +100,7 @@ for energy profiling using the acct_gather_energy plugin .TP \fBnetwork=\fI<interval>\fR where \fI<interval>\fR is the sampling interval in seconds -for infiniband profiling using the acct_gather_infiniband +for infiniband profiling using the acct_gather_interconnect plugin. .TP \fBfilesystem=\fI<interval>\fR diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1 index d1e67a8bcebb5be519fb0aa0cf78bb9423d9f671..2c51a559528a84f0361a9c530090531504ef3a2f 100644 --- a/doc/man/man1/sbatch.1 +++ b/doc/man/man1/sbatch.1 @@ -117,7 +117,7 @@ for energy profiling using the acct_gather_energy plugin .TP \fBnetwork=\fI<interval>\fR where \fI<interval>\fR is the sampling interval in seconds -for infiniband profiling using the acct_gather_infiniband +for infiniband profiling using the acct_gather_interconnect plugin. .TP \fBfilesystem=\fI<interval>\fR diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1 index 3b04194e4e6a3c9d3842daf33c1d38ab08a35eeb..ca5889679fede25b0b866d886f751c67a7a3f101 100644 --- a/doc/man/man1/srun.1 +++ b/doc/man/man1/srun.1 @@ -105,7 +105,7 @@ for energy profiling using the acct_gather_energy plugin .TP \fBnetwork=\fI<interval>\fR where \fI<interval>\fR is the sampling interval in seconds -for infiniband profiling using the acct_gather_infiniband +for infiniband profiling using the acct_gather_interconnect plugin. .TP \fBfilesystem=\fI<interval>\fR diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index a6c26527aae6543ee3d684664ba25fe8092ada93..7b0e4eb6a7e9368416ea4dc5878291d0367d6d21 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -237,10 +237,10 @@ network traffic by the jobs. Configurable values at present are: .RS .TP 20 -\fBacct_gather_infiniband/none\fR +\fBacct_gather_interconnect/none\fR No infiniband network data are collected. .TP -\fBacct_gather_infiniband/ofed\fR +\fBacct_gather_interconnect/ofed\fR Infiniband network traffic data are collected from the hardware monitoring counters of Infiniband devices through the OFED library. In order to account for per job network traffic, add the "ic/ofed" TRES to @@ -1051,7 +1051,7 @@ for energy profiling using the acct_gather_energy plugin .TP \fBnetwork=\fI<interval>\fR where \fI<interval>\fR is the sampling interval in seconds -for infiniband profiling using the acct_gather_infiniband +for infiniband profiling using the acct_gather_interconnect plugin. .TP \fBfilesystem=\fI<interval>\fR