Cmake build by minghangli-uni · Pull Request #2 · ACCESS-NRI/MOM6

minghangli-uni · 2024-12-09T04:11:48Z

Open this PR to make some minor tweaks visible.

Closes #1

codecov · 2024-12-09T04:27:49Z

Welcome to Codecov 🎉

Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests.

Thanks for integrating Codecov - We've got you covered ☂️

cmake/MOM6libConfig.cmake.in

cmake/CMakeLists.txt

cmake/FindPIO.cmake

cmake/MOM6libConfig.cmake.in

cmake/CompilerFlags.cmake

anton-seaice · 2025-03-20T03:37:53Z

This is ready to review. This adds a CMake build for MOM6. The build supports building a library with access3 dependencies and building a standalone mom6.

If you have time to review @micaeljtoliveira that would be great.

@dougiesquire please review and confirm which is the right target branch for this PR?

@minghangli-uni - please reivew too :)

FYI @chrisb13

dougiesquire

Thanks @anton-seaice and @minghangli-uni. Looking great! One typo and a few questions, mostly about default settings.

Regarding which branch to use, I think it's probably best to use dev/access. There's an issue with the generic tracer changes that I need to resolve. We can still test most of our configs using dev/access, just not the WOMBAT one.

CMakeLists.txt

anton-seaice · 2025-03-26T00:38:23Z

Regarding which branch to use, I think it's probably best to use dev/access. There's an issue with the generic tracer changes that I need to resolve. We can still test most of our configs using dev/access, just not the WOMBAT one.

ok - we'd want to reset dev/access to the same as branch 'origin/PRcandidate-202502-gtracer-nuopc' first to avoid the unrelated changes being in this PR.

