git: 993fa95b2e60 - main - misc/py-pytorch: update 2.6.0 → 2.7.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 25 Apr 2025 03:22:32 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=993fa95b2e607202a03d06385d7410562a1bf874
commit 993fa95b2e607202a03d06385d7410562a1bf874
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-04-25 02:59:10 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-04-25 03:22:26 +0000
misc/py-pytorch: update 2.6.0 → 2.7.0
---
misc/py-pytorch/Makefile | 14 ++++++++++----
misc/py-pytorch/distinfo | 6 +++---
misc/py-pytorch/files/patch-CMakeLists.txt | 14 +++++++-------
misc/py-pytorch/files/patch-requirements.txt | 11 -----------
misc/py-pytorch/files/patch-setup.py | 11 -----------
misc/py-pytorch/files/patch-tools_build__pytorch__libs.py | 11 +++++++++++
6 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/misc/py-pytorch/Makefile b/misc/py-pytorch/Makefile
index 8529eb0f0277..a35c58d3c26b 100644
--- a/misc/py-pytorch/Makefile
+++ b/misc/py-pytorch/Makefile
@@ -1,7 +1,6 @@
PORTNAME= pytorch
DISTVERSIONPREFIX= v
-DISTVERSION= 2.6.0
-PORTREVISION= 4
+DISTVERSION= 2.7.0
CATEGORIES= misc # machine-learning
MASTER_SITES= https://github.com/pytorch/pytorch/releases/download/v${DISTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -43,8 +42,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.10.0:devel/py-typing-extensions@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR}
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}astunparse>0:devel/py-astunparse@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} # optional dependency
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}expecttest>=0.2.1:devel/py-expecttest@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} # optional dependencies
USES= compiler:c++17-lang localbase:ldflags python
USE_PYTHON= distutils autoplist
@@ -65,6 +65,9 @@ BINARY_ALIAS= make=${GMAKE}
POST_PLIST= fix-plist
+TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+TEST_WRKSRC= ${WRKSRC}/test
+
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD
@@ -87,4 +90,7 @@ post-install: # strip binaries
fix-plist: # remove the stray %%PYTHON_SITELIBDIR%%/caffe2 file
@${REINPLACE_CMD} -e "s|.*/caffe2$$||" ${TMPPLIST}
+do-test:
+ cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} run_test.py
+
.include <bsd.port.mk>
diff --git a/misc/py-pytorch/distinfo b/misc/py-pytorch/distinfo
index ad7811521f78..9641f134003a 100644
--- a/misc/py-pytorch/distinfo
+++ b/misc/py-pytorch/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1741159433
-SHA256 (pytorch/pytorch-v2.6.0.tar.gz) = 3005690eb7b083c443a38c7657938af63902f524ad87a6c83f1aca38c77e3b57
-SIZE (pytorch/pytorch-v2.6.0.tar.gz) = 303743061
+TIMESTAMP = 1745510594
+SHA256 (pytorch/pytorch-v2.7.0.tar.gz) = ecca266fa2de4235a9fd5a18a33299a9de55ab3babb87f8c297c1c9ab8d436bd
+SIZE (pytorch/pytorch-v2.7.0.tar.gz) = 285987092
SHA256 (pytorch/pytorch-cpuinfo-1e83a2f_GH0.tar.gz) = b8945cf45d4f13054d7f52e8bd9314690ea840d4d0ff21febd95ff04de3c613e
SIZE (pytorch/pytorch-cpuinfo-1e83a2f_GH0.tar.gz) = 3541839
diff --git a/misc/py-pytorch/files/patch-CMakeLists.txt b/misc/py-pytorch/files/patch-CMakeLists.txt
index ea1c77c75a0a..2a92cee61cdc 100644
--- a/misc/py-pytorch/files/patch-CMakeLists.txt
+++ b/misc/py-pytorch/files/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
---- CMakeLists.txt.orig 2024-10-29 18:00:43 UTC
+--- CMakeLists.txt.orig 2025-04-23 16:19:35 UTC
+++ CMakeLists.txt
-@@ -181,7 +181,7 @@ set(CPU_INTEL OFF)
- set(CPU_AARCH64 OFF)
+@@ -182,7 +182,7 @@ set(CPU_POWER OFF)
set(CPU_INTEL OFF)
+ set(CPU_POWER OFF)
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|x86_64)")
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64|x86_64)")
set(CPU_INTEL ON)
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
set(CPU_AARCH64 ON)
-@@ -209,7 +209,7 @@ option(BUILD_CUSTOM_PROTOBUF
+@@ -212,7 +212,7 @@ option(BUILD_CUSTOM_PROTOBUF
option(ATEN_NO_TEST "Do not build ATen test binaries" OFF)
option(BUILD_BINARY "Build C++ binaries" OFF)
option(BUILD_CUSTOM_PROTOBUF
@@ -18,7 +18,7 @@
option(BUILD_PYTHON "Build Python binaries" ON)
option(BUILD_LITE_INTERPRETER "Master flag to build Lite Interpreter" OFF)
option(BUILD_SHARED_LIBS "Build libcaffe2.so" ON)
-@@ -267,7 +267,7 @@ option(USE_GLOG "Use GLOG" OFF)
+@@ -263,7 +263,7 @@ option(USE_GLOG "Use GLOG" OFF)
option(USE_FAKELOWP "Use FakeLowp operators" OFF)
option(USE_GFLAGS "Use GFLAGS" OFF)
option(USE_GLOG "Use GLOG" OFF)
@@ -27,7 +27,7 @@
option(USE_MAGMA "Use MAGMA" ON)
option(USE_PYTORCH_METAL "Use Metal for PyTorch iOS build" OFF)
option(USE_PYTORCH_METAL_EXPORT "Export Metal models on MacOSX desktop" OFF)
-@@ -460,15 +460,15 @@ option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo
+@@ -453,15 +453,15 @@ option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo
# USE_SYSTEM_LIBS being "OFF".
option(USE_SYSTEM_LIBS "Use all available system-provided libraries." OFF)
option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo." OFF)
@@ -44,5 +44,5 @@
-option(USE_SYSTEM_ONNX "Use system-provided onnx." OFF)
+option(USE_SYSTEM_ONNX "Use system-provided onnx." ON)
option(USE_SYSTEM_XNNPACK "Use system-provided xnnpack." OFF)
+ option(USE_SYSTEM_NVTX "Use system-provided nvtx." OFF)
option(USE_GOLD_LINKER "Use ld.gold to link" OFF)
- if(USE_SYSTEM_LIBS)
diff --git a/misc/py-pytorch/files/patch-requirements.txt b/misc/py-pytorch/files/patch-requirements.txt
deleted file mode 100644
index 9088b16615c0..000000000000
--- a/misc/py-pytorch/files/patch-requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- requirements.txt.orig 2025-03-18 16:44:23 UTC
-+++ requirements.txt
-@@ -9,7 +9,7 @@ typing-extensions>=4.10.0
- setuptools
- types-dataclasses
- typing-extensions>=4.10.0
--sympy==1.13.1 ; python_version >= "3.9"
-+sympy>=1.13.1 ; python_version >= "3.9"
- filelock
- networkx
- jinja2
diff --git a/misc/py-pytorch/files/patch-setup.py b/misc/py-pytorch/files/patch-setup.py
deleted file mode 100644
index f3589af84e10..000000000000
--- a/misc/py-pytorch/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig 2025-03-18 16:43:41 UTC
-+++ setup.py
-@@ -1099,7 +1099,7 @@ def main():
- "filelock",
- "typing-extensions>=4.10.0",
- 'setuptools ; python_version >= "3.12"',
-- 'sympy==1.13.1 ; python_version >= "3.9"',
-+ 'sympy>=1.13.1 ; python_version >= "3.9"',
- "networkx",
- "jinja2",
- "fsspec",
diff --git a/misc/py-pytorch/files/patch-tools_build__pytorch__libs.py b/misc/py-pytorch/files/patch-tools_build__pytorch__libs.py
new file mode 100644
index 000000000000..2ab33dd899a4
--- /dev/null
+++ b/misc/py-pytorch/files/patch-tools_build__pytorch__libs.py
@@ -0,0 +1,11 @@
+--- tools/build_pytorch_libs.py.orig 2025-04-24 16:28:33 UTC
++++ tools/build_pytorch_libs.py
+@@ -119,7 +119,7 @@ def build_pytorch(
+ cmake: CMake,
+ ) -> None:
+ my_env = _create_build_env()
+- checkout_nccl()
++ #checkout_nccl()
+ build_test = not check_negative_env_flag("BUILD_TEST")
+ cmake.generate(
+ version, cmake_python_library, build_python, build_test, my_env, rerun_cmake