diff --git a/paddle/fluid/framework/attribute.cc b/paddle/fluid/framework/attribute.cc
index 5074e8f5a05ed4e824b3db7e506b30eb1b70c3fd..1d7e7366b0723c630b24d62c1f5d0a72cf42d770 100644
--- a/paddle/fluid/framework/attribute.cc
+++ b/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/fluid/framework/attribute.h b/paddle/fluid/framework/attribute.h
index bcff9bc4c48f8f233b7f811640c2789f9618a972..16be42ae71497bcc755d10eee2d73d331ede7da6 100644
--- a/paddle/fluid/framework/attribute.h
+++ b/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/fluid/framework/backward.cc b/paddle/fluid/framework/backward.cc
index f52a51519fceffd96a4e8db240b23d15ed399fff..c4795f4fc5c73034b23305162ea3b710480d8ebc 100644
--- a/paddle/fluid/framework/backward.cc
+++ b/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/fluid/framework/backward.h b/paddle/fluid/framework/backward.h
index 69ee3802369c16a8b21c0710d2008ef3c085cc5c..2ea6922426e1dad0ca9b6e1287701bca0adef5c8 100644
--- a/paddle/fluid/framework/backward.h
+++ b/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/fluid/framework/backward_test.cc b/paddle/fluid/framework/backward_test.cc
index 72743b5fd0b32479ccbf28fbf98032df8fa371e9..f9604c68913f98abc4d52c84bc8fa2c02e1a6a31 100644
--- a/paddle/fluid/framework/backward_test.cc
+++ b/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/fluid/framework/block_desc.cc b/paddle/fluid/framework/block_desc.cc
index 3e344ea3790f57b0f53f36a40263dcdd326e67a9..9550159155c28247797a6caa5fc01c64a0c5f99f 100644
--- a/paddle/fluid/framework/block_desc.cc
+++ b/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/fluid/framework/block_desc.h b/paddle/fluid/framework/block_desc.h
index 4b609e4bcb67bb8dda5924a639e7a8165eda4353..5f7eca3878ff6174090c7b0dd4904f5604ac8dc6 100644
--- a/paddle/fluid/framework/block_desc.h
+++ b/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/fluid/framework/channel.h b/paddle/fluid/framework/channel.h
index 146f0e9e71ea9101a8f6c71e6c023178f131f967..5acf4fb39bbeb6bd45d215c962f10f0333578c02 100644
--- a/paddle/fluid/framework/channel.h
+++ b/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/fluid/framework/channel_test.cc b/paddle/fluid/framework/channel_test.cc
index d7140dd10661c7b8582930b47872ab0b330c4d66..953fa40fec8c0480726b44760a3a4c7f59c80a85 100644
--- a/paddle/fluid/framework/channel_test.cc
+++ b/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/fluid/framework/data_device_transform.cc b/paddle/fluid/framework/data_device_transform.cc
index 5daf5a4e0ab47cf90119ee2f48f1fe89559a1972..3c6dd28455b02aa71d8ed09d8c2c81397a6f9955 100644
--- a/paddle/fluid/framework/data_device_transform.cc
+++ b/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 {
diff --git a/paddle/fluid/framework/data_device_transform.h b/paddle/fluid/framework/data_device_transform.h
index 39750a85f2787c6d35723bb908011349a771fb7f..0c4559f586aaf3cc055f9b53b050b3f3a97573bd 100644
--- a/paddle/fluid/framework/data_device_transform.h
+++ b/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/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/paddle/fluid/framework/data_device_transform_test.cu b/paddle/fluid/framework/data_device_transform_test.cu
index efc05b3106b40bdaa6cd03ce707c677dd58b0730..f740f9b3268be31973774674bdea9eb404f718ed 100644
--- a/paddle/fluid/framework/data_device_transform_test.cu
+++ b/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/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/fluid/framework/data_layout.h b/paddle/fluid/framework/data_layout.h
index 31817251ed09a7a1da7223c1e99b2eb369a3de30..b72f13f2e8f28556c195e65e3096b6ef1ba9e13a 100644
--- a/paddle/fluid/framework/data_layout.h
+++ b/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/fluid/framework/data_layout_transform.cc b/paddle/fluid/framework/data_layout_transform.cc
index 9d0a6d5ea3eb4127763acbd1f7a219aa19db4eca..c546a508fe1bc1c6e1608cb16a2e1f708a083895 100644
--- a/paddle/fluid/framework/data_layout_transform.cc
+++ b/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 {
diff --git a/paddle/fluid/framework/data_layout_transform.h b/paddle/fluid/framework/data_layout_transform.h
index 368f7fc9898338af0f9502cbc1e94cc40ae12e3b..862405fbf466cd5e5fc819f42cc7392b1c4ca624 100644
--- a/paddle/fluid/framework/data_layout_transform.h
+++ b/paddle/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/paddle/fluid/framework/data_layout_transform_test.cc b/paddle/fluid/framework/data_layout_transform_test.cc
index 093e8d4d3458479763415dbc24957eaaa0f6f0fe..99eb46bde34b089c3da65885748a1e77fe40c700 100644
--- a/paddle/fluid/framework/data_layout_transform_test.cc
+++ b/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;
diff --git a/paddle/fluid/framework/data_transform.cc b/paddle/fluid/framework/data_transform.cc
index b6fd46401ffdd50cfdb00cc6e4ecd821bb39aba5..9575d01af8875cc21061979e54ce0612d8a7f3a5 100644
--- a/paddle/fluid/framework/data_transform.cc
+++ b/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/fluid/framework/data_transform.h b/paddle/fluid/framework/data_transform.h
index a4b78902379d5eb89f92ec47655ff93b49d0bfab..70d3a174accc8beda06c550bc5ac9ee97897eb2e 100644
--- a/paddle/fluid/framework/data_transform.h
+++ b/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/fluid/framework/data_type.h b/paddle/fluid/framework/data_type.h
index 98eb3e857d1943e71f1d41f24ecbedbe09e85b7b..7a527f0d0c12806045d21b1cf279ccfd2cf73c8d 100644
--- a/paddle/fluid/framework/data_type.h
+++ b/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/fluid/framework/data_type_transform.cc b/paddle/fluid/framework/data_type_transform.cc
index 7df1cc6b75b4e87b57813aa01a1b29302d616158..6921927305aa3a7dee801ead888737a1ab93fc8e 100644
--- a/paddle/fluid/framework/data_type_transform.cc
+++ b/paddle/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/fluid/framework/data_type_transform.h b/paddle/fluid/framework/data_type_transform.h
index 067c0c2a5b14465a31cabf7b5d4442d6a3a1c773..830cced093913839ddef2841b3de1017dc2bc426 100644
--- a/paddle/fluid/framework/data_type_transform.h
+++ b/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/fluid/framework/data_type_transform_test.cc b/paddle/fluid/framework/data_type_transform_test.cc
index 89d32f528334a159e1b015802ff2670f9cfc1584..88dbc51b21718e2261f1c9485177621a827485e2 100644
--- a/paddle/fluid/framework/data_type_transform_test.cc
+++ b/paddle/fluid/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/fluid/framework/ddim.cc b/paddle/fluid/framework/ddim.cc
index 8b6f42b82df14bfcd25f33ef16b5903fb965a8ba..f063ee2e6dd81e66b7b74aa23e9967d865c4d297 100644
--- a/paddle/fluid/framework/ddim.cc
+++ b/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/fluid/framework/ddim.h b/paddle/fluid/framework/ddim.h
index 4ca5e49566b7ec006eba80f3f9808bacb1ff2615..750ab787abb72fa3f2984caf58354e327750aa3d 100644
--- a/paddle/fluid/framework/ddim.h
+++ b/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/fluid/framework/ddim_test.cc b/paddle/fluid/framework/ddim_test.cc
index bc259d1f603fb34ac8546c388669d8c5c1250bd1..18d305a4036840066a7d9c999a7e73db863274d7 100644
--- a/paddle/fluid/framework/ddim_test.cc
+++ b/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/fluid/framework/details/buffered_channel.h b/paddle/fluid/framework/details/buffered_channel.h
index 227a4e4811f95441158150396b5b882815fd7844..88faf3acf7c17b0cb3770a8910e400a1f6688f5f 100644
--- a/paddle/fluid/framework/details/buffered_channel.h
+++ b/paddle/fluid/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/fluid/framework/details/cow_ptr_test.cc b/paddle/fluid/framework/details/cow_ptr_test.cc
index 1f4a12bca0dcab2d146cc62cd7ce1c2d7abcddf9..d2142af277c0b356d83941b3baab1947cce31dac 100644
--- a/paddle/fluid/framework/details/cow_ptr_test.cc
+++ b/paddle/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/fluid/framework/details/op_registry.h b/paddle/fluid/framework/details/op_registry.h
index 31a40bcbcb3905f01aebefe89526f3cfba8cb8c7..d73604ad185a66ade0168f585d1951d0d7d4a5f9 100644
--- a/paddle/fluid/framework/details/op_registry.h
+++ b/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 {
diff --git a/paddle/fluid/framework/details/unbuffered_channel.h b/paddle/fluid/framework/details/unbuffered_channel.h
index 6b5c2196cb2991051c48f7da8397d2f479ca4c58..5c9424928cb7029aac813e7b2f29f81a0093f836 100644
--- a/paddle/fluid/framework/details/unbuffered_channel.h
+++ b/paddle/fluid/framework/details/unbuffered_channel.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <condition_variable>
 #include <mutex>
 
-#include "paddle/framework/channel.h"
+#include "paddle/fluid/framework/channel.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/dim.h b/paddle/fluid/framework/dim.h
index ec17d7c6156351d21a4f9431f85fb0bcf00e4331..3938fd3df5b54443fcbaebf600840ccf2337a173 100644
--- a/paddle/fluid/framework/dim.h
+++ b/paddle/fluid/framework/dim.h
@@ -18,8 +18,8 @@
 #include <stdexcept>
 #include <type_traits>
 
-#include "paddle/platform/assert.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/dim_test.cu b/paddle/fluid/framework/dim_test.cu
index 2bcab7c5c2e454e86a148fde003164d369c46ef2..0f1969d79775ba70661806d589ae3de2696b77e8 100644
--- a/paddle/fluid/framework/dim_test.cu
+++ b/paddle/fluid/framework/dim_test.cu
@@ -15,7 +15,7 @@
 #include <sstream>
 
 #include "gtest/gtest.h"
-#include "paddle/framework/dim.h"
+#include "paddle/fluid/framework/dim.h"
 
 __global__ void test(paddle::framework::Dim<2>* o) {
   o[0] = paddle::framework::make_dim(5, 6);
diff --git a/paddle/fluid/framework/eigen.h b/paddle/fluid/framework/eigen.h
index 54bbeafcabdeeb1e2c1017c156b3512c83dada3a..d1b8c701a7941813c0fbf441b8a6c7f4d3811a6d 100644
--- a/paddle/fluid/framework/eigen.h
+++ b/paddle/fluid/framework/eigen.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
 #include "unsupported/Eigen/CXX11/Tensor"
 
 namespace paddle {
diff --git a/paddle/fluid/framework/eigen_test.cc b/paddle/fluid/framework/eigen_test.cc
index 9e368a522ce71d73213ba4c781e8a56fad917b0a..f9e3abeccb34fd1778cac6918d24e30021b433e9 100644
--- a/paddle/fluid/framework/eigen_test.cc
+++ b/paddle/fluid/framework/eigen_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/eigen.h"
+#include "paddle/fluid/framework/eigen.h"
 #include <gtest/gtest.h>
 
 namespace paddle {
diff --git a/paddle/fluid/framework/executor.cc b/paddle/fluid/framework/executor.cc
index 2a88e5a92985fab7311c1edd266cb89f7d76d867..816ad8d6590a1af3a043cfef5da1edee5119575d 100644
--- a/paddle/fluid/framework/executor.cc
+++ b/paddle/fluid/framework/executor.cc
@@ -12,19 +12,19 @@ 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/executor.h"
+#include "paddle/fluid/framework/executor.h"
 
 #include <set>
 
 #include "gflags/gflags.h"
-#include "paddle/framework/feed_fetch_method.h"
-#include "paddle/framework/feed_fetch_type.h"
-#include "paddle/framework/lod_rank_table.h"
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/reader.h"
-#include "paddle/platform/place.h"
-#include "paddle/platform/profiler.h"
+#include "paddle/fluid/framework/feed_fetch_method.h"
+#include "paddle/fluid/framework/feed_fetch_type.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/reader.h"
+#include "paddle/fluid/platform/place.h"
+#include "paddle/fluid/platform/profiler.h"
 
 DECLARE_bool(benchmark);
 DEFINE_bool(check_nan_inf, false,
diff --git a/paddle/fluid/framework/executor.h b/paddle/fluid/framework/executor.h
index 035ff48a52bd2fc4b1a46b48b1fbf1fbcb2ac70b..893c949939e8db2f5227b940bf721ca7f114db9c 100644
--- a/paddle/fluid/framework/executor.h
+++ b/paddle/fluid/framework/executor.h
@@ -14,11 +14,11 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_info.h"
-#include "paddle/framework/program_desc.h"
-#include "paddle/framework/scope.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/op_info.h"
+#include "paddle/fluid/framework/program_desc.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/feed_fetch_method.cc b/paddle/fluid/framework/feed_fetch_method.cc
index 21201b675519e34b11e9f1f3a6f2a135c06d63a7..a9bb17355d9bc1fb7f355a4038a4c5831d3530b1 100644
--- a/paddle/fluid/framework/feed_fetch_method.cc
+++ b/paddle/fluid/framework/feed_fetch_method.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/feed_fetch_method.h"
+#include "paddle/fluid/framework/feed_fetch_method.h"
 #include "glog/logging.h"
-#include "paddle/framework/variable.h"
+#include "paddle/fluid/framework/variable.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/feed_fetch_method.h b/paddle/fluid/framework/feed_fetch_method.h
index b71945fcc8834d2e5fe21151e1e88788b4acd5c1..5355c29047e668d1a2ec141b303dd562158b2bb3 100644
--- a/paddle/fluid/framework/feed_fetch_method.h
+++ b/paddle/fluid/framework/feed_fetch_method.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/feed_fetch_type.h"
-#include "paddle/framework/scope.h"
+#include "paddle/fluid/framework/feed_fetch_type.h"
+#include "paddle/fluid/framework/scope.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/feed_fetch_type.h b/paddle/fluid/framework/feed_fetch_type.h
index 168f456675af508df86dd0520cdeb5d16d94ad31..4281e36b138f66268e2f1e835d4475676d97839d 100644
--- a/paddle/fluid/framework/feed_fetch_type.h
+++ b/paddle/fluid/framework/feed_fetch_type.h
@@ -15,7 +15,7 @@ limitations under the License. */
 #pragma once
 #include <string>
 #include <vector>
-#include "paddle/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/grad_op_desc_maker.h b/paddle/fluid/framework/grad_op_desc_maker.h
index f51753453bee255a0592e9c5b0fb2d9aa380e109..21dd4e885485f88eeeb034ca45c643f9fadf3163 100644
--- a/paddle/fluid/framework/grad_op_desc_maker.h
+++ b/paddle/fluid/framework/grad_op_desc_maker.h
@@ -16,8 +16,8 @@ limitations under the License. */
 #include <string>
 #include <unordered_set>
 #include <vector>
-#include "paddle/framework/op_desc.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/op_desc.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/init.cc b/paddle/fluid/framework/init.cc
index 3f6ea121b3994979d89a7d5a8c20c59240a0c111..cb2d740d8609210064a06cccc5d45c84275e9709 100644
--- a/paddle/fluid/framework/init.cc
+++ b/paddle/fluid/framework/init.cc
@@ -16,10 +16,10 @@ limitations under the License. */
 #include <stdexcept>
 #include <string>
 
-#include "paddle/framework/init.h"
-#include "paddle/framework/operator.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/place.h"
 #include "paddle/string/piece.h"
 
 namespace paddle {
diff --git a/paddle/fluid/framework/init_test.cc b/paddle/fluid/framework/init_test.cc
index 01e076dd8ea24831e3ed7c8a7f8fae6818a89335..f3018541e27a403e1b6e63a8da9eeb1f67915e9e 100644
--- a/paddle/fluid/framework/init_test.cc
+++ b/paddle/fluid/framework/init_test.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include "gtest/gtest.h"
 
-#include "paddle/framework/init.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/platform/device_context.h"
 
 TEST(InitDevices, CPU) {
   using paddle::framework::InitDevices;
diff --git a/paddle/fluid/framework/lod_rank_table.cc b/paddle/fluid/framework/lod_rank_table.cc
index 704bce2a0eb60b974efd41a4edda0af2933da825..31c87492349bff4cd81b101a0e8d44b0516bac46 100644
--- a/paddle/fluid/framework/lod_rank_table.cc
+++ b/paddle/fluid/framework/lod_rank_table.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/lod_rank_table.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/lod_rank_table.h b/paddle/fluid/framework/lod_rank_table.h
index df188709e91871ded0258fa5703ee16a5664f057..0eaaf49e4c4d90250b247edf2a8699b8c7c5920d 100644
--- a/paddle/fluid/framework/lod_rank_table.h
+++ b/paddle/fluid/framework/lod_rank_table.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include <iosfwd>
-#include "paddle/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/lod_tensor.cc b/paddle/fluid/framework/lod_tensor.cc
index cb27de6991674247e6215ce64a2da5000fa78ed4..05c67e453d0b8c84aaa8b72ec314153791c73e8f 100644
--- a/paddle/fluid/framework/lod_tensor.cc
+++ b/paddle/fluid/framework/lod_tensor.cc
@@ -12,12 +12,12 @@ 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/lod_tensor.h"
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/framework.pb.h"
 
-#include "paddle/memory/memcpy.h"
-#include "paddle/memory/memory.h"
+#include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/memory/memory.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/paddle/fluid/framework/lod_tensor.h b/paddle/fluid/framework/lod_tensor.h
index 9de454428d9fd733aa70601f5012e77b9ceb2022..1509a9fb1347659f7526c6892f632feb8c84579c 100644
--- a/paddle/fluid/framework/lod_tensor.h
+++ b/paddle/fluid/framework/lod_tensor.h
@@ -21,12 +21,12 @@ limitations under the License. */
 #endif
 
 #include <glog/logging.h>
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/mixed_vector.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/tensor_util.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/mixed_vector.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/tensor_util.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/lod_tensor_array.h b/paddle/fluid/framework/lod_tensor_array.h
index 4a8e7f4fa540b1c2f19a6e3ec236a0dd5c0daf0b..652513bd22597000e8249eb19776182d850793aa 100644
--- a/paddle/fluid/framework/lod_tensor_array.h
+++ b/paddle/fluid/framework/lod_tensor_array.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include <vector>
-#include "paddle/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/lod_tensor_test.cc b/paddle/fluid/framework/lod_tensor_test.cc
index 3b63020e685436396071fa05cd7697630ae56c95..7e0ed2495d68a8cc0d377aaf5b5103aea1064688 100644
--- a/paddle/fluid/framework/lod_tensor_test.cc
+++ b/paddle/fluid/framework/lod_tensor_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor.h"
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/paddle/fluid/framework/lod_tensor_test.cu b/paddle/fluid/framework/lod_tensor_test.cu
index a28b7caf86c689d55808c4e7defecd37a5a03442..4dd7810c1b25cbfeb7d6d79034a97db3f1d67ebb 100644
--- a/paddle/fluid/framework/lod_tensor_test.cu
+++ b/paddle/fluid/framework/lod_tensor_test.cu
@@ -15,12 +15,12 @@
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <stdio.h>
-#include "paddle/framework/init.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/platform/assert.h"
 
-#include <gtest/gtest.h>
-#include <paddle/platform/place.h>
+#include "gtest/gtest.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/place.h"
 
 __global__ void test(size_t* a, int size) {
   for (int i = blockIdx.x * blockDim.x + threadIdx.x; i < size;
diff --git a/paddle/fluid/framework/mixed_vector.h b/paddle/fluid/framework/mixed_vector.h
index f776f0317a2bed69cf8795c2a12a467c50ba38d3..9756754260d46519d181f95e000f39ba92d22ef0 100644
--- a/paddle/fluid/framework/mixed_vector.h
+++ b/paddle/fluid/framework/mixed_vector.h
@@ -17,8 +17,8 @@
 #include <initializer_list>
 #include <vector>
 
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/tensor_util.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/tensor_util.h"
 
 #include "glog/logging.h"
 
diff --git a/paddle/fluid/framework/mixed_vector_test.cu b/paddle/fluid/framework/mixed_vector_test.cu
index f02db8f612c498ddd103a6b96e80d265e13c0f52..a89064525661af71b22f18f835fd7b111956847b 100644
--- a/paddle/fluid/framework/mixed_vector_test.cu
+++ b/paddle/fluid/framework/mixed_vector_test.cu
@@ -15,8 +15,8 @@
 
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "paddle/framework/mixed_vector.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/framework/mixed_vector.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 template <typename T>
 using vec = paddle::framework::Vector<T>;
diff --git a/paddle/fluid/framework/op_desc.cc b/paddle/fluid/framework/op_desc.cc
index b51afe499bbc0e6b727aeeb4334f56e400ea81a5..b7847326005731c2429c07929fe5b8204ac774e1 100644
--- a/paddle/fluid/framework/op_desc.cc
+++ b/paddle/fluid/framework/op_desc.cc
@@ -12,15 +12,15 @@ 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/op_desc.h"
+#include "paddle/fluid/framework/op_desc.h"
 #include <functional>
 #include <mutex>
 #include <unordered_map>
 #include "glog/logging.h"
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/operator.h"
-#include "paddle/framework/program_desc.h"
-#include "paddle/framework/shape_inference.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/program_desc.h"
+#include "paddle/fluid/framework/shape_inference.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_desc.h b/paddle/fluid/framework/op_desc.h
index 13695cff59f0bfd79c48eb28670ecc67a0309332..698df829e56e1182e742db926a712497ee2b6966 100644
--- a/paddle/fluid/framework/op_desc.h
+++ b/paddle/fluid/framework/op_desc.h
@@ -16,9 +16,9 @@ limitations under the License. */
 
 #include <unordered_map>
 #include <vector>
-#include "paddle/framework/attribute.h"
-#include "paddle/framework/type_defs.h"
-#include "paddle/framework/var_desc.h"
+#include "paddle/fluid/framework/attribute.h"
+#include "paddle/fluid/framework/type_defs.h"
+#include "paddle/fluid/framework/var_desc.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_info.cc b/paddle/fluid/framework/op_info.cc
index b520108109bb2f72b80f83559fa065a5ca58e9e1..703c9c3234b62e80c3f768ddb892584c1c0070c0 100644
--- a/paddle/fluid/framework/op_info.cc
+++ b/paddle/fluid/framework/op_info.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/op_info.h"
+#include "paddle/fluid/framework/op_info.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_info.h b/paddle/fluid/framework/op_info.h
index d9b89f9cac9611fcecb18bef87940632df1e2234..e6b3ff9e653196b9234e02131f37d5964c4f6e84 100644
--- a/paddle/fluid/framework/op_info.h
+++ b/paddle/fluid/framework/op_info.h
@@ -18,9 +18,9 @@ limitations under the License. */
 #include <string>
 #include <unordered_map>
 
-#include "paddle/framework/attribute.h"
-#include "paddle/framework/type_defs.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/framework/attribute.h"
+#include "paddle/fluid/framework/type_defs.h"
+#include "paddle/fluid/platform/macros.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_kernel_type.h b/paddle/fluid/framework/op_kernel_type.h
index 44adb94d2a8feb79a5ff93c6e32cdff52333166e..b5dbff26d7edc212a270d4d187dbb868068790c9 100644
--- a/paddle/fluid/framework/op_kernel_type.h
+++ b/paddle/fluid/framework/op_kernel_type.h
@@ -14,11 +14,11 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/data_layout.h"
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/library_type.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/data_layout.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/library_type.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_kernel_type_test.cc b/paddle/fluid/framework/op_kernel_type_test.cc
index cb23bbde01493d1a3b5845e77d6160a75f409c7a..64096907df5a52904525ef0bf25bb9527c3a8c4b 100644
--- a/paddle/fluid/framework/op_kernel_type_test.cc
+++ b/paddle/fluid/framework/op_kernel_type_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/op_kernel_type.h"
+#include "paddle/fluid/framework/op_kernel_type.h"
 #include <gtest/gtest.h>
 #include <iostream>
 
diff --git a/paddle/fluid/framework/op_proto_maker.cc b/paddle/fluid/framework/op_proto_maker.cc
index 151d61d5b175535509306d028027c7bc19abce81..0a779b10b49ab35dd0dbe25ac3f2bccd34fb654e 100644
--- a/paddle/fluid/framework/op_proto_maker.cc
+++ b/paddle/fluid/framework/op_proto_maker.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/op_proto_maker.h"
+#include "paddle/fluid/framework/op_proto_maker.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_proto_maker.h b/paddle/fluid/framework/op_proto_maker.h
index efd3a5ca535403d8d46a73adc899d914623b53e4..1dbfc7d37be6ae79fde39434b12355a54ee648f6 100644
--- a/paddle/fluid/framework/op_proto_maker.h
+++ b/paddle/fluid/framework/op_proto_maker.h
@@ -13,8 +13,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/attribute.h"
-#include "paddle/framework/framework.pb.h"
+#include "paddle/fluid/framework/attribute.h"
+#include "paddle/fluid/framework/framework.pb.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_proto_maker_test.cc b/paddle/fluid/framework/op_proto_maker_test.cc
index f16cb6fa3aa095a6d9737d84c7ce58f385a7072b..cfefee8dbdead9dd0074d954fe7318baae57e8c4 100644
--- a/paddle/fluid/framework/op_proto_maker_test.cc
+++ b/paddle/fluid/framework/op_proto_maker_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/op_proto_maker.h"
+#include "paddle/fluid/framework/op_proto_maker.h"
 
 #include "gtest/gtest.h"
 
diff --git a/paddle/fluid/framework/op_registry.cc b/paddle/fluid/framework/op_registry.cc
index dfa151316daeccfe92e26818165a694b78b5df62..739ec72ebc17e31ab207b0e2260d7f563ceaca6e 100644
--- a/paddle/fluid/framework/op_registry.cc
+++ b/paddle/fluid/framework/op_registry.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/op_registry.h>
+#include "paddle/fluid/framework/op_registry.h"
 
 #include <vector>
 
diff --git a/paddle/fluid/framework/op_registry.h b/paddle/fluid/framework/op_registry.h
index 6fb8532b2a807e287de7fab03402f8a290eabcf2..73faa99668ad58ddb66de515eb4750883f58bcf5 100644
--- a/paddle/fluid/framework/op_registry.h
+++ b/paddle/fluid/framework/op_registry.h
@@ -22,14 +22,14 @@ limitations under the License. */
 #include <unordered_set>
 
 #include "glog/logging.h"  // For VLOG()
-#include "paddle/framework/attribute.h"
-#include "paddle/framework/details/op_registry.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/grad_op_desc_maker.h"
-#include "paddle/framework/op_desc.h"
-#include "paddle/framework/operator.h"
-#include "paddle/framework/scope.h"
-#include "paddle/framework/shape_inference.h"
+#include "paddle/fluid/framework/attribute.h"
+#include "paddle/fluid/framework/details/op_registry.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/grad_op_desc_maker.h"
+#include "paddle/fluid/framework/op_desc.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/framework/shape_inference.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/op_registry_test.cc b/paddle/fluid/framework/op_registry_test.cc
index 341da8befd45abd1a3fc86581be33319a8791567..bfbb2cfc2c57c705cf42c65825edcc6dea08cf41 100644
--- a/paddle/fluid/framework/op_registry_test.cc
+++ b/paddle/fluid/framework/op_registry_test.cc
@@ -15,7 +15,7 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace pd = paddle::framework;
 
diff --git a/paddle/fluid/framework/operator.cc b/paddle/fluid/framework/operator.cc
index 52387aabd9d0b41b13814499fb3f0107f42401e7..07c65ae926f800ccc0eab2675f8642b77cd5acc9 100644
--- a/paddle/fluid/framework/operator.cc
+++ b/paddle/fluid/framework/operator.cc
@@ -16,11 +16,11 @@ limitations under the License. */
 
 #include <algorithm>
 
-#include "paddle/framework/data_transform.h"
-#include "paddle/framework/executor.h"
-#include "paddle/framework/operator.h"
-#include "paddle/framework/shape_inference.h"
-#include "paddle/framework/var_type.h"
+#include "paddle/fluid/framework/data_transform.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/shape_inference.h"
+#include "paddle/fluid/framework/var_type.h"
 
 DECLARE_bool(benchmark);
 
diff --git a/paddle/fluid/framework/operator.h b/paddle/fluid/framework/operator.h
index c9140f304c89e32a0fa8bd24722cc2e5dbc4e2e1..52300abeb7df346d610d2363335dc9d3330ee39e 100644
--- a/paddle/fluid/framework/operator.h
+++ b/paddle/fluid/framework/operator.h
@@ -22,17 +22,17 @@ limitations under the License. */
 #include <vector>
 
 #include "glog/logging.h"  // For VLOG
-#include "paddle/framework/attribute.h"
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_info.h"
-#include "paddle/framework/op_kernel_type.h"
-#include "paddle/framework/scope.h"
-#include "paddle/framework/selected_rows.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/variant.h"
+#include "paddle/fluid/framework/attribute.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_info.h"
+#include "paddle/fluid/framework/op_kernel_type.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/variant.h"
 #include "paddle/utils/Error.h"
 
 namespace paddle {
diff --git a/paddle/fluid/framework/operator_test.cc b/paddle/fluid/framework/operator_test.cc
index b69d7c7a7406eb3e18d385c568cb9c21b9b4107b..b90f5538bb620275521cdc11bf47b4014b2a66e2 100644
--- a/paddle/fluid/framework/operator_test.cc
+++ b/paddle/fluid/framework/operator_test.cc
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include "gtest/gtest.h"
 
-#include "paddle/framework/init.h"
-#include "paddle/framework/op_info.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/framework/op_info.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/program_desc.cc b/paddle/fluid/framework/program_desc.cc
index 0e937dda4e185590648962a6d4f827eea21eb620..b3f2e97cd954bd55ab1a8c9def6938c877a79449 100644
--- a/paddle/fluid/framework/program_desc.cc
+++ b/paddle/fluid/framework/program_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/program_desc.h"
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/feed_fetch_type.h"
+#include "paddle/fluid/framework/program_desc.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/feed_fetch_type.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/program_desc.h b/paddle/fluid/framework/program_desc.h
index 8e958eab6ee08436ca73b13bac010e66c7df2b8b..937de6ba9270a275e5d4e020fe5f2e7f5ef63557 100644
--- a/paddle/fluid/framework/program_desc.h
+++ b/paddle/fluid/framework/program_desc.h
@@ -16,10 +16,10 @@ limitations under the License. */
 
 #include <memory>
 #include <vector>
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/proto_desc.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/proto_desc.h"
+#include "paddle/fluid/platform/macros.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/program_desc_test.cc b/paddle/fluid/framework/program_desc_test.cc
index 9945aee31b647a6243971c7e64c8391c0b1c09c5..afd5c9dabfbb0dab2832300dedc378ef617d8e81 100644
--- a/paddle/fluid/framework/program_desc_test.cc
+++ b/paddle/fluid/framework/program_desc_test.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/program_desc.h"
+#include "paddle/fluid/framework/program_desc.h"
 #include "gtest/gtest.h"
-#include "paddle/framework/block_desc.h"
+#include "paddle/fluid/framework/block_desc.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/prune.cc b/paddle/fluid/framework/prune.cc
index ddd6b993d40f72cba919fad95318f70409c98bca..79dbd3bcab4124d3aa765c8ede174c9fb3de689b 100644
--- a/paddle/fluid/framework/prune.cc
+++ b/paddle/fluid/framework/prune.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/prune.h"
+#include "paddle/fluid/framework/prune.h"
 
 #include <algorithm>
 #include <set>
diff --git a/paddle/fluid/framework/prune.h b/paddle/fluid/framework/prune.h
index 593292523d0c14136791bb804a4721a0740b47ba..601e66b67a77b615e43fe74e72935b1622e59965 100644
--- a/paddle/fluid/framework/prune.h
+++ b/paddle/fluid/framework/prune.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#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/fluid/framework/prune_test.cc b/paddle/fluid/framework/prune_test.cc
index d76c5abca94cb87220ce73537a8657c3ec695f4d..36b76f0763ec2bab861adf86b60093c5e3c4b9e2 100644
--- a/paddle/fluid/framework/prune_test.cc
+++ b/paddle/fluid/framework/prune_test.cc
@@ -12,15 +12,15 @@ 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/prune.h"
+#include "paddle/fluid/framework/prune.h"
 
-#include "paddle/framework/attribute.h"
-#include "paddle/framework/operator.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/framework/attribute.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/operators/net_op.h"
 
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/op_desc.h"
-#include "paddle/framework/program_desc.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/op_desc.h"
+#include "paddle/fluid/framework/program_desc.h"
 
 #include <gtest/gtest.h>
 
diff --git a/paddle/fluid/framework/reader.cc b/paddle/fluid/framework/reader.cc
index 928b661aaadb4a59294de24cc1c414795c2878d5..96c563814c3aefd6a8c468ca6d8d441b6e302f7d 100644
--- a/paddle/fluid/framework/reader.cc
+++ b/paddle/fluid/framework/reader.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/reader.h"
+#include "paddle/fluid/framework/reader.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/reader.h b/paddle/fluid/framework/reader.h
index 534894cfbd66687fc982f1def4cb0d05d77a4583..4a5eba5fb733b3e9da2b245b4dda18725c9b0895 100644
--- a/paddle/fluid/framework/reader.h
+++ b/paddle/fluid/framework/reader.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/scope.cc b/paddle/fluid/framework/scope.cc
index af08b2ab816f63c05d4c65df9601c787e57994f5..6006ed16bd4a9aece5772bad58dc75c8b0847206 100644
--- a/paddle/fluid/framework/scope.cc
+++ b/paddle/fluid/framework/scope.cc
@@ -12,12 +12,12 @@ 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/scope.h"
+#include "paddle/fluid/framework/scope.h"
 
 #include <memory>  // for unique_ptr
 #include <mutex>   // for call_once
 #include "glog/logging.h"
-#include "paddle/framework/threadpool.h"
+#include "paddle/fluid/framework/threadpool.h"
 #include "paddle/string/printf.h"
 
 DEFINE_bool(benchmark, false,
diff --git a/paddle/fluid/framework/scope.h b/paddle/fluid/framework/scope.h
index a1da81cc7977d2f31b99c41fb3db3ec03188f954..2da9e0716e7c02dc8c5397e37746344dff8e429d 100644
--- a/paddle/fluid/framework/scope.h
+++ b/paddle/fluid/framework/scope.h
@@ -19,8 +19,8 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 
-#include "paddle/framework/variable.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/framework/variable.h"
+#include "paddle/fluid/platform/macros.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/scope_test.cc b/paddle/fluid/framework/scope_test.cc
index 0f5b86061dbdebde08badca7f984f4a2c8d7bc79..d64acb130cb29eda34cb01ef0533c42f1f03dcf8 100644
--- a/paddle/fluid/framework/scope_test.cc
+++ b/paddle/fluid/framework/scope_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/scope.h"
+#include "paddle/fluid/framework/scope.h"
 #include "glog/logging.h"
 #include "gtest/gtest.h"
 
diff --git a/paddle/fluid/framework/selected_rows.cc b/paddle/fluid/framework/selected_rows.cc
index 3b3e60177a495cc99f38ee8b82af41c4c76b8652..f5d9e9a4951877e031ea6fdf529676fcb21e202f 100644
--- a/paddle/fluid/framework/selected_rows.cc
+++ b/paddle/fluid/framework/selected_rows.cc
@@ -9,7 +9,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/selected_rows.h"
+#include "paddle/fluid/framework/selected_rows.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/selected_rows.h b/paddle/fluid/framework/selected_rows.h
index 30d3dfc1e89f073a8180ceacf77619b36f7079a9..f1a263962b2efc1ca828dd2eeb45495334ac1047 100644
--- a/paddle/fluid/framework/selected_rows.h
+++ b/paddle/fluid/framework/selected_rows.h
@@ -10,8 +10,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/tensor.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/selected_rows_test.cc b/paddle/fluid/framework/selected_rows_test.cc
index 8ff3fb6a97199a2798ab29c56957a0f77fa26628..d414f2a5934282b4d586e6a9f7f81e44afbc9305 100644
--- a/paddle/fluid/framework/selected_rows_test.cc
+++ b/paddle/fluid/framework/selected_rows_test.cc
@@ -9,7 +9,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/selected_rows.h"
+#include "paddle/fluid/framework/selected_rows.h"
 #include "gtest/gtest.h"
 
 namespace paddle {
diff --git a/paddle/fluid/framework/shape_inference.cc b/paddle/fluid/framework/shape_inference.cc
index 2f4d45057715d2c6f26bca74d1d691207b528207..ac7fc029737ffa792350506730ac2dc9f72bf155 100644
--- a/paddle/fluid/framework/shape_inference.cc
+++ b/paddle/fluid/framework/shape_inference.cc
@@ -11,9 +11,9 @@ distributed under the License is distributed on an "AS IS" BASIS,
 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/shape_inference.h"
+#include "paddle/fluid/framework/shape_inference.h"
 #include "grad_op_desc_maker.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/shape_inference.h b/paddle/fluid/framework/shape_inference.h
index 7bee86985239de73fca9aef1faefc04f7615f3ce..a923463ce3718699696c2c698da00bc81b947223 100644
--- a/paddle/fluid/framework/shape_inference.h
+++ b/paddle/fluid/framework/shape_inference.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/attribute.h"
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/framework.pb.h"
+#include "paddle/fluid/framework/attribute.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/framework.pb.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/tensor.cc b/paddle/fluid/framework/tensor.cc
index f922e606249849e621e679f71d6dbe0f007c8464..a56091d3c629c4cedc13c465c84a646dc02cd094 100644
--- a/paddle/fluid/framework/tensor.cc
+++ b/paddle/fluid/framework/tensor.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/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
 
 namespace paddle {
 namespace framework {}
diff --git a/paddle/fluid/framework/tensor.h b/paddle/fluid/framework/tensor.h
index be09b7c94507b99b5b4cbfe6f2039c74ec76b4a2..44d2c7dae943a06eeab8ab1a1565f62b11de0af1 100644
--- a/paddle/fluid/framework/tensor.h
+++ b/paddle/fluid/framework/tensor.h
@@ -20,12 +20,12 @@ limitations under the License. */
 #include <typeindex>
 #include <vector>
 
-#include "paddle/framework/data_layout.h"
-#include "paddle/framework/ddim.h"
-#include "paddle/memory/memory.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/data_layout.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/memory/memory.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 
@@ -224,4 +224,4 @@ inline void Tensor::switch_place(platform::Place new_place) {
 }  // namespace framework
 }  // namespace paddle
 
-#include "paddle/framework/tensor_impl.h"
+#include "paddle/fluid/framework/tensor_impl.h"
diff --git a/paddle/fluid/framework/tensor_impl.h b/paddle/fluid/framework/tensor_impl.h
index 652d6b8a90ebb8e761aa7ab01902802d93bfecae..e69836292cd0f4ed99e87ee8e297021dac43b64f 100644
--- a/paddle/fluid/framework/tensor_impl.h
+++ b/paddle/fluid/framework/tensor_impl.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/memory/memcpy.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/tensor_test.cc b/paddle/fluid/framework/tensor_test.cc
index 9a387526ac2b0982aa4c931a9d92d98b08fb4f98..6ed416e46f99f4d2ed50538a3e2c090ed8dd6fc3 100644
--- a/paddle/fluid/framework/tensor_test.cc
+++ b/paddle/fluid/framework/tensor_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
 #include <gtest/gtest.h>
 #include <string>
 
diff --git a/paddle/fluid/framework/tensor_util.cc b/paddle/fluid/framework/tensor_util.cc
index a5b83eaa07ad25d39996f5644d6a7f3ed35ff7b2..537fb4614cac8bc898b277899f803a3b1846a00e 100644
--- a/paddle/fluid/framework/tensor_util.cc
+++ b/paddle/fluid/framework/tensor_util.cc
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License. */
 
-#include "paddle/framework/tensor_util.h"
+#include "paddle/fluid/framework/tensor_util.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/tensor_util.cu b/paddle/fluid/framework/tensor_util.cu
deleted file mode 120000
index b00e6e59d93328bf3142597ea4de0dc225501e56..0000000000000000000000000000000000000000
--- a/paddle/fluid/framework/tensor_util.cu
+++ /dev/null
@@ -1 +0,0 @@
-./tensor_util.cc
\ No newline at end of file
diff --git a/paddle/fluid/framework/tensor_util.cu b/paddle/fluid/framework/tensor_util.cu
new file mode 100644
index 0000000000000000000000000000000000000000..537fb4614cac8bc898b277899f803a3b1846a00e
--- /dev/null
+++ b/paddle/fluid/framework/tensor_util.cu
@@ -0,0 +1,119 @@
+/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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/fluid/framework/tensor_util.h"
+
+namespace paddle {
+namespace framework {
+template <typename Predicate, typename DevCtx>
+struct AnyDTypeVisitor {
+  Predicate predicate_;
+  const Tensor& tensor_;
+  const DevCtx& ctx_;
+  Tensor* out_;
+
+  AnyDTypeVisitor(Predicate predicate, const Tensor& tensor, const DevCtx& ctx,
+                  Tensor* out)
+      : predicate_(predicate), tensor_(tensor), ctx_(ctx), out_(out) {}
+
+  template <typename T>
+  void operator()() const {
+    auto t = EigenVector<T>::Flatten(tensor_);
+    auto o = EigenScalar<bool>::From(*out_);
+    // return any of predicate_(t) is true.
+    o.device(*ctx_.eigen_device()) = predicate_(t).any();
+  }
+};
+
+template <typename Predicate, typename DevCtx>
+inline void AnyImpl(Predicate predicate, const framework::Tensor& tensor,
+                    const DevCtx& ctx, framework::Tensor* out) {
+  VisitDataType(ToDataType(tensor.type()), AnyDTypeVisitor<Predicate, DevCtx>(
+                                               predicate, tensor, ctx, out));
+}
+
+template <typename Predicate>
+struct AnyVisitor : public boost::static_visitor<bool> {
+  const framework::Tensor& tensor_;
+  Predicate predicate_;
+
+  AnyVisitor(const framework::Tensor& tensor, Predicate predicate)
+      : tensor_(tensor), predicate_(std::move(predicate)) {}
+
+  template <typename Place>
+  bool operator()(const Place& place) const {
+    framework::Tensor out;
+    out.Resize({1});
+    out.mutable_data<bool>(place);
+    auto* ctx = platform::DeviceContextPool::Instance().GetByPlace(place);
+    AnyImpl(predicate_, tensor_, *ctx, &out);
+    return this->GetResult(out, place);
+  }
+
+  bool GetResult(const framework::Tensor& out,
+                 const platform::CUDAPlace& gpu) const {
+    platform::CPUPlace cpu;
+    framework::Tensor tmp;
+    tmp.Resize({1});
+    tmp.mutable_data<bool>(cpu);
+    auto gpuctx = platform::DeviceContextPool::Instance().Get(gpu);
+    gpuctx->Wait();
+    Copy(out, cpu, *gpuctx, &tmp);
+    gpuctx->Wait();
+    return GetResult(tmp, cpu);
+  }
+
+  bool GetResult(const framework::Tensor& out,
+                 const platform::CPUPlace& cpu) const {
+    return *out.data<bool>();
+  }
+};
+
+template <typename Predicate>
+inline bool Any(const framework::Tensor& tensor, Predicate predicate) {
+  AnyVisitor<Predicate> visitor(tensor, predicate);
+  auto place = tensor.place();
+  return platform::VisitPlace(place, visitor);
+}
+
+struct HasNANPredicate {
+  template <typename T>
+  auto operator()(const T& eigen_vec) const
+      -> decltype(std::declval<T>().isnan()) {
+    // Cast eigen_vector to vector of bool. true if is inf.
+    return eigen_vec.isnan();
+  }
+};
+
+bool HasNAN(const framework::Tensor& tensor) {
+  HasNANPredicate predicate;
+  return Any(tensor, predicate);
+}
+
+struct HasInfPredicate {
+  template <typename T>
+  auto operator()(const T& eigen_vec) const
+      -> decltype(std::declval<T>().isinf()) {
+    // Cast eigen_vector to vector of bool. true if is inf.
+    return eigen_vec.isinf();
+  }
+};
+
+bool HasInf(const framework::Tensor& tensor) {
+  HasInfPredicate predicate;
+  return Any(tensor, predicate);
+}
+
+}  // namespace framework
+}  // namespace paddle
diff --git a/paddle/fluid/framework/tensor_util.h b/paddle/fluid/framework/tensor_util.h
index b49c61449984f51d65963958c87191b0799bcf5b..b7e772b6daad93dc915665d58d4a5722c74c0d2b 100644
--- a/paddle/fluid/framework/tensor_util.h
+++ b/paddle/fluid/framework/tensor_util.h
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/tensor_util_test.cc b/paddle/fluid/framework/tensor_util_test.cc
index 906b0b5656301eebbb9f61fad2a3cb4e464a83e8..8764c692e875328fc98a7b67a018014af487f394 100644
--- a/paddle/fluid/framework/tensor_util_test.cc
+++ b/paddle/fluid/framework/tensor_util_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/tensor_util.h"
+#include "paddle/fluid/framework/tensor_util.h"
 #include <gtest/gtest.h>
 #include <cmath>
 #include <string>
diff --git a/paddle/fluid/framework/tensor_util_test.cu b/paddle/fluid/framework/tensor_util_test.cu
index ebd35fdf6c2a1388fec23057070f723c8ef9da9c..1982b642bcd1f2e21a684b701d7bd603f0c2c894 100644
--- a/paddle/fluid/framework/tensor_util_test.cu
+++ b/paddle/fluid/framework/tensor_util_test.cu
@@ -13,9 +13,9 @@
    limitations under the License. */
 
 #include "gtest/gtest.h"
-#include "paddle/framework/tensor_util.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/tensor_util.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/threadpool.cc b/paddle/fluid/framework/threadpool.cc
index b7d7c00bcf9d9770f58284023ca2defcda299d64..2c4de41b0c41fa3eeaf6c77def9c728dd9976895 100644
--- a/paddle/fluid/framework/threadpool.cc
+++ b/paddle/fluid/framework/threadpool.cc
@@ -12,9 +12,9 @@
    See the License for the specific language governing permissions and
    limitations under the License. */
 
-#include "paddle/framework/threadpool.h"
+#include "paddle/fluid/framework/threadpool.h"
 
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/threadpool.h b/paddle/fluid/framework/threadpool.h
index 77d31a1176d5947655b57c70846294093a7bb5ef..e88e6c01f02deb77278a02ba81ee62ddfcf42eb8 100644
--- a/paddle/fluid/framework/threadpool.h
+++ b/paddle/fluid/framework/threadpool.h
@@ -22,8 +22,8 @@ limitations under the License. */
 #include <thread>
 #include <vector>
 #include "glog/logging.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/macros.h"  // for DISABLE_COPY_AND_ASSIGN
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/type_defs.h b/paddle/fluid/framework/type_defs.h
index 1eedbbc419ab660f5ce00aa891ef80ca245bc0a8..786d78a6440de60abea44f7b8fccb90d455b488c 100644
--- a/paddle/fluid/framework/type_defs.h
+++ b/paddle/fluid/framework/type_defs.h
@@ -20,7 +20,7 @@ limitations under the License. */
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
-#include "paddle/platform/variant.h"
+#include "paddle/fluid/platform/variant.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/var_desc.cc b/paddle/fluid/framework/var_desc.cc
index 11a4daf2c991fc85a65c242403a0c83d06c4c44c..7ec9b2ced94c4176b64996827dcb79f1d756be6b 100644
--- a/paddle/fluid/framework/var_desc.cc
+++ b/paddle/fluid/framework/var_desc.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/var_desc.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/framework/var_desc.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/var_desc.h b/paddle/fluid/framework/var_desc.h
index 72da2fbb0a66ec7ca8c0c274dc4273bfbfcf303e..cdb1bc3ec09c890f2166190d591b6e6ee8b668a0 100644
--- a/paddle/fluid/framework/var_desc.h
+++ b/paddle/fluid/framework/var_desc.h
@@ -16,7 +16,7 @@ limitations under the License. */
 
 #include <vector>
 #include "glog/logging.h"
-#include "paddle/framework/framework.pb.h"
+#include "paddle/fluid/framework/framework.pb.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/var_type.h b/paddle/fluid/framework/var_type.h
index 599d45149024ca0fb395c2a1c6deeb7d8cd5eb17..2dc4de529814bb0f7a5193b8e216343a4b1b3503 100644
--- a/paddle/fluid/framework/var_type.h
+++ b/paddle/fluid/framework/var_type.h
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/lod_rank_table.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/reader.h"
-#include "paddle/framework/selected_rows.h"
-#include "paddle/framework/variable.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/reader.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/framework/variable.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/var_type_inference.h b/paddle/fluid/framework/var_type_inference.h
index 6c11f2fee7f554fb008f559bb33aeafea5c5a556..44fd4cd622cbada7f10ade8928a69d4e3d1d9ec0 100644
--- a/paddle/fluid/framework/var_type_inference.h
+++ b/paddle/fluid/framework/var_type_inference.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/type_defs.h"
+#include "paddle/fluid/framework/type_defs.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/var_type_inference_test.cc b/paddle/fluid/framework/var_type_inference_test.cc
index fa6018b1c583abaccb0259b82c9bb61c0fc10820..0ee589c821a77af7f6714fefd7bebff89218dad8 100644
--- a/paddle/fluid/framework/var_type_inference_test.cc
+++ b/paddle/fluid/framework/var_type_inference_test.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/var_type_inference.h"
+#include "paddle/fluid/framework/var_type_inference.h"
 #include "gtest/gtest.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
-#include "paddle/framework/program_desc.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/program_desc.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/variable.h b/paddle/fluid/framework/variable.h
index 3b7ec0a2a90d8f88bfb7f1629f484b3a8a8078df..9fb8ca92d68203a0bf8ec6ecd30072374b5fe4af 100644
--- a/paddle/fluid/framework/variable.h
+++ b/paddle/fluid/framework/variable.h
@@ -17,7 +17,7 @@
 #include <typeindex>
 #include <typeinfo>
 
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace framework {
diff --git a/paddle/fluid/framework/variable_test.cc b/paddle/fluid/framework/variable_test.cc
index e5585c8724d712e273d086001b6cbc3d59c46ebe..8c14e506fd7fd480012135b316479e45bed5584e 100644
--- a/paddle/fluid/framework/variable_test.cc
+++ b/paddle/fluid/framework/variable_test.cc
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "paddle/framework/variable.h"
+#include "paddle/fluid/framework/variable.h"
 
 TEST(Variable, GetMutable) {
   using paddle::framework::Variable;
diff --git a/paddle/fluid/inference/io.cc b/paddle/fluid/inference/io.cc
index 784e87970f77857e7f3182df904dc0133c44d6c9..58d7ab40bfa67595a9c7c61ed431a7cf9509e1f7 100644
--- a/paddle/fluid/inference/io.cc
+++ b/paddle/fluid/inference/io.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/inference/io.h"
+#include "paddle/fluid/inference/io.h"
 
 #include <fstream>
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/feed_fetch_type.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/feed_fetch_type.h"
 
 namespace paddle {
 namespace inference {
diff --git a/paddle/fluid/inference/io.h b/paddle/fluid/inference/io.h
index a7d7c499690620740d8627e7f5085d728d67f7c3..9d7864060646d9a480ce6ced6a1f4364e83938c0 100644
--- a/paddle/fluid/inference/io.h
+++ b/paddle/fluid/inference/io.h
@@ -17,9 +17,9 @@ limitations under the License. */
 #include <memory>
 #include <string>
 #include <vector>
-#include "paddle/framework/executor.h"
-#include "paddle/framework/program_desc.h"
-#include "paddle/framework/scope.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/program_desc.h"
+#include "paddle/fluid/framework/scope.h"
 
 namespace paddle {
 namespace inference {
diff --git a/paddle/fluid/inference/tests/book/test_helper.h b/paddle/fluid/inference/tests/book/test_helper.h
index 02104306e71b9ec06c0fef0f7417bbde8f6ff88a..d74017095162f7185ab0b72270c3dd7ba72efa39 100644
--- a/paddle/fluid/inference/tests/book/test_helper.h
+++ b/paddle/fluid/inference/tests/book/test_helper.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <time.h>
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/inference/io.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/inference/io.h"
 
 template <typename T>
 void SetupTensor(paddle::framework::LoDTensor& input,
diff --git a/paddle/fluid/memory/.clang-format b/paddle/fluid/memory/.clang-format
deleted file mode 120000
index 7d28cb3924707d39dafe20f4664fb17b5538996c..0000000000000000000000000000000000000000
--- a/paddle/fluid/memory/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../framework/.clang-format
\ No newline at end of file
diff --git a/paddle/fluid/memory/.clang-format b/paddle/fluid/memory/.clang-format
new file mode 100644
index 0000000000000000000000000000000000000000..29282dc87e2c499988c17d90d47d44cd5cf7f115
--- /dev/null
+++ b/paddle/fluid/memory/.clang-format
@@ -0,0 +1,5 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+Standard:  Cpp11 
+...
diff --git a/paddle/fluid/memory/detail/buddy_allocator.cc b/paddle/fluid/memory/detail/buddy_allocator.cc
index 2bc2c06a15702b29c8bdf755978aebe0e6219b4a..2cee8271d27014815b19175ef93759d6a07b7e73 100644
--- a/paddle/fluid/memory/detail/buddy_allocator.cc
+++ b/paddle/fluid/memory/detail/buddy_allocator.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/memory/detail/buddy_allocator.h"
+#include "paddle/fluid/memory/detail/buddy_allocator.h"
 #include "glog/logging.h"
 
 namespace paddle {
diff --git a/paddle/fluid/memory/detail/buddy_allocator.h b/paddle/fluid/memory/detail/buddy_allocator.h
index 4e0135dd655d04b7f99722a2159795738c1b29c7..644d79330680787f717920652708c0dd5bee1833 100644
--- a/paddle/fluid/memory/detail/buddy_allocator.h
+++ b/paddle/fluid/memory/detail/buddy_allocator.h
@@ -14,12 +14,12 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/memory/detail/meta_cache.h"
-#include "paddle/memory/detail/meta_data.h"
-#include "paddle/memory/detail/system_allocator.h"
-#include "paddle/platform/assert.h"
-#include "paddle/platform/cpu_info.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/memory/detail/meta_cache.h"
+#include "paddle/fluid/memory/detail/meta_data.h"
+#include "paddle/fluid/memory/detail/system_allocator.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/cpu_info.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 #include <mutex>
 #include <set>
diff --git a/paddle/fluid/memory/detail/memory_block.cc b/paddle/fluid/memory/detail/memory_block.cc
index f50eceba096477d7b2f50f7c406770c8e9595332..23388cdd5b7c44ff91e10aadaa8cc25d8ef29d14 100644
--- a/paddle/fluid/memory/detail/memory_block.cc
+++ b/paddle/fluid/memory/detail/memory_block.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/memory/detail/memory_block.h"
-#include "paddle/memory/detail/meta_cache.h"
-#include "paddle/memory/detail/meta_data.h"
-#include "paddle/platform/assert.h"
+#include "paddle/fluid/memory/detail/memory_block.h"
+#include "paddle/fluid/memory/detail/meta_cache.h"
+#include "paddle/fluid/memory/detail/meta_data.h"
+#include "paddle/fluid/platform/assert.h"
 
 namespace paddle {
 namespace memory {
diff --git a/paddle/fluid/memory/detail/meta_cache.cc b/paddle/fluid/memory/detail/meta_cache.cc
index 2bacca75108f9f80e7aa291fcb4fd66112201394..7d78811c7715b906aea1b88c13a4c3939db6387d 100644
--- a/paddle/fluid/memory/detail/meta_cache.cc
+++ b/paddle/fluid/memory/detail/meta_cache.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/memory/detail/meta_cache.h"
+#include "paddle/fluid/memory/detail/meta_cache.h"
 #include "glog/logging.h"
-#include "paddle/memory/detail/memory_block.h"
-#include "paddle/platform/assert.h"
+#include "paddle/fluid/memory/detail/memory_block.h"
+#include "paddle/fluid/platform/assert.h"
 
 namespace paddle {
 namespace memory {
diff --git a/paddle/fluid/memory/detail/meta_cache.h b/paddle/fluid/memory/detail/meta_cache.h
index db8ffd49ae30cf72ca691894af2df08a7106d02f..635d6398e697de80d0606a200c2634a93468199d 100644
--- a/paddle/fluid/memory/detail/meta_cache.h
+++ b/paddle/fluid/memory/detail/meta_cache.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/memory/detail/memory_block.h"
-#include "paddle/memory/detail/meta_data.h"
+#include "paddle/fluid/memory/detail/memory_block.h"
+#include "paddle/fluid/memory/detail/meta_data.h"
 
 #include <unordered_map>
 
diff --git a/paddle/fluid/memory/detail/meta_data.cc b/paddle/fluid/memory/detail/meta_data.cc
index dc57d4d2376ab1cfe6fb49c92af4591b3972a53a..eae49ebdcffd03eeb192fb7e859666027336245b 100644
--- a/paddle/fluid/memory/detail/meta_data.cc
+++ b/paddle/fluid/memory/detail/meta_data.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/memory/detail/meta_data.h"
+#include "paddle/fluid/memory/detail/meta_data.h"
 
 #include <functional>
 
diff --git a/paddle/fluid/memory/detail/meta_data.h b/paddle/fluid/memory/detail/meta_data.h
index 6b83c42eb851f0487bed6d625d848cf90db00929..368523701ef1a7b3bd869e1f0542c42c61448b40 100644
--- a/paddle/fluid/memory/detail/meta_data.h
+++ b/paddle/fluid/memory/detail/meta_data.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/memory/detail/memory_block.h"
+#include "paddle/fluid/memory/detail/memory_block.h"
 
 #include <stddef.h>
 
diff --git a/paddle/fluid/memory/detail/system_allocator.cc b/paddle/fluid/memory/detail/system_allocator.cc
index 509250debc2b2fd2e87078ab5f233ae2db6fd898..1f07c5e789c42997b3c75167a26a5b09875bd498 100644
--- a/paddle/fluid/memory/detail/system_allocator.cc
+++ b/paddle/fluid/memory/detail/system_allocator.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/memory/detail/system_allocator.h"
-#include "paddle/platform/assert.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/memory/detail/system_allocator.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 #include <stdlib.h>    // for malloc and free
 #include <sys/mman.h>  // for mlock and munlock
diff --git a/paddle/fluid/memory/detail/system_allocator_test.cc b/paddle/fluid/memory/detail/system_allocator_test.cc
index 6a8558937bf0c924e5f48605ff066e2789fd59b6..a850e480ec948b727980a8020df91958584aea02 100644
--- a/paddle/fluid/memory/detail/system_allocator_test.cc
+++ b/paddle/fluid/memory/detail/system_allocator_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/memory/detail/system_allocator.h"
+#include "paddle/fluid/memory/detail/system_allocator.h"
 
 #include <memory>
 #include <vector>
diff --git a/paddle/fluid/memory/memcpy.cc b/paddle/fluid/memory/memcpy.cc
index b46141aafd7146bd3def12d86108c10f1f143d20..8938b3613373a06620a6a0237b3de773c6421edd 100644
--- a/paddle/fluid/memory/memcpy.cc
+++ b/paddle/fluid/memory/memcpy.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/memory/memcpy.h"
+#include "paddle/fluid/memory/memcpy.h"
 
 #include <cstring>  // for memcpy
 
diff --git a/paddle/fluid/memory/memcpy.h b/paddle/fluid/memory/memcpy.h
index 29c20e18601b71bac5201df8ff0c7ce0bed702dc..77d209c3fbe8256bc94b3eca866f0f7e17a93325 100644
--- a/paddle/fluid/memory/memcpy.h
+++ b/paddle/fluid/memory/memcpy.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/platform/gpu_info.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/platform/gpu_info.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace memory {
diff --git a/paddle/fluid/memory/memory.cc b/paddle/fluid/memory/memory.cc
index 1a73a94567e45b81a0b148965a834f03c7407ffe..6eedab5d034192c071328b1be5c296227383287e 100644
--- a/paddle/fluid/memory/memory.cc
+++ b/paddle/fluid/memory/memory.cc
@@ -12,13 +12,13 @@ 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/memory/memory.h"
+#include "paddle/fluid/memory/memory.h"
 
 #include "glog/logging.h"
 
-#include "paddle/memory/detail/buddy_allocator.h"
-#include "paddle/memory/detail/system_allocator.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/memory/detail/buddy_allocator.h"
+#include "paddle/fluid/memory/detail/system_allocator.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 DECLARE_double(fraction_of_gpu_memory_to_use);
 
diff --git a/paddle/fluid/memory/memory.h b/paddle/fluid/memory/memory.h
index 30ed68c6e0ea95d206658d16684800e169ededc5..a9166a6746e1985752ca18ffa7c429e5b35b55bb 100644
--- a/paddle/fluid/memory/memory.h
+++ b/paddle/fluid/memory/memory.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/platform/place.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace memory {
diff --git a/paddle/fluid/memory/memory_test.cc b/paddle/fluid/memory/memory_test.cc
index b3f699f9b7eff54c06ff69023db082380c83467a..d7505ef0f36bc8765ba7634f286b67bccc6eacb6 100644
--- a/paddle/fluid/memory/memory_test.cc
+++ b/paddle/fluid/memory/memory_test.cc
@@ -12,13 +12,13 @@ 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/memory/memory.h"
-#include "paddle/memory/detail/memory_block.h"
-#include "paddle/memory/detail/meta_data.h"
+#include "paddle/fluid/memory/memory.h"
+#include "paddle/fluid/memory/detail/memory_block.h"
+#include "paddle/fluid/memory/detail/meta_data.h"
 
-#include "paddle/platform/cpu_info.h"
-#include "paddle/platform/gpu_info.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/platform/cpu_info.h"
+#include "paddle/fluid/platform/gpu_info.h"
+#include "paddle/fluid/platform/place.h"
 
 #include <gtest/gtest.h>
 #include <unordered_map>
diff --git a/paddle/fluid/operators/.clang-format b/paddle/fluid/operators/.clang-format
deleted file mode 120000
index 7d28cb3924707d39dafe20f4664fb17b5538996c..0000000000000000000000000000000000000000
--- a/paddle/fluid/operators/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../framework/.clang-format
\ No newline at end of file
diff --git a/paddle/fluid/operators/.clang-format b/paddle/fluid/operators/.clang-format
new file mode 100644
index 0000000000000000000000000000000000000000..29282dc87e2c499988c17d90d47d44cd5cf7f115
--- /dev/null
+++ b/paddle/fluid/operators/.clang-format
@@ -0,0 +1,5 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+Standard:  Cpp11 
+...
diff --git a/paddle/fluid/operators/accuracy_op.cc b/paddle/fluid/operators/accuracy_op.cc
index 8e8a3c7dd3036317fac29b709d7a29e18f017503..43689b3b7da5a0f5157ec8bc5fcf19d643ddc4ca 100644
--- a/paddle/fluid/operators/accuracy_op.cc
+++ b/paddle/fluid/operators/accuracy_op.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/operators/accuracy_op.h"
+#include "paddle/fluid/operators/accuracy_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/accuracy_op.cu b/paddle/fluid/operators/accuracy_op.cu
index 0aadd5af41531e54b357756441f92da668d4ec01..4462b9ba5c0e902933c53130f72fe40f807bde4a 100644
--- a/paddle/fluid/operators/accuracy_op.cu
+++ b/paddle/fluid/operators/accuracy_op.cu
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #include <thrust/execution_policy.h>
 #include <thrust/reduce.h>
-#include "paddle/operators/accuracy_op.h"
-#include "paddle/platform/cuda_helper.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/operators/accuracy_op.h"
+#include "paddle/fluid/platform/cuda_helper.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/accuracy_op.h b/paddle/fluid/operators/accuracy_op.h
index 04104a695fac6a967ad94780e31ba3fdd2ca2eda..b3ed1d3fe09ba044142ed69a463918d7e03a78e9 100644
--- a/paddle/fluid/operators/accuracy_op.h
+++ b/paddle/fluid/operators/accuracy_op.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include <algorithm>
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/activation_op.cc b/paddle/fluid/operators/activation_op.cc
index 4188858a90daf8b2c10eb6960393de977d467371..c04dd8cb9163cf7b05fd09bcf7f1d2937368614f 100644
--- a/paddle/fluid/operators/activation_op.cc
+++ b/paddle/fluid/operators/activation_op.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/operators/activation_op.h"
+#include "paddle/fluid/operators/activation_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/activation_op.cu b/paddle/fluid/operators/activation_op.cu
index b9ccdf639cf4a9ea80d530e550c16089e50c44e0..b86a7926a978b987d9dbb51fba55e025aab5e7fd 100644
--- a/paddle/fluid/operators/activation_op.cu
+++ b/paddle/fluid/operators/activation_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/activation_op.h"
+#include "paddle/fluid/operators/activation_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/activation_op.h b/paddle/fluid/operators/activation_op.h
index c0809abc05104c1e8c1f42331c0530724dd1472f..7a6ae2224c84cc17223f43046f06f08d11451439 100644
--- a/paddle/fluid/operators/activation_op.h
+++ b/paddle/fluid/operators/activation_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/detail/safe_ref.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adadelta_op.cc b/paddle/fluid/operators/adadelta_op.cc
index d8a9491c8247ac463e01606dac248780d5284236..ececd47e6a6787a161405fec75dafda336fddfbf 100644
--- a/paddle/fluid/operators/adadelta_op.cc
+++ b/paddle/fluid/operators/adadelta_op.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/operators/adadelta_op.h"
+#include "paddle/fluid/operators/adadelta_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adadelta_op.cu b/paddle/fluid/operators/adadelta_op.cu
index 91294a0d5d148a43bb95ab83ae8176b475fde9de..733482f788df8dfe1224ebe0d4494111bf9f647b 100644
--- a/paddle/fluid/operators/adadelta_op.cu
+++ b/paddle/fluid/operators/adadelta_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/adadelta_op.h"
+#include "paddle/fluid/operators/adadelta_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/adadelta_op.h b/paddle/fluid/operators/adadelta_op.h
index 819d0845dbdafab95d993a455013300fa71495e2..82ced08710448293fb91a4fb0dea7ab216cd3da6 100644
--- a/paddle/fluid/operators/adadelta_op.h
+++ b/paddle/fluid/operators/adadelta_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adagrad_op.cc b/paddle/fluid/operators/adagrad_op.cc
index c83318a272302a474c37ce86365201acf56b9cad..61c0ecd019b1d7811ee5cfd4b43358bdb0fba3d9 100644
--- a/paddle/fluid/operators/adagrad_op.cc
+++ b/paddle/fluid/operators/adagrad_op.cc
@@ -12,12 +12,12 @@ 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/operators/adagrad_op.h"
+#include "paddle/fluid/operators/adagrad_op.h"
 
 #include <cmath>
 
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adagrad_op.cu b/paddle/fluid/operators/adagrad_op.cu
index 9a21e00b12bc2795e1bf1591f7db60c0245bacd3..1117363c133fe02c0c6b0a563d0b3665efb7fb18 100644
--- a/paddle/fluid/operators/adagrad_op.cu
+++ b/paddle/fluid/operators/adagrad_op.cu
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/adagrad_op.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/selected_rows_functor.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/adagrad_op.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adagrad_op.h b/paddle/fluid/operators/adagrad_op.h
index 66f5b0f449a4f11a3c734c98a6a97833763348a1..ee503b2c36299c7550f6679fe6e4bca7c33c8eee 100644
--- a/paddle/fluid/operators/adagrad_op.h
+++ b/paddle/fluid/operators/adagrad_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adam_op.cc b/paddle/fluid/operators/adam_op.cc
index 03527de936bf736d572fb0140033bde4db990981..25da9336b28ca8d14bf01ce8ca13bd8b379e9b10 100644
--- a/paddle/fluid/operators/adam_op.cc
+++ b/paddle/fluid/operators/adam_op.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/operators/adam_op.h"
+#include "paddle/fluid/operators/adam_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adam_op.cu b/paddle/fluid/operators/adam_op.cu
index 94f840c188942a900858429bc621c3a18d5900ad..85b806eb6a1c0ed28cd47331786b66fc2e3a21eb 100644
--- a/paddle/fluid/operators/adam_op.cu
+++ b/paddle/fluid/operators/adam_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/adam_op.h"
+#include "paddle/fluid/operators/adam_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/adam_op.h b/paddle/fluid/operators/adam_op.h
index af2c3ecd725ed1c916ff3b8a0291794d35a70e8b..a51b46ef15778cf83d4d4f9c2d8f366b1c5d6b9f 100644
--- a/paddle/fluid/operators/adam_op.h
+++ b/paddle/fluid/operators/adam_op.h
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #pragma once
 #include <math.h>  // for sqrt in CPU and CUDA
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/detail/safe_ref.h"
-#include "paddle/operators/math/selected_rows_functor.h"
-#include "paddle/platform/for_range.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/platform/for_range.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adamax_op.cc b/paddle/fluid/operators/adamax_op.cc
index 3b0b71418477ea128dbb31a8d7cd44cf6bf023a1..b2249b8f96da86438748ab5b2b0f748cc590b8f7 100644
--- a/paddle/fluid/operators/adamax_op.cc
+++ b/paddle/fluid/operators/adamax_op.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/operators/adamax_op.h"
+#include "paddle/fluid/operators/adamax_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/adamax_op.cu b/paddle/fluid/operators/adamax_op.cu
index 8f87bb28671018a184f25a014f9bdb7615f3040c..44a5d6c7bdeac94ceb710d981c6445c046528cb0 100644
--- a/paddle/fluid/operators/adamax_op.cu
+++ b/paddle/fluid/operators/adamax_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/adamax_op.h"
+#include "paddle/fluid/operators/adamax_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/adamax_op.h b/paddle/fluid/operators/adamax_op.h
index 172c179c5fabf5ca106bf11479aff2d94a4e21d2..124453c0eceb4caa53bf63a8d9e8c4b90a2213c9 100644
--- a/paddle/fluid/operators/adamax_op.h
+++ b/paddle/fluid/operators/adamax_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/array_operator.h b/paddle/fluid/operators/array_operator.h
index 3fdad5ad9b1246e06bbb71e582a96c212de1b0d5..4ffb414ecea350006e5a370a0b25ae304cace89c 100644
--- a/paddle/fluid/operators/array_operator.h
+++ b/paddle/fluid/operators/array_operator.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/array_to_lod_tensor_op.cc b/paddle/fluid/operators/array_to_lod_tensor_op.cc
index ba5c6bd3c681b4ae4f612da96df866227961df3d..bf8e11bd8c047275fe341ead9424d02e98d5d8f4 100644
--- a/paddle/fluid/operators/array_to_lod_tensor_op.cc
+++ b/paddle/fluid/operators/array_to_lod_tensor_op.cc
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include <numeric>
 
-#include "paddle/framework/lod_rank_table.h"
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/memory/memcpy.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/assign_op.cc b/paddle/fluid/operators/assign_op.cc
index e04aa2d28cff7b106b30304bfa19ba18e2affd21..f99f9af4276c0e8928f821ae166d55aed02e8e27 100644
--- a/paddle/fluid/operators/assign_op.cc
+++ b/paddle/fluid/operators/assign_op.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.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/var_type.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/var_type.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/assign_value_op.cc b/paddle/fluid/operators/assign_value_op.cc
index 8e3a53048920d9875f1b1a178b367cf02b2c9cf8..835043d9ab49a20a73d5dd0fff936cb3e9473b1e 100644
--- a/paddle/fluid/operators/assign_value_op.cc
+++ b/paddle/fluid/operators/assign_value_op.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/operators/assign_value_op.h"
+#include "paddle/fluid/operators/assign_value_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/assign_value_op.cu.cc b/paddle/fluid/operators/assign_value_op.cu.cc
index b17e20150053cea4c6b9ed6a5f222f77f4a4bd36..616163f97b9b917187ff66339c01f95289f2f618 100644
--- a/paddle/fluid/operators/assign_value_op.cu.cc
+++ b/paddle/fluid/operators/assign_value_op.cu.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/operators/assign_value_op.h"
+#include "paddle/fluid/operators/assign_value_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(assign_value, ops::AssignValueKernel<int>,
diff --git a/paddle/fluid/operators/assign_value_op.h b/paddle/fluid/operators/assign_value_op.h
index ec98c535132e454958e38c385f7da4df404fab50..33a344cad596a079faf2582ee1d9dc497531465a 100644
--- a/paddle/fluid/operators/assign_value_op.h
+++ b/paddle/fluid/operators/assign_value_op.h
@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/auc_op.cc b/paddle/fluid/operators/auc_op.cc
index b6494f95097bdc87081950815e910beda5d6850d..8ac08ea4a19b981b0dc8dac43e4ae5de7b09bb5d 100644
--- a/paddle/fluid/operators/auc_op.cc
+++ b/paddle/fluid/operators/auc_op.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/operators/auc_op.h"
+#include "paddle/fluid/operators/auc_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/auc_op.h b/paddle/fluid/operators/auc_op.h
index b80509e2a99a2a255dff2a98d950257588a21d29..e648db70974087f84020f45c568fb0c1924a88dd 100644
--- a/paddle/fluid/operators/auc_op.h
+++ b/paddle/fluid/operators/auc_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/batch_norm_op.cc b/paddle/fluid/operators/batch_norm_op.cc
index 0e984c38ba78bddc232ce43bd0982408e837abe3..506c25d50d453ef841e6885c412ccff38f25cebb 100644
--- a/paddle/fluid/operators/batch_norm_op.cc
+++ b/paddle/fluid/operators/batch_norm_op.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/operators/batch_norm_op.h"
-#include "paddle/framework/data_layout.h"
+#include "paddle/fluid/operators/batch_norm_op.h"
+#include "paddle/fluid/framework/data_layout.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/batch_norm_op.cu.cc b/paddle/fluid/operators/batch_norm_op.cu.cc
index 3d17725ab47682355b2093782848849857f9bf59..b9c97211e14c0ef3a99a7e2b5cbfd8b267d40c1e 100644
--- a/paddle/fluid/operators/batch_norm_op.cu.cc
+++ b/paddle/fluid/operators/batch_norm_op.cu.cc
@@ -12,12 +12,12 @@ 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/operators/batch_norm_op.h"
-#include "paddle/framework/data_layout.h"
+#include "paddle/fluid/operators/batch_norm_op.h"
+#include "paddle/fluid/framework/data_layout.h"
 
 #include <cfloat>
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/cudnn_helper.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/cudnn_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/batch_norm_op.h b/paddle/fluid/operators/batch_norm_op.h
index a817ef41fc87da33ad87923c99a75ee7c3c7bbfe..fa9942ad099f4a28a3abc68c676edeeb827aacd0 100644
--- a/paddle/fluid/operators/batch_norm_op.h
+++ b/paddle/fluid/operators/batch_norm_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/beam_search_decode_op.cc b/paddle/fluid/operators/beam_search_decode_op.cc
index 72e05607b0b612807d552b4c45b58f9d9ce9c2af..7737d4e098ac9a0e56e1db2aee796550e8d71ba3 100644
--- a/paddle/fluid/operators/beam_search_decode_op.cc
+++ b/paddle/fluid/operators/beam_search_decode_op.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/operators/beam_search_decode_op.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/operators/beam_search_decode_op.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/beam_search_decode_op.h b/paddle/fluid/operators/beam_search_decode_op.h
index 3b1c6cd7a1045bfbb896725c79dc1ae2e22f43dc..aeecb8d39acf1e2761aec62b89322c9cbbfe7445 100644
--- a/paddle/fluid/operators/beam_search_decode_op.h
+++ b/paddle/fluid/operators/beam_search_decode_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/beam_search_decode_op_test.cc b/paddle/fluid/operators/beam_search_decode_op_test.cc
index 5ac23991f3c7768abaf94f3a4b750697de0ef114..24f87279d5eaa19715c31b2228c7a22d4723efae 100644
--- a/paddle/fluid/operators/beam_search_decode_op_test.cc
+++ b/paddle/fluid/operators/beam_search_decode_op_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/operators/beam_search_decode_op.h"
+#include "paddle/fluid/operators/beam_search_decode_op.h"
 #include "gtest/gtest.h"
 
 using CPUPlace = paddle::platform::CPUPlace;
diff --git a/paddle/fluid/operators/beam_search_op.cc b/paddle/fluid/operators/beam_search_op.cc
index 844ade40eb2a7ae239b079daa609f03b9e7a06df..6f4c8c7e06ee17b4cf3880db7bc8ddfbb88df3b8 100644
--- a/paddle/fluid/operators/beam_search_op.cc
+++ b/paddle/fluid/operators/beam_search_op.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/operators/beam_search_op.h"
+#include "paddle/fluid/operators/beam_search_op.h"
 
 #include <map>
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/beam_search_op.h b/paddle/fluid/operators/beam_search_op.h
index 7ad85874fcbd6ea48d688b32f2cc982d6b76d3c4..9e2a05a60c30e388093aceddd40e58273364c8f9 100644
--- a/paddle/fluid/operators/beam_search_op.h
+++ b/paddle/fluid/operators/beam_search_op.h
@@ -18,8 +18,8 @@ limitations under the License. */
 #include "gtest/gtest.h"
 #endif
 
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/beam_search_op_test.cc b/paddle/fluid/operators/beam_search_op_test.cc
index d4beb64a85a1645b3fed22c3325bd8c0b7cd12b1..ea2afda4d492ccde8889a394201b398eeff3badb 100644
--- a/paddle/fluid/operators/beam_search_op_test.cc
+++ b/paddle/fluid/operators/beam_search_op_test.cc
@@ -12,7 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License. */
 
-#include "paddle/operators/beam_search_op.h"
+#include "paddle/fluid/operators/beam_search_op.h"
 
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/paddle/fluid/operators/bilinear_tensor_product_op.cc b/paddle/fluid/operators/bilinear_tensor_product_op.cc
index 7640147a12d66a924f16eaf168227b6ce6a96040..cc378b1b4536273e4364a488eb7a4ca2cc706782 100644
--- a/paddle/fluid/operators/bilinear_tensor_product_op.cc
+++ b/paddle/fluid/operators/bilinear_tensor_product_op.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/operators/bilinear_tensor_product_op.h"
+#include "paddle/fluid/operators/bilinear_tensor_product_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/bilinear_tensor_product_op.cu b/paddle/fluid/operators/bilinear_tensor_product_op.cu
index 0f48010716f086a64c0b6a35b76e06a42430ab84..2cec48ee69ac500c0b0ba84f4b6fc20415f4b82c 100644
--- a/paddle/fluid/operators/bilinear_tensor_product_op.cu
+++ b/paddle/fluid/operators/bilinear_tensor_product_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/bilinear_tensor_product_op.h"
+#include "paddle/fluid/operators/bilinear_tensor_product_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/bilinear_tensor_product_op.h b/paddle/fluid/operators/bilinear_tensor_product_op.h
index ba9a2c5ce3c024a82e864a399ad90281d8dcdb20..626fa957c42c02c978519c1869cd5f0679d22a26 100644
--- a/paddle/fluid/operators/bilinear_tensor_product_op.h
+++ b/paddle/fluid/operators/bilinear_tensor_product_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/bipartite_match_op.cc b/paddle/fluid/operators/bipartite_match_op.cc
index 1e6fa2091de25218e2bdafeb740ce884234638a5..d614bf704382da7743b2128fa57a147e8db33d24 100644
--- a/paddle/fluid/operators/bipartite_match_op.cc
+++ b/paddle/fluid/operators/bipartite_match_op.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/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/box_coder_op.cc b/paddle/fluid/operators/box_coder_op.cc
index 539813d4858b8faef386047f9ef64aa232aefca1..8e0fee22d8d828978fe74bd48e46ea6c8063150d 100644
--- a/paddle/fluid/operators/box_coder_op.cc
+++ b/paddle/fluid/operators/box_coder_op.cc
@@ -9,7 +9,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/operators/box_coder_op.h"
+#include "paddle/fluid/operators/box_coder_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/box_coder_op.cu b/paddle/fluid/operators/box_coder_op.cu
index 98bd93457fafb49f2af5e1ff258fbfa9f9985600..dd9299ceacdf2507f51f895c71041c1645dd8371 100644
--- a/paddle/fluid/operators/box_coder_op.cu
+++ b/paddle/fluid/operators/box_coder_op.cu
@@ -9,8 +9,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/operators/box_coder_op.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/box_coder_op.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/box_coder_op.h b/paddle/fluid/operators/box_coder_op.h
index 086251f6e066f082743f332ce72918c6e572ce19..c41bcc212b8fcfc4a274a53db4b25161ecdb3fe5 100644
--- a/paddle/fluid/operators/box_coder_op.h
+++ b/paddle/fluid/operators/box_coder_op.h
@@ -10,8 +10,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cast_op.cc b/paddle/fluid/operators/cast_op.cc
index 446976edafca56f3c56fe573c8b5ef76a333089f..364c21f7619910784d63047f3abb3713f1bfd0fc 100644
--- a/paddle/fluid/operators/cast_op.cc
+++ b/paddle/fluid/operators/cast_op.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/operators/cast_op.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/operators/cast_op.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cast_op.cu b/paddle/fluid/operators/cast_op.cu
index d68bbe6e39a2fbaa92787731145ae324288b981a..fb597be9d93af12afb608bf87382c283ddf78e7c 100644
--- a/paddle/fluid/operators/cast_op.cu
+++ b/paddle/fluid/operators/cast_op.cu
@@ -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/operators/cast_op.h"
+#include "paddle/fluid/operators/cast_op.h"
 
 template <typename T>
 using CastOpKernel =
diff --git a/paddle/fluid/operators/cast_op.h b/paddle/fluid/operators/cast_op.h
index 9f39d91edd49d236d74019ca81b42002e4f35d36..9ab4961cef4bd6e7d4e592581b51d7d4eb896ec7 100644
--- a/paddle/fluid/operators/cast_op.h
+++ b/paddle/fluid/operators/cast_op.h
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/chunk_eval_op.cc b/paddle/fluid/operators/chunk_eval_op.cc
index 44f667aead9ac88fee57310e06e3192732a8d908..080e4d80da4752a0c6bea86c0a9f503cf46e8878 100644
--- a/paddle/fluid/operators/chunk_eval_op.cc
+++ b/paddle/fluid/operators/chunk_eval_op.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/operators/chunk_eval_op.h"
+#include "paddle/fluid/operators/chunk_eval_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/chunk_eval_op.h b/paddle/fluid/operators/chunk_eval_op.h
index 300aff90c0af666a95b7d4a0329de709e48ceddb..3dca3d2c0f99c3b2d447ffe4516c1b6c379b13f2 100644
--- a/paddle/fluid/operators/chunk_eval_op.h
+++ b/paddle/fluid/operators/chunk_eval_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include <set>
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/clip_by_norm_op.cc b/paddle/fluid/operators/clip_by_norm_op.cc
index b90921d79baa920f0b6f92cde2f7e1ca9183d0d2..89df118c06f4df6444fc1f61b5ddde48f6ad8ba7 100644
--- a/paddle/fluid/operators/clip_by_norm_op.cc
+++ b/paddle/fluid/operators/clip_by_norm_op.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/operators/clip_by_norm_op.h"
+#include "paddle/fluid/operators/clip_by_norm_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/clip_by_norm_op.cu b/paddle/fluid/operators/clip_by_norm_op.cu
index cbf8fa44133739f948fed13e18fc5cbaabd3abb0..a466b335914f1fde6865c6cc375f4ef009632e41 100644
--- a/paddle/fluid/operators/clip_by_norm_op.cu
+++ b/paddle/fluid/operators/clip_by_norm_op.cu
@@ -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/operators/clip_by_norm_op.h"
+#include "paddle/fluid/operators/clip_by_norm_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/clip_by_norm_op.h b/paddle/fluid/operators/clip_by_norm_op.h
index 87956a707cf58afa2336602b8ab6acf73b0ff814..82bcf07657bfbf1df6b541b3953285622fb25a87 100644
--- a/paddle/fluid/operators/clip_by_norm_op.h
+++ b/paddle/fluid/operators/clip_by_norm_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/clip_op.cc b/paddle/fluid/operators/clip_op.cc
index 7adb74eab78dcdd0251b8db60781f6e24e348634..76b2cefbf9dd67c5036b6ecfe35a9d53a54467a9 100644
--- a/paddle/fluid/operators/clip_op.cc
+++ b/paddle/fluid/operators/clip_op.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/operators/clip_op.h"
+#include "paddle/fluid/operators/clip_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/clip_op.cu b/paddle/fluid/operators/clip_op.cu
index 5ccbc9643407c65e8734711744ceac9814f4c6a2..7b044d6e699d59dda04fa19468c17faf1e0a0eb7 100644
--- a/paddle/fluid/operators/clip_op.cu
+++ b/paddle/fluid/operators/clip_op.cu
@@ -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/operators/clip_op.h"
+#include "paddle/fluid/operators/clip_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/clip_op.h b/paddle/fluid/operators/clip_op.h
index 51db185dffd80cc3b839d063acaf3f936d732817..aecd6f83bfaf4deab4271e859bea10feecacab62 100644
--- a/paddle/fluid/operators/clip_op.h
+++ b/paddle/fluid/operators/clip_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/compare_op.cc b/paddle/fluid/operators/compare_op.cc
index 51b5bcb38f9d60b1246f818de62275dba5b087f9..f3414c33b5ab3cc8dffee640fd85b9625b3f237b 100644
--- a/paddle/fluid/operators/compare_op.cc
+++ b/paddle/fluid/operators/compare_op.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/operators/compare_op.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/operators/compare_op.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/compare_op.cu b/paddle/fluid/operators/compare_op.cu
index f625824dbc99d603f1e92700b4ad3d7fa25b471d..3507af2ae3add8cf02f5b9f3b3d89b40d73bcb0d 100644
--- a/paddle/fluid/operators/compare_op.cu
+++ b/paddle/fluid/operators/compare_op.cu
@@ -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/operators/compare_op.h"
+#include "paddle/fluid/operators/compare_op.h"
 
 REGISTER_LOGICAL_KERNEL(less_than, CUDA, paddle::operators::LessThanFunctor);
 REGISTER_LOGICAL_KERNEL(less_equal, CUDA, paddle::operators::LessEqualFunctor);
diff --git a/paddle/fluid/operators/compare_op.h b/paddle/fluid/operators/compare_op.h
index 79b8c6f59c7ad3d77aa969f6b4f36f8050cfe823..4b2ee5a9d68f5f1fd3d2d374669763855659f1db 100644
--- a/paddle/fluid/operators/compare_op.h
+++ b/paddle/fluid/operators/compare_op.h
@@ -15,9 +15,9 @@ limitations under the License. */
 #pragma once
 #include <math.h>
 #include <type_traits>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/elementwise_op_function.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/concat_op.cc b/paddle/fluid/operators/concat_op.cc
index 32b61edfd0dd163e5ef8f3d1de133c55314458b5..68eb5412beb02d9dc948eeb188a2d5b1cdb0c5b3 100644
--- a/paddle/fluid/operators/concat_op.cc
+++ b/paddle/fluid/operators/concat_op.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/operators/concat_op.h"
+#include "paddle/fluid/operators/concat_op.h"
 #include <vector>
 
 namespace paddle {
diff --git a/paddle/fluid/operators/concat_op.cu.cc b/paddle/fluid/operators/concat_op.cu.cc
index 7b46452d3d5db58799923a3dc76bb9df3471d9e7..143bda6116775611e399ad805708474621d33b96 100644
--- a/paddle/fluid/operators/concat_op.cu.cc
+++ b/paddle/fluid/operators/concat_op.cu.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/operators/concat_op.h"
+#include "paddle/fluid/operators/concat_op.h"
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
     concat, ops::ConcatKernel<paddle::platform::CUDADeviceContext, float>);
diff --git a/paddle/fluid/operators/concat_op.h b/paddle/fluid/operators/concat_op.h
index de4011585af81363368a096a5c361ff3f7aeecdb..72b3e225bf64f889804eb5e4fab9df4653f5452b 100644
--- a/paddle/fluid/operators/concat_op.h
+++ b/paddle/fluid/operators/concat_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 
 #include <vector>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/strided_memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cond_op.cc b/paddle/fluid/operators/cond_op.cc
index e333002bfd1ab40c62882f09cd207a12a0939648..dd93790d5b52a2ccc8358a94f7ead346d384f191 100644
--- a/paddle/fluid/operators/cond_op.cc
+++ b/paddle/fluid/operators/cond_op.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/operators/cond_op.h"
-#include "paddle/operators/gather.h"
-#include "paddle/operators/scatter.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/operators/cond_op.h"
+#include "paddle/fluid/operators/gather.h"
+#include "paddle/fluid/operators/scatter.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cond_op.h b/paddle/fluid/operators/cond_op.h
index 7dcdc47e0b2ff216bea92d083fe5897009384d39..695af4490696b29d2d47f5825ebc0159b39663c0 100644
--- a/paddle/fluid/operators/cond_op.h
+++ b/paddle/fluid/operators/cond_op.h
@@ -15,11 +15,11 @@ limitations under the License. */
 #pragma once
 #include <vector>
 #include "glog/logging.h"
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/operator.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/operators/net_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conditional_block_op.cc b/paddle/fluid/operators/conditional_block_op.cc
index bdcdb85be7a94a748961048ac97e69f2f3b78677..30435c6cca0a4fb1d41dce47b8fefeafb6c48a51 100644
--- a/paddle/fluid/operators/conditional_block_op.cc
+++ b/paddle/fluid/operators/conditional_block_op.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 <algorithm>
-#include "paddle/framework/executor.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_cudnn_op.cu.cc b/paddle/fluid/operators/conv_cudnn_op.cu.cc
index 3a5409a7e3f29a4c46839d6395760fc7fe8c086e..a729d376ac8c3dc49ec06271c3ffef6406a20b28 100644
--- a/paddle/fluid/operators/conv_cudnn_op.cu.cc
+++ b/paddle/fluid/operators/conv_cudnn_op.cu.cc
@@ -12,12 +12,12 @@ 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/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/memory/memory.h"
-#include "paddle/operators/conv_op.h"
-#include "paddle/platform/assert.h"
-#include "paddle/platform/cudnn_helper.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/memory/memory.h"
+#include "paddle/fluid/operators/conv_op.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/cudnn_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_op.cc b/paddle/fluid/operators/conv_op.cc
index cef7ddd5fe7e12a374fb9cc79211bd2eb97c6c52..a047e579163cfe9cd0d053f337b7a92339466a96 100644
--- a/paddle/fluid/operators/conv_op.cc
+++ b/paddle/fluid/operators/conv_op.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/operators/conv_op.h"
+#include "paddle/fluid/operators/conv_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_op.cu.cc b/paddle/fluid/operators/conv_op.cu.cc
index d0bd40ee95dab3b2589742b8a0c3a5de7918b5b9..b2129d3b461249b5d1b317edde924ffc04f4f90f 100644
--- a/paddle/fluid/operators/conv_op.cu.cc
+++ b/paddle/fluid/operators/conv_op.cu.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/operators/conv_op.h"
+#include "paddle/fluid/operators/conv_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/conv_op.h b/paddle/fluid/operators/conv_op.h
index 3c1d0e9c1c4bb964bfaebc3bfed115548bd53f97..1156e6c8fe3263607d4dcd1af0c9996acd9368fb 100644
--- a/paddle/fluid/operators/conv_op.h
+++ b/paddle/fluid/operators/conv_op.h
@@ -14,12 +14,12 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/depthwise_conv.h"
-#include "paddle/operators/math/im2col.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/vol2col.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/depthwise_conv.h"
+#include "paddle/fluid/operators/math/im2col.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/vol2col.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_shift_op.cc b/paddle/fluid/operators/conv_shift_op.cc
index 106b68a0a0e787a0c9da2de924f4646c77b42b41..a96aac63e09b47c9afe99b2e622a718839ba047c 100644
--- a/paddle/fluid/operators/conv_shift_op.cc
+++ b/paddle/fluid/operators/conv_shift_op.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/operators/conv_shift_op.h"
-#include "paddle/framework/eigen.h"
+#include "paddle/fluid/operators/conv_shift_op.h"
+#include "paddle/fluid/framework/eigen.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_shift_op.cu b/paddle/fluid/operators/conv_shift_op.cu
index cf7abc196e1293ab1b998d1a8cb9c361a7c2d427..9818707ce3b98afe25050336d85e3b05919620f3 100644
--- a/paddle/fluid/operators/conv_shift_op.cu
+++ b/paddle/fluid/operators/conv_shift_op.cu
@@ -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/operators/conv_shift_op.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/conv_shift_op.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_shift_op.h b/paddle/fluid/operators/conv_shift_op.h
index 6781d87ef0d99a0b0fc4747245920b6a38a33804..987a690895e2a7428f058eb2d8366f9c7572912b 100644
--- a/paddle/fluid/operators/conv_shift_op.h
+++ b/paddle/fluid/operators/conv_shift_op.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_transpose_cudnn_op.cu.cc b/paddle/fluid/operators/conv_transpose_cudnn_op.cu.cc
index 23bc97e13c13e5c1d62a406be5e528ab272fa93a..0aed4ebeffa7312c218bb892fbcdf9cd9cdc53ca 100644
--- a/paddle/fluid/operators/conv_transpose_cudnn_op.cu.cc
+++ b/paddle/fluid/operators/conv_transpose_cudnn_op.cu.cc
@@ -12,12 +12,12 @@ 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/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/memory/memory.h"
-#include "paddle/operators/conv_transpose_op.h"
-#include "paddle/platform/assert.h"
-#include "paddle/platform/cudnn_helper.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/memory/memory.h"
+#include "paddle/fluid/operators/conv_transpose_op.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/cudnn_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_transpose_op.cc b/paddle/fluid/operators/conv_transpose_op.cc
index 089290a506db10f676c8d7eb92663d2cb56892af..974cffad92871c1a855c86a7a2e56f8e65819428 100644
--- a/paddle/fluid/operators/conv_transpose_op.cc
+++ b/paddle/fluid/operators/conv_transpose_op.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/operators/conv_transpose_op.h"
+#include "paddle/fluid/operators/conv_transpose_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/conv_transpose_op.cu.cc b/paddle/fluid/operators/conv_transpose_op.cu.cc
index f1d827c606283440debb9a0edb25168816a3a08c..ed90c6ec6265cc914a172b6c7217a204981e7fd1 100644
--- a/paddle/fluid/operators/conv_transpose_op.cu.cc
+++ b/paddle/fluid/operators/conv_transpose_op.cu.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/operators/conv_transpose_op.h"
+#include "paddle/fluid/operators/conv_transpose_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/conv_transpose_op.h b/paddle/fluid/operators/conv_transpose_op.h
index 8c0d57afcd21d8622fb6316f7b988d79a45b57fe..f512575468626edfb3e36c007e26b05faff0a06d 100644
--- a/paddle/fluid/operators/conv_transpose_op.h
+++ b/paddle/fluid/operators/conv_transpose_op.h
@@ -14,11 +14,11 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/im2col.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/vol2col.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/im2col.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/vol2col.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cos_sim_op.cc b/paddle/fluid/operators/cos_sim_op.cc
index 9019a1edb379be4007e38d3c0dc71feae23ae4e8..57c5a6025a03fbafadb56a3dbec9c4cfab5e979a 100644
--- a/paddle/fluid/operators/cos_sim_op.cc
+++ b/paddle/fluid/operators/cos_sim_op.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/operators/cos_sim_op.h"
+#include "paddle/fluid/operators/cos_sim_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cos_sim_op.cu b/paddle/fluid/operators/cos_sim_op.cu
index 9e5d1b6e4f0b6e482edd96df93d535e05dba3bc6..c8cf363cdc4009bd8fa233a52435dcc6ea56cf3c 100644
--- a/paddle/fluid/operators/cos_sim_op.cu
+++ b/paddle/fluid/operators/cos_sim_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/cos_sim_op.h"
+#include "paddle/fluid/operators/cos_sim_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/cos_sim_op.h b/paddle/fluid/operators/cos_sim_op.h
index eadcca55f9bfc3e59f329df8ff419ad4c5a29007..9cd8b196daf6e4afe9bde4d91db0110430cd7324 100644
--- a/paddle/fluid/operators/cos_sim_op.h
+++ b/paddle/fluid/operators/cos_sim_op.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/cos_sim_functor.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/for_range.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/cos_sim_functor.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/for_range.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/create_reader_op.cc b/paddle/fluid/operators/create_reader_op.cc
index 5ba2a25ab4c679f638e928a9e04c20d683a93630..2927ea2dafabbe55a3d990c768243948ceb769e7 100644
--- a/paddle/fluid/operators/create_reader_op.cc
+++ b/paddle/fluid/operators/create_reader_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/reader.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/reader.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/crf_decoding_op.cc b/paddle/fluid/operators/crf_decoding_op.cc
index 30626028c137a4ac3acf67f37ba5c5bb75215b3a..e3c1fc95a3be574635ab8a99aa29b71bd8dbc71e 100644
--- a/paddle/fluid/operators/crf_decoding_op.cc
+++ b/paddle/fluid/operators/crf_decoding_op.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/operators/crf_decoding_op.h"
+#include "paddle/fluid/operators/crf_decoding_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/crf_decoding_op.h b/paddle/fluid/operators/crf_decoding_op.h
index ce2f4e6622c21e1e5383b4a3aefc2987bf155aec..c3c161eec5f541b9f60a36064d7e8c350078c664 100644
--- a/paddle/fluid/operators/crf_decoding_op.h
+++ b/paddle/fluid/operators/crf_decoding_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/crop_op.cc b/paddle/fluid/operators/crop_op.cc
index 310e351443112c340054cf092cd2443b309ec49c..8e80f77e497ee21ccd5322b544376f20cb7de012 100644
--- a/paddle/fluid/operators/crop_op.cc
+++ b/paddle/fluid/operators/crop_op.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/operators/crop_op.h"
+#include "paddle/fluid/operators/crop_op.h"
 #include <boost/lexical_cast.hpp>
 
 namespace paddle {
diff --git a/paddle/fluid/operators/crop_op.cu b/paddle/fluid/operators/crop_op.cu
index bba5db4c6ce682cb00482e35fa1e340aba83e37f..f3610675aae1572380ca9b778ac3251c1951678b 100644
--- a/paddle/fluid/operators/crop_op.cu
+++ b/paddle/fluid/operators/crop_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/crop_op.h"
+#include "paddle/fluid/operators/crop_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(crop, ops::CropKernel<float>);
diff --git a/paddle/fluid/operators/crop_op.h b/paddle/fluid/operators/crop_op.h
index 69d1a92977250b4e8a64b47ac66444724fbc53f6..9c7c0446d4c0baf1ba59eb860a928341eed7cce0 100644
--- a/paddle/fluid/operators/crop_op.h
+++ b/paddle/fluid/operators/crop_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/strided_memcpy.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 
 namespace paddle {
 namespace operators {  // Internal
diff --git a/paddle/fluid/operators/cross_entropy_op.cc b/paddle/fluid/operators/cross_entropy_op.cc
index 7abd5b1c61d610f4f723b13ad6ce61791b96d06d..5e34b248b6aa696eaa03c7e1b4236a76a9081ef0 100644
--- a/paddle/fluid/operators/cross_entropy_op.cc
+++ b/paddle/fluid/operators/cross_entropy_op.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/operators/cross_entropy_op.h"
+#include "paddle/fluid/operators/cross_entropy_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cross_entropy_op.cu b/paddle/fluid/operators/cross_entropy_op.cu
index 3b04894e6ccb08c13e2d24bb38196fdc7935bf9e..de0976c69fc65ebc2ef7df9025d6071545e91c33 100644
--- a/paddle/fluid/operators/cross_entropy_op.cu
+++ b/paddle/fluid/operators/cross_entropy_op.cu
@@ -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/operators/cross_entropy_op.h"
+#include "paddle/fluid/operators/cross_entropy_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cross_entropy_op.h b/paddle/fluid/operators/cross_entropy_op.h
index 5623d2ded16daaf51dd26c9d9a8c04a0ae5be5ec..4a5b20ecb70887dd03865e53f168dad818195b16 100644
--- a/paddle/fluid/operators/cross_entropy_op.h
+++ b/paddle/fluid/operators/cross_entropy_op.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/cross_entropy.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/cross_entropy.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/ctc_align_op.cc b/paddle/fluid/operators/ctc_align_op.cc
index eeecbd32127d2cf9756432817fc5d36673685aa7..3c7db78813e3bdd90d1c65e3af26208ae2a9ba21 100644
--- a/paddle/fluid/operators/ctc_align_op.cc
+++ b/paddle/fluid/operators/ctc_align_op.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/operators/ctc_align_op.h"
+#include "paddle/fluid/operators/ctc_align_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/ctc_align_op.cu b/paddle/fluid/operators/ctc_align_op.cu
index 6406825d4a5c4538b5e2780efbe5ba86adce5b72..f629e0a9f15192c4d0d6fa5b8a122811d11ca415 100644
--- a/paddle/fluid/operators/ctc_align_op.cu
+++ b/paddle/fluid/operators/ctc_align_op.cu
@@ -15,7 +15,7 @@ limitations under the License. */
 #include <stdio.h>
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
-#include "paddle/operators/ctc_align_op.h"
+#include "paddle/fluid/operators/ctc_align_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/ctc_align_op.h b/paddle/fluid/operators/ctc_align_op.h
index 54ad1d6f5cc96c884c9e0c101c44d8d629792f8f..1ef034c2f5b566e3cf720e295953fd7a69dd5812 100644
--- a/paddle/fluid/operators/ctc_align_op.h
+++ b/paddle/fluid/operators/ctc_align_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 
 #include <string.h>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cum_op.h b/paddle/fluid/operators/cum_op.h
index e3813ac9036169345bd69d1d42db4618c6c45ebf..3b2249147848b790833d09a0abe0370057ddd617 100644
--- a/paddle/fluid/operators/cum_op.h
+++ b/paddle/fluid/operators/cum_op.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
-#include "paddle/operators/detail/safe_ref.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cumsum_op.cc b/paddle/fluid/operators/cumsum_op.cc
index 4933cc923d46ad053e16e060d94a39083709bbe1..d15d4e3db35c4cd27f7b990a39a40af57acd5a65 100644
--- a/paddle/fluid/operators/cumsum_op.cc
+++ b/paddle/fluid/operators/cumsum_op.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/operators/cum_op.h"
+#include "paddle/fluid/operators/cum_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/cumsum_op.cu b/paddle/fluid/operators/cumsum_op.cu
index 90661c4269a9fadaba1446e04b3f661f1227a978..e063cc0f65a5d63f8f558c5f16e548a1e1fcd4f6 100644
--- a/paddle/fluid/operators/cumsum_op.cu
+++ b/paddle/fluid/operators/cumsum_op.cu
@@ -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/operators/cum_op.h"
+#include "paddle/fluid/operators/cum_op.h"
 
 namespace ops = paddle::operators;
 using CUDA = paddle::platform::CUDADeviceContext;
diff --git a/paddle/fluid/operators/decayed_adagrad_op.cc b/paddle/fluid/operators/decayed_adagrad_op.cc
index 739a8d881c35817756421a3299901c9e5e7d96ba..d827155919ed060df6bb45bbb54c286e81cb6c81 100644
--- a/paddle/fluid/operators/decayed_adagrad_op.cc
+++ b/paddle/fluid/operators/decayed_adagrad_op.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/operators/decayed_adagrad_op.h"
+#include "paddle/fluid/operators/decayed_adagrad_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/decayed_adagrad_op.cu b/paddle/fluid/operators/decayed_adagrad_op.cu
index 7bc8161f2339572c2a9284f865846b9b7e594354..215d6dbc7d80405bf2fdd340c280c299de9e8cc7 100644
--- a/paddle/fluid/operators/decayed_adagrad_op.cu
+++ b/paddle/fluid/operators/decayed_adagrad_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/decayed_adagrad_op.h"
+#include "paddle/fluid/operators/decayed_adagrad_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/decayed_adagrad_op.h b/paddle/fluid/operators/decayed_adagrad_op.h
index fec9705cfc1e14e5423e23d6afb218c6c051f5a1..52b67586ea3d138f738956c450416698042590fa 100644
--- a/paddle/fluid/operators/decayed_adagrad_op.h
+++ b/paddle/fluid/operators/decayed_adagrad_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/detail/grpc_client.cc b/paddle/fluid/operators/detail/grpc_client.cc
index 9b5f7afc6a48f13ff999f635efeb9e7bf0a76fb5..0d395d347ba4f48bae6b879c1daa3adb6f838e77 100644
--- a/paddle/fluid/operators/detail/grpc_client.cc
+++ b/paddle/fluid/operators/detail/grpc_client.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "grpc_client.h"
-#include "paddle/framework/threadpool.h"
+#include "paddle/fluid/framework/threadpool.h"
 namespace paddle {
 namespace operators {
 namespace detail {
diff --git a/paddle/fluid/operators/detail/grpc_client.h b/paddle/fluid/operators/detail/grpc_client.h
index f9499f6dc70c541c214e0b659f10b2ed1e8e8581..314fe8168f0ecdae7b5d2737279050f54185e02a 100644
--- a/paddle/fluid/operators/detail/grpc_client.h
+++ b/paddle/fluid/operators/detail/grpc_client.h
@@ -25,12 +25,12 @@ limitations under the License. */
 #include <string>
 #include <vector>
 
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/scope.h"
-#include "paddle/framework/selected_rows.h"
-#include "paddle/operators/detail/sendrecvop_utils.h"
-#include "paddle/operators/detail/simple_block_queue.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/operators/detail/sendrecvop_utils.h"
+#include "paddle/fluid/operators/detail/simple_block_queue.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/detail/grpc_server.cc b/paddle/fluid/operators/detail/grpc_server.cc
index 4f94e1315fbd2810a05354f7c3fc54ea30967e8a..96f4ea797b1d8e82fa1c2a52a8b353259906bac2 100644
--- a/paddle/fluid/operators/detail/grpc_server.cc
+++ b/paddle/fluid/operators/detail/grpc_server.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/operators/detail/grpc_server.h"
+#include "paddle/fluid/operators/detail/grpc_server.h"
 
 using grpc::ServerAsyncResponseWriter;
 
diff --git a/paddle/fluid/operators/detail/grpc_server.h b/paddle/fluid/operators/detail/grpc_server.h
index 3f8b9d93176148619d6820f6a365d9da2e73b10d..1382d1731838c72008ef782d1c398f534f23f7e6 100644
--- a/paddle/fluid/operators/detail/grpc_server.h
+++ b/paddle/fluid/operators/detail/grpc_server.h
@@ -14,19 +14,19 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/scope.h"
-#include "paddle/framework/selected_rows.h"
-#include "paddle/framework/var_type.h"
-#include "paddle/operators/detail/simple_block_queue.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/framework/var_type.h"
+#include "paddle/fluid/operators/detail/simple_block_queue.h"
 
-#include "paddle/operators/detail/send_recv.grpc.pb.h"
-#include "paddle/operators/detail/send_recv.pb.h"
+#include "paddle/fluid/operators/detail/send_recv.grpc.pb.h"
+#include "paddle/fluid/operators/detail/send_recv.pb.h"
 
 #include <grpc++/grpc++.h>
 #include <grpc/support/log.h>
 #include <thread>
-#include "paddle/operators/detail/sendrecvop_utils.h"
+#include "paddle/fluid/operators/detail/sendrecvop_utils.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/detail/sendrecvop_utils.cc b/paddle/fluid/operators/detail/sendrecvop_utils.cc
index 7635b9e8dbdff624bb42a9de346b8d05a980f9b6..ba3ae6add6099cb232a5e0df82550b9c2628c05c 100644
--- a/paddle/fluid/operators/detail/sendrecvop_utils.cc
+++ b/paddle/fluid/operators/detail/sendrecvop_utils.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/operators/detail/sendrecvop_utils.h"
+#include "paddle/fluid/operators/detail/sendrecvop_utils.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/detail/sendrecvop_utils.h b/paddle/fluid/operators/detail/sendrecvop_utils.h
index 8e66f7299c7b4d30bc5a6fe6a18b7cb3ae3827a5..fed887c02796463b4b1b7a747883c702c2a95a72 100644
--- a/paddle/fluid/operators/detail/sendrecvop_utils.h
+++ b/paddle/fluid/operators/detail/sendrecvop_utils.h
@@ -17,14 +17,14 @@ limitations under the License. */
 #include <string>
 #include <vector>
 
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/scope.h"
-#include "paddle/framework/selected_rows.h"
-#include "paddle/framework/var_type.h"
-
-#include "paddle/operators/detail/send_recv.grpc.pb.h"
-#include "paddle/operators/detail/send_recv.pb.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/framework/var_type.h"
+
+#include "paddle/fluid/operators/detail/send_recv.grpc.pb.h"
+#include "paddle/fluid/operators/detail/send_recv.pb.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/detail/strided_memcpy.h b/paddle/fluid/operators/detail/strided_memcpy.h
index 9ed524d4dcf7f8bd4607281ade34e9d56f409085..d7a7eed50b961b0efc04a2a636178fa6578cbf3a 100644
--- a/paddle/fluid/operators/detail/strided_memcpy.h
+++ b/paddle/fluid/operators/detail/strided_memcpy.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/ddim.h"
-#include "paddle/memory/memcpy.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/detection_output_op.cc b/paddle/fluid/operators/detection_output_op.cc
index ea44cd32678d7e8a5836c1886cf9c1b4961970aa..6dee5222959f00141cf5c09257d4a2c96b9e3746 100644
--- a/paddle/fluid/operators/detection_output_op.cc
+++ b/paddle/fluid/operators/detection_output_op.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/operators/detection_output_op.h"
+#include "paddle/fluid/operators/detection_output_op.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/detection_output_op.cu.cc b/paddle/fluid/operators/detection_output_op.cu.cc
index 4a6560e0492c559afd06e5152c34fab545b7ce61..309e03a25be95362b11689f873bafe68570c42e4 100644
--- a/paddle/fluid/operators/detection_output_op.cu.cc
+++ b/paddle/fluid/operators/detection_output_op.cu.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/operators/detection_output_op.h"
+#include "paddle/fluid/operators/detection_output_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/detection_output_op.h b/paddle/fluid/operators/detection_output_op.h
index 86285b748a7fe57437ddaa8cc4262d9ac1b0403a..05e5b72bd354329d575c33a88189cfbc64abfea9 100644
--- a/paddle/fluid/operators/detection_output_op.h
+++ b/paddle/fluid/operators/detection_output_op.h
@@ -13,12 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/operators/math/detection_util.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/softmax.h"
-#include "paddle/operators/strided_memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/operators/math/detection_util.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/softmax.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 namespace paddle {
 namespace operators {
 template <typename DeviceContext, typename T>
diff --git a/paddle/fluid/operators/dropout_op.cc b/paddle/fluid/operators/dropout_op.cc
index 5274aa204e6629c9c5ea850c433e0948c89015bd..e1dc900512cb2c20cc1a39b5d11a78f5eb905dc5 100644
--- a/paddle/fluid/operators/dropout_op.cc
+++ b/paddle/fluid/operators/dropout_op.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/operators/dropout_op.h"
+#include "paddle/fluid/operators/dropout_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/dropout_op.cu b/paddle/fluid/operators/dropout_op.cu
index 84d78445a4fa340ba3c066bb48b96b2a890db652..4ae9f4ce54d27dd1ad0312b5ad8d78a4cb904c79 100644
--- a/paddle/fluid/operators/dropout_op.cu
+++ b/paddle/fluid/operators/dropout_op.cu
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <thrust/iterator/counting_iterator.h>
 #include <thrust/random.h>
 #include <thrust/transform.h>
-#include "paddle/operators/dropout_op.h"
+#include "paddle/fluid/operators/dropout_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/dropout_op.h b/paddle/fluid/operators/dropout_op.h
index 46e5dbc64ff9ad3d04a9c1c07f4226932f661baf..9dd1f33669ccf89202abe4a80bd9796411f630ba 100644
--- a/paddle/fluid/operators/dropout_op.h
+++ b/paddle/fluid/operators/dropout_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include <random>
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/edit_distance_op.cc b/paddle/fluid/operators/edit_distance_op.cc
index 7e7dfc79eba5c9a75366415e5f4b3183653a5cc6..ae82408da71f9424a7a64dc9d3e42759707683b9 100644
--- a/paddle/fluid/operators/edit_distance_op.cc
+++ b/paddle/fluid/operators/edit_distance_op.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/operators/edit_distance_op.h"
+#include "paddle/fluid/operators/edit_distance_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/edit_distance_op.cu b/paddle/fluid/operators/edit_distance_op.cu
index c3e116af086627d576c7a788caebd45667d70017..bdfead75e71752549f44a8b3c9b9e4501e8845a3 100644
--- a/paddle/fluid/operators/edit_distance_op.cu
+++ b/paddle/fluid/operators/edit_distance_op.cu
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <algorithm>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/cuda_helper.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/cuda_helper.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/edit_distance_op.h b/paddle/fluid/operators/edit_distance_op.h
index 974299e604d22422e9024382e85c843ad831575d..205e16e6bfe6b2d1678fca258ce1e70d29eff331 100644
--- a/paddle/fluid/operators/edit_distance_op.h
+++ b/paddle/fluid/operators/edit_distance_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include <algorithm>
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/elementwise_add_op.cc b/paddle/fluid/operators/elementwise_add_op.cc
index 37951fa7587c8a200f4733e5a46575461f5026cd..5b9947b8c935fd2b4739162cbd2f98dc965cec2a 100644
--- a/paddle/fluid/operators/elementwise_add_op.cc
+++ b/paddle/fluid/operators/elementwise_add_op.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/operators/elementwise_add_op.h"
-#include "paddle/operators/elementwise_op.h"
+#include "paddle/fluid/operators/elementwise_add_op.h"
+#include "paddle/fluid/operators/elementwise_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_add_op.cu b/paddle/fluid/operators/elementwise_add_op.cu
index 641cea323acee549898cb6f0245ccac4c069ce32..2ac3a998ec46528ccb72fad1f5d73ce88992d995 100644
--- a/paddle/fluid/operators/elementwise_add_op.cu
+++ b/paddle/fluid/operators/elementwise_add_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/elementwise_add_op.h"
+#include "paddle/fluid/operators/elementwise_add_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/elementwise_add_op.h b/paddle/fluid/operators/elementwise_add_op.h
index c24f97a85092ff14e8211ca8bc4bb9b155510a2c..248e3b9d617fadd914f27ad02861e27078600b61 100644
--- a/paddle/fluid/operators/elementwise_add_op.h
+++ b/paddle/fluid/operators/elementwise_add_op.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_div_op.cc b/paddle/fluid/operators/elementwise_div_op.cc
index 6ebd58b1b3dd79a465e70a24f7aab56261290bf6..818ae82f44ccd159b36944e67521c3b730214539 100644
--- a/paddle/fluid/operators/elementwise_div_op.cc
+++ b/paddle/fluid/operators/elementwise_div_op.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/operators/elementwise_div_op.h"
-#include "paddle/operators/elementwise_op.h"
+#include "paddle/fluid/operators/elementwise_div_op.h"
+#include "paddle/fluid/operators/elementwise_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_div_op.cu b/paddle/fluid/operators/elementwise_div_op.cu
index a0372123d6ffe7e3a90727ddd37a787c1030e0bd..d1bb7a474c06f68d33412512a9eb99757634d18e 100644
--- a/paddle/fluid/operators/elementwise_div_op.cu
+++ b/paddle/fluid/operators/elementwise_div_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/elementwise_div_op.h"
+#include "paddle/fluid/operators/elementwise_div_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/elementwise_div_op.h b/paddle/fluid/operators/elementwise_div_op.h
index dc863cc598ec6015067f166b1544a5d20223662a..8e0726d9465fa988646f6f8dc74857a3bedf43e8 100644
--- a/paddle/fluid/operators/elementwise_div_op.h
+++ b/paddle/fluid/operators/elementwise_div_op.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_max_op.cc b/paddle/fluid/operators/elementwise_max_op.cc
index 53c27ae5be4cbfe85ce61aa27196594ae152eea4..1331bcadc8ce9a114d3dd7604273a3512e821e91 100644
--- a/paddle/fluid/operators/elementwise_max_op.cc
+++ b/paddle/fluid/operators/elementwise_max_op.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/operators/elementwise_max_op.h"
-#include "paddle/operators/elementwise_op.h"
+#include "paddle/fluid/operators/elementwise_max_op.h"
+#include "paddle/fluid/operators/elementwise_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_max_op.cu b/paddle/fluid/operators/elementwise_max_op.cu
index 5ff4af17477cbd35b765cc00d46c95fda620e2df..7f0259ad0024c1a9b640f73ade5711b6eaa8f871 100644
--- a/paddle/fluid/operators/elementwise_max_op.cu
+++ b/paddle/fluid/operators/elementwise_max_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/elementwise_max_op.h"
+#include "paddle/fluid/operators/elementwise_max_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/elementwise_max_op.h b/paddle/fluid/operators/elementwise_max_op.h
index 67efe4e1511e054d54f91b5aa22ce28f222ed20a..e1db9bcc01104c3462b562b7a37b5817e867d7e4 100644
--- a/paddle/fluid/operators/elementwise_max_op.h
+++ b/paddle/fluid/operators/elementwise_max_op.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_min_op.cc b/paddle/fluid/operators/elementwise_min_op.cc
index 99482e1bf60c88062087c5fe0105e90aa0a8677c..1d69099c8e6bd8e11a605758f553a9edd9cc322e 100644
--- a/paddle/fluid/operators/elementwise_min_op.cc
+++ b/paddle/fluid/operators/elementwise_min_op.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/operators/elementwise_min_op.h"
-#include "paddle/operators/elementwise_op.h"
+#include "paddle/fluid/operators/elementwise_min_op.h"
+#include "paddle/fluid/operators/elementwise_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_min_op.cu b/paddle/fluid/operators/elementwise_min_op.cu
index 3547e6ccb77177002b1ecbee4e4604b602f72209..ed53204735056477b5c59ce5082d377501409c65 100644
--- a/paddle/fluid/operators/elementwise_min_op.cu
+++ b/paddle/fluid/operators/elementwise_min_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/elementwise_min_op.h"
+#include "paddle/fluid/operators/elementwise_min_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/elementwise_min_op.h b/paddle/fluid/operators/elementwise_min_op.h
index cf11759404d3342b8a1c0080fa09f6cd57e735db..bfe213dd4318aef8b1fb299ba40981d2feef8f9d 100644
--- a/paddle/fluid/operators/elementwise_min_op.h
+++ b/paddle/fluid/operators/elementwise_min_op.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_mul_op.cc b/paddle/fluid/operators/elementwise_mul_op.cc
index 450dd05c796e22794315274b73398e85c8145940..0cb96f21d1b5049f9c7193f0a951e08986884c70 100644
--- a/paddle/fluid/operators/elementwise_mul_op.cc
+++ b/paddle/fluid/operators/elementwise_mul_op.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/operators/elementwise_mul_op.h"
-#include "paddle/operators/elementwise_op.h"
+#include "paddle/fluid/operators/elementwise_mul_op.h"
+#include "paddle/fluid/operators/elementwise_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_mul_op.cu b/paddle/fluid/operators/elementwise_mul_op.cu
index f73e8afda960a89aff8568eab66b0f120db2e342..d72b6250eed24adbfc18e95a659a82b8e9916bc1 100644
--- a/paddle/fluid/operators/elementwise_mul_op.cu
+++ b/paddle/fluid/operators/elementwise_mul_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/elementwise_mul_op.h"
+#include "paddle/fluid/operators/elementwise_mul_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/elementwise_mul_op.h b/paddle/fluid/operators/elementwise_mul_op.h
index 773125f5ca54e7b529df47a2823d56a5ad71e50d..dc292eb1e7295780aacb0c34730044c3c8759cb7 100644
--- a/paddle/fluid/operators/elementwise_mul_op.h
+++ b/paddle/fluid/operators/elementwise_mul_op.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_op.h b/paddle/fluid/operators/elementwise_op.h
index 1a0131d8b943da3deebd0c461f78cb02b34e6dc2..38f83d7ad36d3cb6b42a283fec3c431b51747d4e 100644
--- a/paddle/fluid/operators/elementwise_op.h
+++ b/paddle/fluid/operators/elementwise_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_op_function.h b/paddle/fluid/operators/elementwise_op_function.h
index 74abf7c4a58788eb0e53025886f10f5a43021a9e..c1269382a447d4f8d089c5fc392495d418123e48 100644
--- a/paddle/fluid/operators/elementwise_op_function.h
+++ b/paddle/fluid/operators/elementwise_op_function.h
@@ -13,16 +13,16 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/platform/transform.h"
 
 #ifdef __NVCC__
 #include <thrust/iterator/iterator_adaptor.h>
 #endif
 
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_pow_op.cc b/paddle/fluid/operators/elementwise_pow_op.cc
index 5293cc7dd34ccee860c50e964516da9b4d42d29c..911b5dbd2501e6c5ef6177a23592fadeb3383002 100644
--- a/paddle/fluid/operators/elementwise_pow_op.cc
+++ b/paddle/fluid/operators/elementwise_pow_op.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/operators/elementwise_pow_op.h"
-#include "paddle/operators/elementwise_op.h"
+#include "paddle/fluid/operators/elementwise_pow_op.h"
+#include "paddle/fluid/operators/elementwise_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_pow_op.cu b/paddle/fluid/operators/elementwise_pow_op.cu
index 643c978e635bc8e9671b47774c2eac5b713f59c2..2996600738fe11c3fef67c3f4c5660ff05e37957 100644
--- a/paddle/fluid/operators/elementwise_pow_op.cu
+++ b/paddle/fluid/operators/elementwise_pow_op.cu
@@ -10,7 +10,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/elementwise_pow_op.h"
+#include "paddle/fluid/operators/elementwise_pow_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/elementwise_pow_op.h b/paddle/fluid/operators/elementwise_pow_op.h
index 0c5dd031ec46ebecaabb701839c0f69c02678eb0..b793c1eae0ec3a796897c7d81ac061f80ccffdb6 100644
--- a/paddle/fluid/operators/elementwise_pow_op.h
+++ b/paddle/fluid/operators/elementwise_pow_op.h
@@ -15,7 +15,7 @@ limitations under the License. */
 #pragma once
 
 #include <cmath>
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_sub_op.cc b/paddle/fluid/operators/elementwise_sub_op.cc
index d3c51f0a697b7cb07a46871cdba2e84e902fd0f2..46ce01c7cf5bf4930d05535e22f1d54073838071 100644
--- a/paddle/fluid/operators/elementwise_sub_op.cc
+++ b/paddle/fluid/operators/elementwise_sub_op.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/operators/elementwise_sub_op.h"
-#include "paddle/operators/elementwise_op.h"
+#include "paddle/fluid/operators/elementwise_sub_op.h"
+#include "paddle/fluid/operators/elementwise_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/elementwise_sub_op.cu b/paddle/fluid/operators/elementwise_sub_op.cu
index 7a2516ef6a6d5739e9f122455d289cbfeaaf2549..eb09d6c5edcb6e8460de71d76077fd103d799847 100644
--- a/paddle/fluid/operators/elementwise_sub_op.cu
+++ b/paddle/fluid/operators/elementwise_sub_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/elementwise_sub_op.h"
+#include "paddle/fluid/operators/elementwise_sub_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/elementwise_sub_op.h b/paddle/fluid/operators/elementwise_sub_op.h
index 6a88c5f6b4c869f8ab5b4fa3b112ffc264be7145..af2d497b9ae8f892aa272211ee2158d063d13909 100644
--- a/paddle/fluid/operators/elementwise_sub_op.h
+++ b/paddle/fluid/operators/elementwise_sub_op.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/expand_op.cc b/paddle/fluid/operators/expand_op.cc
index 043c93654d33f7c105c89960e18ec72d3557237d..ccb9a94856fe868c8069510a7c557dfb8c22c369 100644
--- a/paddle/fluid/operators/expand_op.cc
+++ b/paddle/fluid/operators/expand_op.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/operators/expand_op.h"
+#include "paddle/fluid/operators/expand_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/expand_op.cu b/paddle/fluid/operators/expand_op.cu
index 84e8fa567b80599d9687fed516eac6fbb308b24a..8a9f39708beec3e0d32d65245c63f8ccf9df8604 100644
--- a/paddle/fluid/operators/expand_op.cu
+++ b/paddle/fluid/operators/expand_op.cu
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/expand_op.h"
+#include "paddle/fluid/operators/expand_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/expand_op.h b/paddle/fluid/operators/expand_op.h
index a4994cf3a5becb8198f01f9252f3e96beba5a3c3..8df1cd34d7dc5093b9bdcd3d015be4f9958d089d 100644
--- a/paddle/fluid/operators/expand_op.h
+++ b/paddle/fluid/operators/expand_op.h
@@ -21,9 +21,9 @@ limitations under the License. */
 #include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
 #include <iostream>
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 #define MAX_RANK_SUPPORTED 6
 
diff --git a/paddle/fluid/operators/feed_op.cc b/paddle/fluid/operators/feed_op.cc
index 789d01e0022b5c36957f295265a9dc42649b310f..0b3f5f0d1d09a932e15936285f5cb226daa86e95 100644
--- a/paddle/fluid/operators/feed_op.cc
+++ b/paddle/fluid/operators/feed_op.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/feed_fetch_type.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/feed_fetch_type.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/fetch_op.cc b/paddle/fluid/operators/fetch_op.cc
index 7205ee2a879dfff711ad1cabebe197ef53377a1c..54e5892016cdb01f50189147a7453b868c5a48c0 100644
--- a/paddle/fluid/operators/fetch_op.cc
+++ b/paddle/fluid/operators/fetch_op.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/feed_fetch_type.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/feed_fetch_type.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/fill_constant_batch_size_like_op.cc b/paddle/fluid/operators/fill_constant_batch_size_like_op.cc
index c74a5b6ced3af27847dd36511aeab0ee9614415a..e6992ba371c1dd61f7f6fa293be586818350fb3f 100644
--- a/paddle/fluid/operators/fill_constant_batch_size_like_op.cc
+++ b/paddle/fluid/operators/fill_constant_batch_size_like_op.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/operators/fill_constant_batch_size_like_op.h"
+#include "paddle/fluid/operators/fill_constant_batch_size_like_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/fill_constant_batch_size_like_op.cu.cc b/paddle/fluid/operators/fill_constant_batch_size_like_op.cu.cc
index 608f4b91623e4ddf0240c37be7a8e56117dd40f2..b4f4d2a50305e2582f23ceed931d655f9690e110 100644
--- a/paddle/fluid/operators/fill_constant_batch_size_like_op.cu.cc
+++ b/paddle/fluid/operators/fill_constant_batch_size_like_op.cu.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/operators/fill_constant_batch_size_like_op.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/operators/fill_constant_batch_size_like_op.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/fill_constant_batch_size_like_op.h b/paddle/fluid/operators/fill_constant_batch_size_like_op.h
index 66da9d0307e36db3726f30518c8c57a923e54388..da4a20d99a13533019d57fca42b1b49780200b79 100644
--- a/paddle/fluid/operators/fill_constant_batch_size_like_op.h
+++ b/paddle/fluid/operators/fill_constant_batch_size_like_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/fill_constant_op.cc b/paddle/fluid/operators/fill_constant_op.cc
index dcd43a30c86b62d79f52ac640f14b295a062146c..d4bf6406e5716a6b65a234d1cd642b64dcc5726f 100644
--- a/paddle/fluid/operators/fill_constant_op.cc
+++ b/paddle/fluid/operators/fill_constant_op.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.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/fill_op.cc b/paddle/fluid/operators/fill_op.cc
index 4f5a2ed169565771629fe8df7c25cf23bc94e339..8e318f37cf0bc945597b5aa7b384e53038c97786 100644
--- a/paddle/fluid/operators/fill_op.cc
+++ b/paddle/fluid/operators/fill_op.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.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/detail/safe_ref.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/fill_zeros_like_op.cc b/paddle/fluid/operators/fill_zeros_like_op.cc
index b4ae1de876010effff6bf577a4e33043f6760a4f..958bfb1557d9fa39534caef594818aa97bbe03a6 100644
--- a/paddle/fluid/operators/fill_zeros_like_op.cc
+++ b/paddle/fluid/operators/fill_zeros_like_op.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/operators/fill_zeros_like_op.h"
+#include "paddle/fluid/operators/fill_zeros_like_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/fill_zeros_like_op.cu.cc b/paddle/fluid/operators/fill_zeros_like_op.cu.cc
index b7048e8f5857e646e16d5017593f5d3c6e79ea7e..07078573d8aaa1d72f876f4be68ff70d8a56d8a1 100644
--- a/paddle/fluid/operators/fill_zeros_like_op.cu.cc
+++ b/paddle/fluid/operators/fill_zeros_like_op.cu.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/operators/fill_zeros_like_op.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/operators/fill_zeros_like_op.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/fill_zeros_like_op.h b/paddle/fluid/operators/fill_zeros_like_op.h
index 351ecf8b2f1d945fabdd1d6c5ed56f76f3caae61..141c3809e9aa3e2984bf802418f8ddf7d92fa446 100644
--- a/paddle/fluid/operators/fill_zeros_like_op.h
+++ b/paddle/fluid/operators/fill_zeros_like_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/ftrl_op.cc b/paddle/fluid/operators/ftrl_op.cc
index d00700823d48eb2ea4fc64d1fa2989f18c7c5f18..e72a173751e9b163b6083df474c2b46c76ed459d 100644
--- a/paddle/fluid/operators/ftrl_op.cc
+++ b/paddle/fluid/operators/ftrl_op.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/operators/ftrl_op.h"
+#include "paddle/fluid/operators/ftrl_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/ftrl_op.cu b/paddle/fluid/operators/ftrl_op.cu
index abbbe7adbe6bd14f55f7f941c5e6740fada24910..dbdfcb927e0aff373a716c5e0eace96bec38e9ad 100644
--- a/paddle/fluid/operators/ftrl_op.cu
+++ b/paddle/fluid/operators/ftrl_op.cu
@@ -12,7 +12,7 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/ftrl_op.h"
+#include "paddle/fluid/operators/ftrl_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/ftrl_op.h b/paddle/fluid/operators/ftrl_op.h
index 4eea04cd8d61bb34fc612e0ca1765a664e329ca9..0a9405fcef1fa405ab14ba7c797b99c2259892f7 100644
--- a/paddle/fluid/operators/ftrl_op.h
+++ b/paddle/fluid/operators/ftrl_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gather.cu.h b/paddle/fluid/operators/gather.cu.h
index 9840c066f053e5e1cd1c756d4dd938eace1a5eb4..af5898e29ecaed5a4d2cf8372a3bb20f192fc776 100644
--- a/paddle/fluid/operators/gather.cu.h
+++ b/paddle/fluid/operators/gather.cu.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gather.h b/paddle/fluid/operators/gather.h
index 052db49cb3c2594eca8b9a5e3716689480089703..287732eeb6e5249f631bc3e39cd18bc050f9fc3b 100644
--- a/paddle/fluid/operators/gather.h
+++ b/paddle/fluid/operators/gather.h
@@ -16,10 +16,10 @@ limitations under the License. */
 #include <memory.h>
 #include <cstring>
 
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gather_op.cc b/paddle/fluid/operators/gather_op.cc
index 597fdad0794ec076669a0b2e6157e5c74c80d735..dceeb71ee3552bcb462014b5f08a59d4406497ad 100644
--- a/paddle/fluid/operators/gather_op.cc
+++ b/paddle/fluid/operators/gather_op.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/operators/gather_op.h"
-#include "paddle/framework/ddim.h"
+#include "paddle/fluid/operators/gather_op.h"
+#include "paddle/fluid/framework/ddim.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gather_op.cu b/paddle/fluid/operators/gather_op.cu
index eec2415e1de2434de0a920567863d421d2d3032d..484f4232624e862aff7c0aff337b4e5df65d5be3 100644
--- a/paddle/fluid/operators/gather_op.cu
+++ b/paddle/fluid/operators/gather_op.cu
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "gather.cu.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/operators/gather_op.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/operators/gather_op.h"
 #include "scatter.cu.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/gather_op.h b/paddle/fluid/operators/gather_op.h
index 1a1ba0c41aef95d3dc8cc929db72770a7bd08b18..7ba4a31c81be025978c6c2a325792eea2eb353a7 100644
--- a/paddle/fluid/operators/gather_op.h
+++ b/paddle/fluid/operators/gather_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include "gather.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 #include "scatter.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/gather_test.cc b/paddle/fluid/operators/gather_test.cc
index cbd86b87961ee24aa889e208de5ac38e03a33135..4d86cf5ce334705d16435f542cc33be454edabb7 100644
--- a/paddle/fluid/operators/gather_test.cc
+++ b/paddle/fluid/operators/gather_test.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/operators/gather.h"
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/operators/gather.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/place.h"
 
 #include <gtest/gtest.h>
 #include <iostream>
diff --git a/paddle/fluid/operators/gaussian_random_op.cc b/paddle/fluid/operators/gaussian_random_op.cc
index 2dca05760ecc98f822b8c426af3152d365526d2b..b090f8759765039eadfc900361bcdabe215c2225 100644
--- a/paddle/fluid/operators/gaussian_random_op.cc
+++ b/paddle/fluid/operators/gaussian_random_op.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <random>
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gaussian_random_op.cu b/paddle/fluid/operators/gaussian_random_op.cu
index 8a70db17e17ebf7d5bad1e1ee6a2acdff1b85a09..70d655d4bb259bf33765fa42e46a19510ffca35d 100644
--- a/paddle/fluid/operators/gaussian_random_op.cu
+++ b/paddle/fluid/operators/gaussian_random_op.cu
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include <thrust/random.h>
 #include <thrust/transform.h>
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/get_places_op.cc b/paddle/fluid/operators/get_places_op.cc
index 24fafb23074c358669715f1840246c3520f948c7..ba908e472bbc165a244d8543713f1dbf293abb48 100644
--- a/paddle/fluid/operators/get_places_op.cc
+++ b/paddle/fluid/operators/get_places_op.cc
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <thread>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/detail/safe_ref.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
+#include "paddle/fluid/platform/place.h"
 #ifdef PADDLE_WITH_CUDA
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/platform/gpu_info.h"
 #endif
 
 namespace paddle {
diff --git a/paddle/fluid/operators/gru_op.cc b/paddle/fluid/operators/gru_op.cc
index fb901b639492a179925ff852f9030fc6674d1f63..1436e55b0e13b8b327a61e7c91294fa958b146c4 100644
--- a/paddle/fluid/operators/gru_op.cc
+++ b/paddle/fluid/operators/gru_op.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/operators/gru_op.h"
+#include "paddle/fluid/operators/gru_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gru_op.cu.cc b/paddle/fluid/operators/gru_op.cu.cc
index 9cb0cc42d5589792aae6d99cec807aac6e4991b6..e908d01d2920af8bdbbdc694944e62a86bad327a 100644
--- a/paddle/fluid/operators/gru_op.cu.cc
+++ b/paddle/fluid/operators/gru_op.cu.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/operators/gru_op.h"
+#include "paddle/fluid/operators/gru_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/gru_op.h b/paddle/fluid/operators/gru_op.h
index a08bd4233b02d021aaa64bafe4b855f11a60d338..37f3ae1a837c77bd5e3696abbd9ae14257a7f5d7 100644
--- a/paddle/fluid/operators/gru_op.h
+++ b/paddle/fluid/operators/gru_op.h
@@ -14,13 +14,13 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/operators/math/gru_compute.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/sequence2batch.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/gru_compute.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence2batch.h"
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gru_unit_op.cc b/paddle/fluid/operators/gru_unit_op.cc
index c354293be7720abd7d96b1c4311b32049a16730c..21ad3aeb492ee18d465edea6ec0fca7e49d1366b 100644
--- a/paddle/fluid/operators/gru_unit_op.cc
+++ b/paddle/fluid/operators/gru_unit_op.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/operators/gru_unit_op.h"
+#include "paddle/fluid/operators/gru_unit_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/gru_unit_op.cu b/paddle/fluid/operators/gru_unit_op.cu
index 95c8c23dadadf0e053012c86d44346ee31565cfc..88b707fd1314ec5f12b507edc64a56ea9895a9d6 100644
--- a/paddle/fluid/operators/gru_unit_op.cu
+++ b/paddle/fluid/operators/gru_unit_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/gru_unit_op.h"
+#include "paddle/fluid/operators/gru_unit_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/gru_unit_op.h b/paddle/fluid/operators/gru_unit_op.h
index a77be46718b766d9a0a8b8fb4cf2316b44687db8..c4031a5a575e59488c1a6cd77c3da88ea6af423e 100644
--- a/paddle/fluid/operators/gru_unit_op.h
+++ b/paddle/fluid/operators/gru_unit_op.h
@@ -14,11 +14,11 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/activation_op.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/activation_op.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/hinge_loss_op.cc b/paddle/fluid/operators/hinge_loss_op.cc
index 19d2e9dc56fe11f9dfb13e8cb271a23e128bf91b..f644c22c9f1bdde6edc0126186361baccfbfcfb0 100644
--- a/paddle/fluid/operators/hinge_loss_op.cc
+++ b/paddle/fluid/operators/hinge_loss_op.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/operators/hinge_loss_op.h"
+#include "paddle/fluid/operators/hinge_loss_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/hinge_loss_op.cu b/paddle/fluid/operators/hinge_loss_op.cu
index b9cfbc50c49c6cc902cb3667200c12c74fb5d13d..cb53a9b7f4aaeeee71ed81c507feb0e9c946a541 100644
--- a/paddle/fluid/operators/hinge_loss_op.cu
+++ b/paddle/fluid/operators/hinge_loss_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/hinge_loss_op.h"
+#include "paddle/fluid/operators/hinge_loss_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/hinge_loss_op.h b/paddle/fluid/operators/hinge_loss_op.h
index 91369cfb8a5d4f40be9e6249b50079ba2b550003..1e924d236ea1d3208a8f425f76be8d455714a51f 100644
--- a/paddle/fluid/operators/hinge_loss_op.h
+++ b/paddle/fluid/operators/hinge_loss_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/huber_loss_op.cc b/paddle/fluid/operators/huber_loss_op.cc
index 5c92f2c7b2d2f701bcc487716db41a0cce91002f..dc1f609dcfa23dff82812e72c16b1d62a93ca9a6 100644
--- a/paddle/fluid/operators/huber_loss_op.cc
+++ b/paddle/fluid/operators/huber_loss_op.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/operators/huber_loss_op.h"
+#include "paddle/fluid/operators/huber_loss_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/huber_loss_op.cu b/paddle/fluid/operators/huber_loss_op.cu
index ccc83a16ba271f0aa879c5c075dce1932dd40494..ef5120c69d4fda533625ace9bab504be39385ec9 100644
--- a/paddle/fluid/operators/huber_loss_op.cu
+++ b/paddle/fluid/operators/huber_loss_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/huber_loss_op.h"
+#include "paddle/fluid/operators/huber_loss_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/huber_loss_op.h b/paddle/fluid/operators/huber_loss_op.h
index 4dd20e8b080ab8bd2e61830241d64ee8546a80ec..caca89fcf63d27c7717de522e38f6ff0cab0d8f6 100644
--- a/paddle/fluid/operators/huber_loss_op.h
+++ b/paddle/fluid/operators/huber_loss_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/im2sequence_op.cc b/paddle/fluid/operators/im2sequence_op.cc
index 31baaedf6914b1a6939fc762491ef35013db4bb6..936e5fe49eda40dff6d8aa5fd626d443ee8dbe75 100644
--- a/paddle/fluid/operators/im2sequence_op.cc
+++ b/paddle/fluid/operators/im2sequence_op.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/operators/im2sequence_op.h"
+#include "paddle/fluid/operators/im2sequence_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/im2sequence_op.cu b/paddle/fluid/operators/im2sequence_op.cu
index 9db7529112f2710d6ff4af2b444e304543486de3..1e7bf4631224620ad5c65f750ed0c0c22e936dcf 100644
--- a/paddle/fluid/operators/im2sequence_op.cu
+++ b/paddle/fluid/operators/im2sequence_op.cu
@@ -13,7 +13,7 @@
    limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/im2sequence_op.h"
+#include "paddle/fluid/operators/im2sequence_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/im2sequence_op.h b/paddle/fluid/operators/im2sequence_op.h
index f33aec71a92a65ec0e4114530d70e36c9dc1be04..59456f0ea2996bb20bd48806a7258e31518a5ea3 100644
--- a/paddle/fluid/operators/im2sequence_op.h
+++ b/paddle/fluid/operators/im2sequence_op.h
@@ -14,11 +14,11 @@
 
 #pragma once
 
-#include "paddle/framework/data_layout.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/im2col.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/data_layout.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/im2col.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/increment_op.cc b/paddle/fluid/operators/increment_op.cc
index e0b80cc4e74429dee1b9a25e41b116970ad4de2a..3d488067b254c37515c6bdb9a4589aad311f344f 100644
--- a/paddle/fluid/operators/increment_op.cc
+++ b/paddle/fluid/operators/increment_op.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/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/iou_similarity_op.cc b/paddle/fluid/operators/iou_similarity_op.cc
index c520b28b83e66dbf53d2e19985370be4a2f69e23..c2e452cdfaa71cae53c2bfe259bae7f80cd259d7 100755
--- a/paddle/fluid/operators/iou_similarity_op.cc
+++ b/paddle/fluid/operators/iou_similarity_op.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/operators/iou_similarity_op.h"
+#include "paddle/fluid/operators/iou_similarity_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/iou_similarity_op.cu b/paddle/fluid/operators/iou_similarity_op.cu
index fa5052624618c35875b241419946f69b776c81d4..f8df1f4aa4c4894b59fe373a9e0cb697dfb96b62 100755
--- a/paddle/fluid/operators/iou_similarity_op.cu
+++ b/paddle/fluid/operators/iou_similarity_op.cu
@@ -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/operators/iou_similarity_op.h"
+#include "paddle/fluid/operators/iou_similarity_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/iou_similarity_op.h b/paddle/fluid/operators/iou_similarity_op.h
index e36177069d7b18ea23759f99c4679218fbfd32b8..2fb1b5f70703f9c88a532644d88a8b5df45404f0 100644
--- a/paddle/fluid/operators/iou_similarity_op.h
+++ b/paddle/fluid/operators/iou_similarity_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/for_range.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/for_range.h"
 
 template <typename T>
 inline HOSTDEVICE T IOUSimilarity(T xmin1, T ymin1, T xmax1, T ymax1, T xmin2,
diff --git a/paddle/fluid/operators/is_empty_op.cc b/paddle/fluid/operators/is_empty_op.cc
index 492ae48845aa5aa123989e62d07f5ae899af6193..ea424018d66dac85d5a4ad75cbf5199064d52848 100644
--- a/paddle/fluid/operators/is_empty_op.cc
+++ b/paddle/fluid/operators/is_empty_op.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/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/l1_norm_op.cc b/paddle/fluid/operators/l1_norm_op.cc
index 1a5d6e19263325821dd220d8a31c0e34600b8220..974ee404f8364ed66e9e213f857ea89993e1d6af 100644
--- a/paddle/fluid/operators/l1_norm_op.cc
+++ b/paddle/fluid/operators/l1_norm_op.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/operators/l1_norm_op.h"
+#include "paddle/fluid/operators/l1_norm_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/l1_norm_op.cu b/paddle/fluid/operators/l1_norm_op.cu
index 7ecc774670a8480da46ac688f3635e04b1ab7c1f..5e9e864a346298a670db63c664491c336a9bd36a 100644
--- a/paddle/fluid/operators/l1_norm_op.cu
+++ b/paddle/fluid/operators/l1_norm_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/l1_norm_op.h"
+#include "paddle/fluid/operators/l1_norm_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/l1_norm_op.h b/paddle/fluid/operators/l1_norm_op.h
index 086d42705dceaf0cbd35ce8e5115156a76a0b6e8..7ddf2ac6a9046d4d8c2130b459f2385ef4e1301a 100644
--- a/paddle/fluid/operators/l1_norm_op.h
+++ b/paddle/fluid/operators/l1_norm_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/label_smooth_op.cc b/paddle/fluid/operators/label_smooth_op.cc
index c89082f44b360cbd171eccb212674040b8688a46..c018965beefb362ae845d132e34ded1bb2911629 100644
--- a/paddle/fluid/operators/label_smooth_op.cc
+++ b/paddle/fluid/operators/label_smooth_op.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/operators/label_smooth_op.h"
+#include "paddle/fluid/operators/label_smooth_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/label_smooth_op.cu b/paddle/fluid/operators/label_smooth_op.cu
index 5a0cec12bc58a56e4b0c3bd6fbc6c4754ef81fa4..4a40a4e9ec82199afae3ae77bb2296a2fa95b0a5 100644
--- a/paddle/fluid/operators/label_smooth_op.cu
+++ b/paddle/fluid/operators/label_smooth_op.cu
@@ -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/operators/label_smooth_op.h"
+#include "paddle/fluid/operators/label_smooth_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/label_smooth_op.h b/paddle/fluid/operators/label_smooth_op.h
index 87bc9f793e3b4e249142710243c45d51f3a913b2..15752377f663fcb526b8306158e1e90d743c6cb6 100644
--- a/paddle/fluid/operators/label_smooth_op.h
+++ b/paddle/fluid/operators/label_smooth_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/layer_norm_op.cc b/paddle/fluid/operators/layer_norm_op.cc
index d9b774272cb7c9d87140bf30d2eabb44f49b2b7c..60e37ed01b3cad428dc0184634b4d36c9f24f9c5 100644
--- a/paddle/fluid/operators/layer_norm_op.cc
+++ b/paddle/fluid/operators/layer_norm_op.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/operators/layer_norm_op.h"
+#include "paddle/fluid/operators/layer_norm_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/layer_norm_op.cu b/paddle/fluid/operators/layer_norm_op.cu
index 77d13b216f0e8d6d4434742908437f1eb74818c9..aa54fd54155ce19298ad9f80c930ad08e542d71c 100644
--- a/paddle/fluid/operators/layer_norm_op.cu
+++ b/paddle/fluid/operators/layer_norm_op.cu
@@ -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/operators/layer_norm_op.h"
+#include "paddle/fluid/operators/layer_norm_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/layer_norm_op.h b/paddle/fluid/operators/layer_norm_op.h
index 3c436b89263758bbc0abcd1bb71cef3e1370d2a5..60c0b07add172520dc8062d3d5e8e4e69758e1f1 100644
--- a/paddle/fluid/operators/layer_norm_op.h
+++ b/paddle/fluid/operators/layer_norm_op.h
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
-#include "paddle/operators/elementwise_op_function.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/elementwise_op_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/linear_chain_crf_op.cc b/paddle/fluid/operators/linear_chain_crf_op.cc
index e24bf622b7f11e61198ab5238f47ba7edff2f4da..3e1dfa494872b6f187ee0b3cca399308a1cab42a 100644
--- a/paddle/fluid/operators/linear_chain_crf_op.cc
+++ b/paddle/fluid/operators/linear_chain_crf_op.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/operators/linear_chain_crf_op.h"
+#include "paddle/fluid/operators/linear_chain_crf_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/linear_chain_crf_op.cu b/paddle/fluid/operators/linear_chain_crf_op.cu
index da612510b4d45d8eefabe7de303e9fd0132c5f77..6e04e76eebc71def814fed65a469ef5f9f1b16b0 100644
--- a/paddle/fluid/operators/linear_chain_crf_op.cu
+++ b/paddle/fluid/operators/linear_chain_crf_op.cu
@@ -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/operators/linear_chain_crf_op.h"
+#include "paddle/fluid/operators/linear_chain_crf_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/linear_chain_crf_op.h b/paddle/fluid/operators/linear_chain_crf_op.h
index afc197a1c38091df5bf7d11ef07a4193ad6417cd..15b64c09bf366b356683c47c82a6dbf9529d9b58 100644
--- a/paddle/fluid/operators/linear_chain_crf_op.h
+++ b/paddle/fluid/operators/linear_chain_crf_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/listen_and_serv_op.cc b/paddle/fluid/operators/listen_and_serv_op.cc
index 099f6b23736adcc2a6e9c27dca297178687ae785..a72708d9baad98b670b46da66f56bf79bad951be 100644
--- a/paddle/fluid/operators/listen_and_serv_op.cc
+++ b/paddle/fluid/operators/listen_and_serv_op.cc
@@ -19,14 +19,14 @@ limitations under the License. */
 
 #include <unistd.h>
 
-#include "paddle/framework/executor.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/proto_desc.h"
-#include "paddle/operators/detail/grpc_server.h"
-#include "paddle/operators/detail/sendrecvop_utils.h"
-#include "paddle/operators/detail/simple_block_queue.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/proto_desc.h"
+#include "paddle/fluid/operators/detail/grpc_server.h"
+#include "paddle/fluid/operators/detail/sendrecvop_utils.h"
+#include "paddle/fluid/operators/detail/simple_block_queue.h"
 #include "paddle/string/printf.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/load_combine_op.cc b/paddle/fluid/operators/load_combine_op.cc
index f4be793d7bf1f346c011842c57fb5b5179a697d6..1948063d886b79964b1a52d9d82a8e7d2fb0d493 100644
--- a/paddle/fluid/operators/load_combine_op.cc
+++ b/paddle/fluid/operators/load_combine_op.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include <fstream>
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/load_op.cc b/paddle/fluid/operators/load_op.cc
index f886b423ac7cb89961d1fdb5c6d3776ccafcaf60..c9bf5d72b234f96d9eb5a4c275737ac8c18cd63d 100644
--- a/paddle/fluid/operators/load_op.cc
+++ b/paddle/fluid/operators/load_op.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include <fstream>
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lod_array_length_op.cc b/paddle/fluid/operators/lod_array_length_op.cc
index d2c52745cfdf8d0fdb168ef2d90e75a515c31015..f11f5a89f5ad5b2f3deed905625aefa1e9d9935b 100644
--- a/paddle/fluid/operators/lod_array_length_op.cc
+++ b/paddle/fluid/operators/lod_array_length_op.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/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lod_rank_table_op.cc b/paddle/fluid/operators/lod_rank_table_op.cc
index 692b9bf3710d764eceafda8390eedb8590794ddf..0b9426a9f8f0b0b3082667dc7a1414aceb824aca 100644
--- a/paddle/fluid/operators/lod_rank_table_op.cc
+++ b/paddle/fluid/operators/lod_rank_table_op.cc
@@ -11,8 +11,8 @@ distributed under the License is distributed on an "AS IS" BASIS,
 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/lod_rank_table.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/op_registry.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/lod_reset_op.cc b/paddle/fluid/operators/lod_reset_op.cc
index 3d7b15edcfece84ffea539591a4db2690bd82029..55ae71c1815470925b2bb153fc647b331dcc9ba4 100644
--- a/paddle/fluid/operators/lod_reset_op.cc
+++ b/paddle/fluid/operators/lod_reset_op.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/operators/lod_reset_op.h"
+#include "paddle/fluid/operators/lod_reset_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lod_reset_op.cu b/paddle/fluid/operators/lod_reset_op.cu
index 910866ea6330059f8e0b04e036e3b124e920b5c4..8bfc8bd3bf06037d7fcd387dee0514a1e4c6a0f9 100644
--- a/paddle/fluid/operators/lod_reset_op.cu
+++ b/paddle/fluid/operators/lod_reset_op.cu
@@ -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/operators/lod_reset_op.h"
+#include "paddle/fluid/operators/lod_reset_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/lod_reset_op.h b/paddle/fluid/operators/lod_reset_op.h
index c1bbba7a83a3d63a94c54390cacbcdf773ab6b98..a10efee0bdd8c58d23c05bb85f0f882d801848fe 100644
--- a/paddle/fluid/operators/lod_reset_op.h
+++ b/paddle/fluid/operators/lod_reset_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lod_tensor_to_array_op.cc b/paddle/fluid/operators/lod_tensor_to_array_op.cc
index 685a807a8acafd36f44161fb17e0e88070d0bf43..edc32bcec1441e50e24612789727db9a044cde54 100644
--- a/paddle/fluid/operators/lod_tensor_to_array_op.cc
+++ b/paddle/fluid/operators/lod_tensor_to_array_op.cc
@@ -11,11 +11,11 @@ distributed under the License is distributed on an "AS IS" BASIS,
 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/lod_rank_table.h"
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/detail/safe_ref.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/log_loss_op.cc b/paddle/fluid/operators/log_loss_op.cc
index f714945354c5668f58e273dc8d6c7c16d51ac17d..6c5cd2956811329a1ac5da9e42e808c2684dc771 100644
--- a/paddle/fluid/operators/log_loss_op.cc
+++ b/paddle/fluid/operators/log_loss_op.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/operators/log_loss_op.h"
+#include "paddle/fluid/operators/log_loss_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/log_loss_op.cu b/paddle/fluid/operators/log_loss_op.cu
index be283e470052cc3a569be564ab4baa6bc5b75808..c164a6d04056c2e9d9302b609c1ff4f2b2c4a3f3 100644
--- a/paddle/fluid/operators/log_loss_op.cu
+++ b/paddle/fluid/operators/log_loss_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/log_loss_op.h"
+#include "paddle/fluid/operators/log_loss_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/log_loss_op.h b/paddle/fluid/operators/log_loss_op.h
index 743eddb74004b5e87ed9b8a6ccb1b8496b8548dc..67fac7cfe55d1d50063afac925863a8fb2eb63a8 100644
--- a/paddle/fluid/operators/log_loss_op.h
+++ b/paddle/fluid/operators/log_loss_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/logical_op.cc b/paddle/fluid/operators/logical_op.cc
index fedd325cf4f7b5a779d17e0259a16d5cf39b77b7..ff49895df1979bde9dc9f9c7b92601a2a65241da 100644
--- a/paddle/fluid/operators/logical_op.cc
+++ b/paddle/fluid/operators/logical_op.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/operators/logical_op.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/operators/logical_op.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/logical_op.cu b/paddle/fluid/operators/logical_op.cu
index 87f2287b8f11aabe8afe87776eff49295c1ea2ac..2b17444061252b714cd9bbaadc7fcf877628ef89 100644
--- a/paddle/fluid/operators/logical_op.cu
+++ b/paddle/fluid/operators/logical_op.cu
@@ -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/operators/logical_op.h"
+#include "paddle/fluid/operators/logical_op.h"
 
 REGISTER_BINARY_LOGICAL_KERNEL(logical_and, CUDA,
                                paddle::operators::LogicalAndFunctor);
diff --git a/paddle/fluid/operators/logical_op.h b/paddle/fluid/operators/logical_op.h
index 413857685603c7b84e885135d9aadf7cc71a4f72..f6d5866c2c8e4ce54e9556a1acf69414dba523d2 100644
--- a/paddle/fluid/operators/logical_op.h
+++ b/paddle/fluid/operators/logical_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 #include <math.h>
 #include <type_traits>
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lookup_table_op.cc b/paddle/fluid/operators/lookup_table_op.cc
index 2405852f53d46356a474897d3a111d1c94eed081..2c555f1a3fa228215812b7d3291e882b0d42bb64 100644
--- a/paddle/fluid/operators/lookup_table_op.cc
+++ b/paddle/fluid/operators/lookup_table_op.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/operators/lookup_table_op.h"
-#include "paddle/framework/var_type_inference.h"
+#include "paddle/fluid/operators/lookup_table_op.h"
+#include "paddle/fluid/framework/var_type_inference.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lookup_table_op.cu b/paddle/fluid/operators/lookup_table_op.cu
index 9684b6d4612c8e134ccad658840bd028a8508085..801adba5a440ebda9506717603e8f9665ea9e6ba 100644
--- a/paddle/fluid/operators/lookup_table_op.cu
+++ b/paddle/fluid/operators/lookup_table_op.cu
@@ -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/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/lookup_table_op.h"
-#include "paddle/platform/assert.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/lookup_table_op.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lookup_table_op.h b/paddle/fluid/operators/lookup_table_op.h
index 0842c422f7bfd3cad9b36dfdbab930f3cc4a8728..d264496882a9e1828953d843d4a18fe4c16b1d24 100644
--- a/paddle/fluid/operators/lookup_table_op.h
+++ b/paddle/fluid/operators/lookup_table_op.h
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/selected_rows.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/selected_rows.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lrn_op.cc b/paddle/fluid/operators/lrn_op.cc
index 95673ba19e776b3c52eb492d0b14d761b584f807..c84507f231c6d3c4c5d6e33719fafc2752876f03 100644
--- a/paddle/fluid/operators/lrn_op.cc
+++ b/paddle/fluid/operators/lrn_op.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/operators/lrn_op.h"
+#include "paddle/fluid/operators/lrn_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lrn_op.cu b/paddle/fluid/operators/lrn_op.cu
index eb9d66a73dfe3e22f1151d73ce5e34f2eda0835e..03112bf3e03595a521c22cd914f414f026970c10 100644
--- a/paddle/fluid/operators/lrn_op.cu
+++ b/paddle/fluid/operators/lrn_op.cu
@@ -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/operators/lrn_op.h"
+#include "paddle/fluid/operators/lrn_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lrn_op.h b/paddle/fluid/operators/lrn_op.h
index ef3a2883a88ff321fb9a87ddaf31123a3b9ee90a..b7b78b459145bae5483e3f12b3d872c679823740 100644
--- a/paddle/fluid/operators/lrn_op.h
+++ b/paddle/fluid/operators/lrn_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lstm_op.cc b/paddle/fluid/operators/lstm_op.cc
index afb095a04e73c2f09b828c01630ef2347ff49613..d1f1b5f235f991e7a4d84c815bc5dda74ab64752 100644
--- a/paddle/fluid/operators/lstm_op.cc
+++ b/paddle/fluid/operators/lstm_op.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/operators/lstm_op.h"
+#include "paddle/fluid/operators/lstm_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lstm_op.cu.cc b/paddle/fluid/operators/lstm_op.cu.cc
index cfcc1fc92a074c9bfe83e6c32560177edef12ae9..679d02b1f9a1d1f0313b5c8109285c92734e3e5a 100644
--- a/paddle/fluid/operators/lstm_op.cu.cc
+++ b/paddle/fluid/operators/lstm_op.cu.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/operators/lstm_op.h"
+#include "paddle/fluid/operators/lstm_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/lstm_op.h b/paddle/fluid/operators/lstm_op.h
index 72e95b75e29c88c5944607ceaa40435bac7a745c..1c48495533cf5dbf1f46176cff936f7f988a3d48 100644
--- a/paddle/fluid/operators/lstm_op.h
+++ b/paddle/fluid/operators/lstm_op.h
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/operators/math/lstm_compute.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/sequence2batch.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/lstm_compute.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence2batch.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lstm_unit_op.cc b/paddle/fluid/operators/lstm_unit_op.cc
index c2d2c43982580c9724849d68576d42ffa44fc6b4..3d33d47e0c3ba8b83be2c06e9884d90e9bb1012e 100644
--- a/paddle/fluid/operators/lstm_unit_op.cc
+++ b/paddle/fluid/operators/lstm_unit_op.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/operators/lstm_unit_op.h"
+#include "paddle/fluid/operators/lstm_unit_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lstm_unit_op.cu b/paddle/fluid/operators/lstm_unit_op.cu
index 5ee5ddd280f7720c4583053e4e48a5043ab423f4..12ebffca37f995111bbeb2a1e8b30ea2fe35c74d 100644
--- a/paddle/fluid/operators/lstm_unit_op.cu
+++ b/paddle/fluid/operators/lstm_unit_op.cu
@@ -16,10 +16,10 @@ limitations under the License. */
 https://github.com/caffe2/caffe2/blob/master/caffe2/operators/lstm_unit_op_gpu.cu
 */
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/cross_entropy_op.h"
-#include "paddle/platform/assert.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/cross_entropy_op.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lstm_unit_op.h b/paddle/fluid/operators/lstm_unit_op.h
index fa8d141bcb6ee4bfc9a29e337b7adbc5ecd3ad23..9f2370fe690a45f49c0138fbd1303d7bfd6dacd0 100644
--- a/paddle/fluid/operators/lstm_unit_op.h
+++ b/paddle/fluid/operators/lstm_unit_op.h
@@ -18,7 +18,7 @@ https://github.com/caffe2/caffe2/blob/master/caffe2/operators/lstm_unit_op.h
 
 #pragma once
 #include "glog/logging.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lstmp_op.cc b/paddle/fluid/operators/lstmp_op.cc
index c96b30ba353fabc48630258ea8f88f741b8c415e..2d30edf5c3cbabe7223a459a5f60b7b9aa51af9a 100644
--- a/paddle/fluid/operators/lstmp_op.cc
+++ b/paddle/fluid/operators/lstmp_op.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/operators/lstmp_op.h"
+#include "paddle/fluid/operators/lstmp_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/lstmp_op.cu b/paddle/fluid/operators/lstmp_op.cu
index 7fcbcfecc871976fdfbfffbbb4e0243b91351a29..bcefb94c75b8577fefb1ee3b440dc5fb045562d5 100644
--- a/paddle/fluid/operators/lstmp_op.cu
+++ b/paddle/fluid/operators/lstmp_op.cu
@@ -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/operators/lstmp_op.h"
+#include "paddle/fluid/operators/lstmp_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/lstmp_op.h b/paddle/fluid/operators/lstmp_op.h
index e064a155dfadd8104fa80727a962cb2e24ade29f..22ef4721860a493fded98cf32b40a2aceb851a5c 100644
--- a/paddle/fluid/operators/lstmp_op.h
+++ b/paddle/fluid/operators/lstmp_op.h
@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/operators/activation_op.h"
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/operators/math/lstm_compute.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/sequence2batch.h"
-
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/operators/activation_op.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/lstm_compute.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence2batch.h"
+
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/margin_rank_loss_op.cc b/paddle/fluid/operators/margin_rank_loss_op.cc
index e0df3077742bc330ce8510bf06b0411148f669d8..fc31befb20526e84aae1804756d2d44a785aa229 100644
--- a/paddle/fluid/operators/margin_rank_loss_op.cc
+++ b/paddle/fluid/operators/margin_rank_loss_op.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/operators/margin_rank_loss_op.h"
+#include "paddle/fluid/operators/margin_rank_loss_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/margin_rank_loss_op.cu b/paddle/fluid/operators/margin_rank_loss_op.cu
index 798c3ed182b08b07a779da88924bfc05743c680e..ca4593a48d6d3eccff81dfd621ea1198e5bad880 100644
--- a/paddle/fluid/operators/margin_rank_loss_op.cu
+++ b/paddle/fluid/operators/margin_rank_loss_op.cu
@@ -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/operators/margin_rank_loss_op.h"
+#include "paddle/fluid/operators/margin_rank_loss_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/margin_rank_loss_op.h b/paddle/fluid/operators/margin_rank_loss_op.h
index 7438e881e1c69c9ef1f84b21e6ee0ba093f3378a..934a5da0f804f7cf7dc176a9ee4e1b72261ef008 100644
--- a/paddle/fluid/operators/margin_rank_loss_op.h
+++ b/paddle/fluid/operators/margin_rank_loss_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/context_project.cc b/paddle/fluid/operators/math/context_project.cc
index 980dd90df8710cdbcb760e1ca84f1492a76fdb70..b73d976d1b3e6dcf99e5cc525263282b1253c600 100644
--- a/paddle/fluid/operators/math/context_project.cc
+++ b/paddle/fluid/operators/math/context_project.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/operators/math/context_project.h"
+#include "paddle/fluid/operators/math/context_project.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/context_project.cu b/paddle/fluid/operators/math/context_project.cu
index 934e3df645916013b4d1fe5eb4a19be924c914d5..bbd36a6e8f54833f15ee0c991228c10b7f74f272 100644
--- a/paddle/fluid/operators/math/context_project.cu
+++ b/paddle/fluid/operators/math/context_project.cu
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/math/context_project.h"
+#include "paddle/fluid/operators/math/context_project.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/context_project.h b/paddle/fluid/operators/math/context_project.h
index 218de9fb9564fa0fa30227a6710f57bb89f1a2c8..2fe593ec3af9d07a2cbafc69e8d3a52e2c43e76b 100644
--- a/paddle/fluid/operators/math/context_project.h
+++ b/paddle/fluid/operators/math/context_project.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/operators/math/im2col.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/operators/math/im2col.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/cos_sim_functor.cc b/paddle/fluid/operators/math/cos_sim_functor.cc
index 6af9f0fcd967b4e8e9e338c155d5a8ee2866fbfa..701a9c23c0da3afbb643e9a821b7b74e69170710 100644
--- a/paddle/fluid/operators/math/cos_sim_functor.cc
+++ b/paddle/fluid/operators/math/cos_sim_functor.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/operators/math/cos_sim_functor.h"
+#include "paddle/fluid/operators/math/cos_sim_functor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/cos_sim_functor.cu b/paddle/fluid/operators/math/cos_sim_functor.cu
index 6eb0a4ea4c5b86f84c93b97615255adf55e9e042..0323680870ad835afca5a896f80d3abde0aad11c 100644
--- a/paddle/fluid/operators/math/cos_sim_functor.cu
+++ b/paddle/fluid/operators/math/cos_sim_functor.cu
@@ -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/operators/math/cos_sim_functor.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/cos_sim_functor.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/cos_sim_functor.h b/paddle/fluid/operators/math/cos_sim_functor.h
index aae8ab5b7a937c016e8a45e34b22aba7a1df3066..445d94f975f3448cc09c21be8e0a13d73d002382 100644
--- a/paddle/fluid/operators/math/cos_sim_functor.h
+++ b/paddle/fluid/operators/math/cos_sim_functor.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 #include <math.h>
 #include <stdlib.h>
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/cross_entropy.cc b/paddle/fluid/operators/math/cross_entropy.cc
index d9cb016fb440b6b2fe1d222812215feb5970dc4f..76abd03ff8b75e595461f41301c41ffe57d78686 100644
--- a/paddle/fluid/operators/math/cross_entropy.cc
+++ b/paddle/fluid/operators/math/cross_entropy.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/operators/math/cross_entropy.h"
+#include "paddle/fluid/operators/math/cross_entropy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/cross_entropy.cu b/paddle/fluid/operators/math/cross_entropy.cu
index 16c9e7b28ec8d453492455c8d620ba9edf130a07..39222c484c2fe847aec70b65d3d01745b8eea336 100644
--- a/paddle/fluid/operators/math/cross_entropy.cu
+++ b/paddle/fluid/operators/math/cross_entropy.cu
@@ -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/operators/math/cross_entropy.h"
+#include "paddle/fluid/operators/math/cross_entropy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/cross_entropy.h b/paddle/fluid/operators/math/cross_entropy.h
index b3b6d767a8b8f59e3c75e72ac6c98653a8e1c3a4..2fe216a805383ae0d7e8d008af2838652fcf87c6 100644
--- a/paddle/fluid/operators/math/cross_entropy.h
+++ b/paddle/fluid/operators/math/cross_entropy.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/depthwise_conv.cu b/paddle/fluid/operators/math/depthwise_conv.cu
index b212e78208355866516211d276cb8046623babd7..7b75e593071eaeb72bcfc687b6ff22b7cf4f143f 100644
--- a/paddle/fluid/operators/math/depthwise_conv.cu
+++ b/paddle/fluid/operators/math/depthwise_conv.cu
@@ -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/operators/math/depthwise_conv.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/depthwise_conv.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/depthwise_conv.h b/paddle/fluid/operators/math/depthwise_conv.h
index 4708920bb42db90d84fda0c6a1039991cb79e80d..c3081e7a0deb4afc47d826753ecb2556aa6f4522 100644
--- a/paddle/fluid/operators/math/depthwise_conv.h
+++ b/paddle/fluid/operators/math/depthwise_conv.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/detail/activation_functions.h b/paddle/fluid/operators/math/detail/activation_functions.h
index 585a0123437a39c2b610306b18fe0a970c0ed072..3af7ba790c489b2fc34b3cb6d56849ce789d2430 100644
--- a/paddle/fluid/operators/math/detail/activation_functions.h
+++ b/paddle/fluid/operators/math/detail/activation_functions.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include <math.h>
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 #ifdef __AVX__
 #include <immintrin.h>
diff --git a/paddle/fluid/operators/math/detail/avx_functions.cc b/paddle/fluid/operators/math/detail/avx_functions.cc
index 921364788cd23e265fa0ca027bf1af3f81604489..838cd30e3d503ddb4734f1114e741fd40b1939c0 100644
--- a/paddle/fluid/operators/math/detail/avx_functions.cc
+++ b/paddle/fluid/operators/math/detail/avx_functions.cc
@@ -15,7 +15,7 @@ limitations under the License. */
 #ifdef __AVX__
 
 #include <immintrin.h>
-#include "paddle/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
 // TODO(qingqing) refine this dependence
 #include "paddle/cuda/src/avx_mathfun.h"
 
diff --git a/paddle/fluid/operators/math/detail/gru_cpu_kernel.h b/paddle/fluid/operators/math/detail/gru_cpu_kernel.h
index a61b232f4275d93cae1d9a71d49a779216c3555b..75c5c8eb29a34047a22779edcc0fc2f5fbcbab6f 100644
--- a/paddle/fluid/operators/math/detail/gru_cpu_kernel.h
+++ b/paddle/fluid/operators/math/detail/gru_cpu_kernel.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include <type_traits>
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/operators/math/gru_compute.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/gru_compute.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/detail/gru_gpu_kernel.h b/paddle/fluid/operators/math/detail/gru_gpu_kernel.h
index 1783d46096858c874b27ce75760342082835b180..fbf69d4a85883a68f137945ed8978acb9108b77b 100644
--- a/paddle/fluid/operators/math/detail/gru_gpu_kernel.h
+++ b/paddle/fluid/operators/math/detail/gru_gpu_kernel.h
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #pragma once
 #include <type_traits>
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/operators/math/gru_compute.h"
-#include "paddle/platform/cuda_helper.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/gru_compute.h"
+#include "paddle/fluid/platform/cuda_helper.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/detail/gru_kernel.h b/paddle/fluid/operators/math/detail/gru_kernel.h
index 4d8245cb5d03b33edbda5d8350be02b4fa87ab95..705787e2ff76630fbcb23e646c91f74fa2feea24 100644
--- a/paddle/fluid/operators/math/detail/gru_kernel.h
+++ b/paddle/fluid/operators/math/detail/gru_kernel.h
@@ -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/operators/math/detail/activation_functions.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 #include <type_traits>
 
diff --git a/paddle/fluid/operators/math/detail/lstm_cpu_kernel.h b/paddle/fluid/operators/math/detail/lstm_cpu_kernel.h
index 42888fcdb0a464892e3007ee73c195fcd2a431bb..bf26509ba17774f55c4f7592ff3afb7bcfcaa336 100644
--- a/paddle/fluid/operators/math/detail/lstm_cpu_kernel.h
+++ b/paddle/fluid/operators/math/detail/lstm_cpu_kernel.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include <type_traits>
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/operators/math/lstm_compute.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/lstm_compute.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/detail/lstm_gpu_kernel.h b/paddle/fluid/operators/math/detail/lstm_gpu_kernel.h
index e31e657e8b6964c2b99f6e456545c83d8da8e7f9..7865d0c0ba12c6150d87ea22e9c597e90b57e1ba 100644
--- a/paddle/fluid/operators/math/detail/lstm_gpu_kernel.h
+++ b/paddle/fluid/operators/math/detail/lstm_gpu_kernel.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/operators/math/lstm_compute.h"
-#include "paddle/platform/cuda_helper.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/operators/math/lstm_compute.h"
+#include "paddle/fluid/platform/cuda_helper.h"
+#include "paddle/fluid/platform/device_context.h"
 
 #include <type_traits>
 
diff --git a/paddle/fluid/operators/math/detail/lstm_kernel.h b/paddle/fluid/operators/math/detail/lstm_kernel.h
index fed8f9c4ca48905ad4c524ba400e8c7bb2f7fbd1..0679cc62ba91fce540d9f6e227729a96a1553173 100644
--- a/paddle/fluid/operators/math/detail/lstm_kernel.h
+++ b/paddle/fluid/operators/math/detail/lstm_kernel.h
@@ -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/operators/math/detail/activation_functions.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 #include <type_traits>
 
diff --git a/paddle/fluid/operators/math/detection_util.h b/paddle/fluid/operators/math/detection_util.h
index e3a3ef2badc37924d866ded8ee7a7338fbc4b2d2..13e5d406c11a10dc87533a2ca07d14f4684446f5 100644
--- a/paddle/fluid/operators/math/detection_util.h
+++ b/paddle/fluid/operators/math/detection_util.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #pragma once
 #include <map>
-#include "paddle/framework/selected_rows.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/gru_compute.cc b/paddle/fluid/operators/math/gru_compute.cc
index 101ab859624869bf34d171cd42d46d0c5bdac29c..100318041679e38b37fd1ef1f071d4e682889756 100644
--- a/paddle/fluid/operators/math/gru_compute.cc
+++ b/paddle/fluid/operators/math/gru_compute.cc
@@ -9,10 +9,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/operators/math/gru_compute.h"
-#include "paddle/operators/math/detail/gru_cpu_kernel.h"
-#include "paddle/operators/math/detail/gru_kernel.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/gru_compute.h"
+#include "paddle/fluid/operators/math/detail/gru_cpu_kernel.h"
+#include "paddle/fluid/operators/math/detail/gru_kernel.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/gru_compute.cu b/paddle/fluid/operators/math/gru_compute.cu
index d5a0e630ea0eadea990988c3170395c842a91900..0d5d5d7a743150c397a5b8356d1b3add88c509b6 100644
--- a/paddle/fluid/operators/math/gru_compute.cu
+++ b/paddle/fluid/operators/math/gru_compute.cu
@@ -9,10 +9,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/operators/math/detail/gru_gpu_kernel.h"
-#include "paddle/operators/math/detail/gru_kernel.h"
-#include "paddle/operators/math/gru_compute.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/detail/gru_gpu_kernel.h"
+#include "paddle/fluid/operators/math/detail/gru_kernel.h"
+#include "paddle/fluid/operators/math/gru_compute.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/gru_compute.h b/paddle/fluid/operators/math/gru_compute.h
index bf69147b506661692a6d71823043cd3506ea8b5d..93e19cf55782facfd95affdc77dcf78c511d8bbd 100644
--- a/paddle/fluid/operators/math/gru_compute.h
+++ b/paddle/fluid/operators/math/gru_compute.h
@@ -11,9 +11,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/im2col.cc b/paddle/fluid/operators/math/im2col.cc
index c2633b2e16434558d16f699a701e7b8cf1de8342..c298b00bb4cb9df8f9a54b4420edb07aed9cf891 100644
--- a/paddle/fluid/operators/math/im2col.cc
+++ b/paddle/fluid/operators/math/im2col.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/operators/math/im2col.h"
+#include "paddle/fluid/operators/math/im2col.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/im2col.cu b/paddle/fluid/operators/math/im2col.cu
index a88e837b030f286cce272f99ad7991c70336e4a9..c26343aacf524c4381a8bba1e4e0d1a07bee6d6e 100644
--- a/paddle/fluid/operators/math/im2col.cu
+++ b/paddle/fluid/operators/math/im2col.cu
@@ -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/operators/math/im2col.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/im2col.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/im2col.h b/paddle/fluid/operators/math/im2col.h
index 38f2c9fe0adf80a2a4355a45bebb9ba0f341d1ab..525c0f5dda102ef92a9d79832fecc10f99ccd900 100644
--- a/paddle/fluid/operators/math/im2col.h
+++ b/paddle/fluid/operators/math/im2col.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/tensor_util.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/tensor_util.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/im2col_test.cc b/paddle/fluid/operators/math/im2col_test.cc
index 1ba24325ffe3922081f59abfc1c67c95b514bcfa..59d6a84b892fc32aceb5622a856a5c648a3ade5b 100644
--- a/paddle/fluid/operators/math/im2col_test.cc
+++ b/paddle/fluid/operators/math/im2col_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/operators/math/im2col.h"
+#include "paddle/fluid/operators/math/im2col.h"
 #include <gtest/gtest.h>
 
 template <typename DeviceContext, typename Place>
diff --git a/paddle/fluid/operators/math/lstm_compute.cc b/paddle/fluid/operators/math/lstm_compute.cc
index d453102ecefc9d79e1f4474ba94be0eb69a87c85..09eb89ec58d107f547a5c83908a9d2a541aa95f4 100644
--- a/paddle/fluid/operators/math/lstm_compute.cc
+++ b/paddle/fluid/operators/math/lstm_compute.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/operators/math/lstm_compute.h"
-#include "paddle/operators/math/detail/lstm_cpu_kernel.h"
-#include "paddle/operators/math/detail/lstm_kernel.h"
+#include "paddle/fluid/operators/math/lstm_compute.h"
+#include "paddle/fluid/operators/math/detail/lstm_cpu_kernel.h"
+#include "paddle/fluid/operators/math/detail/lstm_kernel.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/lstm_compute.cu b/paddle/fluid/operators/math/lstm_compute.cu
index 82065d699f760db6cc86bf3d6c56e51c583c6ace..adedee28bd010c611b9c6901c55bf67e73d3639b 100644
--- a/paddle/fluid/operators/math/lstm_compute.cu
+++ b/paddle/fluid/operators/math/lstm_compute.cu
@@ -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/operators/math/detail/lstm_gpu_kernel.h"
-#include "paddle/operators/math/detail/lstm_kernel.h"
-#include "paddle/operators/math/lstm_compute.h"
+#include "paddle/fluid/operators/math/detail/lstm_gpu_kernel.h"
+#include "paddle/fluid/operators/math/detail/lstm_kernel.h"
+#include "paddle/fluid/operators/math/lstm_compute.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/lstm_compute.h b/paddle/fluid/operators/math/lstm_compute.h
index e1ad6b64d201ef99d83eaa2a821356008dcc9c8e..8610e96cf1abb0e5a64cd60c6bab3a8c08754587 100644
--- a/paddle/fluid/operators/math/lstm_compute.h
+++ b/paddle/fluid/operators/math/lstm_compute.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/math/detail/activation_functions.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/operators/math/detail/activation_functions.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/math_function.cc b/paddle/fluid/operators/math/math_function.cc
index ce0a5f6cff873166e3308a625978ecefaed2aa29..2636dbddde67955a99663aa93df1425b9e1ec2ce 100644
--- a/paddle/fluid/operators/math/math_function.cc
+++ b/paddle/fluid/operators/math/math_function.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/operators/math/math_function.h"
-#include "paddle/framework/data_type.h"
-#include "paddle/operators/math/math_function_impl.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/operators/math/math_function_impl.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/math_function.cu b/paddle/fluid/operators/math/math_function.cu
index c0a107470a4629506fc06dabc78a4a4716be6649..5764da71c8491e27493774569bb663f6a6e835c3 100644
--- a/paddle/fluid/operators/math/math_function.cu
+++ b/paddle/fluid/operators/math/math_function.cu
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/framework/data_type.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/math_function_impl.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function_impl.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/math_function.h b/paddle/fluid/operators/math/math_function.h
index cb14d1e57468564710640773fdabd41896c178e0..84916af1f8e5bd55920685b4897858f2da9fde92 100644
--- a/paddle/fluid/operators/math/math_function.h
+++ b/paddle/fluid/operators/math/math_function.h
@@ -47,11 +47,11 @@ int LAPACKE_dgetri(int matrix_layout, int n, double* a, int lda,
 
 #include <cmath>
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/tensor_util.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/tensor_util.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/math_function_impl.h b/paddle/fluid/operators/math/math_function_impl.h
index af4127788af0aaeb99199f7d6e2138a449b9fe51..a55ed6c58bafafed1d58ff47fb433a9ae58b8261 100644
--- a/paddle/fluid/operators/math/math_function_impl.h
+++ b/paddle/fluid/operators/math/math_function_impl.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/data_type.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/math_function_test.cc b/paddle/fluid/operators/math/math_function_test.cc
index c9f322b92e5476d889b57bcc91a0ce1d9e5339d5..6cd8e8b35abeb6d321bb075d7b88f0abd8f0fc59 100644
--- a/paddle/fluid/operators/math/math_function_test.cc
+++ b/paddle/fluid/operators/math/math_function_test.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/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 #include "gtest/gtest.h"
 
 TEST(math_function, gemm_notrans_cblas) {
diff --git a/paddle/fluid/operators/math/math_function_test.cu b/paddle/fluid/operators/math/math_function_test.cu
index 6f16d6679248a88425e1de487988e50ee8a469bf..2ef53a8209940e52390cfe52978f3b32b6dabae6 100644
--- a/paddle/fluid/operators/math/math_function_test.cu
+++ b/paddle/fluid/operators/math/math_function_test.cu
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 #include "gtest/gtest.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 TEST(math_function, notrans_mul_trans) {
   paddle::framework::Tensor input1;
diff --git a/paddle/fluid/operators/math/matmul.h b/paddle/fluid/operators/math/matmul.h
index ae7f1fe9be5066a0ac0ac522849d481fc66a19be..50f79979d99141c8074c55d2b767285dced49f60 100644
--- a/paddle/fluid/operators/math/matmul.h
+++ b/paddle/fluid/operators/math/matmul.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/maxouting.cc b/paddle/fluid/operators/math/maxouting.cc
index fea86675f75dad99a336d795d4561ae32d58c30a..746328cd45ada637132ac661c87f4ac4710aeaa4 100644
--- a/paddle/fluid/operators/math/maxouting.cc
+++ b/paddle/fluid/operators/math/maxouting.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/operators/math/maxouting.h"
+#include "paddle/fluid/operators/math/maxouting.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/maxouting.cu b/paddle/fluid/operators/math/maxouting.cu
index 6056ad251c12976fe9032f03aaaeb52727da1f42..68e5dfc3c551958c1f201341b8a704d9306ef150 100644
--- a/paddle/fluid/operators/math/maxouting.cu
+++ b/paddle/fluid/operators/math/maxouting.cu
@@ -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/operators/math/maxouting.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/maxouting.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/maxouting.h b/paddle/fluid/operators/math/maxouting.h
index 68f4743db07af0f369eb18f1a7cb6e326d469e85..0e81790f0aba422f6676cd329def95a642a12239 100644
--- a/paddle/fluid/operators/math/maxouting.h
+++ b/paddle/fluid/operators/math/maxouting.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/pooling.cc b/paddle/fluid/operators/math/pooling.cc
index 150de6fd59ef3ac0c4cb9160bf5afb1ce1064577..9adb142f14ea984c598855cf30838f0a1f2e5015 100644
--- a/paddle/fluid/operators/math/pooling.cc
+++ b/paddle/fluid/operators/math/pooling.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/operators/math/pooling.h"
+#include "paddle/fluid/operators/math/pooling.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/pooling.cu b/paddle/fluid/operators/math/pooling.cu
index 0243cf8316a2a83bfc4c091f64419574c1be2f5c..c65632de9066251a94ab3c32d4382d44f4120c2a 100644
--- a/paddle/fluid/operators/math/pooling.cu
+++ b/paddle/fluid/operators/math/pooling.cu
@@ -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/operators/math/pooling.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/pooling.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/pooling.h b/paddle/fluid/operators/math/pooling.h
index 2759f06cb6a51f7ceb6b8010d792030eb6ad5d3e..1195038f6a067fde776df8013a2a81e7003489a1 100644
--- a/paddle/fluid/operators/math/pooling.h
+++ b/paddle/fluid/operators/math/pooling.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/selected_rows_functor.cc b/paddle/fluid/operators/math/selected_rows_functor.cc
index 4e15d01a3071995e1412fed2a451e4ad3f171862..01aa37ab35ce906133f6195df5d7014b4fb23d16 100644
--- a/paddle/fluid/operators/math/selected_rows_functor.cc
+++ b/paddle/fluid/operators/math/selected_rows_functor.cc
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #include <set>
 
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/selected_rows_functor.cu b/paddle/fluid/operators/math/selected_rows_functor.cu
index 54a41a67d063fdc9e4453cb339d92d4a406cecc2..ee3b5d52058f7f04d5eeda1d033171f9eae0d772 100644
--- a/paddle/fluid/operators/math/selected_rows_functor.cu
+++ b/paddle/fluid/operators/math/selected_rows_functor.cu
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #include <set>
 
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/selected_rows_functor.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/selected_rows_functor.h b/paddle/fluid/operators/math/selected_rows_functor.h
index 09d4631905f90f78772368ad71b11826877bdc34..510a9ed8be6336448971de305279f607282f7658 100644
--- a/paddle/fluid/operators/math/selected_rows_functor.h
+++ b/paddle/fluid/operators/math/selected_rows_functor.h
@@ -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. */
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/selected_rows.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/platform/device_context.h"
 
 #define INLINE_FOR2(sizei, sizej)     \
   for (int64_t i = 0; i < sizei; i++) \
diff --git a/paddle/fluid/operators/math/selected_rows_functor_test.cc b/paddle/fluid/operators/math/selected_rows_functor_test.cc
index 8c74cab0a1e817f9e98fa682fe4122db7837aec9..db6b41cd52049a32239eca1a39cd730c11ddc2d8 100644
--- a/paddle/fluid/operators/math/selected_rows_functor_test.cc
+++ b/paddle/fluid/operators/math/selected_rows_functor_test.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/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
 #include "gtest/gtest.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 TEST(selected_rows_functor, cpu_add) {
   using namespace paddle::framework;
diff --git a/paddle/fluid/operators/math/selected_rows_functor_test.cu b/paddle/fluid/operators/math/selected_rows_functor_test.cu
index 38808e13014c581fb3d10c3e712f1dd1fa6523e2..b3c4bc9244f9ca1771c5f435788cf3789d7c4574 100644
--- a/paddle/fluid/operators/math/selected_rows_functor_test.cu
+++ b/paddle/fluid/operators/math/selected_rows_functor_test.cu
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "gtest/gtest.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
 
 TEST(selected_rows_functor, gpu_add) {
   using namespace paddle::framework;
diff --git a/paddle/fluid/operators/math/sequence2batch.cc b/paddle/fluid/operators/math/sequence2batch.cc
index 17abce1c2f809f75edb2c5dc46709094c2ce10c3..0485070fd9b722bdf9011452b2545e065f46d2ac 100644
--- a/paddle/fluid/operators/math/sequence2batch.cc
+++ b/paddle/fluid/operators/math/sequence2batch.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/operators/math/sequence2batch.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence2batch.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence2batch.cu b/paddle/fluid/operators/math/sequence2batch.cu
index eaed2c30a80c75d56aef329f6e6f67b8bac3520a..450be80ea2fe67aa0e537f06e15f07b38c5751ea 100644
--- a/paddle/fluid/operators/math/sequence2batch.cu
+++ b/paddle/fluid/operators/math/sequence2batch.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/math/sequence2batch.h"
+#include "paddle/fluid/operators/math/sequence2batch.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence2batch.h b/paddle/fluid/operators/math/sequence2batch.h
index 6db0427b4174a09dd254d771e8d3d215cc6571a9..00bd25ab613b198e539368f3233d71618dfc758f 100644
--- a/paddle/fluid/operators/math/sequence2batch.h
+++ b/paddle/fluid/operators/math/sequence2batch.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_padding.cc b/paddle/fluid/operators/math/sequence_padding.cc
index 2e69aa47eb8a060a6cac6588b2f37960898aba92..ad8cd825676c77cc204bbb02f88f422d945f1a2c 100644
--- a/paddle/fluid/operators/math/sequence_padding.cc
+++ b/paddle/fluid/operators/math/sequence_padding.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/operators/math/sequence_padding.h"
+#include "paddle/fluid/operators/math/sequence_padding.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_padding.cu b/paddle/fluid/operators/math/sequence_padding.cu
index c2bd56448aa363160f6bf621ec67deff9e369c92..c1a390577840db2424185da19f5a5d2b231f25b6 100644
--- a/paddle/fluid/operators/math/sequence_padding.cu
+++ b/paddle/fluid/operators/math/sequence_padding.cu
@@ -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/operators/math/sequence_padding.h"
+#include "paddle/fluid/operators/math/sequence_padding.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_padding.h b/paddle/fluid/operators/math/sequence_padding.h
index 8f586c5eb469ea260dbdf9cc4e7f9b4b4a46a8cc..0d84f9dcb3802d82cd385957f66ffe28269b8dfc 100644
--- a/paddle/fluid/operators/math/sequence_padding.h
+++ b/paddle/fluid/operators/math/sequence_padding.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_padding_test.cc b/paddle/fluid/operators/math/sequence_padding_test.cc
index 3e504f4a15c2cb4e2380f5ff8a39d83626dae062..147cb37da2bbb1bad6fc423b3936a1446e17de15 100644
--- a/paddle/fluid/operators/math/sequence_padding_test.cc
+++ b/paddle/fluid/operators/math/sequence_padding_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/operators/math/sequence_padding.h"
+#include "paddle/fluid/operators/math/sequence_padding.h"
 #include <gtest/gtest.h>
 
 template <typename DeviceContext, typename Place, typename T>
diff --git a/paddle/fluid/operators/math/sequence_pooling.cc b/paddle/fluid/operators/math/sequence_pooling.cc
index 8fb92b1a130b8f25163d856f3f596136072180cf..b3b87ec93e19c4dcf99fbacf8f882f9f065430de 100644
--- a/paddle/fluid/operators/math/sequence_pooling.cc
+++ b/paddle/fluid/operators/math/sequence_pooling.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/operators/math/sequence_pooling.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence_pooling.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_pooling.cu b/paddle/fluid/operators/math/sequence_pooling.cu
index c69bd3da7e741d3113de63fe08d22c23f772dda4..c4267e992a78fd7e80a45ca1dcc1d81ca0f6e8f5 100644
--- a/paddle/fluid/operators/math/sequence_pooling.cu
+++ b/paddle/fluid/operators/math/sequence_pooling.cu
@@ -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/operators/math/math_function.h"
-#include "paddle/operators/math/sequence_pooling.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence_pooling.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_pooling.h b/paddle/fluid/operators/math/sequence_pooling.h
index 13ffb2ebef3a683b5e5fe64433a90237b944002e..9ba9cad74b54b3d0835ba5f89f6498f9309875cc 100644
--- a/paddle/fluid/operators/math/sequence_pooling.h
+++ b/paddle/fluid/operators/math/sequence_pooling.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_scale.cc b/paddle/fluid/operators/math/sequence_scale.cc
index 7e439e9a2cebaa5d494b185fd878e293a6895e45..427689b9718db6ed8cbb8525712404c1498faf20 100644
--- a/paddle/fluid/operators/math/sequence_scale.cc
+++ b/paddle/fluid/operators/math/sequence_scale.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/operators/math/sequence_scale.h"
+#include "paddle/fluid/operators/math/sequence_scale.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_scale.cu b/paddle/fluid/operators/math/sequence_scale.cu
index 7cb9242db932ba8b2490f528ee08bd3f4b4e8f83..7c081ed7f4547c4e1200ea7554f83696e404d021 100644
--- a/paddle/fluid/operators/math/sequence_scale.cu
+++ b/paddle/fluid/operators/math/sequence_scale.cu
@@ -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/operators/math/sequence_scale.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/sequence_scale.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/sequence_scale.h b/paddle/fluid/operators/math/sequence_scale.h
index ecd9a57c3f4d8d91bfb8933a0fd38355c227744d..e8e07fd3156cc516c904a1d3d510a7c6eed5b8a0 100644
--- a/paddle/fluid/operators/math/sequence_scale.h
+++ b/paddle/fluid/operators/math/sequence_scale.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/softmax.cc b/paddle/fluid/operators/math/softmax.cc
index 72f10f35f4ef39b41fbc5e900313eafd7ba669e9..eab31ec567d15a52661bf5ab2373819d8e1e7ddf 100644
--- a/paddle/fluid/operators/math/softmax.cc
+++ b/paddle/fluid/operators/math/softmax.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/operators/math/softmax.h"
-#include "paddle/operators/math/softmax_impl.h"
+#include "paddle/fluid/operators/math/softmax.h"
+#include "paddle/fluid/operators/math/softmax_impl.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/softmax.cu b/paddle/fluid/operators/math/softmax.cu
index 9e73f6a371c950ed6f81ee90216f7fd3899f73ce..733d7eeee6d08241783b8f854b25863f9b756c80 100644
--- a/paddle/fluid/operators/math/softmax.cu
+++ b/paddle/fluid/operators/math/softmax.cu
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/math/softmax.h"
-#include "paddle/operators/math/softmax_impl.h"
+#include "paddle/fluid/operators/math/softmax.h"
+#include "paddle/fluid/operators/math/softmax_impl.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/softmax.h b/paddle/fluid/operators/math/softmax.h
index 471f44d340cfd0d6305a9127c34289ef1663accb..b7d67d5f12d83f015297e75c730de27566e5489b 100644
--- a/paddle/fluid/operators/math/softmax.h
+++ b/paddle/fluid/operators/math/softmax.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/softmax_impl.h b/paddle/fluid/operators/math/softmax_impl.h
index 82f597ff792decb1760f59e693026cd453432d05..f7c61cb647e899e25f3d9806c993395e898794ab 100644
--- a/paddle/fluid/operators/math/softmax_impl.h
+++ b/paddle/fluid/operators/math/softmax_impl.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/tensor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/unpooling.cc b/paddle/fluid/operators/math/unpooling.cc
index ecd3a647e00655a57d11c2f082bd1f81822cf92b..e02bc02e0022b82085e29ac6c83677c0accfce49 100644
--- a/paddle/fluid/operators/math/unpooling.cc
+++ b/paddle/fluid/operators/math/unpooling.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/operators/math/unpooling.h"
+#include "paddle/fluid/operators/math/unpooling.h"
 namespace paddle {
 namespace operators {
 namespace math {
diff --git a/paddle/fluid/operators/math/unpooling.cu b/paddle/fluid/operators/math/unpooling.cu
index ecbde0f6a798ba817c28714b37af8187d2e9555e..2e74270fdf16b470ab6438a3283525c725b2d01b 100644
--- a/paddle/fluid/operators/math/unpooling.cu
+++ b/paddle/fluid/operators/math/unpooling.cu
@@ -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/operators/math/unpooling.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/unpooling.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/unpooling.h b/paddle/fluid/operators/math/unpooling.h
index 0f0ff1371ebea8c7501aee1c7c45bc6a79de397e..f245ba7ba873e7f217c577e0c895f9a8d48e9cdf 100644
--- a/paddle/fluid/operators/math/unpooling.h
+++ b/paddle/fluid/operators/math/unpooling.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/tensor.h"
+#include "paddle/fluid/framework/tensor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/vol2col.cc b/paddle/fluid/operators/math/vol2col.cc
index d574ed9234304d992a6e4a10fce0816aee7fa40a..ded0bbc74477656310cb4d464c5709173f20f505 100644
--- a/paddle/fluid/operators/math/vol2col.cc
+++ b/paddle/fluid/operators/math/vol2col.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/operators/math/vol2col.h"
+#include "paddle/fluid/operators/math/vol2col.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/vol2col.cu b/paddle/fluid/operators/math/vol2col.cu
index b029442fe48dd27232d322aadec5864760e1b9ff..35ef24c7f5ffe793a4aefe69807da5ffcf5ced4a 100644
--- a/paddle/fluid/operators/math/vol2col.cu
+++ b/paddle/fluid/operators/math/vol2col.cu
@@ -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/operators/math/vol2col.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/vol2col.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/vol2col.h b/paddle/fluid/operators/math/vol2col.h
index dcd80370e8516d34b764b1ab3b0b98516e738bf6..3ce38b2d11f7c64f1004a73ecfc7d85a5a6346ba 100644
--- a/paddle/fluid/operators/math/vol2col.h
+++ b/paddle/fluid/operators/math/vol2col.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/tensor.h"
-#include "paddle/framework/tensor_util.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/framework/tensor_util.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/math/vol2col_test.cc b/paddle/fluid/operators/math/vol2col_test.cc
index 7a308ca81403fb4ac65a7463102a91c050ab4561..af0a900f80e9bec2c5cfd0ec7dc66beabba049d7 100644
--- a/paddle/fluid/operators/math/vol2col_test.cc
+++ b/paddle/fluid/operators/math/vol2col_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/operators/math/vol2col.h"
+#include "paddle/fluid/operators/math/vol2col.h"
 #include <gtest/gtest.h>
 #include <iostream>
 
diff --git a/paddle/fluid/operators/matmul_op.cc b/paddle/fluid/operators/matmul_op.cc
index 3336978c8d8d94c69b986970274661a01ad2161d..267b0057bf4894705b7e6eddb8e2e2eaa5c18c8e 100644
--- a/paddle/fluid/operators/matmul_op.cc
+++ b/paddle/fluid/operators/matmul_op.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/operators/matmul_op.h"
+#include "paddle/fluid/operators/matmul_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/matmul_op.cu.cc b/paddle/fluid/operators/matmul_op.cu.cc
index d28d12164e493786c5bdafb157795d797ee87b91..988787f0fe40ccdb266327dbff400a72f5dc448b 100644
--- a/paddle/fluid/operators/matmul_op.cu.cc
+++ b/paddle/fluid/operators/matmul_op.cu.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/operators/matmul_op.h"
+#include "paddle/fluid/operators/matmul_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/matmul_op.h b/paddle/fluid/operators/matmul_op.h
index fe6a97465f8992281c909d4600bcfd8121d6a64a..f4cae3c91cb03980b915a70242e368852322b365 100644
--- a/paddle/fluid/operators/matmul_op.h
+++ b/paddle/fluid/operators/matmul_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/matmul.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/matmul.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/max_sequence_len_op.cc b/paddle/fluid/operators/max_sequence_len_op.cc
index 019150e4914e8bd34a5e8b7d37318aee43942fcc..eff8b927e52c94a4e19bb10c644cbaa34a7a0581 100644
--- a/paddle/fluid/operators/max_sequence_len_op.cc
+++ b/paddle/fluid/operators/max_sequence_len_op.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/lod_rank_table.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/maxout_op.cc b/paddle/fluid/operators/maxout_op.cc
index 3ee32269417e80cd14a6ff0f8e52c0b2dec4b8be..8ce12cd4c4d93327dfcf9eb40ae1ff429f703419 100644
--- a/paddle/fluid/operators/maxout_op.cc
+++ b/paddle/fluid/operators/maxout_op.cc
@@ -12,7 +12,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License. */
 
-#include "paddle/operators/maxout_op.h"
+#include "paddle/fluid/operators/maxout_op.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/maxout_op.cu.cc b/paddle/fluid/operators/maxout_op.cu.cc
index c4a2d676d3aca4d59d0bfa8c75aa0c249e202ab5..f3f45c90cde754bcbf985092c5cbf31f134a2eee 100644
--- a/paddle/fluid/operators/maxout_op.cu.cc
+++ b/paddle/fluid/operators/maxout_op.cu.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/operators/maxout_op.h"
+#include "paddle/fluid/operators/maxout_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/maxout_op.h b/paddle/fluid/operators/maxout_op.h
index e8b12552b9ff39e23702de17abc9825a527f02aa..e5de3e3760b99c9bde9dd86e8851dc2f65e4b2d2 100644
--- a/paddle/fluid/operators/maxout_op.h
+++ b/paddle/fluid/operators/maxout_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/maxouting.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/maxouting.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/mean_op.cc b/paddle/fluid/operators/mean_op.cc
index 411f4d14efbfa5a8ee6dd7da645a044b191bf006..1043820345a21cc3a7bbdf45d2914f9319c8e708 100644
--- a/paddle/fluid/operators/mean_op.cc
+++ b/paddle/fluid/operators/mean_op.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/operators/mean_op.h"
+#include "paddle/fluid/operators/mean_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/mean_op.cu b/paddle/fluid/operators/mean_op.cu
index 212d4481138c1478f6e3aa684008f9e42c5a3870..ccf2248760a551174953b8b55dc9a69454074885 100644
--- a/paddle/fluid/operators/mean_op.cu
+++ b/paddle/fluid/operators/mean_op.cu
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/mean_op.h"
+#include "paddle/fluid/operators/mean_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/mean_op.h b/paddle/fluid/operators/mean_op.h
index 351b34595974b1771d9f4ae5232e0b3a33491104..ae162287da6a5b9e826dec9552262e73468ee58a 100644
--- a/paddle/fluid/operators/mean_op.h
+++ b/paddle/fluid/operators/mean_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/merge_lod_tensor_op.cc b/paddle/fluid/operators/merge_lod_tensor_op.cc
index 87644d316d42c7d9453a99b759214b24088062df..255f55334093213df867852e4d222f0e227e8c5d 100644
--- a/paddle/fluid/operators/merge_lod_tensor_op.cc
+++ b/paddle/fluid/operators/merge_lod_tensor_op.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/op_registry.h"
-#include "paddle/memory/memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/memory/memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/mine_hard_examples_op.cc b/paddle/fluid/operators/mine_hard_examples_op.cc
index 051cc24706d69ec4f38524af1dd510bf079c74c7..73a6c0b679310ac4108a915836b5ed497853b38b 100644
--- a/paddle/fluid/operators/mine_hard_examples_op.cc
+++ b/paddle/fluid/operators/mine_hard_examples_op.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/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/minus_op.cc b/paddle/fluid/operators/minus_op.cc
index 3d7742dd4bc2a3c727279bc1e6c7dd47b96eefa3..8a35d668ccfa8a95cd41c4a943aad6ff915cc7dd 100644
--- a/paddle/fluid/operators/minus_op.cc
+++ b/paddle/fluid/operators/minus_op.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/operators/minus_op.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/minus_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/minus_op.cu b/paddle/fluid/operators/minus_op.cu
index 80cd9f7c16845904b7b46ae1597ce9558c32f46a..ce0b1fdc0419fead915511581270fb9984df9dc5 100644
--- a/paddle/fluid/operators/minus_op.cu
+++ b/paddle/fluid/operators/minus_op.cu
@@ -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/operators/minus_op.h"
+#include "paddle/fluid/operators/minus_op.h"
 
 REGISTER_OP_CUDA_KERNEL(
     minus,
diff --git a/paddle/fluid/operators/minus_op.h b/paddle/fluid/operators/minus_op.h
index 20760b8cd5bd2f74ed8469addda8f67f11f4545c..dc94cbbeca264536669716beb5318432ba9689a4 100644
--- a/paddle/fluid/operators/minus_op.h
+++ b/paddle/fluid/operators/minus_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/modified_huber_loss_op.cc b/paddle/fluid/operators/modified_huber_loss_op.cc
index f5d69071a86e3f8037840c091cf5b7683e4eeb96..f2d16531658d42556756e75895b7250a529f13df 100644
--- a/paddle/fluid/operators/modified_huber_loss_op.cc
+++ b/paddle/fluid/operators/modified_huber_loss_op.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/operators/modified_huber_loss_op.h"
+#include "paddle/fluid/operators/modified_huber_loss_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/modified_huber_loss_op.cu b/paddle/fluid/operators/modified_huber_loss_op.cu
index 3d2a5562e8cc2117b0b460496d9ba8e96823fbfb..69ac2b1ed546a4755cd4e8d52a7f8b98b4f0e7b9 100644
--- a/paddle/fluid/operators/modified_huber_loss_op.cu
+++ b/paddle/fluid/operators/modified_huber_loss_op.cu
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include <thrust/for_each.h>
 #include <thrust/tuple.h>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/modified_huber_loss_op.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/modified_huber_loss_op.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/modified_huber_loss_op.h b/paddle/fluid/operators/modified_huber_loss_op.h
index 6ce86feee574efca8811f316f47f1c3fbbdd0bf9..a470a45e13b55a33a8485cac2038ce1cc761a3f3 100644
--- a/paddle/fluid/operators/modified_huber_loss_op.h
+++ b/paddle/fluid/operators/modified_huber_loss_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/momentum_op.cc b/paddle/fluid/operators/momentum_op.cc
index 15b8b80776732f43c3ef4f8b80cffedf5c2a76fd..a3950ac99da93687596f62c6f020f4add1fb04ba 100644
--- a/paddle/fluid/operators/momentum_op.cc
+++ b/paddle/fluid/operators/momentum_op.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/operators/momentum_op.h"
+#include "paddle/fluid/operators/momentum_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/momentum_op.cu b/paddle/fluid/operators/momentum_op.cu
index 2b9314162e6f10b3791c913203c732d2822861ab..28a14cd4b219b86ba4922a3485b99c2c861a74d9 100644
--- a/paddle/fluid/operators/momentum_op.cu
+++ b/paddle/fluid/operators/momentum_op.cu
@@ -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/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/momentum_op.h b/paddle/fluid/operators/momentum_op.h
index da69532ea58bad8d3908770d82dbcc6e6b108fce..fdab86b24eefe15b85f4ca6a49e54ea67c1e7bdf 100644
--- a/paddle/fluid/operators/momentum_op.h
+++ b/paddle/fluid/operators/momentum_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/mul_op.cc b/paddle/fluid/operators/mul_op.cc
index c923e988a55b43ebb7ba6256e7b72a85c124f360..c9375d8ea1297f5201b6294f61119f6b5603d988 100644
--- a/paddle/fluid/operators/mul_op.cc
+++ b/paddle/fluid/operators/mul_op.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/operators/mul_op.h"
+#include "paddle/fluid/operators/mul_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/mul_op.cu.cc b/paddle/fluid/operators/mul_op.cu.cc
index 43de9a719499e4e0e8fd2e5fcc6771d717ce6522..6f605fd84fb802a079f9ed13afc032cc2d6c2b0c 100644
--- a/paddle/fluid/operators/mul_op.cu.cc
+++ b/paddle/fluid/operators/mul_op.cu.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/operators/mul_op.h"
+#include "paddle/fluid/operators/mul_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/mul_op.h b/paddle/fluid/operators/mul_op.h
index 1fb0569b49cce80c3f1e408fb57b5f5cf7033a27..745989f07f3646ab5d59f3d292030f3eb52dac49 100644
--- a/paddle/fluid/operators/mul_op.h
+++ b/paddle/fluid/operators/mul_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/multiclass_nms_op.cc b/paddle/fluid/operators/multiclass_nms_op.cc
index 41b9335fb8fc9ef5f5336bd8c63dc68bb94ff4f6..b2934f69cc9b2e50bdd5cbdf04deeaf5ca120e2c 100644
--- a/paddle/fluid/operators/multiclass_nms_op.cc
+++ b/paddle/fluid/operators/multiclass_nms_op.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/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/multiplex_op.cc b/paddle/fluid/operators/multiplex_op.cc
index d275fa5cbbfbf4a949d7bb16c3acc598543ba000..f89b00376ba7a759419fa60efe80575b6a8d1f2e 100644
--- a/paddle/fluid/operators/multiplex_op.cc
+++ b/paddle/fluid/operators/multiplex_op.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/operators/multiplex_op.h"
+#include "paddle/fluid/operators/multiplex_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/multiplex_op.cu b/paddle/fluid/operators/multiplex_op.cu
index 546e6e7a24d3653e9904706eac51c1b833f51463..3ef7ef1dfcd04d59573bc6c726fef757f5f2ce23 100644
--- a/paddle/fluid/operators/multiplex_op.cu
+++ b/paddle/fluid/operators/multiplex_op.cu
@@ -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/op_registry.h"
-#include "paddle/operators/multiplex_op.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/multiplex_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/multiplex_op.h b/paddle/fluid/operators/multiplex_op.h
index ef66be5556ee613a037de13286ecc66b53885c1f..682117cb1b4581560d6b4a615d97e2d18a91ffd6 100644
--- a/paddle/fluid/operators/multiplex_op.h
+++ b/paddle/fluid/operators/multiplex_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/memory/memcpy.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/memory/memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/nccl/nccl_gpu_common.cc b/paddle/fluid/operators/nccl/nccl_gpu_common.cc
index 1602a3d9b54dd64813770a7162f8d4f3dd0e791a..2a8ce932ec51a3d85ef04a2c07e08186929632f2 100644
--- a/paddle/fluid/operators/nccl/nccl_gpu_common.cc
+++ b/paddle/fluid/operators/nccl/nccl_gpu_common.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/operators/nccl/nccl_gpu_common.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/operators/nccl/nccl_gpu_common.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 namespace paddle {
 namespace platform {}  // namespace platform
diff --git a/paddle/fluid/operators/nccl/nccl_gpu_common.h b/paddle/fluid/operators/nccl/nccl_gpu_common.h
index 5173996f2020ec7a94643277e8c7a532d41d9045..6e78613239e6c401bad5aa80746000c5b47cd031 100644
--- a/paddle/fluid/operators/nccl/nccl_gpu_common.h
+++ b/paddle/fluid/operators/nccl/nccl_gpu_common.h
@@ -22,10 +22,10 @@ limitations under the License. */
 #include <unordered_map>
 #include <vector>
 
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/dynload/nccl.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/dynload/nccl.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/macros.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/operators/nccl_op.cc b/paddle/fluid/operators/nccl_op.cc
index 9d51153b0631b988c9297f395672be67e18ee3f9..52420ceba0de0323dae000aa301ce7838b3311b6 100644
--- a/paddle/fluid/operators/nccl_op.cc
+++ b/paddle/fluid/operators/nccl_op.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/op_registry.h"
-#include "paddle/operators/nccl/nccl_gpu_common.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/nccl/nccl_gpu_common.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/nccl_op.cu.cc b/paddle/fluid/operators/nccl_op.cu.cc
index 1b986a13650de7d77f4828d71798ee00d61c1284..333aed2903e7873aa799bd34468b2e05ef2e556c 100644
--- a/paddle/fluid/operators/nccl_op.cu.cc
+++ b/paddle/fluid/operators/nccl_op.cu.cc
@@ -11,9 +11,9 @@ limitations under the License. */
 
 #include <functional>
 
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/nccl/nccl_gpu_common.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/nccl/nccl_gpu_common.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/nccl_op_test.cu.cc b/paddle/fluid/operators/nccl_op_test.cu.cc
index 827a62534778e48c8d4f03d2634056b7d1392ae8..212ed2f9b63de5061dc3a2eb86508d8a4c305f89 100644
--- a/paddle/fluid/operators/nccl_op_test.cu.cc
+++ b/paddle/fluid/operators/nccl_op_test.cu.cc
@@ -21,17 +21,17 @@ limitations under the License. */
 #include <utility>
 #include <vector>
 
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/init.h"
-#include "paddle/framework/op_desc.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/program_desc.h"
-#include "paddle/framework/var_desc.h"
-#include "paddle/operators/nccl/nccl_gpu_common.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/gpu_info.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/framework/op_desc.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/program_desc.h"
+#include "paddle/fluid/framework/var_desc.h"
+#include "paddle/fluid/operators/nccl/nccl_gpu_common.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/gpu_info.h"
+#include "paddle/fluid/platform/place.h"
 
 USE_NO_KERNEL_OP(ncclInit);
 USE_CUDA_ONLY_OP(ncclAllReduce);
diff --git a/paddle/fluid/operators/nce_op.cc b/paddle/fluid/operators/nce_op.cc
index 994ddf717e7a5b883d8071c6a47da0b4b4074f2e..0841313a1042ea4099473fdc0293d9bae4a7c8c3 100644
--- a/paddle/fluid/operators/nce_op.cc
+++ b/paddle/fluid/operators/nce_op.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/operators/nce_op.h"
+#include "paddle/fluid/operators/nce_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/nce_op.h b/paddle/fluid/operators/nce_op.h
index 86fa13a649ce7fdcaad64e2609ceea2fb4d7e072..624c2d9bbd3245a11c8cfff2dd7cae6e5b25f106 100644
--- a/paddle/fluid/operators/nce_op.h
+++ b/paddle/fluid/operators/nce_op.h
@@ -16,8 +16,8 @@ limitations under the License. */
 
 #include <math.h>
 #include <random>
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 #include "unsupported/Eigen/CXX11/Tensor"
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/net_op.cc b/paddle/fluid/operators/net_op.cc
index 000e029840ceb842941f9cbad5758209b6fd4dd5..c0ca5873adcc92a39f20a162796e7581ea10c63f 100644
--- a/paddle/fluid/operators/net_op.cc
+++ b/paddle/fluid/operators/net_op.cc
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/net_op.h"
 #include <set>
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/net_op.h b/paddle/fluid/operators/net_op.h
index b24042f5ef5822eabcada8ed9d21c552579e8064..14e5909851c4ac08b5f59c5c193c801827b91234 100644
--- a/paddle/fluid/operators/net_op.h
+++ b/paddle/fluid/operators/net_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 
 #include <set>
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/net_op_test.cc b/paddle/fluid/operators/net_op_test.cc
index 9358f29f62fc21801f8036400d2baebdfd663a3a..cc20be0c81763abe2adcf09de858ce51e16d77a6 100644
--- a/paddle/fluid/operators/net_op_test.cc
+++ b/paddle/fluid/operators/net_op_test.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/operators/net_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 #include <gtest/gtest.h>
 
diff --git a/paddle/fluid/operators/norm_op.cc b/paddle/fluid/operators/norm_op.cc
index 0eeafcaae0a01ed7090800ecb06708773ede67aa..ee85b1a90a85f8c6ec57900c4c7d0dd319a0186a 100644
--- a/paddle/fluid/operators/norm_op.cc
+++ b/paddle/fluid/operators/norm_op.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/operators/norm_op.h"
+#include "paddle/fluid/operators/norm_op.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/norm_op.cu b/paddle/fluid/operators/norm_op.cu
index 2941c89b93141388d3746cf128848960ed6f3625..438bb3b86e79c526f70a23d3c7f6cc13f72e0463 100644
--- a/paddle/fluid/operators/norm_op.cu
+++ b/paddle/fluid/operators/norm_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/norm_op.h"
+#include "paddle/fluid/operators/norm_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/norm_op.h b/paddle/fluid/operators/norm_op.h
index 5759d6f1f07d50d4c65c93578ba7d7916a2d9b4e..db74c9b02a74afc6bd0e59da97e64a3e556b97dc 100644
--- a/paddle/fluid/operators/norm_op.h
+++ b/paddle/fluid/operators/norm_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/one_hot_op.cc b/paddle/fluid/operators/one_hot_op.cc
index e78b7468de4ea5f29378c2dc5905fdd36fb0ae2f..2c3a60da729d6f4edb8e7e3aa0c81cd3140855c0 100644
--- a/paddle/fluid/operators/one_hot_op.cc
+++ b/paddle/fluid/operators/one_hot_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/operators/one_hot_op.h"
-#include "paddle/framework/framework.pb.h"
+#include "paddle/fluid/operators/one_hot_op.h"
+#include "paddle/fluid/framework/framework.pb.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/one_hot_op.cu b/paddle/fluid/operators/one_hot_op.cu
index 16f6d9433eabd7be157ed57362a0d55d86c6ee92..6a8061edaab61661f57b17cd5e065c5c84edb906 100644
--- a/paddle/fluid/operators/one_hot_op.cu
+++ b/paddle/fluid/operators/one_hot_op.cu
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/operators/one_hot_op.h"
-#include "paddle/platform/cuda_helper.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/operators/one_hot_op.h"
+#include "paddle/fluid/platform/cuda_helper.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/one_hot_op.h b/paddle/fluid/operators/one_hot_op.h
index 12031ede2c3cd042a3d25003b714652b4d0d4453..ddac6edd0ec73a932dcf9c6ca7d7d63853467f1c 100644
--- a/paddle/fluid/operators/one_hot_op.h
+++ b/paddle/fluid/operators/one_hot_op.h
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/pad_op.cc b/paddle/fluid/operators/pad_op.cc
index 90c53bd17732aa046beceb3ac0a3b8c0d69994f3..4b021fde7cba699327e1874d569a14c3139a4c32 100644
--- a/paddle/fluid/operators/pad_op.cc
+++ b/paddle/fluid/operators/pad_op.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/operators/pad_op.h"
+#include "paddle/fluid/operators/pad_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/pad_op.cu b/paddle/fluid/operators/pad_op.cu
index 433b5f1112a27b36edbe6d99fcdd4fc8395bc2e8..203c31440371440b5e942452dab08978e2136275 100644
--- a/paddle/fluid/operators/pad_op.cu
+++ b/paddle/fluid/operators/pad_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/pad_op.h"
+#include "paddle/fluid/operators/pad_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/pad_op.h b/paddle/fluid/operators/pad_op.h
index fdf91a5776620485c38a8b2c5f8b26039e438d0c..244d8f9b6cf51ab249e991ed129e99da67ff9e62 100644
--- a/paddle/fluid/operators/pad_op.h
+++ b/paddle/fluid/operators/pad_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/parallel_do_op.cc b/paddle/fluid/operators/parallel_do_op.cc
index edb9de82509f9ee7619f5e90f49022de977a2ea4..e25df92479943d210d98f02374f377f778f43d2c 100644
--- a/paddle/fluid/operators/parallel_do_op.cc
+++ b/paddle/fluid/operators/parallel_do_op.cc
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #include <vector>
 
-#include "paddle/framework/executor.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/threadpool.h"
-#include "paddle/operators/detail/safe_ref.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/threadpool.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/pool_cudnn_op.cu.cc b/paddle/fluid/operators/pool_cudnn_op.cu.cc
index 446fb0819d98e0eb3d81bb202a67c55a23fc06b6..75984b7721c48526c6d11c4b82004dba1c166cc4 100644
--- a/paddle/fluid/operators/pool_cudnn_op.cu.cc
+++ b/paddle/fluid/operators/pool_cudnn_op.cu.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/op_registry.h"
-#include "paddle/operators/pool_op.h"
-#include "paddle/platform/cudnn_helper.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/pool_op.h"
+#include "paddle/fluid/platform/cudnn_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/pool_op.cc b/paddle/fluid/operators/pool_op.cc
index b97333bb1a13a0170c325520b86ac73e68282f91..9dd33eefc5fd18ba08dce5ea8dff791cda54332c 100644
--- a/paddle/fluid/operators/pool_op.cc
+++ b/paddle/fluid/operators/pool_op.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/operators/pool_op.h"
+#include "paddle/fluid/operators/pool_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/pool_op.cu.cc b/paddle/fluid/operators/pool_op.cu.cc
index 39a9dfbf794b3dbaf81e2435f8609014dc27f3af..14486c07402af387ee11a127ba193ac9ac36c8a2 100644
--- a/paddle/fluid/operators/pool_op.cu.cc
+++ b/paddle/fluid/operators/pool_op.cu.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/operators/pool_op.h"
+#include "paddle/fluid/operators/pool_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/pool_op.h b/paddle/fluid/operators/pool_op.h
index d6ba5e298a4939e31fde71bf5bf8484640a7ceaf..4cabd634d66e402282f17ed8724129a3e6e1ff43 100644
--- a/paddle/fluid/operators/pool_op.h
+++ b/paddle/fluid/operators/pool_op.h
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/pooling.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/pooling.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/pool_with_index_op.cc b/paddle/fluid/operators/pool_with_index_op.cc
index 1d31d813af4ec4eb829b906fa9add38cc71d54f3..ef6d5d867b2d38b3ca26deb1cbd9f16ca9846d0f 100644
--- a/paddle/fluid/operators/pool_with_index_op.cc
+++ b/paddle/fluid/operators/pool_with_index_op.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/operators/pool_with_index_op.h"
+#include "paddle/fluid/operators/pool_with_index_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/pool_with_index_op.cu.cc b/paddle/fluid/operators/pool_with_index_op.cu.cc
index 4c9804da639e3ad44f90963b53948cd8b755a6ac..722a4d1e2a4a4ad5c1268483db46e5e9d5d4a33b 100644
--- a/paddle/fluid/operators/pool_with_index_op.cu.cc
+++ b/paddle/fluid/operators/pool_with_index_op.cu.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/operators/pool_with_index_op.h"
+#include "paddle/fluid/operators/pool_with_index_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/pool_with_index_op.h b/paddle/fluid/operators/pool_with_index_op.h
index 4f4087d1dd36d6e91cdd9a9253dd72a71735e136..da7ef9df73a51aabc208521880168144de6f392c 100644
--- a/paddle/fluid/operators/pool_with_index_op.h
+++ b/paddle/fluid/operators/pool_with_index_op.h
@@ -14,10 +14,10 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/pooling.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/pooling.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/positive_negative_pair_op.cc b/paddle/fluid/operators/positive_negative_pair_op.cc
index 5aa5167dbb83c9caf2e754859938e51700d8ec3f..d237da25a00de13057e009b6705d3241b8b26539 100644
--- a/paddle/fluid/operators/positive_negative_pair_op.cc
+++ b/paddle/fluid/operators/positive_negative_pair_op.cc
@@ -9,7 +9,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/operators/positive_negative_pair_op.h"
+#include "paddle/fluid/operators/positive_negative_pair_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/positive_negative_pair_op.h b/paddle/fluid/operators/positive_negative_pair_op.h
index 977e59b7d2f771fc4c3412f0092f1eba92ef22da..f20f33bbeb19766d6974ea17b155cac363c01fb2 100644
--- a/paddle/fluid/operators/positive_negative_pair_op.h
+++ b/paddle/fluid/operators/positive_negative_pair_op.h
@@ -12,8 +12,8 @@ limitations under the License. */
 #pragma once
 #include <unordered_map>
 #include <vector>
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 #include "paddle/utils/Logging.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/precision_recall_op.cc b/paddle/fluid/operators/precision_recall_op.cc
index f1598d53cae2a58acd0207a20938b4f744ba0efe..30d594719c7274b90a88127028035a49c25e32e7 100644
--- a/paddle/fluid/operators/precision_recall_op.cc
+++ b/paddle/fluid/operators/precision_recall_op.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/operators/precision_recall_op.h"
+#include "paddle/fluid/operators/precision_recall_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/precision_recall_op.h b/paddle/fluid/operators/precision_recall_op.h
index c0d55405a362809f414b8dc3b12ed692f96c24e9..7dae86b76fc8d50e2ed5fe353920b68f7a846fb1 100644
--- a/paddle/fluid/operators/precision_recall_op.h
+++ b/paddle/fluid/operators/precision_recall_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/prelu_op.cc b/paddle/fluid/operators/prelu_op.cc
index ddc21a657024dcc800726475fa6242f8e6576ad1..22b970d971221e86a25e0b72f3d3704e5cee5d7f 100644
--- a/paddle/fluid/operators/prelu_op.cc
+++ b/paddle/fluid/operators/prelu_op.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/operators/prelu_op.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/prelu_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/prelu_op.cu b/paddle/fluid/operators/prelu_op.cu
index 1718bb5cd65f48eba391023e4374a30e405a164d..038b09a493c5064d5419260b2fbfdf56b6bb5982 100644
--- a/paddle/fluid/operators/prelu_op.cu
+++ b/paddle/fluid/operators/prelu_op.cu
@@ -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/operators/prelu_op.h"
+#include "paddle/fluid/operators/prelu_op.h"
 
 REGISTER_OP_CUDA_KERNEL(
     prelu,
diff --git a/paddle/fluid/operators/prelu_op.h b/paddle/fluid/operators/prelu_op.h
index 56f9a553ec12d5bfa745af63ec0570ad30910628..85ad75d479001ec5dad1b796d4932c7e6c4ab7af 100644
--- a/paddle/fluid/operators/prelu_op.h
+++ b/paddle/fluid/operators/prelu_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/print_op.cc b/paddle/fluid/operators/print_op.cc
index 8b233d64c904a8870212af33c5839cfc555b5dc8..3616545309e8c279f61a22e571a5e71335c47f93 100644
--- a/paddle/fluid/operators/print_op.cc
+++ b/paddle/fluid/operators/print_op.cc
@@ -15,8 +15,8 @@
 #include <algorithm>
 #include <ctime>
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/variable.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/variable.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/prior_box_op.cc b/paddle/fluid/operators/prior_box_op.cc
index 1dc4b288559d0294e5f58cc923ffc78b80604af9..ed48603e17f38f89705186fb9fb992f69d26d2ff 100644
--- a/paddle/fluid/operators/prior_box_op.cc
+++ b/paddle/fluid/operators/prior_box_op.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/operators/prior_box_op.h"
+#include "paddle/fluid/operators/prior_box_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/prior_box_op.h b/paddle/fluid/operators/prior_box_op.h
index 6b221cb74ebb306b99533f49c824ed6c60144ff2..fd07041233495660605e9cf9acb33d57eb57bc30 100644
--- a/paddle/fluid/operators/prior_box_op.h
+++ b/paddle/fluid/operators/prior_box_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/platform/transform.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/proximal_adagrad_op.cc b/paddle/fluid/operators/proximal_adagrad_op.cc
index b92f46b5bd4e48a25f8c87873c5df53f1753b71b..d9e3894c576a94c094c0f4b72e3b6519c4ec26e1 100644
--- a/paddle/fluid/operators/proximal_adagrad_op.cc
+++ b/paddle/fluid/operators/proximal_adagrad_op.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/operators/proximal_adagrad_op.h"
+#include "paddle/fluid/operators/proximal_adagrad_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/proximal_adagrad_op.cu b/paddle/fluid/operators/proximal_adagrad_op.cu
index 42a178f94b94c8e80ec8f9b5e6471b75878b65d1..54c75b3abb8e84b2aa55d044e79423cf86523d76 100644
--- a/paddle/fluid/operators/proximal_adagrad_op.cu
+++ b/paddle/fluid/operators/proximal_adagrad_op.cu
@@ -12,7 +12,7 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/proximal_adagrad_op.h"
+#include "paddle/fluid/operators/proximal_adagrad_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/proximal_adagrad_op.h b/paddle/fluid/operators/proximal_adagrad_op.h
index 523924d80e127d9ad2483e6b239fb948aa72200c..70205a8d11f757d08150a81d1369133778ad996c 100644
--- a/paddle/fluid/operators/proximal_adagrad_op.h
+++ b/paddle/fluid/operators/proximal_adagrad_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/proximal_gd_op.cc b/paddle/fluid/operators/proximal_gd_op.cc
index 2d3bbdaf320a4d6bdf18ec92230a81ad98371498..de7c6843c8ba7c1cc9229a11707de7a1400deee1 100644
--- a/paddle/fluid/operators/proximal_gd_op.cc
+++ b/paddle/fluid/operators/proximal_gd_op.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/operators/proximal_gd_op.h"
+#include "paddle/fluid/operators/proximal_gd_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/proximal_gd_op.cu b/paddle/fluid/operators/proximal_gd_op.cu
index b7dd840d19a13cd3329fb68563693a80d22291ca..97b672e872c99783ef4c0cd085e4b86380a06e10 100644
--- a/paddle/fluid/operators/proximal_gd_op.cu
+++ b/paddle/fluid/operators/proximal_gd_op.cu
@@ -12,7 +12,7 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/proximal_gd_op.h"
+#include "paddle/fluid/operators/proximal_gd_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/proximal_gd_op.h b/paddle/fluid/operators/proximal_gd_op.h
index 64648b3ccaf9615c995d65464607105d87c04198..8372380f25277e7774b72e144e00ea80e76a71e0 100644
--- a/paddle/fluid/operators/proximal_gd_op.h
+++ b/paddle/fluid/operators/proximal_gd_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/rank_loss_op.cc b/paddle/fluid/operators/rank_loss_op.cc
index f2164a0f80519ed9c2490ab3aa6809dc84c6070d..222ca73d2acfa8cc3d6fa6a3badce4606be9bcb0 100644
--- a/paddle/fluid/operators/rank_loss_op.cc
+++ b/paddle/fluid/operators/rank_loss_op.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/operators/rank_loss_op.h"
+#include "paddle/fluid/operators/rank_loss_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/rank_loss_op.cu b/paddle/fluid/operators/rank_loss_op.cu
index 294b22738347b17dd67df05291ac496bfb608323..1b182ced70d2a234237f1de822c3dc81047ebda7 100644
--- a/paddle/fluid/operators/rank_loss_op.cu
+++ b/paddle/fluid/operators/rank_loss_op.cu
@@ -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/operators/rank_loss_op.h"
+#include "paddle/fluid/operators/rank_loss_op.h"
 
 REGISTER_OP_CUDA_KERNEL(rank_loss,
                         paddle::operators::RankLossKernel<
diff --git a/paddle/fluid/operators/rank_loss_op.h b/paddle/fluid/operators/rank_loss_op.h
index bd0c49ca6e42bcb1a25c53421c0e672cecbb3a15..08bb2c28218e8c478af426b560efc9a4b6161696 100644
--- a/paddle/fluid/operators/rank_loss_op.h
+++ b/paddle/fluid/operators/rank_loss_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/read_op.cc b/paddle/fluid/operators/read_op.cc
index 3ae454101f585cf412a306fd3198f99fbdb8324d..4d562c291911f54c9d1e8fed2e84035808bffbb7 100644
--- a/paddle/fluid/operators/read_op.cc
+++ b/paddle/fluid/operators/read_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/reader.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/reader.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/recurrent_op.cc b/paddle/fluid/operators/recurrent_op.cc
index a136c5b447d7a64f783c00c928bf9e248aff6649..e4b9b8dab9b0394752d538aa5f59be3c06d0188f 100644
--- a/paddle/fluid/operators/recurrent_op.cc
+++ b/paddle/fluid/operators/recurrent_op.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <vector>
-#include "paddle/framework/executor.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/recv_op.cc b/paddle/fluid/operators/recv_op.cc
index ba71094219f37eb7a3c2df68be986cec7afbf7ab..c093f60ceed4171ee4ab7f0e5757af2ee5950270 100644
--- a/paddle/fluid/operators/recv_op.cc
+++ b/paddle/fluid/operators/recv_op.cc
@@ -14,13 +14,13 @@ limitations under the License. */
 
 #include <ostream>
 
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 #include <future>
-#include "paddle/operators/detail/grpc_client.h"
+#include "paddle/fluid/operators/detail/grpc_client.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/reduce_op.cc b/paddle/fluid/operators/reduce_op.cc
index 84f24a909597915f0eebb6c9cad37510cbe93e7b..f4d9d4cc07b1f76ed04e17bc1cc65293163fb6f2 100644
--- a/paddle/fluid/operators/reduce_op.cc
+++ b/paddle/fluid/operators/reduce_op.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/operators/reduce_op.h"
+#include "paddle/fluid/operators/reduce_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/reduce_op.cu b/paddle/fluid/operators/reduce_op.cu
index 4ed1e051db4df579afe1c1ca24a06fa1baf3e13a..1ca107ebfe9b617bd5e952965543549a8d92a5b1 100644
--- a/paddle/fluid/operators/reduce_op.cu
+++ b/paddle/fluid/operators/reduce_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/reduce_op.h"
+#include "paddle/fluid/operators/reduce_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/reduce_op.h b/paddle/fluid/operators/reduce_op.h
index da5f3977769990a45c94db21f5dbd01ac70ac06e..a153cf272b5dd8abcba1bc7d3d02c480702eae4d 100644
--- a/paddle/fluid/operators/reduce_op.h
+++ b/paddle/fluid/operators/reduce_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 
 #include "glog/logging.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/reorder_lod_tensor_by_rank_op.cc b/paddle/fluid/operators/reorder_lod_tensor_by_rank_op.cc
index 3c30447949421da516213b47178828453671c693..148a65bb4b7fe599f2fdb833c179665e58fe1c41 100644
--- a/paddle/fluid/operators/reorder_lod_tensor_by_rank_op.cc
+++ b/paddle/fluid/operators/reorder_lod_tensor_by_rank_op.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/lod_rank_table.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/detail/safe_ref.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/reshape_op.cc b/paddle/fluid/operators/reshape_op.cc
index b9743a5df1092917d13a50aa20ea7e7c52b8d151..b4f80cc06abaa536d1b1097850047fd370246dee 100644
--- a/paddle/fluid/operators/reshape_op.cc
+++ b/paddle/fluid/operators/reshape_op.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/operators/reshape_op.h"
+#include "paddle/fluid/operators/reshape_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/reshape_op.cu b/paddle/fluid/operators/reshape_op.cu
index f487e43b99d5be2af299a9edd91dcda0c4eb7b99..f9ae6da29e54187b2d6aedb833a2aa4ca95cacba 100644
--- a/paddle/fluid/operators/reshape_op.cu
+++ b/paddle/fluid/operators/reshape_op.cu
@@ -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/operators/reshape_op.h"
+#include "paddle/fluid/operators/reshape_op.h"
 
 REGISTER_OP_CUDA_KERNEL(
     reshape,
diff --git a/paddle/fluid/operators/reshape_op.h b/paddle/fluid/operators/reshape_op.h
index d884b03cadbf32de2c44e1aaed52fee9304534eb..a17ba7c619490977b837c565ef1f4cc0780d5c61 100644
--- a/paddle/fluid/operators/reshape_op.h
+++ b/paddle/fluid/operators/reshape_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/rmsprop_op.cc b/paddle/fluid/operators/rmsprop_op.cc
index f7c250bf913b9213e7d7e2cca9ecadf74cac91a1..06d3ccafefd4cc163b806aeb5d2a582c686f10cb 100644
--- a/paddle/fluid/operators/rmsprop_op.cc
+++ b/paddle/fluid/operators/rmsprop_op.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/operators/rmsprop_op.h"
+#include "paddle/fluid/operators/rmsprop_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/rmsprop_op.cu b/paddle/fluid/operators/rmsprop_op.cu
index 0295dc262f095a2b58ab34e3c2ec9f5440e4bfca..a909c942791d2e2e4d9887d4c9265383a93ca137 100644
--- a/paddle/fluid/operators/rmsprop_op.cu
+++ b/paddle/fluid/operators/rmsprop_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/rmsprop_op.h"
+#include "paddle/fluid/operators/rmsprop_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/rmsprop_op.h b/paddle/fluid/operators/rmsprop_op.h
index 16a561835d02457cf2268f713289001773e63d6c..469c102a4721ca45026112e3166dc0807ba93292 100644
--- a/paddle/fluid/operators/rmsprop_op.h
+++ b/paddle/fluid/operators/rmsprop_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/rnn_memory_helper_op.cc b/paddle/fluid/operators/rnn_memory_helper_op.cc
index eb55ed6a05b51d7a6c63d16fcf5aff73f6744903..504456c4b069f81319893ae51f57503f5025761a 100644
--- a/paddle/fluid/operators/rnn_memory_helper_op.cc
+++ b/paddle/fluid/operators/rnn_memory_helper_op.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/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/roi_pool_op.cc b/paddle/fluid/operators/roi_pool_op.cc
index a7351f11c5da7b850681346942ad699aba85a8e0..09238f89a775979b8b1866d410e6ad1ef772f9d7 100644
--- a/paddle/fluid/operators/roi_pool_op.cc
+++ b/paddle/fluid/operators/roi_pool_op.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/operators/roi_pool_op.h"
+#include "paddle/fluid/operators/roi_pool_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/roi_pool_op.cu b/paddle/fluid/operators/roi_pool_op.cu
index a874befe4d12029afa9ce55230da22cb048000aa..0e8fc9ec7a68cffeb45f8ece3e5bde39d1e71e92 100644
--- a/paddle/fluid/operators/roi_pool_op.cu
+++ b/paddle/fluid/operators/roi_pool_op.cu
@@ -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/operators/roi_pool_op.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/roi_pool_op.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/roi_pool_op.h b/paddle/fluid/operators/roi_pool_op.h
index 09a9d3d870c1066f1c6f780c4b3203679e9e7505..15f3b36fcd16bf72b9b09f58a3019b24538eec12 100644
--- a/paddle/fluid/operators/roi_pool_op.h
+++ b/paddle/fluid/operators/roi_pool_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/row_conv_op.cc b/paddle/fluid/operators/row_conv_op.cc
index 68f4e3531566fd346055404d45651c2b53ebe31b..92661ea9716a89a66c27fa21543d81b5a280bcdd 100644
--- a/paddle/fluid/operators/row_conv_op.cc
+++ b/paddle/fluid/operators/row_conv_op.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/operators/row_conv_op.h"
-#include "paddle/framework/eigen.h"
+#include "paddle/fluid/operators/row_conv_op.h"
+#include "paddle/fluid/framework/eigen.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/row_conv_op.cu b/paddle/fluid/operators/row_conv_op.cu
index d1a6d119d3da605b1d455d38f38a8808234b8ad1..832072edf810099d142c82930abfd7f198a7d1b8 100644
--- a/paddle/fluid/operators/row_conv_op.cu
+++ b/paddle/fluid/operators/row_conv_op.cu
@@ -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/operators/math/math_function.h"
-#include "paddle/operators/row_conv_op.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/row_conv_op.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/row_conv_op.h b/paddle/fluid/operators/row_conv_op.h
index 10d435ab080851713ee08a491c43aad1549f6fbb..59164b5215910630b4641501bc0b0c0e941911c2 100644
--- a/paddle/fluid/operators/row_conv_op.h
+++ b/paddle/fluid/operators/row_conv_op.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/save_combine_op.cc b/paddle/fluid/operators/save_combine_op.cc
index bffa2908bc42d73332f22fa3706d24ab49cd4b38..c23de9073ef965b989e98936b2dd07fc6bce7fdc 100644
--- a/paddle/fluid/operators/save_combine_op.cc
+++ b/paddle/fluid/operators/save_combine_op.cc
@@ -17,11 +17,11 @@ limitations under the License. */
 #include <fstream>
 #include <numeric>
 #include <sstream>
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/save_load_combine_op_test.cc b/paddle/fluid/operators/save_load_combine_op_test.cc
index f3ddc4a6c55d72e4e444869a1ebcd7662c892317..f8325bac6bc59602e81d38cb857b7b8e133be2cc 100644
--- a/paddle/fluid/operators/save_load_combine_op_test.cc
+++ b/paddle/fluid/operators/save_load_combine_op_test.cc
@@ -16,7 +16,7 @@ limitations under the License. */
 #include <string>
 #include <vector>
 #include "gtest/gtest.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 USE_NO_KERNEL_OP(save_combine);
 USE_NO_KERNEL_OP(load_combine);
diff --git a/paddle/fluid/operators/save_load_op_test.cc b/paddle/fluid/operators/save_load_op_test.cc
index d829d5da174b73613da9dcfcd308a5b05e12bce9..da4573a8ed936cf607123590ca41fb8f630930f3 100644
--- a/paddle/fluid/operators/save_load_op_test.cc
+++ b/paddle/fluid/operators/save_load_op_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "gtest/gtest.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 USE_NO_KERNEL_OP(save);
 USE_NO_KERNEL_OP(load);
diff --git a/paddle/fluid/operators/save_op.cc b/paddle/fluid/operators/save_op.cc
index 4b1cbe88836e340c94f797806243a6768410ed3d..483cdfa4c3b9e3b9abd3f32bc5e6e5e0b493bd23 100644
--- a/paddle/fluid/operators/save_op.cc
+++ b/paddle/fluid/operators/save_op.cc
@@ -17,11 +17,11 @@ limitations under the License. */
 #include <fstream>
 #include <numeric>
 
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/scale_op.cc b/paddle/fluid/operators/scale_op.cc
index c0e614743a894dece2cdc395d0b28df7e86e921d..017fc2c00e4016052179acfe328cdda42d6f84de 100644
--- a/paddle/fluid/operators/scale_op.cc
+++ b/paddle/fluid/operators/scale_op.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/operators/scale_op.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/scale_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/scale_op.cu b/paddle/fluid/operators/scale_op.cu
index 7202c0de707ff0b0b3ad966d9d1d3a7c0a89e880..a9b46077aa07406fef2cba5b18d190501ce2f92a 100644
--- a/paddle/fluid/operators/scale_op.cu
+++ b/paddle/fluid/operators/scale_op.cu
@@ -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/operators/scale_op.h"
+#include "paddle/fluid/operators/scale_op.h"
 
 REGISTER_OP_CUDA_KERNEL(
     scale,
diff --git a/paddle/fluid/operators/scale_op.h b/paddle/fluid/operators/scale_op.h
index 395268c2eee40c187f5d211317ca8b28d35a71e0..b1c2964ca6385dc6fb81f61a3e5bb042f5d7019f 100644
--- a/paddle/fluid/operators/scale_op.h
+++ b/paddle/fluid/operators/scale_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/scatter.cu.h b/paddle/fluid/operators/scatter.cu.h
index 55555300fc3219c0651583d8540b47189c8d3f13..0f1b9426a745ac293bd756da6ee750119879429e 100644
--- a/paddle/fluid/operators/scatter.cu.h
+++ b/paddle/fluid/operators/scatter.cu.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/scatter.h b/paddle/fluid/operators/scatter.h
index c1fb844ebd2ff7ca7dbdb8e8ac3c1fff4c0c6607..70cae1286caf10323e8e424853f1dc14f84b110c 100644
--- a/paddle/fluid/operators/scatter.h
+++ b/paddle/fluid/operators/scatter.h
@@ -15,10 +15,10 @@ limitations under the License. */
 #pragma once
 #include <cstring>
 
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/scatter_op.cc b/paddle/fluid/operators/scatter_op.cc
index b65334890633f54e70179bfa8fe5463901f7947e..e35930af53463e18e5ecca3cf41b91ed58a7c4c2 100644
--- a/paddle/fluid/operators/scatter_op.cc
+++ b/paddle/fluid/operators/scatter_op.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/operators/scatter_op.h"
-#include "paddle/framework/ddim.h"
+#include "paddle/fluid/operators/scatter_op.h"
+#include "paddle/fluid/framework/ddim.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/scatter_op.cu b/paddle/fluid/operators/scatter_op.cu
index 0c198d225890882ab6697d3a8b3d17e034c06cc4..f9eaae33a802ed1a45184a24757e3883fad5e639 100644
--- a/paddle/fluid/operators/scatter_op.cu
+++ b/paddle/fluid/operators/scatter_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "gather.cu.h"
-#include "paddle/operators/gather_op.h"
+#include "paddle/fluid/operators/gather_op.h"
 #include "scatter.cu.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/scatter_op.h b/paddle/fluid/operators/scatter_op.h
index 1a4f6f99bfe36cd0de2d4f2af3f6054571d8f188..65d10546328780e09bb57876acf2326d98803847 100644
--- a/paddle/fluid/operators/scatter_op.h
+++ b/paddle/fluid/operators/scatter_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 #include "gather.h"
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 #include "scatter.h"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/scatter_test.cc b/paddle/fluid/operators/scatter_test.cc
index 00dbdacbfef7af826790472acc6caa285c259e0e..8fb5ef96af34e5bd2dc0802ea76456a8b47749ab 100644
--- a/paddle/fluid/operators/scatter_test.cc
+++ b/paddle/fluid/operators/scatter_test.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/operators/scatter.h"
-#include "paddle/framework/ddim.h"
-#include "paddle/framework/tensor.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/operators/scatter.h"
+#include "paddle/fluid/framework/ddim.h"
+#include "paddle/fluid/framework/tensor.h"
+#include "paddle/fluid/platform/place.h"
 
 #include <gtest/gtest.h>
 #include <iostream>
diff --git a/paddle/fluid/operators/send_op.cc b/paddle/fluid/operators/send_op.cc
index ee0f268b0e4dfa23bf878d71404d47553183a977..a8390aa6596c69f85e3ef736dda9dd99c3fd6dba 100644
--- a/paddle/fluid/operators/send_op.cc
+++ b/paddle/fluid/operators/send_op.cc
@@ -14,13 +14,13 @@ limitations under the License. */
 
 #include <ostream>
 
-#include "paddle/framework/data_type.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/data_type.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 #include <future>
-#include "paddle/operators/detail/grpc_client.h"
+#include "paddle/fluid/operators/detail/grpc_client.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/send_recv_op_test.cc b/paddle/fluid/operators/send_recv_op_test.cc
index 31527a906d56da54d2571910de627757d708a996..716f687044a85d46676141ee125baf398e9e695d 100644
--- a/paddle/fluid/operators/send_recv_op_test.cc
+++ b/paddle/fluid/operators/send_recv_op_test.cc
@@ -17,11 +17,11 @@ limitations under the License. */
 #include <thread>
 
 #include "gtest/gtest.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
-#include "paddle/framework/program_desc.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/framework/program_desc.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
 #include "paddle/string/printf.h"
 
 USE_NO_KERNEL_OP(send);
diff --git a/paddle/fluid/operators/sequence_concat_op.cc b/paddle/fluid/operators/sequence_concat_op.cc
index 2f0aad2003e48952ca26ca27573bc45386a4e585..4ddf800d85e11aa631255c1b1ec5c12f6e0f221c 100644
--- a/paddle/fluid/operators/sequence_concat_op.cc
+++ b/paddle/fluid/operators/sequence_concat_op.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/operators/sequence_concat_op.h"
+#include "paddle/fluid/operators/sequence_concat_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_concat_op.cu.cc b/paddle/fluid/operators/sequence_concat_op.cu.cc
index 144bdb5af635b0cb75bcd1f654700041186dae46..c5a280ef9e2515114f5dd6826e55a304066973aa 100644
--- a/paddle/fluid/operators/sequence_concat_op.cu.cc
+++ b/paddle/fluid/operators/sequence_concat_op.cu.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/operators/sequence_concat_op.h"
+#include "paddle/fluid/operators/sequence_concat_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sequence_concat_op.h b/paddle/fluid/operators/sequence_concat_op.h
index 8445224f46aba6110280783c9080ed4691266b8b..9121196369f1bee20abc56a33b9da8bc4a43f315 100644
--- a/paddle/fluid/operators/sequence_concat_op.h
+++ b/paddle/fluid/operators/sequence_concat_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/strided_memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_conv_op.cc b/paddle/fluid/operators/sequence_conv_op.cc
index c5b7c81bd7c6e1110aa9e2ced629bea5d88832d1..af9938b18069d65648fbbf0deae31eff088b791f 100644
--- a/paddle/fluid/operators/sequence_conv_op.cc
+++ b/paddle/fluid/operators/sequence_conv_op.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/operators/sequence_conv_op.h"
+#include "paddle/fluid/operators/sequence_conv_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_conv_op.cu.cc b/paddle/fluid/operators/sequence_conv_op.cu.cc
index 0b8f2c695564f19cf71ecc56a60e707c3703af36..36f9e8da95d8c963c74fb6c8e75c777b7ba03095 100644
--- a/paddle/fluid/operators/sequence_conv_op.cu.cc
+++ b/paddle/fluid/operators/sequence_conv_op.cu.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/operators/sequence_conv_op.h"
+#include "paddle/fluid/operators/sequence_conv_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sequence_conv_op.h b/paddle/fluid/operators/sequence_conv_op.h
index bb584b7bfa5fb8f6eb0a452468d24ca034be6f1b..1c81067fea2370458cf6abe8e5465b4c674fbf09 100644
--- a/paddle/fluid/operators/sequence_conv_op.h
+++ b/paddle/fluid/operators/sequence_conv_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/context_project.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/context_project.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_erase_op.cc b/paddle/fluid/operators/sequence_erase_op.cc
index aa0c00aa6f7854ee5e34aef78970971b78df6514..2e0adf8b1900f7b7c43001459a7e7c494d854274 100644
--- a/paddle/fluid/operators/sequence_erase_op.cc
+++ b/paddle/fluid/operators/sequence_erase_op.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/operators/sequence_erase_op.h"
+#include "paddle/fluid/operators/sequence_erase_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_erase_op.cu b/paddle/fluid/operators/sequence_erase_op.cu
index 4a7217cfd656f4f6b46d5a80a9c8e165c839df1d..43fc352fe78d03fb54dd90a43e3d37b0646cefce 100644
--- a/paddle/fluid/operators/sequence_erase_op.cu
+++ b/paddle/fluid/operators/sequence_erase_op.cu
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #include <thrust/device_vector.h>
 #include <thrust/host_vector.h>
-#include "paddle/operators/sequence_erase_op.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/sequence_erase_op.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_erase_op.h b/paddle/fluid/operators/sequence_erase_op.h
index cb2d7be009dcbe0138818457249e95fbdd27fc0a..e151279c7fc20d5e04048080a9432cb723334b75 100644
--- a/paddle/fluid/operators/sequence_erase_op.h
+++ b/paddle/fluid/operators/sequence_erase_op.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_expand_op.cc b/paddle/fluid/operators/sequence_expand_op.cc
index d34dbd35b6df2dac275fbe2c41f99b8549217d5b..4ebce641d2876a4f2329b6d7d7263a6b2a31fcf6 100644
--- a/paddle/fluid/operators/sequence_expand_op.cc
+++ b/paddle/fluid/operators/sequence_expand_op.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/operators/sequence_expand_op.h"
+#include "paddle/fluid/operators/sequence_expand_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_expand_op.cu b/paddle/fluid/operators/sequence_expand_op.cu
index 0b9638b2ce60f73c95e1ccbcfb16cef7b5351073..5ac76d83da618680502d0add51ae68ac117ad2aa 100644
--- a/paddle/fluid/operators/sequence_expand_op.cu
+++ b/paddle/fluid/operators/sequence_expand_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/sequence_expand_op.h"
+#include "paddle/fluid/operators/sequence_expand_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sequence_expand_op.h b/paddle/fluid/operators/sequence_expand_op.h
index 6021526eee8e0a1f58885f6de38b14048787a828..8010627ff6f5acbf300b0f3f9281e60b4ebfa94e 100644
--- a/paddle/fluid/operators/sequence_expand_op.h
+++ b/paddle/fluid/operators/sequence_expand_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/memory/memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/memory/memcpy.h"
 #include "unsupported/Eigen/CXX11/Tensor"
 
 namespace paddle {
diff --git a/paddle/fluid/operators/sequence_pool_op.cc b/paddle/fluid/operators/sequence_pool_op.cc
index 549d9620ef20e2be7d030f41f1e7567cb1922f3b..2cfb336b2e0b31ab20182a36d806506b6af4c139 100644
--- a/paddle/fluid/operators/sequence_pool_op.cc
+++ b/paddle/fluid/operators/sequence_pool_op.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/operators/sequence_pool_op.h"
+#include "paddle/fluid/operators/sequence_pool_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_pool_op.cu b/paddle/fluid/operators/sequence_pool_op.cu
index 265f695935236236f98c2dd2062072756e9c8b14..364769c39bd1b94935630eb8c16c0e27787139e1 100644
--- a/paddle/fluid/operators/sequence_pool_op.cu
+++ b/paddle/fluid/operators/sequence_pool_op.cu
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/sequence_pool_op.h"
+#include "paddle/fluid/operators/sequence_pool_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sequence_pool_op.h b/paddle/fluid/operators/sequence_pool_op.h
index 7519aa1d7208b9832f7a3d3afbc59a2eb4e8e13a..7b67e6201ebb04b3fbda3520347c580fd9501098 100644
--- a/paddle/fluid/operators/sequence_pool_op.h
+++ b/paddle/fluid/operators/sequence_pool_op.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/sequence_pooling.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence_pooling.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_reshape_op.cc b/paddle/fluid/operators/sequence_reshape_op.cc
index d89a46a712c9c84a142e1e347219ed171556d761..c4e42d3eeb5555be693946ccde30ef87f88d0f32 100644
--- a/paddle/fluid/operators/sequence_reshape_op.cc
+++ b/paddle/fluid/operators/sequence_reshape_op.cc
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/operators/sequence_reshape_op.h"
-#include "paddle/framework/ddim.h"
+#include "paddle/fluid/operators/sequence_reshape_op.h"
+#include "paddle/fluid/framework/ddim.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_reshape_op.cu b/paddle/fluid/operators/sequence_reshape_op.cu
index d9c2f7e9a4149371867cf2a8b81d58566999bfba..5ca3497396eaa6c811c69af4acf4fa3092cff42a 100644
--- a/paddle/fluid/operators/sequence_reshape_op.cu
+++ b/paddle/fluid/operators/sequence_reshape_op.cu
@@ -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/operators/sequence_reshape_op.h"
+#include "paddle/fluid/operators/sequence_reshape_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sequence_reshape_op.h b/paddle/fluid/operators/sequence_reshape_op.h
index aaae7ab29281b72848515b80cc60931c13a294c9..7a5d1261da917c6e596ff7b85afbfd95ff90f12a 100644
--- a/paddle/fluid/operators/sequence_reshape_op.h
+++ b/paddle/fluid/operators/sequence_reshape_op.h
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_slice_op.cc b/paddle/fluid/operators/sequence_slice_op.cc
index f79106ff0f7a3d0918bc3a5c428179cb170ffc79..87b8eff64621290ebd75d2cb76d7c684655b884f 100644
--- a/paddle/fluid/operators/sequence_slice_op.cc
+++ b/paddle/fluid/operators/sequence_slice_op.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/operators/sequence_slice_op.h"
+#include "paddle/fluid/operators/sequence_slice_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_slice_op.cu b/paddle/fluid/operators/sequence_slice_op.cu
index 43a21d619f4116874c329eb968f09dc230975c05..041fabdf9a2dc73540ab45e5e86aa1ef71bed4dc 100755
--- a/paddle/fluid/operators/sequence_slice_op.cu
+++ b/paddle/fluid/operators/sequence_slice_op.cu
@@ -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/operators/sequence_slice_op.h"
+#include "paddle/fluid/operators/sequence_slice_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sequence_slice_op.h b/paddle/fluid/operators/sequence_slice_op.h
index 0e4e4cf65fc69121f31886bb9909a87fea56a0be..65c36a32aa12c628db5c4f0c104d3977e625ad97 100644
--- a/paddle/fluid/operators/sequence_slice_op.h
+++ b/paddle/fluid/operators/sequence_slice_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/strided_memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_softmax_op.cc b/paddle/fluid/operators/sequence_softmax_op.cc
index b74766f012e333cc2a317e6efe17c5b60238924a..f966b7162077943dd78d601743b3a3e2e103444b 100644
--- a/paddle/fluid/operators/sequence_softmax_op.cc
+++ b/paddle/fluid/operators/sequence_softmax_op.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/operators/sequence_softmax_op.h"
+#include "paddle/fluid/operators/sequence_softmax_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sequence_softmax_op.cu.cc b/paddle/fluid/operators/sequence_softmax_op.cu.cc
index 5f65b4daf97cf025b975d2d95212375b5fca01f8..c42dfd7540954616eb7bf012160a98211c3caf1b 100644
--- a/paddle/fluid/operators/sequence_softmax_op.cu.cc
+++ b/paddle/fluid/operators/sequence_softmax_op.cu.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/operators/sequence_softmax_op.h"
+#include "paddle/fluid/operators/sequence_softmax_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sequence_softmax_op.h b/paddle/fluid/operators/sequence_softmax_op.h
index e889e88cb34719b6648e3032754645fbb2807741..e6c21c67b3362835b2ff87045a213b2636556346 100644
--- a/paddle/fluid/operators/sequence_softmax_op.h
+++ b/paddle/fluid/operators/sequence_softmax_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/softmax.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/softmax.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sgd_op.cc b/paddle/fluid/operators/sgd_op.cc
index a11c9624ce5e8485449dd6b420ad1f23ff3550c7..f1e23a62f4ec52b40cfa1febc98fbfb045f45efd 100644
--- a/paddle/fluid/operators/sgd_op.cc
+++ b/paddle/fluid/operators/sgd_op.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/operators/sgd_op.h"
+#include "paddle/fluid/operators/sgd_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sgd_op.cu b/paddle/fluid/operators/sgd_op.cu
index d27befe4460550f7b7b30aa93a23c8e51aa52da9..09374e20494be2eebba913bd90a7c32e1aa0015b 100644
--- a/paddle/fluid/operators/sgd_op.cu
+++ b/paddle/fluid/operators/sgd_op.cu
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/sgd_op.h"
-#include "paddle/platform/cuda_helper.h"
+#include "paddle/fluid/operators/sgd_op.h"
+#include "paddle/fluid/platform/cuda_helper.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sgd_op.h b/paddle/fluid/operators/sgd_op.h
index a6c544591e1172320f6cf7192bf640ff25225b99..f1eaaecdb1eef1b42ea5d3b7315133c665b50df6 100644
--- a/paddle/fluid/operators/sgd_op.h
+++ b/paddle/fluid/operators/sgd_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/selected_rows.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/selected_rows.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/shrink_rnn_memory_op.cc b/paddle/fluid/operators/shrink_rnn_memory_op.cc
index bf870115a4d7b6f4d578df7707826973d4363ba6..df50a324fde1637f1f9f64a0b0d4eff8ba3f26d2 100644
--- a/paddle/fluid/operators/shrink_rnn_memory_op.cc
+++ b/paddle/fluid/operators/shrink_rnn_memory_op.cc
@@ -11,10 +11,10 @@ distributed under the License is distributed on an "AS IS" BASIS,
 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/lod_rank_table.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/operators/array_operator.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/operators/array_operator.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.cc b/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.cc
index c526a88a127da12a6384777bca31b60873844d94..3188415a2bd4434704ca95b92427094023527019 100644
--- a/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.cc
+++ b/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.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/operators/sigmoid_cross_entropy_with_logits_op.h"
+#include "paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.cu b/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.cu
index 3f393265f48b428dca8703ff77688de979fb63df..daa9d3e4fa5aeba77f770f69d6057ced98741eaa 100644
--- a/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.cu
+++ b/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/sigmoid_cross_entropy_with_logits_op.h"
+#include "paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(sigmoid_cross_entropy_with_logits,
diff --git a/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.h b/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.h
index b78bcc436e9fa5c5d4db3fbb22224e328c3bc3c2..977849f7627bc3f5b08a5f34bd300ab1442c6276 100644
--- a/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.h
+++ b/paddle/fluid/operators/sigmoid_cross_entropy_with_logits_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sign_op.cc b/paddle/fluid/operators/sign_op.cc
index f63eaa4464cc668acdb8e5b8a74ad5bba936db44..54b962538b8426141c9ab1b9269c0ed8bd5a8496 100644
--- a/paddle/fluid/operators/sign_op.cc
+++ b/paddle/fluid/operators/sign_op.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/operators/sign_op.h"
+#include "paddle/fluid/operators/sign_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sign_op.cu b/paddle/fluid/operators/sign_op.cu
index f224880cffb2154a7c46b8a4701d7357e67bb70c..93cdb311eb4961a7754f9adfe14a15f3b2d0ca58 100644
--- a/paddle/fluid/operators/sign_op.cu
+++ b/paddle/fluid/operators/sign_op.cu
@@ -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/operators/sign_op.h"
+#include "paddle/fluid/operators/sign_op.h"
 
 REGISTER_OP_CUDA_KERNEL(
     sign,
diff --git a/paddle/fluid/operators/sign_op.h b/paddle/fluid/operators/sign_op.h
index 9fe49ae1a2161d9f1472eef830c11b0f8305c568..1c2ebebee40d9b64dd8b658b904e631ba294e41e 100644
--- a/paddle/fluid/operators/sign_op.h
+++ b/paddle/fluid/operators/sign_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/smooth_l1_loss_op.cc b/paddle/fluid/operators/smooth_l1_loss_op.cc
index dcb18d729da69beaa556e4b93129dafb08b72c06..be4c7a56a84e84c39a578b958fe7c9ad551f54f6 100644
--- a/paddle/fluid/operators/smooth_l1_loss_op.cc
+++ b/paddle/fluid/operators/smooth_l1_loss_op.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/operators/smooth_l1_loss_op.h"
+#include "paddle/fluid/operators/smooth_l1_loss_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/smooth_l1_loss_op.cu b/paddle/fluid/operators/smooth_l1_loss_op.cu
index 213429bc370ef0d5b493b3a448df1b3bf0e4e87c..94c0d6cd299075541f0ef66cbc0bd48a8f4d51b3 100644
--- a/paddle/fluid/operators/smooth_l1_loss_op.cu
+++ b/paddle/fluid/operators/smooth_l1_loss_op.cu
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/smooth_l1_loss_op.h"
+#include "paddle/fluid/operators/smooth_l1_loss_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/smooth_l1_loss_op.h b/paddle/fluid/operators/smooth_l1_loss_op.h
index 3facfae116d711f86ea5c193562c20ea60a2efc9..325ad824e1874281873b5e41ab62db0fa43040d0 100644
--- a/paddle/fluid/operators/smooth_l1_loss_op.h
+++ b/paddle/fluid/operators/smooth_l1_loss_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/softmax_op.cc b/paddle/fluid/operators/softmax_op.cc
index cef1f1fc99d6a34db068257f94f935bf4435119d..1d9462d08b9cc06df2d0dca568dbbe1c50dc948f 100644
--- a/paddle/fluid/operators/softmax_op.cc
+++ b/paddle/fluid/operators/softmax_op.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/operators/softmax_op.h"
+#include "paddle/fluid/operators/softmax_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/softmax_op.cu.cc b/paddle/fluid/operators/softmax_op.cu.cc
index e7da40f3e82d5db858a795e9634abf57b884d6a2..c53d8a2bc82dcfafc178b67299769b2e06109eb3 100644
--- a/paddle/fluid/operators/softmax_op.cu.cc
+++ b/paddle/fluid/operators/softmax_op.cu.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/operators/softmax_op.h"
+#include "paddle/fluid/operators/softmax_op.h"
 
 namespace ops = paddle::operators;
 
diff --git a/paddle/fluid/operators/softmax_op.h b/paddle/fluid/operators/softmax_op.h
index 63e379a3b31a6c75aab0c56b4ce1b988fa7f0318..9287f0231031675b09c941f19c1df1fefc993506 100644
--- a/paddle/fluid/operators/softmax_op.h
+++ b/paddle/fluid/operators/softmax_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/softmax.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/softmax.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/softmax_with_cross_entropy_op.cc b/paddle/fluid/operators/softmax_with_cross_entropy_op.cc
index 7135780c92dca00503ab098dc6930afd8fac0be8..79d56cb97d38ebd725668442c29229ef22f5b05e 100644
--- a/paddle/fluid/operators/softmax_with_cross_entropy_op.cc
+++ b/paddle/fluid/operators/softmax_with_cross_entropy_op.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/operators/softmax_with_cross_entropy_op.h"
+#include "paddle/fluid/operators/softmax_with_cross_entropy_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/softmax_with_cross_entropy_op.cu b/paddle/fluid/operators/softmax_with_cross_entropy_op.cu
index 61583c6161c3bbc62788dc8b6940ddcc29b2302a..410d9e8887c593249495e08424467b4be15c9bcb 100644
--- a/paddle/fluid/operators/softmax_with_cross_entropy_op.cu
+++ b/paddle/fluid/operators/softmax_with_cross_entropy_op.cu
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/softmax_with_cross_entropy_op.h"
+#include "paddle/fluid/operators/softmax_with_cross_entropy_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/softmax_with_cross_entropy_op.h b/paddle/fluid/operators/softmax_with_cross_entropy_op.h
index 6bde0f37e06ccf7d81487e0c99227287787c5d72..0927efd42ceb35cc4183f84d160c44f35f6cc3f5 100644
--- a/paddle/fluid/operators/softmax_with_cross_entropy_op.h
+++ b/paddle/fluid/operators/softmax_with_cross_entropy_op.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/cross_entropy.h"
-#include "paddle/operators/math/softmax.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/cross_entropy.h"
+#include "paddle/fluid/operators/math/softmax.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/split_lod_tensor_op.cc b/paddle/fluid/operators/split_lod_tensor_op.cc
index bd93c492015e074afe08ee167025aa6251b369d1..f821dc54d7bbe697d3642e64dc1628ec7d966592 100644
--- a/paddle/fluid/operators/split_lod_tensor_op.cc
+++ b/paddle/fluid/operators/split_lod_tensor_op.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/op_registry.h"
-#include "paddle/memory/memcpy.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/split_op.cc b/paddle/fluid/operators/split_op.cc
index 8d55ae5dd7b0e76acb9f21cb10b79cb7aca18a8d..f8bc22fe1d3d24866b5bf2506ed0ff585d259cc2 100644
--- a/paddle/fluid/operators/split_op.cc
+++ b/paddle/fluid/operators/split_op.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/operators/split_op.h"
-#include "paddle/operators/net_op.h"
+#include "paddle/fluid/operators/split_op.h"
+#include "paddle/fluid/operators/net_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/split_op.cu.cc b/paddle/fluid/operators/split_op.cu.cc
index dbad0bbf68d7924cfba80721bb3294b7e0cfac00..279691c759e988ea26a62e1263198d2a9d878cf9 100644
--- a/paddle/fluid/operators/split_op.cu.cc
+++ b/paddle/fluid/operators/split_op.cu.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/operators/split_op.h"
+#include "paddle/fluid/operators/split_op.h"
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
     split, ops::SplitOpKernel<paddle::platform::CUDADeviceContext, float>);
diff --git a/paddle/fluid/operators/split_op.h b/paddle/fluid/operators/split_op.h
index a38c435d531d7da2a1a60eb2c455bc1782c1cd4c..e78218f2fb108dac5bce717e03ce0aba1ed88195 100644
--- a/paddle/fluid/operators/split_op.h
+++ b/paddle/fluid/operators/split_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 
 #include <vector>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/strided_memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/split_selected_rows_op.cc b/paddle/fluid/operators/split_selected_rows_op.cc
index 0515ea13aadbd6e12e2586c937f3d1ed0a298d69..113ce2ce109778a355130aaf686261c1f71c0980 100644
--- a/paddle/fluid/operators/split_selected_rows_op.cc
+++ b/paddle/fluid/operators/split_selected_rows_op.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/operators/split_selected_rows_op.h"
+#include "paddle/fluid/operators/split_selected_rows_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/split_selected_rows_op.cu b/paddle/fluid/operators/split_selected_rows_op.cu
index 983285480fd9de7a2a4d2787a9bba72c160b7fae..0bbf1ecfaefeddd426b1055d93ce39a138abec28 100644
--- a/paddle/fluid/operators/split_selected_rows_op.cu
+++ b/paddle/fluid/operators/split_selected_rows_op.cu
@@ -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/operators/split_selected_rows_op.h"
+#include "paddle/fluid/operators/split_selected_rows_op.h"
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
     split_selected_rows,
diff --git a/paddle/fluid/operators/split_selected_rows_op.h b/paddle/fluid/operators/split_selected_rows_op.h
index 12e64e2901e5902d187d65a12c94b8d7ef45a481..527264bd675520a98b442380e2d1ec259964e92e 100644
--- a/paddle/fluid/operators/split_selected_rows_op.h
+++ b/paddle/fluid/operators/split_selected_rows_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 
 #include <vector>
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/spp_op.cc b/paddle/fluid/operators/spp_op.cc
index c0aa87b0f06ca9c7d156dfdf8df188da68ac1450..e6755b12000463b111fe65dbdf2c140a060d968b 100644
--- a/paddle/fluid/operators/spp_op.cc
+++ b/paddle/fluid/operators/spp_op.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/operators/spp_op.h"
+#include "paddle/fluid/operators/spp_op.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/spp_op.cu.cc b/paddle/fluid/operators/spp_op.cu.cc
index 761e4d6c4a9639898ba548d56bed3c8817720c1b..cad2ca5ef8e16ee6ea6943f61da33367099e0937 100644
--- a/paddle/fluid/operators/spp_op.cu.cc
+++ b/paddle/fluid/operators/spp_op.cu.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/operators/spp_op.h"
+#include "paddle/fluid/operators/spp_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/spp_op.h b/paddle/fluid/operators/spp_op.h
index f35b305d02c73bcae6e72b8afa5ce55148ea98b8..1da1f805807fc648b3a54de91842f163b356435b 100644
--- a/paddle/fluid/operators/spp_op.h
+++ b/paddle/fluid/operators/spp_op.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/pooling.h"
-#include "paddle/operators/strided_memcpy.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/pooling.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/squared_l2_distance_op.cc b/paddle/fluid/operators/squared_l2_distance_op.cc
index 9e097176f3434e81e31f2ecf4093af47b654e816..c1d0c2c7f392cae3dc30611a0f077c1af7b68cbe 100644
--- a/paddle/fluid/operators/squared_l2_distance_op.cc
+++ b/paddle/fluid/operators/squared_l2_distance_op.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/operators/squared_l2_distance_op.h"
+#include "paddle/fluid/operators/squared_l2_distance_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/squared_l2_distance_op.cu b/paddle/fluid/operators/squared_l2_distance_op.cu
index f2648dde5eb9c56aed3fad81521e6207dc2d973e..959e7afac99bd2565890cb6a296bc908f250a16c 100644
--- a/paddle/fluid/operators/squared_l2_distance_op.cu
+++ b/paddle/fluid/operators/squared_l2_distance_op.cu
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #define EIGEN_USE_GPU
 
-#include "paddle/operators/squared_l2_distance_op.h"
+#include "paddle/fluid/operators/squared_l2_distance_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/squared_l2_distance_op.h b/paddle/fluid/operators/squared_l2_distance_op.h
index 5bd5f4819a35966b73038f433d38c06031e18715..aab241247e5e92f43a997f3d29c8e7d7d44d7711 100644
--- a/paddle/fluid/operators/squared_l2_distance_op.h
+++ b/paddle/fluid/operators/squared_l2_distance_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/squared_l2_norm_op.cc b/paddle/fluid/operators/squared_l2_norm_op.cc
index 6626bf0375548eac457f960105ce33e63e1a3706..a43cc22994b1b15a4acf0fd89b956bf05d3f35c8 100644
--- a/paddle/fluid/operators/squared_l2_norm_op.cc
+++ b/paddle/fluid/operators/squared_l2_norm_op.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/operators/squared_l2_norm_op.h"
+#include "paddle/fluid/operators/squared_l2_norm_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/squared_l2_norm_op.cu b/paddle/fluid/operators/squared_l2_norm_op.cu
index b222113a8c82061bd841da440a714b66f6c1fb9c..52f4ab79b2189b269b7d0685dccedc52b627ad8d 100644
--- a/paddle/fluid/operators/squared_l2_norm_op.cu
+++ b/paddle/fluid/operators/squared_l2_norm_op.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/squared_l2_norm_op.h"
+#include "paddle/fluid/operators/squared_l2_norm_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/squared_l2_norm_op.h b/paddle/fluid/operators/squared_l2_norm_op.h
index 1ce26c775ed5700cee73d00f4c51d58a692a1152..56524636b8f1b063266fda0997e91a703131adff 100644
--- a/paddle/fluid/operators/squared_l2_norm_op.h
+++ b/paddle/fluid/operators/squared_l2_norm_op.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/strided_memcpy.h b/paddle/fluid/operators/strided_memcpy.h
index 735cabcd973a3b5ea1ab8ab57091eae14e23b89b..8a99b405e266da48427fa23e9a3e67f2bc54c5a0 100644
--- a/paddle/fluid/operators/strided_memcpy.h
+++ b/paddle/fluid/operators/strided_memcpy.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/operators/detail/strided_memcpy.h"
+#include "paddle/fluid/operators/detail/strided_memcpy.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/strided_memcpy_test.cc b/paddle/fluid/operators/strided_memcpy_test.cc
index 06d81188558aad85c41c56ddefad3617d48da74c..a369941a993c02744cb7de0d6c6c878f56d5e0fe 100644
--- a/paddle/fluid/operators/strided_memcpy_test.cc
+++ b/paddle/fluid/operators/strided_memcpy_test.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/operators/strided_memcpy.h"
+#include "paddle/fluid/operators/strided_memcpy.h"
 #include "gtest/gtest.h"
-#include "paddle/memory/memory.h"
+#include "paddle/fluid/memory/memory.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sum_op.cc b/paddle/fluid/operators/sum_op.cc
index 88ed67f7ba2527e1d91e6bb30762d5dcf818761d..96f851720aea2ddd643e1e6251fee314e26cbf95 100644
--- a/paddle/fluid/operators/sum_op.cc
+++ b/paddle/fluid/operators/sum_op.cc
@@ -9,10 +9,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/operators/sum_op.h"
+#include "paddle/fluid/operators/sum_op.h"
 #include <vector>
-#include "paddle/framework/var_type_inference.h"
-#include "paddle/operators/detail/safe_ref.h"
+#include "paddle/fluid/framework/var_type_inference.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/sum_op.cu b/paddle/fluid/operators/sum_op.cu
index 873155076c179d5280a418e25fd39fdaf4b0a2b2..8d8f90d7510bae854a0507adaf8998fb7aea3b58 100644
--- a/paddle/fluid/operators/sum_op.cu
+++ b/paddle/fluid/operators/sum_op.cu
@@ -10,7 +10,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #define EIGEN_USE_GPU
-#include "paddle/operators/sum_op.h"
+#include "paddle/fluid/operators/sum_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/sum_op.h b/paddle/fluid/operators/sum_op.h
index 3d8102c3ae20c8b714cd48b4fc78dc18a0cf89a7..5e1222c6ef723a6321392a5af7fdb558c24df32b 100644
--- a/paddle/fluid/operators/sum_op.h
+++ b/paddle/fluid/operators/sum_op.h
@@ -10,11 +10,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/selected_rows_functor.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/selected_rows_functor.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/target_assign_op.cc b/paddle/fluid/operators/target_assign_op.cc
index 615ca857ceb45d442b75fffc6662cc2bda19562d..24f1b7252318f8321ef394d321aedb658398e16d 100644
--- a/paddle/fluid/operators/target_assign_op.cc
+++ b/paddle/fluid/operators/target_assign_op.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/operators/target_assign_op.h"
+#include "paddle/fluid/operators/target_assign_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/target_assign_op.cu b/paddle/fluid/operators/target_assign_op.cu
index fc0a1000a4202adeca3e0d6fbb05e832a79dbaba..5c012d27ad82eb62d9981c8c73ef5b8cc03adc47 100644
--- a/paddle/fluid/operators/target_assign_op.cu
+++ b/paddle/fluid/operators/target_assign_op.cu
@@ -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/operators/target_assign_op.h"
+#include "paddle/fluid/operators/target_assign_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/target_assign_op.h b/paddle/fluid/operators/target_assign_op.h
index 574919e1ef8d28c2a27b73b97a91d29e89896a6b..876111523af51ce67e804d6646f404c45c00af12 100644
--- a/paddle/fluid/operators/target_assign_op.h
+++ b/paddle/fluid/operators/target_assign_op.h
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/framework/op_registry.h"
-#include "paddle/platform/assert.h"
-#include "paddle/platform/for_range.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/assert.h"
+#include "paddle/fluid/platform/for_range.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/tensor_array_read_write_op.cc b/paddle/fluid/operators/tensor_array_read_write_op.cc
index a70be8b8752d12433bb19b9953d80e397858834c..50811fb22491598849216f41a584ae0b68f8f306 100644
--- a/paddle/fluid/operators/tensor_array_read_write_op.cc
+++ b/paddle/fluid/operators/tensor_array_read_write_op.cc
@@ -11,8 +11,8 @@ distributed under the License is distributed on an "AS IS" BASIS,
 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/operators/array_operator.h"
-#include "paddle/operators/detail/safe_ref.h"
+#include "paddle/fluid/operators/array_operator.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/top_k_op.cc b/paddle/fluid/operators/top_k_op.cc
index a8ddd729732eb41618ea2788a6eb70a16a5ac70f..c81ea860d0c9fa5498de2d149e3d05d080ad729f 100644
--- a/paddle/fluid/operators/top_k_op.cc
+++ b/paddle/fluid/operators/top_k_op.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/operators/top_k_op.h"
+#include "paddle/fluid/operators/top_k_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/top_k_op.cu b/paddle/fluid/operators/top_k_op.cu
index f7bf58e7218cb9b94526cb9346bc5f9aa971038a..5390cb5063bcc302f5ff9cfe96bd421b477eeb3f 100644
--- a/paddle/fluid/operators/top_k_op.cu
+++ b/paddle/fluid/operators/top_k_op.cu
@@ -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/op_registry.h"
-#include "paddle/platform/assert.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/platform/assert.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/top_k_op.h b/paddle/fluid/operators/top_k_op.h
index bf42e15e6b234125d9ec24e8500367b9915213ab..e32b35150070b30c3ccbbb9483c1f24b1d205919 100644
--- a/paddle/fluid/operators/top_k_op.h
+++ b/paddle/fluid/operators/top_k_op.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 #include <algorithm>
 #include <iostream>
-#include "paddle/framework/eigen.h"
-#include "paddle/framework/op_registry.h"
+#include "paddle/fluid/framework/eigen.h"
+#include "paddle/fluid/framework/op_registry.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/transpose_op.cc b/paddle/fluid/operators/transpose_op.cc
index c7ae162638ca5e929cca14c841cc3eceeea5f64e..a3d8acffc269c1abe98d2de39dcf09fbf3d825f3 100644
--- a/paddle/fluid/operators/transpose_op.cc
+++ b/paddle/fluid/operators/transpose_op.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/operators/transpose_op.h"
+#include "paddle/fluid/operators/transpose_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/transpose_op.cu.cc b/paddle/fluid/operators/transpose_op.cu.cc
index 281c4468cc267c659befd238c9a286dd23eaf16d..f8667ab369e1de9c2b74ba902242355d1660d24a 100644
--- a/paddle/fluid/operators/transpose_op.cu.cc
+++ b/paddle/fluid/operators/transpose_op.cu.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/operators/transpose_op.h"
+#include "paddle/fluid/operators/transpose_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/transpose_op.h b/paddle/fluid/operators/transpose_op.h
index b9686a2db3f76dbb9b8ebdba5e243f5e5a3c571a..1fb419474ab078efa64523454bbbbb6176a58d40 100644
--- a/paddle/fluid/operators/transpose_op.h
+++ b/paddle/fluid/operators/transpose_op.h
@@ -14,8 +14,8 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/uniform_random_op.cc b/paddle/fluid/operators/uniform_random_op.cc
index 3a314bdb9b058f5dfc61b35795000298c40551e6..b6fea1d4485fd7f88375c96511c85396b707bf1c 100644
--- a/paddle/fluid/operators/uniform_random_op.cc
+++ b/paddle/fluid/operators/uniform_random_op.cc
@@ -11,8 +11,8 @@ distributed under the License is distributed on an "AS IS" BASIS,
 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/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/uniform_random_op.cu b/paddle/fluid/operators/uniform_random_op.cu
index 719d0872a7cba55dc97c95a73a7f86614ab3f4b7..9afca68e59f8c0eedaf38be4b51343b9cb043f65 100644
--- a/paddle/fluid/operators/uniform_random_op.cu
+++ b/paddle/fluid/operators/uniform_random_op.cu
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 #include <thrust/random.h>
 #include <thrust/transform.h>
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/unpool_op.cc b/paddle/fluid/operators/unpool_op.cc
index 50cee11a7a2d6a2483c6851e888b61475cba1376..2e0b271fed69772a53a776f290d524565df3dc94 100644
--- a/paddle/fluid/operators/unpool_op.cc
+++ b/paddle/fluid/operators/unpool_op.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/operators/unpool_op.h"
+#include "paddle/fluid/operators/unpool_op.h"
 namespace paddle {
 namespace operators {
 
diff --git a/paddle/fluid/operators/unpool_op.cu.cc b/paddle/fluid/operators/unpool_op.cu.cc
index 9b002e35c434db561114dbbafce2f3f934daaf6a..15d81eb296ba35d9f67426083870c1a83ff66ee5 100644
--- a/paddle/fluid/operators/unpool_op.cu.cc
+++ b/paddle/fluid/operators/unpool_op.cu.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/operators/unpool_op.h"
+#include "paddle/fluid/operators/unpool_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/unpool_op.h b/paddle/fluid/operators/unpool_op.h
index ee18b118c957c7933890000bbe934e6ffdc9e56f..ceed5507391b40491d4a26bbc51e8c861e1bf1c2 100644
--- a/paddle/fluid/operators/unpool_op.h
+++ b/paddle/fluid/operators/unpool_op.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/unpooling.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/unpooling.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/warpctc_op.cc b/paddle/fluid/operators/warpctc_op.cc
index bd0c5f9957663fb05670269aa6c39a976de7bc9c..1c05fed0b47c3bb3582e4b261ef188146d41820e 100644
--- a/paddle/fluid/operators/warpctc_op.cc
+++ b/paddle/fluid/operators/warpctc_op.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/operators/warpctc_op.h"
+#include "paddle/fluid/operators/warpctc_op.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/warpctc_op.cu.cc b/paddle/fluid/operators/warpctc_op.cu.cc
index 7d8527ac75fd4964f95198417a213ff6155aac2a..9ee7f970a9a5f7deaab8a98278cf1a7c051cfbd2 100644
--- a/paddle/fluid/operators/warpctc_op.cu.cc
+++ b/paddle/fluid/operators/warpctc_op.cu.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/operators/warpctc_op.h"
+#include "paddle/fluid/operators/warpctc_op.h"
 
 namespace ops = paddle::operators;
 REGISTER_OP_CUDA_KERNEL(
diff --git a/paddle/fluid/operators/warpctc_op.h b/paddle/fluid/operators/warpctc_op.h
index 8aea061c00cc9614db37ed408b6d330ef707d1cf..a1de71627ee7e511a03231c11831cf54755a145e 100644
--- a/paddle/fluid/operators/warpctc_op.h
+++ b/paddle/fluid/operators/warpctc_op.h
@@ -14,11 +14,11 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/framework/op_registry.h"
-#include "paddle/operators/math/math_function.h"
-#include "paddle/operators/math/sequence_padding.h"
-#include "paddle/operators/math/sequence_scale.h"
-#include "paddle/platform/dynload/warpctc.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/operators/math/math_function.h"
+#include "paddle/fluid/operators/math/sequence_padding.h"
+#include "paddle/fluid/operators/math/sequence_scale.h"
+#include "paddle/fluid/platform/dynload/warpctc.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/operators/while_op.cc b/paddle/fluid/operators/while_op.cc
index a744ebd61595403ee495a2e2c9e84181422e92ff..d254c572acff52d967e551c377b3b32b05c92973 100644
--- a/paddle/fluid/operators/while_op.cc
+++ b/paddle/fluid/operators/while_op.cc
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <vector>
-#include "paddle/framework/executor.h"
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/op_registry.h"
-#include "paddle/framework/operator.h"
-#include "paddle/operators/detail/safe_ref.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
+#include "paddle/fluid/operators/detail/safe_ref.h"
 
 namespace paddle {
 namespace operators {
diff --git a/paddle/fluid/platform/cpu_info.cc b/paddle/fluid/platform/cpu_info.cc
index 78e1fa9df56b1623bfd9a53c6a37524d29648afc..47473aead0e512005a63e60b01170b41500dd1f6 100644
--- a/paddle/fluid/platform/cpu_info.cc
+++ b/paddle/fluid/platform/cpu_info.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/platform/cpu_info.h"
+#include "paddle/fluid/platform/cpu_info.h"
 
 #ifdef __APPLE__
 #include <sys/sysctl.h>
diff --git a/paddle/fluid/platform/cpu_info_test.cc b/paddle/fluid/platform/cpu_info_test.cc
index 1bfe62c1fb667e17d7383cf0a1b2632043c72743..d1fdba13b80629902faf2bcebb646572b36b459e 100644
--- a/paddle/fluid/platform/cpu_info_test.cc
+++ b/paddle/fluid/platform/cpu_info_test.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/platform/cpu_info.h"
+#include "paddle/fluid/platform/cpu_info.h"
 #include "paddle/string/printf.h"
 
 #include <ostream>
diff --git a/paddle/fluid/platform/cudnn_helper.h b/paddle/fluid/platform/cudnn_helper.h
index 80a4c9bb4bbcd03cf849d86118db4e502382f031..f2daa4f4fcc6fe43c2950b413024df7e301abf50 100644
--- a/paddle/fluid/platform/cudnn_helper.h
+++ b/paddle/fluid/platform/cudnn_helper.h
@@ -15,9 +15,9 @@ limitations under the License. */
 #pragma once
 
 #include <vector>
-#include "paddle/platform/dynload/cudnn.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/platform/dynload/cudnn.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/macros.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/cudnn_helper_test.cc b/paddle/fluid/platform/cudnn_helper_test.cc
index 427359f69713b961c4730b697d3ccde5f7085838..cd0bd3fe3ed115c4a91723e1023851456da74890 100644
--- a/paddle/fluid/platform/cudnn_helper_test.cc
+++ b/paddle/fluid/platform/cudnn_helper_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/platform/cudnn_helper.h"
+#include "paddle/fluid/platform/cudnn_helper.h"
 #include <gtest/gtest.h>
 
 TEST(CudnnHelper, ScopedTensorDescriptor) {
diff --git a/paddle/fluid/platform/device_context.cc b/paddle/fluid/platform/device_context.cc
index 9d9348079a0179418ab1a1474cfd8b69136f26b2..c4da846bb1c25abc3d31006657652abaa5a11add 100644
--- a/paddle/fluid/platform/device_context.cc
+++ b/paddle/fluid/platform/device_context.cc
@@ -9,8 +9,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/platform/device_context.h"
-#include "paddle/memory/memory.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/memory/memory.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/device_context.h b/paddle/fluid/platform/device_context.h
index 9826a642768a3346110a7872a726aba15eac1fb0..10b581f41a1e9473a2f85d3e5d2e40ee1fdaa1af 100644
--- a/paddle/fluid/platform/device_context.h
+++ b/paddle/fluid/platform/device_context.h
@@ -15,18 +15,18 @@ limitations under the License. */
 #include <unordered_map>
 
 #ifdef PADDLE_WITH_CUDA
-#include "paddle/platform/dynload/cublas.h"
-#include "paddle/platform/dynload/cudnn.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/platform/dynload/cublas.h"
+#include "paddle/fluid/platform/dynload/cudnn.h"
+#include "paddle/fluid/platform/gpu_info.h"
 #define EIGEN_USE_GPU
 #endif
 
 #ifdef PADDLE_WITH_MKLDNN
-#include "paddle/platform/mkldnn_helper.h"
+#include "paddle/fluid/platform/mkldnn_helper.h"
 #endif
 
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/place.h"
 #include "unsupported/Eigen/CXX11/Tensor"
 
 #include "glog/logging.h"
diff --git a/paddle/fluid/platform/device_context_test.cu b/paddle/fluid/platform/device_context_test.cu
index 767fe9b24a5d51630397a864c98928de52d21f31..f4dae6e90a8d12fc2dccab6fd3c6881e58e80fed 100644
--- a/paddle/fluid/platform/device_context_test.cu
+++ b/paddle/fluid/platform/device_context_test.cu
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "gtest/gtest.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"
 
 #include "glog/logging.h"
 
diff --git a/paddle/fluid/platform/dynload/cublas.cc b/paddle/fluid/platform/dynload/cublas.cc
index 6aca716657c5f629ce40e88c04dc25fbbc9b4f36..c599712554b1d6183c896eb7fc6ac5bbf71d67fc 100644
--- a/paddle/fluid/platform/dynload/cublas.cc
+++ b/paddle/fluid/platform/dynload/cublas.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/platform/dynload/cublas.h"
+#include "paddle/fluid/platform/dynload/cublas.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/cublas.h b/paddle/fluid/platform/dynload/cublas.h
index 61a22d9db3e07cbe6fbca0e0b09fedcba232ff6c..05f69e506515ac092c8509fba26e5b7a0f0823f7 100644
--- a/paddle/fluid/platform/dynload/cublas.h
+++ b/paddle/fluid/platform/dynload/cublas.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <cublas_v2.h>
 #include <dlfcn.h>
 #include <mutex>
-#include "paddle/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/cudnn.cc b/paddle/fluid/platform/dynload/cudnn.cc
index 701f6240fef2e9df25472c0caf6177e7f1964cfd..0b1c4c4f9609ebb61674c07f6cfd615d9674dfcd 100644
--- a/paddle/fluid/platform/dynload/cudnn.cc
+++ b/paddle/fluid/platform/dynload/cudnn.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/platform/dynload/cudnn.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/dynload/cudnn.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/cudnn.h b/paddle/fluid/platform/dynload/cudnn.h
index b92634794947f6979255d6241ff3a333f3771bfb..00dfbc83872ed04d2b4e840e3f6ac31e89a8a3cd 100644
--- a/paddle/fluid/platform/dynload/cudnn.h
+++ b/paddle/fluid/platform/dynload/cudnn.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <cudnn.h>
 #include <dlfcn.h>
 #include <mutex>
-#include "paddle/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/curand.cc b/paddle/fluid/platform/dynload/curand.cc
index d05dd88126bfee7278e553710a717b8f2eb02ae0..eac690b1458a4e53f6958b77d01d2c3c9f26f6eb 100644
--- a/paddle/fluid/platform/dynload/curand.cc
+++ b/paddle/fluid/platform/dynload/curand.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/platform/dynload/curand.h>
+#include "paddle/fluid/platform/dynload/curand.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/curand.h b/paddle/fluid/platform/dynload/curand.h
index 7bfe0778c78f6075ec8a284d478a1f9d5ee66ae9..ce3115b3ce0dbaa30af63bfc15908f81c16309d1 100644
--- a/paddle/fluid/platform/dynload/curand.h
+++ b/paddle/fluid/platform/dynload/curand.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <curand.h>
 #include <dlfcn.h>
 #include <mutex>
-#include "paddle/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/dynamic_loader.cc b/paddle/fluid/platform/dynload/dynamic_loader.cc
index c8c09ae608fa7cc67a54fada9cfe86b40096a9fd..eb00f93b7cde0a39beb4adabd910eef634c2581c 100644
--- a/paddle/fluid/platform/dynload/dynamic_loader.cc
+++ b/paddle/fluid/platform/dynload/dynamic_loader.cc
@@ -12,14 +12,14 @@ 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/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/dynload/dynamic_loader.h"
 #include <dlfcn.h>
 #include <memory>
 #include <mutex>
 #include <string>
 #include "gflags/gflags.h"
 #include "glog/logging.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 
 DEFINE_string(cudnn_dir, "",
               "Specify path for loading libcudnn.so. For instance, "
diff --git a/paddle/fluid/platform/dynload/nccl.cc b/paddle/fluid/platform/dynload/nccl.cc
index 4cec829a8ad8994d4a7643613331881e3a397b9a..1dc3e96f04a4f98e5cf0cb7848a99213ca082b79 100644
--- a/paddle/fluid/platform/dynload/nccl.cc
+++ b/paddle/fluid/platform/dynload/nccl.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/platform/dynload/nccl.h"
+#include "paddle/fluid/platform/dynload/nccl.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/nccl.h b/paddle/fluid/platform/dynload/nccl.h
index 6c776afc97a53c964f0bc2b2a8abf2c29f474d3f..349a4d0ba325fe1f7c23873c82dce0d35d295340 100644
--- a/paddle/fluid/platform/dynload/nccl.h
+++ b/paddle/fluid/platform/dynload/nccl.h
@@ -17,8 +17,8 @@ limitations under the License. */
 #include <dlfcn.h>
 #include <nccl.h>
 #include <mutex>
-#include "paddle/platform/call_once.h"
-#include "paddle/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/call_once.h"
+#include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/warpctc.cc b/paddle/fluid/platform/dynload/warpctc.cc
index 9b7d01a6e8f6cccc0082f65f9511085d2a3111b7..84de2cae94790ca44c8c0f87d75a45a1b7001a64 100644
--- a/paddle/fluid/platform/dynload/warpctc.cc
+++ b/paddle/fluid/platform/dynload/warpctc.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/platform/dynload/warpctc.h"
+#include "paddle/fluid/platform/dynload/warpctc.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/dynload/warpctc.h b/paddle/fluid/platform/dynload/warpctc.h
index acafcaff2ccc33c315f216e31b866bf4c8ae1fec..f1955818dede54b0d9c53cb33b95c6102b854d7b 100644
--- a/paddle/fluid/platform/dynload/warpctc.h
+++ b/paddle/fluid/platform/dynload/warpctc.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <dlfcn.h>
 #include <mutex>
 #include "ctc.h"
-#include "paddle/platform/dynload/dynamic_loader.h"
+#include "paddle/fluid/platform/dynload/dynamic_loader.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/enforce.cc b/paddle/fluid/platform/enforce.cc
index e8d31bc782ec3cddd18ceaedf88fe5e7b4aed2cc..55cd80943cf18545d3cac6f3ebddee1030d62b37 100644
--- a/paddle/fluid/platform/enforce.cc
+++ b/paddle/fluid/platform/enforce.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/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace platform {}  // namespace platform
diff --git a/paddle/fluid/platform/enforce.h b/paddle/fluid/platform/enforce.h
index d1c7be0790b5e11d6273efe6c08cdb7bf22425c6..b22893c0a56f39347894924b3cd6ea64180aa8b6 100644
--- a/paddle/fluid/platform/enforce.h
+++ b/paddle/fluid/platform/enforce.h
@@ -22,7 +22,7 @@ limitations under the License. */
 #include <stdexcept>
 #include <string>
 
-#include "paddle/platform/macros.h"
+#include "paddle/fluid/platform/macros.h"
 #include "paddle/string/printf.h"
 #include "paddle/string/to_string.h"
 
@@ -34,10 +34,10 @@ limitations under the License. */
 
 #ifdef PADDLE_WITH_CUDA
 
-#include "paddle/platform/dynload/cublas.h"
-#include "paddle/platform/dynload/cudnn.h"
-#include "paddle/platform/dynload/curand.h"
-#include "paddle/platform/dynload/nccl.h"
+#include "paddle/fluid/platform/dynload/cublas.h"
+#include "paddle/fluid/platform/dynload/cudnn.h"
+#include "paddle/fluid/platform/dynload/curand.h"
+#include "paddle/fluid/platform/dynload/nccl.h"
 
 #include <cublas_v2.h>
 #include <cudnn.h>
diff --git a/paddle/fluid/platform/enforce_test.cc b/paddle/fluid/platform/enforce_test.cc
index 8206a055eabf4abf584962e921610d5029e2f571..896a9a04eca80f22bebf87859d277458d9bdb092 100644
--- a/paddle/fluid/platform/enforce_test.cc
+++ b/paddle/fluid/platform/enforce_test.cc
@@ -14,7 +14,7 @@ limitations under the License. */
 #include <memory>
 
 #include "gtest/gtest.h"
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 #include "paddle/string/piece.h"
 
 using StringPiece = paddle::string::Piece;
diff --git a/paddle/fluid/platform/for_range.h b/paddle/fluid/platform/for_range.h
index 694a66d9ac4eb6ad02daf1931806fa1287de7cab..0e695328c394cd5cd1a14f42b7c82e8899e2167b 100644
--- a/paddle/fluid/platform/for_range.h
+++ b/paddle/fluid/platform/for_range.h
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #pragma once
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/gpu_info.cc b/paddle/fluid/platform/gpu_info.cc
index 7037551d7544d6fea54e2f4bf887309b7dc5a52e..1797f59a9c9731d28febe32d268d2b07073550eb 100644
--- a/paddle/fluid/platform/gpu_info.cc
+++ b/paddle/fluid/platform/gpu_info.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/platform/gpu_info.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 #include "gflags/gflags.h"
 
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 
 DEFINE_double(fraction_of_gpu_memory_to_use, 0.92,
               "Default use 92% of GPU memory for PaddlePaddle,"
diff --git a/paddle/fluid/platform/nccl_test.cu b/paddle/fluid/platform/nccl_test.cu
index 84f5ac28be319473d045dc554bf2cb3c0e48803a..75b95aff1a41dac70f1b732938c648ca55b2a973 100644
--- a/paddle/fluid/platform/nccl_test.cu
+++ b/paddle/fluid/platform/nccl_test.cu
@@ -19,11 +19,11 @@ limitations under the License. */
 #include "glog/logging.h"
 #include "gtest/gtest.h"
 
-#include "paddle/framework/init.h"
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/dynload/nccl.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/dynload/nccl.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/gpu_info.h"
 
 static int dev_count = 0;
 
diff --git a/paddle/fluid/platform/place.cc b/paddle/fluid/platform/place.cc
index f05260ccac4c2b11e5568d484141720fa4792d13..e99b75d761abcf065070f463d578171797383cea 100644
--- a/paddle/fluid/platform/place.cc
+++ b/paddle/fluid/platform/place.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/platform/place.h"
+#include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/place.h b/paddle/fluid/platform/place.h
index fbb43fa043a44c302e6b1cc67d83c18d791f07c5..2977a41036e84fc5aabd69c24cc9e62391b7dc38 100644
--- a/paddle/fluid/platform/place.h
+++ b/paddle/fluid/platform/place.h
@@ -15,8 +15,8 @@ limitations under the License. */
 #pragma once
 
 #include <iostream>
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/variant.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/variant.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/place_test.cc b/paddle/fluid/platform/place_test.cc
index 150b2d3b1fbacec18ea33156f30f1c9965aedb31..f248902d91c1ffad1364a2f1078a41626b61ac22 100644
--- a/paddle/fluid/platform/place_test.cc
+++ b/paddle/fluid/platform/place_test.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/platform/place.h"
+#include "paddle/fluid/platform/place.h"
 #include <sstream>
 #include "gtest/gtest.h"
 
diff --git a/paddle/fluid/platform/profiler.cc b/paddle/fluid/platform/profiler.cc
index 6df087d154cc104955c6399050c9cb2bce8d36e1..28d2675f799a2d398d43dc31c550f0d84424116e 100644
--- a/paddle/fluid/platform/profiler.cc
+++ b/paddle/fluid/platform/profiler.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/platform/profiler.h"
+#include "paddle/fluid/platform/profiler.h"
 #include <iomanip>
 #include <map>
 #include "glog/logging.h"
diff --git a/paddle/fluid/platform/profiler.h b/paddle/fluid/platform/profiler.h
index 8de1e6ad296d1e15c1659ccf431f1d5013eb608c..0bc5e666cb4f28b99169435cb3dd52829c35a2c2 100644
--- a/paddle/fluid/platform/profiler.h
+++ b/paddle/fluid/platform/profiler.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <list>
 #include <mutex>
 #include <vector>
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/platform/device_context.h"
 
 namespace paddle {
 namespace platform {
diff --git a/paddle/fluid/platform/profiler_test.cc b/paddle/fluid/platform/profiler_test.cc
index 81f10c91342f76910cc780b0ebd0c0df04e9d7bf..d2525c38b6fb98ea9bac49f7eb28e755bd7fa9a2 100644
--- a/paddle/fluid/platform/profiler_test.cc
+++ b/paddle/fluid/platform/profiler_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/platform/profiler.h"
+#include "paddle/fluid/platform/profiler.h"
 #include "gtest/gtest.h"
 
 TEST(Event, CpuElapsedTime) {
diff --git a/paddle/fluid/platform/transform.h b/paddle/fluid/platform/transform.h
index a88902b164c7a705cae09662e724b35cd8c8b4bf..879daed19102c85cc5ea03933f8324023cec0fe2 100644
--- a/paddle/fluid/platform/transform.h
+++ b/paddle/fluid/platform/transform.h
@@ -14,17 +14,17 @@ limitations under the License. */
 
 #pragma once
 
-#include "paddle/platform/device_context.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/hostdevice.h"
-#include "paddle/platform/place.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/hostdevice.h"
+#include "paddle/fluid/platform/place.h"
 
 #include <algorithm>
 #include <type_traits>
 #ifdef __NVCC__
 #include <thrust/execution_policy.h>
 #include <thrust/transform.h>
-#include "paddle/platform/details/device_ptr_cast.h"
+#include "paddle/fluid/platform/details/device_ptr_cast.h"
 #endif
 
 namespace paddle {
diff --git a/paddle/fluid/platform/transform_test.cu b/paddle/fluid/platform/transform_test.cu
index af9204a0a7b6e09fcfdacb8ba985e269665b4034..0e4b9edc2fd45e9c00f5339948172f6267210363 100644
--- a/paddle/fluid/platform/transform_test.cu
+++ b/paddle/fluid/platform/transform_test.cu
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <gtest/gtest.h>
-#include "paddle/memory/memcpy.h"
-#include "paddle/memory/memory.h"
-#include "paddle/platform/hostdevice.h"
-#include "paddle/platform/transform.h"
+#include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/memory/memory.h"
+#include "paddle/fluid/platform/hostdevice.h"
+#include "paddle/fluid/platform/transform.h"
 
 template <typename T>
 class Scale {
diff --git a/paddle/fluid/pybind/.clang-format b/paddle/fluid/pybind/.clang-format
deleted file mode 120000
index 7d28cb3924707d39dafe20f4664fb17b5538996c..0000000000000000000000000000000000000000
--- a/paddle/fluid/pybind/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-../framework/.clang-format
\ No newline at end of file
diff --git a/paddle/fluid/pybind/.clang-format b/paddle/fluid/pybind/.clang-format
new file mode 100644
index 0000000000000000000000000000000000000000..29282dc87e2c499988c17d90d47d44cd5cf7f115
--- /dev/null
+++ b/paddle/fluid/pybind/.clang-format
@@ -0,0 +1,5 @@
+---
+Language:        Cpp
+BasedOnStyle:  Google
+Standard:  Cpp11 
+...
diff --git a/paddle/fluid/pybind/const_value.cc b/paddle/fluid/pybind/const_value.cc
index b13ad42ea29453354798d88bff8ef47339d1a614..098252a83d3b7e2926bf737ce7f2b3794046f28f 100644
--- a/paddle/fluid/pybind/const_value.cc
+++ b/paddle/fluid/pybind/const_value.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include "const_value.h"
-#include "paddle/framework/operator.h"
+#include "paddle/fluid/framework/operator.h"
 
 namespace paddle {
 namespace pybind {
diff --git a/paddle/fluid/pybind/const_value.h b/paddle/fluid/pybind/const_value.h
index 3d57c972a9d5339c0e155fa1d6395af9face8744..67d14ac9ff01d1754dd8dd165b638db12c9d0ea0 100644
--- a/paddle/fluid/pybind/const_value.h
+++ b/paddle/fluid/pybind/const_value.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include <Python.h>
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 #include "pybind11/pybind11.h"
 
 namespace py = pybind11;
diff --git a/paddle/fluid/pybind/exception.cc b/paddle/fluid/pybind/exception.cc
index e29ac3ebab760a011a3798f8e4be46270d6b80cc..7398a88541bcbf338ca9568595d0dc7b16eff118 100644
--- a/paddle/fluid/pybind/exception.cc
+++ b/paddle/fluid/pybind/exception.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/pybind/exception.h"
+#include "paddle/fluid/pybind/exception.h"
 
 namespace paddle {
 namespace pybind {
diff --git a/paddle/fluid/pybind/exception.h b/paddle/fluid/pybind/exception.h
index 436ddd5707ace37a5668c8d4401c1bdcf2dadfe3..43e91a706300e561a20d88abe80d9b6654bd2171 100644
--- a/paddle/fluid/pybind/exception.h
+++ b/paddle/fluid/pybind/exception.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include <Python.h>
-#include "paddle/platform/enforce.h"
+#include "paddle/fluid/platform/enforce.h"
 #include "pybind11/pybind11.h"
 namespace paddle {
 namespace pybind {
diff --git a/paddle/fluid/pybind/protobuf.cc b/paddle/fluid/pybind/protobuf.cc
index 0a92e10927caf00be60fdd8107600b4033cf09ea..4aefcf1a1cdcb3ad2408ded2f76a69570eccb41d 100644
--- a/paddle/fluid/pybind/protobuf.cc
+++ b/paddle/fluid/pybind/protobuf.cc
@@ -12,14 +12,14 @@ 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/pybind/protobuf.h"
+#include "paddle/fluid/pybind/protobuf.h"
 #include <deque>
 #include <iostream>
-#include "paddle/framework/backward.h"
-#include "paddle/framework/block_desc.h"
-#include "paddle/framework/op_desc.h"
-#include "paddle/framework/program_desc.h"
-#include "paddle/framework/var_desc.h"
+#include "paddle/fluid/framework/backward.h"
+#include "paddle/fluid/framework/block_desc.h"
+#include "paddle/fluid/framework/op_desc.h"
+#include "paddle/fluid/framework/program_desc.h"
+#include "paddle/fluid/framework/var_desc.h"
 
 // Cast boost::variant for PyBind.
 // Copy from
diff --git a/paddle/fluid/pybind/protobuf.h b/paddle/fluid/pybind/protobuf.h
index 9e747e9ea60fd95c74937daa283bc7a9eb9368c0..c828e4583d259a462ece4145c7beb75e249e8429 100644
--- a/paddle/fluid/pybind/protobuf.h
+++ b/paddle/fluid/pybind/protobuf.h
@@ -17,7 +17,7 @@ limitations under the License. */
 #include <Python.h>
 #include <fstream>
 #include <vector>
-#include "paddle/platform/variant.h"
+#include "paddle/fluid/platform/variant.h"
 #include "pybind11/numpy.h"
 #include "pybind11/pybind11.h"
 #include "pybind11/stl.h"
diff --git a/paddle/fluid/pybind/pybind.cc b/paddle/fluid/pybind/pybind.cc
index a880d9bdbc63aacc1f2cdbc0d7da001a59c7b372..8924aabd17b18504a863990e1196e664905bbb52 100644
--- a/paddle/fluid/pybind/pybind.cc
+++ b/paddle/fluid/pybind/pybind.cc
@@ -12,35 +12,35 @@ 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/pybind/protobuf.h"
+#include "paddle/fluid/pybind/protobuf.h"
 
 #include <mutex>  // for call_once
 #include <unordered_map>
-#include "paddle/framework/backward.h"
-#include "paddle/framework/executor.h"
-#include "paddle/framework/feed_fetch_method.h"
-#include "paddle/framework/framework.pb.h"
-#include "paddle/framework/init.h"
-#include "paddle/framework/lod_rank_table.h"
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/framework/lod_tensor_array.h"
-#include "paddle/framework/prune.h"
-#include "paddle/framework/selected_rows.h"
-#include "paddle/operators/cond_op.h"
-#include "paddle/operators/net_op.h"
-#include "paddle/platform/enforce.h"
-#include "paddle/platform/place.h"
-#include "paddle/platform/profiler.h"
-#include "paddle/pybind/const_value.h"
-#include "paddle/pybind/exception.h"
-#include "paddle/pybind/pybind.h"
-#include "paddle/pybind/tensor_py.h"
+#include "paddle/fluid/framework/backward.h"
+#include "paddle/fluid/framework/executor.h"
+#include "paddle/fluid/framework/feed_fetch_method.h"
+#include "paddle/fluid/framework/framework.pb.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/framework/lod_rank_table.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/framework/lod_tensor_array.h"
+#include "paddle/fluid/framework/prune.h"
+#include "paddle/fluid/framework/selected_rows.h"
+#include "paddle/fluid/operators/cond_op.h"
+#include "paddle/fluid/operators/net_op.h"
+#include "paddle/fluid/platform/enforce.h"
+#include "paddle/fluid/platform/place.h"
+#include "paddle/fluid/platform/profiler.h"
+#include "paddle/fluid/pybind/const_value.h"
+#include "paddle/fluid/pybind/exception.h"
+#include "paddle/fluid/pybind/pybind.h"
+#include "paddle/fluid/pybind/tensor_py.h"
 #include "paddle/string/to_string.h"
 
 #ifdef PADDLE_WITH_CUDA
-#include "paddle/operators/nccl/nccl_gpu_common.h"
-#include "paddle/platform/cuda_profiler.h"
-#include "paddle/platform/gpu_info.h"
+#include "paddle/fluid/operators/nccl/nccl_gpu_common.h"
+#include "paddle/fluid/platform/cuda_profiler.h"
+#include "paddle/fluid/platform/gpu_info.h"
 #endif
 
 // disable auto conversion to list in Python
diff --git a/paddle/fluid/pybind/tensor_py.h b/paddle/fluid/pybind/tensor_py.h
index 3b5210e2b91dd697e213a0c847f73c6969cd654b..0261709f1e47afce268471e1c7586937b6d4a6b9 100644
--- a/paddle/fluid/pybind/tensor_py.h
+++ b/paddle/fluid/pybind/tensor_py.h
@@ -14,9 +14,9 @@ limitations under the License. */
 
 #pragma once
 #include <string>
-#include "paddle/framework/lod_tensor.h"
-#include "paddle/memory/memcpy.h"
-#include "paddle/platform/device_context.h"
+#include "paddle/fluid/framework/lod_tensor.h"
+#include "paddle/fluid/memory/memcpy.h"
+#include "paddle/fluid/platform/device_context.h"
 #include "pybind11/numpy.h"
 #include "pybind11/pybind11.h"
 
diff --git a/paddle/math/float16.h b/paddle/math/float16.h
index efebbce50405018c6b7ce2049f8d55c33680469f..63248d36f9d010547271a95505e5414ff770b8d8 100644
--- a/paddle/math/float16.h
+++ b/paddle/math/float16.h
@@ -22,7 +22,7 @@ limitations under the License. */
 
 #include "unsupported/Eigen/CXX11/Tensor"
 
-#include "paddle/platform/hostdevice.h"
+#include "paddle/fluid/platform/hostdevice.h"
 
 #ifdef __GNUC__
 #define PADDLE_GNUC_VER (__GNUC__ * 10 + __GNUC_MINOR__)
diff --git a/paddle/testing/paddle_gtest_main.cc b/paddle/testing/paddle_gtest_main.cc
index ab84f1c292b97f55d88165e7ef0e32b93d542802..270f2f4c181df847348be12a199534d47b3577f5 100644
--- a/paddle/testing/paddle_gtest_main.cc
+++ b/paddle/testing/paddle_gtest_main.cc
@@ -16,8 +16,8 @@ limitations under the License. */
 
 #include "gflags/gflags.h"
 #include "gtest/gtest.h"
-#include "paddle/framework/init.h"
-#include "paddle/memory/memory.h"
+#include "paddle/fluid/framework/init.h"
+#include "paddle/fluid/memory/memory.h"
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);