Merge 0.11.0 to develop (#2825)

* Update package and communicator versions to 0.11 * Remove pip cache fallback for CircleCI This change removes the caching fallback in the case where dependencies change, since it can cause CI failures when we have incompatible dependencies in the cache. * Limit Tensorflow version for tests to <2.0 * Use stable bokken image. (#2815) * build fixes for 2018+ (#2808) * rename CompressionType enum * fix standalone build test for 2018+ * Add more editor versions for testing. (#2809) * class variable for API verison, fix env tests (#2817) * fixed area prefab agents were pointing to the wrong laser gameObject.
Unity-Technologies · Oct 30, 2019 · 7fcf623 · 7fcf623
1 parent 765d72e
commit 7fcf623
Show file tree

Hide file tree

Showing 22 changed files with 180 additions and 148 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,8 +33,6 @@ jobs:
           keys:
           # Parameterize the cache so that different python versions can get different versions of the packages
           - v1-dependencies-py<< parameters.pyversion >>-{{ checksum "python_deps.txt" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-py<< parameters.pyversion >>-
 
       - run:
           name: Install Dependencies

diff --git a/.yamato/csharp-tests.yml b/.yamato/csharp-tests.yml
@@ -1,24 +1,30 @@
-name: Mac Edit Mode Tests
-triggers:
+test_editors:
+  - version: 2017.4
+  - version: 2018.4
+  - version: 2019.3
+---
+{% for editor in test_editors %}
+test_mac_editmode_{{ editor.version }}:
+  name: Test Mac EditMode {{ editor.version }}
+  agent:
+    type: Unity::VM::osx
+    image: ml-agents/ml-agents-bokken-mac:stable
+    flavor: i1.small
+  variables:
+    UNITY_VERSION: {{ editor.version }}
+  commands:
+    - ./run-tests-editmode-osx-editor.sh
+  triggers:
     branches:
       only:
-      - "/develop-.*/"
+        - "/develop-.*/"
     targets:
       only:
-      - "develop"
+        - "develop"
     pull_requests:
       - targets:
           only:
             - "master"
             - "/release-.*/"
             - "/hotfix-.*/"
-
-agent:
-  type: Unity::VM::osx
-  image: ml-agents/ml-agents-bokken-mac:stable
-  flavor: i1.small
-
-variables:
-  LC_ALL: "en_US.UTF-8"
-commands:
-  - ./run-tests-editmode-osx-editor.sh
+{% endfor %}
diff --git a/.yamato/standalone-build-test.yml b/.yamato/standalone-build-test.yml
@@ -1,24 +1,30 @@
-name: Mac Standalone Build Test
-triggers:
-  branches:
-    only:
-      - "/develop-.*/"
-  targets:
-    only:
-      - "develop"
-  pull_requests:
-    - targets:
-        only:
-          - "master"
-          - "/release-.*/"
-          - "/hotfix-.*/"
-
-agent:
-  type: Unity::VM::osx
-  image: ml-agents/ml-agents-bokken-mac:stable
-  flavor: i1.small
-
-variables:
-  LC_ALL: "en_US.UTF-8"
-commands:
-  - ./run-standalone-build-osx.sh
+test_editors:
+  - version: 2017.4
+  - version: 2018.4
+  - version: 2019.3
+---
+{% for editor in test_editors %}
+test_mac_standalone_{{ editor.version }}:
+  name: Test Mac Standalone {{ editor.version }}
+  agent:
+    type: Unity::VM::osx
+    image: ml-agents/ml-agents-bokken-mac:stable
+    flavor: i1.small
+  variables:
+    UNITY_VERSION: {{ editor.version }}
+  commands:
+    - ./run-standalone-build-osx.sh
+  triggers:
+    branches:
+      only:
+        - "/develop-.*/"
+    targets:
+      only:
+        - "develop"
+    pull_requests:
+      - targets:
+          only:
+            - "master"
+            - "/release-.*/"
+            - "/hotfix-.*/"
+{% endfor %}
diff --git a/UnitySDK/Assets/ML-Agents/Editor/Tests/MLAgentsEditModeTest.cs b/UnitySDK/Assets/ML-Agents/Editor/Tests/MLAgentsEditModeTest.cs
@@ -93,9 +93,9 @@ public byte[] GetCompressedObservation()
             return null;
         }
 
-        public CompressionType GetCompressionType()
+        public SensorCompressionType GetCompressionType()
         {
-            return CompressionType.None;
+            return SensorCompressionType.None;
         }
 
         public string GetName()

diff --git a/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs b/UnitySDK/Assets/ML-Agents/Editor/Tests/StandaloneBuildTest.cs
@@ -1,6 +1,9 @@
 using System;
 using UnityEditor;
 using UnityEngine;
+#if UNITY_2018_1_OR_NEWER
+using UnityEditor.Build.Reporting;
+#endif
 
 namespace MLAgents
 {
@@ -9,19 +12,37 @@ public class StandaloneBuildTest
         static void BuildStandalonePlayerOSX()
         {
             string[] scenes = { "Assets/ML-Agents/Examples/3DBall/Scenes/3DBall.unity" };
-            var error = BuildPipeline.BuildPlayer(scenes, "testPlayer", BuildTarget.StandaloneOSX, BuildOptions.None);
-            if (string.IsNullOrEmpty(error))
+            var buildResult = BuildPipeline.BuildPlayer(scenes, "testPlayer", BuildTarget.StandaloneOSX, BuildOptions.None);
+#if UNITY_2018_1_OR_NEWER
+            var isOK = buildResult.summary.result == BuildResult.Succeeded;
+            var error = "";
+            foreach (var stepInfo in buildResult.steps)
+            {
+                foreach (var msg in stepInfo.messages)
+                {
+                    if (msg.type != LogType.Log && msg.type != LogType.Warning)
+                    {
+                        error += msg.content + "\n";
+                    }
+                }
+            }
+#else
+            var error = buildResult;
+            var isOK = string.IsNullOrEmpty(error);
+#endif
+            if (isOK)
             {
                 EditorApplication.Exit(0);
             }
             else
             {
                 Console.Error.WriteLine(error);
                 EditorApplication.Exit(1);
-                
+
             }
             Debug.Log(error);
+
         }
-        
+
     }
 }
diff --git a/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/Prefabs/FoodCollectorArea.prefab b/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/Prefabs/FoodCollectorArea.prefab
@@ -3686,7 +3686,6 @@ MonoBehaviour:
     vectorObservationSize: 53
     numStackedVectorObservations: 1
     vectorActionSize: 03000000030000000300000002000000
-    cameraResolutions: []
     vectorActionDescriptions: []
     vectorActionSpaceType: 0
   m_Model: {fileID: 11400000, guid: d32fca21cf4c04536ab7f88eb9de83e0, type: 3}
@@ -3705,8 +3704,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   agentParameters:
-    agentCameras: []
-    agentRenderTextures: []
     maxStep: 5000
     resetOnDone: 1
     onDemandDecision: 0
@@ -3750,8 +3747,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   agentParameters:
-    agentCameras: []
-    agentRenderTextures: []
     maxStep: 5000
     resetOnDone: 1
     onDemandDecision: 0
@@ -3763,7 +3758,7 @@ MonoBehaviour:
   badMaterial: {fileID: 2100000, guid: 88b9ae7af2c1748a0a1f63407587a601, type: 2}
   goodMaterial: {fileID: 2100000, guid: c67450f290f3e4897bc40276a619e78d, type: 2}
   frozenMaterial: {fileID: 2100000, guid: 66163cf35956a4be08e801b750c26f33, type: 2}
-  myLaser: {fileID: 1081721624670010}
+  myLaser: {fileID: 1617924810425504}
   contribute: 0
   useVectorObs: 1
 --- !u!114 &114192565006091356
@@ -3789,8 +3784,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   agentParameters:
-    agentCameras: []
-    agentRenderTextures: []
     maxStep: 5000
     resetOnDone: 1
     onDemandDecision: 0
@@ -3802,7 +3795,7 @@ MonoBehaviour:
   badMaterial: {fileID: 2100000, guid: 88b9ae7af2c1748a0a1f63407587a601, type: 2}
   goodMaterial: {fileID: 2100000, guid: c67450f290f3e4897bc40276a619e78d, type: 2}
   frozenMaterial: {fileID: 2100000, guid: 66163cf35956a4be08e801b750c26f33, type: 2}
-  myLaser: {fileID: 1081721624670010}
+  myLaser: {fileID: 1045923826166930}
   contribute: 0
   useVectorObs: 1
 --- !u!114 &114374774605792098
@@ -3820,7 +3813,6 @@ MonoBehaviour:
     vectorObservationSize: 53
     numStackedVectorObservations: 1
     vectorActionSize: 03000000030000000300000002000000
-    cameraResolutions: []
     vectorActionDescriptions: []
     vectorActionSpaceType: 0
   m_Model: {fileID: 11400000, guid: d32fca21cf4c04536ab7f88eb9de83e0, type: 3}
@@ -3853,7 +3845,6 @@ MonoBehaviour:
     vectorObservationSize: 53
     numStackedVectorObservations: 1
     vectorActionSize: 03000000030000000300000002000000
-    cameraResolutions: []
     vectorActionDescriptions: []
     vectorActionSpaceType: 0
   m_Model: {fileID: 11400000, guid: d32fca21cf4c04536ab7f88eb9de83e0, type: 3}
@@ -3872,8 +3863,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   agentParameters:
-    agentCameras: []
-    agentRenderTextures: []
     maxStep: 5000
     resetOnDone: 1
     onDemandDecision: 0
@@ -3885,7 +3874,7 @@ MonoBehaviour:
   badMaterial: {fileID: 2100000, guid: 88b9ae7af2c1748a0a1f63407587a601, type: 2}
   goodMaterial: {fileID: 2100000, guid: c67450f290f3e4897bc40276a619e78d, type: 2}
   frozenMaterial: {fileID: 2100000, guid: 66163cf35956a4be08e801b750c26f33, type: 2}
-  myLaser: {fileID: 1081721624670010}
+  myLaser: {fileID: 1421240237750412}
   contribute: 0
   useVectorObs: 1
 --- !u!114 &114661830999747712
@@ -3911,8 +3900,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   agentParameters:
-    agentCameras: []
-    agentRenderTextures: []
     maxStep: 5000
     resetOnDone: 1
     onDemandDecision: 0
@@ -3924,7 +3911,7 @@ MonoBehaviour:
   badMaterial: {fileID: 2100000, guid: 88b9ae7af2c1748a0a1f63407587a601, type: 2}
   goodMaterial: {fileID: 2100000, guid: c67450f290f3e4897bc40276a619e78d, type: 2}
   frozenMaterial: {fileID: 2100000, guid: 66163cf35956a4be08e801b750c26f33, type: 2}
-  myLaser: {fileID: 1081721624670010}
+  myLaser: {fileID: 1941433838307300}
   contribute: 0
   useVectorObs: 1
 --- !u!114 &114762047763154270
@@ -3964,7 +3951,6 @@ MonoBehaviour:
     vectorObservationSize: 53
     numStackedVectorObservations: 1
     vectorActionSize: 03000000030000000300000002000000
-    cameraResolutions: []
     vectorActionDescriptions: []
     vectorActionSpaceType: 0
   m_Model: {fileID: 11400000, guid: d32fca21cf4c04536ab7f88eb9de83e0, type: 3}
@@ -3986,7 +3972,6 @@ MonoBehaviour:
     vectorObservationSize: 53
     numStackedVectorObservations: 1
     vectorActionSize: 03000000030000000300000002000000
-    cameraResolutions: []
     vectorActionDescriptions: []
     vectorActionSpaceType: 0
   m_Model: {fileID: 11400000, guid: d32fca21cf4c04536ab7f88eb9de83e0, type: 3}

diff --git a/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/Scenes/FoodCollector.unity b/UnitySDK/Assets/ML-Agents/Examples/FoodCollector/Scenes/FoodCollector.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44971162, g: 0.49977726, b: 0.5756362, a: 1}
+  m_IndirectSpecularColor: {r: 0.4497121, g: 0.4997778, b: 0.5756369, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -747,9 +747,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4fe57113e76a5426297487dd6faadc5b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  broadcastHub:
-    brainsToControl:
-    - {fileID: 11400000, guid: 9e7865ec29c894c2d8c1617b0fa392f9, type: 2}
   m_TrainingConfiguration:
     width: 500
     height: 500

diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Academy.cs b/UnitySDK/Assets/ML-Agents/Scripts/Academy.cs
@@ -92,7 +92,7 @@ public EnvironmentConfiguration(
         "docs/Learning-Environment-Design-Academy.md")]
     public abstract class Academy : MonoBehaviour
     {
-        const string k_ApiVersion = "API-10";
+        const string k_ApiVersion = "API-11";
 
         /// Temporary storage for global gravity value
         /// Used to restore oringal value when deriving Academy modifies it

diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Agent.cs b/UnitySDK/Assets/ML-Agents/Scripts/Agent.cs
@@ -150,7 +150,7 @@ public class AgentParameters
     /// of the environment extracts its current observation, sends them to its
     /// policy and in return receives an action. In practice,
     /// however, an agent need not send its observation at every step since very
-    /// little may have changed between successive steps. 
+    /// little may have changed between successive steps.
     ///
     /// At any step, an agent may be considered <see cref="m_Done"/>.
     /// This could occur due to a variety of reasons:
@@ -319,15 +319,15 @@ void OnDisable()
 
         /// <summary>
         /// Updates the Model for the agent. Any model currently assigned to the
-        /// agent will be replaced with the provided one. If the arguments are 
+        /// agent will be replaced with the provided one. If the arguments are
         /// identical to the current parameters of the agent, the model will
-        /// remain unchanged. 
+        /// remain unchanged.
         /// </summary>
-        /// <param name="behaviorName"> The identifier of the behavior. This 
-        /// will categorize the agent when training. 
+        /// <param name="behaviorName"> The identifier of the behavior. This
+        /// will categorize the agent when training.
         /// </param>
         /// <param name="model"> The model to use for inference.</param>
-        /// <param name = "inferenceDevice"> Define on what device the model 
+        /// <param name = "inferenceDevice"> Define on what device the model
         /// will be run.</param>
         public void GiveModel(
             string behaviorName,

diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensor.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CameraSensor.cs
@@ -55,9 +55,9 @@ public void WriteToTensor(TensorProxy tensorProxy, int agentIndex)
             }
         }
 
-        public CompressionType GetCompressionType()
+        public SensorCompressionType GetCompressionType()
         {
-            return CompressionType.PNG;
+            return SensorCompressionType.PNG;
         }
 
         /// <summary>

diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CompressedObservation.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/CompressedObservation.cs
@@ -13,7 +13,7 @@ public struct CompressedObservation
         /// <summary>
         /// The format of the compressed data
         /// </summary>
-        public CompressionType CompressionType;
+        public SensorCompressionType CompressionType;
 
         /// <summary>
         /// The uncompressed dimensions of the data.

diff --git a/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs b/UnitySDK/Assets/ML-Agents/Scripts/Sensor/ISensor.cs
@@ -2,7 +2,7 @@
 
 namespace MLAgents.Sensor
 {
-    public enum CompressionType
+    public enum SensorCompressionType
     {
         None,
         PNG
@@ -38,10 +38,10 @@ public interface ISensor {
         byte[] GetCompressedObservation();
 
         /// <summary>
-        /// Return the compression type being used. If no compression is used, return CompressionType.None
+        /// Return the compression type being used. If no compression is used, return SensorCompressionType.None
         /// </summary>
         /// <returns></returns>
-        CompressionType GetCompressionType();
+        SensorCompressionType GetCompressionType();
 
         /// <summary>
         /// Get the name of the sensor. This is used to ensure deterministic sorting of the sensors on an Agent,