HDF5 1.14.4.3, Zlib 2.2.1, FindHDF5 efficiency

Author: scivision

cmake/FindHDF5.cmake

@@ -157,7 +157,7 @@ message(DEBUG "HDF5 version match 0, 1: ${CMAKE_MATCH_0}   ${CMAKE_MATCH_1}")
 
 # avoid picking up incompatible zlib over the desired zlib
 if(NOT ZLIB_ROOT)
-  get_filename_component(ZLIB_ROOT ${HDF5_C_INCLUDE_DIR} DIRECTORY)
+  cmake_path(GET HDF5_C_INCLUDE_DIR PARENT_PATH ZLIB_ROOT)
   list(APPEND ZLIB_ROOT ${HDF5_ROOT})
 endif()
 
@@ -226,6 +226,8 @@ endif()
 
 hdf5_fortran_wrap(hdf5_lib_dirs hdf5_inc_dirs)
 
+# "PATH" Env var is useful on HPC for finding HDF5 libraries
+
 if(MSVC)
   set(CMAKE_FIND_LIBRARY_PREFIXES lib)
 endif()
@@ -236,7 +238,7 @@ set(_hl_stub_names hdf5_hl_f90cstub)
 set(_stub_names hdf5_f90cstub)
 
 # distro names (Ubuntu)
-if(parallel IN_LIST HDF5_FIND_COMPONENTS)
+if(HDF5_parallel_FOUND)
   list(APPEND _names hdf5_openmpi_fortran hdf5_mpich_fortran)
   list(APPEND _hl_names hdf5_openmpihl_fortran hdf5_mpichhl_fortran)
 else()
@@ -265,28 +267,27 @@ NAMES_PER_DIR
 DOC "HDF5 Fortran API"
 )
 
+cmake_path(GET HDF5_Fortran_LIBRARY PARENT_PATH hdf5_libdir)
+
 find_library(HDF5_Fortran_HL_LIBRARY
 NAMES ${_hl_names}
-HINTS ${HDF5_ROOT} ${hdf5_lib_dirs}
-PATH_SUFFIXES ${hdf5_lsuf}
-NAMES_PER_DIR
+HINTS ${hdf5_libdir}
+NO_DEFAULT_PATH
 DOC "HDF5 Fortran HL high-level API"
 )
 
 # not all platforms have this stub
 find_library(HDF5_Fortran_HL_stub
 NAMES ${_hl_stub_names}
-HINTS ${HDF5_ROOT} ${hdf5_lib_dirs}
-PATH_SUFFIXES ${hdf5_lsuf}
-NAMES_PER_DIR
+HINTS ${hdf5_libdir}
+NO_DEFAULT_PATH
 DOC "Fortran C HL interface, not all HDF5 implementations have/need this"
 )
 
 find_library(HDF5_Fortran_stub
 NAMES ${_stub_names}
-HINTS ${HDF5_ROOT} ${hdf5_lib_dirs}
-PATH_SUFFIXES ${hdf5_lsuf}
-NAMES_PER_DIR
+HINTS ${hdf5_libdir}
+NO_DEFAULT_PATH
 DOC "Fortran C interface, not all HDF5 implementations have/need this"
 )
 
@@ -303,7 +304,7 @@ if(HDF5_ROOT)
   DOC "HDF5 Fortran module path"
   )
 else()
-  if(parallel IN_LIST HDF5_FIND_COMPONENTS)
+  if(HDF5_parallel_FOUND)
     # HDF5-MPI system library presents a unique challenge, as when non-MPI HDF5 is
     # also installed, which is typically necessary for other system libraries, the
     # HDF5-MPI compiler wrapper often includes that wrong non-MPI include dir first.
@@ -362,8 +363,15 @@ endfunction(find_hdf5_fortran)
 
 function(find_hdf5_cxx)
 
+if(parallel IN_LIST HDF5_FIND_COMPONENTS AND NOT HDF5_parallel_FOUND)
+  # avoid expensive C++ find when MPI isn't linked properly
+  return()
+endif()
+
 hdf5_cxx_wrap(hdf5_lib_dirs hdf5_inc_dirs)
 
+# "PATH" Env var is useful on HPC for finding HDF5 libraries
+
 if(MSVC)
   set(CMAKE_FIND_LIBRARY_PREFIXES lib)
 endif()
