Skip to content

Commit 03f7080

Browse files
JustinPriviteraJustinPrivitera
committed
merge develop
2 parents 5697007 + d64f9ce commit 03f7080

179 files changed

Lines changed: 30886 additions & 18359 deletions

File tree

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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
build_basic:
9-
name: Ubuntu Build Conduit Clang Asan
9+
name: Ubuntu Clang Asan
1010
runs-on: ubuntu-latest
1111
env:
1212
CC: clang
@@ -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_cuda.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: build_conduit_cuda
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
7+
jobs:
8+
build_cuda:
9+
name: Ubuntu CUDA
10+
runs-on: ubuntu-latest
11+
container: alpinedav/ascent-ci:ubuntu-22.04-cuda-11.8.0-devel
12+
env:
13+
CMAKE_VERSION: 3.31.8
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
17+
with:
18+
submodules: 'recursive'
19+
- name: Install CMake
20+
run: |
21+
curl -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -o cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
22+
tar -xzf cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
23+
cmake-${CMAKE_VERSION}-linux-x86_64/bin/cmake --version
24+
- name: Build TPLs
25+
run: |
26+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
27+
env enable_cuda=ON \
28+
enable_mpi=OFF \
29+
enable_fortran=OFF \
30+
enable_tests=OFF \
31+
build_conduit=OFF \
32+
enable_verbose=OFF \
33+
build_jobs=2 \
34+
./scripts/build_conduit/build_conduit.sh
35+
- name: Configure Conduit
36+
run: |
37+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
38+
cmake --version
39+
echo "**** Configuring Conduit"
40+
cmake -S src -B build -C conduit-config.cmake -DCMAKE_INSTALL_PREFIX=install
41+
- name: Build Conduit
42+
run: |
43+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
44+
echo "**** Building Conduit"
45+
cmake --build build -j2 --config Release
46+
- name: Install Conduit
47+
run: |
48+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
49+
echo "**** Installing Conduit"
50+
cmake --install build --config Release

‎.github/workflows/build_conduit_gcc.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66

77
jobs:
88
build_basic:
9-
name: Ubuntu Build Conduit GCC
10-
runs-on: ubuntu-22.04
9+
name: Ubuntu GCC
10+
runs-on: ubuntu-24.04
1111
env:
1212
CC: gcc
1313
CXX: g++
@@ -16,7 +16,8 @@ jobs:
1616
- name: Install System Deps
1717
run: |
1818
sudo apt-get update
19-
sudo apt-get install binutils \
19+
sudo env DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
20+
sudo apt-get install -y binutils \
2021
gcc \
2122
g++ \
2223
gfortran \
@@ -72,22 +73,25 @@ jobs:
7273
run: |
7374
echo "**** Building Conduit"
7475
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
7580
- name: Install Conduit
7681
run: |
7782
echo "**** Installing Conduit"
7883
cmake --install build
7984
- name: Check Install
8085
run: |
81-
echo "**** Checking Conduit using-with-cmake-mpi example"
8286
export CC=/usr/bin/mpicc
8387
export CXX=/usr/bin/mpicxx
8488
cd install/examples/conduit/using-with-cmake-mpi
8589
cmake -S . -B build
8690
cmake --build build --verbose -j2
8791
mpiexec -n 2 ./build/conduit_mpi_example
8892
build_basic_pyvenv:
89-
name: Ubuntu Build Conduit GCC with Python VENV
90-
runs-on: ubuntu-22.04
93+
name: Ubuntu GCC with Python VENV
94+
runs-on: ubuntu-24.04
9195
env:
9296
CC: gcc
9397
CXX: g++
@@ -96,7 +100,8 @@ jobs:
96100
- name: Install System Deps
97101
run: |
98102
sudo apt-get update
99-
sudo apt-get install binutils \
103+
sudo env DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
104+
sudo apt-get install -y binutils \
100105
gcc \
101106
g++ \
102107
gfortran \

