Skip to content

Make PIO selectable via CLI build #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Whyborn wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Make PIO selectable via CLI build #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9aa7517
Make PIO selectable via CLI build
Whyborn Oct 1, 2026
811d6f3
Minor restructure of CMakeLists.txt (#746)
Whyborn Oct 1, 2026
2ec8759
Make PIO more obviously dependent on MPI
Whyborn Oct 1, 2026
e164341
Attempt to locate fortuno locally before cloning
Whyborn Oct 1, 2026
b336b0f
Merge branch 'main' into add-PIO-build-flag
Whyborn Oct 1, 2026
6b9c4fc
Make CI manifests test MPI and PIO builds
Whyborn Oct 1, 2026
944e9dc
Revert back to automatically including PIO in MPI builds if available
Whyborn Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/build-ci/manifests/gcc.spack.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ spack:
- path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/config
specs:
- cable@git.{{ ref }}
- cable@git.{{ ref }}+mpi+pio
packages:
all:
require:
Expand Down
1 change: 1 addition & 0 deletions .github/build-ci/manifests/intel.spack.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ spack:
- path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/config
specs:
- cable@git.{{ ref }}
- cable@git.{{ ref }}+mpi+pio
packages:
all:
require:
Expand Down
0 .../manifests/um7-acces-esm1p6.spack.yaml.j2 → ...manifests/um7-access-esm1p6.spack.yaml.j2
View file
Open in desktop
File renamed without changes.
20 changes: 14 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,12 @@ else()
# third party libs
if(CABLE_MPI)
find_package(MPI REQUIRED COMPONENTS Fortran)
# PIO is an extension of the MPI build, and is used if it can be found
find_package(PIO COMPONENTS Fortran QUIET)
if(TARGET PIO::PIO_Fortran)
message(STATUS "Found PIO_Fortran: ${PIO_DIR}")
else()
message(STATUS "PIO_Fortran not found: building without PIO support")
endif()
endif()
if(CABLE_TESTS)
Expand All @@ -233,9 +236,11 @@ else()
set(fortuno_libs Fortuno::fortuno_serial)
endif ()
include(FetchContent)
# Use a locally installed Fortuno if one can be found, otherwise clone it
FetchContent_Declare(Fortuno
GIT_REPOSITORY https://github.com/fortuno-repos/fortuno
GIT_TAG eb61214fd76d6235a3072b6f8ed83d0380c2f266
FIND_PACKAGE_ARGS NAMES Fortuno
)
FetchContent_MakeAvailable(Fortuno)
endif()
Expand Down Expand Up @@ -384,13 +389,16 @@ else()
target_link_libraries(cable_common PRIVATE PkgConfig::NETCDF)

if(CABLE_MPI)
target_compile_definitions(cable_common PRIVATE __MPI__)
target_link_libraries(cable_common PRIVATE MPI::MPI_Fortran)
endif()
target_compile_definitions(cable_common PRIVATE __MPI__)
target_link_libraries(cable_common PRIVATE MPI::MPI_Fortran)

if(TARGET PIO::PIO_Fortran)
target_link_libraries(cable_common PRIVATE PIO::PIO_Fortran)
target_sources(cable_common PRIVATE src/util/netcdf/pio/cable_netcdf_pio.F90)
# PIO is only available as part of the MPI build
if(TARGET PIO::PIO_Fortran)
target_link_libraries(cable_common PRIVATE PIO::PIO_Fortran)
target_sources(cable_common PRIVATE src/util/netcdf/pio/cable_netcdf_pio.F90)
else()
target_sources(cable_common PRIVATE src/util/netcdf/pio/cable_netcdf_pio_stub.F90)
endif()
else()
target_sources(cable_common PRIVATE src/util/netcdf/pio/cable_netcdf_pio_stub.F90)
endif()
Expand Down
Loading