Bumped versions. (#6155)

miguelalonsojr · web-flow · commit 36b312ab35a6 · 2024-10-04T21:24:33.000-04:00
* Bumped versions.

* Bumped versions.

* Updated unity projects.

* Updated version validation.

* Fixed failing GPU test.
diff --git a/DevProject/Packages/packages-lock.json b/DevProject/Packages/packages-lock.json
@@ -79,7 +79,7 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.ml-agents": "3.0.0-exp.1",
+        "com.unity.ml-agents": "3.0.0",
         "com.unity.modules.physics": "1.0.0"
       }
     },
diff --git a/DevProject/ProjectSettings/EditorBuildSettings.asset b/DevProject/ProjectSettings/EditorBuildSettings.asset
@@ -9,6 +9,6 @@ EditorBuildSettings:
     path: Assets/ML-Agents/Scripts/Tests/Runtime/AcademyTest/AcademyStepperTestScene.unity
     guid: 9bafc50b1e55b43b2b1ae9620f1f8311
   m_configObjects:
-    com.unity.ml-agents.settings: {fileID: 11400000, guid: b176c44294f5e434bb5109ddfc43274e,
+    com.unity.ml-agents.settings: {fileID: 11400000, guid: b9540ad82945942dd852207c48989240,
       type: 2}
   m_UseUCBPForAssetBundles: 0
diff --git a/Project/Packages/packages-lock.json b/Project/Packages/packages-lock.json
@@ -96,7 +96,7 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.ml-agents": "3.0.0-exp.1",
+        "com.unity.ml-agents": "3.0.0",
         "com.unity.modules.physics": "1.0.0"
       }
     },
diff --git a/com.unity.ml-agents.extensions/package.json b/com.unity.ml-agents.extensions/package.json
@@ -5,7 +5,7 @@
   "unity": "2023.2",
   "description": "A source-only package for new features based on ML-Agents",
   "dependencies": {
-    "com.unity.ml-agents": "3.0.0-exp.1",
+    "com.unity.ml-agents": "3.0.0",
     "com.unity.modules.physics": "1.0.0"
   }
 }
diff --git a/com.unity.ml-agents/package.json b/com.unity.ml-agents/package.json
@@ -12,8 +12,8 @@
   },
   "samples": [
     {
-      "displayName":"3D Ball",
-      "description":"The 3D Ball sample is a simple environment that is a great for jumping into ML-Agents to see how things work.",
+      "displayName": "3D Ball",
+      "description": "The 3D Ball sample is a simple environment that is a great for jumping into ML-Agents to see how things work.",
       "path": "Samples~/3DBall"
     }
   ]
diff --git a/ml-agents-envs/mlagents_envs/__init__.py b/ml-agents-envs/mlagents_envs/__init__.py
@@ -1,5 +1,5 @@
 # Version of the library that will be used to upload to pypi
-__version__ = "1.1.0.dev0"
+__version__ = "1.2.0.dev0"
 
 # Git tag that will be checked to determine whether to trigger upload to pypi
 __release_tag__ = None
diff --git a/ml-agents/mlagents/torch_utils/torch.py b/ml-agents/mlagents/torch_utils/torch.py
@@ -53,7 +53,7 @@ def set_torch_config(torch_settings: TorchSettings) -> None:
 
     if _device.type == "cuda":
         torch.set_default_device(_device.type)
-        torch.set_default_dtype(torch.cuda.FloatTensor)
+        torch.set_default_dtype(torch.float32)
     else:
         torch.set_default_dtype(torch.float32)
     logger.debug(f"default Torch device: {_device}")
diff --git a/ml-agents/mlagents/trainers/__init__.py b/ml-agents/mlagents/trainers/__init__.py
@@ -1,5 +1,5 @@
 # Version of the library that will be used to upload to pypi
-__version__ = "1.1.0.dev0"
+__version__ = "1.2.0.dev0"
 
 # Git tag that will be checked to determine whether to trigger upload to pypi
 __release_tag__ = None
diff --git a/ml-agents/mlagents/trainers/tests/test_torch_utils.py b/ml-agents/mlagents/trainers/tests/test_torch_utils.py
@@ -11,8 +11,8 @@
     "device_str, expected_type, expected_index, expected_tensor_type",
     [
         ("cpu", "cpu", None, torch.float32),
-        ("cuda", "cuda", None, torch.cuda.FloatTensor),
-        ("cuda:42", "cuda", 42, torch.cuda.FloatTensor),
+        ("cuda", "cuda", None, torch.float32),
+        ("cuda:42", "cuda", 42, torch.float32),
         ("opengl", "opengl", None, torch.float32),
     ],
 )
diff --git a/ml-agents/mlagents/trainers/tests/torch_entities/test_attention.py b/ml-agents/mlagents/trainers/tests/torch_entities/test_attention.py
@@ -1,5 +1,5 @@
 import pytest
