Verified Commit cf15284c authored by Julien Bigot's avatar Julien Bigot
Browse files

Fixed parallel NetCDF support

parent 5bd468c5
Pipeline #14373 passed with stages
in 14 minutes and 30 seconds
......@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
### Changed
* NetCDF 4.6.2 is now required for parallel NetCDF support.
### Deprecated
......
......@@ -509,6 +509,11 @@ if("${BUILD_DECL_NETCDF_PLUGIN}")
else()
set(NETCDF_CC "${CMAKE_C_COMPILER}")
endif()
if("${BUILD_NETCDF_PARALLEL}")
set(NETCDF_MIN_VERSION "4.6.2")
else()
set(NETCDF_MIN_VERSION "4.6.0")
endif()
set(NETCDF_CPATH "${SBUILD_CPATH}")
set(NETCDF_LIBRARY_PATH "${SBUILD_LIBRARY_PATH}")
if("${HDF5_FOUND}")
......@@ -532,7 +537,7 @@ if("${BUILD_DECL_NETCDF_PLUGIN}")
--disable-dap
--disable-utilities
--disable-testsets
VERSION 4.6.0
VERSION "${NETCDF_MIN_VERSION}"
)
if("${NETCDF_FOUND}")
if("${BUILD_NETCDF_PARALLEL}" AND NOT "PARALLEL4" IN_LIST NetCDF_FEATURES)
......
......@@ -41,7 +41,6 @@ To publish a new minor or major release:
When changing the list of dependencies or just the version of one dependency:
* update `pdi/docs/Source_installation.md`,
* update `README.md`,
* update `spack.yaml`,
* update PDI distribution CMakeLists.txt as well as all CMakeLists.txt actually using it,
* update the dockerfiles used for tests,
......
......@@ -191,6 +191,13 @@ Dependencies of **the Decl'HDF5 plugin**:
* the [HDF5](https://www.hdfgroup.org/solutions/hdf5/) library version 1.8.10 or above (provided),
* **a MPI implementation for the parallel version of the plugin (not provided)**.
Dependencies of **the Decl'NetCDF plugin**:
* the PDI library,
* the [NetCDF](https://www.unidata.ucar.edu/software/netcdf/) library version 4.6.2 or above (provided),
* the [HDF5](https://www.hdfgroup.org/solutions/hdf5/) library version 1.8.10 or above (provided),
* **a MPI implementation for the parallel version of the plugin (not provided)**.
Dependencies of **the MPI plugin**:
* the PDI library,
......
......@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
### Changed
* NetCDF 4.6.2 is now required for parallel NetCDF support.
### Deprecated
......
......@@ -50,7 +50,12 @@ if("${BUILD_NETCDF_PARALLEL}")
endif()
# NetCDF
find_package(NetCDF 4.6.0 REQUIRED)
if("${BUILD_NETCDF_PARALLEL}")
set(NETCDF_MIN_VERSION "4.6.2")
else()
set(NETCDF_MIN_VERSION "4.6.0")
endif()
find_package(NetCDF "${NETCDF_MIN_VERSION}" REQUIRED)
if("${BUILD_NETCDF_PARALLEL}" AND NOT "PARALLEL4" IN_LIST NetCDF_FEATURES)
message(FATAL_ERROR "Parallel NetCDF required, sequential NetCDF only found. Please set -DBUILD_NETCDF_PARALLEL=OFF to disable parallel NetCDF")
endif()
......
......@@ -40,7 +40,7 @@ spack:
- 'googletest@1.8.0: +gmock'
- 'hdf5@1.10.0:1.999.999'
- 'mpi'
- 'netcdf-c@4.6.0:4.999.999'
- 'netcdf-c@4.6.2:4.999.999'
- 'paraconf@0.4.14:0.999.999'
- 'pkgconfig'
- 'python@3.6.5:3.999.999'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment