Merge pull request #8344 from wangkuiyi/move_to_fluid

Move Fluid C++ code from /paddle to /paddle/fluid
PaddlePaddle · Feb 10, 2018 · 8370fa8 · 8370fa8
2 parents 175aa7e + 77f04fd
commit 8370fa8
Show file tree

Hide file tree

Showing 722 changed files with 1,618 additions and 1,463 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,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
diff --git a/paddle/CMakeLists.txt b/paddle/CMakeLists.txt
@@ -19,12 +19,7 @@ else()
   endif()
 
   if(NOT ANDROID AND NOT IOS)
-    add_subdirectory(memory)
-    add_subdirectory(platform)
-    add_subdirectory(framework)
-    add_subdirectory(operators)
-    add_subdirectory(pybind)
-    add_subdirectory(inference)
+    add_subdirectory(fluid)
   endif()
 
   if(WITH_SWIG_PY)

diff --git a/paddle/fluid/CMakeLists.txt b/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)
diff --git a/paddle/framework/.clang-format → paddle/fluid/framework/.clang-format b/paddle/framework/.clang-format → paddle/fluid/framework/.clang-format
diff --git a/paddle/framework/CMakeLists.txt → paddle/fluid/framework/CMakeLists.txt b/paddle/framework/CMakeLists.txt → paddle/fluid/framework/CMakeLists.txt
diff --git a/paddle/framework/attribute.cc → paddle/fluid/framework/attribute.cc b/paddle/framework/attribute.cc → 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>
 

diff --git a/paddle/framework/attribute.h → paddle/fluid/framework/attribute.h b/paddle/framework/attribute.h → 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/framework/type_defs.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/type_defs.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/backward.cc → paddle/fluid/framework/backward.cc b/paddle/framework/backward.cc → 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/operators/net_op.h"
+#include "paddle/fluid/framework/backward.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/framework/op_registry.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/net_op.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/backward.h → paddle/fluid/framework/backward.h b/paddle/framework/backward.h → 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/framework/program_desc.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/program_desc.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/backward_test.cc → paddle/fluid/framework/backward_test.cc b/paddle/framework/backward_test.cc → 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/framework/op_desc.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/var_desc.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/op_desc.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/var_desc.h"
+#include "paddle/fluid/operators/net_op.h"
 
 USE_NO_KERNEL_OP(fill_constant);
 

diff --git a/paddle/framework/block_desc.cc → paddle/fluid/framework/block_desc.cc b/paddle/framework/block_desc.cc → 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/framework/operator.h"
-#include "paddle/framework/program_desc.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/program_desc.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/block_desc.h → paddle/fluid/framework/block_desc.h b/paddle/framework/block_desc.h → 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/framework/proto_desc.h"
-#include "paddle/framework/var_desc.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/framework/op_desc.h"
+#include "paddle/fluid/framework/proto_desc.h"
+#include "paddle/fluid/framework/var_desc.h"
+#include "paddle/fluid/platform/macros.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/channel.h → paddle/fluid/framework/channel.h b/paddle/framework/channel.h → 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/framework/details/unbuffered_channel.h"
+#include "paddle/fluid/framework/details/buffered_channel.h"
+#include "paddle/fluid/framework/details/unbuffered_channel.h"
diff --git a/paddle/framework/channel_test.cc → paddle/fluid/framework/channel_test.cc b/paddle/framework/channel_test.cc → 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>

