Skip to content

Commit

Permalink
Merge branch 'main' into dev/cal-poisson-nodewise-csr-3d-support
Browse files Browse the repository at this point in the history
  • Loading branch information
toutane committed Oct 10, 2024
2 parents 2daf464 + cbbf0e3 commit 306beae
Show file tree
Hide file tree
Showing 25 changed files with 613 additions and 191 deletions.
15 changes: 15 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
coverage:
precision: 2
range:
- 65.0
- 100.0
round: down
status:
project:
default:
target: 70%
threshold: 10%
patch:
default:
target: 50%
threshold: 10%
17 changes: 10 additions & 7 deletions .github/workflows/acoustics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ on:
workflow_dispatch:

env:

SOURCE_DIR: '/__w/arcanefem/arcanefem/src'
BUILD_DIR: '/__w/arcanefem/arcanefem/build'
MODULE_DIR: 'acoustics'

# CTest
CT_RESULT_DIR: '/__w/arcanefem/arcanefem/test'
CT_OPTS: "--timeout 300 --output-on-failure"

# MPI
Expand All @@ -31,11 +27,18 @@ jobs:
name: 'Build and Test'
runs-on: ubuntu-latest
container:
image: ghcr.io/arcaneframework/arcane_ubuntu-2204:gcc-12_full_check_latest
image: ghcr.io/arcaneframework/arcane_ubuntu-2404:gcc-14_full_check_latest

steps:
- name: Define environment paths
shell: bash
run: |
echo "SOURCE_DIR=${GITHUB_WORKSPACE}/src" >> $GITHUB_ENV
echo "BUILD_DIR=${GITHUB_WORKSPACE}/build" >> $GITHUB_ENV
echo "CT_RESULT_DIR=${GITHUB_WORKSPACE}/test" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.SOURCE_DIR }}

Expand All @@ -59,7 +62,7 @@ jobs:
ctest --test-dir ${{ env.BUILD_DIR }} --output-junit ${{ env.CT_RESULT_DIR }}/results.xml ${{ env.CT_OPTS }} -R '\[${{ env.MODULE_DIR }}\]'
- name: Upload test artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-${{ env.MODULE_DIR }}-artifact
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/aerodynamics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ on:
workflow_dispatch:

env:

SOURCE_DIR: '/__w/arcanefem/arcanefem/src'
BUILD_DIR: '/__w/arcanefem/arcanefem/build'
MODULE_DIR: 'aerodynamics'

# CTest
CT_RESULT_DIR: '/__w/arcanefem/arcanefem/test'
CT_OPTS: "--timeout 300 --output-on-failure"

# MPI
Expand All @@ -31,11 +27,18 @@ jobs:
name: 'Build and Test'
runs-on: ubuntu-latest
container:
image: ghcr.io/arcaneframework/arcane_ubuntu-2204:gcc-12_full_check_latest
image: ghcr.io/arcaneframework/arcane_ubuntu-2404:gcc-14_full_check_latest

steps:
- name: Define environment paths
shell: bash
run: |
echo "SOURCE_DIR=${GITHUB_WORKSPACE}/src" >> $GITHUB_ENV
echo "BUILD_DIR=${GITHUB_WORKSPACE}/build" >> $GITHUB_ENV
echo "CT_RESULT_DIR=${GITHUB_WORKSPACE}/test" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.SOURCE_DIR }}

Expand All @@ -59,7 +62,7 @@ jobs:
ctest --test-dir ${{ env.BUILD_DIR }} --output-junit ${{ env.CT_RESULT_DIR }}/results.xml ${{ env.CT_OPTS }} -R '\[${{ env.MODULE_DIR }}\]'
- name: Upload test artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-${{ env.MODULE_DIR }}-artifact
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/bilaplacian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ on:
workflow_dispatch:

env:

SOURCE_DIR: '/__w/arcanefem/arcanefem/src'
BUILD_DIR: '/__w/arcanefem/arcanefem/build'
MODULE_DIR: 'bilaplacian'

# CTest
CT_RESULT_DIR: '/__w/arcanefem/arcanefem/test'
CT_OPTS: "--timeout 300 --output-on-failure"

