Skip to content

[Refactor] Simplify FlattenObservation default kwargs #805

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

Merged
merged 2 commits into from
Jan 9, 2023
Merged

[Refactor] Simplify FlattenObservation default kwargs #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c559b27
init
vmoens Jan 9, 2023
70e614e
bf
vmoens Jan 9, 2023
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
2 changes: 1 addition & 1 deletion examples/dreamer/dreamer_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def make_env_transforms(
env.append_transform(Resize(cfg.image_size, cfg.image_size))
if cfg.grayscale:
env.append_transform(GrayScale())
env.append_transform(FlattenObservation(0))
env.append_transform(FlattenObservation(0, -3))
env.append_transform(CatFrames(N=cfg.catframes, in_keys=["pixels"]))
if stats is None:
obs_stats = {
Expand Down
2 changes: 1 addition & 1 deletion test/test_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ def test_initialize_stats_from_non_obs_transform(device):
env.set_seed(1)

t_env = TransformedEnv(env)
t_env.transform = FlattenObservation(first_dim=0)
t_env.transform = FlattenObservation(first_dim=0, last_dim=-3)
pre_init_state_dict = t_env.transform.state_dict()
initialize_observation_norm_transforms(proof_environment=t_env, num_iter=100)
post_init_state_dict = t_env.transform.state_dict()
Expand Down
2 changes: 1 addition & 1 deletion test/test_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2284,7 +2284,7 @@ def test_batch_unlocked_with_batch_size_transformed(device):
id="CenterCrop",
marks=pytest.mark.skipif(not _has_tv, reason="needs torchvision dependency"),
),
pytest.param(partial(FlattenObservation, first_dim=-3), id="FlattenObservation"),
pytest.param(partial(FlattenObservation, first_dim=-3, last_dim=-3), id="FlattenObservation"),
pytest.param(
partial(UnsqueezeTransform, unsqueeze_dim=-1), id="UnsqueezeTransform"
),
Expand Down
8 changes: 3 additions & 5 deletions torchrl/envs/transforms/transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,18 +1027,16 @@ class FlattenObservation(ObservationTransform):
"""Flatten adjacent dimensions of a tensor.

Args:
first_dim (int, optional): first dimension of the dimensions to flatten.
Default is 0.
last_dim (int, optional): last dimension of the dimensions to flatten.
Default is -3.
first_dim (int): first dimension of the dimensions to flatten.
last_dim (int): last dimension of the dimensions to flatten.
"""

inplace = False

def __init__(
self,
first_dim: int,
last_dim: int = -3,
last_dim: int,
in_keys: Optional[Sequence[str]] = None,
out_keys: Optional[Sequence[str]] = None,
):
Expand Down
2 changes: 1 addition & 1 deletion torchrl/trainers/helpers/envs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def make_env_transforms(
env.append_transform(Resize(cfg.image_size, cfg.image_size))
if cfg.grayscale:
env.append_transform(GrayScale())
env.append_transform(FlattenObservation(0))
env.append_transform(FlattenObservation(0, -3))
env.append_transform(CatFrames(N=cfg.catframes, in_keys=["pixels"]))
if stats is None:
obs_stats = {
Expand Down