[arch-commits] Commit in python-pytorch/trunk (3 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Thu Oct 29 09:18:53 UTC 2020
Date: Thursday, October 29, 2020 @ 09:18:53
Author: svenstaro
Revision: 736469
Prepare 1.7.0
Modified:
python-pytorch/trunk/PKGBUILD
python-pytorch/trunk/nccl_version.patch
python-pytorch/trunk/use-system-libuv.patch
------------------------+
PKGBUILD | 17 ++++++++---------
nccl_version.patch | 29 ++++-------------------------
use-system-libuv.patch | 20 ++++++++++----------
3 files changed, 22 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-29 07:54:03 UTC (rev 736468)
+++ PKGBUILD 2020-10-29 09:18:53 UTC (rev 736469)
@@ -4,9 +4,9 @@
pkgbase=python-pytorch
pkgname=("python-pytorch" "python-pytorch-opt" "python-pytorch-cuda" "python-pytorch-opt-cuda")
_pkgname="pytorch"
-pkgver=1.6.0
-_pkgver=1.6.0
-pkgrel=6
+pkgver=1.7.0
+_pkgver=1.7.0
+pkgrel=1
pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
arch=('x86_64')
url="https://pytorch.org"
@@ -23,9 +23,9 @@
disable_non_x86_64.patch)
sha256sums=('SKIP'
'147bdaeac8ec46ea46382e6146878bd8f8d51e05d5bd6f930dfd8e2b520859b9'
- '6f3b7a87172011de810bf1ab581245b4463ef86e5cd09bec63aeffa372e26646'
+ '26b1dd596f1e21a011ee18cab939924483d6c6d4d98e543bf76f5a9312d54d67'
'7b65c3b209fc39f92ba58a58be6d3da40799f1922910b1171ccd9209eda1f9eb'
- '1a276bd827a0c76dab908cbc6605fa4c9fc2cc2b9431b6578a41133ae27dba2b'
+ 'e4a96887b41cbdfd4204ce5f16fcb16a23558d23126331794ab6aa30a66f2e0d'
'd3ef8491718ed7e814fe63e81df2f49862fffbea891d2babbcb464796a1bd680')
prepare() {
@@ -43,10 +43,9 @@
# Use system libuv
patch -Np1 -i "${srcdir}"/use-system-libuv.patch
- patch -Np1 -i "${srcdir}"/use-system-libuv2.patch -d third_party/tensorpipe
# FindNCCL patch to export correct nccl version
- patch -Np1 -i "${srcdir}"/nccl_version.patch
+ # patch -Np1 -i "${srcdir}"/nccl_version.patch
# remove local nccl
rm -rf third_party/nccl/nccl
@@ -78,8 +77,8 @@
export CUDA_HOME=/opt/cuda
export CUDNN_LIB_DIR=/usr/lib
export CUDNN_INCLUDE_DIR=/usr/include
- export TORCH_NVCC_FLAGS="-Xfatbin -compress-all"
- export TORCH_CUDA_ARCH_LIST="5.2;5.3;6.0;6.0+PTX;6.1;6.1+PTX;6.2;6.2+PTX;7.0;7.0+PTX;7.2;7.2+PTX;7.5;7.5+PTX;8.0" # Not yet supported in pytorch: 8.0+PTX;8.6;8.6+PTX
+ # export TORCH_NVCC_FLAGS="-Xfatbin -compress-all"
+ export TORCH_CUDA_ARCH_LIST="5.2;5.3;6.0;6.1;6.2;7.0;7.0+PTX;7.2;7.2+PTX;7.5;7.5+PTX;8.0;8.0+PTX;8.6;8.6+PTX"
}
build() {
Modified: nccl_version.patch
===================================================================
--- nccl_version.patch 2020-10-29 07:54:03 UTC (rev 736468)
+++ nccl_version.patch 2020-10-29 09:18:53 UTC (rev 736469)
@@ -1,15 +1,8 @@
diff --git a/cmake/Modules/FindNCCL.cmake b/cmake/Modules/FindNCCL.cmake
-index 5bd3ccd606..f92eda98f5 100644
+index a16c9aca67..51eb54f14c 100644
--- a/cmake/Modules/FindNCCL.cmake
+++ b/cmake/Modules/FindNCCL.cmake
-@@ -48,37 +48,39 @@ find_library(NCCL_LIBRARIES
-
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(NCCL DEFAULT_MSG NCCL_INCLUDE_DIRS NCCL_LIBRARIES)
-
- if(NCCL_FOUND) # obtaining NCCL version and some sanity checks
- set (NCCL_HEADER_FILE "${NCCL_INCLUDE_DIRS}/nccl.h")
- message (STATUS "Determining NCCL version from ${NCCL_HEADER_FILE}...")
+@@ -55,9 +55,10 @@ if(NCCL_FOUND) # obtaining NCCL version and some sanity checks
set (OLD_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})
list (APPEND CMAKE_REQUIRED_INCLUDES ${NCCL_INCLUDE_DIRS})
include(CheckCXXSymbolExists)
@@ -22,25 +15,11 @@
set(file "${PROJECT_BINARY_DIR}/detect_nccl_version.cc")
file(WRITE ${file} "
#include <iostream>
- #include <nccl.h>
- int main()
- {
- std::cout << NCCL_MAJOR << '.' << NCCL_MINOR << '.' << NCCL_PATCH << std::endl;
-
- int x;
- ncclGetVersion(&x);
- return x == NCCL_VERSION_CODE;
+@@ -72,6 +73,7 @@ if(NCCL_FOUND) # obtaining NCCL version and some sanity checks
}
")
try_run(NCCL_VERSION_MATCHED compile_result ${PROJECT_BINARY_DIR} ${file}
+ CMAKE_FLAGS -DINCLUDE_DIRECTORIES=/opt/cuda/include
RUN_OUTPUT_VARIABLE NCCL_VERSION_FROM_HEADER
+ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${NCCL_INCLUDE_DIRS}"
LINK_LIBRARIES ${NCCL_LIBRARIES})
- if (NOT NCCL_VERSION_MATCHED)
- message(FATAL_ERROR "Found NCCL header version and library version do not match! \
- (include: ${NCCL_INCLUDE_DIRS}, library: ${NCCL_LIBRARIES}) Please set NCCL_INCLUDE_DIR and NCCL_LIB_DIR manually.")
- endif()
- message(STATUS "NCCL version: ${NCCL_VERSION_FROM_HEADER}")
- else()
- message(STATUS "NCCL version < 2.3.5-5")
- endif ()
Modified: use-system-libuv.patch
===================================================================
--- use-system-libuv.patch 2020-10-29 07:54:03 UTC (rev 736468)
+++ use-system-libuv.patch 2020-10-29 09:18:53 UTC (rev 736469)
@@ -1,13 +1,13 @@
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index b498be17e1..69e5c9f187 100644
+index 023bbe9e8d..e25aa0aa7f 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
-@@ -1312,7 +1312,7 @@ if(USE_DISTRIBUTED AND USE_TENSORPIPE)
- set(__BUILD_TESTING ${BUILD_TESTING})
- set(BUILD_TESTING OFF)
- set(TP_BUILD_PYTHON OFF)
-- set(TP_BUILD_LIBUV ON)
-+ set(TP_BUILD_LIBUV OFF)
-
- add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/tensorpipe)
-
+@@ -1308,7 +1308,7 @@ 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_BUILD_LIBUV OFF 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)
More information about the arch-commits
mailing list