CVS commit: pkgsrc/math/py-torch

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  3 06:45:40 UTC 2026

Modified Files:
        pkgsrc/math/py-torch: distinfo
        pkgsrc/math/py-torch/patches:
            patch-third__party_fbgemm_external_cpuinfo_src_init.c
Added Files:
        pkgsrc/math/py-torch/patches:
            patch-torch_csrc_distributed_c10d_init.cpp
            patch-torch_csrc_jit_python_init.cpp
            patch-torch_csrc_utils_python__arg__parser.cpp

Log Message:
py-torch: apply fixes for py-pybind11 pkgsrc version

from YAMAMOTO Takashi in PR 60306


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-torch/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/math/py-torch/patches/patch-third__party_fbgemm_external_cpuinfo_src_init.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/py-torch/patches/patch-torch_csrc_distributed_c10d_init.cpp \
    pkgsrc/math/py-torch/patches/patch-torch_csrc_jit_python_init.cpp \
    pkgsrc/math/py-torch/patches/patch-torch_csrc_utils_python__arg__parser.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-torch/distinfo
diff -u pkgsrc/math/py-torch/distinfo:1.5 pkgsrc/math/py-torch/distinfo:1.6
--- pkgsrc/math/py-torch/distinfo:1.5   Sat Sep 27 01:19:55 2025
+++ pkgsrc/math/py-torch/distinfo       Wed Jun  3 06:45:40 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2025/09/27 01:19:55 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2026/06/03 06:45:40 wiz Exp $
 
 BLAKE2s (pytorch-v2.8.0.tar.gz) = 3f03dc30835f2e81fc4b676c10f74487d5ca995fe0e6f11c7031070042991b30
 SHA512 (pytorch-v2.8.0.tar.gz) = 791e658eab87fb957f025558cb9f925078d2426ab7b6f60771d9841dfb691f67d905ba1330a800008efe7c938b6c69bdc52232bccfe8d4860e795a532cd69d28
