From b91cb20c697ae58ca791ae3e1e191d59dc531039 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Sat, 26 Jan 2019 16:44:09 -0600
Subject: Add batch files with batch parameters specific to cori and ray.
 Release.txt entry for skipping long double dt_arith tests on ppc64.

---
 bin/batch/cori_ctestP.sl.in.cmake | 17 +++++++++++++++++
 bin/batch/cori_ctestS.sl.in.cmake | 16 ++++++++++++++++
 bin/batch/ctestP.sl.in.cmake      |  4 ++--
 bin/batch/ctestS.sl.in.cmake      |  3 ++-
 bin/batch/knl_ctestP.sl.in.cmake  |  2 +-
 bin/batch/knl_ctestS.sl.in.cmake  |  2 +-
 bin/batch/ray_ctestP.lsf.in.cmake | 20 ++++++++++++++++++++
 bin/batch/ray_ctestS.lsf.in.cmake | 18 ++++++++++++++++++
 release_docs/RELEASE.txt          |  9 +++++++++
 9 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 bin/batch/cori_ctestP.sl.in.cmake
 create mode 100644 bin/batch/cori_ctestS.sl.in.cmake
 create mode 100644 bin/batch/ray_ctestP.lsf.in.cmake
 create mode 100644 bin/batch/ray_ctestS.lsf.in.cmake

diff --git a/bin/batch/cori_ctestP.sl.in.cmake b/bin/batch/cori_ctestP.sl.in.cmake
new file mode 100644
index 0000000..90dd52a
--- /dev/null
+++ b/bin/batch/cori_ctestP.sl.in.cmake
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+#SBATCH -C knl,quad,cache
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestP
+
+cd @HDF5_BINARY_DIR@
+CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
+
+echo "Run $CMD. Test output will be in build/ctestP.out"
+$CMD >& ctestP.out
+echo "Done running $CMD"
+
diff --git a/bin/batch/cori_ctestS.sl.in.cmake b/bin/batch/cori_ctestS.sl.in.cmake
new file mode 100644
index 0000000..0ec7bf7
--- /dev/null
+++ b/bin/batch/cori_ctestS.sl.in.cmake
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#SBATCH -C knl,quad, cache
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestS
+
+cd @HDF5_BINARY_DIR@
+CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
+
+echo "Run $CMD. Test output will be in build/ctestS.out"
+$CMD  >& ctestS.out
+echo "Done running $CMD"
diff --git a/bin/batch/ctestP.sl.in.cmake b/bin/batch/ctestP.sl.in.cmake
index 230a642..9fed14d 100644
--- a/bin/batch/ctestP.sl.in.cmake
+++ b/bin/batch/ctestP.sl.in.cmake
@@ -5,10 +5,10 @@
 #SBATCH --mail-type=BEGIN,END,FAIL
 ##SBATCH --mail-user=<username>@sandia.gov
 #SBATCH --export=ALL
-#SBATCH --job-name=h5_ctestS
+#SBATCH --job-name=h5_ctestP
 
 cd @HDF5_BINARY_DIR@
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM -E t_cache_image -C Release -T test"
+CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
 
 echo "Run $CMD. Test output will be in build/ctestP.out"
 $CMD >& ctestP.out
diff --git a/bin/batch/ctestS.sl.in.cmake b/bin/batch/ctestS.sl.in.cmake
index 9802e13..a5d7d76 100644
--- a/bin/batch/ctestS.sl.in.cmake
+++ b/bin/batch/ctestS.sl.in.cmake
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+#SBATCH -p knl -C quad,cache
 #SBATCH --nodes=1
 #SBATCH -t 00:30:00
 #SBATCH --mail-type=BEGIN,END,FAIL
@@ -8,7 +9,7 @@
 #SBATCH --job-name=h5_ctestS
 
 cd @HDF5_BINARY_DIR@
-CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM -C Release -j 32 -T test"
+CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
 
 echo "Run $CMD. Test output will be in build/ctestS.out"
 $CMD  >& ctestS.out
diff --git a/bin/batch/knl_ctestP.sl.in.cmake b/bin/batch/knl_ctestP.sl.in.cmake
index 687804b..8d786da 100644
--- a/bin/batch/knl_ctestP.sl.in.cmake
+++ b/bin/batch/knl_ctestP.sl.in.cmake
@@ -10,7 +10,7 @@
 
 cd @HDF5_BINARY_DIR@
 #run parallel tests except t_cache_image test
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM -E t_cache_image -C Release -T test"
+CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
 
 echo "Run $CMD. Test output will be in build/ctestP.out"
 $CMD >& ctestP.out