diff --git a/paddle/framework/data_device_transform.cc → .../fluid/framework/data_device_transform.cc b/paddle/framework/data_device_transform.cc → .../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 {

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

diff --git a/...e/framework/data_device_transform_test.cu → ...d/framework/data_device_transform_test.cu b/...e/framework/data_device_transform_test.cu → ...d/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/framework/lod_tensor.h"
-#include "paddle/framework/op_info.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/elementwise_op_function.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_info.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/data_layout.h → paddle/fluid/framework/data_layout.h b/paddle/framework/data_layout.h → 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 {

diff --git a/paddle/framework/data_layout_transform.cc → .../fluid/framework/data_layout_transform.cc b/paddle/framework/data_layout_transform.cc → .../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 {

diff --git a/paddle/framework/data_layout_transform.h → ...e/fluid/framework/data_layout_transform.h b/paddle/framework/data_layout_transform.h → ...e/fluid/framework/data_layout_transform.h
@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "paddle/framework/op_kernel_type.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/variable.h"
+#include "paddle/fluid/framework/op_kernel_type.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/variable.h"
 
 namespace paddle {
 namespace framework {

diff --git a/...e/framework/data_layout_transform_test.cc → ...d/framework/data_layout_transform_test.cc b/...e/framework/data_layout_transform_test.cc → ...d/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;

diff --git a/paddle/framework/data_transform.cc → paddle/fluid/framework/data_transform.cc b/paddle/framework/data_transform.cc → 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/framework/data_layout_transform.h"
-#include "paddle/framework/data_type_transform.h"
+#include "paddle/fluid/framework/data_device_transform.h"
+#include "paddle/fluid/framework/data_layout_transform.h"
+#include "paddle/fluid/framework/data_type_transform.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/data_transform.h → paddle/fluid/framework/data_transform.h b/paddle/framework/data_transform.h → 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/framework/selected_rows.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/variable.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/macros.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/op_kernel_type.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/variable.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/macros.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/data_type.h → paddle/fluid/framework/data_type.h b/paddle/framework/data_type.h → paddle/fluid/framework/data_type.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include <typeindex>
-#include "paddle/framework/framework.pb.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/data_type_transform.cc → ...le/fluid/framework/data_type_transform.cc b/paddle/framework/data_type_transform.cc → ...le/fluid/framework/data_type_transform.cc
@@ -12,10 +12,10 @@ 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_type_transform.h"
+#include "paddle/fluid/framework/data_type_transform.h"
 
-#include "paddle/framework/selected_rows.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/data_type_transform.h → paddle/fluid/framework/data_type_transform.h b/paddle/framework/data_type_transform.h → paddle/fluid/framework/data_type_transform.h
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_kernel_type.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/variable.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/op_kernel_type.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/variable.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/data_type_transform_test.cc → ...uid/framework/data_type_transform_test.cc b/paddle/framework/data_type_transform_test.cc → ...uid/framework/data_type_transform_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/data_type_transform.h"
+#include "paddle/fluid/framework/data_type_transform.h"
 
 #include "gtest/gtest.h"
 

diff --git a/paddle/framework/ddim.cc → paddle/fluid/framework/ddim.cc b/paddle/framework/ddim.cc → paddle/fluid/framework/ddim.cc
@@ -12,8 +12,8 @@ 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/ddim.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/ddim.h → paddle/fluid/framework/ddim.h b/paddle/framework/ddim.h → paddle/fluid/framework/ddim.h
@@ -17,9 +17,9 @@ limitations under the License. */
 #include <initializer_list>
 #include <stdexcept>
 #include <vector>
-#include "paddle/framework/dim.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/variant.h"
+#include "paddle/fluid/framework/dim.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/variant.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/ddim_test.cc → paddle/fluid/framework/ddim_test.cc b/paddle/framework/ddim_test.cc → paddle/fluid/framework/ddim_test.cc
@@ -15,7 +15,7 @@ limitations under the License. */
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "paddle/framework/ddim.h"
+#include "paddle/fluid/framework/ddim.h"
 
 TEST(DDim, Equality) {
   // construct a DDim from an initialization list

diff --git a/paddle/framework/details/buffered_channel.h → ...luid/framework/details/buffered_channel.h b/paddle/framework/details/buffered_channel.h → ...luid/framework/details/buffered_channel.h
@@ -18,8 +18,8 @@ limitations under the License. */
 #include <deque>
 #include <mutex>
 
-#include "paddle/framework/channel.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/framework/channel.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {

diff --git a/paddle/framework/details/cow_ptr.h → paddle/fluid/framework/details/cow_ptr.h b/paddle/framework/details/cow_ptr.h → paddle/fluid/framework/details/cow_ptr.h
diff --git a/paddle/framework/details/cow_ptr_test.cc → ...e/fluid/framework/details/cow_ptr_test.cc b/paddle/framework/details/cow_ptr_test.cc → ...e/fluid/framework/details/cow_ptr_test.cc
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License. */
 
-#include "paddle/framework/details/cow_ptr.h"
+#include "paddle/fluid/framework/details/cow_ptr.h"
 #include "gtest/gtest.h"
 
 namespace paddle {

diff --git a/paddle/framework/details/op_registry.h → paddle/fluid/framework/details/op_registry.h b/paddle/framework/details/op_registry.h → paddle/fluid/framework/details/op_registry.h
@@ -14,11 +14,11 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/grad_op_desc_maker.h"
-#include "paddle/framework/op_info.h"
-#include "paddle/framework/op_proto_maker.h"
-#include "paddle/framework/operator.h"
-#include "paddle/framework/var_type_inference.h"
+#include "paddle/fluid/framework/grad_op_desc_maker.h"
+#include "paddle/fluid/framework/op_info.h"
+#include "paddle/fluid/framework/op_proto_maker.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/var_type_inference.h"
 
 namespace paddle {
 namespace framework {