Skip to content
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

[Feature] Gym 'vectorized' envs compatibility #1519

Merged
merged 20 commits into from
Sep 17, 2023
Merged

[Feature] Gym 'vectorized' envs compatibility #1519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
20d09bc
init
vmoens Sep 12, 2023
0b0d8df
amend
vmoens Sep 12, 2023
c798307
amend
vmoens Sep 13, 2023
2c178a5
amend
vmoens Sep 14, 2023
9335a99
amend
vmoens Sep 14, 2023
cca67fa
fix robohive
vmoens Sep 14, 2023
4c311ac
Merge branch 'main' into gym_vecenvs
vmoens Sep 14, 2023
65b4605
amend
vmoens Sep 14, 2023
c42d8c3
Merge remote-tracking branch 'origin/main' into gym_vecenvs
vmoens Sep 15, 2023
5060595
Merge remote-tracking branch 'origin/main' into gym_vecenvs
vmoens Sep 15, 2023
a9a0ebe
amend
vmoens Sep 15, 2023
0807716
Merge branch 'main' into gym_vecenvs
vmoens Sep 15, 2023
32c0cb2
amend
vmoens Sep 15, 2023
8aa2660
init
vmoens Sep 15, 2023
49caa04
fix
vmoens Sep 15, 2023
0a4ea8e
fix
vmoens Sep 15, 2023
c188b88
amend
vmoens Sep 17, 2023
a329b80
amend
vmoens Sep 17, 2023
8d6e9c7
amend
vmoens Sep 17, 2023
f2f5744
amend
vmoens Sep 17, 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
Prev Previous commit
Next Next commit
amend
  • Loading branch information
@vmoens
vmoens committed Sep 15, 2023
commit a9a0ebeef3b37e224a97861682a97cb571673779
7 changes: 6 additions & 1 deletion test/test_libs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@
from torchrl.envs.libs.openml import OpenMLEnv
from torchrl.envs.libs.pettingzoo import _has_pettingzoo, PettingZooEnv
from torchrl.envs.libs.robohive import RoboHiveEnv
from torchrl.envs.libs.smacv2 import _has_smacv2, SMACv2Env
from torchrl.envs.libs.vmas import _has_vmas, VmasEnv, VmasWrapper
from torchrl.envs.utils import check_env_specs, ExplorationType, MarlGroupMapType
from torchrl.modules import ActorCriticOperator, MLP, SafeModule, ValueOperator
from torchrl.envs.libs.smacv2 import _has_smacv2, SMACv2Env

_has_d4rl = importlib.util.find_spec("d4rl") is not None

Expand Down Expand Up @@ -395,6 +395,11 @@ def test_vecenvs(self): # noqa: F811
env = GymEnv(envname, num_envs=2, from_pixels=True)
check_env_specs(env)

@implement_for("gym", None, "0.18")
def test_vecenvs(self): # noqa: F811
# skipping tests for older versions of gym
return


@implement_for("gym", None, "0.26")
def _make_gym_environment(env_name): # noqa: F811
Expand Down
6 changes: 2 additions & 4 deletions torchrl/envs/libs/gym.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
import torch

from tensordict import TensorDictBase
from torchrl.envs.batched_envs import CloudpickleWrapper

from torchrl.envs.utils import _classproperty

from torchrl._utils import implement_for
from torchrl.data.tensor_specs import (
Expand All @@ -31,14 +28,15 @@
UnboundedContinuousTensorSpec,
)
from torchrl.data.utils import numpy_to_torch_dtype_dict
from torchrl.envs.batched_envs import CloudpickleWrapper

from torchrl.envs.gym_like import (
BaseInfoDictReader,
default_info_dict_reader,
GymLikeEnv,
)

from torchrl.envs.utils import _classproperty
from torchrl.envs.gym_like import default_info_dict_reader, GymLikeEnv

try:
from torch.utils._contextlib import _DecoratorContextManager
Expand Down