Skip to content

Commit c927be5

Browse files
jjokellajjokella
committed
Merge branch 'master' into tsmp-pdaf-patched-netcdf-fortran-fix
2 parents bc934e4 + b73c713 commit c927be5

940 files changed

Lines changed: 12940 additions & 644 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/linux.yml‎

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Linux CI Tests
22

33
on: [push, pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
59
jobs:
610
style-check:
711
# Runs a check on C and Python coding style. Code
@@ -112,11 +116,12 @@ jobs:
112116
# useful.
113117
config:
114118
- {
115-
name: "Ubuntu 24.04 GCC",
116-
os: ubuntu-24.04,
117-
cudaos: 'ubuntu2404',
119+
name: "Ubuntu 22.04 GCC",
120+
os: ubuntu-22.04,
121+
cudaos: 'ubuntu2204',
118122
cc: "gcc", cxx: "g++", fc: "gfortran",
119-
python: "false",
123+
python: "true",
124+
tcl: "true",
120125
backend: "none",
121126
amps_layer: mpi1,
122127
netcdf: "true",
@@ -125,53 +130,60 @@ jobs:
125130
sundials: "embedded"
126131
}
127132
- {
128-
name: "Ubuntu 24.04 GCC Sundials",
133+
name: "Ubuntu 24.04 GCC",
129134
os: ubuntu-24.04,
130135
cudaos: 'ubuntu2404',
131136
cc: "gcc", cxx: "g++", fc: "gfortran",
132-
python: "false",
137+
python: "true",
138+
tcl: "true",
133139
backend: "none",
134140
amps_layer: mpi1,
135141
netcdf: "true",
136142
memory_manager: "none",
137143
pdi: "false",
138-
sundials: "external"
144+
sundials: "embedded"
139145
}
140146
- {
141-
name: "Ubuntu 24.04 LLVM",
147+
name: "Ubuntu 24.04 GCC Sundials",
142148
os: ubuntu-24.04,
143149
cudaos: 'ubuntu2404',
144-
cc: "clang-18", cxx: "clang++-18", fc: "gfortran",
145-
python: "false",
150+
cc: "gcc", cxx: "g++", fc: "gfortran",
151+
python: "true",
152+
tcl: "true",
146153
backend: "none",
147154
amps_layer: mpi1,
148155
netcdf: "true",
149156
memory_manager: "none",
150157
pdi: "false",
151-
sundials: "embedded"
158+
sundials: "external"
152159
}
153160
- {
154-
name: "Ubuntu 22.04 GCC Python",
155-
os: ubuntu-22.04,
156-
cudaos: 'ubuntu2204',
161+
# Testing deprecation of TCL
162+
# Should switch default in other matrix builds to build without TCL when we deprecate TCL
163+
# Keep at least one test with TCL until we fully remove TCL
164+
name: "Ubuntu 24.04 GCC without TCL",
165+
os: ubuntu-24.04,
166+
cudaos: 'ubuntu2404',
157167
cc: "gcc", cxx: "g++", fc: "gfortran",
158168
python: "true",
169+
tcl: "false",
159170
backend: "none",
160171
amps_layer: mpi1,
161172
netcdf: "true",
162173
memory_manager: "none",
163174
pdi: "false",
164-
sundials: "embedded"
175+
sundials: "external"
165176
}
166177
- {
167-
name: "Ubuntu 24.04 GCC Python",
178+
name: "Ubuntu 24.04 LLVM",
168179
os: ubuntu-24.04,
169180
cudaos: 'ubuntu2404',
170-
cc: "gcc", cxx: "g++", fc: "gfortran",
181+
cc: "clang-18", cxx: "clang++-18", fc: "gfortran",
171182
python: "true",
183+
tcl: "true",
172184
backend: "none",
173185
amps_layer: mpi1,
174-
netcdf: "false",
186+
netcdf: "true",
175187
memory_manager: "none",
176188
pdi: "false",
177189
sundials: "embedded"
@@ -181,7 +193,8 @@ jobs:
181193
os: ubuntu-24.04,
182194
cudaos: 'ubuntu2404',
183195
cc: "gcc", cxx: "g++", fc: "gfortran",
184-
python: "false",
196+
python: "true",
197+
tcl: "true",
185198
backend: "omp",
186199
amps_layer: mpi1,
187200
netcdf: "false",
@@ -190,6 +203,7 @@ jobs:
190203
sundials: "embedded"
191204
}
192205
- {
206+
# OASIS tests are broken with Python
193207
name: "Ubuntu 24.04 LLVM OASIS3-MCT Build",
194208
os: ubuntu-24.04,
195209
cudaos: 'ubuntu2404',
@@ -217,7 +231,8 @@ jobs:
217231
name: "Ubuntu 24.04 GCC CUDA/Umpire Build",
218232
os: ubuntu-24.04,
219233
cc: "gcc", cxx: "g++", fc: "gfortran",
220-
python: "false",
234+
python: "true",
235+
tcl: "true",
221236
backend: "cuda",
222237
cudaos: 'ubuntu2404',
223238
amps_layer: mpi1,
@@ -241,7 +256,8 @@ jobs:
241256
name: "Ubuntu 24.04 GCC Kokkos/Umpire Build",
242257
os: ubuntu-24.04,
243258
cc: "gcc", cxx: "g++", fc: "gfortran",
244-
python: "false",
259+
python: "true",
260+
tcl: "true",
245261
backend: "kokkos",
246262
cudaos: 'ubuntu2404',
247263
amps_layer: mpi1,
@@ -255,7 +271,8 @@ jobs:
255271
os: ubuntu-24.04,
256272
cudaos: 'ubuntu2404',
257273
cc: "gcc", cxx: "g++", fc: "gfortran",
258-
python: "false",
274+
python: "true",
275+
tcl: "true",
259276
backend: "none",
260277
amps_layer: mpi1,
261278
netcdf: "false",
@@ -393,7 +410,7 @@ jobs:
393410
make -j
394411
make install
395412
fi
396-
echo "RMM_FLAGS=-Drmm_ROOT=$PARFLOW_DEP_DIR/rmm" >> $GITHUB_ENV
413+
echo "RMM_FLAGS=-DRMM_ROOT=$PARFLOW_DEP_DIR/rmm" >> $GITHUB_ENV
397414
398415
- name: Umpire Install
399416
env:
@@ -410,7 +427,7 @@ jobs:
410427
cmake --build build --parallel 4
411428
cmake --install build
412429
fi
413-
echo "UMPIRE_FLAGS=-Dumpire_ROOT=$PARFLOW_DEP_DIR/Umpire" >> $GITHUB_ENV
430+
echo "UMPIRE_FLAGS=-DUMPIRE_ROOT=$PARFLOW_DEP_DIR/Umpire" >> $GITHUB_ENV
414431
415432
- name: Kokkos Install
416433
env:
@@ -494,7 +511,7 @@ jobs:
494511
CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
495512
run: |
496513
if [[ "$CACHE_HIT" != 'true' ]]; then
497-
URL=https://github.com/LLNL/Silo/archive/refs/tags/4.11.1.tar.gz
514+
URL=https://github.com/LLNL/Silo/archive/refs/tags/4.12.0.tar.gz
498515
mkdir silo
499516
cd silo
500517
curl -L $URL | tar --strip-components=1 -xz
@@ -599,6 +616,7 @@ jobs:
599616
-DOAS3_ROOT=$PARFLOW_DEP_DIR \
600617
-DSILO_ROOT=$PARFLOW_DEP_DIR \
601618
-DPARFLOW_ENABLE_PYTHON=${{ matrix.config.python }} \
619+
-DPARFLOW_ENABLE_TCL=${{ matrix.config.tcl }} \
602620
-DCMAKE_INSTALL_PREFIX=$PARFLOW_DIR \
603621
$NETCDF_FLAGS $KOKKOS_FLAGS $RMM_FLAGS $UMPIRE_FLAGS $PDI_FLAGS $SUNDIALS_FLAGS
604622

‎.github/workflows/macos.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ name: MacOS CI Tests
77

88
on: [push, pull_request]
99

10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
cancel-in-progress: true
13+
1014
jobs:
1115
build:
1216
name: ${{ matrix.config.name }}
@@ -120,7 +124,7 @@ jobs:
120124
CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
121125
run: |
122126
if [[ "$CACHE_HIT" != 'true' ]]; then
123-
URL=https://github.com/LLNL/Silo/archive/refs/tags/4.11.1.tar.gz
127+
URL=https://github.com/LLNL/Silo/archive/refs/tags/4.12.0.tar.gz
124128
mkdir silo
125129
cd silo
126130
curl -L $URL | tar --strip-components=1 -xz
@@ -133,7 +137,7 @@ jobs:
133137
CACHE_HIT: ${{steps.cache-parflow-dependencies.outputs.cache-hit}}
134138
run: |
135139
if [[ "$CACHE_HIT" != 'true' ]]; then
136-
URL=https://github.com/hypre-space/hypre/archive/v2.26.0.tar.gz
140+
URL=https://github.com/hypre-space/hypre/archive/v2.33.0.tar.gz
137141
mkdir hypre
138142
cd hypre
139143
curl -L $URL | tar --strip-components=1 -xz

‎.github/workflows/self_hosted.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: GPU CI Tests
22

33
on: [push, pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
59
jobs:
610
test-gpu:
711
# only run GPU test if in parflow project
@@ -44,7 +48,7 @@ jobs:
4448
cmake .. -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/depend/rmm -DBUILD_TESTS=OFF
4549
make -j
4650
make install
47-
echo "RMM_FLAGS=-Drmm_ROOT=$GITHUB_WORKSPACE/depend/rmm" >> $GITHUB_ENV
51+
echo "RMM_FLAGS=-DRMM_ROOT=$GITHUB_WORKSPACE/depend/rmm" >> $GITHUB_ENV
4852
4953
- name: Install Umpire
5054
if: matrix.config.memory_manager == 'umpire'
@@ -59,7 +63,7 @@ jobs:
5963
cmake .. -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/depend/Umpire -DENABLE_CUDA=On
6064
make -j
6165
make install
62-
echo "UMPIRE_FLAGS=-Dumpire_ROOT=$GITHUB_WORKSPACE/depend/Umpire" >> $GITHUB_ENV
66+
echo "UMPIRE_FLAGS=-DUMPIRE_ROOT=$GITHUB_WORKSPACE/depend/Umpire" >> $GITHUB_ENV
6367
6468
- name: Configure ParFlow
6569
run: |

0 commit comments

Comments
 (0)