diff --git a/bin/batch/knl_ctestS.sl.in.cmake b/bin/batch/knl_ctestS.sl.in.cmake
index de1335c..b983228 100644
--- a/bin/batch/knl_ctestS.sl.in.cmake
+++ b/bin/batch/knl_ctestS.sl.in.cmake
@@ -9,7 +9,7 @@
 #SBATCH --job-name=h5_ctestS
 
 cd @HDF5_BINARY_DIR@
-CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM -C Release -j 32 -T test"
+CMD="ctest . -E TEST_PAR|PH5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
 
 echo "Run $CMD. Test output will be in build/ctestS.out"
 $CMD  >& ctestS.out
diff --git a/bin/batch/ray_ctestP.lsf.in.cmake b/bin/batch/ray_ctestP.lsf.in.cmake
new file mode 100644
index 0000000..6b5316a
--- /dev/null
+++ b/bin/batch/ray_ctestP.lsf.in.cmake
@@ -0,0 +1,20 @@
+#!/bin/tcsh
+### LSF syntax
+#BSUB -n 6                       #number of nodes
+#BSUB -R "span[ptile=6]"
+#BSUB -W 30                      #walltime in minutes
+#BSUB -G guests                  #account
+#BSUB -e ctestPerrors.txt        #stderr
+#BSUB -o ctestPoutput.txt        #stdout
+#BSUB -J hdf5_ctestP             #job
+##BSUB -q pbatch                 #queue to use
+#BSUB -q pdebug
+
+##date; hostname
+##echo -n 'JobID is '; echo $LSB_JOBID
+
+cd @HDF5_BINARY_DIR@
+echo "Run parallel test command. Test output will be in build/ctestP.out"
+ctest . -R 'TEST_PAR|PH5DIFF|PERFORM|ph5example' -E t_cache_image -C Release -T test >& ctestP.out
+
+echo "Done running ctest parallel command."
diff --git a/bin/batch/ray_ctestS.lsf.in.cmake b/bin/batch/ray_ctestS.lsf.in.cmake
new file mode 100644
index 0000000..cbc7130
--- /dev/null
+++ b/bin/batch/ray_ctestS.lsf.in.cmake
@@ -0,0 +1,18 @@
+#!/bin/tcsh
+### LSF syntax
+#BSUB -n 1                       #number of nodes
+#BSUB -W 29                      #walltime in minutes
+#BSUB -G guests                  #account
+#BSUB -e ctestSerrors.txt        #stderr
+#BSUB -o ctestSoutput.txt        #stdout
+#BSUB -J hdf5_ctestS             #job
+##BSUB -q pbatch                 #queue to use
+#BSUB -q pdebug
+
+cd @HDF5_BINARY_DIR@
+echo "Run command. Test output will be in build/ctestS.out"
+ctest . -E 'TEST_PAR|H5DIFF|PERFORM|ph5example' -C Release -j 32 -T test >& ctestS.out
+
+##$CMD  >& ctestS.out
+echo "Done running command."
+
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 2dfcfc1..2af832b 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -637,6 +637,15 @@ Bug Fixes since HDF5-1.10.2 release
 
     Testing
     -------
+    - The dt_arith test failed on IBM Power8 and Power9 machines when testing
+      conversions from or to long double types, especially when special values
+      such as infinity or NAN were involved.  In some cases the results differed
+      by extremely small amounts from those on other machines, while some other
+      tests resulted in segmentation faults.  These conversion tests with long 
+      double types have been disabled for ppc64 machines until the problems are 
+      better understood and can be properly addressed.
+    
+      (SRL - 2019/01/07, TRILAB-98)
 
 Supported Platforms
 ===================
-- 
cgit v0.12


From cee36ca40d91ced2a417156feac3fd7407f0b82d Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Sun, 27 Jan 2019 17:55:44 -0600
Subject: Remove knl configuration from ctestS.sl.in.cmake. Add sandia batch
 files with account info.

---
 bin/batch/ctestS.sl.in.cmake        |  1 -
 bin/batch/sandia_ctestP.sl.in.cmake | 17 +++++++++++++++++
 bin/batch/sandia_ctestS.sl.in.cmake | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 bin/batch/sandia_ctestP.sl.in.cmake
 create mode 100644 bin/batch/sandia_ctestS.sl.in.cmake

