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.

Sign up for GitHub

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

Minor CI fixes #527

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Minor CI fixes #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40ab85a
Updating to latest Firedrake docker container in CI
brownbaerchen Feb 4, 2025
a7f41c0
Linting after black update..
brownbaerchen Feb 4, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
user_firedrake_tests:
runs-on: ubuntu-latest
container:
image: firedrakeproject/firedrake-vanilla:2025-01
image: firedrakeproject/firedrake-vanilla:latest
Copy link
Member

Choose a reason for hiding this comment

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

That is dangerous. You don't know what the next stage will bring.. can you pin the version to something?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

un-pinning the version is precisely the point of this PR. The Gusto pipeline runs on the latest Firedrake, so if we pin Firedrake but not Gusto, we might get into trouble. If we pin both, we make sure that the current state runs now, but people may not be able to install the current Firedrake outside of containers in the future.
I suggest we test on the latest Firedrake and revert to a specific version if something fails that we cannot fix easily.
What is your take @jshipton, you have more experience on being dependent on Firedrake ;)

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree with @brownbaerchen - that seems to be the sanest option

options: --user root
volumes:
- ${{ github.workspace }}:/repositories
Expand Down
2 changes: 1 addition & 1 deletion pySDC/projects/GPU/paper_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
""" Make plots for publications """
"""Make plots for publications"""

import matplotlib.pyplot as plt
from pySDC.helpers.plot_helper import setup_mpl, figsize_by_journal
Expand Down
2 changes: 1 addition & 1 deletion pySDC/projects/Resilience/AC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def post_step(self, step, level_number):
self.dt += [step.dt]
self.axs[2].plot(self.t, self.dt)
self.axs[2].set_yscale('log')
self.axs[2].axhline(step.levels[level_number].prob.eps ** 2, label=r'$\epsilon^2$', color='black', ls='--')
self.axs[2].axhline(step.levels[level_number].prob.eps**2, label=r'$\epsilon^2$', color='black', ls='--')
self.axs[2].legend(frameon=False)
self.axs[2].set_xlim([0, 0.03])
self.axs[2].set_title(r'$\Delta t$')
Expand Down
4 changes: 1 addition & 3 deletions pySDC/tests/test_convergence_controllers/test_adaptivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,7 @@ def multiple_tests(adaptivity, e_tol_range, num_nodes, **kwargs):
not_passed += [(4, f'Expected order wrt e_tol {expected_order_error_e_tol}, but got {order_e_tol}!')]
if not np.isclose(np.median(order_estimate_e_tol), expected_order_estimate_e_tol, atol=0.4):
not_passed += [
(
f'Expected order wrt e_tol {expected_order_estimate_e_tol} in the estimate, but got {order_estimate_e_tol}!'
)
f'Expected order wrt e_tol {expected_order_estimate_e_tol} in the estimate, but got {order_estimate_e_tol}!'
]

return not_passed
Expand Down