From 5e738ca33315da274676cdfb53bd9fa4aef9bab3 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Mon, 21 Nov 2016 16:37:36 +0800
Subject: [PATCH] Change auto => size_t in BaseMatrix.cu

* Because it is a cuda source file, and we need to support c++ 03 in
  cuda.
---
 paddle/math/BaseMatrix.cu | 20 ++++++++++----------
 paddle/math/Vector.cpp    |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/paddle/math/BaseMatrix.cu b/paddle/math/BaseMatrix.cu
index 2afb216db5..2f32b3fdd1 100644
--- a/paddle/math/BaseMatrix.cu
+++ b/paddle/math/BaseMatrix.cu
@@ -1449,8 +1449,8 @@ template<>
 template <class Agg>
 int BaseMatrixT<real>::applyRow(Agg agg, BaseMatrixT& b) {
   MatrixOffset offset(0, 0, 0, 0, 0, 0);
-  auto numRows = b.height_;
-  auto numCols = b.width_;
+  size_t numRows = b.height_;
+  size_t numCols = b.width_;
   CHECK_EQ(height_, numRows);
   CHECK_EQ(width_, 1UL);
   aggregate(agg, base::unary::identity(), base::binary::second(), b, numRows,
@@ -1463,8 +1463,8 @@ template<>
 template <class Agg, class Saver>
 int BaseMatrixT<real>::applyRow(Agg agg, Saver sv, BaseMatrixT& b) {
   MatrixOffset offset(0, 0, 0, 0, 0, 0);
-  auto numRows = b.height_;
-  auto numCols = b.width_;
+  size_t numRows = b.height_;
+  size_t numCols = b.width_;
   CHECK_EQ(height_, numRows);
   CHECK_EQ(width_, 1UL);
   aggregate(agg, base::unary::identity(), sv, b, numRows, numCols, offset,
@@ -1493,8 +1493,8 @@ template <class Agg, class Op, class Saver>
 int BaseMatrixT<real>::applyRow(Agg agg, Op op, Saver sv,
                                 BaseMatrixT& b, BaseMatrixT& c) {
   MatrixOffset offset(0, 0, 0, 0, 0, 0);
-  auto numRows = b.height_;
-  auto numCols = b.width_;
+  size_t numRows = b.height_;
+  size_t numCols = b.width_;
   CHECK_EQ(height_, numRows);
   CHECK_EQ(width_, 1UL);
   CHECK_EQ(c.height_, numRows);
@@ -1524,8 +1524,8 @@ template<>
 template <class Agg>
 int BaseMatrixT<real>::applyCol(Agg agg, BaseMatrixT& b) {
   MatrixOffset offset(0, 0, 0, 0, 0, 0);
-  auto numRows = b.height_;
-  auto numCols = b.width_;
+  size_t numRows = b.height_;
+  size_t numCols = b.width_;
   CHECK_EQ(width_, numCols);
   CHECK_EQ(height_, 1UL);
   aggregate(agg, base::unary::identity(), base::binary::second(), b, numRows,
@@ -1538,8 +1538,8 @@ template<>
 template <class Agg, class Saver>
 int BaseMatrixT<real>::applyCol(Agg agg, Saver sv, BaseMatrixT& b) {
   MatrixOffset offset(0, 0, 0, 0, 0, 0);
-  auto numRows = b.height_;
-  auto numCols = b.width_;
+  size_t numRows = b.height_;
+  size_t numCols = b.width_;
   CHECK_EQ(width_, numCols);
   CHECK_EQ(height_, 1UL);
   aggregate(agg, base::unary::identity(), sv, b, numRows, numCols, offset,
diff --git a/paddle/math/Vector.cpp b/paddle/math/Vector.cpp
index 9ef7f2b4b5..68a1518d67 100644
--- a/paddle/math/Vector.cpp
+++ b/paddle/math/Vector.cpp
@@ -82,8 +82,8 @@ MatrixPtr VectorT<real>::toOneHotSparseMatrix(size_t idRange, bool useGpu) {
 
 template <>
 MatrixPtr VectorT<int>::toOneHotSparseMatrix(size_t idRange, bool useGpu) {
-  auto height = getSize();
-  auto width = idRange;
+  size_t height = getSize();
+  size_t width = idRange;
   MatrixPtr mat = Matrix::createSparseMatrix(
       height, idRange, height, NO_VALUE, SPARSE_CSR, false, useGpu);
 
-- 
GitLab