diff --git a/bin/batch/ctestS.sl.in.cmake b/bin/batch/ctestS.sl.in.cmake
index a5d7d76..f772be9 100644
--- a/bin/batch/ctestS.sl.in.cmake
+++ b/bin/batch/ctestS.sl.in.cmake
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-#SBATCH -p knl -C quad,cache
 #SBATCH --nodes=1
 #SBATCH -t 00:30:00
 #SBATCH --mail-type=BEGIN,END,FAIL
diff --git a/bin/batch/sandia_ctestP.sl.in.cmake b/bin/batch/sandia_ctestP.sl.in.cmake
new file mode 100644
index 0000000..55d47eb
--- /dev/null
+++ b/bin/batch/sandia_ctestP.sl.in.cmake
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+##SBATCH --account=fy140085  # WC ID
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestP
+
+cd @HDF5_BINARY_DIR@
+CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
+
+echo "Run $CMD. Test output will be in build/ctestP.out"
+$CMD >& ctestP.out
+echo "Done running $CMD"
+
diff --git a/bin/batch/sandia_ctestS.sl.in.cmake b/bin/batch/sandia_ctestS.sl.in.cmake
new file mode 100644
index 0000000..3d491b7
--- /dev/null
+++ b/bin/batch/sandia_ctestS.sl.in.cmake
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+##SBATCH --account=fy140085  # WC ID
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestS
+
+cd @HDF5_BINARY_DIR@
+CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
+
+echo "Run $CMD. Test output will be in build/ctestS.out"
+$CMD  >& ctestS.out
+echo "Done running $CMD"
-- 
cgit v0.12


