Upgraded to pytorch 2.1.1, fixed some windows related test issues.

Unity-Technologies · Nov 20, 2023 · 1733183 · 1733183
1 parent 643df35
commit 1733183
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/com.unity.ml-agents/CHANGELOG.md b/com.unity.ml-agents/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to
 #### com.unity.ml-agents / com.unity.ml-agents.extensions (C#)
 
 #### ml-agents / ml-agents-envs
+- Upgraded to PyTorch 2.1.1
 
 ### Minor Changes
 #### com.unity.ml-agents / com.unity.ml-agents.extensions (C#)

diff --git a/ml-agents-envs/tests/test_envs.py b/ml-agents-envs/tests/test_envs.py
@@ -1,3 +1,4 @@
+import os
 from unittest import mock
 import pytest
 
@@ -53,11 +54,15 @@ def test_port_defaults(
 def test_log_file_path_is_set(mock_communicator, mock_launcher):
     mock_communicator.return_value = MockCommunicator()
     env = UnityEnvironment(
-        file_name="myfile", worker_id=0, log_folder="./some-log-folder-path"
+        file_name="myfile",
+        worker_id=0,
+        log_folder=os.path.join(".", "some-log-folder-path"),
     )
     args = env._executable_args()
     log_file_index = args.index("-logFile")
-    assert args[log_file_index + 1] == "./some-log-folder-path/Player-0.log"
+    assert args[log_file_index + 1] == os.path.join(
+        ".", "some-log-folder-path", "Player-0.log"
+    )
     env.close()
 
 

diff --git a/ml-agents/mlagents/trainers/tests/test_trainer_util.py b/ml-agents/mlagents/trainers/tests/test_trainer_util.py
@@ -149,13 +149,20 @@ def test_setup_init_path(tmpdir, dir_exists):
 
     :return:
     """
-    test_yaml = """
+    init_path = os.path.join(
+        "{}",
+        "test_setup_init_path_results",
+        "test_run_id",
+        "MediumWallJump",
+        "checkpoint.pt",
+    )
+    test_yaml = f"""
     behaviors:
         BigWallJump:
             init_path: BigWallJump-6540981.pt #full path
             trainer_type: ppo
         MediumWallJump:
-            init_path: {}/test_setup_init_path_results/test_run_id/MediumWallJump/checkpoint.pt
+            init_path: {init_path}
             trainer_type: ppo
         SmallWallJump:
             trainer_type: ppo

diff --git a/ml-agents/mlagents/trainers/tests/torch_entities/test_simple_rl.py b/ml-agents/mlagents/trainers/tests/torch_entities/test_simple_rl.py
@@ -93,7 +93,7 @@ def test_var_len_obs_and_goal_poca(num_vis, num_vector, num_var_len, conditionin
         POCA_TORCH_CONFIG,
         hyperparameters=new_hyperparams,
         network_settings=new_network,
-        max_steps=25000,
+        max_steps=5000,
     )
     check_environment_trains(env, {BRAIN_NAME: config})
 

diff --git a/ml-agents/setup.py b/ml-agents/setup.py
@@ -62,7 +62,7 @@ def run(self):
         "Pillow>=4.2.1",
         "protobuf>=3.6,<3.20",
         "pyyaml>=3.1.0",
-        "torch>=1.13.1",
+        "torch>=2.1.1",
         "tensorboard>=2.14",
         # adding six explicit dependency since tensorboard needs it but doesn't declare it as a dep
         "six>=1.16",