From cef74b4e0333a7982ce1bd336d18f28b8e13d603 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sat, 12 Oct 2024 13:10:02 +0000 Subject: [PATCH] chore(main/python-{torch,torchaudio,torchvision}) Move to main Move pytorch from x11 to main after removal of opencv dependencies in #21764. --- ...make-python-find-Development-before-Development.Module.patch | 0 {x11-packages => packages}/python-torch/0002-fix-macros.patch | 0 .../python-torch/0003-impl-posix-shm.patch | 0 {x11-packages => packages}/python-torch/0004-memalign.patch | 0 .../python-torch/0005-fix-arm-target-triple.patch | 0 .../python-torch/0008-fix-for-narrowing.patch | 0 .../python-torch/0009-fix-over-optimizing.patch | 0 .../python-torch/0010-cmake-Dependencies.cmake.patch | 0 {x11-packages => packages}/python-torch/build.sh | 2 +- .../python-torch/torch-csrc-autograd-python_function.cpp.patch | 0 .../0001-do-not-try-to-import-torch-when-cross-compiling.patch | 0 {x11-packages => packages}/python-torchaudio/build.sh | 2 +- {x11-packages => packages}/python-torchvision/build.sh | 2 +- {x11-packages => packages}/python-torchvision/setup.py.patch | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename {x11-packages => packages}/python-torch/0001-cmake-python-find-Development-before-Development.Module.patch (100%) rename {x11-packages => packages}/python-torch/0002-fix-macros.patch (100%) rename {x11-packages => packages}/python-torch/0003-impl-posix-shm.patch (100%) rename {x11-packages => packages}/python-torch/0004-memalign.patch (100%) rename {x11-packages => packages}/python-torch/0005-fix-arm-target-triple.patch (100%) rename {x11-packages => packages}/python-torch/0008-fix-for-narrowing.patch (100%) rename {x11-packages => packages}/python-torch/0009-fix-over-optimizing.patch (100%) rename {x11-packages => packages}/python-torch/0010-cmake-Dependencies.cmake.patch (100%) rename {x11-packages => packages}/python-torch/build.sh (99%) rename {x11-packages => packages}/python-torch/torch-csrc-autograd-python_function.cpp.patch (100%) rename {x11-packages => packages}/python-torchaudio/0001-do-not-try-to-import-torch-when-cross-compiling.patch (100%) rename {x11-packages => packages}/python-torchaudio/build.sh (97%) rename {x11-packages => packages}/python-torchvision/build.sh (98%) rename {x11-packages => packages}/python-torchvision/setup.py.patch (100%) diff --git a/x11-packages/python-torch/0001-cmake-python-find-Development-before-Development.Module.patch b/packages/python-torch/0001-cmake-python-find-Development-before-Development.Module.patch similarity index 100% rename from x11-packages/python-torch/0001-cmake-python-find-Development-before-Development.Module.patch rename to packages/python-torch/0001-cmake-python-find-Development-before-Development.Module.patch diff --git a/x11-packages/python-torch/0002-fix-macros.patch b/packages/python-torch/0002-fix-macros.patch similarity index 100% rename from x11-packages/python-torch/0002-fix-macros.patch rename to packages/python-torch/0002-fix-macros.patch diff --git a/x11-packages/python-torch/0003-impl-posix-shm.patch b/packages/python-torch/0003-impl-posix-shm.patch similarity index 100% rename from x11-packages/python-torch/0003-impl-posix-shm.patch rename to packages/python-torch/0003-impl-posix-shm.patch diff --git a/x11-packages/python-torch/0004-memalign.patch b/packages/python-torch/0004-memalign.patch similarity index 100% rename from x11-packages/python-torch/0004-memalign.patch rename to packages/python-torch/0004-memalign.patch diff --git a/x11-packages/python-torch/0005-fix-arm-target-triple.patch b/packages/python-torch/0005-fix-arm-target-triple.patch similarity index 100% rename from x11-packages/python-torch/0005-fix-arm-target-triple.patch rename to packages/python-torch/0005-fix-arm-target-triple.patch diff --git a/x11-packages/python-torch/0008-fix-for-narrowing.patch b/packages/python-torch/0008-fix-for-narrowing.patch similarity index 100% rename from x11-packages/python-torch/0008-fix-for-narrowing.patch rename to packages/python-torch/0008-fix-for-narrowing.patch diff --git a/x11-packages/python-torch/0009-fix-over-optimizing.patch b/packages/python-torch/0009-fix-over-optimizing.patch similarity index 100% rename from x11-packages/python-torch/0009-fix-over-optimizing.patch rename to packages/python-torch/0009-fix-over-optimizing.patch diff --git a/x11-packages/python-torch/0010-cmake-Dependencies.cmake.patch b/packages/python-torch/0010-cmake-Dependencies.cmake.patch similarity index 100% rename from x11-packages/python-torch/0010-cmake-Dependencies.cmake.patch rename to packages/python-torch/0010-cmake-Dependencies.cmake.patch diff --git a/x11-packages/python-torch/build.sh b/packages/python-torch/build.sh similarity index 99% rename from x11-packages/python-torch/build.sh rename to packages/python-torch/build.sh index da4ae48cf5..6f3df53f56 100644 --- a/x11-packages/python-torch/build.sh +++ b/packages/python-torch/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tensors and Dynamic neural networks in Python" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="2.4.1" -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=git+https://github.com/pytorch/pytorch TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag" TERMUX_PKG_DEPENDS="libc++, libopenblas, libprotobuf, python, python-numpy, python-pip" diff --git a/x11-packages/python-torch/torch-csrc-autograd-python_function.cpp.patch b/packages/python-torch/torch-csrc-autograd-python_function.cpp.patch similarity index 100% rename from x11-packages/python-torch/torch-csrc-autograd-python_function.cpp.patch rename to packages/python-torch/torch-csrc-autograd-python_function.cpp.patch diff --git a/x11-packages/python-torchaudio/0001-do-not-try-to-import-torch-when-cross-compiling.patch b/packages/python-torchaudio/0001-do-not-try-to-import-torch-when-cross-compiling.patch similarity index 100% rename from x11-packages/python-torchaudio/0001-do-not-try-to-import-torch-when-cross-compiling.patch rename to packages/python-torchaudio/0001-do-not-try-to-import-torch-when-cross-compiling.patch diff --git a/x11-packages/python-torchaudio/build.sh b/packages/python-torchaudio/build.sh similarity index 97% rename from x11-packages/python-torchaudio/build.sh rename to packages/python-torchaudio/build.sh index 0f13a35bb4..76ab297da3 100644 --- a/x11-packages/python-torchaudio/build.sh +++ b/packages/python-torchaudio/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Data manipulation and transformation for audio signal pr TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=2.4.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=git+https://github.com/pytorch/audio # FFMPEG TERMUX_PKG_DEPENDS="libc++, python, python-pip, python-torch" diff --git a/x11-packages/python-torchvision/build.sh b/packages/python-torchvision/build.sh similarity index 98% rename from x11-packages/python-torchvision/build.sh rename to packages/python-torchvision/build.sh index eb7563e666..684319f3cd 100644 --- a/x11-packages/python-torchvision/build.sh +++ b/packages/python-torchvision/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Datasets, Transforms and Models specific to Computer Vis TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.19.1 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_REVISION=2 TERMUX_PKG_SRCURL=git+https://github.com/pytorch/vision # ffmpeg TERMUX_PKG_DEPENDS="libc++, python, python-numpy, python-pillow, python-pip, python-torch, libjpeg-turbo, libpng, zlib" diff --git a/x11-packages/python-torchvision/setup.py.patch b/packages/python-torchvision/setup.py.patch similarity index 100% rename from x11-packages/python-torchvision/setup.py.patch rename to packages/python-torchvision/setup.py.patch