From 10388b6b277f23b8799667afc648de53b815b2d9 Mon Sep 17 00:00:00 2001
From: Thomas Baumann <39156931+brownbaerchen@users.noreply.github.com>
Date: Thu, 13 Feb 2025 11:56:00 +0000
Subject: [PATCH] Firedrake ensemble fix (#528)
* Fix for Firedrake ensemble communicator
* Problem seems to be in Gusto logging. Bit sus...
* Removed debug output from tutorial while being at it
* Added space-time-parallelism to Gusto tests
* Forgot linting..
---
.github/workflows/ci_pipeline.yml | 2 +-
.../firedrake_ensemble_communicator.py | 3 +++
.../tests/test_helpers/test_gusto_coupling.py | 23 ++++++++++++++-----
pySDC/tutorial/step_7/F_pySDC_with_Gusto.py | 3 +++
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml
index 3487393df..7650b8638 100644
--- a/.github/workflows/ci_pipeline.yml
+++ b/.github/workflows/ci_pipeline.yml
@@ -205,7 +205,7 @@ jobs:
firedrake-clean
cd ./pySDC
coverage run -m pytest --continue-on-collection-errors -v --durations=0 /repositories/pySDC/pySDC/tests -m firedrake
- timeout-minutes: 120
+ timeout-minutes: 45
- name: Make coverage report
run: |
. /home/firedrake/firedrake/bin/activate
diff --git a/pySDC/helpers/firedrake_ensemble_communicator.py b/pySDC/helpers/firedrake_ensemble_communicator.py
index b08d1dc54..8cbbab7e8 100644
--- a/pySDC/helpers/firedrake_ensemble_communicator.py
+++ b/pySDC/helpers/firedrake_ensemble_communicator.py
@@ -67,6 +67,9 @@ class FiredrakeEnsembleCommunicator:
return self.ensemble.ensemble_comm.Isend(buf=buf, dest=dest, tag=tag)
return self.ensemble.isend(buf, dest, tag=tag)[0]
+ def Free(self):
+ del self
+
def get_ensemble(comm, space_size):
return fd.Ensemble(comm, space_size)
diff --git a/pySDC/tests/test_helpers/test_gusto_coupling.py b/pySDC/tests/test_helpers/test_gusto_coupling.py
index 29410d3e8..1eeeb9fa0 100644
--- a/pySDC/tests/test_helpers/test_gusto_coupling.py
+++ b/pySDC/tests/test_helpers/test_gusto_coupling.py
@@ -26,8 +26,11 @@ def tracer_setup(tmpdir='./tmp', degree=1, small_dt=False, comm=None):
COMM_WORLD,
)
from gusto import OutputParameters, Domain, IO
+ from gusto.core.logging import logger, INFO
from collections import namedtuple
+ logger.setLevel(INFO)
+
opts = ('domain', 'tmax', 'io', 'f_init', 'f_end', 'degree', 'uexpr', 'umax', 'radius', 'tol')
TracerSetup = namedtuple('TracerSetup', opts)
TracerSetup.__new__.__defaults__ = (None,) * len(opts)
@@ -620,15 +623,17 @@ def test_pySDC_integrator_with_adaptivity(dt_initial, setup):
@pytest.mark.firedrake
@pytest.mark.parametrize('n_steps', [1, 2, 4])
@pytest.mark.parametrize('useMPIController', [True, False])
-def test_pySDC_integrator_MSSDC(n_steps, useMPIController, setup, submit=True):
+def test_pySDC_integrator_MSSDC(n_steps, useMPIController, setup, submit=True, n_tasks=4):
if submit and useMPIController:
import os
import subprocess
+ assert n_steps <= n_tasks
+
my_env = os.environ.copy()
my_env['COVERAGE_PROCESS_START'] = 'pyproject.toml'
cwd = '.'
- cmd = f'mpiexec -np {n_steps} python {__file__} --test=MSSDC'.split()
+ cmd = f'mpiexec -np {n_tasks} python {__file__} --test=MSSDC --n_steps={n_steps}'.split()
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=my_env, cwd=cwd)
p.wait()
@@ -653,7 +658,7 @@ def test_pySDC_integrator_MSSDC(n_steps, useMPIController, setup, submit=True):
if useMPIController:
from pySDC.helpers.firedrake_ensemble_communicator import FiredrakeEnsembleCommunicator
- controller_communicator = FiredrakeEnsembleCommunicator(COMM_WORLD, 1)
+ controller_communicator = FiredrakeEnsembleCommunicator(COMM_WORLD, COMM_WORLD.size // n_steps)
assert controller_communicator.size == n_steps
MSSDC_args = {'useMPIController': True, 'controller_communicator': controller_communicator}
dirname = f'./tmp_{controller_communicator.rank}'
@@ -777,13 +782,19 @@ if __name__ == '__main__':
type=str,
default=None,
)
+ parser.add_argument(
+ '--n_steps',
+ help="number of steps",
+ type=int,
+ default=None,
+ )
args = parser.parse_args()
if args.test == 'MSSDC':
- test_pySDC_integrator_MSSDC(n_steps=MPI.COMM_WORLD.size, useMPIController=True, setup=setup, submit=False)
+ test_pySDC_integrator_MSSDC(n_steps=args.n_steps, useMPIController=True, setup=setup, submit=False)
else:
# test_generic_gusto_problem(setup)
# test_pySDC_integrator_RK(False, RK4, setup)
# test_pySDC_integrator(False, False, setup)
- test_pySDC_integrator_with_adaptivity(1e-3, setup)
- # test_pySDC_integrator_MSSDC(2, False, setup)
+ # test_pySDC_integrator_with_adaptivity(1e-3, setup)
+ test_pySDC_integrator_MSSDC(4, True, setup)
diff --git a/pySDC/tutorial/step_7/F_pySDC_with_Gusto.py b/pySDC/tutorial/step_7/F_pySDC_with_Gusto.py
index cc8854305..fdd9b0eac 100644
--- a/pySDC/tutorial/step_7/F_pySDC_with_Gusto.py
+++ b/pySDC/tutorial/step_7/F_pySDC_with_Gusto.py
@@ -29,6 +29,9 @@ from pySDC.helpers.pySDC_as_gusto_time_discretization import pySDC_integrator
from pySDC.helpers.firedrake_ensemble_communicator import FiredrakeEnsembleCommunicator
from gusto import SDC, BackwardEuler
from gusto.core.labels import implicit, time_derivative
+from gusto.core.logging import logger, INFO
+
+logger.setLevel(INFO)
from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
--
GitLab