Supporting gym version 0.21.0

minihack/base.py

@@ -9,7 +9,7 @@
 import numpy as np
 import pkg_resources
 from nle import _pynethack, nethack
-from nle.nethack.nethack import SCREEN_DESCRIPTIONS_SHAPE
+from nle.nethack.nethack import SCREEN_DESCRIPTIONS_SHAPE, OBSERVATION_DESC
 from nle.env.base import FULL_ACTIONS, NLE_SPACE_ITEMS
 from nle.env.tasks import NetHackStaircase
 from minihack.wiki import NetHackWiki
@@ -50,28 +50,46 @@
 
 MINIHACK_SPACE_FUNCS = {
     "glyphs_crop": lambda x, y: gym.spaces.Box(
-        low=0, high=nethack.MAX_GLYPH, shape=(x, y), dtype=np.uint16
+        low=0,
+        high=nethack.MAX_GLYPH,
+        shape=(x, y),
+        dtype=OBSERVATION_DESC["glyphs"]["dtype"],
     ),
     "chars_crop": lambda x, y: gym.spaces.Box(
-        low=0, high=255, shape=(x, y), dtype=np.uint8
+        low=0,
+        high=255,
+        shape=(x, y),
+        dtype=OBSERVATION_DESC["chars"]["dtype"],
     ),
     "colors_crop": lambda x, y: gym.spaces.Box(
-        low=0, high=15, shape=(x, y), dtype=np.uint8
+        low=0,
+        high=15,
+        shape=(x, y),
+        dtype=OBSERVATION_DESC["colors"]["dtype"],
     ),
     "specials_crop": lambda x, y: gym.spaces.Box(
-        low=0, high=255, shape=(x, y), dtype=np.uint8
+        low=0,
+        high=255,
+        shape=(x, y),
+        dtype=OBSERVATION_DESC["specials"]["dtype"],
     ),
     "tty_chars_crop": lambda x, y: gym.spaces.Box(
-        low=0, high=255, shape=(x, y), dtype=np.uint8
+        low=0,
+        high=255,
+        shape=(x, y),
+        dtype=OBSERVATION_DESC["tty_chars"]["dtype"],
     ),
     "tty_colors_crop": lambda x, y: gym.spaces.Box(
-        low=0, high=31, shape=(x, y), dtype=np.uint8
+        low=0,
+        high=31,
+        shape=(x, y),
+        dtype=OBSERVATION_DESC["tty_colors"]["dtype"],
     ),
     "screen_descriptions_crop": lambda x, y: gym.spaces.Box(
         low=0,
         high=127,
         shape=(x, y, _pynethack.nethack.NLE_SCREEN_DESCRIPTION_LENGTH),
-        dtype=np.uint8,
+        dtype=OBSERVATION_DESC["screen_descriptions"]["dtype"],
     ),
     "pixel_crop": lambda x, y: gym.spaces.Box(
         low=0,
@@ -270,7 +288,7 @@ def _get_obs_space_dict(self, space_dict):
                 )
             else:
                 if "pixel" in self._minihack_obs_keys:
-                    d_shape = nethack.OBSERVATION_DESC["glyphs"]["shape"]
+                    d_shape = OBSERVATION_DESC["glyphs"]["shape"]
                     shape = (
                         d_shape[0] * N_TILE_PIXEL,
                         d_shape[1] * N_TILE_PIXEL,

minihack/envs/__init__.py

@@ -1 +1,14 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
+
+import gym
+from gym.envs import registration
+
+
+def register(id, **kwargs):
+    if gym.__version__ >= "0.21":
+        # Starting with version 0.21, gym wraps everything by the
+        # OrderEnforcing wrapper by default (which isn't in gym.wrappers).
+        # This breaks our seed() calls and some other code. Disable.
+        kwargs["order_enforce"] = False
+
+    registration.register(id, **kwargs)

minihack/envs/boxohack.py

@@ -5,7 +5,7 @@
 import numpy as np
 import pkg_resources
 from nle import nethack
-from gym.envs import registration
+from minihack.envs import register
 from minihack import LevelGenerator, MiniHackNavigation
 
 LEVELS_PATH = os.path.join(
@@ -161,15 +161,15 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
 
-registration.register(
+register(
     id="MiniHack-Boxoban-Unfiltered-v0",
     entry_point="minihack.envs.boxohack:MiniHackBoxobanUnfiltered",
 )
-registration.register(
+register(
     id="MiniHack-Boxoban-Medium-v0",
     entry_point="minihack.envs.boxohack:MiniHackBoxobanMedium",
 )
-registration.register(
+register(
     id="MiniHack-Boxoban-Hard-v0",
     entry_point="minihack.envs.boxohack:MiniHackBoxobanHard",
 )

minihack/envs/corridor.py

@@ -1,6 +1,6 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
 from minihack import MiniHackNavigation
-from gym.envs import registration
+from minihack.envs import register
 from nle import nethack
 
 MOVE_ACTIONS = tuple(nethack.CompassDirection)
@@ -39,15 +39,15 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, des_file="corridor5.des", **kwargs)
 
 
-registration.register(
+register(
     id="MiniHack-Corridor-R2-v0",
     entry_point="minihack.envs.corridor:MiniHackCorridor2",
 )
-registration.register(
+register(
     id="MiniHack-Corridor-R3-v0",
     entry_point="minihack.envs.corridor:MiniHackCorridor3",
 )
-registration.register(
+register(
     id="MiniHack-Corridor-R5-v0",
     entry_point="minihack.envs.corridor:MiniHackCorridor5",
 )

minihack/envs/exploremaze.py

@@ -1,5 +1,5 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
-from gym.envs import registration
+from minihack.envs import register
 from minihack import MiniHackNavigation
 from minihack.envs.corridor import NAVIGATE_ACTIONS
 from minihack.reward_manager import RewardManager
@@ -70,19 +70,19 @@ def __init__(self, *args, **kwargs):
         )
 
 
-registration.register(
+register(
     id="MiniHack-ExploreMaze-Easy-v0",
     entry_point="minihack.envs.exploremaze:MiniHackExploreMazeEasy",
 )
-registration.register(
+register(
     id="MiniHack-ExploreMaze-Hard-v0",
     entry_point="minihack.envs.exploremaze:MiniHackExploreMazeHard",
 )
-registration.register(
+register(
     id="MiniHack-ExploreMaze-Easy-Mapped-v0",
     entry_point="minihack.envs.exploremaze:MiniHackExploreMazeEasyMapped",
 )
-registration.register(
+register(
     id="MiniHack-ExploreMaze-Hard-Mapped-v0",
     entry_point="minihack.envs.exploremaze:MiniHackExploreMazeHardMapped",
 )

minihack/envs/fightcorridor.py

@@ -1,6 +1,6 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
 from minihack import MiniHackNavigation, LevelGenerator
-from gym.envs import registration
+from minihack.envs import register
 
 
 class MiniHackFightCorridor(MiniHackNavigation):
@@ -33,12 +33,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, lit=False, **kwargs)
 
 
-registration.register(
+register(
     id="MiniHack-CorridorBattle-v0",
     entry_point="minihack.envs.fightcorridor:MiniHackFightCorridor",
 )
 
-registration.register(
+register(
     id="MiniHack-CorridorBattle-Dark-v0",
     entry_point="minihack.envs.fightcorridor:MiniHackFightCorridorDark",
 )

minihack/envs/hidenseek.py

@@ -1,6 +1,6 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
 from minihack import MiniHackNavigation
-from gym.envs import registration
+from minihack.envs import register
 
 
 class MiniHackHideAndSeekMapped(MiniHackNavigation):
@@ -27,19 +27,19 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, des_file="hidenseek_big.des", **kwargs)
 
 
-registration.register(
+register(
     id="MiniHack-HideNSeek-Mapped-v0",
     entry_point="minihack.envs.hidenseek:MiniHackHideAndSeekMapped",
 )
-registration.register(
+register(
     id="MiniHack-HideNSeek-v0",
     entry_point="minihack.envs.hidenseek:MiniHackHideAndSeek",
 )
-registration.register(
+register(
     id="MiniHack-HideNSeek-Lava-v0",
     entry_point="minihack.envs.hidenseek:MiniHackHideAndSeekLava",
 )
-registration.register(
+register(
     id="MiniHack-HideNSeek-Big-v0",
     entry_point="minihack.envs.hidenseek:MiniHackHideAndSeekBig",
 )

minihack/envs/keyroom.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
 from minihack import MiniHackNavigation
 from minihack.level_generator import PATH_DAT_DIR
-from gym.envs import registration
+from minihack.envs import register
 from nle.nethack import Command
 from nle import nethack
 import os
@@ -112,23 +112,23 @@ def __init__(self, *args, **kwargs):
         )
 
 
-registration.register(
+register(
     id="MiniHack-KeyRoom-Fixed-S5-v0",
     entry_point="minihack.envs.keyroom:MiniHackKeyRoom5x5Fixed",
 )
-registration.register(
+register(
     id="MiniHack-KeyRoom-S5-v0",
     entry_point="minihack.envs.keyroom:MiniHackKeyRoom5x5",
 )
-registration.register(
+register(
     id="MiniHack-KeyRoom-S15-v0",
     entry_point="minihack.envs.keyroom:MiniHackKeyRoom15x15",
 )
-registration.register(
+register(
     id="MiniHack-KeyRoom-Dark-S5-v0",
     entry_point="minihack.envs.keyroom:MiniHackKeyRoom5x5Dark",
 )
-registration.register(
+register(
     id="MiniHack-KeyRoom-Dark-S15-v0",
     entry_point="minihack.envs.keyroom:MiniHackKeyRoom15x15Dark",
 )

minihack/envs/lab.py

@@ -1,6 +1,6 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
 from minihack import MiniHackNavigation, LevelGenerator
-from gym.envs import registration
+from minihack.envs import register
 
 
 class MiniHackLabyrinth(MiniHackNavigation):
@@ -71,12 +71,12 @@ def __init__(self, *args, **kwargs):
         )
 
 
-registration.register(
+register(
     id="MiniHack-Labyrinth-Big-v0",
     entry_point="minihack.envs.lab:MiniHackLabyrinth",
 )
 
-registration.register(
+register(
     id="MiniHack-Labyrinth-Small-v0",
     entry_point="minihack.envs.lab:MiniHackLabyrinthSmall",
 )

minihack/envs/mazewalk.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
 from minihack import MiniHackNavigation
 from minihack.level_generator import LevelGenerator
-from gym.envs import registration
+from minihack.envs import register
 
 DUNGEON_SHAPE = (76, 21)
 
@@ -63,27 +63,27 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, w=45, h=19, premapped=True, **kwargs)
 
 
-registration.register(
+register(
     id="MiniHack-MazeWalk-9x9-v0",
     entry_point="minihack.envs.mazewalk:MiniHackMazeWalk9x9",
 )
-registration.register(
+register(
     id="MiniHack-MazeWalk-Mapped-9x9-v0",
     entry_point="minihack.envs.mazewalk:MiniHackMazeWalk9x9Premapped",
 )
-registration.register(
+register(
     id="MiniHack-MazeWalk-15x15-v0",
     entry_point="minihack.envs.mazewalk:MiniHackMazeWalk15x15",
 )
-registration.register(
+register(
     id="MiniHack-MazeWalk-Mapped-15x15-v0",
     entry_point="minihack.envs.mazewalk:MiniHackMazeWalk15x15Premapped",
 )
-registration.register(
+register(
     id="MiniHack-MazeWalk-45x19-v0",
     entry_point="minihack.envs.mazewalk:MiniHackMazeWalk45x19",
 )
-registration.register(
+register(
     id="MiniHack-MazeWalk-Mapped-45x19-v0",
     entry_point="minihack.envs.mazewalk:MiniHackMazeWalk45x19Premapped",
 )

minihack/envs/memento.py

@@ -1,5 +1,5 @@
 # Copyright (c) Facebook, Inc. and its affiliates.
-from gym.envs import registration
+from minihack.envs import register
 from minihack import MiniHackNavigation, RewardManager
 
 
@@ -41,18 +41,18 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, des_file="memento_hard.des", **kwargs)
 
 
-registration.register(
+register(
     id="MiniHack-Memento-Short-F2-v0",
     entry_point="minihack.envs.memento:MiniHackMementoShortF2",
 )
 
 
-registration.register(
+register(
     id="MiniHack-Memento-F2-v0",
     entry_point="minihack.envs.memento:MiniHackMementoF2",
 )
 
-registration.register(
+register(
     id="MiniHack-Memento-F4-v0",
     entry_point="minihack.envs.memento:MiniHackMementoF4",
 )