# MPI
Expand All @@ -31,11 +27,18 @@ jobs:
name: 'Build and Test'
runs-on: ubuntu-latest
container:
image: ghcr.io/arcaneframework/arcane_ubuntu-2204:gcc-12_full_check_latest
image: ghcr.io/arcaneframework/arcane_ubuntu-2404:gcc-14_full_check_latest

steps:
- name: Define environment paths
shell: bash
run: |
echo "SOURCE_DIR=${GITHUB_WORKSPACE}/src" >> $GITHUB_ENV
echo "BUILD_DIR=${GITHUB_WORKSPACE}/build" >> $GITHUB_ENV
echo "CT_RESULT_DIR=${GITHUB_WORKSPACE}/test" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.SOURCE_DIR }}

Expand All @@ -59,7 +62,7 @@ jobs:
ctest --test-dir ${{ env.BUILD_DIR }} --output-junit ${{ env.CT_RESULT_DIR }}/results.xml ${{ env.CT_OPTS }} -R '\[${{ env.MODULE_DIR }}\]'
- name: Upload test artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-${{ env.MODULE_DIR }}-artifact
Expand Down
87 changes: 87 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: 'Codecov Scan'

on:
schedule:
- cron: '24 0 * * *'
pull_request:
branches: [ main ]
workflow_dispatch:

env:
# CTest
CT_OPTS: "--timeout 300 --output-on-failure"

# MPI
OMPI_ALLOW_RUN_AS_ROOT: 1
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
OMPI_MCA_rmaps_base_oversubscribe: 1

jobs:
tests:
name: 'Build and Test'
runs-on: ubuntu-latest
container:
image: ghcr.io/arcaneframework/arcane_ubuntu-2404:gcc-14_full_release_latest

steps:
# On place la source à la racine pour éviter
# un sous-répertoire en plus dans Codecov.
- name: Define environment paths
shell: bash
run: |
echo "SOURCE_DIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
echo "BUILD_DIR=${GITHUB_WORKSPACE}/build" >> $GITHUB_ENV
echo "CT_RESULT_DIR=${GITHUB_WORKSPACE}/test" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v4
with:
path: ${{ env.SOURCE_DIR }}

- name: Configure
shell: bash
run: |
cmake \
-S ${{ env.SOURCE_DIR }} \
-B ${{ env.BUILD_DIR }} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS_RELEASE="-O2 -g --coverage -fprofile-abs-path -ftest-coverage" \
-GNinja
- name: Build
shell: bash
run: |
cmake --build ${{ env.BUILD_DIR }}
- name: Test
shell: bash
run: |
mkdir -p ${{ env.CT_RESULT_DIR }}
ctest --test-dir ${{ env.BUILD_DIR }} --output-junit ${{ env.CT_RESULT_DIR }}/results.xml ${{ env.CT_OPTS }}
- name: Apply coverage
shell: bash
continue-on-error: true
run: |
gcov -p $(find . -name "*.gcno" -o -name "*.gcda")
- name: Remove gcov files for generated axl .h
shell: bash
run: |
rm -v -f *_axl.h.gcov
- name: Upload coverage files to Codecov
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN : ${{ secrets.CODECOV_TOKEN }}
with:
verbose: true
fail_ci_if_error: true

- name: Upload test artifact
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-all-modules-artifact
path: ${{ env.CT_RESULT_DIR }}
retention-days: 7
17 changes: 10 additions & 7 deletions .github/workflows/elasticity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ on:
workflow_dispatch:

env:

SOURCE_DIR: '/__w/arcanefem/arcanefem/src'
BUILD_DIR: '/__w/arcanefem/arcanefem/build'
MODULE_DIR: 'elasticity'

# CTest
CT_RESULT_DIR: '/__w/arcanefem/arcanefem/test'
CT_OPTS: "--timeout 300 --output-on-failure"

# MPI
Expand All @@ -31,11 +27,18 @@ jobs:
name: 'Build and Test'
runs-on: ubuntu-latest
container:
image: ghcr.io/arcaneframework/arcane_ubuntu-2204:gcc-12_full_check_latest
image: ghcr.io/arcaneframework/arcane_ubuntu-2404:gcc-14_full_check_latest