From 64114e331a90cec440f1d1f0943a0792c8802ca9 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Mon, 28 Jan 2019 12:43:35 -0600
Subject: Add HDF5options.cmake files for serial and parallel tests on HPC
 machines (where tests are to be run as batch jobs. Add README_HPC file with
 instructions for setting up configuration to use batch scripts for running
 tests on HPC machines and some pointers for cross compiling.

---
 config/cmake/scripts/HPC/par-HDF5options.cmake | 117 +++++++++++++++++++++++++
 config/cmake/scripts/HPC/ser-HDF5options.cmake | 117 +++++++++++++++++++++++++
 release_docs/README_HPC                        |  79 +++++++++++++++++
 3 files changed, 313 insertions(+)
 create mode 100644 config/cmake/scripts/HPC/par-HDF5options.cmake
 create mode 100644 config/cmake/scripts/HPC/ser-HDF5options.cmake
 create mode 100644 release_docs/README_HPC

diff --git a/config/cmake/scripts/HPC/par-HDF5options.cmake b/config/cmake/scripts/HPC/par-HDF5options.cmake
new file mode 100644
index 0000000..0527995
--- /dev/null
+++ b/config/cmake/scripts/HPC/par-HDF5options.cmake
@@ -0,0 +1,117 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+
+#############################################################################################
+####      maximum parallel processor count for build and test       ####
+set (MAX_PROC_COUNT 8)
+
+#############################################################################################
+####      alternate toolsets       ####
+#set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0")
+
+#############################################################################################
+####      Only build static libraries       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
+####      Add PICC option on linux/mac       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
+
+#############################################################################################
+####      fortran enabled      ####
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+    ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")
+####      fortran disabled      ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+    ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")
+
+#############################################################################################
+####      java enabled      ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+####      java disabled      ####
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
+
+#############################################################################################
+### change install prefix (default use INSTALLDIR value)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
+
+#############################################################################################
+####      ext libraries       ####
+
+### ext libs from tgz
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=TGZ -DTGZPATH:PATH=${CTEST_SCRIPT_DIRECTORY}")
+### ext libs from git
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=GIT")
+### ext libs on system
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=NO")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_LIBRARY:FILEPATH=some_location/lib/zlib.lib -DZLIB_INCLUDE_DIR:PATH=some_location/include")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib -DSZIP_INCLUDE_DIR:PATH=some_location/include")
+
+### disable using ext zlib
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF")
+### disable using ext szip
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
+
+####      package examples       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-1.10.9-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
+
+#############################################################################################
+### enable parallel builds
+
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF")
+
+#############################################################################################
+### enable thread-safety builds
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=ON")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_HL_LIB:BOOL=OFF")
+
+#############################################################################################
+### disable test program builds
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF")
+
+#############################################################################################
+### disable packaging
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON")
+### Create install package with external libraries (szip, zlib)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
+
+#############################################################################################
+### use a toolchain file
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/craype.cmake")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/GCC.cmake")
+
+#options to run test scripts in batch commands
+set (LOCAL_BATCH_TEST ON)
+set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch")
+set (LOCAL_BATCH_SCRIPT_NAME "knl_ctestS.sl")
+set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl")
+set(MPIEXEC_EXECUTABLE "srun")
+
+#############################################################################################
diff --git a/config/cmake/scripts/HPC/ser-HDF5options.cmake b/config/cmake/scripts/HPC/ser-HDF5options.cmake
new file mode 100644
index 0000000..71266ec
--- /dev/null
+++ b/config/cmake/scripts/HPC/ser-HDF5options.cmake
@@ -0,0 +1,117 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+#############################################################################################
+####  Change default configuration of options in config/cmake/cacheinit.cmake file        ###
+####  format: set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DXXX:YY=ZZZZ")                 ###
+#############################################################################################
+
+### uncomment/comment and change the following lines for other configuration options
+
+#############################################################################################
+####      maximum parallel processor count for build and test       ####
+#set (MAX_PROC_COUNT 8)
+
+#############################################################################################
+####      alternate toolsets       ####
+#set (CMAKE_GENERATOR_TOOLSET "Intel C++ Compiler 17.0")
+
+#############################################################################################
+####      Only build static libraries       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_SHARED_LIBS:BOOL=OFF")
+####      Add PICC option on linux/mac       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_ANSI_CFLAGS:STRING=-fPIC")
+
+#############################################################################################
+####      fortran enabled      ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=ON")
+    ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=ON")
+####      fortran disabled      ####
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+    ### enable Fortran 2003 depends on HDF5_BUILD_FORTRAN
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_F2003:BOOL=OFF")
+
+#############################################################################################
+####      java enabled      ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=ON")
+####      java disabled      ####
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
+
+#############################################################################################
+### change install prefix (default use INSTALLDIR value)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH=${INSTALLDIR}")
+
+#############################################################################################
+####      ext libraries       ####
+
+### ext libs from tgz
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=TGZ -DTGZPATH:PATH=${CTEST_SCRIPT_DIRECTORY}")
+### ext libs from git
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=GIT")
+### ext libs on system
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=NO")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DZLIB_LIBRARY:FILEPATH=some_location/lib/zlib.lib -DZLIB_INCLUDE_DIR:PATH=some_location/include")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSZIP_LIBRARY:FILEPATH=some_location/lib/szlib.lib -DSZIP_INCLUDE_DIR:PATH=some_location/include")
+
+### disable using ext zlib
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=OFF")
+### disable using ext szip
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
+
+####      package examples       ####
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-1.10.9-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
+
+#############################################################################################
+### enable parallel builds
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=OFF")
+
+#############################################################################################
+### enable thread-safety builds
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_THREADSAFE:BOOL=ON")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_HL_LIB:BOOL=OFF")
+
+#############################################################################################
+### disable test program builds
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF")
+
+#############################################################################################
+### disable packaging
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_NO_PACKAGES:BOOL=ON")
+### Create install package with external libraries (szip, zlib)
+set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_EXTLIBS:BOOL=ON")
+
+#############################################################################################
+### use a toolchain file
+
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/intel.cmake")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
+#set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/GCC.cmake")
+
+#options to run test scripts in batch commands
+set (LOCAL_BATCH_TEST ON)
+set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch")
+set (LOCAL_BATCH_SCRIPT_NAME "knl_ctestS.sl")
+set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl")
+set(MPIEXEC_EXECUTABLE "srun")
+
+#############################################################################################
diff --git a/release_docs/README_HPC b/release_docs/README_HPC
new file mode 100644
index 0000000..bdeab67
--- /dev/null
+++ b/release_docs/README_HPC
@@ -0,0 +1,79 @@
+HDF5 version 1.11.4 currently under development
+
+HDF5 source tar files with the HPC prefix are intended for use on clusters where 
+configuration and build steps will be done on a login node and executable and
+lib files that are built will be run on compute nodes.  
+
+Note these differences from the regular CMake tar and zip files:
+  - Test programs produced by this tar file will be run using batch scripts. 
+  - Serial and parallel HDF5options.cmake files, using parallel options by default.
+
+Note also that options are now available in HDF5 source to facilitate use of 
+toolchain files for using cross compilers available on login nodes to compile
+HDF5 for compute nodes.
+
+Instructions to configure build and test HDF5 using CMake:
+
+1. The cmake version must be 3.10 or later (cmake --version).
+2. Load or switch modules and set CC, FC, CXX for compilers desired.
+3. run build-unix.sh to configure, build, test and package HDF5 with CMake.
+
+Contents:
+
+build-unix.sh           Simple script for running CMake to configure, build, 
+                        test, and package HDF5.
+CTestScript.cmake       CMake script to configure, build, test and package 
+                        HDF5.
+hdf5-<version>          HDF5 source for <version>.
+HDF5config.cmake        CMake script to configure, build, test and package
+                        HDF5. 
+HDF5Examples            Source for HDF5 Examples.
+HDF5options.cmake       symlink to parallel or serial HDF5options.cmake files.
+                        Default is parallel file, which builds and tests both
+                        serial and parallel C and Fortran wrappers.
+                        To build serial only, C Fortran and C++ wrappers, delete
+                        The HDF5options.cmake link and run 
+                        'ln -s ser-HDF5options.cmake HDF5options.cmake' to switch.  
+par-HDF5options.cmake   Options file for HDF5 serial and parallel build and test.
+ser-HDF5options.cmake   Options file for HDF5 serial only build and test.
+SZip.tar.gz             Source for building SZip.
+ZLib.tar.gz             Source for buildng Zlib.
+
+
+To cross compile with this HPC-CMake tar.gz HDF5 source file:
+On Cray XC40  haswell login node for knl compute nodes using CMake and Cray modules:
+        1.  Uncomment line in HDF5options.txt to use a toolchain file - line 106 for
+            config/toolchain/crayle.cmake.
+        2.  Uncomment lines 110, 111, and 115 - 122 of HDF5options.cmake.
+            Line 110 allows configuring to complete on the haswell node.
+            Line 111 switches the compiler to build files for knl nodes.
+            Lines 115 - 122 set up test files to use sbatch to run build tests
+            in batch jobs on a knl compute node with 6 processes.
+        3.  Compiler module may be the default PrgEnv-intel/6.0.4 to use 
+            intel/18.0.2 or other intel, PrgEnv-cray/6.0.4 to use cce/8.7.4,
+            or PrgEnv-gnu/6.0.4 for GCC compilers.  PrgEnv-pgi/6.0.4 is also 
+            available but has not been tested with this tar file.
+        4.  These CMake options are set in config/toolchain/crayle.cmake:
+                set(CMAKE_SYSTEM_NAME Linux)
+                set(CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment")
+                set(CMAKE_C_COMPILER cc)
+                set(CMAKE_CXX_COMPILER c++)
+                set(CMAKE_Fortran_COMPILER ftn)
+                set(CMAKE_CROSSCOMPILING_EMULATOR "")
+
+        5.  Settings for two other cross-compiling options are also in the 
+            config/toolchain files which do not seem to be necessary with the 
+            Cray PrgEnv-* modules
+            a.  HDF5_USE_PREGEN.  This option, along with the HDF5_USE_PREGEN_DIR
+                CMake variable would allow the use of an appropriate H5Tinit.c 
+                file with type information generated on a compute node to be used
+                when cross compiling for those compute nodes.  The use of the 
+                variables in lines 110 and 111 of HDF5options.cmake file seem to
+                preclude needing this option with the available Cray modules and
+                CMake options.
+            b.  HDF5_BATCH_H5DETECT and associated CMake variables.  This option
+                when properly configured will run H5detect in a batch job on a
+                compute node at the beginning of the CMake build process.  It 
+                was also found to be unnecessary with the available Cray modules
+                and CMake options.
+-
-- 
cgit v0.12


From 252beb50b69d68ef087f00aded1994a3d9b235f0 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Mon, 28 Jan 2019 12:52:14 -0600
Subject: Account info can be submitted as an argument to run the batch
 scripts. Special versions for sandia are not needed.

---
 bin/batch/sandia_ctestP.sl.in.cmake | 17 -----------------
 bin/batch/sandia_ctestS.sl.in.cmake | 16 ----------------
 2 files changed, 33 deletions(-)
 delete mode 100644 bin/batch/sandia_ctestP.sl.in.cmake
 delete mode 100644 bin/batch/sandia_ctestS.sl.in.cmake

diff --git a/bin/batch/sandia_ctestP.sl.in.cmake b/bin/batch/sandia_ctestP.sl.in.cmake
deleted file mode 100644
index 55d47eb..0000000
--- a/bin/batch/sandia_ctestP.sl.in.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-##SBATCH --account=fy140085  # WC ID
-#SBATCH --nodes=1
-#SBATCH -t 00:30:00
-#SBATCH --mail-type=BEGIN,END,FAIL
-##SBATCH --mail-user=<username>@sandia.gov
-#SBATCH --export=ALL
-#SBATCH --job-name=h5_ctestP
-
-cd @HDF5_BINARY_DIR@
-CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
-
-echo "Run $CMD. Test output will be in build/ctestP.out"
-$CMD >& ctestP.out
-echo "Done running $CMD"
-
diff --git a/bin/batch/sandia_ctestS.sl.in.cmake b/bin/batch/sandia_ctestS.sl.in.cmake
deleted file mode 100644
index 3d491b7..0000000
--- a/bin/batch/sandia_ctestS.sl.in.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-##SBATCH --account=fy140085  # WC ID
-#SBATCH --nodes=1
-#SBATCH -t 00:30:00
-#SBATCH --mail-type=BEGIN,END,FAIL
-##SBATCH --mail-user=<username>@sandia.gov
-#SBATCH --export=ALL
-#SBATCH --job-name=h5_ctestS
-
-cd @HDF5_BINARY_DIR@
-CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
-
-echo "Run $CMD. Test output will be in build/ctestS.out"
-$CMD  >& ctestS.out
-echo "Done running $CMD"
-- 
cgit v0.12


From bae744199b69eb7c3f5eda2441cca30cb8c6175f Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Thu, 31 Jan 2019 14:22:52 -0600
Subject: Add more specific batch scripts. Add script raybsub to handle
 submitting .lsf files on ray with bsub < script.lsf syntax that we couldn't
 handle with CMake. Add hpc-cmake-tgz option for bin/release.

---
 bin/batch/cori_ctestP.sl.in.cmake      |   2 +-
 bin/batch/cori_ctestS.sl.in.cmake      |   2 +-
 bin/batch/cori_knl_ctestP.sl.in.cmake  |  17 ++++++
 bin/batch/cori_knl_ctestS.sl.in.cmake  |  16 ++++++
 bin/batch/raybsub                      |   7 +++
 bin/release                            | 102 ++++++++++++++++++++++++++++++++-
 config/cmake/scripts/CTestScript.cmake |  12 +++-
 src/CMakeLists.txt                     |   6 ++
 8 files changed, 157 insertions(+), 7 deletions(-)
 create mode 100644 bin/batch/cori_knl_ctestP.sl.in.cmake
 create mode 100644 bin/batch/cori_knl_ctestS.sl.in.cmake
 create mode 100644 bin/batch/raybsub

diff --git a/bin/batch/cori_ctestP.sl.in.cmake b/bin/batch/cori_ctestP.sl.in.cmake
index 90dd52a..6aa4916 100644
--- a/bin/batch/cori_ctestP.sl.in.cmake
+++ b/bin/batch/cori_ctestP.sl.in.cmake
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#SBATCH -C knl,quad,cache
+#SBATCH -C haswell
 #SBATCH --nodes=1
 #SBATCH -t 00:30:00
 #SBATCH --mail-type=BEGIN,END,FAIL
diff --git a/bin/batch/cori_ctestS.sl.in.cmake b/bin/batch/cori_ctestS.sl.in.cmake
index 0ec7bf7..502db3f 100644
--- a/bin/batch/cori_ctestS.sl.in.cmake
+++ b/bin/batch/cori_ctestS.sl.in.cmake
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#SBATCH -C knl,quad, cache
+#SBATCH -C haswell
 #SBATCH --nodes=1
 #SBATCH -t 00:30:00
 #SBATCH --mail-type=BEGIN,END,FAIL
diff --git a/bin/batch/cori_knl_ctestP.sl.in.cmake b/bin/batch/cori_knl_ctestP.sl.in.cmake
new file mode 100644
index 0000000..90dd52a
--- /dev/null
+++ b/bin/batch/cori_knl_ctestP.sl.in.cmake
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+#SBATCH -C knl,quad,cache
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestP
+
+cd @HDF5_BINARY_DIR@
+CMD="ctest . -R TEST_PAR|PH5DIFF|PERFORM|ph5example -E t_cache_image -C Release -T test"
+
+echo "Run $CMD. Test output will be in build/ctestP.out"
+$CMD >& ctestP.out
+echo "Done running $CMD"
+
diff --git a/bin/batch/cori_knl_ctestS.sl.in.cmake b/bin/batch/cori_knl_ctestS.sl.in.cmake
new file mode 100644
index 0000000..0ec7bf7
--- /dev/null
+++ b/bin/batch/cori_knl_ctestS.sl.in.cmake
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#SBATCH -C knl,quad, cache
+#SBATCH --nodes=1
+#SBATCH -t 00:30:00
+#SBATCH --mail-type=BEGIN,END,FAIL
+##SBATCH --mail-user=<username>@sandia.gov
+#SBATCH --export=ALL
+#SBATCH --job-name=h5_ctestS
+
+cd @HDF5_BINARY_DIR@
+CMD="ctest . -E TEST_PAR|H5DIFF|PERFORM|ph5example -C Release -j 32 -T test"
+
+echo "Run $CMD. Test output will be in build/ctestS.out"
+$CMD  >& ctestS.out
+echo "Done running $CMD"
diff --git a/bin/batch/raybsub b/bin/batch/raybsub
new file mode 100644
index 0000000..19dceef
--- /dev/null
+++ b/bin/batch/raybsub
@@ -0,0 +1,7 @@
+#!/bin/tcsh
+
+# ray.llnl.gov requires a '<' with bsub for submitting .lsf batch jobs.
+# CMake is reluctant to pass the '<', so we put it in this script and use
+# the script to submit the bsub command on ray.
+
+bsub < $1
diff --git a/bin/release b/bin/release
index e43be17..1cf1b13 100755
--- a/bin/release
+++ b/bin/release
@@ -55,13 +55,21 @@ for compressing the resulting tar archive (if none are given then
 
     tar		-- use tar and don't do any compressing.
     gzip	-- use gzip with "-9" and append ".gz" to the output name.
+    bzip2       -- use bzip2 with "-9" and append ".bz2" to the output name.
+    zip		-- convert all text files to DOS style and form a zip file for Windows use.
     cmake-tgz   -- create a tar file using the gzip default level with a build-unix.sh 
                    command file and all other CMake files needed to build HDF5 source
                    using CMake on unix machines.
-    bzip2       -- use bzip2 with "-9" and append ".bz2" to the output name.
-    zip		-- convert all text files to DOS style and form a zip file for Windows use.
     cmake-zip   -- convert all text files to DOS style and create a zip file inluding cmake
                    scripts and .bat files to build HDF5 source using CMake on Windows. 
+    hpc-cmake-tgz  
+                -- create a tar file using the gzip default level with a build-unix.sh 
+                   command file and all other CMake files needed to build HDF5 source
+                   using CMake on unix machines, with HDF5options.cmake files for serial
+                   and parallel builds on machines requiring batch jobs to run tests.
+                   The default is for parallel build, with serial only build by changing
+                   the HDF5options.cmake symlink to ser-HDF5options.cmake.  More 
+                   information is available in the README_HPC file.
     doc         -- produce the latest doc tree in addition to the archive.
 
 An md5 checksum is produced for each archive created and stored in the md5 file.
@@ -256,7 +264,7 @@ tar2cmakezip()
 }
 
 # Function name: tar2cmaketgz
-# Convert the release tarball to a Windows zipball with files to run CMake build.
+# Convert the release tarball to a gzipped tar file with files to run CMake build.
 #
 # Programmer: Larry Knox
 # Creation date: 2017-02-20
@@ -330,6 +338,94 @@ tar2cmaketgz()
     rm -rf $cmgztmpdir
 }
 