@@ -14,7 +14,7 @@ SHA1 (patch-third__party_cpuinfo_src_ini
 SHA1 (patch-third__party_cpuinfo_src_netbsd_api.h) = 018be10b2cb520f870fcc479610bf5200b977bc9
 SHA1 (patch-third__party_cpuinfo_src_netbsd_topology.c) = 5138bf2355bc70042f5ce9f7a019d315be038bca
 SHA1 (patch-third__party_cpuinfo_src_x86_netbsd_init.c) = 52bcc18d780736b6f56f478b90dd81eede2fb499
-SHA1 (patch-third__party_fbgemm_external_cpuinfo_src_init.c) = e80d9b9aaf26cfa2871495c9e9c82cedad4c7660
+SHA1 (patch-third__party_fbgemm_external_cpuinfo_src_init.c) = 8f75ada97904b6d904686d94d93a3caafae8cacf
 SHA1 (patch-third__party_kineto_libkineto_src_ThreadUtil.cpp) = e3084e19835b5b0d7c33fe181f2608bea8b62623
 SHA1 (patch-third__party_protobuf_cmake_CMakeLists.txt) = 20926b73cb40cde56170dd15c0abd9830ec50c3e
 SHA1 (patch-third__party_protobuf_post__process__dist.sh) = b27d6497f8649491441ef3a2bfc9eb5fa22ba474
@@ -23,5 +23,8 @@ SHA1 (patch-third__party_tensorpipe_tens
 SHA1 (patch-third__party_tensorpipe_third__party_libuv_CMakeLists.txt) = a22fc6bd450c2b52a774543c3785107580eec980
 SHA1 (patch-tools_build__pytorch__libs.py) = 4385fac04bc5a80fc31fadcddd405bb89eded062
 SHA1 (patch-torch_csrc_distributed_c10d_ProcessGroupGloo.cpp) = beb79ca2567df69d4d3020644b8760c2b3ec30dd
+SHA1 (patch-torch_csrc_distributed_c10d_init.cpp) = d98c60c8749bfbc6cb8f4c040e26674bb5d37bfc
 SHA1 (patch-torch_csrc_distributed_c10d_socket.cpp) = cace5d33d59bb8fec1933e74223049e5d63aa0a9
+SHA1 (patch-torch_csrc_jit_python_init.cpp) = 0cd5ef965fd720916465ea1d3a1e85be0119c39b
 SHA1 (patch-torch_csrc_utils_byte__order.h) = 089495773fbd7e7340dbd7545341c56d2f4de9b3
+SHA1 (patch-torch_csrc_utils_python__arg__parser.cpp) = f242e46c3bfed2413e6f23c98f05fa4f2a23d9c8

Index: pkgsrc/math/py-torch/patches/patch-third__party_fbgemm_external_cpuinfo_src_init.c
diff -u pkgsrc/math/py-torch/patches/patch-third__party_fbgemm_external_cpuinfo_src_init.c:1.1 pkgsrc/math/py-torch/patches/patch-third__party_fbgemm_external_cpuinfo_src_init.c:1.2
--- pkgsrc/math/py-torch/patches/patch-third__party_fbgemm_external_cpuinfo_src_init.c:1.1      Sat Sep 27 01:19:55 2025
+++ pkgsrc/math/py-torch/patches/patch-third__party_fbgemm_external_cpuinfo_src_init.c  Wed Jun  3 06:45:40 2026
@@ -1,4 +1,6 @@
-$NetBSD: patch-third__party_fbgemm_external_cpuinfo_src_init.c,v 1.1 2025/09/27 01:19:55 ryoon Exp $
+$NetBSD: patch-third__party_fbgemm_external_cpuinfo_src_init.c,v 1.2 2026/06/03 06:45:40 wiz Exp $
+
+Add NetBSD support.
 
 --- third_party/fbgemm/external/cpuinfo/src/init.c.orig        2025-08-16 20:50:13.480312485 +0000
 +++ third_party/fbgemm/external/cpuinfo/src/init.c

Added files:

Index: pkgsrc/math/py-torch/patches/patch-torch_csrc_distributed_c10d_init.cpp
diff -u /dev/null pkgsrc/math/py-torch/patches/patch-torch_csrc_distributed_c10d_init.cpp:1.1
--- /dev/null   Wed Jun  3 06:45:40 2026
+++ pkgsrc/math/py-torch/patches/patch-torch_csrc_distributed_c10d_init.cpp     Wed Jun  3 06:45:40 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-torch_csrc_distributed_c10d_init.cpp,v 1.1 2026/06/03 06:45:40 wiz Exp $
+
+commit b248ebc17075c0c3ad2b2532970d2ada32b2cf94
+Author: Itamar Oren <itamaro%meta.com@localhost>
+Date:   Sun Apr 5 17:39:43 2026 +0000
+
+    [caffe2] Fix pybind11 3.0.3 ambiguous return type deduction (#179277)
+    
+    Summary:
+    Add explicit return type annotations to resolve ambiguous type
+    deduction in ternary/multi-branch expressions with py::make_tuple.
+    
+    Differential Revision: D99391633
+    
+    Pull Request resolved: https://github.com/pytorch/pytorch/pull/179277
+    Approved by: https://github.com/Skylion007
+
+--- torch/csrc/distributed/c10d/init.cpp.orig  2025-08-06 17:08:06.000000000 +0000
++++ torch/csrc/distributed/c10d/init.cpp
+@@ -875,7 +875,7 @@ This class does not support ``__members__`` property.)
+             return ::c10d::ReduceOp(self);
+           })
+       .def(py::pickle(
+-          [](const ::c10d::ReduceOp& r) {
++          [](const ::c10d::ReduceOp& r) -> py::tuple {
+             // __getstate__
+             if (r.op_ != ::c10d::ReduceOp::RedOpType::PREMUL_SUM) {
+               return py::make_tuple(r.op_, py::none());
Index: pkgsrc/math/py-torch/patches/patch-torch_csrc_jit_python_init.cpp
diff -u /dev/null pkgsrc/math/py-torch/patches/patch-torch_csrc_jit_python_init.cpp:1.1
--- /dev/null   Wed Jun  3 06:45:40 2026
+++ pkgsrc/math/py-torch/patches/patch-torch_csrc_jit_python_init.cpp   Wed Jun  3 06:45:40 2026
@@ -0,0 +1,37 @@
+$NetBSD: patch-torch_csrc_jit_python_init.cpp,v 1.1 2026/06/03 06:45:40 wiz Exp $
+
+commit b248ebc17075c0c3ad2b2532970d2ada32b2cf94
+Author: Itamar Oren <itamaro%meta.com@localhost>
+Date:   Sun Apr 5 17:39:43 2026 +0000
+
+    [caffe2] Fix pybind11 3.0.3 ambiguous return type deduction (#179277)
+    
+    Summary:
+    Add explicit return type annotations to resolve ambiguous type
+    deduction in ternary/multi-branch expressions with py::make_tuple.
+    
+    Differential Revision: D99391633
+    
+    Pull Request resolved: https://github.com/pytorch/pytorch/pull/179277
+    Approved by: https://github.com/Skylion007
+
+--- torch/csrc/jit/python/init.cpp.orig        2025-08-06 17:08:06.000000000 +0000
++++ torch/csrc/jit/python/init.cpp
+@@ -1785,7 +1785,7 @@ void initJITBindings(PyObject* module) {
+ 
+   m.def(
+       "_jit_get_operation",
+-      [](const std::string& op_name) {
++      [](const std::string& op_name) -> py::tuple {
+         try {
+           auto symbol = Symbol::fromQualString(op_name);
+           const auto sortedOps = getAllSortedOperatorsFor(symbol);
+@@ -1832,7 +1832,7 @@ void initJITBindings(PyObject* module) {
+       "_maybe_call_torch_function_for_op_packet",
+       [](py::handle op_overload_packet,
+          const py::args& args,
+-         const py::kwargs& kwargs) {
++         const py::kwargs& kwargs) -> py::tuple {
+         py::list ns_method =
+             op_overload_packet.attr("_qualified_op_name").attr("split")("::");
+         auto res = _maybe_handle_torch_function(
Index: pkgsrc/math/py-torch/patches/patch-torch_csrc_utils_python__arg__parser.cpp
diff -u /dev/null pkgsrc/math/py-torch/patches/patch-torch_csrc_utils_python__arg__parser.cpp:1.1
--- /dev/null   Wed Jun  3 06:45:40 2026
+++ pkgsrc/math/py-torch/patches/patch-torch_csrc_utils_python__arg__parser.cpp Wed Jun  3 06:45:40 2026
@@ -0,0 +1,35 @@
+$NetBSD: patch-torch_csrc_utils_python__arg__parser.cpp,v 1.1 2026/06/03 06:45:40 wiz Exp $
+
+commit b248ebc17075c0c3ad2b2532970d2ada32b2cf94
+Author: Itamar Oren <itamaro%meta.com@localhost>
+Date:   Sun Apr 5 17:39:43 2026 +0000
+
+    [caffe2] Fix pybind11 3.0.3 ambiguous return type deduction (#179277)
+    
+    Summary:
+    Add explicit return type annotations to resolve ambiguous type
+    deduction in ternary/multi-branch expressions with py::make_tuple.
+    
+    Differential Revision: D99391633
+    
+    Pull Request resolved: https://github.com/pytorch/pytorch/pull/179277
+    Approved by: https://github.com/Skylion007
+
+--- torch/csrc/utils/python_arg_parser.cpp.orig        2025-08-06 17:08:06.000000000 +0000
++++ torch/csrc/utils/python_arg_parser.cpp
+@@ -673,9 +673,12 @@ auto handle_torch_function_indexing(
+   }
+   py::object func =
+       PyObject_FastGetAttrString(THPVariableClass, (char*)func_name);
+-  py::object args = (val == nullptr)
+-      ? py::make_tuple(py::handle(self), py::handle(index))
+-      : py::make_tuple(py::handle(self), py::handle(index), py::handle(val));
++  py::tuple args;
++  if (val == nullptr) {
++    args = py::make_tuple(py::handle(self), py::handle(index));
++  } else {
++    args = py::make_tuple(py::handle(self), py::handle(index), py::handle(val));
++  }
+   return handle_torch_function_no_python_arg_parser(
+       overridable_args,
+       args.ptr(),