PETSc updates #3997
Open
PETSc updates #3997
+36
−26
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
dham
force-pushed
the
dham/merge_petsc_upstream
branch
from
6e58fd1 to
7119ce3
Compare
connorjward
reviewed
Feb 11, 2025
connorjward
force-pushed
the
dham/merge_petsc_upstream
branch
from
855cc85 to
2cf30db
Compare
connorjward
reviewed
Feb 12, 2025
| @@ -59,12 +59,12 @@ jobs: | |||
|
|
|||
| - name: Build Firedrake | |||
| run: | | |||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR | |||
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
connorjward
reviewed
Feb 12, 2025
| cd .. | ||
| # Linting should ignore unquoted shell variable $COMPLEX | ||
| # shellcheck disable=SC2086 | ||
| ./firedrake/scripts/firedrake-install \ | ||
| $COMPLEX \ | ||
| --honour-petsc-dir \ | ||
| --mpicc="$MPICH_DIR"/mpicc \ |
There was a problem hiding this comment.
Suggested change
| --mpicc="$MPICH_DIR"/mpicc \ | |
| --honour-petsc-dir \ | |
| --mpicc="$MPICH_DIR"/mpicc \ |
| @@ -87,6 +86,7 @@ jobs: | |||
| --install defcon \ | |||
| --install gadopt \ | |||
| --install asQ \ | |||
| --package-branch petsc dham/merge_upstream \ | |||
There was a problem hiding this comment.
Suggested change
| --package-branch petsc dham/merge_upstream \ |
| @@ -103,49 +103,57 @@ jobs: | |||
| run: | | |||
| : # Use pytest-xdist here so we can have a single collated output (not possible | |||
| : # for parallel tests) | |||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR | |||
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
| . ../firedrake_venv/bin/activate | ||
| firedrake-run-split-tests 1 1 "-n 12 $EXTRA_PYTEST_ARGS --junit-xml=firedrake1_{#}.xml" | ||
|
|
||
| - name: Run tests (nprocs = 2) | ||
| # Run even if earlier tests failed | ||
| if: ${{ success() || steps.build.conclusion == 'success' }} | ||
| run: | | ||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
| . ../firedrake_venv/bin/activate | ||
| firedrake-run-split-tests 4 3 "$EXTRA_PYTEST_ARGS --junit-xml=firedrake4_{#}.xml" | ||
|
|
||
| - name: Run tests (nprocs = 5) | ||
| if: ${{ success() || steps.build.conclusion == 'success' }} | ||
| run: | | ||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
| . ../firedrake_venv/bin/activate | ||
| firedrake-run-split-tests 5 2 "$EXTRA_PYTEST_ARGS --junit-xml=firedrake5_{#}.xml" | ||
|
|
||
| - name: Run tests (nprocs = 6) | ||
| if: ${{ success() || steps.build.conclusion == 'success' }} | ||
| run: | | ||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
| . ../firedrake_venv/bin/activate | ||
| firedrake-run-split-tests 6 2 "$EXTRA_PYTEST_ARGS --junit-xml=firedrake6_{#}.xml" | ||
|
|
||
| - name: Run tests (nprocs = 7) | ||
| if: ${{ success() || steps.build.conclusion == 'success' }} | ||
| run: | | ||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
| . ../firedrake_venv/bin/activate | ||
| firedrake-run-split-tests 7 1 "$EXTRA_PYTEST_ARGS --junit-xml=firedrake7_{#}.xml" | ||
|
|
||
| - name: Run tests (nprocs = 8) | ||
| if: ${{ success() || steps.build.conclusion == 'success' }} | ||
| run: | | ||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
.github/workflows/build.yml
Outdated
| @@ -171,6 +179,7 @@ jobs: | |||
| - name: Test pyadjoint | |||
| if: ${{ matrix.scalar-type == 'real' }} | |||
| run: | | |||
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR | |||
There was a problem hiding this comment.
Suggested change
| unset PETSC_DIR PETSC_ARCH SLEPC_DIR |
Co-authored-by: Connor Ward <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Goes with firedrakeproject/petsc#25 and firedrakeproject/slepc#10