Conversation
micaeljtoliveira
left a comment
There was a problem hiding this comment.
@harshula Here are some comments plus a couple of questions.
b2bb8df to
ac2765e
Compare
4a79dc7 to
271db1e
Compare
|
Update The Spack interaction with upstream netcdf-fortran (autotools), ACCESS-NRI's FMS (CMake) and ACCESS-NRI's GFDL-generic-tracers (CMake) is complicated if we don't use pkgconf and use CMake's native Spack's I had a chat with @micaeljtoliveira about this on Friday. He suggested trying to export the |
a874032 to
f838e7b
Compare
f838e7b to
c83ce9b
Compare
97cada8 to
935f33e
Compare
67aec75 to
5710eff
Compare
|
This has been tested fairly extensively in ACCESS models. Results here: ACCESS-NRI/access-spack-packages#238 (comment) |
dougiesquire
left a comment
There was a problem hiding this comment.
One change below and then this is good to go from my perspective (noting that I haven't tested the PkgConfig).
7b2d80e to
9833220
Compare
|
@harshula, once we get @JorgeG94's update for the mocsy dependency into this branch are you okay for me to (squash and) merge? This has now been pretty well tested. If there's additional testing you want to do, could it continue after merging? |
|
Hi @dougiesquire , I'll try to finish my testing this week and I'll merge it. 21/07/2025 - Added support to build the library as shared/dynamic. |
1010640 to
343ac9f
Compare
|
@harshula is your plan to "Squash and merge" this? |
|
Hi @dougiesquire , No, there'll be a merge commit. These commits will all be independent. |
|
My preference is to "squash and merge" to minimize the number of commits we carry ahead of upstream. Are you okay with that? |
|
Hi @dougiesquire , A merge commit is different from a 'rebase and merge', where all the commits appear linearly in the git commit history and hence difficult to isolate to a single PR/merge. The merge commit provides isolation of a series of commits. e.g. |
|
Yup, I understand that difference thanks. But I said "squash and merge", not "rebase and merge". As I mentioned, we're trying to keep clean and minimize the commits on main that are ahead of upstream. You can include the PR number in the squashed commit message (the Github UI defaults to this) so that the individual commits in this PR can still be easily found. |
|
Hi @dougiesquire , Your reasoning sounded like you are confusing a merge commit with 'rebase and merge'. Try using |
Nah I'm not confusing them. I'm just trying to keep the commits on |
|
Notes |
|
Apologies, testing was held up by a dependency bug in model-config-tests and Payu |
There was a problem hiding this comment.
Summary of results of testing with dev-1deg_jra55_ryf+wombatlite config:
- Adding support for shared fms, mocsy, gtracers libs does not change answers (expected)
- Building ACCESS-OM2 with shared fms, mocsy, gtracers libs does change answers (by a tiny amount)
Thanks for this long slog @harshula. I'm happy to merge. Don't forget to rebase :)
* Generate a pkgconf pc file
* Use find_package for FMS, otherwise shared lib build fails. Co-authored-by: dougiesquire <[email protected]>
* GFDLGTracersConfig.cmake.in: use find_dependency instead of find_package See https://cmake.org/cmake/help/latest/module/CMakeFindDependencyMacro.html
--------- Co-authored-by: dougiesquire <[email protected]>
[Update: 22/07/2025]
option(BUILD_SHARED_LIBS "Build shared/dynamic libraries" OFF)