From ad86e316ad56a75c099d30ca5ce75cff275b5924 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Tue, 21 May 2024 13:34:35 -0700 Subject: [PATCH] 0.9.2 release prep (#1282) * rel prep for 0.9.2 * update sphinx release notes * relnotes script update --- CHANGELOG.md | 15 +++++- .../gen_relnotes_variants_from_changelog.py | 14 +++++- setup.py | 2 +- src/CMakeLists.txt | 2 +- src/docs/sphinx/conf.py | 4 +- src/docs/sphinx/releases.rst | 47 +++++++++++++++++++ src/libs/conduit/python/setup.py | 2 +- 7 files changed, 79 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f78e8792..d2161e28c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,14 @@ 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 +## [0.9.2] - Released 2024-05-21 + +### Added + +#### Relay +- Added support for Blueprint + Silo round trip for axis units and labels. +- Added support for reading Silo column major data as strided structured Blueprint data. +- Added support for reading a much wider set of Silo meshes, beyond multimeshes, multivars, etc. ### Changed @@ -14,10 +21,16 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s #### Blueprint - Fixed partitioner so it reverses vertex order as needed in polyhedral face definitions when extracting mesh elements. - Changed `conduit::blueprint::mesh::partition_map_back()` function so it will attempt to reuse existing field memory when mapping fields back. This permits `partition_map_back()` to send data from a partitioned mesh into the original mesh where fields were provided from a host code using `Node::set_external()`. +- Changed `generate_sides` to be robust to the case where no fields exist. #### Relay - Changed `conduit::relay::mpi::communicate_using_schema` to avoid an invalid tag MPI error message on some MPI distributions. +### Fixed + +#### Relay +- Fixed Relay I/O HDF5 DataSpace handle leak. + ## [0.9.1] - Released 2024-02-09 ### Changed diff --git a/scripts/gen_relnotes_variants_from_changelog.py b/scripts/gen_relnotes_variants_from_changelog.py index 21de75044..eb74c6397 100644 --- a/scripts/gen_relnotes_variants_from_changelog.py +++ b/scripts/gen_relnotes_variants_from_changelog.py @@ -40,6 +40,16 @@ def timestamp(t=None,sep="_"): def conduit_blurb(): return "[Conduit](https://github.com/LLNL/conduit) provides an intuitive model for describing hierarchical scientific data in C++, C, Fortran, and Python. It is used for data coupling between packages in-core, serialization, and I/O tasks." +def release_date(release_id,src): + for l in src.split("\n"): + if l.startswith("## "): + sub_open = False + active_rel = proc_changelog_rel_id_line(l) + if active_rel == release_id: + # grab the date, it will be the last token + return l.split()[-1] + return "Unknown Date" + def gen_llnl_news_entry(release_id,src): txt = "---\n" txt += 'title: "Conduit {0} Released"\n'.format(release_id) @@ -57,6 +67,7 @@ def gen_llnl_news_entry(release_id,src): def gen_sphinx_entry(release_id,src): txt = "v{0}\n".format(release_id) txt += "---------------------------------\n\n" + txt += "* Released {0}\n".format(release_date(release_id,src)) txt += "* `Source Tarball `__\n\n".format(release_id) txt += "Highlights\n" txt += "++++++++++++++++++++++++++++++++++++\n\n" @@ -88,7 +99,8 @@ def sphinx_translate_ticks(l): def gen_github_entry(release_id,src): txt = "# {0} Release Highlights\n\n".format(release_id) - txt += "(adapted from Conduit's Changelog)\n" + txt += "(adapted from Conduit's [Changelog](https://github.com/LLNL/conduit/blob/develop/CHANGELOG.md) )\n\n" + txt += "Released {0}\n\n".format(release_date(release_id,src)) sub_open = False active_rel = "" for l in src.split("\n"): diff --git a/setup.py b/setup.py index bdce0df6c..e1c9b0af4 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ # ############################################################################## -CONDUIT_VERSION = '0.9.1' +CONDUIT_VERSION = '0.9.2' class CMakeExtension(Extension): def __init__(self, name, sourcedir=''): diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 82b97b308..b443994a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,7 @@ endif() # Conduit ################################ -project(conduit VERSION "0.9.1") +project(conduit VERSION "0.9.2") ################################ # Build Options diff --git a/src/docs/sphinx/conf.py b/src/docs/sphinx/conf.py index c911e834b..cc14249f5 100644 --- a/src/docs/sphinx/conf.py +++ b/src/docs/sphinx/conf.py @@ -70,9 +70,9 @@ # built documents. # # The short X.Y version. -version = '0.9.1' +version = '0.9.2' # The full version, including alpha/beta/rc tags. -release = '0.9.1' +release = '0.9.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/src/docs/sphinx/releases.rst b/src/docs/sphinx/releases.rst index e06a80e12..264ef51fd 100644 --- a/src/docs/sphinx/releases.rst +++ b/src/docs/sphinx/releases.rst @@ -11,6 +11,53 @@ Source distributions for Conduit releases are hosted on github: https://github.com/LLNL/conduit/releases .. note:: Conduit uses `BLT `__ as its core CMake build system. We leverage BLT as a git submodule, however github does not include submodule contents in its automatically created source tarballs. To avoid confusion, starting with v0.3.0 we provide our own source tarballs that include BLT. +v0.9.2 +--------------------------------- + +* Released 2024-05-21 +* `Source Tarball `__ + +Highlights +++++++++++++++++++++++++++++++++++++ + +(Extracted from Conduit's :download:`Changelog <../../../CHANGELOG.md>`) + + +Added +~~~~~ + + +* **Relay** + + * Added support for Blueprint + Silo round trip for axis units and labels. + * Added support for reading Silo column major data as strided structured Blueprint data. + * Added support for reading a much wider set of Silo meshes, beyond multimeshes, multivars, etc. + +Changed +~~~~~~~ + + +* **Conduit** + + * Removed cmake use of distutils for python introspection. + +* **Blueprint** + + * Fixed partitioner so it reverses vertex order as needed in polyhedral face definitions when extracting mesh elements. + * Changed ``conduit::blueprint::mesh::partition_map_back()`` function so it will attempt to reuse existing field memory when mapping fields back. This permits ``partition_map_back()`` to send data from a partitioned mesh into the original mesh where fields were provided from a host code using ``Node::set_external()``. + * Changed ``generate_sides`` to be robust to the case where no fields exist. + +* **Relay** + + * Changed ``conduit::relay::mpi::communicate_using_schema`` to avoid an invalid tag MPI error message on some MPI distributions. + +Fixed +~~~~~ + + +* **Relay** + + * Fixed Relay I/O HDF5 DataSpace handle leak. v0.9.1 --------------------------------- diff --git a/src/libs/conduit/python/setup.py b/src/libs/conduit/python/setup.py index 0e0f9f400..7ebf1006e 100644 --- a/src/libs/conduit/python/setup.py +++ b/src/libs/conduit/python/setup.py @@ -25,7 +25,7 @@ def adjust_windows_args_paths(): if platform.system() == 'Windows': adjust_windows_args_paths() -CONDUIT_VERSION = '0.9.1' +CONDUIT_VERSION = '0.9.2' setup (name = 'conduit', description = 'conduit',