Skip to content

Commit 856a36b

Browse files
committed
Merge remote-tracking branch 'origin' into exampleCI2
2 parents 483efa5 + 62bb2f3 commit 856a36b

File tree

76 files changed

+1946
-1428
lines changed

Some content is hidden

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

76 files changed

+1946
-1428
lines changed

.github/codecov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ coverage:
44
default:
55
target: 1%
66
threshold: 1%
7+
patch:
8+
default:
9+
target: 1%
10+
threshold: 1%

.github/file-filter.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@ scripts: &scripts
2222
- 'toolchain/bootstrap/**'
2323

2424
yml: &yml
25-
- '**/*.yml'
25+
- '.github/workflows/phoenix/**'
26+
- '.github/workflows/frontier/**'
27+
- '.github/workflows/bench.yml'
28+
- '.github/workflows/test.yml'
29+
- '.github/workflows/formatting.yml'
2630

2731
checkall: &checkall
2832
- *fortran_src
2933
- *python_src
3034
- *cmakelist
3135
- *tests
3236
- *scripts
33-
- *yml
37+
- *yml

.github/workflows/bench.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020

2121
self:
2222
name: Georgia Tech | Phoenix (NVHPC)
23-
if: github.repository == 'MFlowCode/MFC'
23+
if: github.repository == 'MFlowCode/MFC' && needs.file-changes.outputs.checkall == 'true'
24+
needs: file-changes
2425
strategy:
2526
matrix:
2627
device: ['cpu', 'gpu']

.github/workflows/docs.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
name: Documentation
22

3-
on: [push, pull_request, workflow_dispatch]
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *' # This runs every day at midnight UTC
6+
workflow_dispatch:
7+
push:
8+
pull_request:
49

510
jobs:
611
docs:
712
name: Build & Publish
813
runs-on: ubuntu-latest
914

10-
concurrency:
11-
group: docs-publish
12-
cancel-in-progress: true
13-
1415
steps:
1516
- uses: actions/checkout@v4
1617

@@ -47,7 +48,7 @@ jobs:
4748
echo "excluded-count = ${{ steps.sitemap.outputs.excluded-count }}"
4849
4950
- name: Publish Documentation
50-
if: github.repository == 'MFlowCode/MFC' && github.ref == 'refs/heads/master' && github.event_name == 'push'
51+
if: github.repository == 'MFlowCode/MFC' && github.ref == 'refs/heads/master' && ( github.event_name == 'cron' || github.event_name == 'workflow_dispatch' )
5152
run: |
5253
set +e
5354
git ls-remote "${{ secrets.DOC_PUSH_URL }}" -q

.github/workflows/phoenix/bench.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
n_ranks=4
3+
n_ranks=12
44

55
if [ "$job_device" == "gpu" ]; then
66
n_ranks=$(nvidia-smi -L | wc -l) # number of GPUs on node
@@ -9,7 +9,7 @@ if [ "$job_device" == "gpu" ]; then
99
fi
1010

1111
if ["$job_device" == "gpu"]; then
12-
./mfc.sh bench --mem 8 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix $device_opts -n $n_ranks
12+
./mfc.sh bench --mem 12 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix $device_opts -n $n_ranks
1313
else
1414
./mfc.sh bench --mem 1 -j $(nproc) -o "$job_slug.yaml" -- -c phoenix $device_opts -n $n_ranks
15-
fi
15+
fi

.github/workflows/phoenix/submit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sbatch <<EOT
4141
#SBATCH --account=gts-sbryngelson3 # charge account
4242
#SBATCH -N1 # Number of nodes required
4343
$sbatch_device_opts
44-
#SBATCH -t 04:00:00 # Duration of the job (Ex: 15 mins)
44+
#SBATCH -t 02:00:00 # Duration of the job (Ex: 15 mins)
4545
#SBATCH -q embers # QOS Name
4646
#SBATCH -o$job_slug.out # Combined output and error messages file
4747
#SBATCH -W # Do not exit until the submitted job terminates.

benchmarks/5eq_rk3_weno3_hllc/case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194
'cyl_coord' : 'F',
195195
'dt' : dt,
196196
't_step_start' : 0,
197-
't_step_stop' : int(60*(95*size + 5)),
198-
't_step_save' : int(60*(95*size + 5)),
197+
't_step_stop' : int(30*(95*size + 5)),
198+
't_step_save' : int(30*(95*size + 5)),
199199
# ==========================================================
200200

201201
# Simulation Algorithm Parameters ==========================

benchmarks/hypo_hll/case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
'p' : Nz,
4848
'dt' : 1e-8,
4949
't_step_start' : 0,
50-
't_step_stop' : int(60*(95*size + 5)),
51-
't_step_save' : int(60*(95*size + 5)),
50+
't_step_stop' : int(30*(95*size + 5)),
51+
't_step_save' : int(30*(95*size + 5)),
5252
# ==========================================================
5353

5454
# Simulation Algorithm Parameters ==========================

benchmarks/ibm/case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
'p' : Nz,
5252
'dt' : mydt,
5353
't_step_start' : 0,
54-
't_step_stop' : int(40*(95*size + 5)),
55-
't_step_save' : int(40*(95*size + 5)),
54+
't_step_stop' : int(20*(95*size + 5)),
55+
't_step_save' : int(20*(95*size + 5)),
5656
# ==========================================================
5757

5858
# Simulation Algorithm Parameters ==========================

benchmarks/viscous_weno5_sgb_acoustic/case.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
'p' : Nz,
114114
'dt' : dt,
115115
't_step_start' : 0,
116-
't_step_stop' : int(30*(25*size + 5)),
117-
't_step_save' : int(30*(25*size + 5)),
116+
't_step_stop' : int(15*(25*size + 5)),
117+
't_step_save' : int(15*(25*size + 5)),
118118
# ==========================================================
119119

120120
# Simulation Algorithm Parameters ==========================

0 commit comments

Comments
 (0)