I thought dev/access needs to be in a state to be able to merge upstream in the future ? (which it wouldn't be with this change)

dougiesquire · 2025-03-26T01:13:14Z

ok - we'd want to reset dev/access to the same as branch 'origin/PRcandidate-202502-gtracer-nuopc' first to avoid the unrelated changes being in this PR.

I don't think we want to do this

I thought dev/access needs to be in a state to be able to merge upstream in the future ? (which it wouldn't be with this change)

I need to go and reread the new fork-management policy

CMakeLists.txt

Co-authored-by: minghangli-uni <minghang.li1@anu.edu.au> Co-authored-by: Micael Oliveira <micael.oliveira@anu.edu.au> Co-authored-by: Dougie Squire <dougie.squire@anu.edu.au>

anton-seaice · 2025-03-27T02:09:34Z

Apologies for the git chaos.

Even though this change won't end up upstream (probably), we will merge into dev/access - as described in #7

I removed the generic tracers changes which are not in dev/access yet.

anton-seaice · 2025-03-27T03:19:40Z

I think I addressed all the comments. This is ready for re-review

New builds:

ACCESS-NRI/ACCESS-OM3#35 (comment)
ACCESS-NRI/ACCESS-OM3#64 (comment)

micaeljtoliveira

LGTM!

CMakeLists.txt

dougiesquire

LGTM!

anton-seaice · 2025-03-27T22:35:21Z

This is ready to merge, just holding off until we are tripley sure dev/access is the place for it

dougiesquire

Sorry, another thought:

I wonder if we should put CMakeLists.txt in the cmake directory. This might be preferred if/when we try to get this upstream.

dougiesquire

Good catch

* Add cmake build based on https://github.com/cOSIMA/access-om3 There are two variations, the default is to build the mom6 standalone executable, the alternative is to build a library for access3 models (with https://github.com/ACCESS-NRI/access3-share as a dependency). Co-authored-by: minghangli-uni <minghang.li1@anu.edu.au> Co-authored-by: Micael Oliveira <micael.oliveira@anu.edu.au> Co-authored-by: Dougie Squire <dougie.squire@anu.edu.au>

* Add cmake build based on https://github.com/COSIMA/access-om3 There are two variations, the default is to build the mom6 standalone executable, the alternative is to build a library for access3 models (with https://github.com/ACCESS-NRI/access3-share as a dependency). Co-authored-by: Dougie Squire <dougie.squire@anu.edu.au> Co-authored-by: minghangli-uni <minghang.li1@anu.edu.au> Co-authored-by: Micael Oliveira <micael.oliveira@anu.edu.au>

* Add cmake build based on https://github.com/COSIMA/access-om3 There are two variations, the default is to build the mom6 standalone executable, the alternative is to build a library for access3 models (with https://github.com/ACCESS-NRI/access3-share as a dependency). Co-authored-by: Dougie Squire <dougie.squire@anu.edu.au> Co-authored-by: minghangli-uni <minghang.li1@anu.edu.au> Co-authored-by: Micael Oliveira <micael.oliveira@anu.edu.au> Co-authored-by: Jorge Galvez Vallejo <jorge.galvezvallejo@anu.edu.au>

* Add MOM_ANN module * Mesoscale momentum parameterization with ANN - Computes subgrid stress using ANN in MOM_Zanna_Bolton - Uses MOM_ANN module for ANN inference Equivalent MOM_override for defaults ``` USE_ZB2020 = True ZB2020_USE_ANN = True USE_CIRCULATION_IN_HORVISC = True ZB2020_ANN_FILE_TALL = /path/to/ocean3d/subfilter/FGR3/EXP1/model/Tall.nc ``` * Mesoscale momentum parameterization with ANN (#2) Blank commit after squash/rebase was handled on command line * Moved MOM_ANN.F90 to src/framework/ * Minor refactor of MOM_ANN - Removed unused modules - Removed unused MOM_memory.h - Added input and output means which default to 0 and do not need to be present in the weights file - Gave defaults to means, norms, tests so that they do no need to be present in file - Added missing array notation "(:)" - Minor formatting * Adds unit tests and timing test to MOM_ANN - Added ANN_allocate, set_layer, set_input_normalization, and set_output_normalization methods to allow reconfiguration during unit tests - Added ANN_unit_tests with some simple constructed-by-code networks with known solutions - Added config_src/drivers/unit_tests/test_MOM_ANN.F90 to drive unit tests - Added config_src/drivers/timing_tests/time_MOM_ANN.F90 as rudimentary for timing inference * Adding multiple forms of inference - Adds inference operating on array (instead of single vector of features) - Implements several different versions of inference with various loop orders - Involves storing the transpose of A in the type - Tested by checking inference on same inputs is identical between variants - Added randomizers to assist in unit testing - Adds timing of variants to config_src/drivers/timing/time_MOM_ANN.F90 - Adds an interface (MOM_apply) to select preferred version of inference subroutine - Added command line args to time_MOM_ANN.F90 to allow more rapid evaluation of performance Variants explored, timed with gfortran (13.2) -O3 on Xeon: - vector_v1: - original inference from Pavel - vector_v2: - allocate work arrays just once, using widest layer - loop over layers in 2's to avoid pointer calculations and copies - speed up, x0.8 relative to v1 - vector_v3: - transpose loops - slow down, x1.54 relative to v1 - vector_v4: - transpose weights with same loop order as v1 - slow down, x1.03 relative to v1 - array_v1: - same structure as v2, working on x(space,feature) input/outputs - speed up, x0.41 relative to v1 - array_v2: - as for array_v1 but with transposed loop order - apply activation function on vector of first index while in cache - speed up, x0.35 relative to v1 - array_v3: - same structure as v2, working on x(feature,space) input/outputs - speed up, x0.58 relative to v1 * Renamed ANN variants and added some module documentation - Added module dox - Renamed _v1, _v2 etc to labels - Added ANN_apply_array_sio to ANN_apply interface - Replaced "flops" with "MBps" in timing output * Removed alternative variants of ANN in favor of optimized - Deleted variants of ANN that did not perform as well as the two versions that remain. * Apply array_sio function in ANN inference for momentum fluxes (#5) * Apply array_sio ANN inference for computation of momentum fluxes * remove trailing space * Initial commit * address Robert Hallberg code review * Restore deafult value of ZB_SCALING coefficient --------- Co-authored-by: Alistair Adcroft <Alistair.Adcroft@noaa.gov> Co-authored-by: Alistair Adcroft <adcroft@users.noreply.github.com>

* Add cmake build based on https://github.com/COSIMA/access-om3 There are two variations, the default is to build the mom6 standalone executable, the alternative is to build a library for access3 models (with https://github.com/ACCESS-NRI/access3-share as a dependency). Co-authored-by: Dougie Squire <dougie.squire@anu.edu.au> Co-authored-by: minghangli-uni <minghang.li1@anu.edu.au> Co-authored-by: Micael Oliveira <micael.oliveira@anu.edu.au> Co-authored-by: Jorge Galvez Vallejo <jorge.galvezvallejo@anu.edu.au>

minghangli-uni self-assigned this Dec 9, 2024

anton-seaice reviewed Jan 23, 2025

View reviewed changes

cmake/MOM6libConfig.cmake.in Outdated Show resolved Hide resolved

minghangli-uni commented Jan 23, 2025

View reviewed changes

cmake/CMakeLists.txt Outdated Show resolved Hide resolved

anton-seaice reviewed Feb 5, 2025

View reviewed changes

cmake/FindPIO.cmake Outdated Show resolved Hide resolved

anton-seaice reviewed Feb 5, 2025

View reviewed changes

cmake/MOM6libConfig.cmake.in Outdated Show resolved Hide resolved

anton-seaice reviewed Feb 13, 2025

View reviewed changes

cmake/CompilerFlags.cmake Outdated Show resolved Hide resolved

dougiesquire reviewed Feb 13, 2025

View reviewed changes

cmake/CompilerFlags.cmake Outdated Show resolved Hide resolved

anton-seaice requested review from dougiesquire and micaeljtoliveira March 20, 2025 03:35

dougiesquire requested changes Mar 25, 2025

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

CMakeLists.txt Outdated Show resolved Hide resolved

CMakeLists.txt Show resolved Hide resolved

CMakeLists.txt Show resolved Hide resolved

CMakeLists.txt Outdated Show resolved Hide resolved

dougiesquire reviewed Mar 25, 2025

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

dougiesquire reviewed Mar 26, 2025

View reviewed changes

CMakeLists.txt Show resolved Hide resolved

dougiesquire mentioned this pull request Mar 26, 2025

Spack Components for OM3 ACCESS-NRI/access-spack-packages#171

Merged

anton-seaice force-pushed the cmake_build branch from 2a18bf5 to d3d74ea Compare March 27, 2025 01:58

Add CMake build for mom-standalone and access3-share

ddd3902

Co-authored-by: minghangli-uni <minghang.li1@anu.edu.au> Co-authored-by: Micael Oliveira <micael.oliveira@anu.edu.au> Co-authored-by: Dougie Squire <dougie.squire@anu.edu.au>

anton-seaice force-pushed the cmake_build branch from d3d74ea to ddd3902 Compare March 27, 2025 02:03

remove generic tracers specific file

b9c1fac

micaeljtoliveira previously approved these changes Mar 27, 2025

View reviewed changes

dougiesquire reviewed Mar 27, 2025

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

remove MOM6_CESMCOUPLED

e539f72

anton-seaice dismissed micaeljtoliveira’s stale review via e539f72 March 27, 2025 04:19

dougiesquire previously approved these changes Mar 27, 2025

View reviewed changes

dougiesquire reviewed Mar 31, 2025

View reviewed changes

Add drivers/nuopc_cap/mom_cap_gtracer_flux.F90

bae9342

anton-seaice dismissed dougiesquire’s stale review via bae9342 May 6, 2025 03:18

dougiesquire reviewed May 6, 2025

View reviewed changes

dougiesquire approved these changes May 6, 2025

View reviewed changes

anton-seaice merged commit 411281f into 2025.02 May 6, 2025
18 checks passed

dougiesquire deleted the cmake_build branch May 6, 2025 06:18

dougiesquire restored the cmake_build branch May 6, 2025 06:18

dougiesquire deleted the cmake_build branch July 3, 2025 11:09

Conversation

minghangli-uni commented Dec 9, 2024 • edited by dougiesquire Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Dec 9, 2024

Welcome to Codecov 🎉

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anton-seaice commented Mar 20, 2025

Uh oh!

dougiesquire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anton-seaice commented Mar 26, 2025

Uh oh!

dougiesquire commented Mar 26, 2025

Uh oh!

Uh oh!

anton-seaice commented Mar 27, 2025

Uh oh!

anton-seaice commented Mar 27, 2025

Uh oh!

micaeljtoliveira left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dougiesquire left a comment

Choose a reason for hiding this comment

Uh oh!

anton-seaice commented Mar 27, 2025

Uh oh!

dougiesquire left a comment

Choose a reason for hiding this comment

Uh oh!

dougiesquire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

minghangli-uni commented Dec 9, 2024 •

edited by dougiesquire

Loading