Merge com.unity.ml-agents.extensions into com.unity.ml-agents

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

@@ -33,9 +33,6 @@ test_coverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}_{{ edi
             NOT pull_request.draft AND
             (pull_request.changes.any match "com.unity.ml-agents/**" OR
              pull_request.changes.any match " {{ editor.testProject }}/**" OR
-            {% if package.name == "com.unity.ml-agents.extensions" %}
-            pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
-            {% endif %}
             pull_request.changes.any match ".yamato/com.unity.ml-agents-coverage.yml")
       {% endif %}
 {% endfor %}

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

@@ -7,6 +7,8 @@ pack:
   commands:
     - |
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
+      sudo apt-get update
+      sudo apt-get install upm-pvp=0.76.0
       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 6000.0 -c editor --wait --fast

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

@@ -29,9 +29,6 @@ packages:
     - name: com.unity.ml-agents
       assembly: Unity.ML-Agents
       minCoveragePct: 72
-    - name: com.unity.ml-agents.extensions
-      assembly: Unity.ML-Agents.Extensions*
-      minCoveragePct: 75
 ---
 
 all_package_tests:
@@ -102,9 +99,6 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}_{{ editor.testP
             NOT pull_request.draft AND
             (pull_request.changes.any match "com.unity.ml-agents/**" OR
              pull_request.changes.any match " {{ editor.testProject }}/**" OR
-            {% if package.name == "com.unity.ml-agents.extensions" %}
-              pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
-            {% endif %}
             pull_request.changes.any match ".yamato/com.unity.ml-agents-test.yml")
       {% endif %}
       {% endfor %}

.yamato/compressed-sensor-test.yml

@@ -28,7 +28,6 @@ test_compressed_obs_{{ editor.version }}_{{ editor.extra_test }}:
       pull_request.target match "release.+") AND
       NOT pull_request.draft AND
       (pull_request.changes.any match "com.unity.ml-agents/**" OR
-      pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
       pull_request.changes.any match "Project/**" OR
       pull_request.changes.any match "ml-agents/tests/yamato/**" OR
       pull_request.changes.any match "ml-agents-envs/**" OR

.yamato/coverage_tests.metafile

@@ -12,6 +12,3 @@ coverage_test_packages:
     - name: com.unity.ml-agents
       assembly: Unity.ML-Agents
       minCoveragePct: 72
-    - name: com.unity.ml-agents.extensions
-      assembly: Unity.ML-Agents.Extensions*
-      minCoveragePct: 75

.yamato/standalone-build-test.yml

@@ -30,7 +30,6 @@ test_linux_standalone_{{ editor.version }}_{{ editor.extra_test }}:
       pull_request.target match "release.+") AND
       NOT pull_request.draft AND
       (pull_request.changes.any match "com.unity.ml-agents/**" OR
-      pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
       pull_request.changes.any match ".yamato/standalone-build-test.yml") AND
       NOT pull_request.changes.all match "**/*.md"
   artifacts:

.yamato/training-int-tests.yml

@@ -25,7 +25,6 @@ test_linux_training_int_{{ editor.version }}_{{ editor.extra_test }}:
       pull_request.target match "release.+") AND
       NOT pull_request.draft AND
       (pull_request.changes.any match "com.unity.ml-agents/**" OR
-      pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
       pull_request.changes.any match "Project/**" OR
       pull_request.changes.any match "ml-agents/**" OR
       pull_request.changes.any match "ml-agents-envs/**" OR

DevProject/Packages/manifest.json

@@ -4,7 +4,6 @@
     "com.unity.coding": "0.1.0-preview.13",
     "com.unity.inputsystem": "1.13.0",
     "com.unity.ml-agents": "file:../../com.unity.ml-agents",
-    "com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
     "com.unity.multiplayer.center": "1.0.0",
     "com.unity.package-manager-doctools": "3.0.0-preview",
     "com.unity.package-validation-suite": "0.59.0-preview",
@@ -22,7 +21,6 @@
   "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
   "testables": [
     "com.unity.ml-agents",
-    "com.unity.ml-agents.extensions",
     "com.unity.inputsystem"
   ]
 }

DevProject/Packages/packages-lock.json

@@ -85,15 +85,6 @@
         "com.unity.modules.physics": "1.0.0"
       }
     },
-    "com.unity.ml-agents.extensions": {
-      "version": "file:../../com.unity.ml-agents.extensions",
-      "depth": 0,
-      "source": "local",
-      "dependencies": {
-        "com.unity.ml-agents": "3.0.0",
-        "com.unity.modules.physics": "1.0.0"
-      }
-    },
     "com.unity.multiplayer.center": {
       "version": "1.0.0",
       "depth": 0,

Project/Assets/ML-Agents/Examples/PushBlockWithInput/Scripts/PushBlockWithInputPlayerController.cs

@@ -1,4 +1,4 @@
-using Unity.MLAgents.Extensions.Input;
+using Unity.MLAgents.Input;
 using UnityEngine;
 using UnityEngine.InputSystem;
 

Project/Packages/manifest.json

@@ -5,7 +5,6 @@
     "com.unity.ide.rider": "3.0.31",
     "com.unity.inputsystem": "1.13.0",
     "com.unity.ml-agents": "file:../../com.unity.ml-agents",
-    "com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
     "com.unity.multiplayer.center": "1.0.0",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
     "com.unity.recorder": "5.1.2",
@@ -21,7 +20,6 @@
   },
   "testables": [
     "com.unity.ml-agents",
-    "com.unity.ml-agents.extensions",
     "com.unity.inputsystem"
   ]
 }

Project/Packages/packages-lock.json

@@ -111,15 +111,6 @@
         "com.unity.modules.physics": "1.0.0"
       }
     },
-    "com.unity.ml-agents.extensions": {
-      "version": "file:../../com.unity.ml-agents.extensions",
-      "depth": 0,
-      "source": "local",
-      "dependencies": {
-        "com.unity.ml-agents": "3.0.0",
-        "com.unity.modules.physics": "1.0.0"
-      }
-    },
     "com.unity.multiplayer.center": {
       "version": "1.0.0",
       "depth": 0,

Project/ProjectSettings/SceneTemplateSettings.json

@@ -61,6 +61,11 @@
             "type": "UnityEngine.PhysicMaterial",
             "defaultInstantiationMode": 0
         },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.PhysicsMaterial",
+            "defaultInstantiationMode": 0
+        },
         {
             "userAdded": false,
             "type": "UnityEngine.PhysicsMaterial2D",
@@ -118,4 +123,4 @@
         "defaultInstantiationMode": 1
     },
     "newSceneOverride": 0
-}
+}