Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
75c4a24c
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
75c4a24c
编写于
9月 06, 2023
作者:
Z
zhangbo9674
提交者:
GitHub
9月 06, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[IR] Add IrMetaTensor (#56973)
* add meta tensor * refine code * fix bug * fix bug
上级
1b7c1c56
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
168 addition
and
14 deletion
+168
-14
paddle/fluid/framework/type_info.cc
paddle/fluid/framework/type_info.cc
+2
-0
paddle/fluid/ir/dialect/op_generator/op_build_gen.py
paddle/fluid/ir/dialect/op_generator/op_build_gen.py
+11
-13
paddle/fluid/ir/dialect/op_generator/op_gen.py
paddle/fluid/ir/dialect/op_generator/op_gen.py
+1
-0
paddle/fluid/ir/dialect/paddle_dialect/ir/CMakeLists.txt
paddle/fluid/ir/dialect/paddle_dialect/ir/CMakeLists.txt
+1
-1
paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.cc
paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.cc
+68
-0
paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h
paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h
+80
-0
paddle/phi/core/meta_tensor.cc
paddle/phi/core/meta_tensor.cc
+3
-0
paddle/phi/core/utils/type_info.cc
paddle/phi/core/utils/type_info.cc
+2
-0
未找到文件。
paddle/fluid/framework/type_info.cc
浏览文件 @
75c4a24c
...
...
@@ -16,6 +16,7 @@ limitations under the License. */
#include "paddle/fluid/framework/feed_fetch_type.h"
#include "paddle/fluid/framework/raw_tensor.h"
#include "paddle/fluid/framework/string_array.h"
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h"
#include "paddle/fluid/prim/utils/static/desc_tensor.h"
#include "paddle/fluid/primitive/type/lazy_tensor.h"
...
...
@@ -44,5 +45,6 @@ template class TypeInfoTraits<phi::TensorBase, paddle::prim::DescTensor>;
template
class
TypeInfoTraits
<
phi
::
TensorBase
,
paddle
::
primitive
::
LazyTensor
>;
template
class
TypeInfoTraits
<
phi
::
TensorBase
,
paddle
::
framework
::
VariableRefArray
>;
template
class
TypeInfoTraits
<
phi
::
TensorBase
,
paddle
::
dialect
::
IrMetaTensor
>;
}
// namespace phi
paddle/fluid/ir/dialect/op_generator/op_build_gen.py
浏览文件 @
75c4a24c
...
...
@@ -286,27 +286,25 @@ def GenBuildOutputs(
build_output_str
=
' VLOG(4) << "Builder construction outputs";
\n
'
CREATE_INPUT_METATENSOR_TEMPLATE
=
"""
VLOG(4) << "Builder construction dense_{name}";
phi::DenseTensor dense_{name}(std::make_unique<paddle::experimental::DefaultAllocator>(paddle::platform::CPUPlace()).get(),
phi::DenseTensorMeta(paddle::dialect::TransToPhiDataType({name}.dtype()),
{name}.dims(),
{name}.data_layout(),
{name}.lod(),
{name}.offset()));
paddle::dialect::IrMetaTensor ir_meta_tensor_{name}(paddle::dialect::TransToPhiDataType({name}.dtype()),
{name}.dims(),
{name}.data_layout(),
{name}.lod(),
{name}.offset());
VLOG(4) << "Builder construction meta_{name}";
phi::MetaTensor meta_{name}(&
dense
_{name});
phi::MetaTensor meta_{name}(&
ir_meta_tensor
_{name});
"""
CREATE_INPUT_VEC_METATENSOR_TEMPLATE
=
""" std::vector<p
hi::DenseTensor> vec_dense
_{name};
CREATE_INPUT_VEC_METATENSOR_TEMPLATE
=
""" std::vector<p
addle::dialect::IrMetaTensor> vec_ir_meta_tensor
_{name};
for (size_t i=0; i < static_cast<size_t>({name}.size()); i++) {{
vec_dense_{name}.push_back(phi::DenseTensor(std::make_unique<paddle::experimental::DefaultAllocator>(paddle::platform::CPUPlace()).get(),
phi::DenseTensorMeta(paddle::dialect::TransToPhiDataType({name}[i].dyn_cast<paddle::dialect::DenseTensorType>().dtype()),
vec_ir_meta_tensor_{name}.push_back(paddle::dialect::IrMetaTensor(paddle::dialect::TransToPhiDataType({name}[i].dyn_cast<paddle::dialect::DenseTensorType>().dtype()),
{name}[i].dyn_cast<paddle::dialect::DenseTensorType>().dims(),
{name}[i].dyn_cast<paddle::dialect::DenseTensorType>().data_layout(),
{name}[i].dyn_cast<paddle::dialect::DenseTensorType>().lod(),
{name}[i].dyn_cast<paddle::dialect::DenseTensorType>().offset()))
)
;
{name}[i].dyn_cast<paddle::dialect::DenseTensorType>().offset()));
}}
std::vector<phi::MetaTensor> vec_meta_{name};
for (size_t i=0; i < vec_
dense
_{name}.size(); i++) {{
vec_meta_{name}.push_back(phi::MetaTensor(&vec_
dense
_{name}[i]));
for (size_t i=0; i < vec_
ir_meta_tensor
_{name}.size(); i++) {{
vec_meta_{name}.push_back(phi::MetaTensor(&vec_
ir_meta_tensor
_{name}[i]));
}}
std::vector<const phi::MetaTensor*> meta_{name};
...
...
paddle/fluid/ir/dialect/op_generator/op_gen.py
浏览文件 @
75c4a24c
...
...
@@ -101,6 +101,7 @@ CC_FILE_TEMPLATE = """// This file is generated by "paddle/fluid/ir/dialect/op_g
#include "{h_file}"
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_type.h"
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_attribute.h"
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h"
#include "paddle/ir/core/builtin_attribute.h"
#include "paddle/ir/core/builtin_type.h"
#include "paddle/ir/core/builtin_op.h"
...
...
paddle/fluid/ir/dialect/paddle_dialect/ir/CMakeLists.txt
浏览文件 @
75c4a24c
...
...
@@ -183,7 +183,7 @@ add_custom_target(ops_api_gen ALL DEPENDS ${ops_api_source_file})
cc_library
(
pd_dialect_core
SRCS pd_attribute.cc pd_type.cc
SRCS pd_attribute.cc pd_type.cc
pd_meta_tensor.cc
DEPS phi pd_interface pd_trait type_info
)
cc_library
(
pd_dialect_op
...
...
paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.cc
0 → 100644
浏览文件 @
75c4a24c
// Copyright (c) 2023 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/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h"
#include "paddle/ir/core/enforce.h"
namespace
paddle
{
namespace
dialect
{
IrMetaTensor
::
IrMetaTensor
(
phi
::
DataType
dtype
,
const
phi
::
DDim
&
dims
,
phi
::
DataLayout
layout
,
const
LoD
&
lod
,
size_t
offset
)
:
dims_
(
dims
),
dtype_
(
dtype
),
layout_
(
layout
),
lod_
(
lod
),
offset_
(
offset
)
{}
IrMetaTensor
::
IrMetaTensor
(
const
IrMetaTensor
&
other
)
{
dims_
=
other
.
dims
();
dtype_
=
other
.
dtype
();
layout_
=
other
.
layout
();
lod_
=
other
.
lod
();
offset_
=
other
.
offset
();
}
IrMetaTensor
&
IrMetaTensor
::
operator
=
(
const
IrMetaTensor
&
other
)
{
dims_
=
other
.
dims
();
dtype_
=
other
.
dtype
();
layout_
=
other
.
layout
();
lod_
=
other
.
lod
();
offset_
=
other
.
offset
();
return
*
this
;
}
IrMetaTensor
&
IrMetaTensor
::
operator
=
(
IrMetaTensor
&&
other
)
noexcept
{
dims_
=
std
::
move
(
other
.
dims
());
dtype_
=
other
.
dtype
();
layout_
=
other
.
layout
();
lod_
=
std
::
move
(
other
.
lod
());
offset_
=
other
.
offset
();
return
*
this
;
}
int64_t
IrMetaTensor
::
numel
()
const
{
return
phi
::
product
(
dims_
);
}
const
phi
::
Place
&
IrMetaTensor
::
place
()
const
{
IR_THROW
(
"Don't use IrMetaTensor::place method."
);
}
void
*
IrMetaTensor
::
AllocateFrom
(
phi
::
Allocator
*
allocator
,
phi
::
DataType
dtype
,
size_t
requested_size
,
bool
fake_alloc
)
{
IR_THROW
(
"Don't use IrMetaTensor::AllocateFrom method."
);
}
}
// namespace dialect
}
// namespace paddle
paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h
0 → 100644
浏览文件 @
75c4a24c
// Copyright (c) 2023 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.
#pragma once
#include "paddle/phi/core/allocator.h"
#include "paddle/phi/core/tensor_base.h"
#include "paddle/phi/core/tensor_meta.h"
namespace
paddle
{
namespace
dialect
{
using
LoD
=
std
::
vector
<
std
::
vector
<
size_t
>>
;
class
IrMetaTensor
:
public
phi
::
TensorBase
,
public
phi
::
TypeInfoTraits
<
phi
::
TensorBase
,
IrMetaTensor
>
{
public:
IrMetaTensor
(
phi
::
DataType
dtype
,
const
phi
::
DDim
&
dims
,
phi
::
DataLayout
layout
,
const
LoD
&
lod
,
size_t
offset
=
0
);
IrMetaTensor
(
IrMetaTensor
&&
other
)
=
default
;
IrMetaTensor
(
const
IrMetaTensor
&
other
);
IrMetaTensor
&
operator
=
(
const
IrMetaTensor
&
other
);
IrMetaTensor
&
operator
=
(
IrMetaTensor
&&
other
)
noexcept
;
virtual
~
IrMetaTensor
()
=
default
;
public:
static
const
char
*
name
()
{
return
"IrMetaTensor"
;
}
int64_t
numel
()
const
override
;
const
phi
::
DDim
&
dims
()
const
noexcept
override
{
return
dims_
;
}
const
phi
::
Place
&
place
()
const
override
;
phi
::
DataType
dtype
()
const
noexcept
override
{
return
dtype_
;
}
phi
::
DataLayout
layout
()
const
noexcept
override
{
return
layout_
;
}
const
LoD
&
lod
()
const
noexcept
{
return
lod_
;
}
size_t
offset
()
const
noexcept
{
return
offset_
;
}
bool
valid
()
const
noexcept
override
{
return
true
;
}
bool
initialized
()
const
override
{
return
true
;
}
void
*
AllocateFrom
(
phi
::
Allocator
*
allocator
,
phi
::
DataType
dtype
,
size_t
requested_size
=
0
,
bool
fake_alloc
=
false
)
override
;
private:
phi
::
DDim
dims_
;
phi
::
DataType
dtype_
{
phi
::
DataType
::
UNDEFINED
};
phi
::
DataLayout
layout_
{
phi
::
DataLayout
::
NCHW
};
LoD
lod_
;
size_t
offset_
{
0
};
};
}
// namespace dialect
}
// namespace paddle
paddle/phi/core/meta_tensor.cc
浏览文件 @
75c4a24c
...
...
@@ -16,6 +16,7 @@ limitations under the License. */
#include "glog/logging.h"
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h"
#include "paddle/phi/core/dense_tensor.h"
#include "paddle/phi/core/distributed/auto_parallel/dist_tensor.h"
#include "paddle/phi/core/enforce.h"
...
...
@@ -271,6 +272,8 @@ const LoD& MetaTensor::lod() const {
return
static_cast
<
SparseCooTensor
*>
(
tensor_
)
->
non_zero_elements
().
lod
();
}
else
if
(
phi
::
SparseCsrTensor
::
classof
(
tensor_
))
{
return
static_cast
<
SparseCsrTensor
*>
(
tensor_
)
->
non_zero_elements
().
lod
();
}
else
if
(
paddle
::
dialect
::
IrMetaTensor
::
classof
(
tensor_
))
{
return
static_cast
<
paddle
::
dialect
::
IrMetaTensor
*>
(
tensor_
)
->
lod
();
}
else
{
PADDLE_THROW
(
phi
::
errors
::
Unimplemented
(
"Unsupported getting lod of `%s`."
,
tensor_
->
type_info
().
name
()));
...
...
paddle/phi/core/utils/type_info.cc
浏览文件 @
75c4a24c
...
...
@@ -14,6 +14,7 @@ limitations under the License. */
#include <string>
#include "paddle/fluid/ir/dialect/paddle_dialect/ir/pd_meta_tensor.h"
#include "paddle/phi/backends/cpu/cpu_context.h"
#include "paddle/phi/backends/custom/custom_context.h"
#include "paddle/phi/backends/gpu/gpu_context.h"
...
...
@@ -50,6 +51,7 @@ template class TypeInfoTraits<phi::TensorBase, SparseCsrTensor>;
template
class
TypeInfoTraits
<
phi
::
TensorBase
,
StringTensor
>;
template
class
TypeInfoTraits
<
phi
::
TensorBase
,
TensorArray
>;
template
class
TypeInfoTraits
<
phi
::
TensorBase
,
phi
::
distributed
::
DistTensor
>;
template
class
TypeInfoTraits
<
phi
::
TensorBase
,
paddle
::
dialect
::
IrMetaTensor
>;
template
class
TypeInfoTraits
<
phi
::
DeviceContext
,
CPUContext
>;
template
class
TypeInfoTraits
<
phi
::
DeviceContext
,
CustomContext
>;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录