Skip to content

Create ML-Agents Package #3267

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.

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 39 commits into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a4d987d
First commit of craeting a package.
surfnerd Jan 22, 2020
d9b2723
remove (mostly) all references to 'UnitySDK'.
surfnerd Jan 22, 2020
55d6895
Fix protobuf generation test.
surfnerd Jan 22, 2020
eb98ea7
Re-enable show diff on failure for precommit.
surfnerd Jan 23, 2020
3d2f7a2
Fix links in readme.
surfnerd Jan 23, 2020
ab775da
Fix last link.
surfnerd Jan 23, 2020
a712529
Move standalone tests to Project.
surfnerd Jan 23, 2020
909481a
Add meta files.
surfnerd Jan 23, 2020
06c274d
Fix doc change, fill in asmdef for Runtime test folder.
surfnerd Jan 23, 2020
5225f29
Update meta files.
surfnerd Jan 23, 2020
f9118f4
Add package pack and tests.
surfnerd Jan 23, 2020
562a0c0
fix name.
surfnerd Jan 23, 2020
ea9bed9
Move dll dependencies into package.
surfnerd Jan 24, 2020
d58cb11
Move ray perception tests back to the project.
surfnerd Jan 24, 2020
d0a0905
Make protobuf files internal. Make Unity.ML-Agents internally visibl…
surfnerd Jan 24, 2020
207e6f7
Make windows protobuf script the same as bash. Remove unnecessary na…
surfnerd Jan 24, 2020
2a8b9bc
Make this visible to the Editor Tests assembly.
surfnerd Jan 24, 2020
45195f8
Add license.
surfnerd Jan 24, 2020
2b099ea
update changelog.
surfnerd Jan 24, 2020
78a5a24
Update changelog to reflect version.
surfnerd Jan 24, 2020
2e6630e
Fix linux VM type.
surfnerd Jan 24, 2020
260f053
remove trunk test for now.
surfnerd Jan 24, 2020
5095f9e
add project settings.
surfnerd Jan 24, 2020
907f55a
Bump Barracua version. Update asmdefs to reference Barrcuda.
surfnerd Jan 27, 2020
b3e2cc7
Move triggers into template so they exist for each job.
surfnerd Jan 27, 2020
5f1b685
Move Plugins folder out of Runtime. Update asmdefs to reference 3rd …
surfnerd Jan 27, 2020
5db09a1
Fix asmdef for Edtior test assembly.
surfnerd Jan 27, 2020
ec0a91f
Remove duplicate references.
surfnerd Jan 27, 2020
0b680b4
Comment out COMPILER variable.
surfnerd Jan 27, 2020
531d934
Bump up linux flavor due to out of memory error.
surfnerd Jan 27, 2020
fbe5acc
Apply protobuf patch.
surfnerd Jan 27, 2020
59400c4
Move CONTRIBUTING.md into com.unity.ml-agents and update links to poi…
surfnerd Jan 27, 2020
8157c9f
Remove the old csharp test file as those tests are now run in the pac…
surfnerd Jan 27, 2020
d7fe6b3
Update code of conduct link.
surfnerd Jan 27, 2020
5f5a930
Delete template documentation.
surfnerd Jan 27, 2020
5b33b5d
Fix link.
surfnerd Jan 27, 2020
537f536
Mirror internal acces for windows protobuf generation.
surfnerd Jan 27, 2020
daf810d
Add new line.
surfnerd Jan 28, 2020
b81b87d
Resolve conflicts.
surfnerd Jan 28, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ jobs:
chmod +x Grpc.Tools.1.14.1/tools/linux_x64/protoc
chmod +x Grpc.Tools.1.14.1/tools/linux_x64/grpc_csharp_plugin
COMPILER=Grpc.Tools.1.14.1/tools/linux_x64 ./make.sh
CS_PROTO_PATH=UnitySDK/Assets/ML-Agents/Scripts/Grpc/CommunicatorObjects
CS_PROTO_PATH=com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects
git diff --exit-code --quiet -- :/ ":(exclude,top)$CS_PROTO_PATH/*.meta" \
|| { GIT_ERR=$?; echo "protobufs need to be regenerated, apply the patch uploaded to artifacts."; \
echo "Apply the patch with the command: git apply proto.patch"; \
Expand Down
26 changes: 4 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
/UnitySDK/[Ll]ibrary/
/UnitySDK/Logs/
/UnitySDK/[Tt]emp/
/UnitySDK/[Oo]bj/
/UnitySDK/[Bb]uild/
/UnitySDK/[Bb]uilds/
/UnitySDK/Assets/AssetStoreTools*
/UnitySDK/Assets/Plugins*
/UnitySDK/Assets/Demonstrations*
/UnitySDK/csharp_timers.json

# Tensorflow Model Info
/models
/summaries
Expand All @@ -23,8 +12,8 @@
/UnitySDK/.vs/

# Autogenerated VS/MD/Consulo solution and project files
/UnitySDKExportedObj/
/UnitySDK.consulo/
/com.unity.ml-agentsExportedObj/
/com.unity.ml-agents.consulo/
*.csproj
*.unityproj
*.sln
Expand All @@ -41,7 +30,7 @@
*.pidb.meta

# Unity3D Generated File On Crash Reports
/UnitySDK/sysinfo.txt
/com.unity.ml-agents/sysinfo.txt

# Builds
*.apk
Expand All @@ -51,15 +40,8 @@
*.x86_64
*.x86

# Tensorflow Sharp Files
/UnitySDK/Assets/ML-Agents/Plugins/Android*
/UnitySDK/Assets/ML-Agents/Plugins/iOS*
/UnitySDK/Assets/ML-Agents/Plugins/Computer*
/UnitySDK/Assets/ML-Agents/Plugins/System.Numerics*
/UnitySDK/Assets/ML-Agents/Plugins/System.ValueTuple*

# Plugins
/UnitySDK/Assets/ML-Agents/VideoRecorder*
/com.unity.ml-agents/VideoRecorder*

# Generated doc folders
/docs/html
Expand Down
13 changes: 13 additions & 0 deletions .yamato/com.unity.ml-agents-pack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
pack:
name: Pack
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.large
commands:
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package pack --package-path com.unity.ml-agents
artifacts:
packages:
paths:
- "upm-ci~/packages/**/*"
44 changes: 44 additions & 0 deletions .yamato/com.unity.ml-agents-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
test_editors:
- version: 2018.4
- version: 2019.3
test_platforms:
- name: win
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.large
- name: mac
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: b1.small
- name: linux
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.medium
---

{% for editor in test_editors %}
{% for platform in test_platforms %}
test_{{ platform.name }}_{{ editor.version }}:
name : com.unity.ml-agents test {{ editor.version }} on {{ platform.name }}
agent:
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor}}
commands:
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package test -u {{ editor.version }} --package-path com.unity.ml-agents
artifacts:
logs:
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/com.unity.ml-agents-pack.yml#pack
triggers:
pull_requests:
- targets:
only:
- "master"
- "/release-.*/"
- "/hotfix-.*/"
{% endfor %}
{% endfor %}
27 changes: 0 additions & 27 deletions .yamato/csharp-tests.yml

This file was deleted.

69 changes: 69 additions & 0 deletions Project/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/[Ll]ibrary/
/Logs/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
/Assets/Plugins*
/Assets/Demonstrations*
/csharp_timers.json

# Environemnt logfile
*Project.log

# Visual Studio 2015 cache directory
/.vs/

# Autogenerated VS/MD/Consulo solution and project files
/ProjectExportedObj/
/Project.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
/sysinfo.txt

# Builds
*.apk
*.unitypackage
*.app
*.exe
*.x86_64
*.x86

# Plugins
/Assets/VideoRecorder*

# Mac hidden files
*.DS_Store
*/.ipynb_checkpoints
*/.idea
*.pyc
*.idea/misc.xml
*.idea/modules.xml
*.idea/
*.iml
*.cache
*/build/
*/dist/
*.egg-info*
*.eggs*
*.gitignore.swp

# VSCode hidden files
*.vscode/

.DS_Store
File renamed without changes.
5 changes: 2 additions & 3 deletions UnitySDK/Assets/ML-Agents/Editor.meta → Project/Assets/ML-Agents/Editor.meta
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading