Skip to content

Do not save checkpoints for eval runs #154

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

Open
lopatovsky wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not save checkpoints for eval runs #154

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions skrl/agents/jax/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ def pre_interaction(self, timestep: int, timesteps: int) -> None:
"""
pass

def post_interaction(self, timestep: int, timesteps: int) -> None:
def post_interaction(self, timestep: int, timesteps: int, save_checkpoints: bool = True) -> None:
"""Callback called after the interaction with the environment

:param timestep: Current timestep
Expand All @@ -463,7 +463,7 @@ def post_interaction(self, timestep: int, timesteps: int) -> None:
timestep += 1

# update best models and write checkpoints
if timestep > 1 and self.checkpoint_interval > 0 and not timestep % self.checkpoint_interval:
if save_checkpoints and timestep > 1 and self.checkpoint_interval > 0 and not timestep % self.checkpoint_interval:
# update best models
reward = np.mean(self.tracking_data.get("Reward / Total reward (mean)", -2 ** 31))
if reward > self.checkpoint_best_modules["reward"]:
Expand Down
4 changes: 2 additions & 2 deletions skrl/agents/torch/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ def pre_interaction(self, timestep: int, timesteps: int) -> None:
"""
pass

def post_interaction(self, timestep: int, timesteps: int) -> None:
def post_interaction(self, timestep: int, timesteps: int, save_checkpoints: bool = True) -> None:
"""Callback called after the interaction with the environment

:param timestep: Current timestep
Expand All @@ -636,7 +636,7 @@ def post_interaction(self, timestep: int, timesteps: int) -> None:
timestep += 1

# update best models and write checkpoints
if timestep > 1 and self.checkpoint_interval > 0 and not timestep % self.checkpoint_interval:
if save_checkpoints and timestep > 1 and self.checkpoint_interval > 0 and not timestep % self.checkpoint_interval:
# update best models
reward = np.mean(self.tracking_data.get("Reward / Total reward (mean)", -2 ** 31))
if reward > self.checkpoint_best_modules["reward"]:
Expand Down
4 changes: 2 additions & 2 deletions skrl/trainers/jax/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ def single_agent_eval(self) -> None:
infos=infos,
timestep=timestep,
timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps, save_checkpoints=False)

# reset environments
if self.env.num_envs > 1:
Expand Down Expand Up @@ -362,7 +362,7 @@ def multi_agent_eval(self) -> None:
infos=infos,
timestep=timestep,
timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps, save_checkpoints=False)

# reset environments
if not self.env.agents:
Expand Down
2 changes: 1 addition & 1 deletion skrl/trainers/jax/sequential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def eval(self) -> None:
infos=infos,
timestep=timestep,
timesteps=self.timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=self.timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=self.timesteps, save_checkpoints=False)

# reset environments
if terminated.any() or truncated.any():
Expand Down
4 changes: 2 additions & 2 deletions skrl/trainers/jax/step.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def eval(self, timestep: Optional[int] = None, timesteps: Optional[int] = None)
infos=infos,
timestep=timestep,
timesteps=timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=timesteps, save_checkpoints=False)

else:
# write data to TensorBoard
Expand All @@ -259,7 +259,7 @@ def eval(self, timestep: Optional[int] = None, timesteps: Optional[int] = None)
infos=infos,
timestep=timestep,
timesteps=timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=timesteps, save_checkpoints=False)

# reset environments
if terminated.any() or truncated.any():
Expand Down
4 changes: 2 additions & 2 deletions skrl/trainers/torch/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ def single_agent_eval(self) -> None:
infos=infos,
timestep=timestep,
timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps, save_checkpoints=False)

# reset environments
if self.env.num_envs > 1:
Expand Down Expand Up @@ -359,7 +359,7 @@ def multi_agent_eval(self) -> None:
infos=infos,
timestep=timestep,
timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=self.timesteps, save_checkpoints=False)

# reset environments
if not self.env.agents:
Expand Down
2 changes: 1 addition & 1 deletion skrl/trainers/torch/parallel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def fn_processor(process_index, *args):
infos=queue.get(),
timestep=msg['timestep'],
timesteps=msg['timesteps'])
super(type(agent), agent).post_interaction(timestep=msg['timestep'], timesteps=msg['timesteps'])
super(type(agent), agent).post_interaction(timestep=msg['timestep'], timesteps=msg['timesteps'], save_checkpoints=False)
barrier.wait()


Expand Down
2 changes: 1 addition & 1 deletion skrl/trainers/torch/sequential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def eval(self) -> None:
infos=infos,
timestep=timestep,
timesteps=self.timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=self.timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=self.timesteps, save_checkpoints=False)

# reset environments
if terminated.any() or truncated.any():
Expand Down
4 changes: 2 additions & 2 deletions skrl/trainers/torch/step.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def eval(self, timestep: Optional[int] = None, timesteps: Optional[int] = None)
infos=infos,
timestep=timestep,
timesteps=timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=timesteps)
super(type(self.agents), self.agents).post_interaction(timestep=timestep, timesteps=timesteps, save_checkpoints=False)

else:
# write data to TensorBoard
Expand All @@ -254,7 +254,7 @@ def eval(self, timestep: Optional[int] = None, timesteps: Optional[int] = None)
infos=infos,
timestep=timestep,
timesteps=timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=timesteps)
super(type(agent), agent).post_interaction(timestep=timestep, timesteps=timesteps, save_checkpoints=False)

# reset environments
if terminated.any() or truncated.any():
Expand Down