Skip to content

Commit fb24597

Browse files
miguelalonsojrmiguelalonsojr
authored
Develop sentis upgrade (#5979)
* Commiting changes. * Initial barracuda 4 upgrade. * Play mode tests passing. * Edit mode tests passing. * Training fixes. * Fixed performance issue with stacking sensor. * Fixed failing tests and issue with stacking sensor. * Updated examples for barracuda 4 upgrade. * Fixed issue with attention ONNX export w.r.t. dimensions. * Fixed issue with Buffer Sensor and Recurrent In/Out. * Retrained old policies and updated with ONNX policies. Deprecated old policy versions. * Saving work. * Saving work. * Updating to Sentis 1.1.1-exp.2 * Fixed more errors with Sentis upgrade. * Fixed tensor allocation issue in TensorUtils.ResizeTensor. Inference is working for 3DBall with Sentis. * Fixed broken Sentis model links for some example environments. * Fixed some broken edit mode tests. * Fixed some failing tests. * Fixing bugs with GPU inference on Sentis. * Updated packages lock and onnx meta files. * Refactoring all Barracuda related naming to Sentis. * Python max version bump. * Precommit fixes. * Pinned tensorboard version * Revert tensorboard version. * Fixed rpc tests. * Fixed failing python tests. * Fixed some more failing tests. Added six as an explicit dependency due to tensorboard requirements. * gha fix. * Updated environment registry for Sentis. * Fixed texture sensor test. * Develop python 3.10 (#5981) * Deprecated python 3.8.x and 3.9.x. * Updated colab gha test to 3.10.12 * Updated colabs for Sentis and python 3.10. * Test fix. * Minor update to colabs. * Develop torch 1.13.1 (#5982) * Bumped PyTorch version to 1.13.1 * Added potential fixes to model overrider TBD at a later date. * Updated changelog. * Updated protobufs. (#5983) * Updated training init tests to remove inference test temporarily. (#5984)
1 parent 8bcedab commit fb24597

File tree

262 files changed

+6843
-3047
lines changed

Some content is hidden

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

262 files changed

+6843
-3047
lines changed

‎.github/workflows/colab.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Set up Python
3232
uses: actions/setup-python@v2
3333
with:
34-
python-version: 3.9.x
34+
python-version: 3.10.12
3535
- uses: actions/setup-dotnet@v1
3636
with:
3737
dotnet-version: '6.0.x'

‎.github/workflows/nightly.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ jobs:
3737
# If one test in the matrix fails we still want to run the others.
3838
fail-fast: false
3939
matrix:
40-
python-version: [3.8.x, 3.9.x, 3.10.x]
40+
python-version: [3.10.x]
4141
include:
42-
- python-version: 3.8.x
43-
pip_constraints: test_constraints_min_version.txt
44-
- python-version: 3.9.x
45-
pip_constraints: test_constraints_mid_version.txt
4642
- python-version: 3.10.x
47-
pip_constraints: test_constraints_max_version.txt
43+
pip_constraints: test_constraints_version.txt
4844
steps:
4945
- uses: actions/checkout@v2
5046
- name: Set up Python

‎.github/workflows/pre-commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-python@v2
1818
with:
19-
python-version: 3.8.x
19+
python-version: 3.10.x
2020
- uses: actions/setup-ruby@v1
2121
env:
2222
ImageOS: ubuntu20

‎.github/workflows/publish_docs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
uses: actions/checkout@v2
1313
with:
1414
token: ${{ secrets.PUBLIC_GH_TOKEN }}
15-
- name: Setup Python 3.8
15+
- name: Setup Python 3.10
1616
uses: actions/setup-python@v2
1717
with:
18-
python-version: 3.8
18+
python-version: 3.10
1919
- name: Publish docs
2020
run: |
2121
pip install mkdocs

‎.github/workflows/publish_pypi.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@main
21-
- name: Set up Python 3.8
21+
- name: Set up Python 3.10
2222
uses: actions/setup-python@v2
2323
with:
24-
python-version: 3.8
24+
python-version: 3.10
2525
- name: Install dependencies
2626
run: pip install setuptools wheel twine --user
2727
- name: verify git tag vs. version

‎.github/workflows/publish_pypi_python_api.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@v2
21-
- name: Set up Python 3.8
21+
- name: Set up Python 3.10
2222
uses: actions/setup-python@v2
2323
with:
24-
python-version: 3.8
24+
python-version: 3.10
2525
- name: Install dependencies
2626
run: pip install setuptools wheel twine --user
2727
- name: verify git tag vs. version

‎.github/workflows/pytest.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ jobs:
3737
# If one test in the matrix fails we still want to run the others.
3838
fail-fast: false
3939
matrix:
40-
python-version: [3.8.x, 3.9.x, 3.10.x]
40+
python-version: [3.10.12]
4141
include:
42-
- python-version: 3.8.x
43-
pip_constraints: test_constraints_min_version.txt
44-
- python-version: 3.9.x
45-
pip_constraints: test_constraints_mid_version.txt
46-
- python-version: 3.10.x
47-
pip_constraints: test_constraints_max_version.txt
42+
- python-version: 3.10.12
43+
pip_constraints: test_constraints_version.txt
4844
steps:
4945
- uses: actions/checkout@v2
5046
- name: Set up Python

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,4 @@ repos:
135135
language: python
136136
entry: ./utils/generate_markdown_docs.py --package_dirs ml-agents-envs ml-agents
137137
pass_filenames: false
138-
additional_dependencies: [pyyaml, pydoc-markdown==3.10.1]
138+
additional_dependencies: [pyyaml==5.3, pydoc-markdown==3.10.1]

‎.yamato/com.unity.ml-agents-coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test_coverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
1515
- npm install [email protected] -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1616
- upm-ci project test -u {{ editor.version }} --type project-tests --project-path {{ editor.testProject }} --package-filter {{ package.name }} {{ coverageOptions }} --extra-utr-arg "reruncount=2"
1717
- |
18-
conda activate python3.8
18+
conda activate python3.10
1919
python3 ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ package.minCoveragePct }}
2020
artifacts:
2121
logs:

