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

.gitignore

@@ -1,3 +1,9 @@
+paddle/operators/check_t.save
+paddle/operators/check_tensor.ls
+paddle/operators/tensor.save
+python/paddle/v2/fluid/tests/book/image_classification_resnet.inference.model/
+python/paddle/v2/fluid/tests/book/image_classification_vgg.inference.model/
+python/paddle/v2/fluid/tests/book/label_semantic_roles.inference.model/
 *.DS_Store
 build/
 build_doc/
@@ -27,5 +33,5 @@ CMakeFiles
 cmake_install.cmake
 paddle/.timestamp
 python/paddlepaddle.egg-info/
-paddle/pybind/pybind.h
+paddle/fluid/pybind/pybind.h
 python/paddle/version.py

CONTRIBUTING.md

@@ -1,5 +1,8 @@
 # Contribute Code
 
+You are welcome to contribute to project PaddlePaddle. To contribute to PaddlePaddle, you have to agree with the 
+[PaddlePaddle Contributor License Agreement](https://gist.github.com/wangkuiyi/0c22c7b1bd3bb7eb27d76f85c3a3e329).
+
 We sincerely appreciate your contribution.  This document explains our workflow and work style.
 
 ## Workflow

cmake/cuda.cmake

@@ -181,7 +181,8 @@ elseif(CMAKE_BUILD_TYPE  STREQUAL "Release")
 elseif(CMAKE_BUILD_TYPE  STREQUAL "RelWithDebInfo")
     list(APPEND CUDA_NVCC_FLAGS  ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
 elseif(CMAKE_BUILD_TYPE  STREQUAL "MinSizeRel")
-    list(APPEND CUDA_NVCC_FLAGS  ${CMAKE_CXX_FLAGS_MINSIZEREL})
+    # nvcc 9 does not support -Os. Use Release flags instead
+    list(APPEND CUDA_NVCC_FLAGS  ${CMAKE_CXX_FLAGS_RELEASE})
 endif()
 
 mark_as_advanced(CUDA_BUILD_CUBIN CUDA_BUILD_EMULATION CUDA_VERBOSE_BUILD)

paddle/CMakeLists.txt

@@ -19,12 +19,7 @@ else()
   endif()
 
   if(NOT ANDROID AND NOT IOS)
-    add_subdirectory(memory)
+    add_subdirectory(fluid)
-    add_subdirectory(platform)
-    add_subdirectory(framework)
-    add_subdirectory(operators)
-    add_subdirectory(pybind)
-    add_subdirectory(inference)
   endif()
 
   if(WITH_SWIG_PY)

paddle/fluid/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_subdirectory(memory)
+add_subdirectory(platform)
+add_subdirectory(framework)
+add_subdirectory(operators)
+add_subdirectory(pybind)
+add_subdirectory(inference)

paddle/fluid/framework/attribute.cc

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/framework/attribute.h"
+#include "paddle/fluid/framework/attribute.h"
 
 #include <vector>
 

paddle/fluid/framework/attribute.h

@@ -20,9 +20,9 @@ limitations under the License. */
 #include <unordered_set>
 #include <vector>
 
-#include "paddle/framework/framework.pb.h"
+#include "paddle/fluid/framework/framework.pb.h"
-#include "paddle/framework/type_defs.h"
+#include "paddle/fluid/framework/type_defs.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/backward.cc

@@ -12,17 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/framework/backward.h"
+#include "paddle/fluid/framework/backward.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 #include <deque>
 #include <list>
 #include <memory>
 #include <unordered_set>
 
-#include "paddle/framework/block_desc.h"
+#include "paddle/fluid/framework/block_desc.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/backward.h

@@ -18,8 +18,8 @@ limitations under the License. */
 #include <unordered_map>
 #include <unordered_set>
 
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/operator.h"
-#include "paddle/framework/program_desc.h"
+#include "paddle/fluid/framework/program_desc.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/backward_test.cc

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/backward.h"
+#include "paddle/fluid/framework/backward.h"
 
 #include <gtest/gtest.h>
-#include "paddle/framework/block_desc.h"
+#include "paddle/fluid/framework/block_desc.h"
-#include "paddle/framework/op_desc.h"
+#include "paddle/fluid/framework/op_desc.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/framework/var_desc.h"
+#include "paddle/fluid/framework/var_desc.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 USE_NO_KERNEL_OP(fill_constant);
 

paddle/fluid/framework/block_desc.cc

@@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/framework/block_desc.h"
+#include "paddle/fluid/framework/block_desc.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/operator.h"
-#include "paddle/framework/program_desc.h"
+#include "paddle/fluid/framework/program_desc.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/block_desc.h

@@ -20,10 +20,10 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 
-#include "paddle/framework/op_desc.h"
+#include "paddle/fluid/framework/op_desc.h"
-#include "paddle/framework/proto_desc.h"
+#include "paddle/fluid/framework/proto_desc.h"
-#include "paddle/framework/var_desc.h"
+#include "paddle/fluid/framework/var_desc.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/platform/macros.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/channel.h

@@ -54,5 +54,5 @@ void CloseChannel(Channel<T>* ch) {
 }  // namespace framework
 }  // namespace paddle
 
-#include "paddle/framework/details/buffered_channel.h"
+#include "paddle/fluid/framework/details/buffered_channel.h"
-#include "paddle/framework/details/unbuffered_channel.h"
+#include "paddle/fluid/framework/details/unbuffered_channel.h"

paddle/fluid/framework/channel_test.cc

@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/framework/channel.h"
+#include "paddle/fluid/framework/channel.h"
 
 #include <chrono>
 #include <thread>

paddle/fluid/framework/data_device_transform.cc

@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/framework/data_device_transform.h"
+#include "paddle/fluid/framework/data_device_transform.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_device_transform.h

@@ -13,10 +13,10 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
-#include "paddle/framework/tensor_util.h"
+#include "paddle/fluid/framework/tensor_util.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_device_transform_test.cu

@@ -14,13 +14,13 @@ limitations under the License. */
 
 #include "gtest/gtest.h"
 
-#include "paddle/framework/init.h"
+#include "paddle/fluid/framework/init.h"
-#include "paddle/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor.h"
-#include "paddle/framework/op_info.h"
+#include "paddle/fluid/framework/op_info.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_layout.h

@@ -17,7 +17,7 @@ limitations under the License. */
 #include <cctype>
 #include <ostream>
 
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_layout_transform.cc

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/data_layout_transform.h"
+#include "paddle/fluid/framework/data_layout_transform.h"
 
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_layout_transform.h

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "paddle/framework/op_kernel_type.h"
+#include "paddle/fluid/framework/op_kernel_type.h"
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
-#include "paddle/framework/variable.h"
+#include "paddle/fluid/framework/variable.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_layout_transform_test.cc

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/data_layout_transform.h"
+#include "paddle/fluid/framework/data_layout_transform.h"
 
 #include "gtest/gtest.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"
 
 TEST(DataTransform, DataLayoutFunction) {
   using namespace paddle::framework;

paddle/fluid/framework/data_transform.cc

@@ -12,11 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include "paddle/framework/data_transform.h"
+#include "paddle/fluid/framework/data_transform.h"
 
-#include "paddle/framework/data_device_transform.h"
+#include "paddle/fluid/framework/data_device_transform.h"
-#include "paddle/framework/data_layout_transform.h"
+#include "paddle/fluid/framework/data_layout_transform.h"
-#include "paddle/framework/data_type_transform.h"
+#include "paddle/fluid/framework/data_type_transform.h"
 
 namespace paddle {
 namespace framework {

paddle/fluid/framework/data_transform.h

@@ -18,14 +18,14 @@ limitations under the License. */
 #include <utility>
 #include <vector>
 
-#include "paddle/framework/op_kernel_type.h"
+#include "paddle/fluid/framework/op_kernel_type.h"
-#include "paddle/framework/selected_rows.h"
+#include "paddle/fluid/framework/selected_rows.h"
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
-#include "paddle/framework/variable.h"
+#include "paddle/fluid/framework/variable.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/platform/macros.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace framework {