Skip to content

Release v0.7 into master #1764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Feb 27, 2019
Merged

Release v0.7 into master #1764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c115f5a
Merge pull request #1495 from Unity-Technologies/release-v0.6
eshvk Dec 14, 2018
1d3091f
Merge pull request #1497 from Unity-Technologies/release-v0.6
vincentpierre Dec 14, 2018
08861ed
Documentation tweaks and updates (#1479)
ervteng Dec 19, 2018
3b572a2
Improve Gym wrapper compatibility and add Dopamine documentation (#1541)
ervteng Jan 8, 2019
fb52f5a
Replace AddVectorObs(float[]) and AddVectorObs(List<float>) with a mo…
Du-z Jan 8, 2019
9945e9c
Merge pull request #1589 from Unity-Technologies/hotfix-0.6.0a
vincentpierre Jan 11, 2019
553c6b7
Remove env creation logic from TrainerController (#1562)
Jan 24, 2019
81b1ad9
Add docs for increasing memory limit for Docker for Mac
eshvk Jan 24, 2019
ad28178
Merge pull request #1634 from Unity-Technologies/develop-xvfb-fix
eshvk Jan 24, 2019
c9ca179
Minor fix to docs on Docker
eshvk Jan 24, 2019
71e873e
Merge pull request #1636 from Unity-Technologies/develop-docs
eshvk Jan 24, 2019
1927a4c
Barracuda integration into ML-Agents (#1557)
mantasp Feb 1, 2019
d60d985
Update Learning-Environment-Design-Academy.md (#1653)
vxgu86 Feb 6, 2019
1a44b21
Update Learning-Environment-Create-New.md (#1650)
vxgu86 Feb 6, 2019
3b77fe9
added the pypiwin32 package (#1668)
xiaomaogy Feb 6, 2019
e5b578a
Update Learning-Environment-Design-Agents.md (#1659)
Lucretiel Feb 6, 2019
e0faaeb
Ticked API : (#1696)
vincentpierre Feb 11, 2019
3ed8036
Rename decision frequency to interval (#1697)
awjuliani Feb 11, 2019
4146c47
adding a comment on IL2CPP vs Mono on the Barracuda documentation pag…
vincentpierre Feb 13, 2019
f8d8270
Fixing Typos
vincentpierre Feb 19, 2019
6a2bffc
Capitalization
vincentpierre Feb 19, 2019
25c41f0
Removing dead Links
vincentpierre Feb 19, 2019
61a83ec
Added missing meta files
vincentpierre Feb 19, 2019
fad29a9
Set the default Package Name on Android to com.Company.ProductName
vincentpierre Feb 20, 2019
930b051
Added comment on OpenGL 3.0 emulation (#1735)
vincentpierre Feb 21, 2019
a4baab2
Release v0.7 disable gRPC on non supported platforms (#1743)
vincentpierre Feb 21, 2019
397b992
Edited the Tennis code and retrained the model (#1746)
vincentpierre Feb 22, 2019
f863601
Release 0.7 Fix gym_unity Tests (#1744)
ervteng Feb 22, 2019
388a7fc
Linking Tennis Model to Tennis Brain
vincentpierre Feb 22, 2019
f969bdc
Update Timeout error messages (#1750)
vincentpierre Feb 22, 2019
63dc3cf
Release v0.7 minor fixes (#1759)
vincentpierre Feb 25, 2019
3c56f8b
Adding the new icon for the NNModel (#1748)
vincentpierre Feb 25, 2019
5f57742
Retrained models for Release 0.7 and deleted random prefab for bounce…
eshvk Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Editor/AgentEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions UnitySDK/Assets/ML-Agents/Editor/LearningBrainEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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())
{
Expand Down
29 changes: 29 additions & 0 deletions UnitySDK/Assets/ML-Agents/Editor/NNModelImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
11 changes: 11 additions & 0 deletions UnitySDK/Assets/ML-Agents/Editor/NNModelImporter.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions UnitySDK/Assets/ML-Agents/Editor/Tests/EditModeTestInternalBrainTensorGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 11 additions & 0 deletions UnitySDK/Assets/ML-Agents/Editor/Tests/MultinomialTest.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions UnitySDK/Assets/ML-Agents/Editor/Tests/RandomNormalTest.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/3DBall/Brains/3DBallHardLearning.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ MonoBehaviour:
-
-
vectorActionSpaceType: 1
model: {fileID: 4900000, guid: 8a2da2218425f46e9921caefda4b7813, type: 3}
model: {fileID: 11400000, guid: 8be33caeca04d43498913448b5364f2b, type: 3}
2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/3DBall/Brains/3DBallLearning.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ MonoBehaviour:
-
-
vectorActionSpaceType: 1
model: {fileID: 4900000, guid: 9f58800fa9d54477aa01ee258842f6b3, type: 3}
model: {fileID: 11400000, guid: c282d4bbc4c8f4e78b2bb29eccd17557, type: 3}
2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/3DBall/Prefabs/Game.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/3DBall/Prefabs/GameHard.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: edf26e11cf4ed42eaa3ffb7b91bb4676, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: 55f48be32ac184c6ab67cf647100bac4, type: 2}
brain: {fileID: 11400000, guid: 4f74e089fbb75455ebf6f0495e30be6e, type: 2}
agentParameters:
agentCameras: []
maxStep: 5000
Expand Down
Binary file removed UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHardLearning.bytes
View file
Open in desktop
Binary file not shown.
Binary file added UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHardLearning.nn
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallHardLearning.nn.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallLearning.bytes
View file
Open in desktop
Binary file not shown.
Binary file added UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallLearning.nn
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions UnitySDK/Assets/ML-Agents/Examples/3DBall/TFModels/3DBallLearning.nn.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/BananaCollectors/Brains/BananaLearning.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ MonoBehaviour:
-
-
vectorActionSpaceType: 0
model: {fileID: 4900000, guid: 69bd818d72b944849916d2fda9fe471b, type: 3}
model: {fileID: 11400000, guid: 9aed85b22394844eaa6db4d5e3c61adb, type: 3}
10 changes: 5 additions & 5 deletions UnitySDK/Assets/ML-Agents/Examples/BananaCollectors/Prefabs/RLArea.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5752,7 +5752,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 700720465a0104fa586fa4a412b044f8, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: dff7429d656234fed84c4fac2a7a683c, type: 2}
brain: {fileID: 11400000, guid: 9e7865ec29c894c2d8c1617b0fa392f9, type: 2}
agentParameters:
agentCameras: []
maxStep: 5000
Expand Down Expand Up @@ -5830,7 +5830,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 700720465a0104fa586fa4a412b044f8, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: dff7429d656234fed84c4fac2a7a683c, type: 2}
brain: {fileID: 11400000, guid: 9e7865ec29c894c2d8c1617b0fa392f9, type: 2}
agentParameters:
agentCameras: []
maxStep: 5000
Expand Down Expand Up @@ -5858,7 +5858,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 700720465a0104fa586fa4a412b044f8, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: dff7429d656234fed84c4fac2a7a683c, type: 2}
brain: {fileID: 11400000, guid: 9e7865ec29c894c2d8c1617b0fa392f9, type: 2}
agentParameters:
agentCameras: []
maxStep: 5000
Expand Down Expand Up @@ -5886,7 +5886,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 700720465a0104fa586fa4a412b044f8, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: dff7429d656234fed84c4fac2a7a683c, type: 2}
brain: {fileID: 11400000, guid: 9e7865ec29c894c2d8c1617b0fa392f9, type: 2}
agentParameters:
agentCameras: []
maxStep: 5000
Expand Down Expand Up @@ -5914,7 +5914,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 700720465a0104fa586fa4a412b044f8, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: dff7429d656234fed84c4fac2a7a683c, type: 2}
brain: {fileID: 11400000, guid: 9e7865ec29c894c2d8c1617b0fa392f9, type: 2}
agentParameters:
agentCameras: []
maxStep: 5000
Expand Down
Binary file removed UnitySDK/Assets/ML-Agents/Examples/BananaCollectors/TFModels/BananaLearning.bytes
View file
Open in desktop
Binary file not shown.
Binary file added UnitySDK/Assets/ML-Agents/Examples/BananaCollectors/TFModels/BananaLearning.nn
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions UnitySDK/Assets/ML-Agents/Examples/BananaCollectors/TFModels/BananaLearning.nn.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion UnitySDK/Assets/ML-Agents/Examples/Basic/Brains/BasicLearning.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ MonoBehaviour:
vectorActionDescriptions:
-
vectorActionSpaceType: 0
model: {fileID: 4900000, guid: 503ce1e8257904bd0b5be8f7fb4b5d28, type: 3}
model: {fileID: 11400000, guid: b9b3600e7ab99422684e1f3bf597a456, type: 3}
inferenceDevice: 0
2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/Basic/Prefabs/Basic.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 624480a72e46148118ab2e2d89b537de, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: 1adbe3db6a2f94bf2b1e22a29b955387, type: 2}
brain: {fileID: 11400000, guid: e5cf0e35e16264ea483f8863e5115c3c, type: 2}
agentParameters:
agentCameras: []
maxStep: 0
Expand Down
Binary file added UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/BasicLearning.nn
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions UnitySDK/Assets/ML-Agents/Examples/Basic/TFModels/BasicLearning.nn.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/Bouncer/Brains/BouncerLearning.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ MonoBehaviour:
-
-
vectorActionSpaceType: 1
model: {fileID: 4900000, guid: 760d2b8347b4b46e3a44d9b989e1304e, type: 3}
model: {fileID: 11400000, guid: 055df42a4cc114162939e523d053c4d7, type: 3}
2 changes: 1 addition & 1 deletion UnitySDK/Assets/ML-Agents/Examples/Bouncer/Prefabs/Environment.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0f09741cbce2e44bc88d3e92917eea0e, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: 5527511df7b944e8e9177dd69db5a9c1, type: 2}
brain: {fileID: 11400000, guid: 573920e3a672d40038169c7ffdbdca05, type: 2}
agentParameters:
agentCameras: []
maxStep: 0
Expand Down
Loading