Skip to content

PETSc updates#3997

Closed
dham wants to merge 12 commits intomasterfrom
dham/merge_petsc_upstream
Closed

PETSc updates#3997
dham wants to merge 12 commits intomasterfrom
dham/merge_petsc_upstream

Conversation

@dham
Copy link
Member

@dham dham commented Jan 28, 2025

@github-actions
Copy link

github-actions bot commented Jan 28, 2025

TestsPassed ✅Skipped ⏭️Failed ❌
Firedrake real8197 ran7484 passed713 skipped0 failed

@github-actions
Copy link

github-actions bot commented Jan 28, 2025

TestsPassed ✅Skipped ⏭️Failed ❌
Firedrake complex8225 ran6555 passed1670 skipped0 failed

@dham dham force-pushed the dham/merge_petsc_upstream branch from 6e58fd1 to 7119ce3 Compare February 9, 2025 10:00
@connorjward connorjward force-pushed the dham/merge_petsc_upstream branch from 855cc85 to 2cf30db Compare February 12, 2025 10:02
@connorjward connorjward marked this pull request as ready for review February 12, 2025 10:02
@connorjward connorjward changed the title Test PETSc merge PETSc updates Feb 12, 2025

- name: Build Firedrake
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

./firedrake/scripts/firedrake-install \
$COMPLEX \
--honour-petsc-dir \
--mpicc="$MPICH_DIR"/mpicc \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
--mpicc="$MPICH_DIR"/mpicc \
--honour-petsc-dir \
--mpicc="$MPICH_DIR"/mpicc \

--install defcon \
--install gadopt \
--install asQ \
--package-branch petsc dham/merge_upstream \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
--package-branch petsc dham/merge_upstream \

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

# Run even if earlier tests failed
if: ${{ success() || steps.build.conclusion == 'success' }}
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

- name: Run tests (nprocs = 5)
if: ${{ success() || steps.build.conclusion == 'success' }}
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

- name: Run tests (nprocs = 6)
if: ${{ success() || steps.build.conclusion == 'success' }}
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

- name: Run tests (nprocs = 7)
if: ${{ success() || steps.build.conclusion == 'success' }}
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

- name: Run tests (nprocs = 8)
if: ${{ success() || steps.build.conclusion == 'success' }}
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

- name: Test pyadjoint
if: ${{ matrix.scalar-type == 'real' }}
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
unset PETSC_DIR PETSC_ARCH SLEPC_DIR

@connorjward connorjward marked this pull request as draft February 20, 2025 09:43
@connorjward
Copy link
Contributor

I have just realised that we can't merge this if we want to land #4011 because it includes petsc4py changes that are in main but not the latest pip release.

@connorjward
Copy link
Contributor

Closing in favour of #4181

@connorjward connorjward closed this Apr 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants