Skip to content

Commit a9e40fc

Browse files
authored
Merge com.unity.ml-agents.extensions into com.unity.ml-agents (#6227)
* Move all files from the extension package to the main package * Update the extension tests * Move Runtime Input tests to a separate assembly * Move Runtime example test to Tests * Update CHANGELOG.md * Update the doc * Change namespace to Unity.MLAgents.Input * Add MovedFrom tags * Upgrade upm-pvp
1 parent 8034047 commit a9e40fc

File tree

154 files changed

+231
-813
lines changed

Some content is hidden

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

154 files changed

+231
-813
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ test_coverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}_{{ edi
3333
NOT pull_request.draft AND
3434
(pull_request.changes.any match "com.unity.ml-agents/**" OR
3535
pull_request.changes.any match " {{ editor.testProject }}/**" OR
36-
{% if package.name == "com.unity.ml-agents.extensions" %}
37-
pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
38-
{% endif %}
3936
pull_request.changes.any match ".yamato/com.unity.ml-agents-coverage.yml")
4037
{% endif %}
4138
{% endfor %}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ pack:
77
commands:
88
- |
99
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
10+
sudo apt-get update
11+
sudo apt-get install upm-pvp=0.76.0
1012
conda activate python3.10
1113
python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
1214
unity-downloader-cli -u 6000.0 -c editor --wait --fast

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ packages:
2929
- name: com.unity.ml-agents
3030
assembly: Unity.ML-Agents
3131
minCoveragePct: 72
32-
- name: com.unity.ml-agents.extensions
33-
assembly: Unity.ML-Agents.Extensions*
34-
minCoveragePct: 75
3532
---
3633

3734
all_package_tests:
@@ -102,9 +99,6 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}_{{ editor.testP
10299
NOT pull_request.draft AND
103100
(pull_request.changes.any match "com.unity.ml-agents/**" OR
104101
pull_request.changes.any match " {{ editor.testProject }}/**" OR
105-
{% if package.name == "com.unity.ml-agents.extensions" %}
106-
pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
107-
{% endif %}
108102
pull_request.changes.any match ".yamato/com.unity.ml-agents-test.yml")
109103
{% endif %}
110104
{% endfor %}

.yamato/compressed-sensor-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ test_compressed_obs_{{ editor.version }}_{{ editor.extra_test }}:
2828
pull_request.target match "release.+") AND
2929
NOT pull_request.draft AND
3030
(pull_request.changes.any match "com.unity.ml-agents/**" OR
31-
pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
3231
pull_request.changes.any match "Project/**" OR
3332
pull_request.changes.any match "ml-agents/tests/yamato/**" OR
3433
pull_request.changes.any match "ml-agents-envs/**" OR

.yamato/coverage_tests.metafile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@ coverage_test_packages:
1212
- name: com.unity.ml-agents
1313
assembly: Unity.ML-Agents
1414
minCoveragePct: 72
15-
- name: com.unity.ml-agents.extensions
16-
assembly: Unity.ML-Agents.Extensions*
17-
minCoveragePct: 75

.yamato/standalone-build-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ test_linux_standalone_{{ editor.version }}_{{ editor.extra_test }}:
3030
pull_request.target match "release.+") AND
3131
NOT pull_request.draft AND
3232
(pull_request.changes.any match "com.unity.ml-agents/**" OR
33-
pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
3433
pull_request.changes.any match ".yamato/standalone-build-test.yml") AND
3534
NOT pull_request.changes.all match "**/*.md"
3635
artifacts:

.yamato/training-int-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ test_linux_training_int_{{ editor.version }}_{{ editor.extra_test }}:
2525
pull_request.target match "release.+") AND
2626
NOT pull_request.draft AND
2727
(pull_request.changes.any match "com.unity.ml-agents/**" OR
28-
pull_request.changes.any match "com.unity.ml-agents.extensions/**" OR
2928
pull_request.changes.any match "Project/**" OR
3029
pull_request.changes.any match "ml-agents/**" OR
3130
pull_request.changes.any match "ml-agents-envs/**" OR

DevProject/Packages/manifest.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"com.unity.coding": "0.1.0-preview.13",
55
"com.unity.inputsystem": "1.13.0",
66
"com.unity.ml-agents": "file:../../com.unity.ml-agents",
7-
"com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
87
"com.unity.multiplayer.center": "1.0.0",
98
"com.unity.package-manager-doctools": "3.0.0-preview",
109
"com.unity.package-validation-suite": "0.59.0-preview",
@@ -22,7 +21,6 @@
2221
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
2322
"testables": [
2423
"com.unity.ml-agents",
25-
"com.unity.ml-agents.extensions",
2624
"com.unity.inputsystem"
2725
]
2826
}

DevProject/Packages/packages-lock.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,6 @@
8585
"com.unity.modules.physics": "1.0.0"
8686
}
8787
},
88-
"com.unity.ml-agents.extensions": {
89-
"version": "file:../../com.unity.ml-agents.extensions",
90-
"depth": 0,
91-
"source": "local",
92-
"dependencies": {
93-
"com.unity.ml-agents": "3.0.0",
94-
"com.unity.modules.physics": "1.0.0"
95-
}
96-
},
9788
"com.unity.multiplayer.center": {
9889
"version": "1.0.0",
9990
"depth": 0,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Unity.MLAgents.Extensions.Input;
1+
using Unity.MLAgents.Input;
22
using UnityEngine;
33
using UnityEngine.InputSystem;
44

0 commit comments

Comments
 (0)