Skip to content

Commit 2f85982

Browse files
committed
Merge remote-tracking branch 'GFDL/dev-gfdl-main-candidate-2023-11-13' into test/GFDL-20231113-final
2 parents c8a7325 + 40134ed commit 2f85982

File tree

145 files changed

+13032
-7447
lines changed

Some content is hidden

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

145 files changed

+13032
-7447
lines changed

.github/workflows/coverage.yml

+17-3
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,29 @@ jobs:
1919

2020
- uses: ./.github/actions/testing-setup
2121

22-
- name: Compile unit testing
23-
run: make -j build/unit/MOM_unit_tests
22+
- name: Compile file parser unit tests
23+
run: make -j build/unit/test_MOM_file_parser
2424

25-
- name: Run unit tests
25+
- name: Run file parser unit tests
2626
run: make run.cov.unit
2727

28+
- name: Compile unit testing
29+
run: make -j build.unit
30+
31+
- name: Run (single processor) unit tests
32+
run: make run.unit
33+
2834
- name: Report unit test coverage to CI (PR)
2935
if: github.event_name == 'pull_request'
3036
run: make report.cov.unit REQUIRE_COVERAGE_UPLOAD=true
37+
env:
38+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
3139

3240
- name: Report unit test coverage to CI (Push)
3341
if: github.event_name != 'pull_request'
3442
run: make report.cov.unit
43+
env:
44+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
3545

3646
- name: Compile ocean-only MOM6 with code coverage
3747
run: make -j build/cov/MOM6
@@ -42,7 +52,11 @@ jobs:
4252
- name: Report coverage to CI (PR)
4353
if: github.event_name == 'pull_request'
4454
run: make report.cov REQUIRE_COVERAGE_UPLOAD=true
55+
env:
56+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4557

4658
- name: Report coverage to CI (Push)
4759
if: github.event_name != 'pull_request'
4860
run: make report.cov
61+
env:
62+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/perfmon.yml

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Performance Monitor
22

3-
on: [pull_request]
3+
on: [push, pull_request]
44

55
jobs:
66
build-test-perfmon:
@@ -20,19 +20,34 @@ jobs:
2020
- uses: ./.github/actions/testing-setup
2121

2222
- name: Compile optimized models
23+
if: ${{ github.event_name == 'pull_request' }}
2324
run: >-
2425
make -j build.prof
2526
MOM_TARGET_SLUG=$GITHUB_REPOSITORY
2627
MOM_TARGET_LOCAL_BRANCH=$GITHUB_BASE_REF
2728
DO_REGRESSION_TESTS=true
2829
2930
- name: Generate profile data
31+
if: ${{ github.event_name == 'pull_request' }}
3032
run: >-
3133
pip install f90nml &&
3234
make profile
3335
DO_REGRESSION_TESTS=true
3436
3537
- name: Generate perf data
38+
if: ${{ github.event_name == 'pull_request' }}
3639
run: |
3740
sudo sysctl -w kernel.perf_event_paranoid=2
3841
make perf DO_REGRESSION_TESTS=true
42+
43+
- name: Compile timing tests
44+
run: |
45+
make -j build.timing
46+
47+
- name: Run timing tests
48+
run: |
49+
make -j run.timing
50+
51+
- name: Display timing results
52+
run: |
53+
make -j show.timing

.gitlab-ci.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ stages:
1010
# We use the "fetch" strategy to speed up the startup of stages
1111
variables:
1212
JOB_DIR: "/lustre/f2/scratch/oar.gfdl.ogrp-account/runner/builds/$CI_PIPELINE_ID"
13-
WORKSPACE: "/lustre/f2/scratch/oar.gfdl.ogrp-account/runner/$CI_RUNNER_ID"
1413
GIT_STRATEGY: fetch
1514

1615
# Always eport value of $JOB_DIR
@@ -185,9 +184,9 @@ actions:gnu:
185184
- make -s -j
186185
- MPIRUN= make preproc -s -j
187186
- echo -e "\e[0Ksection_end:`date +%s`:compile\r\e[0K"
188-
- (echo '#!/bin/bash';echo 'make MPIRUN="srun -mblock --exclusive" WORKSPACE=$WORKSPACE test -s -j') > job.sh
189-
- sbatch --clusters=c5 --nodes=2 --time=0:10:00 --account=gfdl_o --qos=debug --job-name=MOM6.gnu.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make WORKSPACE=$WORKSPACE test -s
190-
- make WORKSPACE=$WORKSPACE test.summary
187+
- (echo '#!/bin/bash';echo 'make MPIRUN="srun -mblock --exclusive" test -s -j') > job.sh
188+
- sbatch --clusters=c5 --nodes=2 --time=0:10:00 --account=gfdl_o --qos=debug --job-name=MOM6.gnu.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make test -s
189+
- make test.summary
191190

192191
actions:intel:
193192
stage: tests
@@ -205,9 +204,9 @@ actions:intel:
205204
- make -s -j
206205
- MPIRUN= make preproc -s -j
207206
- echo -e "\e[0Ksection_end:`date +%s`:compile\r\e[0K"
208-
- (echo '#!/bin/bash';echo 'make MPIRUN="srun -mblock --exclusive" WORKSPACE=$WORKSPACE test -s -j') > job.sh
209-
- sbatch --clusters=c5 --nodes=2 --time=0:10:00 --account=gfdl_o --qos=debug --job-name=MOM6.intel.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make WORKSPACE=$WORKSPACE test -s
210-
- make WORKSPACE=$WORKSPACE test.summary
207+
- (echo '#!/bin/bash';echo 'make MPIRUN="srun -mblock --exclusive" test -s -j') > job.sh
208+
- sbatch --clusters=c5 --nodes=2 --time=0:10:00 --account=gfdl_o --qos=debug --job-name=MOM6.intel.testing --output=log.$CI_JOB_ID --wait job.sh || ( cat log.$CI_JOB_ID ; exit 911 ) && make test -s
209+
- make test.summary
211210

212211
# Tests
213212
#

0 commit comments

Comments
 (0)