@@ -372,7 +380,7 @@ set(_names hdf5_cpp)
 set(_hl_names hdf5_hl_cpp)
 
 # distro names (Ubuntu)
-if(parallel IN_LIST HDF5_FIND_COMPONENTS)
+if(HDF5_parallel_FOUND)
   list(APPEND _names hdf5_openmpi_cpp hdf5_mpich_cpp)
   list(APPEND _hl_names hdf5_openmpi_hl_cpp hdf5_mpich_hl_cpp)
 else()
@@ -397,11 +405,12 @@ NAMES_PER_DIR
 DOC "HDF5 C++ API"
 )
 
+cmake_path(GET HDF5_CXX_LIBRARY PARENT_PATH hdf5_libdir)
+
 find_library(HDF5_CXX_HL_LIBRARY
 NAMES ${_hl_names}
-HINTS ${HDF5_ROOT} ${hdf5_lib_dirs}
-PATH_SUFFIXES ${hdf5_lsuf}
-NAMES_PER_DIR
+HINTS ${hdf5_libdir}
+NO_DEFAULT_PATH
 DOC "HDF5 C++ high-level API"
 )
 
@@ -425,6 +434,8 @@ function(find_hdf5_c)
 
 hdf5_c_wrap(hdf5_lib_dirs hdf5_inc_dirs)
 
+# "PATH" Env var is useful on HPC for finding HDF5 libraries
+
 if(MSVC)
   set(CMAKE_FIND_LIBRARY_PREFIXES lib)
 endif()
@@ -459,11 +470,12 @@ NAMES_PER_DIR
 DOC "HDF5 C library (necessary for all languages)"
 )
 
+cmake_path(GET HDF5_C_LIBRARY PARENT_PATH hdf5_libdir)
+
 find_library(HDF5_C_HL_LIBRARY
 NAMES ${_hl_names}
-HINTS ${HDF5_ROOT} ${hdf5_lib_dirs}
-PATH_SUFFIXES ${hdf5_lsuf}
-NAMES_PER_DIR
+HINTS ${hdf5_libdir}
+NO_DEFAULT_PATH
 DOC "HDF5 C high level interface"
 )
 
@@ -488,7 +500,7 @@ function(hdf5_fortran_wrap lib_var inc_var)
 set(lib_dirs)
 set(inc_dirs)
 
-if(parallel IN_LIST HDF5_FIND_COMPONENTS)
+if(HDF5_parallel_FOUND)
   set(wrapper_names h5pfc h5pfc.openmpi h5pfc.mpich)
 else()
   set(wrapper_names h5fc)
@@ -545,7 +557,7 @@ function(hdf5_cxx_wrap lib_var inc_var)
 set(lib_dirs)
 set(inc_dirs)
 
-if(parallel IN_LIST HDF5_FIND_COMPONENTS)
+if(HDF5_parallel_FOUND)
  set(wrapper_names h5c++.openmpi h5c++.mpich)
 else()
   set(wrapper_names h5c++)
@@ -743,10 +755,10 @@ endfunction(check_fortran_links)
 
 function(check_hdf5_link)
 
-# HDF5 bug #3663 for HDF5 1.14.2, 1.14.3, ...?
+# HDF5 bug #3663 for HDF5 1.14.2,  ...?
 # https://github.com/HDFGroup/hdf5/issues/3663
 if(WIN32 AND CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
-if(HDF5_VERSION MATCHES "1.14.[2-3]")
+if(HDF5_VERSION MATCHES "1.14.[2-4]")
   message(VERBOSE "FindHDF5: applying workaround for HDF5 bug #3663 with Intel oneAPI on Windows")
   list(APPEND CMAKE_REQUIRED_LIBRARIES shlwapi)
 endif()

cmake/libraries.json

@@ -1,9 +1,9 @@
 {
   "zlib": {
     "url" : "https://github.com/zlib-ng/zlib-ng.git",
-    "tag": "2.1.6"
+    "tag": "2.2.1"
   },
   "hdf5": {
-    "url": "https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.4.2/hdf5-1.14.4-2.tar.gz"
+    "url": "https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.4.3/hdf5_1.14.4.3.tar.gz"
   }
 }