Merge branch 'develop' into feature/nselliott/gen-partition

CHANGELOG.md

@@ -4,6 +4,27 @@ Notable changes to Conduit are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project aspires to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Added
+
+#### General
+- Added  `conduit::utils::info_handler()`, `conduit::utils::warning_handler()`, and `conduit::utils::error_handler()`  methods, which provide access to the currently registered info, warning, and error handlers.
+- Added DataType::index_t method. Creates a DataType instance that describes an `index_t`, which is an alias to either `int32`, or `int 64` controlled by the `CONDUIT_INDEX_32` compile time option.
+- Added several more methods to Python DataType interface
+
+#### Relay
+- Added Relay HDF5 support for reading and writing to an HDF5 dataset with offset.
+- Added `conduit::relay::io::hdf5::read_info` which allows you to obtain metadata from an HDF5 file.
+- Added configure error when conduit lacks MPI support and HDF5 has MPI support
+
+### Fixed
+
+#### General
+- Fixed missing implementation of DataType::is_index_t
+- Fixed issue with compiling t_h5z_zfp_smoke.cpp against an MPI-enabled HDF5.
+
+
 ## [0.7.1] - Released 2021-02-11
 
 ### Fixed
@@ -18,17 +39,17 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Changed
 
-#### General 
+#### General
 - Conduit now requires C++11 support.
 - Python Node repr string construction now uses `Node.to_summary_string()`
 
 ### Added
 - CMake: Added extra check for include dir vs fully resolved hdf5 path.
 