‎.github/workflows/build_conduit_hip.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: build_conduit_hip
2+
3+
on:
4+
pull_request:
5+
branches: [ develop ]
6+
7+
jobs:
8+
build_hip:
9+
name: Ubuntu HIP
10+
runs-on: ubuntu-22.04
11+
container: alpinedav/ascent-devel:ubuntu-22.04-rocm-6.3.4-x86_64
12+
env:
13+
CMAKE_VERSION: 3.31.8
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
17+
with:
18+
submodules: 'recursive'
19+
- name: Install CMake
20+
run: |
21+
curl -L https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz -o cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
22+
tar -xzf cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
23+
cmake-${CMAKE_VERSION}-linux-x86_64/bin/cmake --version
24+
- name: Build TPLs
25+
run: |
26+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
27+
env enable_hip=ON \
28+
enable_mpi=OFF \
29+
enable_fortran=OFF \
30+
enable_tests=OFF \
31+
build_conduit=false \
32+
enable_verbose=OFF \
33+
build_jobs=2 \
34+
./scripts/build_conduit/build_conduit.sh
35+
- name: Configure Conduit
36+
run: |
37+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
38+
cmake --version
39+
echo "**** Configuring Conduit"
40+
cmake -S src -B build -C conduit-config.cmake -DCMAKE_INSTALL_PREFIX=install
41+
- name: Build Conduit
42+
run: |
43+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
44+
echo "**** Building Conduit"
45+
cmake --build build -j2 --config Release
46+
- name: Install Conduit
47+
run: |
48+
export PATH=$PATH:cmake-${CMAKE_VERSION}-linux-x86_64/bin/
49+
echo "**** Installing Conduit"
50+
cmake --install build --config Release

‎.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+

‎.github/workflows/pip.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jobs:
5555
submodules: 'recursive'
5656
- name: Build & Test
5757
run: |
58+
# we need pip 24 or newer
59+
python3 -m pip install --upgrade pip
5860
env ENABLE_MPI=ON HDF5_DIR=/usr/ pip install -v .
5961
rm -rf build
6062
python3 -c "import conduit;print(conduit.about());"
@@ -112,6 +114,8 @@ jobs:
112114
submodules: 'recursive'
113115
- name: Build & Test
114116
run: |
117+
# we need pip 24 or newer
118+
python3 -m pip install --upgrade pip
115119
echo 'set(ENABLE_MPI "ON" CACHE BOOL "")' > conduit-config.cmake
116120
echo 'set(HDF5_DIR "/usr/" CACHE PATH "")' >> conduit-config.cmake
117121
cat conduit-config.cmake

‎.github/workflows/uberenv_install.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
uberenv_install_ubuntu_22_04:
9-
name: Uberenv Install ubuntu-22.04
9+
name: Ubuntu Uberenv Install
1010
container: alpinedav/ascent-ci:ubuntu-22.04-devel
1111
runs-on: ubuntu-latest
1212
steps:

‎.github/workflows/windows.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup MPI
1313
uses: mpi4py/setup-mpi@v1
1414
- name: Setup Python Env
15-
run: python3 -m pip install --upgrade pip numpy mpi4py wheel
15+
run: python3 -m pip install --upgrade pip numpy mpi4py wheel setuptools
1616
- uses: actions/checkout@v2
1717
with:
1818
submodules: 'recursive'
@@ -32,7 +32,7 @@ jobs:
3232
- name: Setup MPI
3333
uses: mpi4py/setup-mpi@v1
3434
- name: Setup Python Env
35-
run: python3 -m pip install --upgrade pip numpy mpi4py wheel
35+
run: python3 -m pip install --upgrade pip numpy mpi4py wheel setuptools
3636
- uses: actions/checkout@v4
3737
with:
3838
submodules: 'recursive'
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup MPI
5454
uses: mpi4py/setup-mpi@v1
5555
- name: Setup Python Env
56-
run: python3 -m pip install --upgrade pip numpy mpi4py wheel
56+
run: python3 -m pip install --upgrade pip numpy mpi4py wheel setuptools
5757
- uses: actions/checkout@v4
5858
with:
5959
submodules: 'recursive'
@@ -73,17 +73,16 @@ jobs:
7373
strategy:
7474
matrix:
7575
python-version:
76-
- '3.8'
7776
- '3.9'
78-
- '3.10'
77+
- '3.13'
7978
steps:
8079
- uses: actions/setup-python@v2
8180
with:
8281
python-version: ${{ matrix.python-version }}
8382
- name: Setup MPI
8483
uses: mpi4py/setup-mpi@v1
8584
- name: Setup Python Env
86-
run: python3 -m pip install --upgrade pip numpy mpi4py wheel
85+
run: python3 -m pip install --upgrade pip numpy mpi4py wheel setuptools
8786
- uses: actions/checkout@v4
8887
with:
8988
submodules: 'recursive'
@@ -109,7 +108,7 @@ jobs:
109108
Start-Process -FilePath .\llvm.exe -ArgumentList "/S", "/D=C:\LLVM" -Wait
110109
echo "C:\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
111110
- name: Setup Python Env
112-
run: python3 -m pip install --upgrade pip numpy wheel
111+
run: python3 -m pip install --upgrade pip numpy wheel setuptools
113112
- uses: actions/checkout@v4
114113
with:
115114
submodules: 'recursive'

‎.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",

0 commit comments

Comments
 (0)