Skip to content

[IR] rectify the new ir folder #54124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2023
Merged

[IR] rectify the new ir folder #54124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion paddle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ set(PYTHON_TESTS_DIR
CACHE INTERNAL "python tests directory")

add_subdirectory(utils)
add_subdirectory(ir)
add_subdirectory(scripts)
add_subdirectory(testing)
add_subdirectory(phi)
add_subdirectory(fluid)

add_subdirectory(ir)
add_subdirectory(pass)

# NOTE(zhiqiu): The changes of cc tests
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/dialect/legacy_pd_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#pragma once

#include "paddle/ir/op_base.h"
#include "paddle/ir/core/op_base.h"

namespace paddle {
namespace dialect {
Expand Down
8 changes: 4 additions & 4 deletions paddle/fluid/dialect/op_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{op_declare}
#else

#include "paddle/ir/op_base.h"
#include "paddle/ir/core/op_base.h"

{input}
#endif
Expand Down Expand Up @@ -67,9 +67,9 @@ class {op_name} : public ir::Op<{op_name}{interfaces}{traits}> {{
CC_FILE_TEMPLATE = """#include "{h_file}"
#include "paddle/fluid/dialect/pd_type.h"
#include "paddle/fluid/dialect/pd_attribute.h"
#include "paddle/ir/builtin_attribute.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/ir_context.h"
#include "paddle/ir/core/builtin_attribute.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/ir/core/ir_context.h"
#include "paddle/phi/core/enforce.h"

{input}
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/dialect/pd_attribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#pragma once

#include "paddle/fluid/dialect/pd_attribute_storage.h"
#include "paddle/ir/attribute.h"
#include "paddle/ir/core/attribute.h"

namespace paddle {
namespace dialect {
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/dialect/pd_attribute_storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#pragma once

#include "paddle/ir/attribute.h"
#include "paddle/ir/utils.h"
#include "paddle/ir/core/attribute.h"
#include "paddle/ir/core/utils.h"
#include "paddle/phi/common/data_type.h"
#include "paddle/phi/common/int_array.h"
#include "paddle/phi/common/layout.h"
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/dialect/pd_dialect.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "paddle/fluid/dialect/utils.h"
#include "paddle/fluid/framework/convert_utils.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/ir/dialect_interface.h"
#include "paddle/ir/core/dialect_interface.h"
#include "paddle/phi/core/dense_tensor.h"

namespace paddle {
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/dialect/pd_dialect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#pragma once

#include "paddle/fluid/framework/variable.h"
#include "paddle/ir/dialect.h"
#include "paddle/ir/parameter.h"
#include "paddle/ir/core/dialect.h"
#include "paddle/ir/core/parameter.h"

namespace paddle {
namespace dialect {
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/dialect/pd_type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#pragma once

#include "paddle/fluid/dialect/pd_type_storage.h"
#include "paddle/ir/type.h"
#include "paddle/ir/core/type.h"

namespace paddle {
namespace dialect {
Expand Down
4 changes: 2 additions & 2 deletions paddle/fluid/dialect/pd_type_storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#include <type_traits>

#include "paddle/ir/type.h"
#include "paddle/ir/utils.h"
#include "paddle/ir/core/type.h"
#include "paddle/ir/core/utils.h"

namespace std {
///
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/dialect/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "paddle/fluid/dialect/pd_type_storage.h"
#include "paddle/fluid/framework/convert_utils.h"
#include "paddle/fluid/framework/data_type.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/phi/core/dense_tensor.h"

namespace paddle {
Expand Down
8 changes: 4 additions & 4 deletions paddle/fluid/translator/op_translator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#include "paddle/fluid/translator/op_compat_info.h"
#include "paddle/fluid/translator/program_translator.h"
#include "paddle/fluid/translator/type_translator.h"
#include "paddle/ir/builtin_op.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/ir_context.h"
#include "paddle/ir/value.h"
#include "paddle/ir/core/builtin_op.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/ir/core/ir_context.h"
#include "paddle/ir/core/value.h"
#include "paddle/phi/core/enforce.h"

namespace paddle {
Expand Down
8 changes: 4 additions & 4 deletions paddle/fluid/translator/op_translator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include "paddle/fluid/framework/op_desc.h"
#include "paddle/fluid/framework/var_desc.h"
#include "paddle/fluid/translator/program_translator.h"
#include "paddle/ir/ir_context.h"
#include "paddle/ir/operation.h"
#include "paddle/ir/program.h"
#include "paddle/ir/value.h"
#include "paddle/ir/core/ir_context.h"
#include "paddle/ir/core/operation.h"
#include "paddle/ir/core/program.h"
#include "paddle/ir/core/value.h"

namespace paddle {
namespace translator {
Expand Down
8 changes: 4 additions & 4 deletions paddle/fluid/translator/program_translator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/translator/op_translator.h"
#include "paddle/fluid/translator/type_translator.h"
#include "paddle/ir/attribute.h"
#include "paddle/ir/builtin_op.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/operation.h"
#include "paddle/ir/core/attribute.h"
#include "paddle/ir/core/builtin_op.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/ir/core/operation.h"
#include "paddle/phi/core/enforce.h"

namespace paddle {
Expand Down
6 changes: 3 additions & 3 deletions paddle/fluid/translator/program_translator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include <vector>

#include "paddle/fluid/framework/program_desc.h"
#include "paddle/ir/ir_context.h"
#include "paddle/ir/program.h"
#include "paddle/ir/value.h"
#include "paddle/ir/core/ir_context.h"
#include "paddle/ir/core/program.h"
#include "paddle/ir/core/value.h"

namespace paddle {
namespace translator {
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/translator/translate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "paddle/fluid/dialect/pd_dialect.h"
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/translator/program_translator.h"
#include "paddle/ir/program.h"
#include "paddle/ir/core/program.h"

namespace paddle {

Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/translator/translate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "paddle/fluid/dialect/pd_dialect.h"
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/ir/program.h"
#include "paddle/ir/core/program.h"

namespace paddle {

Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/translator/type_translator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "paddle/fluid/dialect/pd_type.h"
#include "paddle/fluid/dialect/pd_type_storage.h"
#include "paddle/fluid/framework/framework.pb.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/core/builtin_type.h"

namespace paddle {
namespace translator {
Expand Down
6 changes: 3 additions & 3 deletions paddle/fluid/translator/type_translator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include "paddle/fluid/framework/op_desc.h"
#include "paddle/fluid/framework/var_desc.h"
#include "paddle/fluid/translator/program_translator.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/dialect.h"
#include "paddle/ir/ir_context.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/ir/core/dialect.h"
#include "paddle/ir/core/ir_context.h"

namespace paddle {
namespace translator {
Expand Down
7 changes: 1 addition & 6 deletions paddle/ir/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,4 @@ if(NOT WITH_NEWIR)
return()
endif()

set(NEWIR_SOURCE_DIR "${PADDLE_SOURCE_DIR}/paddle/ir")
set(NEWIR_BINARY_DIR "${PADDLE_BINARY_DIR}/paddle/ir")

file(GLOB IR_SRCS "*.cc")

cc_library(new_ir SRCS ${IR_SRCS})
add_subdirectory(core)
6 changes: 6 additions & 0 deletions paddle/ir/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set(NEWIR_SOURCE_DIR "${PADDLE_SOURCE_DIR}/paddle/ir")
set(NEWIR_BINARY_DIR "${PADDLE_BINARY_DIR}/paddle/ir")

file(GLOB IR_SRCS "*.cc")

cc_library(new_ir SRCS ${IR_SRCS})
4 changes: 2 additions & 2 deletions paddle/ir/attribute.cc → paddle/ir/core/attribute.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/ir/attribute.h"
#include "paddle/ir/dialect.h"
#include "paddle/ir/core/attribute.h"
#include "paddle/ir/core/dialect.h"

namespace ir {
IrContext *Attribute::ir_context() const { return dialect().ir_context(); }
Expand Down
4 changes: 2 additions & 2 deletions paddle/ir/attribute.h → paddle/ir/core/attribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

#pragma once

#include "paddle/ir/attribute_base.h"
#include "paddle/ir/cast_utils.h"
#include "paddle/ir/core/attribute_base.h"
#include "paddle/ir/core/cast_utils.h"

namespace ir {
///
Expand Down
6 changes: 3 additions & 3 deletions paddle/ir/attribute_base.h → paddle/ir/core/attribute_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

#pragma once

#include "paddle/ir/ir_context.h"
#include "paddle/ir/storage_manager.h"
#include "paddle/ir/type_id.h"
#include "paddle/ir/core/ir_context.h"
#include "paddle/ir/core/storage_manager.h"
#include "paddle/ir/core/type_id.h"

namespace ir {
class Dialect;
Expand Down
2 changes: 1 addition & 1 deletion paddle/ir/block.cc → paddle/ir/core/block.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/ir/block.h"
#include "paddle/ir/core/block.h"

namespace ir {
Block::~Block() { clear(); }
Expand Down
2 changes: 1 addition & 1 deletion paddle/ir/block.h → paddle/ir/core/block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#pragma once

#include <list>
#include "paddle/ir/operation.h"
#include "paddle/ir/core/operation.h"

namespace ir {
class Block {
Expand Down
2 changes: 1 addition & 1 deletion paddle/ir/builder.cc → paddle/ir/core/builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/ir/builder.h"
#include "paddle/ir/core/builder.h"

namespace ir {
Operation *Builder::insert(Operation *op) {
Expand Down
6 changes: 3 additions & 3 deletions paddle/ir/builder.h → paddle/ir/core/builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include <list>

#include "paddle/ir/block.h"
#include "paddle/ir/operation.h"
#include "paddle/ir/program.h"
#include "paddle/ir/core/block.h"
#include "paddle/ir/core/operation.h"
#include "paddle/ir/core/program.h"

namespace ir {
///
Expand Down
2 changes: 1 addition & 1 deletion paddle/ir/builtin_attribute.cc → paddle/ir/core/builtin_attribute.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/ir/builtin_attribute.h"
#include "paddle/ir/core/builtin_attribute.h"

namespace ir {
std::string StrAttribute::data() const { return storage()->GetAsKey(); }
Expand Down
6 changes: 3 additions & 3 deletions paddle/ir/builtin_attribute.h → paddle/ir/core/builtin_attribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

#pragma once

#include "paddle/ir/attribute.h"
#include "paddle/ir/builtin_attribute_storage.h"
#include "paddle/ir/utils.h"
#include "paddle/ir/core/attribute.h"
#include "paddle/ir/core/builtin_attribute_storage.h"
#include "paddle/ir/core/utils.h"

namespace ir {
class StrAttribute : public Attribute {
Expand Down
4 changes: 2 additions & 2 deletions paddle/ir/builtin_attribute_storage.h → paddle/ir/core/builtin_attribute_storage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <map>
#include <type_traits>

#include "paddle/ir/attribute.h"
#include "paddle/ir/utils.h"
#include "paddle/ir/core/attribute.h"
#include "paddle/ir/core/utils.h"

namespace ir {

Expand Down
8 changes: 4 additions & 4 deletions paddle/ir/builtin_dialect.cc → paddle/ir/core/builtin_dialect.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/ir/builtin_dialect.h"
#include "paddle/ir/builtin_attribute.h"
#include "paddle/ir/builtin_op.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/core/builtin_dialect.h"
#include "paddle/ir/core/builtin_attribute.h"
#include "paddle/ir/core/builtin_op.h"
#include "paddle/ir/core/builtin_type.h"

namespace ir {
BuiltinDialect::BuiltinDialect(ir::IrContext *context)
Expand Down
2 changes: 1 addition & 1 deletion paddle/ir/builtin_dialect.h → paddle/ir/core/builtin_dialect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#pragma once

#include "paddle/ir/dialect.h"
#include "paddle/ir/core/dialect.h"

namespace ir {
///
Expand Down
6 changes: 3 additions & 3 deletions paddle/ir/builtin_op.cc → paddle/ir/core/builtin_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/ir/builtin_op.h"
#include "paddle/ir/core/builtin_op.h"

#include "paddle/ir/builtin_attribute.h"
#include "paddle/ir/builtin_type.h"
#include "paddle/ir/core/builtin_attribute.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/phi/core/enforce.h"

namespace ir {
Expand Down
2 changes: 1 addition & 1 deletion paddle/ir/builtin_op.h → paddle/ir/core/builtin_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#pragma once

#include "paddle/ir/op_base.h"
#include "paddle/ir/core/op_base.h"

namespace ir {
///
Expand Down
2 changes: 1 addition & 1 deletion paddle/ir/builtin_type.cc → paddle/ir/core/builtin_type.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/ir/builtin_type.h"
#include "paddle/ir/core/builtin_type.h"

namespace ir {
std::vector<Type> VectorType::data() const { return storage()->GetAsKey(); }
Expand Down
Loading