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.

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

CI fixup: action versions and timeouts #721

Merged
merged 6 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
liball: ['OFF']
silo: ['OFF']
hdf5: ['OFF']
sanitizer: ['ASAN']
coverage: ['OFF']
include:
- distro: 'ubuntu:latest'
Expand Down Expand Up @@ -92,7 +93,8 @@ jobs:
heffte: 'MKL'
hypre: 'OFF'
coverage: 'OFF'
- distro: 'fedora:latest'
# FIXME: use fedora:latest when MPI timeouts are fixed
- distro: 'fedora:rawhide'
cxx: 'g++'
backend: 'OPENMP'
cmake_build_type: 'Release'
Expand All @@ -102,7 +104,8 @@ jobs:
hypre: 'OFF'
coverage: 'OFF'
doxygen: 'ON'
- distro: 'fedora:latest'
# FIXME: use fedora:latest when MPI timeouts are fixed
- distro: 'fedora:rawhide'
cxx: 'clang++'
backend: 'OPENMP'
cmake_build_type: 'Release'
Expand Down Expand Up @@ -248,7 +251,7 @@ jobs:
continue-on-error: ${{ (matrix.distro == 'ubuntu:intel' && matrix.backend == 'SERIAL' && matrix.cmake_build_type == 'Release') || matrix.distro == 'opensuse:latest' }}
steps:
- name: Cache ccache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.CCACHE_DIR }}
key: ccache-${{ matrix.distro }}-${{github.run_id}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/ecp-copa/ci-containers/fedora:latest
FROM ghcr.io/ecp-copa/ci-containers/fedora:rawhide

WORKDIR /home/kokkos/src/
COPY kokkos/ /home/kokkos/src/kokkos
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/Nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
backend: ["OPENMP", "SERIAL"]
distro: ['ubuntu:latest', 'fedora:rawhide']
runs-on: ubuntu-20.04
timeout-minutes: 30
container:
image: ghcr.io/ecp-copa/ci-containers/${{ matrix.distro }}
steps:
Expand Down Expand Up @@ -47,7 +48,7 @@ jobs:
uses: actions/checkout@v3
- name: Build Cabana
run: |
cmake -B build -DCMAKE_INSTALL_PREFIX=$HOME/Cabana -DCMAKE_PREFIX_PATH="$HOME/kokkos;$HOME/arborx" -DCabana_ENABLE_TESTING=ON -DCabana_ENABLE_EXAMPLES=ON -DCabana_REQUIRE_${{ matrix.backend }}=ON -DVALGRIND_EXECUTABLE=False -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=ON ${{ github.event.inputs.cmake_args }}
cmake -B build -DCMAKE_INSTALL_PREFIX=$HOME/Cabana -DCMAKE_PREFIX_PATH="$HOME/kokkos;$HOME/arborx" -DCabana_ENABLE_TESTING=ON -DCabana_ENABLE_EXAMPLES=ON -DCabana_REQUIRE_${{ matrix.backend }}=ON -DVALGRIND_EXECUTABLE=False ${{ github.event.inputs.cmake_args }}
cmake --build build --parallel 2
ctest --test-dir build --output-on-failure ${{ github.event.inputs.ctest_args }}
cmake --install build
5 changes: 3 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ concurrency:
jobs:
Build:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Checkout kokkos
uses: actions/checkout@v3
Expand Down Expand Up @@ -47,7 +48,7 @@ jobs:
path: cabana

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -71,7 +72,7 @@ jobs:

- name: Build and Push Docker Image
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: ${{github.workspace}}
file: cabana/.github/workflows/Dockerfile
Expand Down
44 changes: 22 additions & 22 deletions core/src/Cabana_Parallel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ class TeamVectorOpTag
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param FirstNeighborsTag Tag indicating operations over particle first
\note FirstNeighborsTag Tag indicating operations over particle first
neighbors.
\param SerialOpTag Tag indicating a serial loop strategy over neighbors.
\note SerialOpTag Tag indicating a serial loop strategy over neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
the Kokkos::parallel_for called by this code and can be used for
identification and profiling purposes.
Expand Down Expand Up @@ -304,9 +304,9 @@ inline void neighbor_parallel_for(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param SecondNeighborsTag Tag indicating operations over particle first and
\note SecondNeighborsTag Tag indicating operations over particle first and
second neighbors.
\param SerialOpTag Tag indicating a serial loop strategy over neighbors.
\note SerialOpTag Tag indicating a serial loop strategy over neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
the Kokkos::parallel_for called by this code and can be used for
identification and profiling purposes.
Expand Down Expand Up @@ -375,9 +375,9 @@ inline void neighbor_parallel_for(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param FirstNeighborsTag Tag indicating operations over particle first
\note FirstNeighborsTag Tag indicating operations over particle first
neighbors.
\param TeamOpTag Tag indicating a team parallel strategy over neighbors.
\note TeamOpTag Tag indicating a team parallel strategy over neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
the Kokkos::parallel_for called by this code and can be used for
identification and profiling purposes.
Expand Down Expand Up @@ -446,9 +446,9 @@ inline void neighbor_parallel_for(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param SecondNeighborsTag Tag indicating operations over particle first and
\note SecondNeighborsTag Tag indicating operations over particle first and
second neighbors.
\param TeamOpTag Tag indicating a team parallel strategy over particle first
\note TeamOpTag Tag indicating a team parallel strategy over particle first
neighbors and serial execution over second neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
the Kokkos::parallel_for called by this code and can be used for
Expand Down Expand Up @@ -524,9 +524,9 @@ inline void neighbor_parallel_for(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param SecondNeighborsTag Tag indicating operations over particle first and
\note SecondNeighborsTag Tag indicating operations over particle first and
second neighbors.
\param TeamVectorOpTag Tag indicating a team parallel strategy over particle
\note TeamVectorOpTag Tag indicating a team parallel strategy over particle
first neighbors and vector parallel loop strategy over second neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
the Kokkos::parallel_for called by this code and can be used for
Expand Down Expand Up @@ -607,9 +607,9 @@ inline void neighbor_parallel_for(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param FirstNeighborsTag Tag indicating operations over particle first
\note FirstNeighborsTag Tag indicating operations over particle first
neighbors.
\param SerialOpTag Tag indicating a serial loop strategy over
\note SerialOpTag Tag indicating a serial loop strategy over
neighbors.
\param reduce_val Scalar to be reduced across particles and neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
Expand Down Expand Up @@ -696,9 +696,9 @@ inline void neighbor_parallel_reduce(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param SecondNeighborsTag Tag indicating operations over particle first and
\note SecondNeighborsTag Tag indicating operations over particle first and
second neighbors.
\param SerialOpTag Tag indicating a serial loop strategy over neighbors.
\note SerialOpTag Tag indicating a serial loop strategy over neighbors.
\param reduce_val Scalar to be reduced across particles and neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
the Kokkos::parallel_reduce called by this code and can be used for
Expand Down Expand Up @@ -772,9 +772,9 @@ inline void neighbor_parallel_reduce(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param FirstNeighborsTag Tag indicating operations over particle first
\note FirstNeighborsTag Tag indicating operations over particle first
neighbors.
\param TeamOpTag Tag indicating a team parallel strategy over particle
\note TeamOpTag Tag indicating a team parallel strategy over particle
neighbors.
\param reduce_val Scalar to be reduced across particles and neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
Expand Down Expand Up @@ -853,9 +853,9 @@ inline void neighbor_parallel_reduce(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param SecondNeighborsTag Tag indicating operations over particle first and
\note SecondNeighborsTag Tag indicating operations over particle first and
second neighbors.
\param TeamOpTag Tag indicating a team parallel strategy over particle first
\note TeamOpTag Tag indicating a team parallel strategy over particle first
neighbors and serial loops over second neighbors.
\param reduce_val Scalar to be reduced across particles and neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
Expand Down Expand Up @@ -939,9 +939,9 @@ inline void neighbor_parallel_reduce(
\param exec_policy The policy over which to execute the functor.
\param functor The functor to execute in parallel
\param list The neighbor list over which to execute the neighbor operations.
\param SecondNeighborsTag Tag indicating operations over particle first and
\note SecondNeighborsTag Tag indicating operations over particle first and
second neighbors.
\param TeamVectorOpTag Tag indicating a team parallel strategy over particle
\note TeamVectorOpTag Tag indicating a team parallel strategy over particle
first neighbors and vector loops over second neighbors.
\param reduce_val Scalar to be reduced across particles and neighbors.
\param str Optional name for the functor. Will be forwarded if non-empty to
Expand Down Expand Up @@ -1028,7 +1028,7 @@ inline void neighbor_parallel_reduce(
\param i Particle index.
\param neighbor_functor The neighbor functor to execute in parallel.
\param list The neighbor list over which to execute the neighbor operations.
\param FirstNeighborsTag Tag indicating operations over particle first
\note FirstNeighborsTag Tag indicating operations over particle first
neighbors.

A "functor" is a class containing the function to execute in parallel, data
Expand Down Expand Up @@ -1079,7 +1079,7 @@ for_each_neighbor( const IndexType i, const FunctorType& neighbor_functor,
\param team Kokkos team.
\param neighbor_functor The neighbor functor to execute in parallel.
\param list The neighbor list over which to execute the neighbor operations.
\param FirstNeighborsTag Tag indicating operations over particle first
\note FirstNeighborsTag Tag indicating operations over particle first
neighbors.
*/
template <class IndexType, class FunctorType, class NeighborListType,
Expand Down
4 changes: 2 additions & 2 deletions grid/src/Cabana_Grid_FastFourierTransform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ class HeffteFastFourierTransform
/*!
\brief Do a forward FFT.
\param x The array on which to perform the forward transform.
\param ScaleType Method of scaling data.
\note ScaleType Method of scaling data.
*/
template <class Array_t, class ScaleType>
void forwardImpl( const Array_t& x, const ScaleType )
Expand All @@ -586,7 +586,7 @@ class HeffteFastFourierTransform
/*!
\brief Do a reverse FFT.
\param x The array on which to perform the reverse transform
\param ScaleType Method of scaling data.
\note ScaleType Method of scaling data.
*/
template <class Array_t, class ScaleType>
void reverseImpl( const Array_t& x, const ScaleType )
Expand Down
Loading