Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
37580838
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看板
体验新版 GitCode,发现更多精彩内容 >>
You need to sign in or sign up before continuing.
未验证
提交
37580838
编写于
5月 07, 2022
作者:
A
Allen Guo
提交者:
GitHub
5月 07, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sync misc changes (#42534)
上级
bb5a14dd
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
54 addition
and
28 deletion
+54
-28
paddle/fluid/platform/device/ipu/ipu_device.cc
paddle/fluid/platform/device/ipu/ipu_device.cc
+4
-2
paddle/fluid/platform/device/ipu/ipu_executor.cc
paddle/fluid/platform/device/ipu/ipu_executor.cc
+36
-3
paddle/fluid/platform/device/ipu/ipu_executor.h
paddle/fluid/platform/device/ipu/ipu_executor.h
+1
-0
paddle/fluid/platform/device/ipu/popart_canonicalization/other_ops.cc
.../platform/device/ipu/popart_canonicalization/other_ops.cc
+13
-6
python/paddle/fluid/tests/unittests/ipu/test_cast_op_ipu.py
python/paddle/fluid/tests/unittests/ipu/test_cast_op_ipu.py
+0
-17
未找到文件。
paddle/fluid/platform/device/ipu/ipu_device.cc
浏览文件 @
37580838
...
@@ -39,7 +39,8 @@ const bool GetBoolEnv(const std::string& str) {
...
@@ -39,7 +39,8 @@ const bool GetBoolEnv(const std::string& str) {
int
GetNumDevices
()
{
int
GetNumDevices
()
{
bool
ipu_model
=
GetBoolEnv
(
"POPLAR_IPUMODEL"
);
bool
ipu_model
=
GetBoolEnv
(
"POPLAR_IPUMODEL"
);
if
(
ipu_model
)
{
bool
compile_only
=
GetBoolEnv
(
"IPU_COMPILE_ONLY"
);
if
(
ipu_model
||
compile_only
)
{
return
1
;
return
1
;
}
}
int
num_devices
=
int
num_devices
=
...
@@ -52,7 +53,8 @@ int GetNumDevices() {
...
@@ -52,7 +53,8 @@ int GetNumDevices() {
std
::
vector
<
int
>
GetDeviceIds
()
{
std
::
vector
<
int
>
GetDeviceIds
()
{
bool
ipu_model
=
GetBoolEnv
(
"POPLAR_IPUMODEL"
);
bool
ipu_model
=
GetBoolEnv
(
"POPLAR_IPUMODEL"
);
if
(
ipu_model
)
{
bool
compile_only
=
GetBoolEnv
(
"IPU_COMPILE_ONLY"
);
if
(
ipu_model
||
compile_only
)
{
return
{
0
};
return
{
0
};
}
}
std
::
vector
<
int
>
device_ids
;
std
::
vector
<
int
>
device_ids
;
...
...
paddle/fluid/platform/device/ipu/ipu_executor.cc
浏览文件 @
37580838
...
@@ -96,6 +96,7 @@ Executor::~Executor() {
...
@@ -96,6 +96,7 @@ Executor::~Executor() {
void
Executor
::
Prepare
(
const
std
::
string
&
proto
)
{
void
Executor
::
Prepare
(
const
std
::
string
&
proto
)
{
VLOG
(
10
)
<<
"enter Executor::Prepare"
;
VLOG
(
10
)
<<
"enter Executor::Prepare"
;
compile_only_
=
GetBoolEnv
(
"IPU_COMPILE_ONLY"
);
AcquireDevice
();
AcquireDevice
();
executor_resources_
=
std
::
make_unique
<
ExecutorResources
>
();
executor_resources_
=
std
::
make_unique
<
ExecutorResources
>
();
...
@@ -122,9 +123,18 @@ void Executor::Prepare(const std::string &proto) {
...
@@ -122,9 +123,18 @@ void Executor::Prepare(const std::string &proto) {
}
}
VLOG
(
10
)
<<
"Creating session from Onnx Model...done"
;
VLOG
(
10
)
<<
"Creating session from Onnx Model...done"
;
VLOG
(
10
)
<<
"Preparing session device..."
;
if
(
compile_only_
)
{
session_
->
prepareDevice
();
LOG
(
INFO
)
VLOG
(
10
)
<<
"Preparing session device...done"
;
<<
"Save the offline cache as offline_cache.popart in current path."
;
VLOG
(
10
)
<<
"Compile only..."
;
session_
->
compileAndExport
(
"./offline_cache.popart"
);
VLOG
(
10
)
<<
"Compile only...done"
;
return
;
}
else
{
VLOG
(
10
)
<<
"Preparing session device..."
;
session_
->
prepareDevice
();
VLOG
(
10
)
<<
"Preparing session device...done"
;
}
SetWeightsIO
();
SetWeightsIO
();
...
@@ -141,6 +151,11 @@ void Executor::Prepare(const std::string &proto) {
...
@@ -141,6 +151,11 @@ void Executor::Prepare(const std::string &proto) {
void
Executor
::
Run
(
const
std
::
vector
<
const
Tensor
*>
&
inputs
,
void
Executor
::
Run
(
const
std
::
vector
<
const
Tensor
*>
&
inputs
,
const
std
::
vector
<
Tensor
*>
&
outputs
,
const
std
::
vector
<
Tensor
*>
&
outputs
,
const
framework
::
ExecutionContext
&
ctx
)
{
const
framework
::
ExecutionContext
&
ctx
)
{
if
(
compile_only_
)
{
LOG
(
INFO
)
<<
"If IPU_COMPILE_ONLY=True, skip exe.run"
;
return
;
}
VLOG
(
10
)
<<
"enter Executor::Run"
;
VLOG
(
10
)
<<
"enter Executor::Run"
;
// inputs
// inputs
std
::
map
<
popart
::
TensorId
,
popart
::
IArray
&>
popart_inputs
;
std
::
map
<
popart
::
TensorId
,
popart
::
IArray
&>
popart_inputs
;
...
@@ -222,6 +237,7 @@ void Executor::AcquireDevice() {
...
@@ -222,6 +237,7 @@ void Executor::AcquireDevice() {
bool
use_ipu_model
=
GetBoolEnv
(
"POPLAR_IPUMODEL"
);
bool
use_ipu_model
=
GetBoolEnv
(
"POPLAR_IPUMODEL"
);
bool
enable_distribution
=
ipu_strategy_
->
enable_distribution
;
bool
enable_distribution
=
ipu_strategy_
->
enable_distribution
;
if
(
use_ipu_model
)
{
if
(
use_ipu_model
)
{
VLOG
(
10
)
<<
"Create IPU model device..."
;
std
::
map
<
std
::
string
,
std
::
string
>
deviceOpts
{
std
::
map
<
std
::
string
,
std
::
string
>
deviceOpts
{
{
{
"numIPUs"
,
std
::
to_string
(
ipu_strategy_
->
num_ipus
),
"numIPUs"
,
std
::
to_string
(
ipu_strategy_
->
num_ipus
),
...
@@ -230,7 +246,21 @@ void Executor::AcquireDevice() {
...
@@ -230,7 +246,21 @@ void Executor::AcquireDevice() {
};
};
device_
=
popart
::
DeviceManager
::
createDeviceManager
().
createIpuModelDevice
(
device_
=
popart
::
DeviceManager
::
createDeviceManager
().
createIpuModelDevice
(
deviceOpts
);
deviceOpts
);
VLOG
(
10
)
<<
"Create IPU model device...done"
;
}
else
if
(
compile_only_
)
{
VLOG
(
10
)
<<
"Create offline device..."
;
std
::
map
<
std
::
string
,
std
::
string
>
deviceOpts
{
{
"numIPUs"
,
std
::
to_string
(
ipu_strategy_
->
num_ipus
),
},
{
"ipuVersion"
,
"ipu2"
},
};
device_
=
popart
::
DeviceManager
::
createDeviceManager
().
createOfflineIPUDevice
(
deviceOpts
);
VLOG
(
10
)
<<
"Create offline device...done"
;
}
else
if
(
enable_distribution
)
{
}
else
if
(
enable_distribution
)
{
VLOG
(
10
)
<<
"Create distribution device..."
;
auto
ipus_per_replica
=
ipu_strategy_
->
num_ipus
/
auto
ipus_per_replica
=
ipu_strategy_
->
num_ipus
/
ipu_strategy_
->
popart_options
.
replicatedGraphCount
;
ipu_strategy_
->
popart_options
.
replicatedGraphCount
;
auto
device_id
=
popdist_get_device
(
ipus_per_replica
);
auto
device_id
=
popdist_get_device
(
ipus_per_replica
);
...
@@ -240,13 +270,16 @@ void Executor::AcquireDevice() {
...
@@ -240,13 +270,16 @@ void Executor::AcquireDevice() {
device_
,
device_
,
errors
::
Unavailable
(
"Can't attach IPU in distribution, ipu_num = %d."
,
errors
::
Unavailable
(
"Can't attach IPU in distribution, ipu_num = %d."
,
RequestIpus
(
ipu_strategy_
->
num_ipus
)));
RequestIpus
(
ipu_strategy_
->
num_ipus
)));
VLOG
(
10
)
<<
"Create distribution device...done"
;
}
else
{
}
else
{
VLOG
(
10
)
<<
"Create IPU device..."
;
device_
=
device_
=
popart
::
DeviceManager
::
createDeviceManager
().
acquireAvailableDevice
(
popart
::
DeviceManager
::
createDeviceManager
().
acquireAvailableDevice
(
RequestIpus
(
ipu_strategy_
->
num_ipus
));
RequestIpus
(
ipu_strategy_
->
num_ipus
));
PADDLE_ENFORCE_NOT_NULL
(
PADDLE_ENFORCE_NOT_NULL
(
device_
,
errors
::
Unavailable
(
"Can't attach IPU, ipu_num = %d."
,
device_
,
errors
::
Unavailable
(
"Can't attach IPU, ipu_num = %d."
,
RequestIpus
(
ipu_strategy_
->
num_ipus
)));
RequestIpus
(
ipu_strategy_
->
num_ipus
)));
VLOG
(
10
)
<<
"Create IPU device...done"
;
}
}
VLOG
(
10
)
<<
"leave Executor::AcquireDevice"
;
VLOG
(
10
)
<<
"leave Executor::AcquireDevice"
;
}
}
...
...
paddle/fluid/platform/device/ipu/ipu_executor.h
浏览文件 @
37580838
...
@@ -91,6 +91,7 @@ class Executor {
...
@@ -91,6 +91,7 @@ class Executor {
const
Scope
*
scope_
=
nullptr
;
const
Scope
*
scope_
=
nullptr
;
const
IpuStrategy
*
ipu_strategy_
=
nullptr
;
const
IpuStrategy
*
ipu_strategy_
=
nullptr
;
CompilerResources
*
compiler_resources_
=
nullptr
;
CompilerResources
*
compiler_resources_
=
nullptr
;
bool
compile_only_
=
false
;
// Deviceinfo for popart session
// Deviceinfo for popart session
std
::
shared_ptr
<
popart
::
DeviceInfo
>
device_
;
std
::
shared_ptr
<
popart
::
DeviceInfo
>
device_
;
...
...
paddle/fluid/platform/device/ipu/popart_canonicalization/other_ops.cc
浏览文件 @
37580838
...
@@ -57,14 +57,21 @@ Node *checkpointoutput_handler(Graph *graph, Node *node) {
...
@@ -57,14 +57,21 @@ Node *checkpointoutput_handler(Graph *graph, Node *node) {
Node
*
custom_nll_loss_handler
(
Graph
*
graph
,
Node
*
node
)
{
Node
*
custom_nll_loss_handler
(
Graph
*
graph
,
Node
*
node
)
{
auto
*
op
=
node
->
Op
();
auto
*
op
=
node
->
Op
();
auto
reduction
=
BOOST_GET_CONST
(
int
,
op
->
GetAttr
(
"reduction"
));
auto
reduction
=
BOOST_GET_CONST
(
int
,
op
->
GetAttr
(
"reduction"
));
auto
ignoreIndex
=
BOOST_GET_CONST
(
int
,
op
->
GetAttr
(
"ignoreIndex"
));
auto
ignoreIndex
=
BOOST_GET_CONST
(
std
::
string
,
op
->
GetAttr
(
"ignoreIndex"
));
auto
inputIsLogProbability
=
auto
inputIsLogProbability
=
BOOST_GET_CONST
(
bool
,
op
->
GetAttr
(
"inputIsLogProbability"
));
BOOST_GET_CONST
(
bool
,
op
->
GetAttr
(
"inputIsLogProbability"
));
return
CreateBaseOp
(
graph
,
node
,
"popart_nllloss_v2"
,
node
->
inputs
,
if
(
ignoreIndex
==
"None"
)
{
node
->
outputs
,
return
CreateBaseOp
(
graph
,
node
,
"popart_nllloss_v2"
,
node
->
inputs
,
{{
"reduction"
,
reduction
},
node
->
outputs
,
{
"ignoreIndex"
,
ignoreIndex
},
{{
"reduction"
,
reduction
},
{
"inputIsLogProbability"
,
inputIsLogProbability
}});
{
"inputIsLogProbability"
,
inputIsLogProbability
}});
}
else
{
return
CreateBaseOp
(
graph
,
node
,
"popart_nllloss_v2"
,
node
->
inputs
,
node
->
outputs
,
{{
"reduction"
,
reduction
},
{
"ignoreIndex"
,
std
::
atoi
(
ignoreIndex
.
c_str
())},
{
"inputIsLogProbability"
,
inputIsLogProbability
}});
}
}
}
Node
*
identity_handler
(
Graph
*
graph
,
Node
*
node
)
{
Node
*
identity_handler
(
Graph
*
graph
,
Node
*
node
)
{
...
...
python/paddle/fluid/tests/unittests/ipu/test_cast_op_ipu.py
浏览文件 @
37580838
...
@@ -85,23 +85,6 @@ class TestEnableFp16(TestBase):
...
@@ -85,23 +85,6 @@ class TestEnableFp16(TestBase):
self
.
attrs
[
'dtype'
]
=
'float32'
self
.
attrs
[
'dtype'
]
=
'float32'
class
TestDisableTransferCast
(
TestEnableFp16
):
def
set_data_feed
(
self
):
data
=
np
.
random
.
uniform
(
size
=
[
1
,
3
,
3
,
3
])
self
.
feed_fp32
=
{
'x'
:
data
.
astype
(
np
.
float32
)}
self
.
feed_fp16
=
{
'x'
:
data
.
astype
(
np
.
float16
)}
def
set_op_attrs
(
self
):
self
.
attrs
=
{}
self
.
attrs
[
'dtype'
]
=
'float32'
def
run_model
(
self
,
exec_mode
):
ipu_strategy
=
paddle
.
static
.
IpuStrategy
()
ipu_strategy
.
set_graph_config
(
is_training
=
self
.
is_training
)
ipu_strategy
.
set_options
({
"transfer_cast_op"
:
False
})
self
.
run_op_test
(
exec_mode
)
class
TestCase2
(
TestBase
):
class
TestCase2
(
TestBase
):
def
set_data_feed
(
self
):
def
set_data_feed
(
self
):
self
.
feed_fp32
=
{
self
.
feed_fp32
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录