Update

[ghstack-poisoned]

.ci/docker/requirements-ci.txt

@@ -153,9 +153,9 @@ opt-einsum==3.3
 #Pinned versions: 3.3
 #test that import: test_linalg.py
 
-optree==0.13.0
+optree==0.17.0
 #Description: A library for tree manipulation
-#Pinned versions: 0.13.0
+#Pinned versions: 0.17.0
 #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,

.github/workflows/_win-test.yml

@@ -204,7 +204,7 @@ jobs:
         run: |
           pushd "${PYTORCH_FINAL_PACKAGE_DIR}"
           # shellcheck disable=SC2046,SC2102
-          python3 -mpip install $(echo *.whl)[opt-einsum,optree] optree==0.13.0
+          python3 -mpip install $(echo *.whl)[opt-einsum,optree] optree==0.17.0
           popd
 
           .ci/pytorch/win-test.sh

.lintrunner.toml

@@ -171,7 +171,7 @@ init_command = [
     'junitparser==2.1.1',
     'rich==14.1.0',
     'pyyaml==6.0.2',
-    'optree==0.13.0',
+    'optree==0.17.0',
     'dataclasses-json==0.6.7',
     'pandas==2.2.3',
 ]

test/dynamo/test_error_messages.py

@@ -430,14 +430,24 @@ from user code:
         fn(torch.randn(4))
         self.assertEqual(len(counters["graph_break"]), 1)
         first_graph_break = next(iter(counters["graph_break"].keys()))
+
+        # Pybind11 improperly sets the __qualname__ attribute on functions and methods
+        # See https://github.com/pybind/pybind11/issues/5774 and https://github.com/pybind/pybind11/issues/2059
+        # Example prefix: pybind11_detail_function_record_v1_system_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1
+        first_graph_break = re.sub(
+            r"pybind11_detail_function_record\w*",  # remove abi/platform specific suffix
+            "pybind11_detail_function_record",
+            first_graph_break,
+        )
+
         self.assertExpectedInline(
             first_graph_break,
             """\
 Attempted to call function marked as skipped
-  Explanation: Dynamo cannot trace optree C/C++ function optree._C.PyCapsule.flatten_with_path.
+  Explanation: Dynamo cannot trace optree C/C++ function optree._C.pybind11_detail_function_record.flatten_with_path.
   Hint: Consider using torch.utils._pytree - https://github.com/pytorch/pytorch/blob/main/torch/utils/_pytree.py
 
-  Developer debug context: module: optree._C, qualname: PyCapsule.flatten_with_path, skip reason: <missing reason>
+  Developer debug context: module: optree._C, qualname: pybind11_detail_function_record.flatten_with_path, skip reason: <missing reason>
 
  For more details about this graph break, please visit: https://meta-pytorch.github.io/compile-graph-break-site/gb/gb0007.html""",
         )