‎.yamato/com.unity.ml-agents-pack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pack:
77
commands:
88
- |
99
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
10-
conda activate python3.8
10+
conda activate python3.10
1111
python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
1212
unity-downloader-cli -u 2022.3 -c editor --wait --fast
1313
./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -

‎.yamato/com.unity.ml-agents-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ test_{{ package.name }}_{{ platform.name }}_trunk:
126126
commands:
127127
- |
128128
{% if platform.name == "linux" %}
129-
conda activate python3.8
129+
conda activate python3.10
130130
{% endif %}
131131
python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
132132
unity-downloader-cli -u trunk -c editor --wait --fast

‎.yamato/compressed-sensor-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_compressed_obs_{{ editor.version }}:
1212
commands:
1313
- |
1414
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
15-
conda activate python3.8
15+
conda activate python3.10
1616
python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1717
python -u -m ml-agents.tests.yamato.setup_venv
1818
python ml-agents/tests/yamato/scripts/run_compressed_sensor.py --env=artifacts/testPlayer-TestGridCompressed

‎.yamato/gym-interface-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_gym_interface_{{ editor.version }}:
1212
commands:
1313
- |
1414
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
15-
conda activate python3.8
15+
conda activate python3.10
1616
python -m pip install wheel --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1717
python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1818
python -u -m ml-agents.tests.yamato.setup_venv

‎.yamato/protobuf-generation-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ test_linux_protobuf_generation:
1111
- |
1212
sudo apt-get update && sudo apt-get install -y nuget
1313
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
14-
conda activate python3.8
14+
conda activate python3.10
1515
nuget install Grpc.Tools -Version $GRPC_VERSION -OutputDirectory protobuf-definitions/
1616
python3 -m pip install --upgrade pip --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
17-
python3 -m pip install grpcio==1.28.1 grpcio-tools==1.13.0 protobuf==3.11.3 six==1.14.0 mypy-protobuf==1.16.0 --progress-bar=off --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
17+
python3 -m pip install grpcio==1.48.2 grpcio-tools==1.48.2 protobuf==3.19.6 six==1.16.0 mypy-protobuf==1.16.0 --progress-bar=off --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1818
pushd protobuf-definitions
1919
chmod +x Grpc.Tools.$GRPC_VERSION/tools/linux_x64/protoc
2020
chmod +x Grpc.Tools.$GRPC_VERSION/tools/linux_x64/grpc_csharp_plugin