-#### General 
+#### General
 - Added a builtin sandboxed header-only version of fmt. The namespace and directory paths were changed to `conduit_fmt` to avoid potential symbol collisions with other codes using fmt. Downstream software can use by including `conduit_fmt/conduit_fmt.h`.
 - Added support for using C++11 initializer lists to set Node and DataArray values from numeric arrays. See C++ tutorial docs (https://llnl-conduit.readthedocs.io/en/latest/tutorial_cpp_numeric.html#c-11-initializer-lists) for more details.
-- Added a Node::describe() method. This method creates a new node that mirrors the current Node, however each leaf is replaced by summary stats and a truncated display of the values. For use cases with large leaves, printing the describe() output Node is much more helpful for debugging and understanding vs wall of text from other to_string() methods. 
+- Added a Node::describe() method. This method creates a new node that mirrors the current Node, however each leaf is replaced by summary stats and a truncated display of the values. For use cases with large leaves, printing the describe() output Node is much more helpful for debugging and understanding vs wall of text from other to_string() methods.
 - Added conduit::utils::format methods. These methods use fmt to format strings that include fmt style patterns. The formatting arguments are passed as a conduit::Node tree. The `args` case allows named arguments (args passed as object) or ordered args (args passed as list). The `maps` case also supports named or ordered args and works in conjunction with a `map_index`. The `map_index` is used to fetch a value from an array, or list of strings, which is then passed to fmt. The `maps` style of indexed indirection supports generating path strings for non-trivial domain partition mappings in Blueprint. This functionality is also available in Python, via the  `conduit.utils.format` method.
 - Added `DataArray::fill` method, which set all elements of a DataArray to a given value.
 - Added `Node::to_summary_string` methods, which allow you to create truncated strings that describe a node tree, control the max number of children and max number of elements shown.
@@ -69,7 +90,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Added
 
-#### General 
+#### General
 - Added support for children with names that include `/`. Since slashes are part of Conduit's hierarchical path mechanism, you must use explicit methods (add_child(), child(), etc) to create and access children with these types of names. These names are also supported in all basic i/o cases (JSON, YAML, Conduit Binary).
 - Added Node::child and Schema::child methods, which provide access to existing children by name.
 - Added Node::fetch_existing and Schema::fetch_existing methods, which provide access to existing paths or error when given a bad path.
@@ -106,7 +127,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Fixed
 
-#### General 
+#### General
 - Updated to newer BLT to resolve BLT/FindMPI issues with rpath linking commands when using OpenMPI.
 - Fixed internal object name string for the Python Iterator object. It used to report `Schema`, which triggered both puzzling and concerned emotions.
 - Fixed a bug with `Node.set` in the Python API that undermined setting NumPy arrays with sliced views and complex striding. General slices should now work with `set`. No changes to the `set_external` case, which requires 1-D effective striding and throws an exception when more complex strides are presented.
@@ -120,9 +141,9 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Changed
 
-#### General 
+#### General
 - Conduit's main git branch was renamed from `master` to `develop`. To allow time for folks to migrate, the `master` branch is active but frozen and will be removed during the `0.7.0` release.
-- We recommend a C++11 (or newer) compiler, support for older C++ standards is deprecated and will be removed in a future release. 
+- We recommend a C++11 (or newer) compiler, support for older C++ standards is deprecated and will be removed in a future release.
 - Node::fetch_child and Schema::fetch_child are deprecated in favor of the more clearly named Node::fetch_existing and Schema::fetch_existing. fetch_child variants still exist, but will be removed in a future release.
 - Python str() methods for Node, Schema, and DataType now use their new to_string() methods.
 - DataArray<T>::to_json(std::ostring &) is deprecated in favor DataArray<T>::to_json_stream. to_json(std::ostring &) will be removed in a future release.
@@ -153,14 +174,14 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Added
 
-#### General 
+#### General
 - Added Node::parse() method, (C++, Python and Fortran) which supports common json and yaml parsing use cases without creating a generator instance.
 - Use FOLDER target property to group targets for Visual Studio
 - Added Node load(), and save() support to the C and Fortran APIs
 
 ### Changed
 
-#### General 
+#### General
 - Node::load() and Node::save() now auto detect which protocol to use when protocol argument is an empty string
 - Changed Node::load() and Node::save() default protocol value to empty (default now is to auto detect)
 - Changed Python linking strategy to defer linking for our compiler modules
@@ -169,7 +190,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Fixed
 
-#### General 
+#### General
 - Fixed install paths for CMake exported target files to follow standard CMake find_package() search conventions. Also perserved duplicate files to support old import path structure for this release.
 - python: Fixed Node.set_external() to accept conduit nodes as well as numpy arrays
 - Fixed dll install locations for Windows
@@ -179,7 +200,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Added
 
-#### General 
+#### General
 - Added support to parse YAML into Conduit Nodes and to create YAML from Conduit Nodes. Support closely follows the "json" protocol, making similar choices related to promoting YAML string leaves to concrete data types.
 - Added several more Conduit Node methods to the C and Fortran APIs. Additions are enumerated here:  https://github.com/LLNL/conduit/pull/426
 - Added Node set support for Python Tuples and Lists with numeric and string entires
@@ -188,19 +209,19 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 #### Blueprint
 
-- Added support for a "zfparray" blueprint that holds ZFP compressed array data. 
+- Added support for a "zfparray" blueprint that holds ZFP compressed array data.
 - Added the the "specsets" top-level section to the Blueprint schema, which can be used to represent multi-dimensional per-material quantities (most commonly per-material atomic composition fractions).
 - Added explicit topological data generation functions for points, lines, and faces
 - Added derived topology generation functions for element centroids, sides, and corners
 - Added the basic example function to the conduit.mesh.blueprint.examples module
 
 #### Relay
-- Added optional ZFP support to relay, that enables wrapping and unwraping zfp arrays into conduit Nodes. 
+- Added optional ZFP support to relay, that enables wrapping and unwraping zfp arrays into conduit Nodes.
 - Extended relay HDF5 I/O support to read a wider range of HDF5 string representations including H5T_VARIABLE strings.
 
 ### Changed
 
-#### General 
+#### General
 - Conduit's automatic build process (uberenv + spack) now defaults to using Python 3
 - Improved CMake export logic to make it easier to find and use Conduit install in a CMake-based build system. (See using-with-cmake example for new recipe)
 
@@ -212,7 +233,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Fixed
 
-#### General 
+#### General
 - Fixed bug that caused memory access after free during Node destruction
 
 #### Relay
@@ -227,11 +248,11 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 #### General
 
 - Added Generic IO Handle class (relay::io::IOHandle) with C++ and Python APIs, tests, and docs.
-- Added ``rename_child`` method to Schema and Node 
+- Added ``rename_child`` method to Schema and Node
 - Added generation and install of conduit_config.mk for using-with-make example
 - Added datatype helpers for long long and long double
 - Added error for empty path fetch
-- Added C functions for setting error, warning, info handlers. 
+- Added C functions for setting error, warning, info handlers.
 - Added limited set of C bindings for DataType
 - Added C bindings for relay IO
 - Added several more functions to conduit node python interfaces
@@ -250,7 +271,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 - Added a relay::mpi::io library that mirrors the API of relay::io, except  that all functions take an MPI communicator. The functions are implemented in parallel for the ADIOS protocol. For other protocols, they will behave the same as the serial functions in relay::io. For the ADIOS protocol, the save() and save_merged() functions operate collectively within a communicator to enable multiple MPI ranks to save data to a single file as separate "domains".
 - Added an add_time_step() function to that lets the caller append data collectively to an existing  ADIOS file
 - Added a function to query the number of time steps and the number of domains in a  ADIOS file.
-- Added versions of save and save_merged that take an options node. 
+- Added versions of save and save_merged that take an options node.
 - Added C API for new save, save_merged functions.
 - Added method to list an HDF5 group's child names
 - Added save and append methods to the HDF5 I/O interface
@@ -259,7 +280,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Changed
 
-#### General 
+#### General
 
 - Changed mapping of c types to bit-width style to be compatible with C++11 std bit-width types when C++11 is enabled
 - Several improvements to uberenv, our automated build process, and building directions
@@ -268,16 +289,16 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 #### Relay
 
 - Improvements to the Silo mesh writer
-- Refactor to support both relay::io and relay::mpi::io namespaces. 
+- Refactor to support both relay::io and relay::mpi::io namespaces.
 - Refactor to add support for steps and domains to I/O interfaces
-- Changed to only use ``libver latest`` setting for for hdf5 1.8 to minimize compatibility issues 
+- Changed to only use ``libver latest`` setting for for hdf5 1.8 to minimize compatibility issues
 
 ### Fixed
 
-#### General 
+#### General
 
 - Fixed bugs with std::vector gap methods
-- Fixed A few C function names in conduit_node.h 
+- Fixed A few C function names in conduit_node.h
 - Fixed bug in python that was requesting unsigned array for signed cases
 - Fixed issue with Node::diff failing for string data with offsets
 - Fixes for building on BlueOS with the xl compiler
@@ -314,7 +335,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 - Updated uberenv to use a newer spack and removed several custom packages
 - C++ ``Node::set`` methods now take const pointers for data
 
-### Fixed 
+### Fixed
 
 #### General
 
@@ -333,7 +354,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ## [0.3.0] - Released 2017-08-21
 
-### Added 
+### Added
 
 #### General
 
@@ -366,7 +387,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 #### General
 
-- Fixed memory leaks in *conduit* 
+- Fixed memory leaks in *conduit*
 - Bug fixes to support building on Visual Studio 2013
 - Bug fixes for `conduit::Nodes` in the List Role
 
@@ -380,7 +401,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 #### Blueprint
 
-- Added support to the blueprint python module for the mesh and mcarray protocol methods 
+- Added support to the blueprint python module for the mesh and mcarray protocol methods
 - Added stand alone blueprint verify executable
 
 ### Changed
@@ -414,7 +435,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 #### General
 
 - Added const access to conduit::Node's children and a new NodeConstIterator
-- Added support for building on Windows 
+- Added support for building on Windows
 - Added more Python, C, and Fortran API support
 
 #### Blueprint
@@ -433,28 +454,29 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 #### General
 
-- Changes to clarify concepts in the conduit::Node API 
+- Changes to clarify concepts in the conduit::Node API
 - Improved unit test coverage
-- Renamed source and header files for clarity and to avoid potential conflicts with other projects 
+- Renamed source and header files for clarity and to avoid potential conflicts with other projects
 
 #### Relay
 
-- Changed I/O protocol string names for clarity 
-- Refactored the relay::WebServer and the Conduit Node Viewer application 
+- Changed I/O protocol string names for clarity
+- Refactored the relay::WebServer and the Conduit Node Viewer application
 
 ### Fixed
 
 #### General
 
-- Resolved several bugs across libraries 
+- Resolved several bugs across libraries
 - Resolved compiler warnings and memory leaks
 
 ## 0.1.0 - Released 2016-03-30
 
 ### Added
 - Initial Open Source Release on GitHub
 
-[Unreleased]: https://github.com/llnl/conduit/compare/v0.7.0...HEAD
+[Unreleased]: https://github.com/llnl/conduit/compare/v0.7.1...HEAD
+[0.7.1]: https://github.com/llnl/conduit/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/llnl/conduit/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/llnl/conduit/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/llnl/conduit/compare/v0.5.0...v0.5.1

src/cmake/thirdparty/SetupHDF5.cmake

@@ -228,6 +228,23 @@ message(STATUS "HDF5 Libraries:    ${HDF5_LIBRARIES}")
 message(STATUS "HDF5 Definitions:  ${HDF5_DEFINITIONS}")
 message(STATUS "HDF5 is parallel:  ${HDF5_IS_PARALLEL}")
 
+
+# if hdf5 was built with mpi support, we have to propgate
+# that regardless of conduit's use of MPI
+
+if(HDF5_IS_PARALLEL)
+    if(NOT MPI_FOUND)
+         MESSAGE(FATAL_ERROR "Cannot link non-mpi aware conduit (MPI_FOUND == FALSE) "
+                             "against HDF5 built with MPI support (HDF5_IS_PARALLEL == TRUE). "
+                             "Please enable conduit's MPI support (ENABLE_MPI == ON, etc) or "
+                             "build against a non-mpi HDF5 library.")
+    endif()
+endif()
+
+#############
+# Note: MPI libraries and include dirs are not propgated for the config.mk case
+#############
+
 message(STATUS "HDF5 Thirdparty Include Flags: ${hdf5_tpl_inc_flags}")
 message(STATUS "HDF5 Thirdparty Link Flags: ${hdf5_tpl_lnk_flags}")