-from mlagents.torch_utils import torch
+from mlagents.torch_utils import torch, default_device
 import numpy as np
 
 from mlagents.trainers.torch_entities.utils import ModelUtils
@@ -217,7 +217,7 @@ def test_predict_minimum_training():
             argmin = argmin.squeeze()
             argmin = argmin.detach()
         sliced_oh = onehots[:, : num + 1]
-        inp = torch.cat([inp, sliced_oh], dim=2)
+        inp = torch.cat([inp, sliced_oh.to(default_device())], dim=2)
 
         embeddings = entity_embedding(inp, inp)
         masks = get_zero_entities_mask([inp])
diff --git a/utils/validate_versions.py b/utils/validate_versions.py
@@ -25,7 +25,8 @@
 
 def _escape_non_none(s: Optional[str]) -> str:
     """
-    Returns s escaped in quotes if it is non-None, else "None"
+    Returns s escaped in quotes if it is non-None, els e "None"
+    Returns s escaped in quotes if it is non-None, els e "None"
     :param s:
     :return:
     """
@@ -81,11 +82,13 @@ def set_version(
             f.write(new_contents)
 
     if csharp_version is not None:
-        package_version = f"{csharp_version}-exp.1"
+        # removed exp.1 tag from version strings since MLA package is a supported package again
+        # package_version = f"{csharp_version}-exp.1"
+        package_version = f"{csharp_version}"
         if csharp_extensions_version is not None:
             # since this has never been promoted we need to keep
             # it in preview forever or CI will fail
-            extension_version = f"{csharp_extensions_version}-exp.1"
+            extension_version = f"{csharp_extensions_version}-preview"
         print(
             f"Setting package version to {package_version} in {MLAGENTS_PACKAGE_JSON_PATH}"
             f" and {MLAGENTS_EXTENSIONS_PACKAGE_JSON_PATH}"
@@ -178,7 +181,7 @@ def print_release_tag_commands(
             print(f"Updating C# package to version {args.csharp_version}")
         if args.csharp_extensions_version:
             print(
-                f"Updating C# extensions package to version {args.csharp_extensions_version}"
+                f"Updating C# extensions package to version {args.csharp_extensions_version}-exp.1"
             )
         set_version(
             args.python_version,

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@`
`79`	`79`	`"depth": 0,`
`80`	`80`	`"source": "local",`
`81`	`81`	`"dependencies": {`
`82`		`- "com.unity.ml-agents": "3.0.0-exp.1",`
	`82`	`+ "com.unity.ml-agents": "3.0.0",`
`83`	`83`	`"com.unity.modules.physics": "1.0.0"`
`84`	`84`	`}`
`85`	`85`	`},`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`"depth": 0,`
`97`	`97`	`"source": "local",`
`98`	`98`	`"dependencies": {`
`99`		`- "com.unity.ml-agents": "3.0.0-exp.1",`
	`99`	`+ "com.unity.ml-agents": "3.0.0",`
`100`	`100`	`"com.unity.modules.physics": "1.0.0"`
`101`	`101`	`}`
`102`	`102`	`},`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"unity": "2023.2",`
`6`	`6`	`"description": "A source-only package for new features based on ML-Agents",`
`7`	`7`	`"dependencies": {`
`8`		`- "com.unity.ml-agents": "3.0.0-exp.1",`
	`8`	`+ "com.unity.ml-agents": "3.0.0",`
`9`	`9`	`"com.unity.modules.physics": "1.0.0"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`},`
`13`	`13`	`"samples": [`
`14`	`14`	`{`
`15`		`- "displayName":"3D Ball",`
`16`		`- "description":"The 3D Ball sample is a simple environment that is a great for jumping into ML-Agents to see how things work.",`
	`15`	`+ "displayName": "3D Ball",`
	`16`	`+ "description": "The 3D Ball sample is a simple environment that is a great for jumping into ML-Agents to see how things work.",`
`17`	`17`	`"path": "Samples~/3DBall"`
`18`	`18`	`}`
`19`	`19`	`]`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`"device_str, expected_type, expected_index, expected_tensor_type",`
`12`	`12`	`[`
`13`	`13`	`("cpu", "cpu", None, torch.float32),`
`14`		`- ("cuda", "cuda", None, torch.cuda.FloatTensor),`
`15`		`- ("cuda:42", "cuda", 42, torch.cuda.FloatTensor),`
	`14`	`+ ("cuda", "cuda", None, torch.float32),`
	`15`	`+ ("cuda:42", "cuda", 42, torch.float32),`
`16`	`16`	`("opengl", "opengl", None, torch.float32),`
`17`	`17`	`],`
`18`	`18`	`)`