Skip to content

Commit

Permalink
Add adaptivity_cpu_time output to local adaptivity metrics too
Browse files Browse the repository at this point in the history
  • Loading branch information
IshaanDesai committed Feb 11, 2025
1 parent 9fcfca9 commit de8c5a4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion micro_manager/adaptivity/global_adaptivity.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def get_full_field_micro_output(self, micro_output: list) -> list:

return micro_sims_output

def log_metrics(self, n: int, adaptivity_cpu_time) -> None:
def log_metrics(self, n: int, adaptivity_cpu_time: float) -> None:
"""
Log metrics for global adaptivity.
Expand Down
7 changes: 5 additions & 2 deletions micro_manager/adaptivity/local_adaptivity.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,16 @@ def get_full_field_micro_output(self, micro_output: list) -> list:

return micro_sims_output

def log_metrics(self, n: int) -> None:
def log_metrics(self, n: int, adaptivity_cpu_time: float) -> None:
"""
Log metrics for local adaptivity.
Parameters
----------
n : int
Current time step
adaptivity_cpu_time : float
CPU time taken for adaptivity calculation
"""
# MPI Gather is necessary as local adaptivity only stores local data
local_active_sims = np.count_nonzero(self._is_sim_active)
Expand All @@ -155,12 +157,13 @@ def log_metrics(self, n: int) -> None:
global_inactive_sims = self._comm.gather(local_inactive_sims)

self._metrics_logger.log_info_one_rank(
"{},{},{},{},{}".format(
"{},{},{},{},{},{}".format(
n,
np.mean(global_active_sims),
np.mean(global_inactive_sims),
np.max(global_active_sims),
np.max(global_inactive_sims),
adaptivity_cpu_time,
)
)

Expand Down

0 comments on commit de8c5a4

Please sign in to comment.