+# Function name: tar2hpccmaketgz
+# Convert the release tarball to a gzipped tarfile with files to run CMake build
+# and HDF5options.cmake files for parallel or serial only builds where build
+# tests are run on compute nodes using batch scripts.
+#
+# Programmer: Larry Knox
+# Creation date: 2019-01-28
+#
+# Modifications
+#
+# Steps:
+# 1. untar the tarball in a temporary directory;
+#    Note: do this in a temporary directory to avoid changing
+#    the original source directory which may be around.
+# 2. add build-unix.sh script.
+# 3. add SZIP.tar.gz, ZLib.tar.gz and cmake files to top level directory.
+# 4. create gzipped tar file with these contents:
+#        build-unix.sh          script
+#        hdf5-<version>         source code directory extracted from tar file
+#        CTestScript.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5config.cmake       cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        HDF5options.cmake      cmake file copied from <hdf5 source code>/config/cmake/scripts
+#        SZip.tar.gz            copied from /mnt/scr1/pre-release/hdf5/CMake
+#        ZLib.tar.gz            copied from /mnt/scr1/pre-release/hdf5/CMake
+#
+# 5. For HPC-CMake tgz file the following are also needed in the top-level directory:
+#        README_HPC                 copied from release_docs
+#        ser-HDF5options.cmake      copied from <hdf5 source code>/config/cmake/scripts/HPC
+#        par-HDF5options.cmake      copied from <hdf5 source code>/config/cmake/scripts/HPC
+#        HDF5options.cmake          symlink to par-HDF5options.cmake
+#
+
+# Parameters:
+# $1 version
+# $2 release tarball
+# $3 output zipball file name
+#
+# Returns 0 if successful; 1 otherwise
+#
+ # need function to create another temporary directory, extract the
+            # $tmpdir/$HDF5_VERS.tar into it, create build-unix.sh,
+            # add CTestScript.cmake, HDF5config.cmake, SZIP.tar.gz
+            # ZLib.tar.gz, HDF5 examples, and then tar.gz it.
+tar2hpccmaketgz()
+{
+    if [ $# -ne 3 ]; then
+	echo "usage: tar2cmaketgz <tarfilename> <tgzfilename>"
+	return 1
+    fi
+    cmgztmpdir=/tmp/cmgztmpdir$$
+    cmgztmpsubdir=$cmgztmpdir/CMake-$HDF5_VERS
+    mkdir -p $cmgztmpsubdir
+    version=$1
+    tarfile=$2
+    tgzfile=$3
+
+    # step 1: untar tarball in cmgztmpdir
+    (cd $cmgztmpsubdir; tar xf -) < $tarfile
+    # sanity check
+    if [ ! -d $cmgztmpsubdir/$version ]; then
+	echo "untar did not create $cmgztmpsubdir/$version source dir"
+	# cleanup
+	rm -rf $cmgztmpdir
+	return 1
+    fi
+
+
+    # step 2: add build-unix.sh script
+    (cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
+
+    # step 3: add SZIP.tar.gz, ZLib.tar.gz and cmake files
+    cp /mnt/scr1/pre-release/hdf5/CMake/SZip.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.10-Source.tar.gz $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
+
+    cp $cmgztmpsubdir/$version/release_docs/README_HPC $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/ser-HDF5options.cmake $cmgztmpsubdir
+    cp $cmgztmpsubdir/$version/config/cmake/scripts/HPC/par-HDF5options.cmake $cmgztmpsubdir
+    (cd $cmgztmpsubdir; ln -s par-HDF5options.cmake HDF5options.cmake)
+    tar czf $DEST/CMake-$HDF5_VERS.tar.gz -C $cmgztmpdir . || exit 1 
+                 
+    # cleanup
+    rm -rf $cmgztmpdir
+}
+
 # This command must be run at the top level of the hdf5 source directory.
 # Verify this requirement.
 if [ ! \( -f configure.ac -a -f bin/release \) ]; then
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index eb466d2..c380a9d 100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -277,7 +277,11 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
         ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
       else ()
         file(STRINGS ${CTEST_BINARY_DIRECTORY}/Testing/TAG TAG_CONTENTS REGEX "^2([0-9]+)[-]([0-9]+)$")
-        execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
+        if ("${LOCAL_BATCH_SCRIPT_COMMAND}" STREQUAL "raybsub")
+          execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
+        else ()
+          execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_NAME})
+        endif ()        
         message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
         execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
         while(result)
