[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: c6c1ae168e2ebd9bb070c31b7468f44ee4884d0d
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun Jul 3 08:36:55 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Jul 3 08:36:55 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c6c1ae16
sci-libs/pytorch: moved to ::gentoo
Signed-off-by: Andrew Ammerlaan gentoo.org>
...-t-build-libtorch-again-for-PyTorch-1.4.0.patch | 30 --
...-t-build-libtorch-again-for-PyTorch-1.7.1.patch | 18 --
...path-to-caffe2-build-dir-made-by-libtorch.patch | 46 ---
...rpath-of-Caffe2-library-for-system-wide-i.patch | 104 ---
...ibrary-directory-according-to-CMake-build.patch | 31 --
...conversion-ambiguity-in-ternary-operators.patch | 38 ---
sci-libs/pytorch/files/get_third_parties | 20 --
sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch | 52
.../files/pytorch-1.10.0-fix-distutils.patch | 93 --
sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch | 12 -
.../files/pytorch-1.10.1-nccl-nvccflags.patch | 37 ---
sci-libs/pytorch/files/pytorch-1.2.0-setup.patch | 24 --
.../files/pytorch-1.4.0-nccl-nvccflags.patch | 28 --
.../pytorch/files/pytorch-1.4.0-skip-tests.patch | 28 --
sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch | 15 -
.../files/pytorch-1.6.0-global-dlopen.patch| 15 -
.../files/pytorch-1.6.0-nccl-nvccflags.patch | 27 --
sci-libs/pytorch/files/pytorch-1.6.0-setup.patch | 14 -
.../pytorch/files/pytorch-1.6.0-skip-tests.patch | 14 -
.../pytorch-1.6.0-tensorpipe-unbundle-libuv.patch | 13 -
.../pytorch/files/pytorch-1.7.1-no-rpath.patch | 12 -
sci-libs/pytorch/files/pytorch-1.7.1-setup.patch | 12 -
.../pytorch-1.7.1-tensorpipe-unbundle-libuv.patch | 12 -
.../files/pytorch-1.7.1-torch_shm_manager.patch| 13 -
...ibrary-directory-according-to-CMake-build.patch | 32 --
.../files/pytorch-1.9.1-fix-wrong-hipify.patch | 13 -
sci-libs/pytorch/metadata.xml | 34 ---
sci-libs/pytorch/pytorch-1.10.2.ebuild | 339 -
28 files changed, 1126 deletions(-)
diff --git
a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch
b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch
deleted file mode 100644
index de9fe9a0d..0
---
a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e5003b88ad3a504eb04c0ba66c2f439149de2ee3 Mon Sep 17 00:00:00 2001
-From: Alexey Chernov <4er...@gmail.com>
-Date: Tue, 5 Nov 2019 00:58:17 +0300
-Subject: [PATCH 2/7] Don't build `libtorch` again for PyTorch
-
-If starting with building of `libtorch` using CMake,
-don't build it again for the sake of running `setup.py`
-to build Python version (PyTorch).
- setup.py | 7 ---
- 1 file changed, 7 deletions(-)
-
-Index: pytorch-1.4.0_p0/setup.py
-===
pytorch-1.4.0_p0.orig/setup.py
-+++ pytorch-1.4.0_p0/setup.py
-@@ -303,13 +303,6 @@ def build_deps():
- check_pydep('yaml', 'pyyaml')
- check_pydep('typing', 'typing')
-
--build_caffe2(version=version,
-- cmake_python_library=cmake_python_library,
-- build_python=True,
-- rerun_cmake=RERUN_CMAKE,
-- cmake_only=CMAKE_ONLY,
-- cmake=cmake)
--
- version_path = os.path.join(cwd, 'torch', 'version.py')
- with open(version_path, 'w') as f:
- f.write("__version__ = '{}'\n".format(version))
diff --git
a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
deleted file mode 100644
index 16d2c1f2e..0
---
a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2db381644c..2241a33015 100644
a/setup.py
-+++ b/setup.py
-@@ -307,13 +307,6 @@ def build_deps():
- check_pydep('yaml', 'pyyaml')
- check_pydep('typing', 'typing')
-
--build_caffe2(version=version,
-- cmake_python_library=cmake_python_library,
-- build_python=True,
-- rerun_cmake=RERUN_CMAKE,
-- cmake_only=CMAKE_ONLY,
-- cmake=cmake)
--
- if CMAKE_ONLY:
- report('Finished running cmake. Run "ccmake build" or '
-'"cmake-gui build" to adjust build options and '
diff --git
a/sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
b/sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
deleted file mode 100644
index f71ba17bc..0
---
a/sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: fad64b065493a4406304cf7cb4d4aa36a7876555
Author: Miezhiko gmail com>
AuthorDate: Mon Dec 27 10:56:29 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Mon Dec 27 11:01:04 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=fad64b06
sci-libs/pytorch: fixes for cuda USE flag, nccl update
Signed-off-by: Miezhiko gmail.com>
Closes: https://github.com/gentoo/sci/pull/1132
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../files/pytorch-1.10.1-nccl-nvccflags.patch | 37 ++
sci-libs/pytorch/pytorch-1.10.1.ebuild | 7 ++--
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch
b/sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch
new file mode 100644
index 0..0ac12a1e7
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch
@@ -0,0 +1,37 @@
+From 7b04cd503fa1a6265893e0320ee246bcc0bd98cf Mon Sep 17 00:00:00 2001
+From: Miezhiko
+Date: Mon, 27 Dec 2021 14:48:12 +0400
+Subject: [PATCH] neutral flags
+
+---
+ makefiles/common.mk | 10 +-
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/makefiles/common.mk b/makefiles/common.mk
+index 64f8d2dc6..7a979c90f 100644
+--- a/makefiles/common.mk
b/makefiles/common.mk
+@@ -55,7 +55,7 @@ CXXFLAGS := -DCUDA_MAJOR=$(CUDA_MAJOR)
-DCUDA_MINOR=$(CUDA_MINOR) -fPIC -fvisi
+ # Maxrregcount needs to be set accordingly to NCCL_MAX_NTHREADS (otherwise it
will cause kernel launch errors)
+ # 512 : 120, 640 : 96, 768 : 80, 1024 : 60
+ # We would not have to set this if we used __launch_bounds__, but this only
works on kernels, not on functions.
+-NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -std=c++11 --expt-extended-lambda
-Xptxas -maxrregcount=96 -Xfatbin -compress-all
++NVCUFLAGS := $(NVCCFLAGS) $(NVCC_GENCODE) -std=c++11 --expt-extended-lambda
-Xptxas -maxrregcount=96 -Xfatbin -compress-all
+ # Use addprefix so that we can specify more than one path
+ NVLDFLAGS := -L${CUDA_LIB} -lcudart -lrt
+
+@@ -69,14 +69,6 @@ NVLDFLAGS += ${GCOV_FLAGS:%=-Xcompiler %}
+ # $(warning GCOV_FLAGS=${GCOV_FLAGS})
+ ## GCOV ##
+
+-ifeq ($(DEBUG), 0)
+-NVCUFLAGS += -O3
+-CXXFLAGS += -O3 -g
+-else
+-NVCUFLAGS += -O0 -G -g
+-CXXFLAGS += -O0 -g -ggdb3
+-endif
+-
+ ifneq ($(VERBOSE), 0)
+ NVCUFLAGS += -Xptxas -v -Xcompiler -Wall,-Wextra,-Wno-unused-parameter
+ CXXFLAGS += -Wall -Wextra
diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild
b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index a7bbb62ac..948d595a7 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -28,7 +28,7 @@
https://github.com/facebookincubator/gloo/archive/c22a5cfba94edf8ea4f53a174d38aa
https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz
-> googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz
https://github.com/intel/ideep/archive/9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz
-> ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz
https://github.com/intel/mkl-dnn/archive/5ef631a0.tar.gz ->
mkl-dnn-5ef631a0.tar.gz
-cuda? ( https://github.com/NVIDIA/nccl/archive/033d7995.tar.gz ->
nccl-033d7995.tar.gz )
+cuda? (
https://github.com/NVIDIA/nccl/archive/c5790b36722d5b41ee2a9b2bad69e364180ffd22.tar.gz
-> nccl-c5790b36722d5b41ee2a9b2bad69e364180ffd22.tar.gz )
https://github.com/Maratyszcza/NNPACK/archive/c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz
-> NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz
https://github.com/onnx/onnx/archive/a82c6a70.tar.gz -> onnx-a82c6a70.tar.gz
https://github.com/onnx/onnx-tensorrt/archive/c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz
-> onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz
@@ -168,7 +168,7 @@ src_prepare() {
rmdir third_party/ideep/mkl-dnn || die
ln -sv "${WORKDIR}"/mkl-dnn-5ef631a030a6f73131c77892041042805a06064f
third_party/ideep/mkl-dnn || die
rmdir third_party/nccl/nccl || die
- ln -sv "${WORKDIR}"/nccl-033d799524fb97629af5ac2f609de367472b2696
third_party/nccl/nccl || die
+ ln -sv "${WORKDIR}"/nccl-c5790b36722d5b41ee2a9b2bad69e364180ffd22
third_party/nccl/nccl || die
rmdir third_party/NNPACK || die
ln -sv "${WORKDIR}"/NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73
third_party/NNPACK || die
rmdir third_party/onnx || die
@@ -208,9 +208,10 @@ src_prepare() {
if use cuda; then
cd third_party/nccl/nccl || die
- eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
+ eapply "${FILESDIR}"/${PN}-1.10.1-nccl-nvccflags.patch
cuda_src_prepare
export CUDAHOSTCXX=$(cuda_gccdir)/g++
+ cd "${S}"
fi
if use rocm; then
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: a5bc890e5d880b2b99952060fe82170a4680eb81
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun Dec 26 14:10:33 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Dec 26 14:12:03 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a5bc890e
sci-libs/pytorch: add clhpp patch, fix setuptools dep
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch | 52 ++
sci-libs/pytorch/pytorch-1.10.1.ebuild | 8 ++--
2 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch
b/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch
new file mode 100644
index 0..9c267dc6e
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch
@@ -0,0 +1,52 @@
+diff --git a/caffe2/contrib/opencl/OpenCL/cl.hpp
b/caffe2/contrib/opencl/OpenCL/cl.hpp
+index 87cc4a1..7c27e33 100644
+--- a/caffe2/contrib/opencl/OpenCL/cl.hpp
b/caffe2/contrib/opencl/OpenCL/cl.hpp
+@@ -76,7 +76,7 @@
+ * #if defined(__APPLE__) || defined(__MACOSX)
+ * #include
+ * #else
+- * #include
++ * #include
+ * #endif
+ * #include
+ * #include
+diff --git a/caffe2/contrib/opencl/context.h b/caffe2/contrib/opencl/context.h
+index b1e61c2..968d3c7 100644
+--- a/caffe2/contrib/opencl/context.h
b/caffe2/contrib/opencl/context.h
+@@ -11,7 +11,7 @@
+ #if defined(__APPLE__) || defined(__MACOSX)
+ #include
+ #else
+-#include
++#include
+ #endif
+
+ #define OPENCL_CHECK(expr) (void)expr
+diff --git a/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp
b/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp
+index f3badf7..928c9f0 100644
+--- a/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp
b/caffe2/mobile/contrib/libopencl-stub/include/CL/cl.hpp
+@@ -76,7 +76,7 @@
+ * #if defined(__APPLE__) || defined(__MACOSX)
+ * #include
+ * #else
+- * #include
++ * #include
+ * #endif
+ * #include
+ * #include
+diff --git a/third_party/tensorflow_cuda_bazel_build/cuda/BUILD
b/third_party/tensorflow_cuda_bazel_build/cuda/BUILD
+index f7271af..334f4ec 100755
+--- a/third_party/tensorflow_cuda_bazel_build/cuda/BUILD
b/third_party/tensorflow_cuda_bazel_build/cuda/BUILD
+@@ -188,7 +188,7 @@ CUDA_INCLUDES_FILES = [
+ "include/CL/cl_gl_ext.h",
+ "include/CL/cl_gl.h",
+ "include/CL/cl.h",
+-"include/CL/cl.hpp",
++"include/CL/cl2.hpp",
+ "include/CL/cl_platform.h",
+ "include/CL/opencl.h",
+ "include/common_functions.h",
diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild
b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 2a11e6240..98afa9662 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_SETUPTOOLS=manual
PYTHON_COMPAT=( python3_{8..10} )
inherit cmake cuda distutils-r1 prefix
@@ -84,9 +84,10 @@ RDEPEND="
leveldb? ( dev-libs/leveldb )
lmdb? ( dev-db/lmdb )
mpi? ( virtual/mpi )
- opencl? ( dev-libs/clhpp virtual/opencl )
+ opencl? ( dev-libs/clhpp )
opencv? ( media-libs/opencv )
python? ( ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/pybind11[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/protobuf-python:=
@@ -118,9 +119,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.7.1-torch_shm_manager.patch
"${FILESDIR}"/${PN}-1.10.0-nonull.patch
"${FILESDIR}"/${PN}-1.10.0-fix-distutils.patch
+ "${FILESDIR}"/${PN}-1.10.0-clhpp2.patch
)
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
src_prepare() {
cmake_src_prepare
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: 74376475a3dbb8124f5fedea9af4ba69a2a4b82f
Author: YiyangWu gmail com>
AuthorDate: Sat Dec 25 16:46:19 2021 +
Commit: Benda XU gentoo org>
CommitDate: Sun Dec 26 13:36:52 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=74376475
sci-libs/pytorch: fix python build with >=setuptools-59.6
Reference:
https://github.com/pytorch/pytorch/commit/07767569c964552702bf374da753212eb9cde327
Reference: https://github.com/gentoo/sci/pull/1123#issuecomment-999597677
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Closes: https://github.com/gentoo/sci/pull/1130
Signed-off-by: Yiyang Wu gmail.com>
Signed-off-by: Benda Xu gentoo.org>
.../files/pytorch-1.10.0-fix-distutils.patch | 93 ++
sci-libs/pytorch/pytorch-1.10.1.ebuild | 1 +
2 files changed, 94 insertions(+)
diff --git a/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch
b/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch
new file mode 100644
index 0..334bcda6f
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch
@@ -0,0 +1,93 @@
+This fix distutils-r1_src_install failure with setuptools-59
+
+From 9af2edb158b3603c44eff6e12896f1d215e8b898 Mon Sep 17 00:00:00 2001
+From: Nikita Shulga
+Date: Tue, 14 Dec 2021 07:15:34 -0800
+Subject: [PATCH] Properly import LooseVersion
+
+This fixes regression introduced by
https://github.com/pytorch/pytorch/pull/57040
+
+Somehow importing `distutils` from `setuptool` caused import of
+`distutils.versions`, which is not a documented dependency and got
+change with the release of
+[setuptools-59.6.0](https://github.com/pypa/setuptools/tree/v59.6.0)
+We should not rely on that, as
+`import distutils` never re-imports `distutils.version`, which one can
+see by observing
+https://github.com/python/cpython/blob/3.9/Lib/distutils/__init__.py
+or by running:
+```
+% python3 -c "import distutils;print(distutils.__version__, dir(distutils))"
+3.7.5 ['__builtins__', '__cached__', '__doc__', '__file__', '__loader__',
'__name__', '__package__', '__path__', '__spec__', '__version__', 'sys']
+% python3 -c "from setuptools import distutils;print(distutils.__version__,
dir(distutils))"
+3.7.5 ['__builtins__', '__cached__', '__doc__', '__file__', '__loader__',
'__name__', '__package__', '__path__', '__spec__', '__version__',
'archive_util', 'ccompiler', 'cmd', 'config', 'core', 'debug', 'dep_util',
'dir_util', 'dist', 'errors', 'extension', 'fancy_getopt', 'file_util',
'filelist', 'log', 'spawn', 'sys', 'sysconfig', 'util', 'version']
+```
+---
+ test/run_test.py | 4 ++--
+ tools/setup_helpers/cmake.py | 8
+ torch/testing/_internal/common_methods_invocations.py | 8
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py
+index 01e87b4bca879..686b5c4a34f4c 100644
+--- a/tools/setup_helpers/cmake.py
b/tools/setup_helpers/cmake.py
+@@ -8,7 +8,7 @@
+ from subprocess import check_call, check_output, CalledProcessError
+ import sys
+ import sysconfig
+-from setuptools import distutils # type: ignore[import]
++from distutils.version import LooseVersion
+ from typing import IO, Any, Dict, List, Optional, Union, cast
+
+ from . import which
+@@ -120,10 +120,10 @@ def _get_cmake_command() -> str:
+ return cmake_command
+ cmake3 = which('cmake3')
+ cmake = which('cmake')
+-if cmake3 is not None and CMake._get_version(cmake3) >=
distutils.version.LooseVersion("3.10.0"):
++if cmake3 is not None and CMake._get_version(cmake3) >=
LooseVersion("3.10.0"):
+ cmake_command = 'cmake3'
+ return cmake_command
+-elif cmake is not None and CMake._get_version(cmake) >=
distutils.version.LooseVersion("3.10.0"):
++elif cmake is not None and CMake._get_version(cmake) >=
LooseVersion("3.10.0"):
+ return cmake_command
+ else:
+ raise RuntimeError('no cmake or cmake3 with version >= 3.10.0
found')
+@@ -134,7 +134,7 @@ def _get_version(cmd: str) -> Any:
+
+ for line in check_output([cmd,
'--version']).decode('utf-8').split('\n'):
+ if 'version' in line:
+-return distutils.version.LooseVersion(line.strip().split('
')[2])
++return LooseVersion(line.strip().split(' ')[2])
+ raise RuntimeError('no version found')
+
+ def run(self, args: List[str], env: Dict[str, str]) -> None:
+diff --git a/torch/testing/_internal/common_methods_invocations.py
b/torch/testing/_internal/common_methods_invocations.py
+index b66e6470b590c..6ec77c2b0ce2e 100644
+--- a/torch/testing/_internal/common_methods_invocations.py
b/torch/testing/_internal/common_methods_invocations.py
+@@ -40,7 +40,7 @@
+ freeze_rng_state)
+ import torch.testing._internal.opinfo_helper as opinfo_helper
+
+-from setuptools import
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: 65e0afb1b927e1da6d8e23565b7d0aa1eacfc013
Author: YiyangWu gmail com>
AuthorDate: Wed Dec 22 09:59:27 2021 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Dec 22 12:42:23 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=65e0afb1
sci-libs/pytorch: fix python and update rocm support
Other changes:
1. Pytorch seems to be work fine with different version of protobuf, so
no need to specify 0/30; however when protobuf version changed torch
should be rebuilt.
2. BUILD_NAMEDTENSOR is not an option now
3. Verbose mode for rm in src_install
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Yiyang Wu gmail.com>
Closes: https://github.com/gentoo/sci/pull/1123
Signed-off-by: Andrew Ammerlaan gentoo.org>
...ibrary-directory-according-to-CMake-build.patch | 32 +++
.../files/pytorch-1.9.1-fix-wrong-hipify.patch | 13 ++
sci-libs/pytorch/pytorch-1.10.1.ebuild | 47 +-
3 files changed, 74 insertions(+), 18 deletions(-)
diff --git
a/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch
b/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch
new file mode 100644
index 0..214267487
--- /dev/null
+++
b/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch
@@ -0,0 +1,32 @@
+From 52019a3f395e5fa97b26d424152d91f73b400f8e Mon Sep 17 00:00:00 2001
+From: Alexey Chernov <4er...@gmail.com>
+Date: Wed, 13 Nov 2019 23:44:12 +0300
+Subject: [PATCH 5/5] Change library directory according to CMake build
+Modified: Tue, 03 Aug 2021, fit for pytorch-1.9.0
+
+Change `lib_path` in favour of out-of-tree CMake build
+directory, so that all the C++ libraries be found.
+---
+ setup.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 60502b6add..cbced52192 100644
+--- a/setup.py
b/setup.py
+@@ -268,9 +268,10 @@ else:
+
+ # Constant known variables used throughout this file
+ cwd = os.path.dirname(os.path.abspath(__file__))
+-lib_path = os.path.join(cwd, "torch", "lib")
++cmake_build_dir = os.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd,
"build"))
++lib_path = os.path.join(cmake_build_dir, "lib")
+ third_party_path = os.path.join(cwd, "third_party")
+-caffe2_build_dir = os.path.join(cwd, "build")
++caffe2_build_dir = cmake_build_dir
+
+ # CMAKE: full path to python library
+ if IS_WINDOWS:
+--
+2.23.0
+
diff --git a/sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch
b/sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch
new file mode 100644
index 0..4e37acd3f
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch
@@ -0,0 +1,13 @@
+The hipify misadd a ) and causes compilation error
+
+--- orig/aten/src/ATen/native/sparse/hip/SparseHIPTensor.hip
pytorch-1.9.1/aten/src/ATen/native/sparse/hip/SparseHIPTensor.hip
+@@ -282,7 +282,7 @@ Tensor sparse_mask_helper_cuda(
+ mask_indices_ti,
+ t_indices_pos_ti,
+ t_values_ti,
+- r_values_ti);
++ r_values_ti;
+ C10_HIP_KERNEL_LAUNCH_CHECK();
+ });
+ }
diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild
b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 5a745c28f..1750f40c9 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -58,7 +58,8 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi
namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack
redis rocm static tools zeromq"
+IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi
namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack
redis rocm static test tools zeromq"
+RESTRICT="!test? ( test )"
REQUIRED_USE="
?? ( cuda rocm )
"
@@ -68,17 +69,17 @@ RDEPEND="
blas? ( virtual/blas )
cuda? ( dev-libs/cudnn
dev-cpp/eigen[cuda] )
- rocm? ( >=dev-util/hip-4.0.0-r1
- >=dev-libs/rccl-4
- >=sci-libs/rocThrust-4
- >=sci-libs/hipCUB-4
- >=sci-libs/rocPRIM-4
- >=sci-libs/miopen-4
- >=sci-libs/rocBLAS-4
- >=sci-libs/rocRAND-4
- >=sci-libs/hipSPARSE-4
- >=sci-libs/rocFFT-4
- >=dev-util/roctracer-4 )
+ rocm? ( >=dev-util/hip-4.3
+ >=dev-libs/rccl-4.3
+ >=sci-libs/rocThrust-4.3
+ >=sci-libs/hipCUB-4.3
+ >=sci-libs/rocPRIM-4.3
+ >=sci-libs/miopen-4.3
+ >=sci-libs/rocBLAS-4.3
+ >=sci-libs/rocRAND-4.3
+
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: b58d722332ff8d22656fe38dcc7509b8194de3fa Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Jan 30 15:39:44 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Jan 30 15:39:44 2021 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b58d7223 sci-libs/pytorch: add missing RESTRICT="!test? ( test )" Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> sci-libs/pytorch/files/get_third_parties | 0 sci-libs/pytorch/pytorch-1.7.1-r2.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/pytorch/files/get_third_parties b/sci-libs/pytorch/files/get_third_parties old mode 100755 new mode 100644 diff --git a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild b/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild index 77d314ca9..dff47d8da 100644 --- a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild +++ b/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild @@ -56,7 +56,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq" - +RESTRICT="!test? ( test )" REQUIRED_USE=" ^^ ( cuda rocm ) "
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: f4f6740dd370885258be7c6f97f08e37143489dd
Author: Benda Xu gentoo org>
AuthorDate: Sun Jan 24 13:27:51 2021 +
Commit: Benda XU gentoo org>
CommitDate: Sun Jan 24 13:38:00 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f4f6740d
sci-libs/pytorch: bump to 1.7.1.
Add ROCm support for AMD GPUs.
Remove fine-grained BLAS flags, use a general USE=blas and rely on
eselect-ldso for runtime switch of blas libraries.
merge USE=numpy into USE=python.
Suggested-by: Yiyang Wu gmail.com>
Bug: https://bugs.gentoo.org/650804
Bug: https://github.com/gentoo/gentoo/pull/10724
Closes: https://github.com/justxi/rocm/issues/133
Closes: https://github.com/gentoo/sci/issues/1039
Closes: https://github.com/gentoo/sci/issues/1011
Package-Manager: Portage-3.0.12, Repoman-3.0.1
RepoMan-Options: --force
Signed-off-by: Benda Xu gentoo.org>
...-t-build-libtorch-again-for-PyTorch-1.7.1.patch | 18 ++
sci-libs/pytorch/files/get_third_parties | 20 ++
.../pytorch/files/pytorch-1.7.1-no-rpath.patch | 12 +
sci-libs/pytorch/files/pytorch-1.7.1-setup.patch | 12 +
.../pytorch-1.7.1-tensorpipe-unbundle-libuv.patch | 12 +
.../files/pytorch-1.7.1-torch_shm_manager.patch| 13 +
sci-libs/pytorch/metadata.xml | 1 +
sci-libs/pytorch/pytorch-1.7.1-r2.ebuild | 292 +
8 files changed, 380 insertions(+)
diff --git
a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
new file mode 100644
index 0..16d2c1f2e
--- /dev/null
+++
b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
@@ -0,0 +1,18 @@
+diff --git a/setup.py b/setup.py
+index 2db381644c..2241a33015 100644
+--- a/setup.py
b/setup.py
+@@ -307,13 +307,6 @@ def build_deps():
+ check_pydep('yaml', 'pyyaml')
+ check_pydep('typing', 'typing')
+
+-build_caffe2(version=version,
+- cmake_python_library=cmake_python_library,
+- build_python=True,
+- rerun_cmake=RERUN_CMAKE,
+- cmake_only=CMAKE_ONLY,
+- cmake=cmake)
+-
+ if CMAKE_ONLY:
+ report('Finished running cmake. Run "ccmake build" or '
+'"cmake-gui build" to adjust build options and '
diff --git a/sci-libs/pytorch/files/get_third_parties
b/sci-libs/pytorch/files/get_third_parties
new file mode 100755
index 0..8c38a9b73
--- /dev/null
+++ b/sci-libs/pytorch/files/get_third_parties
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+path_url() {
+ local dir=$(dirname $1)/
+ git config --file $1 --get-regexp '(path|url)' | sed -r -e "N;s,[^ ]*
([^ ]*)\n[^ ]* ([^ ]*),${dir#./}\1 \2,"
+}
+
+join \
+ <(for gm in $(find . -name '.gitmodules' | sort -r); do path_url $gm;
done | sort -u) \
+ <(git submodule status --recursive | awk '{print $2 " " $1}' | sort -u)
| \
+while read path url hash; do
+[[ ${path} =~
(eigen|six|ios|neon2sse|protobuf|pybind11|python-enum|tbb|zstd|fbjni) ]] &&
continue
+u=${url%.git}
+hfull=${hash#-}
+h=${hfull:0:8}
+p=$(basename $u)
+echo "${u}/archive/${h}.tar.gz -> ${p}-${h}.tar.gz" >> SRC_URI
+[[ $p = fbgemm ]] && p=${p^^}
+echo "rmdir ${path} && ln -sv \"\${WORKDIR}\"/${p}-${hfull} ${path}" >>
src_prepare
+done
diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch
b/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch
new file mode 100644
index 0..eabda092e
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index b3a892cf88..2c8622870c 100644
+--- a/cmake/Dependencies.cmake
b/cmake/Dependencies.cmake
+@@ -4,7 +4,6 @@ if(APPLE)
+ set(CMAKE_MACOSX_RPATH ON)
+ set(_rpath_portable_origin "@loader_path")
+ else()
+- set(_rpath_portable_origin $ORIGIN)
+ endif(APPLE)
+ # Use separate rpaths during build and install phases
+ set(CMAKE_SKIP_BUILD_RPATH FALSE)
diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-setup.patch
b/sci-libs/pytorch/files/pytorch-1.7.1-setup.patch
new file mode 100644
index 0..28db5692c
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.7.1-setup.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 2db381644c..01a2e57aea 100644
+--- a/setup.py
b/setup.py
+@@ -294,7 +294,6 @@ def build_deps():
+
+ check_file(os.path.join(third_party_path, "gloo", "CMakeLists.txt"))
+ check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt'))
+-check_file(os.path.join(third_party_path, 'tbb', 'Makefile'))
+ check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt'))
+ check_file(os.path.join(third_party_path, 'foxi', 'CMakeLists.txt'))
+ check_file(os.path.join(third_party_path, 'QNNPACK', 'CMakeLists.txt'))
diff --git
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: 72df8ef8dc56f868d4feaf7b558e93562b7627f3
Author: Benda Xu gentoo org>
AuthorDate: Tue Aug 11 13:41:24 2020 +
Commit: Benda XU gentoo org>
CommitDate: Tue Aug 11 13:44:16 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=72df8ef8
sci-libs/pytorch: donot hardcode the library path.
Closes: https://bugs.gentoo.org/736643
Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu gentoo.org>
sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch | 15 +++
sci-libs/pytorch/pytorch-1.6.0.ebuild| 3 ++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch
b/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch
new file mode 100644
index 0..1e9388ff1
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch
@@ -0,0 +1,15 @@
+Don't hardcode the library path. Leave it to the dynamic loader.
+
+Index: pytorch-1.6.0/torch/__init__.py
+===
+--- pytorch-1.6.0.orig/torch/__init__.py
pytorch-1.6.0/torch/__init__.py
+@@ -138,7 +138,7 @@ def _load_global_deps():
+ here = os.path.abspath(__file__)
+ lib_path = os.path.join(os.path.dirname(here), 'lib', lib_name)
+
+-ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL)
++ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL)
+
+
+ if (USE_RTLD_GLOBAL_WITH_LIBTORCH or os.getenv('TORCH_USE_RTLD_GLOBAL')) and \
diff --git a/sci-libs/pytorch/pytorch-1.6.0.ebuild
b/sci-libs/pytorch/pytorch-1.6.0.ebuild
index 1394bdbe3..8c3236244 100644
--- a/sci-libs/pytorch/pytorch-1.6.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0.ebuild
@@ -110,6 +110,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.6.0-setup.patch
"${FILESDIR}"/${PN}-1.6.0-skip-tests.patch
+ "${FILESDIR}"/${PN}-pytorch-1.6.0-global-dlopen.patch
"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch
"${FILESDIR}"/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
"${FILESDIR}"/0005-Change-library-directory-according-to-CMake-build.patch
@@ -272,7 +273,7 @@ src_install() {
python_foreach_impl python_optimize
fi
- find "${ED}/usr/lib64" -name "*.a" -exec rm -fv {} \;
+ find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: a788dbf0de374240b116598b7a93881509258e24
Author: Benda Xu gentoo org>
AuthorDate: Fri Aug 7 12:55:50 2020 +
Commit: Benda XU gentoo org>
CommitDate: Fri Aug 7 12:55:58 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a788dbf0
sci-libs/pytorch: refresh cuda nccl patch for 1.6.0.
Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu gentoo.org>
.../files/pytorch-1.6.0-nccl-nvccflags.patch | 27 ++
sci-libs/pytorch/pytorch-1.6.0.ebuild | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch
b/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch
new file mode 100644
index 0..052474ee4
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch
@@ -0,0 +1,27 @@
+diff -uprN nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk
nccl-patched/makefiles/common.mk
+--- nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk
2020-06-09 00:31:44.0 +0800
nccl-patched/makefiles/common.mk 2020-08-06 21:25:57.784279738 +0800
+@@ -54,7 +54,7 @@ CXXFLAGS := -DCUDA_MAJOR=$(CUDA_MAJOR)
+ # Maxrregcount needs to be set accordingly to NCCL_MAX_NTHREADS (otherwise it
will cause kernel launch errors)
+ # 512 : 120, 640 : 96, 768 : 80, 1024 : 60
+ # We would not have to set this if we used __launch_bounds__, but this only
works on kernels, not on functions.
+-NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -std=c++11 -Xptxas
-maxrregcount=96 -Xfatbin -compress-all
++NVCUFLAGS := $(NVCCFLAGS) $(NVCC_GENCODE) -std=c++11 -Xptxas
-maxrregcount=96 -Xfatbin -compress-all
+ # Use addprefix so that we can specify more than one path
+ NVLDFLAGS := -L${CUDA_LIB} -lcudart -lrt
+
+@@ -68,14 +68,6 @@ NVLDFLAGS += ${GCOV_FLAGS:%=-Xcompiler
+ # $(warning GCOV_FLAGS=${GCOV_FLAGS})
+ ## GCOV ##
+
+-ifeq ($(DEBUG), 0)
+-NVCUFLAGS += -O3
+-CXXFLAGS += -O3 -g
+-else
+-NVCUFLAGS += -O0 -G -g
+-CXXFLAGS += -O0 -g -ggdb3
+-endif
+-
+ ifneq ($(VERBOSE), 0)
+ NVCUFLAGS += -Xptxas -v -Xcompiler -Wall,-Wextra,-Wno-unused-parameter
+ CXXFLAGS += -Wall -Wextra
diff --git a/sci-libs/pytorch/pytorch-1.6.0.ebuild
b/sci-libs/pytorch/pytorch-1.6.0.ebuild
index c59b248e2..1394bdbe3 100644
--- a/sci-libs/pytorch/pytorch-1.6.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0.ebuild
@@ -147,7 +147,7 @@ src_prepare() {
if use cuda; then
cd ../nccl || die
- eapply "${FILESDIR}"/${PN}-1.4.0-nccl-nvccflags.patch
+ eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
ln -s . nccl || die
cuda_src_prepare
[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/
commit: fa9ca8f66c0bbbabb61ec8574389bab85862741a
Author: Benda Xu gentoo org>
AuthorDate: Thu Aug 6 01:07:30 2020 +
Commit: Benda XU gentoo org>
CommitDate: Thu Aug 6 01:07:30 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=fa9ca8f6
sci-libs/pytorch: bump to 1.6.0.
Remove virtual/python-typing dependency. It was removed from tree and only
needed by python-2.
Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu gentoo.org>
sci-libs/pytorch/files/pytorch-1.6.0-setup.patch | 14
.../pytorch/files/pytorch-1.6.0-skip-tests.patch | 14
.../pytorch-1.6.0-tensorpipe-unbundle-libuv.patch | 13
sci-libs/pytorch/pytorch-1.4.0_p0.ebuild | 1 -
...ytorch-1.4.0_p0.ebuild => pytorch-1.6.0.ebuild} | 87 ++
5 files changed, 96 insertions(+), 33 deletions(-)
diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch
b/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch
new file mode 100644
index 0..6a197a907
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch
@@ -0,0 +1,14 @@
+Index: pytorch-1.4.0_p0/setup.py
+===
+--- pytorch-1.4.0_p0.orig/setup.py
pytorch-1.4.0_p0/setup.py
+@@ -288,9 +288,7 @@ def build_deps():
+ sys.exit(1)
+
+ check_file(os.path.join(third_party_path, "gloo", "CMakeLists.txt"))
+-check_file(os.path.join(third_party_path, "pybind11", "CMakeLists.txt"))
+ check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt'))
+-check_file(os.path.join(third_party_path, 'tbb', 'Makefile'))
+ check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt'))
+ check_file(os.path.join(third_party_path, 'foxi', 'CMakeLists.txt'))
+ check_file(os.path.join(third_party_path, 'QNNPACK', 'CMakeLists.txt'))
diff --git a/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch
b/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch
new file mode 100644
index 0..3ef2c533f
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch
@@ -0,0 +1,14 @@
+Disable expected test failures.
+
+Reference: https://github.com/pytorch/pytorch/issues/13746
+Reference: https://github.com/pytorch/pytorch/issues/21873
+
+Index: pytorch-1.4.0_p0/caffe2/share/contrib/depthwise/CMakeLists.txt
+===
+--- pytorch-1.4.0_p0.orig/caffe2/share/contrib/depthwise/CMakeLists.txt
pytorch-1.4.0_p0/caffe2/share/contrib/depthwise/CMakeLists.txt
+@@ -6,4 +6,3 @@ set(Caffe2_CONTRIB_DEPTHWISE3x3_TEST_CPU
+ )
+
+ set(Caffe2_CPU_SRCS ${Caffe2_CPU_SRCS} ${Caffe2_CONTRIB_DEPTHWISE3x3_CPU_SRC}
PARENT_SCOPE)
+-set(Caffe2_CPU_TEST_SRCS ${Caffe2_CPU_TEST_SRCS}
${Caffe2_CONTRIB_DEPTHWISE3x3_TEST_CPU_SRC} PARENT_SCOPE)
diff --git
a/sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch
b/sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch
new file mode 100644
index 0..a4ba38322
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch
@@ -0,0 +1,13 @@
+Index: tensorpipe/cmake/pytorch.cmake
+===
+--- tensorpipe.orig/cmake/pytorch.cmake
tensorpipe/cmake/pytorch.cmake
+@@ -138,7 +138,7 @@ endif()
+
+ add_library(tensorpipe ${TENSORPIPE_SRC})
+
+-set(TP_BUILD_LIBUV ON)
++set(TP_BUILD_LIBUV OFF)
+ find_package(uv REQUIRED)
+ target_link_libraries(tensorpipe PRIVATE uv::uv)
+
diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
b/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
index e77582078..762608507 100644
--- a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
@@ -50,7 +50,6 @@ REQUIRED_USE="
DEPEND="
dev-libs/protobuf
dev-python/pyyaml[${PYTHON_USEDEP}]
- virtual/python-typing[${PYTHON_USEDEP}]
atlas? ( sci-libs/atlas )
cuda? ( dev-libs/cudnn
dev-cpp/eigen[cuda] )
diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
b/sci-libs/pytorch/pytorch-1.6.0.ebuild
similarity index 63%
copy from sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
copy to sci-libs/pytorch/pytorch-1.6.0.ebuild
index e77582078..c59b248e2 100644
--- a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0.ebuild
@@ -12,34 +12,56 @@ MPV=${PV/_p/a}
DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU
acceleration"
HOMEPAGE="https://pytorch.org/;
SRC_URI="https://github.com/pytorch/${PN}/archive/v${MPV}.tar.gz -> ${P}.tar.gz
-https://github.com/facebookincubator/gloo/archive/ca528e32.tar.gz ->
gloo-ca528e32.tar.gz
-https://github.com/google/benchmark/archive/505be96a.tar.gz ->
benchmark-505be96a.tar.gz
-https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz ->
gemmlowp-3fb5c176.tar.gz
-https://github.com/google/googletest/archive/2fe3bd99.tar.gz ->
