Skip to content

Fix mujoco_py only installation #3072

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
jkterry1 merged 1 commit into from
Sep 12, 2022
Merged

Fix mujoco_py only installation #3072

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
6 changes: 0 additions & 6 deletions gym/envs/mujoco/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
from gym.envs.mujoco.mujoco_env import MujocoEnv, MuJocoPyEnv # isort:skip
from gym.envs.mujoco.mujoco_rendering import ( # isort:skip
RenderContextOffscreen,
Viewer,
)

# ^^^^^ so that user gets the correct error
# message if mujoco is not installed correctly
from gym.envs.mujoco.ant import AntEnv
from gym.envs.mujoco.half_cheetah import HalfCheetahEnv
from gym.envs.mujoco.hopper import HopperEnv
Expand Down
22 changes: 12 additions & 10 deletions gym/envs/mujoco/mujoco_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@
from gym import error, logger, spaces
from gym.spaces import Space

MUJOCO_PY_NOT_INSTALLED = False
MUJOCO_NOT_INSTALLED = False

try:
import mujoco_py
except ImportError as e:
MUJOCO_PY_IMPORT_ERROR = e
MUJOCO_PY_NOT_INSTALLED = True
else:
MUJOCO_PY_IMPORT_ERROR = None

try:
import mujoco
except ImportError as e:
MUJOCO_IMPORT_ERROR = e
MUJOCO_NOT_INSTALLED = True
else:
MUJOCO_IMPORT_ERROR = None


DEFAULT_SIZE = 480
Expand Down Expand Up @@ -183,7 +182,7 @@ def __init__(
camera_id: Optional[int] = None,
camera_name: Optional[str] = None,
):
if MUJOCO_PY_NOT_INSTALLED:
if MUJOCO_PY_IMPORT_ERROR is not None:
raise error.DependencyNotInstalled(
f"{MUJOCO_PY_IMPORT_ERROR}. (HINT: you need to install mujoco_py, and also perform the setup instructions here: https://github.com/openai/mujoco-py/.)"
)
Expand Down Expand Up @@ -305,7 +304,7 @@ def __init__(
camera_id: Optional[int] = None,
camera_name: Optional[str] = None,
):
if MUJOCO_NOT_INSTALLED:
if MUJOCO_IMPORT_ERROR is not None:
raise error.DependencyNotInstalled(
f"{MUJOCO_IMPORT_ERROR}. (HINT: you need to install mujoco)"
)
Expand Down Expand Up @@ -395,15 +394,18 @@ def close(self):

def _get_viewer(
self, mode
) -> Union["gym.envs.mujoco.Viewer", "gym.envs.mujoco.RenderContextOffscreen"]:
) -> Union[
"gym.envs.mujoco.mujoco_rendering.Viewer",
"gym.envs.mujoco.mujoco_rendering.RenderContextOffscreen",
]:
self.viewer = self._viewers.get(mode)
if self.viewer is None:
if mode == "human":
from gym.envs.mujoco import Viewer
from gym.envs.mujoco.mujoco_rendering import Viewer

self.viewer = Viewer(self.model, self.data)
elif mode in {"rgb_array", "depth_array"}:
from gym.envs.mujoco import RenderContextOffscreen
from gym.envs.mujoco.mujoco_rendering import RenderContextOffscreen

self.viewer = RenderContextOffscreen(self.model, self.data)
else:
Expand Down
4 changes: 2 additions & 2 deletions tests/envs/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np

import gym
from gym import logger
from gym import error, logger
from gym.envs.registration import EnvSpec


Expand All @@ -17,7 +17,7 @@ def try_make_env(env_spec: EnvSpec) -> Optional[gym.Env]:
if "gym.envs." in env_spec.entry_point:
try:
return env_spec.make(disable_env_checker=True).unwrapped
except ImportError as e:
except (ImportError, error.DependencyNotInstalled) as e:
logger.warn(f"Not testing {env_spec.id} due to error: {e}")
return None

Expand Down