Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
99fe83a0
P
Paddle
项目概览
wzpei9
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
99fe83a0
编写于
3月 21, 2018
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move nccl helper
上级
90f98016
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
40 addition
and
15 deletion
+40
-15
paddle/fluid/framework/parallel_executor.cc
paddle/fluid/framework/parallel_executor.cc
+3
-15
paddle/fluid/platform/nccl_helper.h
paddle/fluid/platform/nccl_helper.h
+37
-0
未找到文件。
paddle/fluid/framework/parallel_executor.cc
浏览文件 @
99fe83a0
...
@@ -20,6 +20,7 @@ limitations under the License. */
...
@@ -20,6 +20,7 @@ limitations under the License. */
#include "op_registry.h"
#include "op_registry.h"
#include "paddle/fluid/framework/feed_fetch_type.h"
#include "paddle/fluid/framework/feed_fetch_type.h"
#include "paddle/fluid/operators/math/concat.h"
#include "paddle/fluid/operators/math/concat.h"
#include "paddle/fluid/platform/nccl_helper.h"
namespace
paddle
{
namespace
paddle
{
namespace
framework
{
namespace
framework
{
...
@@ -299,19 +300,6 @@ class ParallelExecutorPrivate {
...
@@ -299,19 +300,6 @@ class ParallelExecutorPrivate {
std
::
unique_ptr
<
platform
::
EnforceNotMet
>
exception_
;
std
::
unique_ptr
<
platform
::
EnforceNotMet
>
exception_
;
};
};
// TODO(yy): Move this function somewhere
ncclDataType_t
ToNCCLDataType
(
std
::
type_index
type
)
{
if
(
type
==
typeid
(
float
))
{
// NOLINT
return
ncclFloat
;
}
else
if
(
type
==
typeid
(
double
))
{
// NOLINT
return
ncclDouble
;
}
else
if
(
type
==
typeid
(
int
))
{
// NOLINT
return
ncclInt
;
}
else
{
PADDLE_THROW
(
"Not supported"
);
}
}
static
std
::
mutex
g_nccl_mtx_
;
static
std
::
mutex
g_nccl_mtx_
;
struct
NCCLAllReduceOpHandle
:
public
OpHandle
{
struct
NCCLAllReduceOpHandle
:
public
OpHandle
{
...
@@ -356,7 +344,7 @@ struct NCCLAllReduceOpHandle : public OpHandle {
...
@@ -356,7 +344,7 @@ struct NCCLAllReduceOpHandle : public OpHandle {
}
}
if
(
dtype
==
-
1
)
{
if
(
dtype
==
-
1
)
{
dtype
=
ToNCCLDataType
(
lod_tensor
.
type
());
dtype
=
platform
::
ToNCCLDataType
(
lod_tensor
.
type
());
}
}
if
(
numel
==
0
)
{
if
(
numel
==
0
)
{
...
@@ -629,7 +617,7 @@ void ParallelExecutor::BCastParamsToGPUs(
...
@@ -629,7 +617,7 @@ void ParallelExecutor::BCastParamsToGPUs(
if
(
var_desc
->
GetType
()
==
proto
::
VarType
::
LOD_TENSOR
)
{
if
(
var_desc
->
GetType
()
==
proto
::
VarType
::
LOD_TENSOR
)
{
auto
&
main_tensor
=
auto
&
main_tensor
=
main_scope
->
FindVar
(
var_desc
->
Name
())
->
Get
<
LoDTensor
>
();
main_scope
->
FindVar
(
var_desc
->
Name
())
->
Get
<
LoDTensor
>
();
ncclDataType_t
data_type
=
ToNCCLDataType
(
main_tensor
.
type
());
ncclDataType_t
data_type
=
platform
::
ToNCCLDataType
(
main_tensor
.
type
());
auto
&
dims
=
main_tensor
.
dims
();
auto
&
dims
=
main_tensor
.
dims
();
size_t
numel
=
main_tensor
.
numel
();
size_t
numel
=
main_tensor
.
numel
();
...
...
paddle/fluid/platform/nccl_helper.h
0 → 100644
浏览文件 @
99fe83a0
// Copyright (c) 2018 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 <typeindex>
#include "paddle/fluid/platform/dynload/nccl.h"
#include "paddle/fluid/platform/enforce.h"
namespace
paddle
{
namespace
platform
{
inline
ncclDataType_t
ToNCCLDataType
(
std
::
type_index
type
)
{
if
(
type
==
typeid
(
float
))
{
// NOLINT
return
ncclFloat
;
}
else
if
(
type
==
typeid
(
double
))
{
// NOLINT
return
ncclDouble
;
}
else
if
(
type
==
typeid
(
int
))
{
// NOLINT
return
ncclInt
;
}
else
{
PADDLE_THROW
(
"Not supported"
);
}
}
}
// namespace platform
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录