Skip to content

Commit

Permalink
update checkout action and configure help string + revert added acc f…
Browse files Browse the repository at this point in the history
…lag in ci
  • Loading branch information
rem1776 authored and rem1776 committed Jul 23, 2024
1 parent 3eee3d2 commit 39434df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
mpi_or_acc: ['','--with-mpi', '--enable-acc']
with_mpi: ['','--with-mpi']
enable_quad_precision: ['', '--enable-quad-precision']
container:
image: noaagfdl/fre-nctools-base:2.0.0-focal
env:
MPI: ${{ matrix.mpi_or_acc }}
MPI: ${{ matrix.with_mpi }}
QUAD_P: ${{ matrix.enable_quad_precision }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive
- name: Configure
Expand All @@ -29,10 +29,10 @@ jobs:
- name: Build tools
run: make -C build
- name: Run all tests
if: matrix.mpi_or_acc == ''
if: matrix.with_mpi == ''
run: make -C build -j check LOG_DRIVER_FLAGS=--comments
- name: Run most tests (skip the slow ones)
if: matrix.mpi_or_acc == '--with-mpi'
if: matrix.with_mpi == '--with-mpi'
env:
SKIP_TESTS: 4
run: make -C build -j check LOG_DRIVER_FLAGS=--comments
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ AM_CONDITIONAL([WITH_MPI_TESTS], [test x"$build_mpi" = x"yes" -a -z "$SKIP_MPI_T
#Build with OpenACC suport. Default is 'no'
AC_ARG_ENABLE([acc],
[AS_HELP_STRING([--enable-acc],
[Builds with openacc flags for nvidias nvc compiler if available. This will result in a second executable for fregrid, fregrid_gpu. Flags added: -acc -O2 -g -tp native -gpu=ccnative -Minfo=accel -Mnoinline (default no)])])
[Builds with openacc flags for nvidias nvc compiler if available. This will result in a second executable for fregrid, fregrid_gpu.(default no)])])
AS_IF([test ${enable_acc:-no} = yes],
[enable_acc=yes],
[enable_acc=no])
Expand Down

0 comments on commit 39434df

Please sign in to comment.