mirror of
https://github.com/saymrwulf/stable-baselines3.git
synced 2026-07-12 17:58:00 +00:00
* Fix failing set_env test * Fix test failiing due to deprectation of env.seed * Adjust mean reward threshold in failing test * Fix her test failing due to rng * Change seed and revert reward threshold to 90 * Pin gym version * Make VecEnv compatible with gym seeding change * Revert change to VecEnv reset signature * Change subprocenv seed cmd to call reset instead * Fix type check * Add backward compat * Add `compat_gym_seed` helper * Add goal env checks in env_checker * Add docs on HER requirements for envs * Capture user warning in test with inverted box space * Update ale-py version * Fix randint * Allow noop_max to be zero * Update changelog * Update docker image * Update doc conda env and dockerfile * Custom envs should not have any warnings * Fix test for numpy >= 1.21 * Add check for vectorized compute reward * Bump to gym 0.24 * Fix gym default step docstring * Test downgrading gym * Revert "Test downgrading gym" This reverts commit 0072b77156c006ada8a1d6e26ce347ed85a83eeb. * Fix protobuf error * Fix in dependencies * Fix protobuf dep * Use newest version of cartpole * Update gym * Fix warning * Loosen required scipy version * Scipy no longer needed * Try gym 0.25 * Silence warnings from gym * Filter warnings during tests * Update doc * Update requirements * Add gym 26 compat in vec env * Fixes in envs and tests for gym 0.26+ * Enforce gym 0.26 api * format * Fix formatting * Fix dependencies * Fix syntax * Cleanup doc and warnings * Faster tests * Higher budget for HER perf test (revert prev change) * Fixes and update doc * Fix doc build * Fix breaking change * Fixes for rendering * Rename variables in monitor * update render method for gym 0.26 API backwards compatible (mode argument is allowed) while using the gym 0.26 API (render mode is determined at environment creation) * update tests and docs to new gym render API * undo removal of render modes metatadata check * set rgb_array as default render mode for gym.make * undo changes & raise warning if not 'rgb_array' * Fix type check * Remove recursion and fix type checking * Remove hacks for protobuf and gym 0.24 * Fix type annotations * reuse existing render_mode attribute * return tiled images for 'human' render mode * Allow to use opencv for human render, fix typos * Add warning when using non-zero start with Discrete (fixes #1197) * Fix type checking * Bug fixes and handle more cases * Throw proper warnings * Update test * Fix new metadata name * Ignore numpy warnings * Fixes in vec recorder * Global ignore * Filter local warning too * Monkey patch not needed for gym 26 * Add doc of VecEnv vs Gym API * Add render test * Fix return type * Update VecEnv vs Gym API doc * Fix for custom render mode * Fix return type * Fix type checking * check test env test_buffer * skip render check * check env test_dict_env * test_env test_gae * check envs in remaining tests * Update tests * Add warning for Discrete action space with non-zero (#1295) * Fix atari annotation * ignore get_action_meanings [attr-defined] * Fix mypy issues * Add patch for gym/gymnasium transition * Switch to gymnasium * Rely on signature instead of version * More patches * Type ignore because of https://github.com/Farama-Foundation/Gymnasium/pull/39 * Fix doc build * Fix pytype errors * Fix atari requirement * Update env checker due to change in dtype for Discrete * Fix type hint * Convert spaces for saved models * Ignore pytype * Remove gitlab CI * Disable pytype for convert space * Fix undefined info * Fix undefined info * Upgrade shimmy * Fix wrappers type annotation (need PR from Gymnasium) * Fix gymnasium dependency * Fix dependency declaration * Cap pygame version for python 3.7 * Point to master branch (v0.28.0) * Fix: use main not master branch * Rename done to terminated * Fix pygame dependency for python 3.7 * Rename gym to gymnasium * Update Gymnasium * Fix test * Fix tests * Forks don't have access to private variables * Fix linter warnings * Update read the doc env * Fix env checker for GoalEnv * Fix import * Update env checker (more info) and fix dtype * Use micromamab for Docker * Update dependencies * Clarify VecEnv doc * Fix Gymnasium version * Copy file only after mamba install * [ci skip] Update docker doc * Polish code * Reformat * Remove deprecated features * Ignore warning * Update doc * Update examples and changelog * Fix type annotation bundle (SAC, TD3, A2C, PPO, base class) (#1436) * Fix SAC type hints, improve DQN ones * Fix A2C and TD3 type hints * Fix PPO type hints * Fix on-policy type hints * Fix base class type annotation, do not use defaults * Update version * Disable mypy for python 3.7 * Rename Gym26StepReturn * Update continuous critic type annotation * Fix pytype complain --------- Co-authored-by: Carlos Luis <carlos.luisgonc@gmail.com> Co-authored-by: Quentin Gallouédec <45557362+qgallouedec@users.noreply.github.com> Co-authored-by: Thomas Lips <37955681+tlpss@users.noreply.github.com> Co-authored-by: tlips <thomas.lips@ugent.be> Co-authored-by: tlpss <thomas17.lips@gmail.com> Co-authored-by: Quentin GALLOUÉDEC <gallouedec.quentin@gmail.com>
181 lines
8.1 KiB
Python
181 lines
8.1 KiB
Python
import warnings
|
|
from typing import Any, Dict, Generic, List, Mapping, Optional, Tuple, TypeVar, Union
|
|
|
|
import numpy as np
|
|
from gymnasium import spaces
|
|
|
|
from stable_baselines3.common.preprocessing import is_image_space, is_image_space_channels_first
|
|
|
|
TObs = TypeVar("TObs", np.ndarray, Dict[str, np.ndarray])
|
|
|
|
|
|
# Disable errors for pytype which doesn't play well with Generic[TypeVar]
|
|
# mypy check passes though
|
|
# pytype: disable=attribute-error
|
|
class StackedObservations(Generic[TObs]):
|
|
"""
|
|
Frame stacking wrapper for data.
|
|
|
|
Dimension to stack over is either first (channels-first) or last (channels-last), which is detected automatically using
|
|
``common.preprocessing.is_image_space_channels_first`` if observation is an image space.
|
|
|
|
:param num_envs: Number of environments
|
|
:param n_stack: Number of frames to stack
|
|
:param observation_space: Environment observation space
|
|
:param channels_order: If "first", stack on first image dimension. If "last", stack on last dimension.
|
|
If None, automatically detect channel to stack over in case of image observation or default to "last".
|
|
For Dict space, channels_order can also be a dictionary.
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
num_envs: int,
|
|
n_stack: int,
|
|
observation_space: Union[spaces.Box, spaces.Dict],
|
|
channels_order: Optional[Union[str, Mapping[str, Optional[str]]]] = None,
|
|
) -> None:
|
|
self.n_stack = n_stack
|
|
self.observation_space = observation_space
|
|
if isinstance(observation_space, spaces.Dict):
|
|
if not isinstance(channels_order, Mapping):
|
|
channels_order = {key: channels_order for key in observation_space.spaces.keys()}
|
|
self.sub_stacked_observations = {
|
|
key: StackedObservations(num_envs, n_stack, subspace, channels_order[key]) # type: ignore[arg-type]
|
|
for key, subspace in observation_space.spaces.items()
|
|
}
|
|
self.stacked_observation_space = spaces.Dict(
|
|
{key: substack_obs.stacked_observation_space for key, substack_obs in self.sub_stacked_observations.items()}
|
|
) # type: Union[spaces.Dict, spaces.Box] # make mypy happy
|
|
elif isinstance(observation_space, spaces.Box):
|
|
if isinstance(channels_order, Mapping):
|
|
raise TypeError("When the observation space is Box, channels_order can't be a dict.")
|
|
|
|
self.channels_first, self.stack_dimension, self.stacked_shape, self.repeat_axis = self.compute_stacking(
|
|
n_stack, observation_space, channels_order
|
|
)
|
|
low = np.repeat(observation_space.low, n_stack, axis=self.repeat_axis)
|
|
high = np.repeat(observation_space.high, n_stack, axis=self.repeat_axis)
|
|
self.stacked_observation_space = spaces.Box(
|
|
low=low,
|
|
high=high,
|
|
dtype=observation_space.dtype, # type: ignore[arg-type]
|
|
)
|
|
self.stacked_obs = np.zeros((num_envs, *self.stacked_shape), dtype=observation_space.dtype)
|
|
else:
|
|
raise TypeError(
|
|
f"StackedObservations only supports Box and Dict as observation spaces. {observation_space} was provided."
|
|
)
|
|
|
|
@staticmethod
|
|
def compute_stacking(
|
|
n_stack: int, observation_space: spaces.Box, channels_order: Optional[str] = None
|
|
) -> Tuple[bool, int, Tuple[int, ...], int]:
|
|
"""
|
|
Calculates the parameters in order to stack observations
|
|
|
|
:param n_stack: Number of observations to stack
|
|
:param observation_space: Observation space
|
|
:param channels_order: Order of the channels
|
|
:return: Tuple of channels_first, stack_dimension, stackedobs, repeat_axis
|
|
"""
|
|
|
|
if channels_order is None:
|
|
# Detect channel location automatically for images
|
|
if is_image_space(observation_space):
|
|
channels_first = is_image_space_channels_first(observation_space)
|
|
else:
|
|
# Default behavior for non-image space, stack on the last axis
|
|
channels_first = False
|
|
else:
|
|
assert channels_order in {
|
|
"last",
|
|
"first",
|
|
}, "`channels_order` must be one of following: 'last', 'first'"
|
|
|
|
channels_first = channels_order == "first"
|
|
|
|
# This includes the vec-env dimension (first)
|
|
stack_dimension = 1 if channels_first else -1
|
|
repeat_axis = 0 if channels_first else -1
|
|
stacked_shape = list(observation_space.shape)
|
|
stacked_shape[repeat_axis] *= n_stack
|
|
return channels_first, stack_dimension, tuple(stacked_shape), repeat_axis
|
|
|
|
def reset(self, observation: TObs) -> TObs:
|
|
"""
|
|
Reset the stacked_obs, add the reset observation to the stack, and return the stack.
|
|
|
|
:param observation: Reset observation
|
|
:return: The stacked reset observation
|
|
"""
|
|
if isinstance(observation, dict):
|
|
return {
|
|
key: self.sub_stacked_observations[key].reset(obs) for key, obs in observation.items()
|
|
} # pytype: disable=bad-return-type
|
|
|
|
self.stacked_obs[...] = 0
|
|
if self.channels_first:
|
|
self.stacked_obs[:, -observation.shape[self.stack_dimension] :, ...] = observation
|
|
else:
|
|
self.stacked_obs[..., -observation.shape[self.stack_dimension] :] = observation
|
|
return self.stacked_obs # pytype: disable=bad-return-type
|
|
|
|
def update(
|
|
self,
|
|
observations: TObs,
|
|
dones: np.ndarray,
|
|
infos: List[Dict[str, Any]],
|
|
) -> Tuple[TObs, List[Dict[str, Any]]]:
|
|
"""
|
|
Add the observations to the stack and use the dones to update the infos.
|
|
|
|
:param observations: Observations
|
|
:param dones: Dones
|
|
:param infos: Infos
|
|
:return: Tuple of the stacked observations and the updated infos
|
|
"""
|
|
if isinstance(observations, dict):
|
|
# From [{}, {terminal_obs: {key1: ..., key2: ...}}]
|
|
# to {key1: [{}, {terminal_obs: ...}], key2: [{}, {terminal_obs: ...}]}
|
|
sub_infos = {
|
|
key: [
|
|
{"terminal_observation": info["terminal_observation"][key]} if "terminal_observation" in info else {}
|
|
for info in infos
|
|
]
|
|
for key in observations.keys()
|
|
}
|
|
|
|
stacked_obs = {}
|
|
stacked_infos = {}
|
|
for key, obs in observations.items():
|
|
stacked_obs[key], stacked_infos[key] = self.sub_stacked_observations[key].update(obs, dones, sub_infos[key])
|
|
|
|
# From {key1: [{}, {terminal_obs: ...}], key2: [{}, {terminal_obs: ...}]}
|
|
# to [{}, {terminal_obs: {key1: ..., key2: ...}}]
|
|
for key in stacked_infos.keys():
|
|
for env_idx in range(len(infos)):
|
|
if "terminal_observation" in infos[env_idx]:
|
|
infos[env_idx]["terminal_observation"][key] = stacked_infos[key][env_idx]["terminal_observation"]
|
|
return stacked_obs, infos
|
|
|
|
shift = -observations.shape[self.stack_dimension]
|
|
self.stacked_obs = np.roll(self.stacked_obs, shift, axis=self.stack_dimension)
|
|
for env_idx, done in enumerate(dones):
|
|
if done:
|
|
if "terminal_observation" in infos[env_idx]:
|
|
old_terminal = infos[env_idx]["terminal_observation"]
|
|
if self.channels_first:
|
|
previous_stack = self.stacked_obs[env_idx, :shift, ...]
|
|
else:
|
|
previous_stack = self.stacked_obs[env_idx, ..., :shift]
|
|
|
|
new_terminal = np.concatenate((previous_stack, old_terminal), axis=self.repeat_axis)
|
|
infos[env_idx]["terminal_observation"] = new_terminal
|
|
else:
|
|
warnings.warn("VecFrameStack wrapping a VecEnv without terminal_observation info")
|
|
self.stacked_obs[env_idx] = 0
|
|
if self.channels_first:
|
|
self.stacked_obs[:, shift:, ...] = observations
|
|
else:
|
|
self.stacked_obs[..., shift:] = observations
|
|
return self.stacked_obs, infos
|