Skip to content

update barracuda version, enable tests for 2020.2 #4571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2020
Merged

update barracuda version, enable tests for 2020.2 #4571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
683c6a9
update barracuda version, enable tests for 2020.2
Oct 15, 2020
22c876f
changelog
Oct 15, 2020
fe36fb2
variable backcompat version
Oct 15, 2020
9459897
sync to tagged version of extensions
Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .yamato/test_versions.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# List of editor versions for standalone-build-test and its dependencies.
# csharp_backcompat_version is used in training-int-tests to determine the
# older package version to run the backwards compat tests against.
test_editors:
- version: 2018.4
csharp_backcompat_version: 1.0.0
- version: 2019.4
csharp_backcompat_version: 1.0.0
- version: 2020.1
# Waiting on a barracuda fix, see https://jira.unity3d.com/browse/MLA-1464
# - version: 2020.2
csharp_backcompat_version: 1.0.0
- version: 2020.2
# 2020.2 moved the AssetImporters namespace
# but we didn't handle this until 1.2.0
csharp_backcompat_version: 1.2.0
2 changes: 1 addition & 1 deletion .yamato/training-int-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ test_mac_training_int_{{ editor.version }}:
# If we make a breaking change to the communication protocol, these will need
# to be disabled until the next release.
- python -u -m ml-agents.tests.yamato.training_int_tests --python=0.16.0
- python -u -m ml-agents.tests.yamato.training_int_tests --csharp=1.0.0
- python -u -m ml-agents.tests.yamato.training_int_tests --csharp={{ editor.csharp_backcompat_version }}
dependencies:
- .yamato/standalone-build-test.yml#test_mac_standalone_{{ editor.version }}
triggers:
Expand Down
1 change: 1 addition & 0 deletions com.unity.ml-agents/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to

### Minor Changes
#### com.unity.ml-agents (C#)
- The Barracuda dependency was upgraded to 1.1.2 (#4571)
#### ml-agents / ml-agents-envs / gym-unity (Python)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion com.unity.ml-agents/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unity": "2018.4",
"description": "Use state-of-the-art machine learning to create intelligent character behaviors in any Unity environment (games, robotics, film, etc.).",
"dependencies": {
"com.unity.barracuda": "1.1.1-preview",
"com.unity.barracuda": "1.1.2-preview",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.physics": "1.0.0",
Expand Down
5 changes: 3 additions & 2 deletions ml-agents/tests/yamato/yamato_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,11 @@ def checkout_csharp_version(csharp_version):
return

csharp_tag = f"com.unity.ml-agents_{csharp_version}"
csharp_dirs = ["com.unity.ml-agents", "Project"]
csharp_dirs = ["com.unity.ml-agents", "com.unity.ml-agents.extensions", "Project"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we don't sync the extensions package, we'll get compile failures because the current extensions code is not compatible with old package code.

for csharp_dir in csharp_dirs:
subprocess.check_call(f"rm -rf {csharp_dir}", shell=True)
subprocess.check_call(f"git checkout {csharp_tag} -- {csharp_dir}", shell=True)
# Allow the checkout to fail, since the extensions folder isn't availabe in 1.0.0
subprocess.call(f"git checkout {csharp_tag} -- {csharp_dir}", shell=True)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... but trying to checkout the directory at old tags before it existed will fail



def undo_git_checkout():
Expand Down