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

Add DaCeConfig to the GEOS Wrapper #403

Merged
merged 1 commit into from
Dec 14, 2022
Merged

Add DaCeConfig to the GEOS Wrapper #403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 30 additions & 7 deletions fv3core/pace/fv3core/initialization/geos_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

import pace.util
from pace import fv3core
from pace.dsl.dace.dace_config import DaceConfig
from pace.driver.performance.collector import PerformanceCollector


class GeosDycoreWrapper:
Expand All @@ -15,17 +17,19 @@ class GeosDycoreWrapper:
"""

def __init__(self, namelist: f90nml.Namelist, comm: pace.util.Comm, backend: str):
self.timer = pace.util.Timer()
self.namelist = namelist
# Make a custom performance collector for the GEOS wrapper
self.perf_collector = PerformanceCollector("GEOS wrapper", comm)

self.backend = backend
self.namelist = namelist
self.dycore_config = fv3core.DynamicalCoreConfig.from_f90nml(self.namelist)

self.layout = self.dycore_config.layout
partitioner = pace.util.CubedSpherePartitioner(
pace.util.TilePartitioner(self.layout)
)
self.communicator = pace.util.CubedSphereCommunicator(
comm, partitioner, timer=self.timer
comm, partitioner, timer=self.perf_collector.timestep_timer
)

sizer = pace.util.SubtileGridSizer.from_namelist(
Expand All @@ -47,6 +51,13 @@ def __init__(self, namelist: f90nml.Namelist, comm: pace.util.Comm, backend: str
),
)

stencil_config.dace_config = DaceConfig(
communicator=self.communicator,
backend=stencil_config.backend,
tile_nx=self.dycore_config.npx,
tile_nz=self.dycore_config.npz,
)

self._grid_indexing = pace.dsl.stencil.GridIndexing.from_sizer_and_communicator(
sizer=sizer, cube=self.communicator
)
Expand Down Expand Up @@ -117,7 +128,7 @@ def __call__(
diss_estd: np.ndarray,
) -> Dict[str, np.ndarray]:

with self.timer.clock("move_to_pace"):
with self.perf_collector.timestep_timer.clock("move_to_pace"):
self.dycore_state = self._put_fortran_data_in_dycore(
u,
v,
Expand Down Expand Up @@ -145,12 +156,24 @@ def __call__(
diss_estd,
)

with self.timer.clock("dycore"):
self.dynamical_core.step_dynamics(state=self.dycore_state, timer=self.timer)
with self.perf_collector.timestep_timer.clock("dycore"):
self.dynamical_core.step_dynamics(
state=self.dycore_state, timer=self.perf_collector.timestep_timer
)

with self.timer.clock("move_to_fortran"):
with self.perf_collector.timestep_timer.clock("move_to_fortran"):
self.output_dict = self._prep_outputs_for_geos()

# Collect performance of the timestep and write
# a json file for rank 0
self.perf_collector.collect_performance()
self.perf_collector.write_out_rank_0(
backend=self.backend,
is_orchestrated=False, # could be infered from config
dt_atmos=self.dycore_config.dt_atmos,
sim_status="Ongoing",
)

return self.output_dict

def _put_fortran_data_in_dycore(
Expand Down