‎.yamato/pytest-gpu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pytest_gpu:
77
commands:
88
- |
99
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
10-
conda activate python3.8
10+
conda activate python3.10
1111
python3 -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1212
python3 -u -m ml-agents.tests.yamato.setup_venv
1313
python3 -m pip install --progress-bar=off -r test_requirements.txt --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple

‎.yamato/python-ll-api-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_linux_ll_api_{{ editor.version }}:
1212
commands:
1313
- |
1414
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
15-
conda activate python3.8
15+
conda activate python3.10
1616
python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1717
python -u -m ml-agents.tests.yamato.setup_venv
1818
python ml-agents/tests/yamato/scripts/run_llapi.py

‎.yamato/standalone-build-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_linux_standalone_{{ editor.version }}:
1212
commands:
1313
- |
1414
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
15-
conda activate python3.8
15+
conda activate python3.10
1616
python3 -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1717
python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
1818
unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast

‎.yamato/standalone-build-webgl-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test_webgl_standalone_{{ editor_version }}:
1010
commands:
1111
- |
1212
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
13-
conda activate python3.8
13+
conda activate python3.10
1414
python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1515
python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
1616
unity-downloader-cli -u {{ editor_version }} -c editor -c WebGL --wait --fast

‎.yamato/training-int-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_linux_training_int_{{ editor.version }}:
1212
commands:
1313
- |
1414
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
15-
conda activate python3.8
15+
conda activate python3.10
1616
python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1717
python -u -m ml-agents.tests.yamato.training_int_tests
1818
dependencies:

‎DevProject/Assets/ML-Agents/Scripts/Tests/Editor/Editor.asmdef

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"references": [
44
"Unity.ML-Agents.Editor",
55
"Unity.ML-Agents",
6-
"Unity.Barracuda",
6+
"Unity.Sentis",
77
"Unity.ML-Agents.CommunicatorObjects",
88
"Unity.PerformanceTesting"
99
],

‎DevProject/Packages/packages-lock.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@
99
},
1010
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
1111
},
12-
"com.unity.barracuda": {
13-
"version": "3.0.0",
14-
"depth": 1,
15-
"source": "registry",
16-
"dependencies": {
17-
"com.unity.burst": "1.6.0",
18-
"com.unity.modules.jsonserialize": "1.0.0",
19-
"com.unity.modules.imageconversion": "1.0.0"
20-
},
21-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
22-
},
2312
"com.unity.burst": {
2413
"version": "1.8.7",
2514
"depth": 2,
@@ -66,7 +55,7 @@
6655
"depth": 0,
6756
"source": "local",
6857
"dependencies": {
69-
"com.unity.barracuda": "3.0.0",
58+
"com.unity.sentis": "1.2.0-exp.2",
7059
"com.unity.modules.imageconversion": "1.0.0",
7160
"com.unity.modules.jsonserialize": "1.0.0",
7261
"com.unity.modules.physics": "1.0.0"
@@ -115,6 +104,17 @@
115104
},
116105
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
117106
},
107+
"com.unity.sentis": {
108+
"version": "1.2.0-exp.2",
109+
"depth": 1,
110+
"source": "registry",
111+
"dependencies": {
112+
"com.unity.burst": "1.8.4",
113+
"com.unity.modules.jsonserialize": "1.0.0",
114+
"com.unity.modules.imageconversion": "1.0.0"
115+
},
116+
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
117+
},
118118
"com.unity.settings-manager": {
119119
"version": "2.0.1",
120120
"depth": 1,

‎DevProject/ProjectSettings/EditorBuildSettings.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ EditorBuildSettings:
99
path: Assets/ML-Agents/Scripts/Tests/Runtime/AcademyTest/AcademyStepperTestScene.unity
1010
guid: 9bafc50b1e55b43b2b1ae9620f1f8311
1111
m_configObjects:
12-
com.unity.ml-agents.settings: {fileID: 11400000, guid: b412e5eb0b23f4bca86655ada9a633d4,
12+
com.unity.ml-agents.settings: {fileID: 11400000, guid: e4ad406c716274fdfb58baafffa12dcd,
1313
type: 2}

‎Project/Assets/ML-Agents/Editor/DisableBurstFromMenu.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#if UNITY_CLOUD_BUILD
22
using UnityEditor;
33

4+
// TODO do we still need this?
5+
46
public class DisableBurstFromMenu
57
{
68
/// This method is needed to disable Burst compilation on windows for our cloudbuild tests.

0 commit comments

Comments
 (0)