steps:
- name: Define environment paths
shell: bash
run: |
echo "SOURCE_DIR=${GITHUB_WORKSPACE}/src" >> $GITHUB_ENV
echo "BUILD_DIR=${GITHUB_WORKSPACE}/build" >> $GITHUB_ENV
echo "CT_RESULT_DIR=${GITHUB_WORKSPACE}/test" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.SOURCE_DIR }}

Expand All @@ -59,7 +62,7 @@ jobs:
ctest --test-dir ${{ env.BUILD_DIR }} --output-junit ${{ env.CT_RESULT_DIR }}/results.xml ${{ env.CT_OPTS }} -R '\[${{ env.MODULE_DIR }}\]'
- name: Upload test artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-${{ env.MODULE_DIR }}-artifact
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/elastodynamics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ on:
workflow_dispatch:

env:

SOURCE_DIR: '/__w/arcanefem/arcanefem/src'
BUILD_DIR: '/__w/arcanefem/arcanefem/build'
MODULE_DIR: 'elastodynamics'

# CTest
CT_RESULT_DIR: '/__w/arcanefem/arcanefem/test'
CT_OPTS: "--timeout 300 --output-on-failure"

# MPI
Expand All @@ -31,11 +27,18 @@ jobs:
name: 'Build and Test'
runs-on: ubuntu-latest
container:
image: ghcr.io/arcaneframework/arcane_ubuntu-2204:gcc-12_full_check_latest
image: ghcr.io/arcaneframework/arcane_ubuntu-2404:gcc-14_full_check_latest

steps:
- name: Define environment paths
shell: bash
run: |
echo "SOURCE_DIR=${GITHUB_WORKSPACE}/src" >> $GITHUB_ENV
echo "BUILD_DIR=${GITHUB_WORKSPACE}/build" >> $GITHUB_ENV
echo "CT_RESULT_DIR=${GITHUB_WORKSPACE}/test" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.SOURCE_DIR }}

Expand All @@ -59,7 +62,7 @@ jobs:
ctest --test-dir ${{ env.BUILD_DIR }} --output-junit ${{ env.CT_RESULT_DIR }}/results.xml ${{ env.CT_OPTS }} -R '\[${{ env.MODULE_DIR }}\]'
- name: Upload test artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-${{ env.MODULE_DIR }}-artifact
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/electrostatics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@ on:
workflow_dispatch:

env:

SOURCE_DIR: '/__w/arcanefem/arcanefem/src'
BUILD_DIR: '/__w/arcanefem/arcanefem/build'
MODULE_DIR: 'electrostatics'

# CTest
CT_RESULT_DIR: '/__w/arcanefem/arcanefem/test'
CT_OPTS: "--timeout 300 --output-on-failure"

# MPI
Expand All @@ -31,11 +27,18 @@ jobs:
name: 'Build and Test'
runs-on: ubuntu-latest
container:
image: ghcr.io/arcaneframework/arcane_ubuntu-2204:gcc-12_full_check_latest
image: ghcr.io/arcaneframework/arcane_ubuntu-2404:gcc-14_full_check_latest

steps:
- name: Define environment paths
shell: bash
run: |
echo "SOURCE_DIR=${GITHUB_WORKSPACE}/src" >> $GITHUB_ENV
echo "BUILD_DIR=${GITHUB_WORKSPACE}/build" >> $GITHUB_ENV
echo "CT_RESULT_DIR=${GITHUB_WORKSPACE}/test" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ${{ env.SOURCE_DIR }}

Expand All @@ -59,7 +62,7 @@ jobs:
ctest --test-dir ${{ env.BUILD_DIR }} --output-junit ${{ env.CT_RESULT_DIR }}/results.xml ${{ env.CT_OPTS }} -R '\[${{ env.MODULE_DIR }}\]'
- name: Upload test artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-${{ env.MODULE_DIR }}-artifact
Expand Down
Loading

0 comments on commit 306beae

Please sign in to comment.