Skip to content

Commit 6d60cf7

Browse files
authored
0.9.1 release prep (#1252)
* 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
1 parent acc225a commit 6d60cf7

7 files changed

Lines changed: 102 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,24 @@ Notable changes to Conduit are documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project aspires to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## Unreleased
7+
## [0.9.1] - Released 2024-02-09
88

99
### Changed
1010

1111
#### Conduit
1212
- 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.
13+
- Restore logic to avoid fused mpi c++ and fortran flags that can undermine blt's mpi smoke test.
1314

1415

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

20+
### Added
21+
22+
#### Relay
23+
- Added polygonal support to Blueprint Silo I/O.
24+
1925
## [0.9.0] - Released 2024-02-05
2026

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

878-
[Unreleased]: https://github.com/llnl/conduit/compare/v0.9.0...HEAD
884+
[Unreleased]: https://github.com/llnl/conduit/compare/v0.9.1...HEAD
885+
[0.9.1]: https://github.com/llnl/conduit/compare/v0.9.0...v0.9.1
879886
[0.9.0]: https://github.com/llnl/conduit/compare/v0.8.8...v0.9.0
880887
[0.8.8]: https://github.com/llnl/conduit/compare/v0.8.7...v0.8.8
881888
[0.8.7]: https://github.com/llnl/conduit/compare/v0.8.6...v0.8.7

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
from setuptools.command.build_ext import build_ext
4343
from distutils.version import LooseVersion
4444

45-
CONDUIT_VERSION = '0.9.0'
45+
CONDUIT_VERSION = '0.9.1'
4646

4747
class CMakeExtension(Extension):
4848
def __init__(self, name, sourcedir=''):

src/cmake/SetupBLT.cmake

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,29 @@ if(ENABLE_MPI)
5757
# compiler will handle them implicitly
5858
set(conduit_blt_mpi_deps "" CACHE STRING "")
5959
endif()
60+
61+
# In some cases (mpich?) -fallow-argument-mismatch will be
62+
# reported as a needed MPI flag for fortran.
63+
# BLT fuses all MPI compiler flags into one big bunch.
64+
# (It does not differentiate between C and fortran flags)
65+
#
66+
# -fallow-argument-mismatch is a fortran compiler flag that makes clang
67+
# very unhappy, and this will cause blt's mpi smoke test to fail to build
68+
# with clang.
69+
#
70+
# Conduit does not use mpi fortran, so we strip this flag if it exists.
71+
#
72+
# blt's mpi target is called "mpi"
73+
if(TARGET mpi)
74+
# check and strip interface compile opts
75+
get_target_property(_mpi_iface_compile_opts mpi INTERFACE_COMPILE_OPTIONS)
76+
if(_mpi_iface_compile_opts)
77+
list(REMOVE_ITEM _mpi_iface_compile_opts "-fallow-argument-mismatch")
78+
list(REMOVE_ITEM _mpi_iface_compile_opts "-fallow-invalid-boz")
79+
set_target_properties(mpi PROPERTIES INTERFACE_COMPILE_OPTIONS "${_mpi_iface_compile_opts}")
80+
endif()
81+
endif()
82+
6083
endif()
6184

6285
if(ENABLE_OPENMP)

src/docs/sphinx/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@
7070
# built documents.
7171
#
7272
# The short X.Y version.
73-
version = '0.9.0'
73+
version = '0.9.1'
7474
# The full version, including alpha/beta/rc tags.
75-
release = '0.9.0'
75+
release = '0.9.1'
7676

7777
# The language for content autogenerated by Sphinx. Refer to documentation
7878
# for a list of supported languages.

src/docs/sphinx/releases.rst

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,45 @@ https://github.com/LLNL/conduit/releases
1212

1313
.. 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.
1414

15+
v0.9.1
16+
---------------------------------
17+
18+
* Released 2024-02-09
19+
* `Source Tarball <https://github.com/LLNL/conduit/releases/download/v0.9.1/conduit-v0.9.1-src-with-blt.tar.gz>`__
20+
21+
Highlights
22+
++++++++++++++++++++++++++++++++++++
23+
24+
(Extracted from Conduit's :download:`Changelog <../../../CHANGELOG.md>`)
25+
26+
27+
Changed
28+
~~~~~~~
29+
30+
31+
* **Conduit**
32+
33+
* 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.
34+
* Restore logic to avoid fused mpi c++ and fortran flags that can undermine blt's mpi smoke test.
35+
36+
* **Blueprint**
37+
38+
* Fixed missing build dependency relationship with the python conduit blueprint table examples module.
39+
* Fixed partitioner so it does not duplicate faces when combining polyhedral meshes.
40+
41+
Added
42+
~~~~~
43+
44+
45+
* **Relay**
46+
47+
* Added polygonal support to Blueprint Silo I/O.
48+
49+
1550
v0.9.0
1651
---------------------------------
1752

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

2056
Highlights
@@ -105,6 +141,7 @@ Fixed
105141
v0.8.8
106142
---------------------------------
107143

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

110147
Highlights
@@ -144,6 +181,7 @@ Fixed
144181
v0.8.7
145182
---------------------------------
146183

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

149187
Highlights
@@ -205,6 +243,7 @@ Changed
205243
v0.8.6
206244
---------------------------------
207245

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

210249
Highlights
@@ -239,6 +278,7 @@ Fixed
239278
v0.8.5
240279
---------------------------------
241280

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

244284
Highlights
@@ -304,6 +344,7 @@ Fixed
304344
v0.8.4
305345
---------------------------------
306346

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

309350
Highlights
@@ -374,6 +415,7 @@ Fixed
374415
v0.8.3
375416
---------------------------------
376417

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

379421
Highlights
@@ -421,6 +463,7 @@ Changed
421463
v0.8.2
422464
---------------------------------
423465

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

426469
Highlights
@@ -440,6 +483,7 @@ Fixed
440483
v0.8.1
441484
---------------------------------
442485

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

445489
Highlights
@@ -481,6 +525,7 @@ Fixed
481525
v0.8.0
482526
---------------------------------
483527

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

486531
Highlights
@@ -569,6 +614,7 @@ Fixed
569614
v0.7.2
570615
---------------------------------
571616

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

574620
Highlights
@@ -629,6 +675,7 @@ Fixed
629675
v0.7.1
630676
---------------------------------
631677

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

634681
Highlights
@@ -653,6 +700,7 @@ Fixed
653700
v0.7.0
654701
---------------------------------
655702

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

658706
Highlights
@@ -728,6 +776,7 @@ Removed
728776
v0.6.0
729777
---------------------------------
730778

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

733782
Highlights
@@ -827,6 +876,8 @@ Changed
827876

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

832883
Highlights
@@ -866,6 +917,8 @@ Fixed
866917

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

871924
Highlights
@@ -926,6 +979,8 @@ Fixed
926979

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

931986
Highlights
@@ -1013,6 +1068,7 @@ Fixed
10131068
v0.3.1
10141069
-----------------
10151070

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

10181074

@@ -1045,6 +1101,7 @@ Highlights
10451101
v0.3.0
10461102
-----------------
10471103

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

10501107
Highlights
@@ -1085,6 +1142,7 @@ Highlights
10851142
v0.2.1
10861143
-----------------
10871144

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

10901148

@@ -1113,6 +1171,7 @@ Highlights
11131171
v0.2.0
11141172
-----------------
11151173

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

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

1204+
v0.1.0
1205+
-----------------
1206+
1207+
* Released 2016-03-30
1208+
* Initial Open Source Release on GitHub
1209+
* `Source Tarball <https://github.com/LLNL/conduit/archive/v0.1.0.tar.gz>`__
11451210

11461211

src/libs/conduit/python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def adjust_windows_args_paths():
2525
if platform.system() == 'Windows':
2626
adjust_windows_args_paths()
2727

28-
CONDUIT_VERSION = '0.9.0'
28+
CONDUIT_VERSION = '0.9.1'
2929

3030
setup (name = 'conduit',
3131
description = 'conduit',

src/libs/relay/conduit_relay_io_silo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class SiloTreePathGenerator
312312
std::string sanitize_silo_varname(const std::string &varname)
313313
{
314314
std::stringstream newvarname;
315-
for (uint i = 0; i < varname.size(); i ++)
315+
for (size_t i = 0; i < varname.size(); i ++)
316316
{
317317
if (std::isalnum(varname[i]))
318318
newvarname << varname[i];

0 commit comments

Comments
 (0)