Date: Thursday, October 4, 2018 @ 22:28:42 Author: svenstaro Revision: 389687
upgpkg: python-pytorch 1.0rc1-1 Added: python-pytorch/trunk/12116.patch Modified: python-pytorch/trunk/PKGBUILD -------------+ 12116.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 10 ++++---- 2 files changed, 75 insertions(+), 5 deletions(-) Added: 12116.patch =================================================================== --- 12116.patch (rev 0) +++ 12116.patch 2018-10-04 22:28:42 UTC (rev 389687) @@ -0,0 +1,70 @@ +From cea0d3269daf34fa32b55237d393de7c47928f65 Mon Sep 17 00:00:00 2001 +From: Xiaodong Wang <xdw...@fb.com> +Date: Wed, 26 Sep 2018 13:44:53 -0700 +Subject: [PATCH] Caffe 2 adoption + +Summary: +Adapt Caffe 2 to platform007 (gcc 8): +* gcc 8 + nvcc template symbol lookup (D9319742): +context_.template CopySameDevice<T> ==> this->context_.template CopySameDevice<T> +* New gcc 8 warning (error): + * -Werror=sizeof-pointer-div + * Unnecessary parenthesis + +Differential Revision: D10045844 + +fbshipit-source-id: 0b0569401fac69f83b8c2be758eea7c8fa18a019 +--- + aten/src/THC/generic/THCTensor.cpp | 2 +- + caffe2/operators/rnn/recurrent_op_cudnn.cc | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/aten/src/THC/generic/THCTensor.cpp b/aten/src/THC/generic/THCTensor.cpp +index a7779047863..673870288e8 100644 +--- a/aten/src/THC/generic/THCTensor.cpp ++++ b/aten/src/THC/generic/THCTensor.cpp +@@ -596,7 +596,7 @@ int THCTensor_(checkGPU)(THCState *state, unsigned int nTensors, ...) + { + int curDev = -1; + THCudaCheck(cudaGetDevice(&curDev)); +- va_list(args); ++ va_list args; + va_start(args, nTensors); + int valid = 1; + for (unsigned int i = 0; i < nTensors; i++) { +diff --git a/caffe2/operators/rnn/recurrent_op_cudnn.cc b/caffe2/operators/rnn/recurrent_op_cudnn.cc +index 4b349655843..fa37874bd3e 100644 +--- a/caffe2/operators/rnn/recurrent_op_cudnn.cc ++++ b/caffe2/operators/rnn/recurrent_op_cudnn.cc +@@ -458,13 +458,13 @@ bool RecurrentParamAccessOp<T, mode>::RunOnDevice() { + if (mode == SET_PARAM) { + CAFFE_ENFORCE_EQ( + biasDims[0] * biasDims[1] * biasDims[2], Input(2).size()); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + biasDims[0] * biasDims[1] * biasDims[2], + Input(2).template data<T>(), + static_cast<T*>(bias)); + } else { + Output(0)->Resize(biasDims); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + biasDims[0] * biasDims[1] * biasDims[2], + static_cast<T*>(bias), + Output(0)->template mutable_data<T>()); +@@ -495,13 +495,13 @@ bool RecurrentParamAccessOp<T, mode>::RunOnDevice() { + CAFFE_ENFORCE_EQ(numDims, 3); + if (mode == SET_PARAM) { + CAFFE_ENFORCE_EQ(matDims[0] * matDims[1] * matDims[2], Input(2).size()); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + matDims[0] * matDims[1] * matDims[2], + Input(2).template data<T>(), + static_cast<T*>(pmatrix)); + } else { + Output(0)->Resize(matDims); +- context_.template CopySameDevice<T>( ++ this->context_.template CopySameDevice<T>( + matDims[0] * matDims[1] * matDims[2], + static_cast<T*>(pmatrix), + Output(0)->template mutable_data<T>()); Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-04 22:20:12 UTC (rev 389686) +++ PKGBUILD 2018-10-04 22:28:42 UTC (rev 389687) @@ -117,21 +117,21 @@ msg2 "Building without cuda" export NO_CUDA=1 export WITH_CUDNN=0 - export USE_OPENCV=1 - export BUILD_BINARY=1 + # export USE_OPENCV=1 + # export BUILD_BINARY=1 cd "$srcdir/${_pkgname}-${pkgver}" python setup.py build msg2 "Building with cuda" - # export CC=gcc-7 - # export CXX=g++-7 + export CC=gcc-7 + export CXX=g++-7 export NO_CUDA=0 export CUDAHOSTCXX=g++-7 export CUDA_HOME=/opt/cuda export CUDNN_LIB_DIR=/opt/cuda/lib64 export CUDNN_INCLUDE_DIR=/opt/cuda/include - export TORCH_CUDA_ARCH_LIST="3.0;3.2;3.5;3.7;5.0;5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5" + # export TORCH_CUDA_ARCH_LIST="3.0;3.2;3.5;3.7;5.0;5.2;5.3;6.0;6.1;6.2;7.0;7.2;7.5" cd "$srcdir/${_pkgname}-${pkgver}-cuda" python setup.py build