[arch-commits] Commit in python-pytorch/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Friday, April 30, 2021 @ 04:55:03
  Author: svenstaro
Revision: 925319

upgpkg: python-pytorch 1.8.1-3: cudnn 8.2 rebuild

Modified:
  python-pytorch/trunk/PKGBUILD
Deleted:
  python-pytorch/trunk/nccl_version.patch
  python-pytorch/trunk/use-system-libuv2.patch

-------------------------+
 PKGBUILD                |    9 +--------
 nccl_version.patch      |   25 -------------------------
 use-system-libuv2.patch |   13 -------------
 3 files changed, 1 insertion(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-30 02:43:44 UTC (rev 925318)
+++ PKGBUILD	2021-04-30 04:55:03 UTC (rev 925319)
@@ -6,7 +6,7 @@
 _pkgname="pytorch"
 pkgver=1.8.1
 _pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
 arch=('x86_64')
 url="https://pytorch.org"
@@ -54,8 +54,6 @@
         "${pkgname}-fmt::git+https://github.com/fmtlib/fmt.git"
         fix_include_system.patch
         use-system-libuv.patch
-        use-system-libuv2.patch
-        nccl_version.patch
         disable_non_x86_64.patch)
 sha256sums=('SKIP'
             'SKIP'
@@ -94,8 +92,6 @@
             'SKIP'
             '557761502bbd994d9795bef46779e4b8c60ba0b45e7d60841f477d3b7f28a00a'
             'cd9ac4aaa9f946ac5eafc57cf66c5c16b3ea7ac8af32c2558fad0705411bb669'
-            '7b65c3b209fc39f92ba58a58be6d3da40799f1922910b1171ccd9209eda1f9eb'
-            'e4a96887b41cbdfd4204ce5f16fcb16a23558d23126331794ab6aa30a66f2e0d'
             'd3ef8491718ed7e814fe63e81df2f49862fffbea891d2babbcb464796a1bd680')
 
 prepare() {
@@ -147,9 +143,6 @@
   # Use system libuv
   patch -Np1 -i "${srcdir}"/use-system-libuv.patch
 
-  # FindNCCL patch to export correct nccl version
-  # patch -Np1 -i "${srcdir}"/nccl_version.patch
-
   # remove local nccl
   rm -rf third_party/nccl/nccl
 

Deleted: nccl_version.patch
===================================================================
--- nccl_version.patch	2021-04-30 02:43:44 UTC (rev 925318)
+++ nccl_version.patch	2021-04-30 04:55:03 UTC (rev 925319)
@@ -1,25 +0,0 @@
-diff --git a/cmake/Modules/FindNCCL.cmake b/cmake/Modules/FindNCCL.cmake
-index a16c9aca67..51eb54f14c 100644
---- a/cmake/Modules/FindNCCL.cmake
-+++ b/cmake/Modules/FindNCCL.cmake
-@@ -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)
--  check_cxx_symbol_exists(NCCL_VERSION_CODE nccl.h NCCL_VERSION_DEFINED)
-+  set(NCCL_VERSION_CODE $ENV{NCCL_VER_CODE})
-+  set(NCCL_VERSION_DEFINED $ENV{NCCL_VER_CODE})
- 
--  if (NCCL_VERSION_DEFINED)
-+  if (DEFINED NCCL_VERSION_DEFINED)
-     set(file "${PROJECT_BINARY_DIR}/detect_nccl_version.cc")
-     file(WRITE ${file} "
-       #include <iostream>
-@@ -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})

Deleted: use-system-libuv2.patch
===================================================================
--- use-system-libuv2.patch	2021-04-30 02:43:44 UTC (rev 925318)
+++ use-system-libuv2.patch	2021-04-30 04:55:03 UTC (rev 925319)
@@ -1,13 +0,0 @@
-diff --git a/cmake/pytorch.cmake b/cmake/pytorch.cmake
-index e4d6b9c..48e0669 100644
---- a/cmake/pytorch.cmake
-+++ b/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)
-