Skip to content

Commit 2b50f60

Browse files
Develop upgrade Sentis 2.0.0 (#6137)
* Upgraded to Sentis v1.4.0-pre.3 * Disabling sonar qube yamato job. Will add gha sonar scanner at a later date. * Addressing PR comments. * Addressing feedback. * Upgraded to sentis 2.0.0. * Fixed failing tests. * Fixed soccertwos policy. * Fixed pytorch deprecation message during training startup. Updated Installation.md * Updated installation docs. * Fixed failing torch utils test.
1 parent a66ffbf commit 2b50f60

File tree

81 files changed

+2591
-1259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2591
-1259
lines changed

.yamato/sonar-python-package.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
csharp:
2-
name: Sonarqube Scan for ml-agents python repo
3-
agent:
4-
type: Unity::metal::macmini
5-
image: package-ci/mac:v1.8.1-822785
6-
flavor: m1.mac
7-
variables:
8-
SONARQUBE_PROJECT_KEY: ai-ml-agents-toolkit
9-
TARGET_BRANCH: develop
10-
commands:
11-
- npm install shellcheck --save-dev
12-
- npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm
13-
- curl https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747-macosx.zip -o sonar-scanner-cli-macosx.zip -L
14-
- unzip sonar-scanner-cli-macosx.zip -d ~/sonar-scanner-cli
15-
- ~/sonar-scanner-cli/sonar-scanner-4.7.0.2747-macosx/bin/sonar-scanner -Dsonar.projectKey=$SONARQUBE_PROJECT_KEY -Dsonar.sources=ml-agents-env -Dsonar.sources=ml-agents -Dsonar.sources=ml-agents-plugin-examples -Dsonar.sources=ml-agents-trainer-plugin -Dsonar.sources=utils -Dsonar.host.url=$SONARQUBE_URL -Dsonar.login=$SONARQUBE_TOKEN -Dsonar.branch.name=$TARGET_BRANCH -Dsonar.scm.provider=git
16-
triggers:
17-
cancel_old_ci: true
18-
expression: |
19-
((pull_request.target eq "main" OR pull_request.target eq "develop" OR pull_request.target match "release.+")
20-
AND NOT pull_request.push.changes.all match "**/*.md") OR
21-
(push.branch eq "main" OR push.branch eq "develop")
1+
#csharp:
2+
# name: Sonarqube Scan for ml-agents python repo
3+
# agent:
4+
# type: Unity::metal::macmini
5+
# image: package-ci/mac:v1.8.1-822785
6+
# flavor: m1.mac
7+
# variables:
8+
# SONARQUBE_PROJECT_KEY: ai-ml-agents-toolkit
9+
# TARGET_BRANCH: develop
10+
# commands:
11+
# - npm install shellcheck --save-dev
12+
# - npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm
13+
# - curl https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747-macosx.zip -o sonar-scanner-cli-macosx.zip -L
14+
# - unzip sonar-scanner-cli-macosx.zip -d ~/sonar-scanner-cli
15+
# - ~/sonar-scanner-cli/sonar-scanner-4.7.0.2747-macosx/bin/sonar-scanner -Dsonar.projectKey=$SONARQUBE_PROJECT_KEY -Dsonar.sources=ml-agents-env -Dsonar.sources=ml-agents -Dsonar.sources=ml-agents-plugin-examples -Dsonar.sources=ml-agents-trainer-plugin -Dsonar.sources=utils -Dsonar.host.url=$SONARQUBE_URL -Dsonar.login=$SONARQUBE_TOKEN -Dsonar.branch.name=$TARGET_BRANCH -Dsonar.scm.provider=git
16+
# triggers:
17+
# cancel_old_ci: true
18+
# expression: |
19+
# ((pull_request.target eq "main" OR pull_request.target eq "develop" OR pull_request.target match "release.+")
20+
# AND NOT pull_request.push.changes.all match "**/*.md") OR
21+
# (push.branch eq "main" OR push.branch eq "develop")

Project/Assets/ML-Agents/Examples/3DBall/Prefabs/3DBall.prefab

Lines changed: 61 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ Transform:
2727
m_PrefabInstance: {fileID: 0}
2828
m_PrefabAsset: {fileID: 0}
2929
m_GameObject: {fileID: 1036225416237908}
30+
serializedVersion: 2
3031
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
3132
m_LocalPosition: {x: 0, y: 4.31, z: 0}
3233
m_LocalScale: {x: 1, y: 1, z: 1}
3334
m_ConstrainProportionsScale: 0
3435
m_Children: []
3536
m_Father: {fileID: 4679453577574622}
36-
m_RootOrder: 0
3737
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3838
--- !u!33 &33399516572863624
3939
MeshFilter:
@@ -51,9 +51,17 @@ SphereCollider:
5151
m_PrefabAsset: {fileID: 0}
5252
m_GameObject: {fileID: 1036225416237908}
5353
m_Material: {fileID: 13400000, guid: 56162663048874fd4b10e065f9cf78b7, type: 2}
54+
m_IncludeLayers:
55+
serializedVersion: 2
56+
m_Bits: 0
57+
m_ExcludeLayers:
58+
serializedVersion: 2
59+
m_Bits: 0
60+
m_LayerOverridePriority: 0
5461
m_IsTrigger: 0
62+
m_ProvidesContacts: 0
5563
m_Enabled: 1
56-
serializedVersion: 2
64+
serializedVersion: 3
5765
m_Radius: 0.5
5866
m_Center: {x: 0, y: 0, z: 0}
5967
--- !u!23 &23610325484096200
@@ -73,6 +81,8 @@ MeshRenderer:
7381
m_ReflectionProbeUsage: 1
7482
m_RayTracingMode: 2
7583
m_RayTraceProcedural: 0
84+
m_RayTracingAccelStructBuildFlagsOverride: 0
85+
m_RayTracingAccelStructBuildFlags: 1
7686
m_RenderingLayerMask: 1
7787
m_RendererPriority: 0
7888
m_Materials:
@@ -105,10 +115,21 @@ Rigidbody:
105115
m_PrefabInstance: {fileID: 0}
106116
m_PrefabAsset: {fileID: 0}
107117
m_GameObject: {fileID: 1036225416237908}
108-
serializedVersion: 2
118+
serializedVersion: 4
109119
m_Mass: 1
110120
m_Drag: 0
111121
m_AngularDrag: 0.01
122+
m_CenterOfMass: {x: 0, y: 0, z: 0}
123+
m_InertiaTensor: {x: 1, y: 1, z: 1}
124+
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
125+
m_IncludeLayers:
126+
serializedVersion: 2
127+
m_Bits: 0
128+
m_ExcludeLayers:
129+
serializedVersion: 2
130+
m_Bits: 0
131+
m_ImplicitCom: 1
132+
m_ImplicitTensor: 1
112133
m_UseGravity: 1
113134
m_IsKinematic: 0
114135
m_Interpolate: 0
@@ -139,13 +160,13 @@ Transform:
139160
m_PrefabInstance: {fileID: 0}
140161
m_PrefabAsset: {fileID: 0}
141162
m_GameObject: {fileID: 1218265376493012}
163+
serializedVersion: 2
142164
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
143165
m_LocalPosition: {x: 0.29999995, y: 0.07399994, z: 0.50040054}
144166
m_LocalScale: {x: 0.29457998, y: 0.29457998, z: 0.29457998}
145167
m_ConstrainProportionsScale: 0
146168
m_Children: []
147169
m_Father: {fileID: 4294419716796784}
148-
m_RootOrder: 1
149170
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
150171
--- !u!33 &33986757750372936
151172
MeshFilter:
@@ -172,6 +193,8 @@ MeshRenderer:
172193
m_ReflectionProbeUsage: 1
173194
m_RayTracingMode: 2
174195
m_RayTraceProcedural: 0
196+
m_RayTracingAccelStructBuildFlagsOverride: 0
197+
m_RayTracingAccelStructBuildFlags: 1
175198
m_RenderingLayerMask: 1
176199
m_RendererPriority: 0
177200
m_Materials:
@@ -220,6 +243,7 @@ Transform:
220243
m_PrefabInstance: {fileID: 0}
221244
m_PrefabAsset: {fileID: 0}
222245
m_GameObject: {fileID: 1321468028730240}
246+
serializedVersion: 2
223247
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
224248
m_LocalPosition: {x: 0, y: 0, z: 5}
225249
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -228,7 +252,6 @@ Transform:
228252
- {fileID: 4259352808153402}
229253
- {fileID: 4780098186595842}
230254
m_Father: {fileID: 0}
231-
m_RootOrder: 0
232255
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
233256
--- !u!1 &1424713891854676
234257
GameObject:
@@ -258,14 +281,14 @@ Transform:
258281
m_PrefabInstance: {fileID: 0}
259282
m_PrefabAsset: {fileID: 0}
260283
m_GameObject: {fileID: 1424713891854676}
284+
serializedVersion: 2
261285
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
262286
m_LocalPosition: {x: 0, y: 0, z: 0}
263287
m_LocalScale: {x: 5, y: 5, z: 5}
264288
m_ConstrainProportionsScale: 0
265289
m_Children:
266290
- {fileID: 4294419716796784}
267291
m_Father: {fileID: 4679453577574622}
268-
m_RootOrder: 1
269292
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
270293
--- !u!65 &65010516625723872
271294
BoxCollider:
@@ -275,9 +298,17 @@ BoxCollider:
275298
m_PrefabAsset: {fileID: 0}
276299
m_GameObject: {fileID: 1424713891854676}
277300
m_Material: {fileID: 0}
301+
m_IncludeLayers:
302+
serializedVersion: 2
303+
m_Bits: 0
304+
m_ExcludeLayers:
305+
serializedVersion: 2
306+
m_Bits: 0
307+
m_LayerOverridePriority: 0
278308
m_IsTrigger: 0
309+
m_ProvidesContacts: 0
279310
m_Enabled: 1
280-
serializedVersion: 2
311+
serializedVersion: 3
281312
m_Size: {x: 1, y: 1, z: 1}
282313
m_Center: {x: 0, y: 0, z: 0}
283314
--- !u!114 &114368073295828880
@@ -342,6 +373,7 @@ MonoBehaviour:
342373
m_Name:
343374
m_EditorClassIdentifier:
344375
DecisionPeriod: 5
376+
DecisionStep: 0
345377
TakeActionsBetweenDecisions: 1
346378
--- !u!114 &1758424554059689351
347379
MonoBehaviour:
@@ -380,13 +412,13 @@ Transform:
380412
m_PrefabInstance: {fileID: 0}
381413
m_PrefabAsset: {fileID: 0}
382414
m_GameObject: {fileID: 1533320402322554}
415+
serializedVersion: 2
383416
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
384417
m_LocalPosition: {x: 0, y: 0, z: 0.15}
385418
m_LocalScale: {x: 1, y: 1, z: 1}
386419
m_ConstrainProportionsScale: 0
387420
m_Children: []
388421
m_Father: {fileID: 4294419716796784}
389-
m_RootOrder: 0
390422
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
391423
--- !u!20 &20793118999710892
392424
Camera:
@@ -402,9 +434,17 @@ Camera:
402434
m_projectionMatrixMode: 1
403435
m_GateFitMode: 2
404436
m_FOVAxisMode: 0
437+
m_Iso: 200
438+
m_ShutterSpeed: 0.005
439+
m_Aperture: 16
440+
m_FocusDistance: 10
441+
m_FocalLength: 50
442+
m_BladeCount: 5
443+
m_Curvature: {x: 2, y: 11}
444+
m_BarrelClipping: 0.25
445+
m_Anamorphism: 0
405446
m_SensorSize: {x: 36, y: 24}
406447
m_LensShift: {x: 0, y: 0}
407-
m_FocalLength: 50
408448
m_NormalizedViewPortRect:
409449
serializedVersion: 2
410450
x: 0
@@ -456,13 +496,13 @@ Transform:
456496
m_PrefabInstance: {fileID: 0}
457497
m_PrefabAsset: {fileID: 0}
458498
m_GameObject: {fileID: 1619100162539582}
499+
serializedVersion: 2
459500
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
460501
m_LocalPosition: {x: 0, y: -0.18299997, z: 0.50040054}
461502
m_LocalScale: {x: 0.27602, y: 0.042489994, z: 0.13891}
462503
m_ConstrainProportionsScale: 0
463504
m_Children: []
464505
m_Father: {fileID: 4294419716796784}
465-
m_RootOrder: 3
466506
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
467507
--- !u!33 &33259119028337980
468508
MeshFilter:
@@ -489,6 +529,8 @@ MeshRenderer:
489529
m_ReflectionProbeUsage: 1
490530
m_RayTracingMode: 2
491531
m_RayTraceProcedural: 0
532+
m_RayTracingAccelStructBuildFlagsOverride: 0
533+
m_RayTracingAccelStructBuildFlags: 1
492534
m_RenderingLayerMask: 1
493535
m_RendererPriority: 0
494536
m_Materials:
@@ -539,13 +581,13 @@ Transform:
539581
m_PrefabInstance: {fileID: 0}
540582
m_PrefabAsset: {fileID: 0}
541583
m_GameObject: {fileID: 1854695166504686}
584+
serializedVersion: 2
542585
m_LocalRotation: {x: -0, y: -0, z: 0.016506119, w: 0.9998638}
543586
m_LocalPosition: {x: 0, y: 0.341, z: 0}
544587
m_LocalScale: {x: 1.0441425, y: 0.19278127, z: 1.0441422}
545588
m_ConstrainProportionsScale: 0
546589
m_Children: []
547590
m_Father: {fileID: 4294419716796784}
548-
m_RootOrder: 4
549591
m_LocalEulerAnglesHint: {x: 0, y: -179.99998, z: 1.8920001}
550592
--- !u!33 &33165976320323760
551593
MeshFilter:
@@ -572,6 +614,8 @@ MeshRenderer:
572614
m_ReflectionProbeUsage: 1
573615
m_RayTracingMode: 2
574616
m_RayTraceProcedural: 0
617+
m_RayTracingAccelStructBuildFlagsOverride: 0
618+
m_RayTracingAccelStructBuildFlags: 1
575619
m_RenderingLayerMask: 1
576620
m_RendererPriority: 0
577621
m_Materials:
@@ -622,6 +666,7 @@ Transform:
622666
m_PrefabInstance: {fileID: 0}
623667
m_PrefabAsset: {fileID: 0}
624668
m_GameObject: {fileID: 1859240399150782}
669+
serializedVersion: 2
625670
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
626671
m_LocalPosition: {x: 0, y: 0, z: 0}
627672
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -633,7 +678,6 @@ Transform:
633678
- {fileID: 4425897039098228}
634679
- {fileID: 4300192163442926}
635680
m_Father: {fileID: 4780098186595842}
636-
m_RootOrder: 0
637681
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
638682
--- !u!33 &33973749152356522
639683
MeshFilter:
@@ -660,6 +704,8 @@ MeshRenderer:
660704
m_ReflectionProbeUsage: 1
661705
m_RayTracingMode: 2
662706
m_RayTraceProcedural: 0
707+
m_RayTracingAccelStructBuildFlagsOverride: 0
708+
m_RayTracingAccelStructBuildFlags: 1
663709
m_RenderingLayerMask: 1
664710
m_RendererPriority: 0
665711
m_Materials:
@@ -710,13 +756,13 @@ Transform:
710756
m_PrefabInstance: {fileID: 0}
711757
m_PrefabAsset: {fileID: 0}
712758
m_GameObject: {fileID: 1999020414315134}
759+
serializedVersion: 2
713760
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
714761
m_LocalPosition: {x: -0.29999995, y: 0.07399994, z: 0.50040054}
715762
m_LocalScale: {x: 0.29457998, y: 0.29457998, z: 0.29457998}
716763
m_ConstrainProportionsScale: 0
717764
m_Children: []
718765
m_Father: {fileID: 4294419716796784}
719-
m_RootOrder: 2
720766
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
721767
--- !u!33 &33069174244444078
722768
MeshFilter:
@@ -743,6 +789,8 @@ MeshRenderer:
743789
m_ReflectionProbeUsage: 1
744790
m_RayTracingMode: 2
745791
m_RayTraceProcedural: 0
792+
m_RayTracingAccelStructBuildFlagsOverride: 0
793+
m_RayTracingAccelStructBuildFlags: 1
746794
m_RenderingLayerMask: 1
747795
m_RendererPriority: 0
748796
m_Materials:

0 commit comments

Comments
 (0)