Skip to content

Commit 4a5e80f

Browse files
jiweibojiweibo
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into place_for_all
2 parents 87111ea + 5c35867 commit 4a5e80f

File tree

208 files changed

+2432
-1873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+2432
-1873
lines changed

‎cmake/external/llvm.cmake‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include(FetchContent)
22

3-
set(LLVM_DOWNLOAD_URL https://paddle-inference-dist.bj.bcebos.com/CINN/llvm11.tar.gz)
4-
set(LLVM_MD5 39d32b6be466781dddf5869318dcba53)
3+
set(LLVM_DOWNLOAD_URL https://paddle-inference-dist.bj.bcebos.com/infrt/llvm_b5149f4e66a49a98b67e8e2de4e24a4af8e2781b.tar.gz)
4+
set(LLVM_MD5 022819bb5760817013cf4b8a37e97d5e)
55

66
set(FETCHCONTENT_BASE_DIR ${THIRD_PARTY_PATH}/llvm)
77
set(FETCHCONTENT_QUIET OFF)
@@ -51,16 +51,18 @@ message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
5151
# To build with MLIR, the LLVM is build from source code using the following flags:
5252

5353
#[==[
54-
cmake -G Ninja ../llvm \
54+
cmake ../llvm -G "Unix Makefiles" \
5555
-DLLVM_ENABLE_PROJECTS="mlir;clang" \
5656
-DLLVM_BUILD_EXAMPLES=OFF \
5757
-DLLVM_TARGETS_TO_BUILD="X86" \
5858
-DCMAKE_BUILD_TYPE=Release \
5959
-DLLVM_ENABLE_ASSERTIONS=ON \
6060
-DLLVM_ENABLE_ZLIB=OFF \
6161
-DLLVM_ENABLE_RTTI=ON \
62+
-DLLVM_INSTALL_UTILS=ON \
63+
-DCMAKE_INSTALL_PREFIX=./install
6264
#]==]
63-
# The matched llvm-project version is f9dc2b7079350d0fed3bb3775f496b90483c9e42 (currently a temporary commit)
65+
# The matched llvm-project version is b5149f4e66a49a98b67e8e2de4e24a4af8e2781b (currently a temporary commit)
6466

6567
add_definitions(${LLVM_DEFINITIONS})
6668

@@ -75,7 +77,7 @@ add_definitions(${LLVM_DEFINITIONS})
7577

7678

7779
# The minimum needed libraries for MLIR IR parse and transform.
78-
set(MLIR_IR_LIBS MLIRAnalysis MLIRStandardOps MLIRPass MLIRParser MLIRDialect MLIRIR MLIROptLib)
80+
set(MLIR_IR_LIBS MLIRAnalysis MLIRPass MLIRParser MLIRDialect MLIRIR MLIROptLib)
7981

8082

8183
# tb_base is the name of a xxx.td file (without the .td suffix)
@@ -89,6 +91,7 @@ function(mlir_tablegen_on td_base)
8991
mlir_tablegen(${td_base}.cpp.inc -gen-op-defs)
9092
if (mlir_tablegen_on_DIALECT)
9193
mlir_tablegen(${td_base}_dialect.hpp.inc --gen-dialect-decls -dialect=${mlir_tablegen_on_DIALECT})
94+
mlir_tablegen(${td_base}_dialect.cpp.inc --gen-dialect-defs -dialect=${mlir_tablegen_on_DIALECT})
9295
endif()
9396
add_public_tablegen_target(${td_base}_IncGen)
9497
add_custom_target(${td_base}_inc DEPENDS ${td_base}_IncGen)

‎paddle/fluid/distributed/fleet.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ limitations under the License. */
3636

3737
namespace paddle {
3838
namespace framework {
39-
class LoDTensor;
39+
class Tensor;
4040
class Scope;
4141
class SelectedRows;
4242
class Variable;

‎paddle/fluid/distributed/service/brpc_utils.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License. */
2020
namespace paddle {
2121
namespace framework {
2222
class Variable;
23-
class LoDTensor;
23+
class Tensor;
2424
} // namespace framework
2525
} // namespace paddle
2626

‎paddle/fluid/distributed/test/brpc_service_dense_sgd_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class PSClient;
3131
class PSServer;
3232
} // namespace distributed
3333
namespace framework {
34-
class LoDTensor;
34+
class Tensor;
3535
class Variable;
3636
} // namespace framework
3737
} // namespace paddle

‎paddle/fluid/distributed/test/brpc_service_sparse_sgd_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class PSClient;
3232
class PSServer;
3333
} // namespace distributed
3434
namespace framework {
35-
class LoDTensor;
35+
class Tensor;
3636
class Variable;
3737
} // namespace framework
3838
} // namespace paddle

