Correct #include path

emailweixu-patch-1
Yi Wang 8 years ago
parent 90648f336d
commit fc374821dd

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/attribute.h" #include "paddle/fluid/framework/attribute.h"
#include <vector> #include <vector>

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

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/backward.h" #include "paddle/fluid/framework/backward.h"
#include "paddle/operators/net_op.h" #include "paddle/fluid/operators/net_op.h"
#include <deque> #include <deque>
#include <list> #include <list>
#include <memory> #include <memory>
#include <unordered_set> #include <unordered_set>
#include "paddle/framework/block_desc.h" #include "paddle/fluid/framework/block_desc.h"
#include "paddle/framework/op_registry.h" #include "paddle/fluid/framework/op_registry.h"
#include "paddle/operators/net_op.h" #include "paddle/fluid/operators/net_op.h"
namespace paddle { namespace paddle {
namespace framework { namespace framework {

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

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

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/block_desc.h" #include "paddle/fluid/framework/block_desc.h"
#include "paddle/framework/operator.h" #include "paddle/fluid/framework/operator.h"
#include "paddle/framework/program_desc.h" #include "paddle/fluid/framework/program_desc.h"
namespace paddle { namespace paddle {
namespace framework { namespace framework {

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

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

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/channel.h" #include "paddle/fluid/framework/channel.h"
#include <chrono> #include <chrono>
#include <thread> #include <thread>

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/data_device_transform.h" #include "paddle/fluid/framework/data_device_transform.h"
namespace paddle { namespace paddle {
namespace framework { namespace framework {

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

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

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

@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // 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 paddle {
namespace framework { namespace framework {

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

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

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/data_transform.h" #include "paddle/fluid/framework/data_transform.h"
#include "paddle/framework/data_device_transform.h" #include "paddle/fluid/framework/data_device_transform.h"
#include "paddle/framework/data_layout_transform.h" #include "paddle/fluid/framework/data_layout_transform.h"
#include "paddle/framework/data_type_transform.h" #include "paddle/fluid/framework/data_type_transform.h"
namespace paddle { namespace paddle {
namespace framework { namespace framework {

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

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

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ 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/fluid/framework/selected_rows.h"
#include "paddle/platform/transform.h" #include "paddle/fluid/platform/transform.h"
namespace paddle { namespace paddle {
namespace framework { namespace framework {

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

@ -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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/data_type_transform.h" #include "paddle/fluid/framework/data_type_transform.h"
#include "gtest/gtest.h" #include "gtest/gtest.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 See the License for the specific language governing permissions and
limitations under the License. */ limitations under the License. */
#include "paddle/framework/ddim.h" #include "paddle/fluid/framework/ddim.h"
#include "paddle/platform/enforce.h" #include "paddle/fluid/platform/enforce.h"
namespace paddle { namespace paddle {
namespace framework { namespace framework {

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

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

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save