Fix Mac backcompat test (#5519)

Author: maryamhonari

.yamato/training-backcompat-tests.yml

@@ -0,0 +1,44 @@
+
+test_mac_backcompat_2019.4:
+  {% capture editor_version %}2019.4{% endcapture %}
+  {% capture csharp_backcompat_version %}1.0.0{% endcapture %}
+  # This test has to run on mac because it requires the custom build of tensorflow without AVX
+  # Test against 2020.1 because 2020.2 has to run against package version 1.2.0
+  name: Test Mac Backcompat Training {{ editor_version }}
+  agent:
+    type: Unity::VM::osx
+    image: ml-agents/ml-agents-bokken-mac:0.1.5-853758
+    flavor: b1.small
+  variables:
+    UNITY_VERSION: {{ editor_version }}
+  commands:
+    - |
+      python -m venv venv && source venv/bin/activate
+      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 --wait --fast
+      # Backwards-compatibility tests.
+      # 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.standalone_build_tests --build-target=mac
+      python -u -m ml-agents.tests.yamato.training_int_tests --csharp {{ csharp_backcompat_version }}
+    - |
+      python -m venv venv_old && source venv_old/bin/activate
+      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 --python 0.24.0
+  triggers:
+    cancel_old_ci: true
+    recurring:
+      - branch: main
+        frequency: daily
+  artifacts:
+    logs:
+      paths:
+        - "artifacts/standalone_build.txt"
+        - "artifacts/inference.nn.txt"
+        - "artifacts/inference.onnx.txt"
+        - "artifacts/*.log"
+    standalonebuild:
+      paths:
+        - "artifacts/testPlayer*/**"
+        - "artifacts/models/**"

com.unity.ml-agents/Runtime/Communicator/RpcCommunicator.cs

@@ -233,7 +233,7 @@ public UnityRLInitParameters Initialize(CommunicatorInitParameters initParameter
                     throw new UnityAgentsException("Incompatible trainer version.");
                 }
                 initParametersOut = new UnityRLInitParameters();
-                m_Channel.ShutdownAsync().Wait();
+                NotifyQuitAndShutDownChannel();
                 return false;
             }
 
@@ -331,7 +331,14 @@ UnityInputProto Initialize(UnityOutputProto unityOutput,
         void NotifyQuitAndShutDownChannel()
         {
             QuitCommandReceived?.Invoke();
-            m_Channel.ShutdownAsync().Wait();
+            try
+            {
+                m_Channel.ShutdownAsync().Wait();
+            }
+            catch (Exception)
+            {
+                // do nothing
+            }
         }
 
 #endregion

ml-agents/tests/yamato/training_int_tests.py

@@ -21,8 +21,10 @@ def run_training(python_version, csharp_version):
     print(
         f"Running training with python={python_version or latest} and c#={csharp_version or latest}"
     )
-    nn_file_expected = f"./models/{run_id}/3DBall.nn"
-    if os.path.exists(nn_file_expected):
+    output_dir = "results"
+    onnx_file_expected = f"./{output_dir}/{run_id}/3DBall.onnx"
+
+    if os.path.exists(onnx_file_expected):
         # Should never happen - make sure nothing leftover from an old test.
         print("Artifacts from previous build found!")
         sys.exit(1)
@@ -62,13 +64,12 @@ def run_training(python_version, csharp_version):
 
     # Copy the default training config but override the max_steps parameter,
     # and reduce the batch_size and buffer_size enough to ensure an update step happens.
-    override_config_file(
-        "config/trainer_config.yaml",
-        "override.yaml",
-        max_steps=100,
-        batch_size=10,
-        buffer_size=10,
-    )
+    yaml_out = "override.yaml"
+    overrides = {
+        "hyperparameters": {"batch_size": 10, "buffer_size": 10},
+        "max_steps": 100,
+    }
+    override_config_file("config/ppo/3DBall.yaml", yaml_out, overrides)
 
     mla_learn_cmd = (
         f"mlagents-learn override.yaml --train --env="

ml-agents/tests/yamato/yamato_utils.py

@@ -109,6 +109,8 @@ def init_venv(
         pip_commands += [
             f"mlagents=={mlagents_python_version}",
             f"gym-unity=={mlagents_python_version}",
+            # TODO build these and publish to internal pypi
+            "tf2onnx==1.6.1",
         ]
     else:
         # Local install