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)
Unity-Technologies · Oct 5, 2023 · fb24597 · fb24597
1 parent 8bcedab
commit fb24597
Show file tree

Hide file tree

Showing 262 changed files with 6,843 additions and 3,047 deletions.
diff --git a/.github/workflows/colab.yml b/.github/workflows/colab.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9.x
+        python-version: 3.10.12
     - uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '6.0.x'

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -37,14 +37,10 @@ jobs:
       # If one test in the matrix fails we still want to run the others.
       fail-fast: false
       matrix:
-        python-version: [3.8.x, 3.9.x, 3.10.x]
+        python-version: [3.10.x]
         include:
-          - python-version: 3.8.x
-            pip_constraints: test_constraints_min_version.txt
-          - python-version: 3.9.x
-            pip_constraints: test_constraints_mid_version.txt
           - python-version: 3.10.x
-            pip_constraints: test_constraints_max_version.txt
+            pip_constraints: test_constraints_version.txt
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.8.x
+        python-version: 3.10.x
     - uses: actions/setup-ruby@v1
       env:
         ImageOS: ubuntu20

diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml
@@ -12,10 +12,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           token: ${{ secrets.PUBLIC_GH_TOKEN }}
-      - name: Setup Python 3.8
+      - name: Setup Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.10
       - name: Publish docs
         run: |
           pip install mkdocs

diff --git a/.github/workflows/publish_pypi.yaml b/.github/workflows/publish_pypi.yaml
@@ -18,10 +18,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@main
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.10
     - name: Install dependencies
       run: pip install setuptools wheel twine --user
     - name: verify git tag vs. version

diff --git a/.github/workflows/publish_pypi_python_api.yaml b/.github/workflows/publish_pypi_python_api.yaml
@@ -18,10 +18,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.10
     - name: Install dependencies
       run: pip install setuptools wheel twine --user
     - name: verify git tag vs. version

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -37,14 +37,10 @@ jobs:
       # If one test in the matrix fails we still want to run the others.
       fail-fast: false
       matrix:
-        python-version: [3.8.x, 3.9.x, 3.10.x]
+        python-version: [3.10.12]
         include:
-          - python-version: 3.8.x
-            pip_constraints: test_constraints_min_version.txt
-          - python-version: 3.9.x
-            pip_constraints: test_constraints_mid_version.txt
-          - python-version: 3.10.x
-            pip_constraints: test_constraints_max_version.txt
+          - python-version: 3.10.12
+            pip_constraints: test_constraints_version.txt
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -135,4 +135,4 @@ repos:
         language: python
         entry: ./utils/generate_markdown_docs.py --package_dirs ml-agents-envs ml-agents
         pass_filenames: false
-        additional_dependencies: [pyyaml, pydoc-markdown==3.10.1]
+        additional_dependencies: [pyyaml==5.3, pydoc-markdown==3.10.1]
diff --git a/.yamato/com.unity.ml-agents-coverage.yml b/.yamato/com.unity.ml-agents-coverage.yml
@@ -15,7 +15,7 @@ test_coverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
         - npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
         - upm-ci project test -u {{ editor.version }} --type project-tests --project-path {{ editor.testProject }} --package-filter {{ package.name }} {{ coverageOptions }} --extra-utr-arg "reruncount=2"
         - |
-          conda activate python3.8
+          conda activate python3.10
           python3 ml-agents/tests/yamato/check_coverage_percent.py upm-ci~/test-results/ {{ package.minCoveragePct }}
     artifacts:
         logs:

diff --git a/.yamato/com.unity.ml-agents-pack.yml b/.yamato/com.unity.ml-agents-pack.yml
@@ -7,7 +7,7 @@ pack:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       unity-downloader-cli -u 2022.3 -c editor --wait --fast
       ./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -

diff --git a/.yamato/com.unity.ml-agents-test.yml b/.yamato/com.unity.ml-agents-test.yml
@@ -126,7 +126,7 @@ test_{{ package.name }}_{{ platform.name }}_trunk:
     commands:
         - |
 {% if platform.name == "linux" %}
-          conda activate python3.8
+          conda activate python3.10
 {% endif %}
           python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
           unity-downloader-cli -u trunk -c editor --wait --fast

diff --git a/.yamato/compressed-sensor-test.yml b/.yamato/compressed-sensor-test.yml
@@ -12,7 +12,7 @@ test_compressed_obs_{{ editor.version }}:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python -u -m ml-agents.tests.yamato.setup_venv
       python ml-agents/tests/yamato/scripts/run_compressed_sensor.py --env=artifacts/testPlayer-TestGridCompressed

diff --git a/.yamato/gym-interface-test.yml b/.yamato/gym-interface-test.yml
@@ -12,7 +12,7 @@ test_gym_interface_{{ editor.version }}:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python -m pip install wheel --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python -u -m ml-agents.tests.yamato.setup_venv

