Skip to content

Commit

Permalink
update to blt 0.6.0 (#1233)
Browse files Browse the repository at this point in the history
* update to blt 0.6.0

* blt: disable cmake python logic in gtest

* changelog

* ci recipe updates (new cmake constraints)

* cleanup and docs updates

* more cleanup

* ci az fix,use 3.21

* guard fmt against mixing c++ standards (which yes is a bad thing and should be avoided)

* update to blt develop

* move to c++14 support

* less than or equal to ...

* fix wrong removed ifdef

* restore guard to proper loc
  • Loading branch information
cyrush committed Jan 24, 2024
1 parent 0698317 commit 177c2f0
Show file tree
Hide file tree
Showing 34 changed files with 154 additions and 511 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
libhdf5-dev
- name: Setup Python Env
run: python3 -m pip install --upgrade pip numpy mpi4py
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Build & Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/uberenv_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
# mpich \
# libmpich-dev \
# libhdf5-dev
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Install
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: mpi4py/setup-mpi@v1
- name: Setup Python Env
run: python3 -m pip install --upgrade pip numpy mpi4py
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Build & Test
Expand All @@ -54,7 +54,7 @@ jobs:
uses: mpi4py/setup-mpi@v1
- name: Setup Python Env
run: python3 -m pip install --upgrade pip numpy mpi4py
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Build & Test
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
uses: mpi4py/setup-mpi@v1
- name: Setup Python Env
run: python3 -m pip install --upgrade pip numpy mpi4py
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Build & Test
Expand All @@ -103,7 +103,7 @@ jobs:
steps:
- name: Setup Python Env
run: python3 -m pip install --upgrade pip numpy
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- uses: seanmiddleditch/gha-setup-ninja@master
Expand Down
248 changes: 0 additions & 248 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
### Changed

#### General
- Conduit now requires C++14 and CMake 3.21 or newer.
- Improved the efficiency of json parsing logic.
- The `conduit_relay_io_convert` program was enhanced so it can read/write Blueprint root files by passing _"blueprint"_ for the read or write protocols.
- The `conduit_adjset_validate` program now writes a point mesh for each adjset groups if the _-output_ argument is supplied.
- Updated to BLT 0.6.0

#### Blueprint
- The `conduit::blueprint::mpi::mesh::partition_map_back()` function was enhanced so it accepts a "field_prefix" value in its options. The prefix is used when looking for the `global_vertex_ids` field, which could have been created with a prefix by the same option in the `conduit::blueprint::mpi::mesh::generate_partition_field()` function.
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ install:
# Install MS-MPI SDK
- ps: Start-FileDownload 'https://download.microsoft.com/download/B/2/E/B2EB83FE-98C2-4156-834A-E1711E6884FB/msmpisdk.msi'
- msmpisdk.msi /passive
- set PATH=C:\Program Files (x86)\Microsoft SDKs\MPI;%PATH%
- set PATH=C:\Program Files (x86)\Microsoft SDKs\MPI;%PATH%
# install mpi4py
- pip install mpi4py

# Install CMake 3.9
# Install CMake 3.24.3
############################################################################
- ps: Start-FileDownload 'http://ascent-dav.org/mirror/cmake-3.9.6-win64-x64.msi'
- cmake-3.9.6-win64-x64.msi /passive
- ps: Start-FileDownload 'https://github.com/Kitware/CMake/releases/download/v3.24.3/cmake-3.24.3-windows-x86_64.msi'
- cmake-3.24.3-windows-x86_64.msi /passive
- set PATH=C:\Program Files\CMake\bin;%PATH%
- cmake --version

Expand Down

0 comments on commit 177c2f0

Please sign in to comment.