Skip to content

Commit

Permalink
0.9.1 release prep (#1252)
Browse files Browse the repository at this point in the history
* fix missing py bp table examples cmake dep

* relay silo, type fix for windows

* restore protection from blt fused lang mpi flags for blt smoke

* update changelog and release notes
  • Loading branch information
cyrush authored Feb 9, 2024
1 parent acc225a commit 6d60cf7
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 7 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@ 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.1] - Released 2024-02-09

### Changed

#### Conduit
- Relaxed strict header check for C++14 back to C++11. A downstream consumer of Conduit has C++11 hardcoded into their build system and patching for related deployments is intractable.
- Restore logic to avoid fused mpi c++ and fortran flags that can undermine blt's mpi smoke test.


#### Blueprint
- Fixed missing build dependency relationship with the python conduit blueprint table examples module.
- Fixed partitioner so it does not duplicate faces when combining polyhedral meshes.

### Added

#### Relay
- Added polygonal support to Blueprint Silo I/O.

## [0.9.0] - Released 2024-02-05

### Added
Expand Down Expand Up @@ -875,7 +881,8 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
### Added
- Initial Open Source Release on GitHub

[Unreleased]: https://github.com/llnl/conduit/compare/v0.9.0...HEAD
[Unreleased]: https://github.com/llnl/conduit/compare/v0.9.1...HEAD
[0.9.1]: https://github.com/llnl/conduit/compare/v0.9.0...v0.9.1
[0.9.0]: https://github.com/llnl/conduit/compare/v0.8.8...v0.9.0
[0.8.8]: https://github.com/llnl/conduit/compare/v0.8.7...v0.8.8
[0.8.7]: https://github.com/llnl/conduit/compare/v0.8.6...v0.8.7
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
from setuptools.command.build_ext import build_ext
from distutils.version import LooseVersion

CONDUIT_VERSION = '0.9.0'
CONDUIT_VERSION = '0.9.1'

class CMakeExtension(Extension):
def __init__(self, name, sourcedir=''):
Expand Down
23 changes: 23 additions & 0 deletions src/cmake/SetupBLT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,29 @@ if(ENABLE_MPI)
# compiler will handle them implicitly
set(conduit_blt_mpi_deps "" CACHE STRING "")
endif()

# In some cases (mpich?) -fallow-argument-mismatch will be
# reported as a needed MPI flag for fortran.
# BLT fuses all MPI compiler flags into one big bunch.
# (It does not differentiate between C and fortran flags)
#
# -fallow-argument-mismatch is a fortran compiler flag that makes clang
# very unhappy, and this will cause blt's mpi smoke test to fail to build
# with clang.
#
# Conduit does not use mpi fortran, so we strip this flag if it exists.
#
# blt's mpi target is called "mpi"
if(TARGET mpi)
# check and strip interface compile opts
get_target_property(_mpi_iface_compile_opts mpi INTERFACE_COMPILE_OPTIONS)
if(_mpi_iface_compile_opts)
list(REMOVE_ITEM _mpi_iface_compile_opts "-fallow-argument-mismatch")
list(REMOVE_ITEM _mpi_iface_compile_opts "-fallow-invalid-boz")
set_target_properties(mpi PROPERTIES INTERFACE_COMPILE_OPTIONS "${_mpi_iface_compile_opts}")
endif()
endif()

endif()

if(ENABLE_OPENMP)
Expand Down
4 changes: 2 additions & 2 deletions src/docs/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
# built documents.
#
# The short X.Y version.
version = '0.9.0'
version = '0.9.1'
# The full version, including alpha/beta/rc tags.
release = '0.9.0'
release = '0.9.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
65 changes: 65 additions & 0 deletions src/docs/sphinx/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,45 @@ https://github.com/LLNL/conduit/releases

.. note:: Conduit uses `BLT <https://github.com/LLNL/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.1
---------------------------------

* Released 2024-02-09
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.9.1/conduit-v0.9.1-src-with-blt.tar.gz>`__

Highlights
++++++++++++++++++++++++++++++++++++

