Lab requires conv2d default network

michaelschaarschmidt · michaelschaarschmidt · commit c8cfba989ce9 · 2017-07-01T19:24:20.000+01:00
diff --git a/BUILD b/BUILD
@@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
 tensorforce_args = [
   "--agent VPGAgent",
   "--agent-config /configs/vpg_agent.json",
-  "--network-config /configs/vpg_network.json",
+  "--network-config /configs/vpg_network_visual.json",
   "--episodes 1000",
   "--max-timesteps 1000"
 ]
@@ -12,7 +12,7 @@ py_library(
     name = "tensorforce",
     imports = [":tensorforce"],
     data = ["//tensorforce:examples/configs/vpg_agent.json",
-    "//tensorforce:examples/configs/vpg_network.json"],
+    "//tensorforce:examples/configs/vpg_network_visual.json"],
     srcs = glob(["tensorforce/**/*.py"])
 )
 
diff --git a/tensorforce/environments/deepmind_lab.py b/tensorforce/environments/deepmind_lab.py
@@ -50,18 +50,19 @@ class DeepMindLab(Environment):
     #     level = deepmind_lab.Lab(level_id, ())
     #     return level.action_spec()
 
-    def __init__(self, level_id, repeat_action=1, state_attributes=['RGB_INTERLACED'], settings={'width': '320', 'height': '240', 'fps': '60', 'appendCommand': ''}):
+    def __init__(self, level_id, repeat_action=1, state_attribute='RGB_INTERLACED', settings={'width': '320', 'height': '240', 'fps': '60', 'appendCommand': ''}):
         """
         Initialize DeepMind Lab environment.
 
         :param level_id: string with id/descriptor of the level, e.g. 'seekavoid_arena_01'
         :param num_steps: number of frames the environment is advanced, executing the given action during every frame
-        :param state_attributes: list of attributes which represent the state for this environment, should adhere to the specification given in DeepMindLabEnvironment.state_spec(level_id)
+        :param state_attribute: Attributes which represents the state for this environment, should adhere to the specification given in DeepMindLabEnvironment.state_spec(level_id)
         :param settings: dict specifying additional settings as key-value string pairs. The following options are recognized: 'width' (horizontal resolution of the observation frames), 'height' (vertical resolution of the observation frames), 'fps' (frames per second) and 'appendCommand' (commands for the internal Quake console).
         """
         self.level_id = level_id
-        self.level = deepmind_lab.Lab(level=level_id, observations=state_attributes, config=settings)
+        self.level = deepmind_lab.Lab(level=level_id, observations=[state_attribute], config=settings)
         self.repeat_action = repeat_action
+        self.state_attribute = state_attribute
 
     def __str__(self):
         return 'DeepMindLab({})'.format(self.level_id)
@@ -80,7 +81,7 @@ def reset(self):
         :return: initial state
         """
         self.level.reset()  # optional: episode=-1, seed=None
-        return self.level.observations()['RGB_INTERLACED']
+        return self.level.observations()[self.state_attribute]
 
     def execute(self, action):
         """
@@ -112,7 +113,8 @@ def states(self):
             if state_type == np.uint8:
                 state_type = np.int32
 
-            states[state['name']] = dict(shape=state['shape'], type=state_type)
+            if state['name'] == self.state_attribute:
+                states[state['name']] = dict(shape=state['shape'], type=state_type)
 
         return states
 
