rename sprfmrgh5 to sh5util

doc/html/acct_gather_profile_plugins.shtml

@@ -29,15 +29,15 @@ parallel file system, disk I/O counts, cpu and memory utilization
 for each task, and a record of energy use.
 
 <p>The reference implementation stores this data in a HDF5 file for each step
-on each node for the jobs. A separate program 
-(<a href="sprfmrgh5.html">sprfmrgh5</a>) is provided to 
+on each node for the jobs. A separate program
+(<a href="sh5util5.html">sh5util</a>) is provided to
 consolidate all the node-step files in one container for the job.
 HDF5 is a well known structured data set that allows different types of
 related data to be stored in one file. Its internal structure resembles a
 file system with <i>groups</i> being similar to <i>directories</i> and
 <i>data sets</i> being similar to <i>files</i>. There are commodity programs, 
 notably <b>HDF5View</b> for viewing and manipulating these files.
-<b>sprfmrgh5</b> also provides some capability for extracting subsets of date
+<b>sh5util</b> also provides some capability for extracting subsets of date
 for import into other analysis tools like spreadsheets.
 
 <p>This plugin is incompatible with --enable-front-end. It you need to 

doc/html/man_index.shtml

@@ -18,7 +18,7 @@ Documentation for other versions of Slurm is distributed with the code</b></p>
 <tr><td><a href="slurm.html">slurm</a></td><td>SLURM system overview.</td></tr>
 <tr><td><a href="smap.html">smap</a></td><td>graphically view information about SLURM jobs, partitions, and set configurations parameters.</td></tr>
 <tr><td><a href="sprio.html">sprio</a></td><td>view the factors that comprise a job's scheduling priority</td></tr>
-<tr><td><a href="sprfmrgh5.html">sprfmrgh5</a></td><td>merge utility for acct_gather_profile plugin.</td></tr>
+<tr><td><a href="sh5util.html">shdf5util</a></td><td>merge utility for acct_gather_profile plugin.</td></tr>
 <tr><td><a href="squeue.html">squeue</a></td><td>view information about jobs located in the SLURM scheduling queue.</td></tr>
 <tr><td><a href="sreport.html">sreport</a></td><td>Generate reports from the slurm accounting data.</td></tr>
 <tr><td><a href="srun_cr.html">srun_cr</a></td><td>run parallel jobs with checkpoint/restart support</td></tr>

doc/man/man1/Makefile.am

@@ -14,7 +14,7 @@ man1_MANS = \
 	slurm.1 \
 	smap.1 \
 	sprio.1 \
-	sprfmrgh5.1 \
+	sh5util.1 \
 	squeue.1 \
 	sreport.1 \
 	srun.1 \
@@ -41,7 +41,7 @@ html_DATA = \
 	sinfo.html \
 	smap.html \
 	sprio.html \
-	sprfmrgh5.html \
+	sh5util.html \
 	squeue.html \
 	sreport.html \
 	srun.html \

doc/man/man1/sh5util.1

-.TH "sprfmrgh5" "1" "SLURM 2.6" "March 2013" "SLURM Commands"
+.TH "sh5util" "1" "SLURM 2.6" "March 2013" "SLURM Commands"
 .SH "NAME"
 .LP
-sprfmrgh5 \- Tool for merging HDF5 files from the acct_gather_profile 
+sh5util \- Tool for merging HDF5 files from the acct_gather_profile 
 plugin that gathers detailed data for jobs running under SLURM
 
 .SH "SYNOPSIS"
 .LP
-sprfmrgh5
+sh5util
 
 .SH "DESCRIPTION"
 .LP
-sprfmrgh5 merges HDF5 files produced on each node for each step of a job into
+sh5util merges HDF5 files produced on each node for each step of a job into
 one HDF5 file for the job. The resulting file can be viewed and manipulated
 by common HDF5 tools such as HDF5View, h5dump, h5edit, or h5ls.
 .LP
-sprfmrgh5 has two execution modes. The first mode merges all the node-step 
+sh5util has two execution modes. The first mode merges all the node-step 
 files for a job into one job file. The second mode extracts a limited set of
 data for specific nodes, steps, and data series.
 The extract mode is set with the \fB\-\-extract\fR command line option.
 .LP
-The merge mode of sprfmrgh5 is expected to be launched during the controller 
+The merge mode of sh5util is expected to be launched during the controller 
 epilog script using the SLURM_JOB_ID environment variable. 
 However, it can be launched on any system with access to the shared file 
 system.

src/plugins/acct_gather_profile/hdf5/sh5util/Makefile.am

 #
-# Makefile for sprfmrgh5
+# Makefile for sh5util
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/plugins/acct_gather_profile/common
-bin_PROGRAMS = sprfmrgh5
+INCLUDES = -I$(top_srcdir) -I../
 
-sprfmrgh5_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS)
+SHDF5_SOURCES = sh5util.c sh5util.h
 
-sprfmrgh5_SOURCES = sprfmrgh5.c sprfmrg5.h	\
-		   ../common/profile_hdf5.c    ../common/profile_hdf5.h
+if BUILD_HDF5
 
-force:
-$(sprfmrgh5_LDADD) : force
-	@cd `dirname $@` && $(MAKE) `basename $@`
+bin_PROGRAMS = sh5util
+
+sh5util_SOURCES = $(SHDF5_SOURCES)
+sh5util_LDADD = $(top_builddir)/src/api/libslurm.o $(DL_LIBS) \
+	../libhdf5_api.la
 
-sprfmrgh5_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) \
+sh5util_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) \
 	$(HWLOC_LDFLAGS) $(HWLOC_LIBS) $(HDF5_LDFLAGS) $(HDF5_LIBS)
 
+force:
+$(sh5util_LDADD) : force
+	@cd `dirname $@` && $(MAKE) `basename $@`
+
+else
+EXTRA_sh5util_SOURCES = $(SHDF5_SOURCES)
+endif

src/plugins/acct_gather_profile/hdf5/sh5util/sh5util.c

 /*****************************************************************************\
- *  sprfmrgh5.c - slurm profile accounting plugin for io and energy using hdf5.
- *              - Utility to merge node-step files into a job file
- *              - or extract data from an job file
+ *  sh5util.c - slurm profile accounting plugin for io and energy using hdf5.
+ *            - Utility to merge node-step files into a job file
+ *            - or extract data from an job file
  *****************************************************************************
  *  Copyright (C) 2013 Bull S. A. S.
  *		Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois.

src/plugins/acct_gather_profile/hdf5/sh5util/sh5util.h

 /*****************************************************************************\
- *  sprfmrgh5.h - slurm profile accounting plugin for io and energy using hdf5.
+ *  sh5util.h - slurm profile accounting plugin for io and energy using hdf5.
  *****************************************************************************
  *  Copyright (C) 2013 Bull S. A. S.
  *		Bull, Rue Jean Jaures, B.P.68, 78340, Les Clayes-sous-Bois.
@@ -36,8 +36,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
-#ifndef _GATHER_PROFILE_SPRFMRGH5_H_
-#define _GATHER_PROFILE_SPRFMRGH5_H_
+#ifndef _GATHER_PROFILE_SH5UTIL_H_
+#define _GATHER_PROFILE_SH5UTIL_H_
 
 /* ============================================================================
  * ============================================================================