More misc hybrid action followup #4777
Merged
Conversation
This file contains hidden or 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
chriselion
commented
Dec 18, 2020
| @@ -89,7 +89,7 @@ public class Academy : IDisposable | |||
| /// </item> | |||
| /// <item> | |||
| /// <term>1.3.0</term> | |||
| /// <description>Support action spaces with both continuous and discrete actions.</description> | |||
There was a problem hiding this comment.
Continuing my war on space.
chriselion
commented
Dec 18, 2020
| @@ -19,9 +19,9 @@ namespace Unity.MLAgents | |||
| internal struct AgentInfo | |||
| { | |||
| /// <summary> | |||
| /// Keeps track of the last vector action taken by the Brain. | |||
There was a problem hiding this comment.
... and my war on "vector action"
chriselion
commented
Dec 18, 2020
| /// </summary> | ||
| public ActionBuffers storedVectorActions; |
There was a problem hiding this comment.
public field in an internal struct, so this is OK to rename.
chriselion
commented
Dec 18, 2020
| var brainParams = m_PolicyFactory.BrainParameters; | ||
| var actionSpec = brainParams.ActionSpec; | ||
| // For continuous and discrete actions together, we don't need to fall back to the legacy method | ||
| if (actionSpec.NumContinuousActions > 0 && actionSpec.NumDiscreteActions > 0) |
There was a problem hiding this comment.
Better to avoid any confusion here - don't call the float[] version if we're using continuous + discrete (plus avoid munging the arrays)
chriselion
commented
Dec 18, 2020
| @@ -1038,7 +1048,7 @@ void SendInfoToBrain() | |||
| CollectObservations(collectObservationsSensor); | |||
| } | |||
| } | |||
| using (TimerStack.Instance.Scoped("CollectDiscreteActionMasks")) | |||
| using (TimerStack.Instance.Scoped("WriteActionMask")) | |||
chriselion
commented
Dec 18, 2020
| // For continuous and discrete actions together, this shouldn't be called because we can only return one. | ||
| if (actionSpec.NumContinuousActions > 0 && actionSpec.NumDiscreteActions > 0) | ||
| { | ||
| Debug.LogWarning("Agent.GetAction() when both continuous and discrete actions are in use. Use Agent.GetStoredActionBuffers() instead."); |
There was a problem hiding this comment.
Not sure if we should throw or log here.
chriselion
commented
Dec 18, 2020
| @@ -64,6 +64,18 @@ public void TestEnsureBufferDiscrete() | |||
| Assert.IsTrue(7 == manager.StoredActions.DiscreteActions.Length); | |||
| } | |||
|
|
|||
| [Test] | |||
| public void TestAllowMixedActions() | |||
There was a problem hiding this comment.
A version of this (that checked for failure) was removed in the hybrid action PR. Adding it back to make sure we can do it.
andrewcoh
approved these changes
Dec 18, 2020
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)
Useful links (Github issues, JIRA tickets, ML-Agents forum threads etc.)
Types of change(s)
Checklist
Other comments