Skip to content

Use apt for more PETSc packages on x86#4122

Merged
connorjward merged 21 commits intomasterfrom
JHopeCollins/more-apt-petsc-packages
Apr 24, 2025
Merged

Use apt for more PETSc packages on x86#4122
connorjward merged 21 commits intomasterfrom
JHopeCollins/more-apt-petsc-packages

Conversation

@JHopeCollins
Copy link
Member

Description

We can use the apt binaries for a load more PETSc packages.
Works locally for x86. Will try with aarch64 once it works with x86 on CI.

@connorjward
Copy link
Contributor

You can "test" ARM by forcing GitHub actions to rebuild the containers like I do in #4104.

Just make sure to give them a unique tag.

@JHopeCollins
Copy link
Member Author

Just make sure to give them a unique tag.

Do we have an ARM label to specify the runner?

@connorjward
Copy link
Contributor

Sort of. We use the macOS runners. I was suggesting rebuilding all of the containers, which will hit the ARM build.

@github-actions
Copy link

github-actions bot commented Mar 17, 2025

TestsPassed ✅Skipped ⏭️Failed ❌
Firedrake default8234 ran7532 passed701 skipped1 failed

@github-actions
Copy link

github-actions bot commented Mar 17, 2025

TestsPassed ✅Skipped ⏭️Failed ❌
Firedrake complex8000 ran6434 passed1566 skipped0 failed

Copy link
Contributor

@connorjward connorjward left a comment

Choose a reason for hiding this comment

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

I figured out why the Docker build is failing! It's sed: https://github.com/firedrakeproject/firedrake/blob/master/docker/Dockerfile.vanilla#L46. We overwrite COPTFLAGS and such to pass -mtune=generic so your extra settings aren't propagated. Could you maybe figure out a better bash command to just replace -march=native with -mtune=generic?

@connorjward connorjward mentioned this pull request Apr 3, 2025
10 tasks
@connorjward
Copy link
Contributor

I figured out why the Docker build is failing! It's sed: https://github.com/firedrakeproject/firedrake/blob/master/docker/Dockerfile.vanilla#L46. We overwrite COPTFLAGS and such to pass -mtune=generic so your extra settings aren't propagated. Could you maybe figure out a better bash command to just replace -march=native with -mtune=generic?

Just had a go at a fix for this.

@JHopeCollins JHopeCollins marked this pull request as ready for review April 23, 2025 13:41
Copy link
Member Author

@JHopeCollins JHopeCollins left a comment

Choose a reason for hiding this comment

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

UNDO BEFORE MERGE

Copy link
Contributor

@connorjward connorjward left a comment

Choose a reason for hiding this comment

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

Looks 99% good to me. Ready to merge once these changes are committed.

Copy link
Member Author

@JHopeCollins JHopeCollins left a comment

Choose a reason for hiding this comment

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

.

JHopeCollins and others added 3 commits April 24, 2025 11:34
Remove workflow edits for testing

Co-authored-by: Connor Ward <c.ward20@imperial.ac.uk>
…om/firedrakeproject/firedrake into JHopeCollins/more-apt-petsc-packages
@JHopeCollins JHopeCollins enabled auto-merge (squash) April 24, 2025 10:37
@connorjward connorjward disabled auto-merge April 24, 2025 13:22
@connorjward
Copy link
Contributor

Forcing through as only failing due to a docs linkcheck fail.

@connorjward connorjward merged commit c48cadf into master Apr 24, 2025
8 of 9 checks passed
@connorjward connorjward deleted the JHopeCollins/more-apt-petsc-packages branch April 24, 2025 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants