Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into fix-3923-r

cmake/external/nccl.cmake

@@ -2,7 +2,7 @@ INCLUDE(ExternalProject)
 
 SET(NCCL_SOURCE_DIR ${THIRD_PARTY_PATH}/nccl)
 
-INCLUDE_DIRECTORIES(${NCCL_SOURCE_DIR}/src/extern_nccl)
+INCLUDE_DIRECTORIES(${NCCL_SOURCE_DIR}/src/extern_nccl/src)
 
 
 if(WITH_DSO)

paddle/operators/math/im2col.h

@@ -75,7 +75,8 @@ class Im2ColFunctor {
   void operator()(const platform::DeviceContext& context,
                   const framework::Tensor& im, framework::Tensor& col,
                   int stride_height, int stride_width, int padding_up,
-                  int padding_down, int padding_left, int padding_right);
+                  int padding_down, int padding_left = 0,
+                  int padding_right = 0);
 };
 
 template <ColFormat Format, typename Place, typename T>
@@ -84,7 +85,7 @@ class Col2ImFunctor {
   void operator()(const platform::DeviceContext& context, framework::Tensor& im,
                   const framework::Tensor& col, int stride_height,
                   int stride_width, int padding_up, int padding_down,
-                  int padding_left, int padding_right);
+                  int padding_left = 0, int padding_right = 0);
 };
 
 }  // namespace math

python/paddle/v2/parameters.py

@@ -326,6 +326,17 @@ class Parameters(object):
         self.set(name, arr.reshape(self.get_shape(name)))
 
     def to_tar(self, f):
+        """
+        Save parameters to a tar file.
+
+        WARNING: You should use `paddle.v2.trainer.SGD.save_parameter_to_tar(f)`
+            to save parameters most of the time. Otherwise, some settings such
+            as model average will not take effect.
+
+        :param f:
+        :type f: file
+        :return:
+        """
         tar = tarfile.TarFile(fileobj=f, mode='w')
         for nm in self.names():
             buf = cStringIO.StringIO()