Update MPI, HDF5, and Netcdf TriBITS find modules (#533, #534) #535
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,105 +37,128 @@ | |
| # ************************************************************************ | ||
| # @HEADER | ||
|
|
||
| cmake_policy(SET CMP0074 NEW) | ||
|
|
||
| set(Netcdf_ALLOW_MODERN FALSE CACHE BOOL "Allow finding Netcdf as a modern CMake config file with exported targets (and only this way)") | ||
|
|
||
| if (Netcdf_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) | ||
|
There was a problem hiding this comment. After seeing how to use this in SEACAS -- At least for SEACAS, I think that the Or, do I reorder things such that CGNS (which depends on HDF5) comes first and then netCDF? There was a problem hiding this comment.
@gsjaardema, you specify the dependencies as: HDF5 <-- CGNS <-- Netcdf See: It looks like GGNS already has a required dependency on HDF5 as per: TriBITS/tribits/common_tpls/FindTPLCGNSDependencies.cmake Lines 1 to 2 in 9fd56d2 But I had no idea that Netcdf depended on CGNS? Also not that, currently, TriBITS does not automatically enable upstream TPL dependencies for an enabled TPL. So the configure script will need to manually enable all of the TPLs it wants. (See NOTES at bottom of slide 16 "TriBITS External Packages/TPLs Dependencies (New!)" in the presentation TriBITS Modernization Update I gave last Thursday, Oct 27, 2022.) |
||
|
|
||
| set(minimum_modern_netCDF_version 4.7.4) | ||
| print_var(Netcdf_ALLOW_MODERN) | ||
| message("-- Using find_package(netCDF ${minimum_modern_netCDF_version} CONFIG) ...") | ||
| find_package(netCDF ${minimum_modern_netCDF_version} CONFIG) | ||
| if (netCDF_FOUND) | ||
| message("-- Found netCDF_CONFIG=${netCDF_CONFIG}") | ||
| message("-- Generating Netcdf::all_libs and NetcdfConfig.cmake") | ||
| tribits_extpkg_create_imported_all_libs_target_and_config_file( | ||
| Netcdf | ||
| INNER_FIND_PACKAGE_NAME netCDF | ||
| IMPORTED_TARGETS_FOR_ALL_LIBS netCDF::netcdf) | ||
| set(TPL_Netcdf_NOT_FOUND FALSE) | ||
| endif() | ||
|
|
||
| endif() | ||
|
|
||
| if (NOT TARGET Netcdf::all_libs) | ||
|
|
||
| # First, set up the variables for the (backward-compatible) TriBITS way of | ||
| # finding Netcdf. These are used in case find_package(Netcdf ...) is not | ||
| # called or does not find HDF5. Also, these variables need to be non-null | ||
| # in order to trigger the right behavior in the function | ||
| # tribits_tpl_find_include_dirs_and_libraries(). | ||
|
|
||
| set(REQUIRED_HEADERS netcdf.h) | ||
| set(REQUIRED_LIBS_NAMES netcdf) | ||
|
|
||
| if (TPL_ENABLE_MPI) | ||
| set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} pnetcdf) | ||
| endif() | ||
|
|
||
| # | ||
| # Second, search for Netcdf components (if allowed) using the standard | ||
| # find_package(NetCDF ...). | ||
| # | ||
| tribits_tpl_allow_pre_find_package(Netcdf Netcdf_ALLOW_PREFIND) | ||
| if (Netcdf_ALLOW_PREFIND) | ||
|
|
||
| message("-- Using find_package(Netcdf ...) ...") | ||
|
|
||
| set(CMAKE_MODULE_PATH | ||
bartlettroscoe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "${CMAKE_MODULE_PATH}" | ||
| "${CMAKE_CURRENT_LIST_DIR}/find_modules" | ||
| "${CMAKE_CURRENT_LIST_DIR}/utils" | ||
| ) | ||
|
|
||
| find_package(NetCDF) | ||
|
|
||
| if (NetCDF_FOUND) | ||
| set(DOCSTR "List of semi-colon separated paths to look for the TPL Netcdf") | ||
| set(TPL_Netcdf_Enables_Netcdf4 ${NetCDF_NEEDS_HDF5} CACHE BOOL | ||
| "True if netcdf enables netcdf-4") | ||
| set(TPL_Netcdf_Enables_PNetcdf ${NetCDF_NEEDS_PNetCDF} CACHE BOOL | ||
| "True if netcdf enables pnetcdf") | ||
| set(TPL_Netcdf_PARALLEL ${NetCDF_PARALLEL} CACHE INTERNAL | ||
| "True if netcdf compiled with parallel enabled") | ||
| set(TPL_Netcdf_LIBRARY_DIRS ${_hdf5_LIBRARY_SEARCH_DIRS} CACHE PATH | ||
| "${DOCSTR} library files") | ||
| set(TPL_Netcdf_LIBRARIES ${NetCDF_LIBRARIES} CACHE PATH | ||
| "List of semi-colon separated library names (not 'lib' or extension).") | ||
| set(TPL_Netcdf_INCLUDE_DIRS ${NetCDF_INCLUDE_DIRS} CACHE PATH | ||
| "${DOCSTR} header files.") | ||
| endif() | ||
| else() | ||
| # Curl library is only required if DAP is enabled; should detect inside | ||
| # FindNetCDF.cmake, but that is not being called... SEMS has DAP enabled; | ||
| # many HPC systems don't, but they override these settings... | ||
| find_program(NC_CONFIG "nc-config") | ||
| if (NC_CONFIG) | ||
| execute_process(COMMAND "nc-config --has-dap2" | ||
| OUTPUT_VARIABLE NETCDF_HAS_DAP2) | ||
| execute_process(COMMAND "nc-config --has-dap4" | ||
| OUTPUT_VARIABLE NETCDF_HAS_DAP4) | ||
| endif() | ||
| if ((NOT NC_CONFIG) OR NETCDF_HAS_DAP2 OR NETCDF_HAS_DAP4) | ||
| set(REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} curl) | ||
| endif() | ||
| endif() | ||
|
|
||
| # | ||
| # Third, call tribits_tpl_find_include_dirs_and_libraries() | ||
| # | ||
| tribits_tpl_find_include_dirs_and_libraries( Netcdf | ||
| REQUIRED_HEADERS ${REQUIRED_HEADERS} | ||
| REQUIRED_LIBS_NAMES ${REQUIRED_LIBS_NAMES} | ||
| ) | ||
| # NOTE: If find_package(Netcdf ...) was called and successfully found Netcdf, | ||
| # then tribits_tpl_find_include_dirs_and_libraries() will use the already-set | ||
| # variables TPL_Netcdf_INCLUDE_DIRS and TPL_Netcdf_LIBRARIES and then print | ||
| # them out (and set some other standard variables as well). This is the final | ||
| # "hook" into the TriBITS TPL system. | ||
|
|
||
| # If the `find_package(NetCDF)` is not run, then this may not be set | ||
| # Need to determine how this is set in the library that is being used... | ||
|
|
||
| if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") | ||
| assert_defined(TPL_Netcdf_INCLUDE_DIRS) | ||
| find_path(meta_path | ||
| NAMES "netcdf_meta.h" | ||
| HINTS ${TPL_Netcdf_INCLUDE_DIRS} | ||
| NO_DEFAULT_PATH) | ||
|
|
||
| if (meta_path) | ||
| # Search meta for NC_HAS_PARALLEL setting... | ||
| # Note that there is both NC_HAS_PARALLEL and NC_HAS_PARALLEL4, only want first... | ||
| file(STRINGS "${meta_path}/netcdf_meta.h" netcdf_par_string REGEX "NC_HAS_PARALLEL ") | ||
| string(REGEX MATCH "[01]" netcdf_par_val "${netcdf_par_string}") | ||
| if (netcdf_par_val EQUAL 1) | ||
| set(TPL_Netcdf_PARALLEL True CACHE INTERNAL | ||
| "True if netcdf compiled with parallel enabled") | ||
| endif() | ||
| endif() | ||
| if ("${TPL_Netcdf_PARALLEL}" STREQUAL "") | ||
| set(TPL_Netcdf_PARALLEL False CACHE INTERNAL | ||
| "True if netcdf compiled with parallel enabled") | ||
| endif() | ||
| endif() | ||
| message(STATUS "TPL_Netcdf_PARALLEL is ${TPL_Netcdf_PARALLEL}") | ||
| endif() | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| tribits_extpkg_define_dependencies( Netcdf | ||
| DEPENDENCIES HDF5) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ibaned @bartlettroscoe
Sorry for not noticing this prior to merging.
What is needed in the HDF5-1.10.X and HDF5-1.12.X versions to make them usable for this. Both of those versions are still in development, so it would be good to fix their CMake configurations if possible.
I can either contact the HDF5 group with the suggested changes, or one of you can also. Note that we have priority support with HDF5, so they will listen and most likely make useful changes that we suggest.