@@ -292,7 +296,11 @@ message (STATUS "Dashboard script configuration:\n${vars}\n")
           file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/SerialTest.xml)
           file (RENAME ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}.log ${CTEST_BINARY_DIRECTORY}/Testing/Temporary/LastTest_${TAG_CONTENTS}_Serial.log)
           unset(result CACHE)
-          execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+          if ("${LOCAL_BATCH_SCRIPT_COMMAND}" STREQUAL "raybsub")
+            execute_process (COMMAND ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+          else ()
+            execute_process (COMMAND ${LOCAL_BATCH_SCRIPT_COMMAND} ${CTEST_BINARY_DIRECTORY}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME})
+          endif ()
           message(STATUS "Check for existence of ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml")
           execute_process(COMMAND ls ${CTEST_BINARY_DIRECTORY}/Testing/${TAG_CONTENTS}/Test.xml RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
           while(result)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff7402b..6b105a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -944,6 +944,12 @@ if (BUILD_SHARED_LIBS)
 endif ()
 
 if (LOCAL_BATCH_TEST)
+  if ("${LOCAL_BATCH_SCRIPT_COMMAND}" STREQUAL "raybsub")
+    configure_file (
+        ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_COMMAND}
+        ${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_COMMAND} ESCAPE_QUOTES @ONLY
+    )
+  endif ()
   if (LOCAL_BATCH_SCRIPT_NAME)
     configure_file (
         ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME}.in.cmake
-- 
cgit v0.12