From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CF5CD158093 for ; Sun, 3 Jul 2022 08:37:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15D07E0ABE; Sun, 3 Jul 2022 08:37:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B58F7E0ABE for ; Sun, 3 Jul 2022 08:37:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B85E34162A for ; Sun, 3 Jul 2022 08:37:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CEA4D522 for ; Sun, 3 Jul 2022 08:37:06 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1656837415.c6c1ae168e2ebd9bb070c31b7468f44ee4884d0d.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/, sci-libs/pytorch/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch sci-libs/pytorch/files/get_third_parties sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch sci-libs/pytorch/files/pytorch-1.2.0-setup.patch sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch sci-libs/pytorch/files/pytorch-1.4.0-skip-tests.patch sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch sci-libs/pytorch/fil es/pytorch-1.6.0-global-dlopen.patch sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch sci-libs/pytorch/files/pytorch-1.6.0-setup.patch sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch sci-libs/pytorch/files/pytorch-1.7.1-setup.patch sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch sci-libs/pytorch/metadata.xml sci-libs/pytorch/pytorch-1.10.2.ebuild X-VCS-Directories: sci-libs/pytorch/files/ sci-libs/pytorch/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: c6c1ae168e2ebd9bb070c31b7468f44ee4884d0d X-VCS-Branch: master Date: Sun, 3 Jul 2022 08:37:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0f177ce5-91f0-40f7-8270-368bb5718216 X-Archives-Hash: fdd6c627c1061db285f21a2dd763d598 commit: c6c1ae168e2ebd9bb070c31b7468f44ee4884d0d Author: Andrew Ammerlaan gentoo org> AuthorDate: Sun Jul 3 08:36:55 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sun Jul 3 08:36:55 2022 +0000 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..000000000 --- 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 <4ernov@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..000000000 --- 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..000000000 --- a/sci-libs/pytorch/files/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch +++ /dev/null @@ -1,46 +0,0 @@ -From dbb0bac77986016217cdfe779499a2ccd0e10570 Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Wed, 6 Nov 2019 00:16:24 +0300 -Subject: [PATCH 3/4] Change path to `caffe2` build dir made by `libtorch` - -Setup and use properly `caffe2` build dir made while -`libtorch` building with CMake, so that it was used -by the Python installation. ---- - setup.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index f4bfdc99cd..60502b6add 100644 ---- a/setup.py -+++ b/setup.py -@@ -236,7 +236,7 @@ else: - cwd = os.path.dirname(os.path.abspath(__file__)) - lib_path = os.path.join(cwd, "torch", "lib") - third_party_path = os.path.join(cwd, "third_party") --caffe2_build_dir = os.path.join(cwd, "build") -+caffe2_build_dir = os.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd, "build")) - # lib/pythonx.x/site-packages - rel_site_packages = distutils.sysconfig.get_python_lib(prefix='') - # full absolute path to the dir above -@@ -279,7 +279,7 @@ elif sha != 'Unknown': - version += '+' + sha[:7] - report("Building wheel {}-{}".format(package_name, version)) - --cmake = CMake() -+cmake = CMake(caffe2_build_dir) - - # all the work we need to do _before_ setup runs - def build_deps(): -@@ -445,7 +445,7 @@ class build_ext(setuptools.command.build_ext.build_ext): - filename = self.get_ext_filename(fullname) - report("\nCopying extension {}".format(ext.name)) - -- src = os.path.join("torch", rel_site_packages, filename) -+ src = os.path.join(caffe2_build_dir, filename) - if not os.path.exists(src): - report("{} does not exist".format(src)) - del self.extensions[i] --- -2.23.0 - diff --git a/sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch b/sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch deleted file mode 100644 index c8f57d9e6..000000000 --- a/sci-libs/pytorch/files/0004-Don-t-fill-rpath-of-Caffe2-library-for-system-wide-i.patch +++ /dev/null @@ -1,104 +0,0 @@ -From a0ace7295b6895954d2a0f8d6fe311a34a7c4e85 Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Tue, 12 Nov 2019 02:01:36 +0300 -Subject: [PATCH 4/4] Don't fill rpath of Caffe2 library for system-wide - install - -Don't fill in runtime path of Caffe2 library for the case of -building for system-wide installation. ---- - CMakeLists.txt | 3 +++ - caffe2/CMakeLists.txt | 18 +++++++++++++++--- - cmake/Dependencies.cmake | 19 +++++++++++-------- - 3 files changed, 29 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20923c0544..45a882ae0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -193,6 +193,9 @@ option(USE_TBB "Use TBB" OFF) - # Used when building Caffe2 through setup.py - option(BUILDING_WITH_TORCH_LIBS "Tell cmake if Caffe2 is being built alongside torch libs" ON) - -+# Used when building Caffe2 for further system-wide installation -+option(BUILDING_SYSTEM_WIDE "Tell cmake if Caffe2 is being built for system-wide installation" OFF) -+ - # /Z7 override option - # When generating debug symbols, CMake default to use the flag /Zi. - # However, it is not compatible with sccache. So we rewrite it off. -diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 1f7d037243..30d5615cdb 100644 ---- a/caffe2/CMakeLists.txt -+++ b/caffe2/CMakeLists.txt -@@ -1235,7 +1235,11 @@ if (BUILD_PYTHON) - if (MSVC AND BUILD_SHARED_LIBS) - install(FILES $ DESTINATION "${PYTHON_LIB_REL_PATH}/caffe2/python" OPTIONAL) - endif() -- set_target_properties(caffe2_pybind11_state PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ if (NOT BUILDING_SYSTEM_WIDE) -+ set_target_properties(caffe2_pybind11_state PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+else() -+ set_target_properties(caffe2_pybind11_state PROPERTIES SKIP_BUILD_RPATH ON) -+ endif() - - if(USE_CUDA) - add_library(caffe2_pybind11_state_gpu MODULE ${Caffe2_GPU_PYTHON_SRCS}) -@@ -1261,7 +1265,11 @@ if (BUILD_PYTHON) - if (MSVC AND BUILD_SHARED_LIBS) - install(FILES $ DESTINATION "${PYTHON_LIB_REL_PATH}/caffe2/python" OPTIONAL) - endif() -- set_target_properties(caffe2_pybind11_state_gpu PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ if (NOT BUILDING_SYSTEM_WIDE) -+ set_target_properties(caffe2_pybind11_state_gpu PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ else() -+ set_target_properties(caffe2_pybind11_state_gpu PROPERTIES SKIP_BUILD_RPATH ON) -+ endif() - endif() - - if(USE_ROCM) -@@ -1284,7 +1292,11 @@ if (BUILD_PYTHON) - caffe2_pybind11_state_hip PROPERTIES LIBRARY_OUTPUT_DIRECTORY - ${CMAKE_BINARY_DIR}/caffe2/python) - install(TARGETS caffe2_pybind11_state_hip DESTINATION "${PYTHON_LIB_REL_PATH}/caffe2/python") -- set_target_properties(caffe2_pybind11_state_hip PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ if (NOT BUILDING_SYSTEM_WIDE) -+ set_target_properties(caffe2_pybind11_state_hip PROPERTIES INSTALL_RPATH "${caffe2_pybind11_rpath}") -+ else() -+ set_target_properties(caffe2_pybind11_state_hip PROPERTIES SKIP_BUILD_RPATH ON) -+ endif() - endif() - - if (MSVC AND CMAKE_GENERATOR MATCHES "Visual Studio") -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index a8e9769536..6ef9d7b0e2 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -6,14 +6,17 @@ if (APPLE) - else() - set(_rpath_portable_origin $ORIGIN) - endif(APPLE) --# Use separate rpaths during build and install phases --set(CMAKE_SKIP_BUILD_RPATH FALSE) --# Don't use the install-rpath during the build phase --set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) --set(CMAKE_INSTALL_RPATH "${_rpath_portable_origin}") --# Automatically add all linked folders that are NOT in the build directory to --# the rpath (per library?) --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ -+if (NOT BUILDING_SYSTEM_WIDE) -+ # Use separate rpaths during build and install phases -+ set(CMAKE_SKIP_BUILD_RPATH FALSE) -+ # Don't use the install-rpath during the build phase -+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -+ set(CMAKE_INSTALL_RPATH "${_rpath_portable_origin}") -+ # Automatically add all linked folders that are NOT in the build directory to -+ # the rpath (per library?) -+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+endif() - - # UBSAN triggers when compiling protobuf, so we need to disable it. - set(UBSAN_FLAG "-fsanitize=undefined") --- -2.23.0 - diff --git a/sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch b/sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch deleted file mode 100644 index 324b8f682..000000000 --- a/sci-libs/pytorch/files/0005-Change-library-directory-according-to-CMake-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 52019a3f395e5fa97b26d424152d91f73b400f8e Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Wed, 13 Nov 2019 23:44:12 +0300 -Subject: [PATCH 5/5] Change library directory according to CMake build - -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 -@@ -234,9 +234,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.environ.get("CMAKE_BUILD_DIR", os.path.join(cwd, "build")) -+caffe2_build_dir = cmake_build_dir - # lib/pythonx.x/site-packages - rel_site_packages = distutils.sysconfig.get_python_lib(prefix='') - # full absolute path to the dir above --- -2.23.0 - diff --git a/sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch b/sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch deleted file mode 100644 index 49835d201..000000000 --- a/sci-libs/pytorch/files/0010-Remove-conversion-ambiguity-in-ternary-operators.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0f3a0d9a948fdd8481a5f7751a255ecd9ed4d37a Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@gmail.com> -Date: Mon, 20 Jan 2020 01:21:22 +0300 -Subject: [PATCH 3/3] Remove conversion ambiguity in ternary operators - -It fails to compile with recent versions of Clang -(namely, version 10 used behind HCC compiler when -being built with ROCm support) with the -`conditional expression is ambiguous` error. ---- - caffe2/operators/relu_op.cu | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/caffe2/operators/relu_op.cu b/caffe2/operators/relu_op.cu -index f6edf7105e..ab49540fc9 100644 ---- a/caffe2/operators/relu_op.cu -+++ b/caffe2/operators/relu_op.cu -@@ -51,7 +51,7 @@ __global__ void ReluCUDAKernel(const int N, const half2* X, half2* Y) { - #else - const float2 xx = __half22float2(X[i]); - Y[i] = -- __floats2half2_rn(xx.x > 0.0f ? xx.x : 0.0f, xx.y > 0.0f ? xx.y : 0.0f); -+ __floats2half2_rn(xx.x > 0.0f ? float(xx.x) : 0.0f, xx.y > 0.0f ? float(xx.y) : 0.0f); - #endif - } - } -@@ -101,7 +101,7 @@ __global__ void ReluGradientCUDAKernel( - const float2 dy = __half22float2(dY[i]); - const float2 yy = __half22float2(Y[i]); - dX[i] = -- __floats2half2_rn(yy.x > 0.0f ? dy.x : 0.0f, yy.y > 0.0f ? dy.y : 0.0f); -+ __floats2half2_rn(yy.x > 0.0f ? float(dy.x) : 0.0f, yy.y > 0.0f ? float(dy.y) : 0.0f); - #endif - } - } --- -2.24.1 - diff --git a/sci-libs/pytorch/files/get_third_parties b/sci-libs/pytorch/files/get_third_parties deleted file mode 100644 index 8c38a9b73..000000000 --- a/sci-libs/pytorch/files/get_third_parties +++ /dev/null @@ -1,20 +0,0 @@ -#!/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.10.0-clhpp2.patch b/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch deleted file mode 100644 index 9c267dc6e..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.0-clhpp2.patch +++ /dev/null @@ -1,52 +0,0 @@ -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/files/pytorch-1.10.0-fix-distutils.patch b/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch deleted file mode 100644 index 334bcda6f..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.0-fix-distutils.patch +++ /dev/null @@ -1,93 +0,0 @@ -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 distutils -+from distutils.version import LooseVersion - - has_scipy_fft = False - if TEST_SCIPY: -@@ -14008,11 +14008,11 @@ def ref_pairwise_distance(input1, input2): - skips=( - # Reference: https://github.com/pytorch/pytorch/pull/49155#issuecomment-742664611 - DecorateInfo(unittest.skip("Skipped!"), 'TestUnaryUfuncs', 'test_reference_numerics_extremal', -- active_if=TEST_SCIPY and distutils.version.LooseVersion(scipy.__version__) < "1.4.0"), -+ active_if=TEST_SCIPY and LooseVersion(scipy.__version__) < "1.4.0"), - DecorateInfo(unittest.skip("Skipped!"), 'TestUnaryUfuncs', 'test_reference_numerics_hard', -- active_if=TEST_SCIPY and distutils.version.LooseVersion(scipy.__version__) < "1.4.0"), -+ active_if=TEST_SCIPY and LooseVersion(scipy.__version__) < "1.4.0"), - DecorateInfo(unittest.skip("Skipped!"), 'TestUnaryUfuncs', 'test_reference_numerics_normal', -- active_if=TEST_SCIPY and distutils.version.LooseVersion(scipy.__version__) < "1.4.0"), -+ active_if=TEST_SCIPY and LooseVersion(scipy.__version__) < "1.4.0"), - )), - UnaryUfuncInfo('lgamma', - ref=reference_lgamma if TEST_SCIPY else _NOTHING, diff --git a/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch b/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch deleted file mode 100644 index adc258556..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/torch/csrc/jit/frontend/ir_emitter.cpp 2021-10-15 05:35:23.000000000 +0400 -+++ b/torch/csrc/jit/frontend/ir_emitter.cpp 2021-10-15 05:35:23.000000000 +0400 -@@ -1678,7 +1678,7 @@ - << "Union type annotation `" << type_hint->repr_str() - << "` can hold " << vector_repr.str() << ", but none of " - << "those list types can hold the types of the given dict" -- << " elements, which were unified to " << candidate->repr_str(); -+ << " elements, which were unified"; - } else { - refined_type_hint = candidate; - } - 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 deleted file mode 100644 index 0ac12a1e7..000000000 --- a/sci-libs/pytorch/files/pytorch-1.10.1-nccl-nvccflags.patch +++ /dev/null @@ -1,37 +0,0 @@ -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/files/pytorch-1.2.0-setup.patch b/sci-libs/pytorch/files/pytorch-1.2.0-setup.patch deleted file mode 100644 index 85e796a60..000000000 --- a/sci-libs/pytorch/files/pytorch-1.2.0-setup.patch +++ /dev/null @@ -1,24 +0,0 @@ -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')) -@@ -341,9 +339,6 @@ def build_deps(): - if not same: - shutil.copyfile(orig_file, sym_file) - -- dir_util.copy_tree('third_party/pybind11/include/pybind11/', -- 'torch/include/pybind11') -- - ################################################################################ - # Building dependent libraries - ################################################################################ diff --git a/sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch b/sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch deleted file mode 100644 index 165e79dd4..000000000 --- a/sci-libs/pytorch/files/pytorch-1.4.0-nccl-nvccflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: nccl-7c72dee660e4d055b81721dd6b03e4e1c0a983cf/makefiles/common.mk -=================================================================== ---- nccl-7c72dee660e4d055b81721dd6b03e4e1c0a983cf.orig/makefiles/common.mk -+++ nccl-7c72dee660e4d055b81721dd6b03e4e1c0a983cf/makefiles/common.mk -@@ -46,7 +46,7 @@ endif - CXXFLAGS := -DCUDA_MAJOR=$(CUDA_MAJOR) -DCUDA_MINOR=$(CUDA_MINOR) -fPIC -fvisibility=hidden - CXXFLAGS += -Wall -Wno-unused-function -Wno-sign-compare -std=c++11 -Wvla - CXXFLAGS += -I $(CUDA_INC) --NVCUFLAGS := -ccbin $(CXX) $(NVCC_GENCODE) -lineinfo -std=c++11 -Xptxas -maxrregcount=96 -Xfatbin -compress-all -+NVCUFLAGS := $(NVCCFLAGS) $(NVCC_GENCODE) -lineinfo -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 - -@@ -60,14 +60,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/files/pytorch-1.4.0-skip-tests.patch b/sci-libs/pytorch/files/pytorch-1.4.0-skip-tests.patch deleted file mode 100644 index 3682469d7..000000000 --- a/sci-libs/pytorch/files/pytorch-1.4.0-skip-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Disable expected test failures. - -TCPStoreTest is too slow to run. - -Reference: https://github.com/pytorch/pytorch/issues/13746 -Reference: https://github.com/pytorch/pytorch/issues/21873 - -Index: pytorch-1.4.0_p0/torch/lib/c10d/test/CMakeLists.txt -=================================================================== ---- pytorch-1.4.0_p0.orig/torch/lib/c10d/test/CMakeLists.txt -+++ pytorch-1.4.0_p0/torch/lib/c10d/test/CMakeLists.txt -@@ -14,7 +14,6 @@ function(c10d_add_test test_src) - endfunction() - - c10d_add_test(FileStoreTest.cpp c10d) --c10d_add_test(TCPStoreTest.cpp c10d) - - if(USE_CUDA) - if(USE_C10D_GLOO) -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.4.0-sleef.patch b/sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch deleted file mode 100644 index 222a0f73e..000000000 --- a/sci-libs/pytorch/files/pytorch-1.4.0-sleef.patch +++ /dev/null @@ -1,15 +0,0 @@ -Give the location of sleef.h. - -Reference: https://github.com/pytorch/pytorch/issues/26555 -Index: pytorch-1.4.0/caffe2/CMakeLists.txt -=================================================================== ---- pytorch-1.4.0.orig/caffe2/CMakeLists.txt -+++ pytorch-1.4.0/caffe2/CMakeLists.txt -@@ -1062,6 +1062,7 @@ if (BUILD_TEST) - add_executable(${test_name} "${test_src}") - target_link_libraries(${test_name} ${Caffe2_MAIN_LIBS} gtest_main) - target_include_directories(${test_name} PRIVATE $) -+ target_include_directories(${test_name} PRIVATE $) - target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) - add_test(NAME ${test_name} COMMAND $) - if (INSTALL_TEST) 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 deleted file mode 100644 index 1e9388ff1..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-global-dlopen.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/files/pytorch-1.6.0-nccl-nvccflags.patch b/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch deleted file mode 100644 index 052474ee4..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-nccl-nvccflags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -uprN nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk nccl-patched/makefiles/common.mk ---- nccl-5949d96f36d050e59d05872f8bbffd2549318e95/makefiles/common.mk 2020-06-09 00:31:44.000000000 +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/files/pytorch-1.6.0-setup.patch b/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch deleted file mode 100644 index 6a197a907..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-setup.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 3ef2c533f..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-skip-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index a4ba38322..000000000 --- a/sci-libs/pytorch/files/pytorch-1.6.0-tensorpipe-unbundle-libuv.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/files/pytorch-1.7.1-no-rpath.patch b/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch deleted file mode 100644 index eabda092e..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-no-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 28db5692c..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-setup.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 a/sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch b/sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch deleted file mode 100644 index 960ae3618..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-tensorpipe-unbundle-libuv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index d1e4bdaed6..85821a78df 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1308,7 +1308,6 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE) - if(MSVC) - message(WARNING "Tensorpipe cannot be used on Windows.") - else() -- set(TP_BUILD_LIBUV ON CACHE BOOL "" FORCE) - set(TP_ENABLE_SHM OFF CACHE BOOL "" FORCE) - set(TP_ENABLE_CMA OFF CACHE BOOL "" FORCE) - set(TP_STATIC_OR_SHARED STATIC CACHE STRING "" FORCE) diff --git a/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch b/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch deleted file mode 100644 index 44b27cac3..000000000 --- a/sci-libs/pytorch/files/pytorch-1.7.1-torch_shm_manager.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/torch/__init__.py b/torch/__init__.py -index 03f6eca622..297fb169a4 100644 ---- a/torch/__init__.py -+++ b/torch/__init__.py -@@ -412,7 +412,7 @@ def manager_path(): - - - # Shared memory manager needs to know the exact location of manager executable --_C._initExtension(manager_path()) -+_C._initExtension(b"@GENTOO_PORTAGE_EPREFIX@/usr/bin/torch_shm_manager") - del manager_path - - # Appease the type checker: it can't deal with direct setting of globals(). 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 deleted file mode 100644 index 214267487..000000000 --- a/sci-libs/pytorch/files/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 52019a3f395e5fa97b26d424152d91f73b400f8e Mon Sep 17 00:00:00 2001 -From: Alexey Chernov <4ernov@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 deleted file mode 100644 index 4e37acd3f..000000000 --- a/sci-libs/pytorch/files/pytorch-1.9.1-fix-wrong-hipify.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/metadata.xml b/sci-libs/pytorch/metadata.xml deleted file mode 100644 index df07ea4be..000000000 --- a/sci-libs/pytorch/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - 4ernov@gmail.com - Alexey Chernov - - - heroxbd@gentoo.org - Benda Xu - - - Build with address sanitizer (ASAN) - Enable support for nVidia CUDA - Enable FBGEMM (Facebook GEneral Matrix Multiplication) support - Build with gflags - Build with glog support - Build gloo distributed communication backend support - Enable support for LevelDB - Enable support for LMDB - Build with Intel MKL-DNN support - Enable support for named tensors - Enable NNPACK support - Enable support for NUMA - Build observers - Enable support for OpenCV - Enable support for OpenCL - Enable QNNPACK support - Enable support for Redis - Enable AMD ROCm - Build binary tools - Enable support for ZeroMQ - - diff --git a/sci-libs/pytorch/pytorch-1.10.2.ebuild b/sci-libs/pytorch/pytorch-1.10.2.ebuild deleted file mode 100644 index 8ba76f1bd..000000000 --- a/sci-libs/pytorch/pytorch-1.10.2.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_SETUPTOOLS=manual -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake cuda distutils-r1 prefix - -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${PV}.tar.gz -> ${P}.tar.gz -https://github.com/google/benchmark/archive/e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz -> benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz -https://github.com/pytorch/cpuinfo/archive/63b25457.tar.gz -> cpuinfo-63b25457.tar.gz -https://github.com/NVlabs/cub/archive/d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -> cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -https://github.com/pytorch/fbgemm/archive/7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz -> fbgemm-7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz -https://github.com/asmjit/asmjit/archive/d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz -> asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz -https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -> cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -https://github.com/google/googletest/archive/0fc5466d.tar.gz -> googletest-0fc5466d.tar.gz -https://github.com/fmtlib/fmt/archive/cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz -> fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz -https://github.com/houseroad/foxi/archive/c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -> foxi-c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz -https://github.com/Maratyszcza/FXdiv/archive/b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz -> FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz -https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz -> gemmlowp-3fb5c176.tar.gz -https://github.com/facebookincubator/gloo/archive/c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz -> gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz -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/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 -https://github.com/onnx/onnx/archive/29e7aa7048809784465d06e897f043a4600642b2.tar.gz -> onnx-29e7aa7048809784465d06e897f043a4600642b2.tar.gz -https://github.com/google/benchmark/archive/e776aa02.tar.gz -> benchmark-e776aa02.tar.gz -https://github.com/google/benchmark/archive/5b7683f4.tar.gz -> benchmark-5b7683f4.tar.gz -https://github.com/google/googletest/archive/5ec7f0c4.tar.gz -> googletest-5ec7f0c4.tar.gz -https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a90.tar.gz -> psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz -https://github.com/Maratyszcza/pthreadpool/archive/a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz -> pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz -https://github.com/Maratyszcza/PeachPy/archive/07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz -> PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz -https://github.com/pytorch/QNNPACK/archive/7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz -> QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz -https://github.com/shibatch/sleef/archive/e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz -> sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz -https://github.com/pytorch/tensorpipe/archive/d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz -> tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz -https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz -https://github.com/google/libnop/archive/aa95422e.tar.gz -> libnop-aa95422e.tar.gz -https://github.com/libuv/libuv/archive/48e04275332f5753427d21a52f17ec6206451f2c.tar.gz -> libuv-48e04275332f5753427d21a52f17ec6206451f2c.tar.gz -https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -> XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -https://github.com/pytorch/kineto/archive/879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -> kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -https://github.com/driazati/breakpad/archive/edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz -> breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz -https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -> lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -" - -# git clone git@github.com:pytorch/pytorch.git && cd pytorch -# git submodules update --init --recursive -# ${FILESDIR}/get_third_paries -# cat SRC_URI src_prepare - -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" -REQUIRED_USE=" ?? ( cuda rocm )" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - blas? ( virtual/blas ) - cuda? ( dev-libs/cudnn - dev-cpp/eigen[cuda] ) - 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 - >=sci-libs/hipSPARSE-4.3 - >=sci-libs/rocFFT-4.3 - >=dev-util/roctracer-4.3 ) - ffmpeg? ( media-video/ffmpeg ) - gflags? ( dev-cpp/gflags ) - glog? ( dev-cpp/glog[gflags] ) - leveldb? ( dev-libs/leveldb ) - lmdb? ( dev-db/lmdb ) - mpi? ( virtual/mpi ) - opencl? ( dev-libs/clhpp ) - opencv? ( media-libs/opencv ) - python? ( ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/protobuf-python:=[${PYTHON_USEDEP}] - ') - ) - redis? ( dev-db/redis ) - zeromq? ( net-libs/zeromq ) - dev-cpp/eigen - dev-libs/protobuf:= - dev-libs/libuv -" - -#ATen code generation -BDEPEND="dev-python/pyyaml" - -DEPEND="${RDEPEND} - dev-cpp/tbb - app-arch/zstd - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - ') - sys-cluster/rdma-core - sys-process/numactl -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-Change-library-directory-according-to-CMake-build.patch - "${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch - "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch - "${FILESDIR}"/${PN}-1.7.1-no-rpath.patch - "${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 --install pytest - -src_prepare() { - cmake_src_prepare - eprefixify torch/__init__.py - - rmdir third_party/benchmark || die - ln -sv "${WORKDIR}"/benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd third_party/benchmark || die - rmdir third_party/cpuinfo || die - ln -sv "${WORKDIR}"/cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d third_party/cpuinfo || die - rmdir third_party/cub || die - ln -sv "${WORKDIR}"/cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4 third_party/cub || die - rmdir third_party/fbgemm || die - ln -sv "${WORKDIR}"/FBGEMM-7588d9d804826b428fc0e4fd418e9cc3f7a72e52 third_party/fbgemm || die - rmdir third_party/fbgemm/third_party/asmjit || die - ln -sv "${WORKDIR}"/asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c third_party/fbgemm/third_party/asmjit || die - rmdir third_party/fbgemm/third_party/cpuinfo || die - ln -sv "${WORKDIR}"/cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970 third_party/fbgemm/third_party/cpuinfo || die - rmdir third_party/fbgemm/third_party/googletest || die - ln -sv "${WORKDIR}"/googletest-0fc5466dbb9e623029b1ada539717d10bd45e99e third_party/fbgemm/third_party/googletest || die - rmdir third_party/fmt || die - ln -sv "${WORKDIR}"/fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05 third_party/fmt || die - rmdir third_party/foxi || die - ln -sv "${WORKDIR}"/foxi-c278588e34e535f0bb8f00df3880d26928038cad third_party/foxi || die - rmdir third_party/FP16 || die - ln -sv "${WORKDIR}"/FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3 third_party/FP16 || die - rmdir third_party/FXdiv - ln -sv "${WORKDIR}"/FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1 third_party/FXdiv || die - rmdir third_party/gemmlowp/gemmlowp || die - ln -sv "${WORKDIR}"/gemmlowp-3fb5c176c17c765a3492cd2f0321b0dab712f350 third_party/gemmlowp/gemmlowp || die - rmdir third_party/gloo || die - ln -sv "${WORKDIR}"/gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f third_party/gloo || die - rmdir third_party/googletest || die - ln -sv "${WORKDIR}"/googletest-e2239ee6043f73722e7aa812a459f54a28552929 third_party/googletest || die - rmdir third_party/ideep || die - ln -sv "${WORKDIR}"/ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40 third_party/ideep || die - 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-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 - ln -sv "${WORKDIR}"/onnx-29e7aa7048809784465d06e897f043a4600642b2 third_party/onnx || die - rmdir third_party/onnx-tensorrt || die - ln -sv "${WORKDIR}"/onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f third_party/onnx-tensorrt || die - rmdir third_party/onnx-tensorrt/third_party/onnx || die - ln -sv "${WORKDIR}"/onnx-765f5ee823a67a866f4bd28a9860e81f3c811ce8 third_party/onnx-tensorrt/third_party/onnx || die - rmdir third_party/onnx/third_party/benchmark || die - ln -sv "${WORKDIR}"/benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/onnx/third_party/benchmark || die - rmdir third_party/psimd || die - ln -sv "${WORKDIR}"/psimd-072586a71b55b7f8c584153d223e95687148a900 third_party/psimd || die - rmdir third_party/pthreadpool || die - ln -sv "${WORKDIR}"/pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413 third_party/pthreadpool || die - rmdir third_party/python-peachpy || die - ln -sv "${WORKDIR}"/PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473 third_party/python-peachpy || die - rmdir third_party/QNNPACK || die - ln -sv "${WORKDIR}"/QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c third_party/QNNPACK || die - rmdir third_party/sleef || die - ln -sv "${WORKDIR}"/sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff third_party/sleef || die - rmdir third_party/tensorpipe || die - ln -sv "${WORKDIR}"/tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99 third_party/tensorpipe || die - rmdir third_party/tensorpipe/third_party/googletest || die - ln -sv "${WORKDIR}"/googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/tensorpipe/third_party/googletest || die - rmdir third_party/tensorpipe/third_party/libnop || die - ln -sv "${WORKDIR}"/libnop-aa95422ea8c409e3f078d2ee7708a5f59a8b9fa2 third_party/tensorpipe/third_party/libnop || die - rmdir third_party/tensorpipe/third_party/libuv || die - ln -sv "${WORKDIR}"/libuv-48e04275332f5753427d21a52f17ec6206451f2c third_party/tensorpipe/third_party/libuv || die - rmdir third_party/XNNPACK || die - ln -sv "${WORKDIR}"/XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db third_party/XNNPACK || die - rmdir third_party/kineto || die - ln -sv "${WORKDIR}"/kineto-879a203d9bf554e95541679ddad6e0326f272dc1 third_party/kineto || die - rmdir third_party/breakpad || die - ln -sv "${WORKDIR}"/breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2 third_party/breakpad || die - rmdir third_party/breakpad/src/third_party/lss || die - ln -sv "${WORKDIR}"/linux-syscall-support-e1e7b0ad8ee99a875b272c8e33e308472e897660 third_party/breakpad/src/third_party/lss || die - - if use cuda; then - cd third_party/nccl/nccl || die - eapply "${FILESDIR}"/${PN}-1.10.1-nccl-nvccflags.patch - cuda_src_prepare - export CUDAHOSTCXX=$(cuda_gccdir)/g++ - cd "${S}" - fi - - if use rocm; then - #Allow escaping sandbox - addread /dev/kfd - addread /dev/dri - addpredict /dev/kfd - addpredict /dev/dri - - ebegin "HIPifying cuda sources" - ${EPYTHON} tools/amd_build/build_amd.py || die - eapply "${FILESDIR}"/${PN}-1.9.1-fix-wrong-hipify.patch - eend $? - - local ROCM_VERSION="$(hipconfig -v)-" - export PYTORCH_ROCM_ARCH="${AMDGPU_TARGETS}" - sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \ - -e "/PYTORCH_HIP_HCC_LIBRARIES/s,\${HIP_PATH}/lib,${EPREFIX}/usr/lib/hip/lib," \ - -e "/set(roctracer_INCLUDE_DIRS/a\ set(thrust_INCLUDE_DIRS ${EPREFIX}/usr/include/rocthrust)" \ - -e "s,\${ROCTRACER_PATH}/lib,${EPREFIX}/usr/lib64/roctracer," \ - -e "/READ.*\.info\/version-dev/c\ set(ROCM_VERSION_DEV_RAW ${ROCM_VERSION})" \ - -i cmake/public/LoadHIP.cmake || die - sed -r -e '/^if\(USE_ROCM/{:a;N;/\nendif/!ba; s,\{([^\{]*)_PATH\}(/include)?,\{\L\1_\UINCLUDE_DIRS\},g}' -i cmake/Dependencies.cmake || die - fi - - # Set build dir for pytorch's setup - sed -e "/BUILD_DIR/s,build,${BUILD_DIR}," -i tools/setup_helpers/env.py || die -} - -src_configure() { - local mycmakeargs=( - -DWERROR=OFF - -DTORCH_BUILD_VERSION=${PV} - -DTORCH_INSTALL_LIB_DIR=$(get_libdir) - -DBUILD_BINARY=$(usex tools ON OFF) - -DBUILD_CUSTOM_PROTOBUF=OFF - -DBUILD_PYTHON=$(usex python ON OFF) - -DBUILD_SHARED_LIBS=$(usex static OFF ON) - -DBUILD_TEST=$(usex test ON OFF) - -DUSE_ASAN=$(usex asan ON OFF) - -DUSE_CUDA=$(usex cuda ON OFF) - -DUSE_NCCL=$(usex cuda ON OFF) - -DUSE_SYSTEM_NCCL=OFF - -DUSE_ROCM=$(usex rocm ON OFF) - -DUSE_FBGEMM=$(usex fbgemm ON OFF) - -DUSE_FFMPEG=$(usex ffmpeg ON OFF) - -DUSE_GFLAGS=$(usex gflags ON OFF) - -DUSE_GLOG=$(usex glog ON OFF) - -DUSE_LEVELDB=$(usex leveldb ON OFF) - -DUSE_LITE_PROTO=OFF - -DUSE_LMDB=$(usex lmdb ON OFF) - -DUSE_MKLDNN=$(usex mkldnn ON OFF) - -DUSE_MKLDNN_CBLAS=OFF - -DUSE_NNPACK=$(usex nnpack ON OFF) - -DUSE_NUMPY=$(usex python ON OFF) - -DUSE_NUMA=$(usex numa ON OFF) - -DUSE_OBSERVERS=$(usex observers ON OFF) - -DUSE_OPENCL=$(usex opencl ON OFF) - -DUSE_OPENCV=$(usex opencv ON OFF) - -DUSE_OPENMP=$(usex openmp ON OFF) - -DUSE_TBB=OFF - -DUSE_PROF=OFF - -DUSE_QNNPACK=$(usex qnnpack ON OFF) - -DUSE_REDIS=$(usex redis ON OFF) - -DUSE_ROCKSDB=OFF - -DUSE_ZMQ=$(usex zeromq ON OFF) - -DUSE_MPI=$(usex mpi ON OFF) - -DUSE_GLOO=$(usex gloo ON OFF) - -DUSE_SYSTEM_EIGEN_INSTALL=ON - -DUSE_SYSTEM_PYBIND11=ON - -DBLAS=$(usex blas Generic Eigen) - -DTP_BUILD_LIBUV=OFF - -Wno-dev - ) - - HIP_PATH="${EPREFIX}/usr/lib/hip" cmake_src_configure - - if use python; then - CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure - fi - - # do not rerun cmake and the build process in src_install - sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die -} - -src_compile() { - cmake_src_compile - - if use python; then - USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile - fi -} - -src_install() { - cmake_src_install - - local LIB=$(get_libdir) - if [[ ${LIB} != lib ]]; then - mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die - fi - - rm -r "${ED}/usr/lib" || die - - rm -r "${ED}/usr/include/asmjit" || die - rm -r "${ED}/usr/include/c10d" || die - rm -r "${ED}/usr/include/fbgemm" || die - rm -r "${ED}/usr/include/fp16" || die - rm -r "${ED}/usr/include/gloo" || die - - if use python; then - scanelf -r --fix "${BUILD_DIR}/caffe2/python" || die - USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install - - python_optimize - fi - - find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \; || die - - if use test; then - rm -r "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit} || die - fi - - # Remove the empty directories by CMake Python: - find "${ED}" -type d -empty -delete || die -}