Skip to content

Commit 3bdb8a8

Browse files
cyrushcyrush
authored
Merge branch 'develop' into task/2026_02_py_method_sig_warnings
2 parents 89c2602 + c5c1ce3 commit 3bdb8a8

43 files changed

Lines changed: 3058 additions & 1106 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_conduit_clang_asan.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ jobs:
9494
export LSAN_OPTIONS="suppressions=${CWD}/src/cmake/lsan.supp"
9595
echo "ASAN_SYMBOLIZER_PATH=${ASAN_SYMBOLIZER_PATH}"
9696
echo "LSAN_OPTIONS=${LSAN_OPTIONS}"
97-
export CTEST_OUTPUT_ON_FAILURE=1
98-
ctest --test-dir build
97+
ctest --test-dir build --output-on-failure -V
9998
- name: Install Conduit
10099
run: |
101100
echo "**** Installing Conduit"

‎.github/workflows/build_conduit_gcc.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ jobs:
7373
run: |
7474
echo "**** Building Conduit"
7575
cmake --build build -j2
76+
- name: Run Conduit Unit Tests
77+
run: |
78+
echo "**** Conduit Unit Tests"
79+
ctest --test-dir build --output-on-failure -V
7680
- name: Install Conduit
7781
run: |
7882
echo "**** Installing Conduit"

‎.github/workflows/build_conduit_macos.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: build_conduit_macos
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
7+
jobs:
8+
build_basic:
9+
name: macOS Clang
10+
runs-on: macos-latest
11+
env:
12+
CC: clang
13+
CXX: clang++
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
17+
with:
18+
submodules: 'recursive'
19+
- name: Build TPLs
20+
run: |
21+
env enable_mpi=OFF \
22+
enable_tests=OFF \
23+
enable_verbose=OFF \
24+
build_conduit=false \
25+
build_jobs=2 \
26+
./scripts/build_conduit/build_conduit.sh
27+
- name: Configure Conduit
28+
run: |
29+
cmake --version
30+
echo "**** Configuring Conduit"
31+
cmake -S src -B build -C conduit-config.cmake -DCMAKE_INSTALL_PREFIX=install
32+
- name: Build Conduit
33+
run: |
34+
echo "**** Building Conduit"
35+
cmake --build build -j2
36+
- name: Run Conduit Unit Tests
37+
run: |
38+
echo "**** Run Conduit Unit Tests"
39+
ctest --test-dir build --output-on-failure -V
40+
- name: Install Conduit
41+
run: |
42+
echo "**** Installing Conduit"
43+
cmake --install build
44+
- name: Check Install
45+
run: |
46+
echo "**** Checking Conduit using-with-cmake example"
47+
cd install/examples/conduit/using-with-cmake
48+
cmake -S . -B build
49+
cmake --build build --verbose -j2
50+
./build/conduit_example
51+

‎.github/workflows/build_conduit_win.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: build_conduit_windows
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
7+
jobs:
8+
build_windows_msvc_base:
9+
name: MSVC Base Release
10+
runs-on: windows-2025
11+
steps:
12+
- name: Setup MPI
13+
uses: mpi4py/setup-mpi@8ac56ec7ab12f2dffdcf55ffaf50f1920ebcc004 # v1
14+
- name: Setup Python Env
15+
run: python3 -m pip install --upgrade pip numpy mpi4py wheel setuptools
16+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
17+
with:
18+
submodules: 'recursive'
19+
- name: Build TPLs
20+
run: |
21+
env build_conduit=false `
22+
enable_tests=OFF `
23+
enable_zfp=OFF `
24+
./scripts/build_conduit/build_conduit.sh
25+
- name: Configure Conduit
26+
run: |
27+
cmake --version
28+
echo "**** Configuring Conduit"
29+
cmake -S src -B build `
30+
-C conduit-config.cmake `
31+
-DENABLE_TESTS=ON `
32+
-DCMAKE_INSTALL_PREFIX=install
33+
- name: Build Conduit
34+
run: |
35+
echo "**** Building Conduit"
36+
cmake --build build --config Release -j2
37+
- name: Run Conduit Unit Tests
38+
run: |
39+
echo "**** Conduit Unit Tests"
40+
cmake -E env CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --config Release --target RUN_TESTS
41+
- name: Install Conduit
42+
run: |
43+
echo "**** Installing Conduit"
44+
cmake --install build --config Release
45+
46+

‎.uberenv_config.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
"package_version" : "develop",
44
"package_source_dir" : "../../",
55
"spack_build_mode" : "uberenv-pkg",
6-
"spack_configs_path": "scripts/uberenv_configs/spack_configs",
6+
"spack_configs_path": "scripts/uberenv_configs/spack_configs/envs",
77
"spack_packages_path": "scripts/uberenv_configs/packages",
88
"spack_skip_externals": "true",
9-
"spack_setup_clingo": "false",
9+
"spack_concretizer": "clingo",
1010
"spack_url": "https://github.com/spack/spack",
11-
"spack_commit": "2bfcc69fa870d3c6919be87593f22647981b648a",
11+
"spack_commit": "2e2169d5282d166f63e3ee4db8d4446c43cefa8a",
12+
"spack_packages_commit": "119680aeee8ea802c6111b7167583bddef97e82f",
1213
"spack_host_config_patches":
1314
{
1415
"PYTHON_EXECUTABLE": "spack_view/view/bin/python3",

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
3535

3636
#### Relay
3737
- Updates to use Silo 4.12 and HDF5 2.0.0.
38+
- Updated uberenv to use Spack 1.1.1
3839
- Reworked HDF5 handle managment to avoid resource leaks with exceptions.
3940
- Relaxed the restriction on float and double volume fractions for data being read from Silo when the length of the mixed arrays is 0 (i.e. no mixed zones/volume fractions are present).
41+
- Adjusted MPI max tag logic search for cases where large tags are supported.
4042
- Added logic to enforce Overlink requirements when writing species sets to Overlink files.
4143

44+
4245
### Fixed
4346

4447
#### Conduit

0 commit comments

Comments
 (0)