Skip to content

Merge master into hybrid actions staging branch #4704

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 38 commits into from
Dec 3, 2020
Merged

Merge master into hybrid actions staging branch #4704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b2f58ba
Add Graphics to the Match3 env (#4627)
Hunter-Unity Nov 10, 2020
96b7016
add match3 to changelog (#4635)
Nov 10, 2020
1c4f1e1
Updating the CHANGELOG on master before release 10 (#4636)
vincentpierre Nov 10, 2020
220f6da
Update CONTRIBUTING.md (#4602)
shihzy Nov 11, 2020
6ff6575
Updated training.md to include note about CLI arguments in the YAML f…
shihzy Nov 12, 2020
44cd820
Bumping versions on master for release_10 (#4642)
vincentpierre Nov 12, 2020
4feccd2
Changing the versions for the release_10 (#4643)
vincentpierre Nov 12, 2020
bf712fe
Release 10 match3 doc (#4647)
shihzy Nov 13, 2020
ceb90ca
Adding a missing doc on the ObservationWriterExtensions (#4648)
vincentpierre Nov 13, 2020
1ee83d8
use int64 steps, check for NaN actions (#4607)
Nov 13, 2020
5203cd0
Update Readme table and loose link to master (#4652)
vincentpierre Nov 13, 2020
2753bc5
use int64 steps, check for NaN actions (#4607) (#4654)
Nov 16, 2020
d4e0dae
[bug-fix] Add clipping to PyTorch policy, fix initialization (#4649)
Nov 17, 2020
728a721
:us: fix spelling :us: (#4663)
Nov 17, 2020
6895bf1
minor match-3 doc updates (#4653)
Nov 17, 2020
7349bcf
[bug-fix] Separate critic only for PPO (#4661)
Nov 18, 2020
60ae629
[bug-fix] Add clipping to PyTorch policy, fix initialization (#4649) …
Nov 18, 2020
3e48be4
Add global lock for torch.onnx.export() (#4659)
Nov 18, 2020
4e5b5b7
Add global lock for torch.onnx.export() (#4665)
Nov 18, 2020
b0ac32e
Cherry-pick separate critic only for PPO (#4661) (#4666)
Nov 18, 2020
3a9a200
[bug-fix] Fix BC module + action clipping (#4667)
Nov 18, 2020
06cdf39
Cherry-pick BC fixes to Release 10 (#4668)
Nov 18, 2020
993f822
[bug-fix] Fix issue where NaNs are outputted by the policy when train…
Nov 18, 2020
d2bd688
Cherry-pick NaN fix for Match 3 (#4664)
Nov 18, 2020
da699f4
skip code coverage on trunk temporarily (#4673)
Nov 19, 2020
1395ab2
[Bug-fix] Remove extra directory created at checkpoint (#4675)
vincentpierre Nov 19, 2020
6f0da1d
[bug-fix] Remove extra period (#4674)
Nov 20, 2020
ec850ae
[bug-fix] Disable threading for self-play envs (#4679)
Nov 20, 2020
21226ff
[Bug-fix] Remove extra directory created at checkpoint (#4675) (#4678)
vincentpierre Nov 20, 2020
058fc2f
[bug-fix] Disable threading for self-play envs (#4679) (#4681)
Nov 20, 2020
da1de79
[bug-fix] Cherry-pick remove extra period to Release 10 (#4680)
Nov 20, 2020
35ec3df
Merging master into release_10_tmp before merge release_10_tmp into m…
vincentpierre Nov 20, 2020
b8c387a
Update com.unity.ml-agents/CHANGELOG.md
vincentpierre Nov 20, 2020
c73616c
Merge pull request #4682 from Unity-Technologies/r10-to-master
vincentpierre Nov 20, 2020
21a761a
Add link to curriculum docs in learning environment design (#4687)
andrewcoh Nov 30, 2020
b5151fa
Fix heuristic example and some crefs (#4690)
Nov 30, 2020
3c07161
pin pip to 20.2 for now (#4694)
Nov 30, 2020
6d4b356
Merge branch 'master' into develop-staging-merge-master
andrewcoh Dec 3, 2020
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
3 changes: 2 additions & 1 deletion .yamato/com.unity.ml-agents-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ test_editors:

trunk_editor:
- version: trunk
enableCodeCoverage: !!bool true
# Workaround for MLA-1596 - need to make sure we load the right results.
enableCodeCoverage: !!bool false
testProject: DevProject

test_platforms:
Expand Down
8 changes: 8 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX.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 added Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/3.fbx
View file
Open in desktop
Binary file not shown.
97 changes: 97 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/3.fbx.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 added Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/Match.fbx
View file
Open in desktop
Binary file not shown.
97 changes: 97 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/FBX/Match.fbx.meta
View file
Open in desktop

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

10 changes: 8 additions & 2 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Match3Heuristic.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ MonoBehaviour:
Board: {fileID: 0}
MoveTime: 0.25
MaxMoves: 500
UseSmartHeuristic: 1
HeuristicQuality: 0
--- !u!114 &3508723250470608011
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -94,7 +94,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: abebb7ad4a5547d7a3b04373784ff195, type: 3}
m_Name:
m_EditorClassIdentifier:
DebugEdgeIndex: -1
DebugMoveIndex: -1
CubeSpacing: 1.25
Board: {fileID: 0}
TilePrefab: {fileID: 4007900521885639951, guid: faee4e805953b49e688bd00b45c55f2e,
type: 3}
--- !u!114 &3508723250470608009
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -127,6 +131,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 08e4b0da54cb4d56bfcbae22dd49ab8d, type: 3}
m_Name:
m_EditorClassIdentifier:
ActuatorName: Match3 Actuator
ForceHeuristic: 1
--- !u!114 &3508723250470608014
MonoBehaviour:
Expand All @@ -140,6 +145,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 530d2f105aa145bd8a00e021bdd925fd, type: 3}
m_Name:
m_EditorClassIdentifier:
SensorName: Match3 Sensor
ObservationType: 0
--- !u!1 &3508723250774301855
GameObject:
Expand Down
14 changes: 12 additions & 2 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Match3VectorObs.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ MonoBehaviour:
Board: {fileID: 0}
MoveTime: 0.25
MaxMoves: 500
HeuristicQuality: 0
--- !u!114 &2118285884327540685
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -124,7 +125,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: abebb7ad4a5547d7a3b04373784ff195, type: 3}
m_Name:
m_EditorClassIdentifier:
DebugEdgeIndex: -1
DebugMoveIndex: -1
CubeSpacing: 1.25
Board: {fileID: 0}
TilePrefab: {fileID: 4007900521885639951, guid: faee4e805953b49e688bd00b45c55f2e,
type: 3}
--- !u!114 &2118285884327540687
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -142,6 +147,9 @@ MonoBehaviour:
NumCellTypes: 6
NumSpecialTypes: 2
RandomSeed: -1
BasicCellPoints: 1
SpecialCell1Points: 2
SpecialCell2Points: 3
--- !u!114 &2118285884327540683
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -154,7 +162,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 08e4b0da54cb4d56bfcbae22dd49ab8d, type: 3}
m_Name:
m_EditorClassIdentifier:
ForceRandom: 0
ActuatorName: Match3 Actuator
ForceHeuristic: 0
--- !u!114 &2118285884327540680
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -167,4 +176,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 530d2f105aa145bd8a00e021bdd925fd, type: 3}
m_Name:
m_EditorClassIdentifier:
SensorName: Match3 Sensor
ObservationType: 0
14 changes: 12 additions & 2 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Match3VisualObs.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ MonoBehaviour:
Board: {fileID: 0}
MoveTime: 0.25
MaxMoves: 500
HeuristicQuality: 0
--- !u!114 &3019509692332007778
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -124,7 +125,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: abebb7ad4a5547d7a3b04373784ff195, type: 3}
m_Name:
m_EditorClassIdentifier:
DebugEdgeIndex: -1
DebugMoveIndex: -1
CubeSpacing: 1.25
Board: {fileID: 0}
TilePrefab: {fileID: 4007900521885639951, guid: faee4e805953b49e688bd00b45c55f2e,
type: 3}
--- !u!114 &3019509692332007776
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -142,6 +147,9 @@ MonoBehaviour:
NumCellTypes: 6
NumSpecialTypes: 2
RandomSeed: -1
BasicCellPoints: 1
SpecialCell1Points: 2
SpecialCell2Points: 3
--- !u!114 &3019509692332007780
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -154,7 +162,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 08e4b0da54cb4d56bfcbae22dd49ab8d, type: 3}
m_Name:
m_EditorClassIdentifier:
ForceRandom: 0
ActuatorName: Match3 Actuator
ForceHeuristic: 0
--- !u!114 &3019509692332007783
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -167,4 +176,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 530d2f105aa145bd8a00e021bdd925fd, type: 3}
m_Name:
m_EditorClassIdentifier:
SensorName: Match3 Sensor
ObservationType: 2
8 changes: 8 additions & 0 deletions Project/Assets/ML-Agents/Examples/Match3/Prefabs/Tiles.meta
View file
Open in desktop

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

Loading