[BE] bump optree version to 0.12.1 (#130139)

XuehaiPan · pytorchmergebot · commit d2bd9acabdea · 2024-07-20T02:41:10.000Z
0.12.0 Major Updates: - Add context manager to temporarily set the dictionary sorting mode - Add accessor APIs - Use `stable` tag for `pybind11` for Python 3.13 support - Fix potential segmentation fault for pickling support 0.12.1 Updates: - Fix warning regression during import when launch with strict warning filters Closes #130155 Pull Request resolved: #130139 Approved by: https://github.com/zou3519 ghstack dependencies: #130895
diff --git a/.ci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt
@@ -134,9 +134,9 @@ opt-einsum==3.3
 #Pinned versions: 3.3
 #test that import: test_linalg.py
 
-optree==0.11.0
+optree==0.12.1
 #Description: A library for tree manipulation
-#Pinned versions: 0.11.0
+#Pinned versions: 0.12.1
 #test that import: test_vmap.py, test_aotdispatch.py, test_dynamic_shapes.py,
 #test_pytree.py, test_ops.py, test_control_flow.py, test_modules.py,
 #common_utils.py, test_eager_transforms.py, test_python_dispatch.py,
diff --git a/.github/requirements/pip-requirements-iOS.txt b/.github/requirements/pip-requirements-iOS.txt
@@ -1,4 +1,4 @@
 # iOS simulator requirements
 coremltools==5.0b5
 protobuf==3.20.2
-optree==0.11.0
+optree==0.12.1
diff --git a/.github/requirements/pip-requirements-macOS.txt b/.github/requirements/pip-requirements-macOS.txt
@@ -26,7 +26,7 @@ pytest-cpp==2.3.0
 rockset==1.0.3
 z3-solver==4.12.2.0
 tensorboard==2.13.0
-optree==0.11.0
+optree==0.12.1
 # NB: test_hparams_* from test_tensorboard is failing with protobuf 5.26.0 in
 # which the stringify metadata is wrong when escaping double quote
 protobuf==3.20.2
diff --git a/.github/workflows/_win-test.yml b/.github/workflows/_win-test.yml
@@ -188,7 +188,7 @@ jobs:
         run: |
           pushd "${PYTORCH_FINAL_PACKAGE_DIR}"
           # shellcheck disable=SC2046,SC2102
-          python3 -mpip install $(echo *.whl)[opt-einsum,optree]
+          python3 -mpip install $(echo *.whl)[opt-einsum,optree] optree==0.12.1
           popd
 
           .ci/pytorch/win-test.sh
diff --git a/.lintrunner.toml b/.lintrunner.toml
@@ -152,7 +152,7 @@ init_command = [
     'junitparser==2.1.1',
     'rich==10.9.0',
     'pyyaml==6.0.1',
-    'optree==0.11.0',
+    'optree==0.12.1',
 ]
 
 [[linter]]
diff --git a/requirements.txt b/requirements.txt
@@ -20,4 +20,4 @@ ninja
 # setuptools was removed from default python install
 setuptools ; python_version >= "3.12"
 packaging
-optree>=0.11.0 ; python_version <= "3.12"
+optree>=0.12.0
diff --git a/setup.py b/setup.py
@@ -1201,7 +1201,7 @@ def main():
     install_requires += extra_install_requires
 
     extras_require = {
-        "optree": ["optree==0.11.0"],
+        "optree": ["optree>=0.12.0"],
         "opt-einsum": ["opt-einsum>=3.3"],
     }
 
diff --git a/test/functorch/test_eager_transforms.py b/test/functorch/test_eager_transforms.py
@@ -3404,7 +3404,7 @@ def f(x):
     @onlyCPU
     def test_no_warning_on_import_functorch(self, device):
         out = subprocess.check_output(
-            [sys.executable, "-W", "all", "-c", "import functorch"],
+            [sys.executable, "-W", "always", "-c", "import functorch"],
             stderr=subprocess.STDOUT,
             cwd=os.path.dirname(os.path.realpath(__file__)),
         ).decode("utf-8")
diff --git a/test/profiler/test_profiler.py b/test/profiler/test_profiler.py
@@ -1479,7 +1479,7 @@ def run_batch():
 """
         try:
             subprocess.check_output(
-                [sys.executable, "-W", "all", "-c", script],
+                [sys.executable, "-W", "always", "-c", script],
                 cwd=os.path.dirname(os.path.realpath(__file__)),
             )
         except subprocess.CalledProcessError as e:
diff --git a/test/test_mps.py b/test/test_mps.py
@@ -11598,7 +11598,7 @@ class TestFallbackWarning(TestCase):
     # TODO: Remove once test_testing.py is running on MPS devices
     def test_no_warning_on_import(self):
         out = subprocess.check_output(
-            [sys.executable, "-W", "all", "-c", "import torch"],
+            [sys.executable, "-W", "always", "-c", "import torch"],
             stderr=subprocess.STDOUT,
             # On Windows, opening the subprocess with the default CWD makes `import torch`
             # fail, so just set CWD to this script's directory
@@ -11640,11 +11640,10 @@ def test_warn_on_not_implemented_with_fallback(self):
 if len(w) != 1:
     print(w)
     exit(2)
-
 """
         try:
             subprocess.check_output(
-                [sys.executable, '-W', 'all', '-c', script],
+                [sys.executable, '-W', 'always', '-c', script],
                 stderr=subprocess.STDOUT,
                 # On Windows, opening the subprocess with the default CWD makes `import torch`
                 # fail, so just set CWD to this script's directory
diff --git a/test/test_stateless.py b/test/test_stateless.py
@@ -887,7 +887,7 @@ def test_private_stateless_warns(self):
 """
         try:
             subprocess.check_output(
-                [sys.executable, '-W', 'all', '-c', script],
+                [sys.executable, '-W', 'always', '-c', script],
                 stderr=subprocess.STDOUT,
                 # On Windows, opening the subprocess with the default CWD makes `import torch`
                 # fail, so just set CWD to this script's directory
diff --git a/test/test_testing.py b/test/test_testing.py
@@ -2216,7 +2216,7 @@ class TestImports(TestCase):
     @classmethod
     def _check_python_output(cls, program) -> str:
         return subprocess.check_output(
-            [sys.executable, "-W", "all", "-c", program],
+            [sys.executable, "-W", "always", "-c", program],
             stderr=subprocess.STDOUT,
             # On Windows, opening the subprocess with the default CWD makes `import torch`
             # fail, so just set CWD to this script's directory
diff --git a/torch/utils/_cxx_pytree.py b/torch/utils/_cxx_pytree.py
@@ -273,7 +273,7 @@ def tree_flatten(
     >>> from collections import OrderedDict
     >>> tree = OrderedDict([('b', (2, [3, 4])), ('a', 1), ('c', None), ('d', 5)])
     >>> tree_flatten(tree)
-    ([2, 3, 4, 1, None, 5], PyTreeSpec(OrderedDict([('b', (*, [*, *])), ('a', *), ('c', *), ('d', *)]), NoneIsLeaf))
+    ([2, 3, 4, 1, None, 5], PyTreeSpec(OrderedDict({'b': (*, [*, *]), 'a': *, 'c': *, 'd': *}), NoneIsLeaf))
 
     Args:
         tree (pytree): A pytree to flatten.

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ init_command = [`
`152`	`152`	`'junitparser==2.1.1',`
`153`	`153`	`'rich==10.9.0',`
`154`	`154`	`'pyyaml==6.0.1',`
`155`		`- 'optree==0.11.0',`
	`155`	`+ 'optree==0.12.1',`
`156`	`156`	`]`
`157`	`157`
`158`	`158`	`[[linter]]`
Original file line number	Diff line number	Diff line change
`@@ -1201,7 +1201,7 @@ def main():`
`1201`	`1201`	`install_requires += extra_install_requires`
`1202`	`1202`
`1203`	`1203`	`extras_require = {`
`1204`		`- "optree": ["optree==0.11.0"],`
	`1204`	`+ "optree": ["optree>=0.12.0"],`
`1205`	`1205`	`"opt-einsum": ["opt-einsum>=3.3"],`
`1206`	`1206`	`}`
`1207`	`1207`
Original file line number	Diff line number	Diff line change
`@@ -1479,7 +1479,7 @@ def run_batch():`
`1479`	`1479`	`"""`
`1480`	`1480`	`try:`
`1481`	`1481`	`subprocess.check_output(`
`1482`		`- [sys.executable, "-W", "all", "-c", script],`
	`1482`	`+ [sys.executable, "-W", "always", "-c", script],`
`1483`	`1483`	`cwd=os.path.dirname(os.path.realpath(__file__)),`
`1484`	`1484`	`)`
`1485`	`1485`	`except subprocess.CalledProcessError as e:`