Skip to content
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

Jump to bottom

move containers to new registry and add basic link+run test for cmake #1316

Closed
wants to merge 11 commits into from
Closed

move containers to new registry and add basic link+run test for cmake #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f5a51ae
move to github container registry, add cmake link test
Aug 2, 2023
ff34d39
update coupler ci image and flags
Aug 3, 2023
7021e61
fix case and libyaml for cmake
Aug 3, 2023
588d85b
fix test cmake program
Aug 3, 2023
dccf552
adjust flags for the coupler build
Aug 3, 2023
ba93f78
add git to image recipefile
Aug 3, 2023
85a62ff
add link flag for netcdf
rem1776 Aug 3, 2023
327d76d
Merge branch 'ci-updates' of github.com:noaa-gfdl/FMS into ci-updates
Aug 4, 2023
161a077
good ol input.nml
Aug 4, 2023
2f15760
add openmp flag
rem1776 Aug 4, 2023
8c362ed
add gnu flag for mpich
rem1776 Aug 4, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/Dockerfile.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ COPY --from=builder /opt/deps/ /opt/deps/
# need to be on the dev boxes if building
COPY ./fms_test_input /home/unit_tests_input

RUN dnf install -y autoconf make automake m4 libtool pkg-config zip
RUN dnf install -y autoconf make automake m4 libtool pkg-config zip cmake git

ENV FC="mpifort"
ENV CC="mpicc"
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/github_autotools_gnu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jobs:
- conf-flag: --with-mpi=no
input-flag: --enable-test-input=/home/unit_tests_input
container:
image: noaagfdl/fms-ci-rocky-gnu:12.3.0
image: ghcr.io/noaa-gfdl/fms/fms-ci-rocky-gnu:12.3.0
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
env:
TEST_VERBOSE: 1
DISTCHECK_CONFIGURE_FLAGS: "${{ matrix.conf-flag }} ${{ matrix.input-flag }} ${{ matrix.io-flag }}"
Expand Down
19 changes: 17 additions & 2 deletions .github/workflows/github_cmake_gnu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,28 @@ jobs:
libyaml-flag: [ "", -DWITH_YAML=on ]
io-flag: [ "", -DUSE_DEPRECATED_IO=on ]
container:
image: noaagfdl/hpc-me.ubuntu-minimal:cmake
image: ghcr.io/noaa-gfdl/fms/fms-ci-rocky-gnu:12.3.0
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
env:
CMAKE_FLAGS: "${{ matrix.omp-flags }} ${{ matrix.io-flag }} ${{ matrix.libyaml-flag }} -D64BIT=on"
LIBYAML_ROOT: "/opt/deps/linux-rocky9-haswell/gcc-12.3.0/libyaml-0.2.5-yiouvafr3qwcdrwdpumepit4wmqvh642/" # TODO should find better way for cmake to find this
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Generate makefiles with CMake
run: cmake $CMAKE_FLAGS .
run: cmake -DNetCDF_INCLUDE_DIR=/opt/view/include/ -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" $CMAKE_FLAGS .
- name: Build the library
run: make
- name: Link with basic executable
run: |
echo "program test" > test.F90
echo " use fms_mod" >> test.F90
echo " call fms_init" >> test.F90
echo " call fms_end" >> test.F90
echo "end program" >> test.F90
mpifort -L/opt/view/lib -fopenmp `nf-config --flibs` -Iinclude_r4 -Iinclude_r8 test.F90 libfms_r4.a libfms_r8.a -o test.x
touch input.nml
- name: Run executable
run: ./test.x
11 changes: 7 additions & 4 deletions .github/workflows/github_coupler_gnu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ jobs:
coupler-build:
runs-on: ubuntu-latest
container:
image: ryanmulhall/hpc-me.ubuntu-minimal:coupler
image: ghcr.io/noaa-gfdl/fms/fms-ci-rocky-gnu:12.3.0
credentials:
username: ${{ github.actor }}
password: ${{ secrets.github_token }}
env:
CC: mpicc
FC: mpif90
CPPFLAGS: '-I/usr/include -Duse_LARGEFILE -DMAXFIELDMETHODS_=500'
FCFLAGS: '-fcray-pointer -fdefault-double-8 -fdefault-real-8 -Waliasing -ffree-line-length-none -fno-range-check -I/usr/include'
LDFLAGS: '-L/usr/lib'
CPPFLAGS: '-I/opt/view/include -Duse_LARGEFILE -DMAXFIELDMETHODS_=500'
FCFLAGS: '-fallow-argument-mismatch -fcray-pointer -fdefault-double-8 -fdefault-real-8 -Waliasing -ffree-line-length-none -fno-range-check -I/opt/view/include'
LDFLAGS: '-L/opt/view/lib'
VERBOSE: 1
steps:
- name: Checkout FMS
Expand Down
Loading