[MLA-488] Fix observations in demonstration drawer #3771
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
April 13, 2020 14:27
chriselion
changed the title
chriselion
requested review from
surfnerd and
vincentpierre
and removed request for
surfnerd
chriselion
commented
Apr 13, 2020
| /// </summary> | ||
| /// <param name="bpp">An instance of a brain parameters protobuf object.</param> | ||
| /// <returns>A BrainParameters struct.</returns> | ||
| public static BrainParameters ToBrainParameters(this BrainParametersProto bpp) |
There was a problem hiding this comment.
Just moved this closer to the BrainParameters -> BrainParametersProto conversion
chriselion
commented
Apr 13, 2020
| /// Used for imitation learning, or other forms of learning from data. | ||
| /// </summary> | ||
| [Serializable] | ||
| internal class Demonstration : ScriptableObject |
There was a problem hiding this comment.
Split this file into DemonstrationSummary.cs and DemonstrationMetaData.cs
|
Old inspector for comparison: |
vincentpierre
approved these changes
Apr 14, 2020
| [Serializable] | ||
| internal class DemonstrationSummary : ScriptableObject | ||
| { | ||
| public DemonstrationMetaData metaData; |
There was a problem hiding this comment.
Does the DemonstrationSummary need DemonstrationMetaData ? I thought the two were side by side anyway.
There was a problem hiding this comment.
The fields from the DemonstrationMetaData are displayed in the inspector. DemonstrationSummary is only used by the DemonstrationDrawer, it's not a full Demonstration (that's why I renamed it).
| @@ -4,7 +4,7 @@ ScriptedImporter: | |||
| fileIDToRecycleName: | |||
| 11400000: Assets/ML-Agents/Examples/Bouncer/Demos/ExpertBouncer.demo | |||
| externalObjects: {} | |||
| userData: ' (MLAgents.Demonstrations.Demonstration)' | |||
| userData: ' (MLAgents.Demonstrations.DemonstrationSummary)' | |||
There was a problem hiding this comment.
Does this mean that old demo files will be incompatible (nothing wrong with that, just making sure)
There was a problem hiding this comment.
No, shouldn't have any effect.
| userData = demonstration.ToString(); | ||
| var demonstrationSummary = ScriptableObject.CreateInstance<DemonstrationSummary>(); | ||
| demonstrationSummary.Initialize(brainParameters, metaData, observationSummaries); | ||
| userData = demonstrationSummary.ToString(); |
There was a problem hiding this comment.
Where is this variable used ?
There was a problem hiding this comment.
I'm not really sure about the purpose of it. It sets this field https://docs.unity3d.com/ScriptReference/AssetImporter-userData.html which explains the .meta file changes.
added 2 commits
April 14, 2020 10:46
mmattar
pushed a commit
that referenced
this pull request
Apr 15, 2020
commit 9600d0f Author: Marwan Mattar <marwan@unity3d.com> Date: Tue Apr 14 17:45:33 2020 -0700 Various doc improvements (#3775) * Various doc improvements For Using-Virtual-Environment.md: - Made a note regarding updating setuptools and pip. - Changed lists from "-" to "*" For Using-Tensorboard.md: - Changed the ordered list to use "1." For Training-on-Microsoft-Azure-Custom-Instance.md: - Deleted as it was not linked anywhere For FAQ.md - Removed stale issues given upgrade to 2018.3 For Readme.md - Added links for Reward Signals, Self-Play and Profiling Trainers For Learning-Environment-Executable.md - Changed the ordered list to use "1." For Learning-Environment-Examples.md - Minor rewording of intro paragraphs * consolidating custom instances page in main page So we have a single page for Azure. Adding warning note for deprecated docs * Fixing doc links that are failing CI commit 34db9c2 Author: Vincent-Pierre BERGES <vincentpierre@unity3d.com> Date: Tue Apr 14 14:06:16 2020 -0700 Removing dark mode from screenshots (#3772) commit 1e164cc Author: Chris Elion <chris.elion@unity3d.com> Date: Tue Apr 14 13:08:18 2020 -0700 [MLA-488] Fix observations in demonstration drawer (#3771) * WIP observation shapes * WIP observation shapes * fix Observation shape serialization * rename field, redo screenshot * docstring * changelog
mmattar
pushed a commit
that referenced
this pull request
Apr 15, 2020
* Improvements to Training-ML-Agents - Removed duplicate documentation - Moved CLI descriptions to learn.py - Reorganized "Training with mlagents-learn" into 5 sub-sections * fixed formatting errors and incorporated minor feedback * minor improvement * Minor formatting. * fixed run-id references * Keeping link to use Inference consistent with master Will update the UIE page in a separate PR. * Squashed commit of the following: commit 9600d0f Author: Marwan Mattar <marwan@unity3d.com> Date: Tue Apr 14 17:45:33 2020 -0700 Various doc improvements (#3775) * Various doc improvements For Using-Virtual-Environment.md: - Made a note regarding updating setuptools and pip. - Changed lists from "-" to "*" For Using-Tensorboard.md: - Changed the ordered list to use "1." For Training-on-Microsoft-Azure-Custom-Instance.md: - Deleted as it was not linked anywhere For FAQ.md - Removed stale issues given upgrade to 2018.3 For Readme.md - Added links for Reward Signals, Self-Play and Profiling Trainers For Learning-Environment-Executable.md - Changed the ordered list to use "1." For Learning-Environment-Examples.md - Minor rewording of intro paragraphs * consolidating custom instances page in main page So we have a single page for Azure. Adding warning note for deprecated docs * Fixing doc links that are failing CI commit 34db9c2 Author: Vincent-Pierre BERGES <vincentpierre@unity3d.com> Date: Tue Apr 14 14:06:16 2020 -0700 Removing dark mode from screenshots (#3772) commit 1e164cc Author: Chris Elion <chris.elion@unity3d.com> Date: Tue Apr 14 13:08:18 2020 -0700 [MLA-488] Fix observations in demonstration drawer (#3771) * WIP observation shapes * WIP observation shapes * fix Observation shape serialization * rename field, redo screenshot * docstring * changelog * Revert "Squashed commit of the following:" This reverts commit 819e8d5. * Removing debugging section. * Prettier formatting * Fixing Prettier oddity
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed change(s)
Fix a long-standing bug in the DemonstrationDrawer. It was never updated to handle the changes to Observations.
PushBlock demo, which has multiple 1-D sensors:
GridWorld demo, which has 1 multi-D sensor:
Useful links (Github issues, JIRA tickets, ML-Agents forum threads etc.)
https://jira.unity3d.com/browse/MLA-488
Types of change(s)
Checklist
Other comments