mirror of
https://github.com/saymrwulf/stable-baselines3.git
synced 2026-07-27 20:02:30 +00:00
* First commit * Fixing missing refs from a quick merge from master * Reformat * Adding DictBuffers * Reformat * Minor reformat * added slow dict test. Added SACMultiInputPolicy for future. Added private static image transpose helper to common policy * Ran black on buffers * Ran isort * Adding StackedObservations classes used within VecStackEnvs wrappers. Made test_dict_env shorter and removed slow * Running isort :facepalm * Fixed typing issues * Adding docstrings and typing. Using util for moving data to device. * Fixed trailing commas * Fix types * Minor edits * Avoid duplicating code * Fix calls to parents * Adding assert to buffers. Updating changelong * Running format on buffers * Adding multi-input policies to dqn,td3,a2c. Fixing warnings. Fixed bug with DictReplayBuffer as Replay buffers use only 1 env * Fixing warnings, splitting is_vectorized_observation into multiple functions based on space type * Created envs folder in common. Updated imports. Moved stacked_obs to vec_env folder * Moved envs to envs directory. Moved stacked obs to vec_envs. Started update on documentation * Fixes * Running code style * Update docstrings on torch_layers * Decapitalize non-constant variables * Using NatureCNN architecture in combined extractor. Increasing img size in multi input env. Adding memory reduction in test * Update doc * Update doc * Fix format * Removing NineRoom env. Using nested preprocess. Removing mutable default args * running code style * Passing channel check through to stacked dict observations. * Running black * Adding channel control to SimpleMultiObsEnv. Passing check_channels to CombinedExtractor * Remove optimize memory for dict buffers * Update doc * Move identity env * Minor edits + bump version * Update doc * Fix doc build * Bug fixes + add support for more type of dict env * Fixes + add multi env test * Add support for vectranspose * Fix stacked obs for dict and add tests * Add check for nested spaces. Fix dict-subprocvecenv test * Fix (single) pytype error * Simplify CombinedExtractor * Fix tests * Fix check * Merge branch 'master' into feat/dict_observations * Fix for net_arch with dict and vector obs * Fixes * Add consistency test * Update env checker * Add some docs on dict obs * Update default CNN feature vector size * Refactor HER (#351) * Start refactoring HER * Fixes * Additional fixes * Faster tests * WIP: HER as a custom replay buffer * New replay only version (working with DQN) * Add support for all off-policy algorithms * Fix saving/loading * Remove ObsDictWrapper and add VecNormalize tests with dict * Stable-Baselines3 v1.0 (#354) * Bump version and update doc * Fix name * Apply suggestions from code review Co-authored-by: Adam Gleave <adam@gleave.me> * Update docs/index.rst Co-authored-by: Adam Gleave <adam@gleave.me> * Update wording for RL zoo Co-authored-by: Adam Gleave <adam@gleave.me> * Add gym-pybullet-drones project (#358) * Update projects.rst Added gym-pybullet-drones * Update projects.rst Longer title underline * Update changelog Co-authored-by: Antonin Raffin <antonin.raffin@ensta.org> * Include SuperSuit in projects (#359) * include supersuit * longer title underline * Update changelog.rst * Fix default arguments + add bugbear (#363) * Fix potential bug + add bug bear * Remove unused variables * Minor: version bump * Add code of conduct + update doc (#373) * Add code of conduct * Fix DQN doc example * Update doc (channel-last/first) * Apply suggestions from code review Co-authored-by: Anssi <kaneran21@hotmail.com> * Apply suggestions from code review Co-authored-by: Adam Gleave <adam@gleave.me> Co-authored-by: Anssi <kaneran21@hotmail.com> Co-authored-by: Adam Gleave <adam@gleave.me> * Make installation command compatible with ZSH (#376) * Add quotes * Add Zsh bracket info * Add clarify pip installation line * Make note bold * Add Zsh pip installation note * Add handle timeouts param * Fixes * Fixes (buffer size, extend test) * Fix `max_episode_length` redefinition * Fix potential issue * Add some docs on dict obs * Fix performance bug * Fix slowdown * Add package to install (#378) * Add package to install * Update docs packages installation command Co-authored-by: Antonin RAFFIN <antonin.raffin@ensta.org> * Fix backward compat + add test * Fix VecEnv detection * Update doc * Fix vec env check * Support for `VecMonitor` for gym3-style environments (#311) * add vectorized monitor * auto format of the code * add documentation and VecExtractDictObs * refactor and add test cases * add test cases and format * avoid circular import and fix doc * fix type * fix type * oops * Update stable_baselines3/common/monitor.py Co-authored-by: Antonin RAFFIN <antonin.raffin@ensta.org> * Update stable_baselines3/common/monitor.py Co-authored-by: Antonin RAFFIN <antonin.raffin@ensta.org> * add test cases * update changelog * fix mutable argument * quick fix * Apply suggestions from code review * fix terminal observation for gym3 envs * delete comment * Update doc and bump version * Add warning when already using `Monitor` wrapper * Update vecmonitor tests * Fixes Co-authored-by: Antonin RAFFIN <antonin.raffin@ensta.org> * Reformat * Fixed loading of ``ent_coef`` for ``SAC`` and ``TQC``, it was not optimized anymore (#392) * Fix ent coef loading bug * Add test * Add comment * Reuse save path * Add test for GAE + rename `RolloutBuffer.dones` for clarification (#375) * Fix return computation + add test for GAE * Rename `last_dones` to `episode_starts` for clarification * Revert advantage * Cleanup test * Rename variable * Clarify return computation * Clarify docs * Add multi-episode rollout test * Reformat Co-authored-by: Anssi "Miffyli" Kanervisto <kaneran21@hotmail.com> * Fixed saving of `A2C` and `PPO` policy when using gSDE (#401) * Improve doc and replay buffer loading * Add support for images * Fix doc * Update Procgen doc * Update changelog * Update docstrings Co-authored-by: Adam Gleave <adam@gleave.me> Co-authored-by: Jacopo Panerati <jacopo.panerati@utoronto.ca> Co-authored-by: Justin Terry <justinkterry@gmail.com> Co-authored-by: Anssi <kaneran21@hotmail.com> Co-authored-by: Tom Dörr <tomdoerr96@gmail.com> Co-authored-by: Tom Dörr <tom.doerr@tum.de> Co-authored-by: Costa Huang <costa.huang@outlook.com> * Update doc and minor fixes * Update doc * Added note about MultiInputPolicy in error of NatureCNN * Merge branch 'master' into feat/dict_observations * Address comments * Naming clarifications * Actually saving the file would be nice * Fix edge case when doing online sampling with HER * Cleanup * Add sanity check Co-authored-by: Antonin RAFFIN <antonin.raffin@ensta.org> Co-authored-by: Anssi "Miffyli" Kanervisto <kaneran21@hotmail.com> Co-authored-by: Adam Gleave <adam@gleave.me> Co-authored-by: Jacopo Panerati <jacopo.panerati@utoronto.ca> Co-authored-by: Justin Terry <justinkterry@gmail.com> Co-authored-by: Tom Dörr <tomdoerr96@gmail.com> Co-authored-by: Tom Dörr <tom.doerr@tum.de> Co-authored-by: Costa Huang <costa.huang@outlook.com>
265 lines
11 KiB
Python
265 lines
11 KiB
Python
import warnings
|
|
from typing import Any, Dict, List, Optional, Tuple, Union
|
|
|
|
import numpy as np
|
|
from gym import spaces
|
|
|
|
from stable_baselines3.common.preprocessing import is_image_space, is_image_space_channels_first
|
|
|
|
|
|
class StackedObservations(object):
|
|
"""
|
|
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 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" (default).
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
num_envs: int,
|
|
n_stack: int,
|
|
observation_space: spaces.Space,
|
|
channels_order: Optional[str] = None,
|
|
):
|
|
|
|
self.n_stack = n_stack
|
|
(
|
|
self.channels_first,
|
|
self.stack_dimension,
|
|
self.stackedobs,
|
|
self.repeat_axis,
|
|
) = self.compute_stacking(num_envs, n_stack, observation_space, channels_order)
|
|
super().__init__()
|
|
|
|
@staticmethod
|
|
def compute_stacking(
|
|
num_envs: int,
|
|
n_stack: int,
|
|
observation_space: spaces.Box,
|
|
channels_order: Optional[str] = None,
|
|
) -> Tuple[bool, int, np.ndarray, int]:
|
|
"""
|
|
Calculates the parameters in order to stack observations
|
|
|
|
:param num_envs: Number of environments in the stack
|
|
:param n_stack: The number of observations to stack
|
|
:param observation_space: The observation space
|
|
:param channels_order: The order of the channels
|
|
:return: tuple of channels_first, stack_dimension, stackedobs, repeat_axis
|
|
"""
|
|
channels_first = False
|
|
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
|
|
low = np.repeat(observation_space.low, n_stack, axis=repeat_axis)
|
|
stackedobs = np.zeros((num_envs,) + low.shape, low.dtype)
|
|
return channels_first, stack_dimension, stackedobs, repeat_axis
|
|
|
|
def stack_observation_space(self, observation_space: spaces.Box) -> spaces.Box:
|
|
"""
|
|
Given an observation space, returns a new observation space with stacked observations
|
|
|
|
:return: New observation space with stacked dimensions
|
|
"""
|
|
low = np.repeat(observation_space.low, self.n_stack, axis=self.repeat_axis)
|
|
high = np.repeat(observation_space.high, self.n_stack, axis=self.repeat_axis)
|
|
return spaces.Box(low=low, high=high, dtype=observation_space.dtype)
|
|
|
|
def reset(self, observation: np.ndarray) -> np.ndarray:
|
|
"""
|
|
Resets the stackedobs, adds the reset observation to the stack, and returns the stack
|
|
|
|
:param observation: Reset observation
|
|
:return: The stacked reset observation
|
|
"""
|
|
self.stackedobs[...] = 0
|
|
if self.channels_first:
|
|
self.stackedobs[:, -observation.shape[self.stack_dimension] :, ...] = observation
|
|
else:
|
|
self.stackedobs[..., -observation.shape[self.stack_dimension] :] = observation
|
|
return self.stackedobs
|
|
|
|
def update(
|
|
self,
|
|
observations: np.ndarray,
|
|
dones: np.ndarray,
|
|
infos: List[Dict[str, Any]],
|
|
) -> Tuple[np.ndarray, List[Dict[str, Any]]]:
|
|
"""
|
|
Adds the observations to the stack and uses the dones to update the infos.
|
|
|
|
:param observations: numpy array of observations
|
|
:param dones: numpy array of done info
|
|
:param infos: numpy array of info dicts
|
|
:return: tuple of the stacked observations and the updated infos
|
|
"""
|
|
stack_ax_size = observations.shape[self.stack_dimension]
|
|
self.stackedobs = np.roll(self.stackedobs, shift=-stack_ax_size, axis=self.stack_dimension)
|
|
for i, done in enumerate(dones):
|
|
if done:
|
|
if "terminal_observation" in infos[i]:
|
|
old_terminal = infos[i]["terminal_observation"]
|
|
if self.channels_first:
|
|
new_terminal = np.concatenate(
|
|
(self.stackedobs[i, :-stack_ax_size, ...], old_terminal),
|
|
axis=self.stack_dimension,
|
|
)
|
|
else:
|
|
new_terminal = np.concatenate(
|
|
(self.stackedobs[i, ..., :-stack_ax_size], old_terminal),
|
|
axis=self.stack_dimension,
|
|
)
|
|
infos[i]["terminal_observation"] = new_terminal
|
|
else:
|
|
warnings.warn("VecFrameStack wrapping a VecEnv without terminal_observation info")
|
|
self.stackedobs[i] = 0
|
|
if self.channels_first:
|
|
self.stackedobs[:, -observations.shape[self.stack_dimension] :, ...] = observations
|
|
else:
|
|
self.stackedobs[..., -observations.shape[self.stack_dimension] :] = observations
|
|
return self.stackedobs, infos
|
|
|
|
|
|
class StackedDictObservations(StackedObservations):
|
|
"""
|
|
Frame stacking wrapper for dictionary 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 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" (default).
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
num_envs: int,
|
|
n_stack: int,
|
|
observation_space: spaces.Dict,
|
|
channels_order: Optional[Union[str, Dict[str, str]]] = None,
|
|
):
|
|
self.n_stack = n_stack
|
|
self.channels_first = {}
|
|
self.stack_dimension = {}
|
|
self.stackedobs = {}
|
|
self.repeat_axis = {}
|
|
|
|
for key, subspace in observation_space.spaces.items():
|
|
assert isinstance(subspace, spaces.Box), "StackedDictObservations only works with nested gym.spaces.Box"
|
|
if isinstance(channels_order, str) or channels_order is None:
|
|
subspace_channel_order = channels_order
|
|
else:
|
|
subspace_channel_order = channels_order[key]
|
|
(
|
|
self.channels_first[key],
|
|
self.stack_dimension[key],
|
|
self.stackedobs[key],
|
|
self.repeat_axis[key],
|
|
) = self.compute_stacking(num_envs, n_stack, subspace, subspace_channel_order)
|
|
|
|
def stack_observation_space(self, observation_space: spaces.Dict) -> spaces.Dict:
|
|
"""
|
|
Returns the stacked verson of a Dict observation space
|
|
|
|
:param observation_space: Dict observation space to stack
|
|
:return: stacked observation space
|
|
"""
|
|
spaces_dict = {}
|
|
for key, subspace in observation_space.spaces.items():
|
|
low = np.repeat(subspace.low, self.n_stack, axis=self.repeat_axis[key])
|
|
high = np.repeat(subspace.high, self.n_stack, axis=self.repeat_axis[key])
|
|
spaces_dict[key] = spaces.Box(low=low, high=high, dtype=subspace.dtype)
|
|
return spaces.Dict(spaces=spaces_dict)
|
|
|
|
def reset(self, observation: Dict[str, np.ndarray]) -> Dict[str, np.ndarray]:
|
|
"""
|
|
Resets the stacked observations, adds the reset observation to the stack, and returns the stack
|
|
|
|
:param observation: Reset observation
|
|
:return: Stacked reset observations
|
|
"""
|
|
for key, obs in observation.items():
|
|
self.stackedobs[key][...] = 0
|
|
if self.channels_first[key]:
|
|
self.stackedobs[key][:, -obs.shape[self.stack_dimension[key]] :, ...] = obs
|
|
else:
|
|
self.stackedobs[key][..., -obs.shape[self.stack_dimension[key]] :] = obs
|
|
return self.stackedobs
|
|
|
|
def update(
|
|
self,
|
|
observations: Dict[str, np.ndarray],
|
|
dones: np.ndarray,
|
|
infos: List[Dict[str, Any]],
|
|
) -> Tuple[Dict[str, np.ndarray], List[Dict[str, Any]]]:
|
|
"""
|
|
Adds the observations to the stack and uses the dones to update the infos.
|
|
|
|
:param observations: Dict of numpy arrays of observations
|
|
:param dones: numpy array of dones
|
|
:param infos: dict of infos
|
|
:return: tuple of the stacked observations and the updated infos
|
|
"""
|
|
for key in self.stackedobs.keys():
|
|
stack_ax_size = observations[key].shape[self.stack_dimension[key]]
|
|
self.stackedobs[key] = np.roll(
|
|
self.stackedobs[key],
|
|
shift=-stack_ax_size,
|
|
axis=self.stack_dimension[key],
|
|
)
|
|
|
|
for i, done in enumerate(dones):
|
|
if done:
|
|
if "terminal_observation" in infos[i]:
|
|
old_terminal = infos[i]["terminal_observation"][key]
|
|
if self.channels_first[key]:
|
|
new_terminal = np.vstack(
|
|
(
|
|
self.stackedobs[key][i, :-stack_ax_size, ...],
|
|
old_terminal,
|
|
)
|
|
)
|
|
else:
|
|
new_terminal = np.concatenate(
|
|
(
|
|
self.stackedobs[key][i, ..., :-stack_ax_size],
|
|
old_terminal,
|
|
),
|
|
axis=self.stack_dimension[key],
|
|
)
|
|
infos[i]["terminal_observation"][key] = new_terminal
|
|
else:
|
|
warnings.warn("VecFrameStack wrapping a VecEnv without terminal_observation info")
|
|
self.stackedobs[key][i] = 0
|
|
if self.channels_first[key]:
|
|
self.stackedobs[key][:, -stack_ax_size:, ...] = observations[key]
|
|
else:
|
|
self.stackedobs[key][..., -stack_ax_size:] = observations[key]
|
|
return self.stackedobs, infos
|