Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into add_py36_py37_dockerfile

7 years ago · e5ca829437
parent 9bb1f66ddb b8f36bd074
commit e5ca829437
3 changed files with 151 additions and 101 deletions
--- a/paddle/fluid/memory/allocation/best_fit_allocator_test.cc
+++ b/paddle/fluid/memory/allocation/best_fit_allocator_test.cc
@ -13,6 +13,7 @@
 // limitations under the License.
 #include "paddle/fluid/memory/allocation/best_fit_allocator.h"
 #include <random>
 #include <thread>  // NOLINT
 #include <vector>
 #include "gtest/gtest.h"
--- a/paddle/fluid/memory/allocation/best_fit_allocator_test.cu
+++ b/paddle/fluid/memory/allocation/best_fit_allocator_test.cu
@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include <random>
 #include <thread>  // NOLINT
 #include <vector>
 #include "gtest/gtest.h"
--- a/python/paddle/fluid/layers/nn.py
+++ b/python/paddle/fluid/layers/nn.py