Combined INSTALL_parallel and README_HPC content

CMakeInstallation.cmake

@@ -251,7 +251,7 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
       if (HDF5_ENABLE_PARALLEL)
         set (release_files
             ${release_files}
-            ${HDF5_SOURCE_DIR}/release_docs/INSTALL_parallel
+            ${HDF5_SOURCE_DIR}/release_docs/README_HPC.md
         )
       endif ()
     endif ()

README.md

@@ -51,7 +51,7 @@ Several more files are located within the [release_docs/][u4] directory with spe
 details for several common platforms and configurations.
 - INSTALL - Start Here. General instructions for compiling and installing the library or using an installed library
 - INSTALL_CMAKE - instructions for building with CMake (Kitware.com)
-- INSTALL_parallel - instructions for building and configuring Parallel HDF5
+- README_HPC.md - instructions for building and configuring Parallel HDF5 on HPC systems
 - INSTALL_Windows and INSTALL_Cygwin - MS Windows installations.
 - USING_HDF5_CMake - Build and Install HDF5 Applications with CMake
 - USING_CMake_Examples - Build and Test HDF5 Examples with CMake

config/cmake/scripts/CTestScript.cmake

@@ -264,15 +264,6 @@ set (ENV{CI_MODEL} ${MODEL})
     file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")
   endif ()
 
-  # On Cray XC40, configuring fails in the Fortran section when using the craype-mic-knl module.
-  # When the configure phase is done with the craype-haswell module and the build phase is done
-  # with the craype-mic-knl module, configure succeeds and tests pass on the knl compute nodes
-  # for Intel, Cray, GCC and Clang compilers.  If the variables aren't set or if not
-  # cross compiling, the module switch will not occur.
-  if (CMAKE_CROSSCOMPILING AND COMPILENODE_HWCOMPILE_MODULE AND COMPUTENODE_HWCOMPILE_MODULE)
-      execute_process (COMMAND module switch ${COMPILENODE_HWCOMPILE_MODULE} ${COMPUTENODE_HWCOMPILE_MODULE})
-  endif ()
-
   ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)
   if (LOCAL_SUBMIT)
     ctest_submit (PARTS Build)

config/cmake/scripts/HPC/qsub-HDF5options.cmake

@@ -21,11 +21,6 @@ endif()
 ### options to run test scripts in batch commands
 set (LOCAL_BATCH_SCRIPT_NAME "ctest.qsub")
 set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctest.qsub")
-if (DEFINED KNL)
-  ### some additions and alternatives to cross compile on haswell for knl
-  set (COMPUTENODE_HWCOMPILE_MODULE "craype-mic-knl")
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
-endif ()
 set (LOCAL_BATCH_SCRIPT_COMMAND "qsub")
 set (LOCAL_BATCH_TEST "TRUE")
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")

config/cmake/scripts/HPC/sbatch-HDF5options.cmake

@@ -19,17 +19,8 @@ if (DEFINED MPI)
 endif()
 #############################################################################################
 ### options to run test scripts in batch commands
-if (DEFINED KNL)
-  ### some additions and alternatives to cross compile on haswell for knl
-  set (COMPILENODE_HWCOMPILE_MODULE "craype-haswell")
-  set (COMPUTENODE_HWCOMPILE_MODULE "craype-mic-knl")
-  set (LOCAL_BATCH_SCRIPT_NAME "knl_ctestS.sl")
-  set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "knl_ctestP.sl")
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=config/toolchain/crayle.cmake")
-else ()
-  set (LOCAL_BATCH_SCRIPT_NAME "ctestS.sl")
-  set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctestP.sl")
-endif ()
+set (LOCAL_BATCH_SCRIPT_NAME "ctestS.sl")
+set (LOCAL_BATCH_SCRIPT_PARALLEL_NAME "ctestP.sl")
 set (LOCAL_BATCH_SCRIPT_COMMAND "sbatch")
 set (LOCAL_BATCH_TEST "TRUE")
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DLOCAL_BATCH_TEST:BOOL=ON")

release_docs/INSTALL_CMake.txt

@@ -65,9 +65,9 @@ from the HDF5 source code package using the CMake tools. This procedure
 will use the default settings in the config/cmake/cacheinit.cmake file.
 The HDF Group recommends using the presets process to build HDF5.
 
-NOTE: if you are using CMake 3.25 or later, you can use the presets process.
-    The CMakePresets.json file in the source directory will configure, build, test,
-    and package HDF5 with the same options that are set in the cacheinit.cmake file.
+NOTE: When using the presets process, the CMakePresets.json file in the source
+    directory will configure, build, test, and package HDF5 with the same options
+    that are set in the cacheinit.cmake file.
     In addition, it will get the optional files listed below that are needed, from
     the appropriate repositories.
     See Section X: Using CMakePresets.json for compiling
@@ -299,9 +299,7 @@ IV. Further Considerations
 ========================================================================
 
    1. We suggest you obtain the latest CMake from the Kitware
-      web site. The HDF5 2."X"."Y" product requires a minimum CMake version 3.18.
-      If you are using VS2022, the CMake minimum version is 3.21. CMakePresets
-      requires CMake 3.25.
+      web site. The HDF5 2."X"."Y" product requires a minimum CMake version 3.26.
 
    2. If you plan to use Zlib or Szip (aka libaec):
       A. Download the binary packages and install them in a central location.
@@ -766,7 +764,7 @@ These five steps are described in detail below.
    12. Parallel versus serial library
         The HDF5 library can be configured to use MPI and MPI-IO for
         parallelism on a distributed multi-processor system.  Read the
-        file INSTALL_parallel for detailed information.
+        file README_HPC.md for detailed information.
             HDF5_ENABLE_PARALLEL:BOOL=ON
 
         The threadsafe, C++ and Java interfaces are not compatible