Merge pull request #1764 from Unity-Technologies/release-v0.7

Release v0.7 into master

Author: vincentpierre

UnitySDK/Assets/ML-Agents/Editor/AgentEditor.cs

@@ -71,7 +71,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(
                     actionsPerDecision,
                     new GUIContent(
-                        "Decision Frequency",
+                        "Decision Interval",
                         "The agent will automatically request a decision every X" +
                         " steps and perform an action at every step."));
                 actionsPerDecision.intValue = Mathf.Max(1, actionsPerDecision.intValue);

UnitySDK/Assets/ML-Agents/Editor/LearningBrainEditor.cs

@@ -14,6 +14,7 @@ namespace MLAgents
     public class LearningBrainEditor : BrainEditor
     {
         private const string ModelPropName = "model";
+        private const string InferenceDevicePropName = "inferenceDevice";
         private const float TimeBetweenModelReloads = 2f;
         // Time since the last reload of the model
         private float _timeSinceModelReload;
@@ -47,6 +48,8 @@ public override void OnInspectorGUI()
             serializedBrain.Update(); 
             var tfGraphModel = serializedBrain.FindProperty(ModelPropName);
             EditorGUILayout.ObjectField(tfGraphModel);
+            var inferenceDevice = serializedBrain.FindProperty(InferenceDevicePropName);
+            EditorGUILayout.PropertyField(inferenceDevice);
             serializedBrain.ApplyModifiedProperties();
             if (EditorGUI.EndChangeCheck())
             {

UnitySDK/Assets/ML-Agents/Editor/NNModelImporter.cs

@@ -0,0 +1,29 @@
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.Experimental.AssetImporters;
+using MLAgents.InferenceBrain;
+
+namespace MLAgents
+{
+    /// <summary>
+    /// Asset Importer of barracuda models.
+    /// </summary>
+    [ScriptedImporter(1, new[] {"nn"})]
+    public class NNModelImporter : ScriptedImporter {
+        private const string IconPath = "Assets/ML-Agents/Resources/NNModelIcon.png";
+
+        public override void OnImportAsset(AssetImportContext ctx)
+        {
+            var model = File.ReadAllBytes(ctx.assetPath);
+            var asset = ScriptableObject.CreateInstance<NNModel>();
+            asset.Value = model;
+            
+            Texture2D texture = (Texture2D)
+                AssetDatabase.LoadAssetAtPath(IconPath, typeof(Texture2D));
+            
+            ctx.AddObjectToAsset(ctx.assetPath, asset, texture);
+            ctx.SetMainObject(asset);
+        }
+    }
+}

UnitySDK/Assets/ML-Agents/Editor/NNModelImporter.cs.meta

@@ -113,17 +113,14 @@ public void GeneratePreviousActionInput()
             var inputTensor = new Tensor()
             {
                 Shape = new long[] {2, 2},
-                ValueType = Tensor.TensorType.FloatingPoint
+                ValueType = Tensor.TensorType.Integer
 
             };
             var batchSize = 4;
             var agentInfos = GetFakeAgentInfos();
 
             var generator = new PreviousActionInputGenerator();
-            Assert.Catch<NotImplementedException>(
-                () => generator.Generate(inputTensor, batchSize, agentInfos));
 
-            inputTensor.ValueType = Tensor.TensorType.Integer;
             generator.Generate(inputTensor, batchSize, agentInfos);
             Assert.IsNotNull(inputTensor.Data as int[,]);
             Assert.AreEqual((inputTensor.Data as int[,])[0, 0], 1);

UnitySDK/Assets/ML-Agents/Editor/Tests/EditModeTestInternalBrainTensorGenerator.cs

@@ -20,4 +20,4 @@ MonoBehaviour:
     - 
     - 
     vectorActionSpaceType: 1
-  model: {fileID: 4900000, guid: 8a2da2218425f46e9921caefda4b7813, type: 3}
+  model: {fileID: 11400000, guid: 8be33caeca04d43498913448b5364f2b, type: 3}

UnitySDK/Assets/ML-Agents/Editor/Tests/MultinomialTest.cs.meta

@@ -20,4 +20,4 @@ MonoBehaviour:
     - 
     - 
     vectorActionSpaceType: 1
-  model: {fileID: 4900000, guid: 9f58800fa9d54477aa01ee258842f6b3, type: 3}
+  model: {fileID: 11400000, guid: c282d4bbc4c8f4e78b2bb29eccd17557, type: 3}

UnitySDK/Assets/ML-Agents/Editor/Tests/RandomNormalTest.cs.meta

@@ -312,7 +312,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: aaba48bf82bee4751aa7b89569e57f73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  brain: {fileID: 11400000, guid: 97d8f9d40dc8c452f932f7caa9549c7d, type: 2}
+  brain: {fileID: 11400000, guid: 383c589e8bb76464eadc2525b5b0f2c1, type: 2}
   agentParameters:
     agentCameras: []
     maxStep: 5000