(Extracted from Conduit's :download:`Changelog <../../../CHANGELOG.md>`)


Changed
~~~~~~~


* **Conduit**

* Relaxed strict header check for C++14 back to C++11. A downstream consumer of Conduit has C++11 hardcoded into their build system and patching for related deployments is intractable.
* Restore logic to avoid fused mpi c++ and fortran flags that can undermine blt's mpi smoke test.

* **Blueprint**

* Fixed missing build dependency relationship with the python conduit blueprint table examples module.
* Fixed partitioner so it does not duplicate faces when combining polyhedral meshes.

Added
~~~~~


* **Relay**

* Added polygonal support to Blueprint Silo I/O.


v0.9.0
---------------------------------

* Released 2024-02-04
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.9.0/conduit-v0.9.0-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -105,6 +141,7 @@ Fixed
v0.8.8
---------------------------------

* Released 2023-05-18
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.8/conduit-v0.8.8-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -144,6 +181,7 @@ Fixed
v0.8.7
---------------------------------

* Released 2023-03-23
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.7/conduit-v0.8.7-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -205,6 +243,7 @@ Changed
v0.8.6
---------------------------------

* Released 2023-01-11
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.6/conduit-v0.8.6-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -239,6 +278,7 @@ Fixed
v0.8.5
---------------------------------

* Released 2022-12-22
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.5/conduit-v0.8.5-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -304,6 +344,7 @@ Fixed
v0.8.4
---------------------------------

* Released 2022-08-22
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.4/conduit-v0.8.4-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -374,6 +415,7 @@ Fixed
v0.8.3
---------------------------------

* Released 2022-04-14
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.3/conduit-v0.8.3-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -421,6 +463,7 @@ Changed
v0.8.2
---------------------------------

* Released 2022-02-01
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.2/conduit-v0.8.2-src-with-blt.tar.gz>`__

Highlights
Expand All @@ -440,6 +483,7 @@ Fixed
v0.8.1
---------------------------------

* Released 2022-01-25
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.1/conduit-v0.8.1-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -481,6 +525,7 @@ Fixed
v0.8.0
---------------------------------

* Released 2021-12-20
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.8.0/conduit-v0.8.0-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -569,6 +614,7 @@ Fixed
v0.7.2
---------------------------------

* Released 2021-05-19
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.7.2/conduit-v0.7.2-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -629,6 +675,7 @@ Fixed
v0.7.1
---------------------------------

* Released 2021-02-11
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.7.1/conduit-v0.7.1-src-with-blt.tar.gz>`__

Highlights
Expand All @@ -653,6 +700,7 @@ Fixed
v0.7.0
---------------------------------

* Released 2021-02-08
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.7.0/conduit-v0.7.0-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -728,6 +776,7 @@ Removed
v0.6.0
---------------------------------

* Released 2020-11-02
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.6.0/conduit-v0.6.0-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -827,6 +876,8 @@ Changed

v0.5.1
-----------------

* Released 2020-01-18
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.5.1/conduit-v0.5.1-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -866,6 +917,8 @@ Fixed

v0.5.0
-----------------

* Released 2019-10-25
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.5.0/conduit-v0.5.0-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -926,6 +979,8 @@ Fixed

v0.4.0
-----------------

* Released 2019-03-01
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.4.0/conduit-v0.4.0-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -1013,6 +1068,7 @@ Fixed
v0.3.1
-----------------

* Released 2018-02-26
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.3.1/conduit-v0.3.1-src-with-blt.tar.gz>`__


Expand Down Expand Up @@ -1045,6 +1101,7 @@ Highlights
v0.3.0
-----------------

* Released 2017-08-21
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz>`__

Highlights
Expand Down Expand Up @@ -1085,6 +1142,7 @@ Highlights
v0.2.1
-----------------

* Released 2017-01-06
* `Source Tarball <https://github.com/LLNL/conduit/archive/v0.2.1.tar.gz>`__


Expand Down Expand Up @@ -1113,6 +1171,7 @@ Highlights
v0.2.0
-----------------

* Released 2016-11-03
* `Source Tarball <https://github.com/LLNL/conduit/archive/v0.2.0.tar.gz>`__

Highlights
Expand Down Expand Up @@ -1142,5 +1201,11 @@ Highlights
* Refactored the ``relay::WebServer`` and the Conduit Node Viewer application
* Added entangle, a python script ssh tunneling solution

v0.1.0
-----------------

* Released 2016-03-30
* Initial Open Source Release on GitHub
* `Source Tarball <https://github.com/LLNL/conduit/archive/v0.1.0.tar.gz>`__


2 changes: 1 addition & 1 deletion src/libs/conduit/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def adjust_windows_args_paths():
if platform.system() == 'Windows':
adjust_windows_args_paths()

CONDUIT_VERSION = '0.9.0'
CONDUIT_VERSION = '0.9.1'

setup (name = 'conduit',
description = 'conduit',
Expand Down
2 changes: 1 addition & 1 deletion src/libs/relay/conduit_relay_io_silo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class SiloTreePathGenerator
std::string sanitize_silo_varname(const std::string &varname)
{
std::stringstream newvarname;
for (uint i = 0; i < varname.size(); i ++)
for (size_t i = 0; i < varname.size(); i ++)
{
if (std::isalnum(varname[i]))
newvarname << varname[i];
Expand Down

0 comments on commit 6d60cf7

Please sign in to comment.