‎paddle/fluid/eager/tests/data_structure_tests/accumulation_node_test.cc‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,27 @@ TEST(AccumulationNode, EagerTensor) {
3232
pten::DenseTensorMeta meta = pten::DenseTensorMeta(
3333
pten::DataType::FLOAT16, paddle::framework::make_ddim({1, 1}));
3434
std::shared_ptr<pten::DenseTensor> dt0 = std::make_shared<pten::DenseTensor>(
35-
pten::make_intrusive<paddle::experimental::SharedStorage>(
36-
paddle::platform::CPUPlace()),
35+
std::make_unique<paddle::experimental::DefaultAllocator>(
36+
paddle::platform::CPUPlace())
37+
.get(),
3738
meta);
3839
dt0->mutable_data<paddle::platform::float16>()[0] = 10.0;
3940
EagerTensor et0 = EagerTensor(dt0);
4041

4142
std::shared_ptr<pten::DenseTensor> dt1 = std::make_shared<pten::DenseTensor>(
42-
pten::make_intrusive<paddle::experimental::SharedStorage>(
43-
paddle::platform::CPUPlace()),
43+
std::make_unique<paddle::experimental::DefaultAllocator>(
44+
paddle::platform::CPUPlace())
45+
.get(),
4446
meta);
4547

4648
dt1->mutable_data<paddle::platform::float16>()[0] = 20.0;
4749
EagerTensor et1 = EagerTensor(dt1);
4850

4951
std::shared_ptr<pten::DenseTensor> grad_dt =
5052
std::make_shared<pten::DenseTensor>(
51-
pten::make_intrusive<paddle::experimental::SharedStorage>(
52-
paddle::platform::CPUPlace()),
53+
std::make_unique<paddle::experimental::DefaultAllocator>(
54+
paddle::platform::CPUPlace())
55+
.get(),
5356
meta);
5457
EagerTensor grad_et = EagerTensor(grad_dt);
5558

‎paddle/fluid/eager/tests/data_structure_tests/autograd_meta_test.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ TEST(AutogradMeta, MemberFunction) {
4242
pten::DenseTensorMeta meta = pten::DenseTensorMeta(
4343
pten::DataType::FLOAT32, paddle::framework::make_ddim({1, 2}));
4444
std::shared_ptr<pten::DenseTensor> dt = std::make_shared<pten::DenseTensor>(
45-
pten::make_intrusive<paddle::experimental::SharedStorage>(
46-
paddle::platform::CPUPlace()),
45+
std::make_unique<paddle::experimental::DefaultAllocator>(
46+
paddle::platform::CPUPlace())
47+
.get(),
4748
meta);
4849
auto* dt_ptr = dt->mutable_data<float>();
4950
dt_ptr[0] = 5.0f;

‎paddle/fluid/eager/tests/data_structure_tests/eager_tensor_test.cc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ TEST(EagerTensor, Constructor) {
3636
pten::DenseTensorMeta meta = pten::DenseTensorMeta(
3737
pten::DataType::FLOAT32, paddle::framework::make_ddim({1, 2}));
3838
std::shared_ptr<pten::DenseTensor> dt = std::make_shared<pten::DenseTensor>(
39-
pten::make_intrusive<paddle::experimental::SharedStorage>(
40-
paddle::platform::CPUPlace()),
39+
std::make_unique<paddle::experimental::DefaultAllocator>(
40+
paddle::platform::CPUPlace())
41+
.get(),
4142
meta);
4243
auto* dt_ptr = dt->mutable_data<float>();
4344
dt_ptr[0] = 5.0f;
@@ -65,8 +66,9 @@ TEST(EagerTensor, MemberFunction) {
6566
pten::DenseTensorMeta meta = pten::DenseTensorMeta(
6667
pten::DataType::FLOAT32, paddle::framework::make_ddim({1, 2}));
6768
std::shared_ptr<pten::DenseTensor> dt = std::make_shared<pten::DenseTensor>(
68-
pten::make_intrusive<paddle::experimental::SharedStorage>(
69-
paddle::platform::CPUPlace()),
69+
std::make_unique<paddle::experimental::DefaultAllocator>(
70+
paddle::platform::CPUPlace())
71+
.get(),
7072
meta);
7173
auto* dt_ptr = dt->mutable_data<float>();
7274
dt_ptr[0] = 5.0f;

‎paddle/fluid/eager/tests/data_structure_tests/grad_node_info_test.cc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ TEST(GradNodeInfo, GradNodeBase) {
4141
pten::DenseTensorMeta meta = pten::DenseTensorMeta(
4242
pten::DataType::FLOAT32, paddle::framework::make_ddim({1, 1}));
4343
std::shared_ptr<pten::DenseTensor> dt = std::make_shared<pten::DenseTensor>(
44-
pten::make_intrusive<paddle::experimental::SharedStorage>(
45-
paddle::platform::CPUPlace()),
44+
std::make_unique<paddle::experimental::DefaultAllocator>(
45+
paddle::platform::CPUPlace())
46+
.get(),
4647
meta);
4748
auto* dt_ptr = dt->mutable_data<float>();
4849
dt_ptr[0] = 5.0f;
@@ -97,8 +98,9 @@ TEST(GradNodeInfo, GradNodeBase) {
9798
pten::DenseTensorMeta meta = pten::DenseTensorMeta(
9899
pten::DataType::FLOAT32, paddle::framework::make_ddim({1, 1}));
99100
std::shared_ptr<pten::DenseTensor> dt = std::make_shared<pten::DenseTensor>(
100-
pten::make_intrusive<paddle::experimental::SharedStorage>(
101-
paddle::platform::CPUPlace()),
101+
std::make_unique<paddle::experimental::DefaultAllocator>(
102+
paddle::platform::CPUPlace())
103+
.get(),
102104
meta);
103105
auto* dt_ptr = dt->mutable_data<float>();
104106
dt_ptr[0] = 6.0f;

‎paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ class GradTestNode : public egr::GradNodeBase {
3737
pten::DenseTensorMeta meta = pten::DenseTensorMeta(
3838
pten::DataType::FLOAT32, paddle::framework::make_ddim({1, 1}));
3939
std::shared_ptr<pten::DenseTensor> dt = std::make_shared<pten::DenseTensor>(
40-
pten::make_intrusive<paddle::experimental::SharedStorage>(
41-
paddle::platform::CPUPlace()),
40+
std::make_unique<paddle::experimental::DefaultAllocator>(
41+
paddle::platform::CPUPlace())
42+
.get(),
4243
meta);
4344
auto* dt_ptr = dt->mutable_data<float>();
4445
dt_ptr[0] = 6.0f;

0 commit comments

Comments
 (0)