From 5ad3a0759d0492017bf0fd10117b9d1b9865b963 Mon Sep 17 00:00:00 2001 From: vincentpierre Date: Mon, 25 Feb 2019 09:36:31 -0800 Subject: [PATCH 1/2] Fix typo --- ml-agents/mlagents/trainers/policy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ml-agents/mlagents/trainers/policy.py b/ml-agents/mlagents/trainers/policy.py index 9230036e73..dc6b766c86 100644 --- a/ml-agents/mlagents/trainers/policy.py +++ b/ml-agents/mlagents/trainers/policy.py @@ -179,9 +179,9 @@ def export_model(self): clear_devices=True, initializer_nodes='', input_saver='', restore_op_name='save/restore_all', filename_tensor_name='save/Const:0') - logger.info('Exported ' + self.model_path + '.bytes file') tf2bc.convert(self.model_path + '/frozen_graph_def.pb', self.model_path + '.nn') + logger.info('Exported ' + self.model_path + '.nn file') def _process_graph(self): """ From bc72618901c7907508a0393dc3b7f7d925c7f7da Mon Sep 17 00:00:00 2001 From: vincentpierre Date: Mon, 25 Feb 2019 09:53:54 -0800 Subject: [PATCH 2/2] Updated some of the scenes --- .../Examples/Bouncer/Scenes/Bouncer.unity | 40 +++--- .../Examples/GridWorld/Resources/agent.prefab | 9 +- .../Examples/GridWorld/Scenes/GridWorld.unity | 13 +- .../ML-Agents/Examples/Template/Scene.unity | 124 ++++-------------- 4 files changed, 47 insertions(+), 139 deletions(-) mode change 100755 => 100644 UnitySDK/Assets/ML-Agents/Examples/Template/Scene.unity diff --git a/UnitySDK/Assets/ML-Agents/Examples/Bouncer/Scenes/Bouncer.unity b/UnitySDK/Assets/ML-Agents/Examples/Bouncer/Scenes/Bouncer.unity index e2bad9641e..ab4b1bbb0d 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/Bouncer/Scenes/Bouncer.unity +++ b/UnitySDK/Assets/ML-Agents/Examples/Bouncer/Scenes/Bouncer.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.4482636, g: 0.49828887, b: 0.5755903, a: 1} + m_IndirectSpecularColor: {r: 0.44824862, g: 0.49827534, b: 0.57558274, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -164,7 +164,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -220,7 +220,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -276,7 +276,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -332,7 +332,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -388,7 +388,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -444,7 +444,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -500,7 +500,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -556,7 +556,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -612,7 +612,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -668,7 +668,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -724,7 +724,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -780,7 +780,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -938,7 +938,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -994,7 +994,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -1050,7 +1050,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -1106,7 +1106,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -1162,7 +1162,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -1218,7 +1218,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} @@ -1420,7 +1420,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1397068878990112, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e2c4e1ad4f2224d34bb09d20f26b3207, type: 2} diff --git a/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Resources/agent.prefab b/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Resources/agent.prefab index 26994b5d67..2fa67a7986 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Resources/agent.prefab +++ b/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Resources/agent.prefab @@ -183,7 +183,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 00d852aac9443402984416f9dbcd22ea, type: 2} m_StaticBatchInfo: @@ -218,7 +217,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 00d852aac9443402984416f9dbcd22ea, type: 2} m_StaticBatchInfo: @@ -253,7 +251,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 00d852aac9443402984416f9dbcd22ea, type: 2} m_StaticBatchInfo: @@ -288,7 +285,6 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 00d852aac9443402984416f9dbcd22ea, type: 2} m_StaticBatchInfo: @@ -416,7 +412,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 857707f3f352541d5b858efca4479b95, type: 3} m_Name: m_EditorClassIdentifier: - brain: {fileID: 0} + brain: {fileID: 11400000, guid: 2c1d51b7167874f31beda0b0cf0af468, type: 2} agentParameters: agentCameras: - {fileID: 0} @@ -424,4 +420,5 @@ MonoBehaviour: resetOnDone: 1 onDemandDecision: 1 numberOfActionsBetweenDecisions: 1 - timeBetweenDecisionsAtInference: 0 + timeBetweenDecisionsAtInference: 0.15 + maskActions: 1 diff --git a/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Scenes/GridWorld.unity b/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Scenes/GridWorld.unity index 829e19aac5..56a3a213d2 100644 --- a/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Scenes/GridWorld.unity +++ b/UnitySDK/Assets/ML-Agents/Examples/GridWorld/Scenes/GridWorld.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.43668893, g: 0.4842832, b: 0.56452656, a: 1} + m_IndirectSpecularColor: {r: 0.43667555, g: 0.4842717, b: 0.56452394, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -1125,22 +1125,11 @@ Prefab: propertyPath: m_Name value: trueAgent objectReference: {fileID: 0} - - target: {fileID: 114143683117020968, guid: 628960e910f094ad1909ecc88cc8016d, - type: 2} - propertyPath: brain - value: - objectReference: {fileID: 11400000, guid: 2c1d51b7167874f31beda0b0cf0af468, - type: 2} - target: {fileID: 114143683117020968, guid: 628960e910f094ad1909ecc88cc8016d, type: 2} propertyPath: agentParameters.agentCameras.Array.data[0] value: objectReference: {fileID: 489340228} - - target: {fileID: 114143683117020968, guid: 628960e910f094ad1909ecc88cc8016d, - type: 2} - propertyPath: timeBetweenDecisionsAtInference - value: 0.15 - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 628960e910f094ad1909ecc88cc8016d, type: 2} m_IsPrefabParent: 0 diff --git a/UnitySDK/Assets/ML-Agents/Examples/Template/Scene.unity b/UnitySDK/Assets/ML-Agents/Examples/Template/Scene.unity old mode 100755 new mode 100644 index 81425d1d44..4e7fffba0b --- a/UnitySDK/Assets/ML-Agents/Examples/Template/Scene.unity +++ b/UnitySDK/Assets/ML-Agents/Examples/Template/Scene.unity @@ -77,15 +77,18 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -107,6 +110,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &762086410 GameObject: @@ -156,20 +161,6 @@ Light: m_Lightmapping: 4 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 - m_FalloffTable: - m_Table[0]: 0 - m_Table[1]: 0 - m_Table[2]: 0 - m_Table[3]: 0 - m_Table[4]: 0 - m_Table[5]: 0 - m_Table[6]: 0 - m_Table[7]: 0 - m_Table[8]: 0 - m_Table[9]: 0 - m_Table[10]: 0 - m_Table[11]: 0 - m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -187,65 +178,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &846768603 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 846768604} - - component: {fileID: 846768605} - m_Layer: 0 - m_Name: Brain - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &846768604 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 846768603} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1574236049} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &846768605 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 846768603} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c676a8ddf5a5f4f64b35e9ed5028679d, type: 3} - m_Name: - m_EditorClassIdentifier: - brainParameters: - stateSize: 12 - actionSize: 4 - memorySize: 0 - cameraResolutions: - - width: 80 - height: 80 - blackAndWhite: 1 - actionDescriptions: - - Up - - Down - - Left - - Right - actionSpaceType: 0 - stateSpaceType: 1 - brainType: 2 - CoreBrains: [] - CollectData: 0 - instanceID: 0 --- !u!1 &1223085755 GameObject: m_ObjectHideFlags: 0 @@ -273,19 +205,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 33bb739f1138d40798114d667776a1d6, type: 3} m_Name: m_EditorClassIdentifier: - brain: {fileID: 846768605} - observations: - - {fileID: 1715640924} - maxStep: 100 - resetOnDone: 1 - id: 0 - reward: 0 - done: 0 - value: 0 - CummulativeReward: 0 - stepCounter: 0 - agentStoredAction: [] - memory: [] + brain: {fileID: 0} + agentParameters: + agentCameras: [] + maxStep: 0 + resetOnDone: 1 + onDemandDecision: 0 + numberOfActionsBetweenDecisions: 1 --- !u!4 &1223085757 Transform: m_ObjectHideFlags: 0 @@ -326,9 +252,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9af83cd96d4bc4088a966af174446d1b, type: 3} m_Name: m_EditorClassIdentifier: + broadcastHub: + broadcastingBrains: [] + _brainsToControl: [] maxSteps: 0 - frameToSkip: 0 - waitTime: 0 trainingConfiguration: width: 80 height: 80 @@ -341,12 +268,8 @@ MonoBehaviour: qualityLevel: 1 timeScale: 1 targetFrameRate: 60 - defaultResetParameters: [] - episodeCount: 0 - done: 0 - currentStep: 0 - isInference: 0 - windowResize: 0 + resetParameters: + resetParameters: [] --- !u!4 &1574236049 Transform: m_ObjectHideFlags: 0 @@ -356,8 +279,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.71938086, y: 0.27357092, z: 4.1970553} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 846768604} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -432,11 +354,11 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &1715640925 Transform: m_ObjectHideFlags: 0