Skip to content

Commit

Permalink
Merge pull request #1631 from NOAA-GFDL/gfdl-to-main-2024-05-31
Browse files Browse the repository at this point in the history
GFDL to main (2024-05-31)
  • Loading branch information
marshallward authored Jul 29, 2024
2 parents 83fb3f0 + ee686c8 commit aacb909
Show file tree
Hide file tree
Showing 154 changed files with 13,673 additions and 8,872 deletions.
2 changes: 1 addition & 1 deletion .github/actions/testing-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ runs:
run: |
echo "::group::Compile FMS library"
cd .testing
REPORT_ERROR_LOGS=true make deps/lib/libFMS.a -s -j
REPORT_ERROR_LOGS=true make build/deps/lib/libFMS.a -s -j
echo "::endgroup::"
- name: Compile MOM6 in symmetric memory mode
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,7 @@ jobs:
- name: Run (single processor) unit tests
run: make run.unit

- name: Report unit test coverage to CI (PR)
if: github.event_name == 'pull_request'
run: make report.cov.unit REQUIRE_COVERAGE_UPLOAD=true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

- name: Report unit test coverage to CI (Push)
if: github.event_name != 'pull_request'
- name: Report unit test coverage to CI
run: make report.cov.unit
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand All @@ -49,14 +42,7 @@ jobs:
- name: Run coverage tests
run: make -j -k run.cov

- name: Report coverage to CI (PR)
if: github.event_name == 'pull_request'
run: make report.cov REQUIRE_COVERAGE_UPLOAD=true
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

- name: Report coverage to CI (Push)
if: github.event_name != 'pull_request'
- name: Report coverage to CI
run: make report.cov
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
1 change: 1 addition & 0 deletions .github/workflows/macos-regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
env:
CC: gcc
FC: gfortran
FMS_COMMIT: 2019.01.03

defaults:
run:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/macos-stencil.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
env:
CC: gcc
FC: gfortran
FMS_COMMIT: 2019.01.03

defaults:
run:
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/perfmon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,36 @@ jobs:
sudo sysctl -w kernel.perf_event_paranoid=2
make perf DO_REGRESSION_TESTS=true
# This job assumes that build/target_codebase was cloned above
- name: Compile timing tests for reference code
if: ${{ github.event_name == 'pull_request' }}
run: >-
make -j build.timing_target
MOM_TARGET_SLUG=$GITHUB_REPOSITORY
MOM_TARGET_LOCAL_BRANCH=$GITHUB_BASE_REF
DO_REGRESSION_TESTS=true
- name: Compile timing tests
run: |
make -j build.timing
# DO_REGERESSION_TESTS=true is needed here to set the internal macro TARGET_CODEBASE
- name: Run timing tests for reference code
if: ${{ github.event_name == 'pull_request' }}
run: >-
make -j run.timing_target
DO_REGRESSION_TESTS=true
- name: Run timing tests
run: |
make -j run.timing
- name: Display timing results
run: |
make -j show.timing
- name: Display comparison of timing results
if: ${{ github.event_name == 'pull_request' }}
run: >-
make -j compare.timing
DO_REGRESSION_TESTS=true
5 changes: 4 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ stages:
# that is unique to this pipeline.
# We use the "fetch" strategy to speed up the startup of stages
variables:
JOB_DIR: "/lustre/f2/scratch/oar.gfdl.ogrp-account/runner/builds/$CI_PIPELINE_ID"
JOB_DIR: "/gpfs/f5/gfdl_o/scratch/oar.gfdl.ogrp-account/runner/builds/$CI_PIPELINE_ID"
GIT_STRATEGY: fetch

# Always eport value of $JOB_DIR
Expand All @@ -32,6 +32,8 @@ p:clone:
tags:
- ncrc5
script:
# NOTE: We could sweep any builds older than 3 days here if needed
#- find $HOME/ci/[0-9]* -mtime +3 -delete 2> /dev/null || true
- .gitlab/pipeline-ci-tool.sh create-job-dir
#.gitlab/pipeline-ci-tool.sh clean-job-dir

Expand Down Expand Up @@ -353,4 +355,5 @@ cleanup:
before_script:
- echo Skipping usual preamble
script:
- rm -rf $HOME/ci/$CI_PIPELINE_ID
- rm -rf $JOB_DIR
7 changes: 7 additions & 0 deletions .gitlab/pipeline-ci-tool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ create-job-dir () {
make -f tools/MRS/Makefile.clone clone_gfdl -j # Extras and link to datasets
bash tools/MRS/generate_manifest.sh . tools/MRS/excluded-expts.txt > manifest.mk
mkdir -p results
# Temporarily move build directory to $HOME to circumvent poor F5 performance
mkdir -p $HOME/ci/$CI_PIPELINE_ID/build
ln -s $HOME/ci/$CI_PIPELINE_ID/build build
# Builds need non-mangled access to src/.
ln -s "$(pwd)"/src $HOME/ci/$CI_PIPELINE_ID/src
# Static builds need access to ocean_only/
ln -s "$(pwd)"/ocean_only $HOME/ci/$CI_PIPELINE_ID/ocean_only
fi
section-end create-job-dir
}
Expand Down
Loading

0 comments on commit aacb909

Please sign in to comment.