Merge branch 'develop' into release-v0.6

Author: vincentpierre

docs/Installation.md

@@ -43,7 +43,7 @@ The `gym-unity` subdirectory contains a package to interface with OpenAI Gym.
 ### Install Python and mlagents Package
 
 In order to use ML-Agents toolkit, you need Python 3.6 along with the
-dependencies listed in the [requirements file](../ml-agents/requirements.txt).
+dependencies listed in the [setup.py file](../ml-agents/setup.py).
 Some of the primary dependencies include:
 
 - [TensorFlow](Background-TensorFlow.md)

docs/Migrating.md

@@ -41,7 +41,6 @@ using the search bar of the `Hierarchy` window with the word `Agent`.
     `LearningBrain` ScriptableObjects used in your scene into entries 
     into this list.
 
-
 ## Migrating from ML-Agents toolkit v0.4 to v0.5
 
 ### Important

ml-agents/mlagents/trainers/trainer_controller.py

@@ -3,7 +3,9 @@
 """Launches trainers for each External Brains in a Unity Environment."""
 
 import os
+import glob
 import logging
+import shutil
 
 import yaml
 import re
@@ -71,8 +73,16 @@ def __init__(self, env_path, run_id, save_freq, curriculum_folder,
                 docker_target_name=docker_target_name,
                 run_id=run_id)
             if env_path is not None:
-                env_path = '/{docker_target_name}/{env_name}'.format(
-                    docker_target_name=docker_target_name, env_name=env_path)
+                """
+                Comments for future maintenance:
+                    Some OS/VM instances (e.g. COS GCP Image) mount filesystems 
+                    with COS flag which prevents execution of the Unity scene, 
+                    to get around this, we will copy the executable into the 
+                    container.
+                """
+                # Navigate in docker path and find env_path and copy it.
+                env_path = self._prepare_for_docker_run(docker_target_name,
+                                                        env_path)
             if curriculum_folder is not None:
                 self.curriculum_folder = \
                     '/{docker_target_name}/{curriculum_folder}'.format(
@@ -124,6 +134,26 @@ def __init__(self, env_path, run_id, save_freq, curriculum_folder,
                                               'name as the Brain '
                                               'whose curriculum it defines.')
 
+    def _prepare_for_docker_run(self, docker_target_name, env_path):
+        for f in glob.glob('/{docker_target_name}/*'.format(
+                docker_target_name=docker_target_name)):
+            if env_path in f:
+                try:
+                    b = os.path.basename(f)
+                    if os.path.isdir(f):
+                        shutil.copytree(f,
+                                        '/ml-agents/{b}'.format(b=b))
+                    else:
+                        src_f = '/{docker_target_name}/{b}'.format(
+                            docker_target_name=docker_target_name, b=b)
+                        dst_f = '/ml-agents/{b}'.format(b=b)
+                        shutil.copyfile(src_f, dst_f)
+                        os.chmod(dst_f, 0o775)  # Make executable
+                except Exception as e:
+                    self.logger.info(e)
+        env_path = '/ml-agents/{env_name}'.format(env_name=env_path)
+        return env_path
+
     def _get_measure_vals(self):
         if self.meta_curriculum:
             brain_names_to_measure_vals = {}

ml-agents/requirements.txt

@@ -33,7 +33,7 @@
         'matplotlib',
         'numpy>=1.13.3,<=1.14.5',
         'jupyter',
-        'pytest>=3.2.2',
+        'pytest>=3.2.2,<4.0.0',
         'docopt',
         'pyyaml',
         'protobuf>=3.6,<3.7',