Date: Sunday, December 9, 2018 @ 17:24:09 Author: svenstaro Revision: 413040
Remove old patch Deleted: python-pytorch/trunk/12116.patch -------------+ 12116.patch | 70 ---------------------------------------------------------- 1 file changed, 70 deletions(-) Deleted: 12116.patch =================================================================== --- 12116.patch 2018-12-09 17:23:43 UTC (rev 413039) +++ 12116.patch 2018-12-09 17:24:09 UTC (rev 413040) @@ -1,70 +0,0 @@ -From cea0d3269daf34fa32b55237d393de7c47928f65 Mon Sep 17 00:00:00 2001 -From: Xiaodong Wang <[email protected]> -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>());
