Skip to content

Commit

Permalink
Satisfy black linter
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiskelm committed Sep 3, 2024
1 parent 5b86882 commit bf4eb28
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 11 deletions.
4 changes: 3 additions & 1 deletion micro_manager/adaptivity/global_adaptivity.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,9 @@ def _update_inactive_sims(
),
"MicroSimulation",
)
micro_sims[to_be_activated_local_id] = create_simulation_class(micro_problem)(i)
micro_sims[to_be_activated_local_id] = create_simulation_class(
micro_problem
)(i)
self._logger.info(f"lazy initialization of {i} successful")
assoc_active_id = local_sim_is_associated_to[to_be_activated_local_id]

Expand Down
4 changes: 2 additions & 2 deletions micro_manager/adaptivity/local_adaptivity.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ def _update_inactive_sims(
micro_problem = getattr(
importlib.import_module(
self._micro_file_name, "MicroSimulation"
),
"MicroSimulation",
),
"MicroSimulation",
)
micro_sims[i] = create_simulation_class(micro_problem)(i)
self._logger.info(f"lazy initalization of {i} successful")
Expand Down
5 changes: 4 additions & 1 deletion micro_manager/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,10 @@ def read_json_micro_manager(self):
else:
raise Exception("Adaptivity type can be either local or global.")

if self._data["simulation_params"]["adaptivity_settings"].get("lazy_init") == "True":
if (
self._data["simulation_params"]["adaptivity_settings"].get("lazy_init")
== "True"
):
self._micro_sims_lazy_init = True

exchange_data = {**self._read_data_names, **self._write_data_names}
Expand Down
27 changes: 20 additions & 7 deletions micro_manager/micro_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ def __init__(self, config_file: str) -> None:

self._is_adaptivity_on = self._config.turn_on_adaptivity()

self._micro_sims_lazy_init = self._is_adaptivity_on and self._config.micro_sims_lazy_init()
self._micro_sims_lazy_init = (
self._is_adaptivity_on and self._config.micro_sims_lazy_init()
)

if self._is_adaptivity_on:
self._number_of_sims_for_adaptivity = 0
Expand Down Expand Up @@ -187,7 +189,9 @@ def solve(self) -> None:
# Write a checkpoint
if self._participant.requires_writing_checkpoint():
for i in range(self._local_number_of_sims):
sim_states_cp[i] = self._micro_sims[i].get_state() if self._micro_sims[i] else None
sim_states_cp[i] = (
self._micro_sims[i].get_state() if self._micro_sims[i] else None
)
t_checkpoint = t
n_checkpoint = n

Expand Down Expand Up @@ -259,8 +263,12 @@ def solve(self) -> None:
for active_id in active_sim_ids:
self._micro_sims_active_steps[active_id] += 1
if sim_states_cp[active_id] == None:
sim_states_cp[active_id] = self._micro_sims[active_id].get_state()
self._logger.info(f"state of lazily initialized micro sim {self._global_ids_of_local_sims[active_id]} successfully checkpointed")
sim_states_cp[active_id] = self._micro_sims[
active_id
].get_state()
self._logger.info(
f"state of lazily initialized micro sim {self._global_ids_of_local_sims[active_id]} successfully checkpointed"
)

micro_sims_output = self._solve_micro_simulations_with_adaptivity(
micro_sims_input, is_sim_active, sim_is_associated_to, dt
Expand Down Expand Up @@ -442,7 +450,8 @@ def initialize(self) -> None:
)
self._logger.info(
"Micro simulations with global IDs {} - {} created.".format(
self._global_ids_of_local_sims[0], self._global_ids_of_local_sims[-1]
self._global_ids_of_local_sims[0],
self._global_ids_of_local_sims[-1],
)
)

Expand Down Expand Up @@ -473,7 +482,9 @@ def initialize(self) -> None:
if not initial_data:
is_initial_data_available = False
if self._micro_sims_lazy_init:
raise Exception("no initial macro data available, lazy initialization would result in only one active simulation.")
raise Exception(
"no initial macro data available, lazy initialization would result in only one active simulation."
)
else:
is_initial_data_available = True

Expand All @@ -485,7 +496,9 @@ def initialize(self) -> None:
getattr(micro_problem, "initialize")
):
if self._micro_sims_lazy_init:
raise Exception("Adaptivity can't use data returned by initialize function of micro sims when using lazy initialization.")
raise Exception(
"Adaptivity can't use data returned by initialize function of micro sims when using lazy initialization."
)
self._micro_sims_init = True # Starting value before setting

try: # Try to get the signature of the initialize() method, if it is written in Python
Expand Down

0 comments on commit bf4eb28

Please sign in to comment.