diff --git a/.yamato/protobuf-generation-test.yml b/.yamato/protobuf-generation-test.yml
@@ -11,10 +11,10 @@ test_linux_protobuf_generation:
     - |
       sudo apt-get update && sudo apt-get install -y nuget
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       nuget install Grpc.Tools -Version $GRPC_VERSION -OutputDirectory protobuf-definitions/
       python3 -m pip install --upgrade pip --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-      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
+      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
       pushd protobuf-definitions
       chmod +x Grpc.Tools.$GRPC_VERSION/tools/linux_x64/protoc
       chmod +x Grpc.Tools.$GRPC_VERSION/tools/linux_x64/grpc_csharp_plugin

diff --git a/.yamato/pytest-gpu.yml b/.yamato/pytest-gpu.yml
@@ -7,7 +7,7 @@ pytest_gpu:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python3 -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python3 -u -m ml-agents.tests.yamato.setup_venv
       python3 -m pip install --progress-bar=off -r test_requirements.txt --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple

diff --git a/.yamato/python-ll-api-test.yml b/.yamato/python-ll-api-test.yml
@@ -12,7 +12,7 @@ test_linux_ll_api_{{ editor.version }}:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python -u -m ml-agents.tests.yamato.setup_venv
       python ml-agents/tests/yamato/scripts/run_llapi.py

diff --git a/.yamato/standalone-build-test.yml b/.yamato/standalone-build-test.yml
@@ -12,7 +12,7 @@ test_linux_standalone_{{ editor.version }}:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python3 -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast

diff --git a/.yamato/standalone-build-webgl-test.yml b/.yamato/standalone-build-webgl-test.yml
@@ -10,7 +10,7 @@ test_webgl_standalone_{{ editor_version }}:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
       unity-downloader-cli -u {{ editor_version }} -c editor -c WebGL --wait --fast

diff --git a/.yamato/training-int-tests.yml b/.yamato/training-int-tests.yml
@@ -12,7 +12,7 @@ test_linux_training_int_{{ editor.version }}:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
-      conda activate python3.8
+      conda activate python3.10
       python -m pip install pyyaml --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
       python -u -m ml-agents.tests.yamato.training_int_tests
   dependencies:

diff --git a/DevProject/Assets/ML-Agents/Scripts/Tests/Editor/Editor.asmdef b/DevProject/Assets/ML-Agents/Scripts/Tests/Editor/Editor.asmdef
@@ -3,7 +3,7 @@
     "references": [
         "Unity.ML-Agents.Editor",
         "Unity.ML-Agents",
-        "Unity.Barracuda",
+        "Unity.Sentis",
         "Unity.ML-Agents.CommunicatorObjects",
         "Unity.PerformanceTesting"
     ],

diff --git a/DevProject/Packages/packages-lock.json b/DevProject/Packages/packages-lock.json
@@ -9,17 +9,6 @@
       },
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
-    "com.unity.barracuda": {
-      "version": "3.0.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.burst": "1.6.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.imageconversion": "1.0.0"
-      },
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
-    },
     "com.unity.burst": {
       "version": "1.8.7",
       "depth": 2,
@@ -66,7 +55,7 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.barracuda": "3.0.0",
+        "com.unity.sentis": "1.2.0-exp.2",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
         "com.unity.modules.physics": "1.0.0"
@@ -115,6 +104,17 @@
       },
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
+    "com.unity.sentis": {
+      "version": "1.2.0-exp.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.burst": "1.8.4",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
+      },
+      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+    },
     "com.unity.settings-manager": {
       "version": "2.0.1",
       "depth": 1,

diff --git a/DevProject/ProjectSettings/EditorBuildSettings.asset b/DevProject/ProjectSettings/EditorBuildSettings.asset
@@ -9,5 +9,5 @@ EditorBuildSettings:
     path: Assets/ML-Agents/Scripts/Tests/Runtime/AcademyTest/AcademyStepperTestScene.unity
     guid: 9bafc50b1e55b43b2b1ae9620f1f8311
   m_configObjects:
-    com.unity.ml-agents.settings: {fileID: 11400000, guid: b412e5eb0b23f4bca86655ada9a633d4,
+    com.unity.ml-agents.settings: {fileID: 11400000, guid: e4ad406c716274fdfb58baafffa12dcd,
       type: 2}
diff --git a/Project/Assets/ML-Agents/Editor/DisableBurstFromMenu.cs b/Project/Assets/ML-Agents/Editor/DisableBurstFromMenu.cs
@@ -1,6 +1,8 @@
 #if UNITY_CLOUD_BUILD
 using UnityEditor;
 
+// TODO do we still need this?
+
 public class DisableBurstFromMenu
 {
     /// This method is needed to disable Burst compilation on windows for our cloudbuild tests.