Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
bbc6c571
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看板
未验证
提交
bbc6c571
编写于
4月 18, 2019
作者:
G
guru4elephant
提交者:
GitHub
4月 18, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16887 from guru4elephant/add_nccl_context_pybind
Add nccl context pybind
上级
cbdb8a17
2ab2869c
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
248 addition
and
3 deletion
+248
-3
paddle/fluid/framework/fleet/CMakeLists.txt
paddle/fluid/framework/fleet/CMakeLists.txt
+2
-0
paddle/fluid/framework/fleet/nccl_wrapper.cc
paddle/fluid/framework/fleet/nccl_wrapper.cc
+78
-0
paddle/fluid/framework/fleet/nccl_wrapper.h
paddle/fluid/framework/fleet/nccl_wrapper.h
+83
-0
paddle/fluid/pybind/CMakeLists.txt
paddle/fluid/pybind/CMakeLists.txt
+2
-2
paddle/fluid/pybind/fleet_wrapper_py.cc
paddle/fluid/pybind/fleet_wrapper_py.cc
+0
-1
paddle/fluid/pybind/nccl_wrapper_py.cc
paddle/fluid/pybind/nccl_wrapper_py.cc
+53
-0
paddle/fluid/pybind/nccl_wrapper_py.h
paddle/fluid/pybind/nccl_wrapper_py.h
+28
-0
paddle/fluid/pybind/pybind.cc
paddle/fluid/pybind/pybind.cc
+2
-0
未找到文件。
paddle/fluid/framework/fleet/CMakeLists.txt
浏览文件 @
bbc6c571
...
...
@@ -3,3 +3,5 @@ if(WITH_PSLIB)
else
()
cc_library
(
fleet_wrapper SRCS fleet_wrapper.cc DEPS framework_proto variable_helper scope
)
endif
(
WITH_PSLIB
)
cc_library
(
nccl_wrapper SRCS nccl_wrapper.cc DEPS framework_proto variable_helper scope
)
paddle/fluid/framework/fleet/nccl_wrapper.cc
0 → 100644
浏览文件 @
bbc6c571
// Copyright (c) 2019 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/framework/fleet/nccl_wrapper.h"
#include <utility>
#include "paddle/fluid/framework/data_feed.h"
#include "paddle/fluid/framework/scope.h"
namespace
paddle
{
namespace
framework
{
std
::
shared_ptr
<
NCCLWrapper
>
NCCLWrapper
::
s_instance_
=
NULL
;
bool
NCCLWrapper
::
is_initialized_
=
false
;
void
NCCLWrapper
::
InitNCCL
()
{
#ifdef PADDLE_WITH_CUDA
PADDLE_ENFORCE
(
platform
::
dynload
::
ncclCommInitRank
(
&
(
nccl_info_
.
comm_
),
nccl_info_
.
global_ranks_
,
nccl_info_
.
nccl_id_
,
nccl_info_
.
my_global_rank_
));
#endif
return
;
}
void
NCCLWrapper
::
SetNCCLId
(
const
NCCLInfo
&
nccl_info
)
{
#ifdef PADDLE_WITH_CUDA
nccl_info_
.
nccl_id_
=
nccl_info
.
nccl_id_
;
#endif
return
;
}
NCCLInfo
NCCLWrapper
::
GetNCCLId
()
{
#ifdef PADDLE_WITH_CUDA
PADDLE_ENFORCE
(
platform
::
dynload
::
ncclGetUniqueId
(
&
(
nccl_info_
.
nccl_id_
)));
#endif
return
nccl_info_
;
}
void
NCCLWrapper
::
SetRankInfo
(
const
int
local_rank
,
const
int
global_rank
,
const
int
ranks
)
{
#ifdef PADDLE_WITH_CUDA
nccl_info_
.
local_rank_
=
local_rank
;
nccl_info_
.
my_global_rank_
=
global_rank
;
nccl_info_
.
global_ranks_
=
ranks
;
PADDLE_ENFORCE
(
cudaSetDevice
(
local_rank
));
PADDLE_ENFORCE
(
cudaStreamCreate
(
&
(
nccl_info_
.
stream_
)));
#endif
return
;
}
void
NCCLWrapper
::
SyncVar
(
const
int
root_rank
,
const
Scope
&
scope
,
const
std
::
vector
<
std
::
string
>&
var_names
)
{
#ifdef PADDLE_WITH_CUDA
for
(
auto
&
name
:
var_names
)
{
auto
var
=
scope
.
FindVar
(
name
);
LoDTensor
*
tensor
=
var
->
GetMutable
<
LoDTensor
>
();
int32_t
total_size
=
tensor
->
numel
();
PADDLE_ENFORCE
(
platform
::
dynload
::
ncclBcast
(
reinterpret_cast
<
void
*>
(
tensor
->
data
<
float
>
()),
total_size
,
ncclFloat
,
root_rank
,
nccl_info_
.
comm_
,
nccl_info_
.
stream_
));
cudaStreamSynchronize
(
nccl_info_
.
stream_
);
}
#endif
return
;
}
}
// end namespace framework
}
// end namespace paddle
paddle/fluid/framework/fleet/nccl_wrapper.h
0 → 100644
浏览文件 @
bbc6c571
/* Copyright (c) 2019 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 <atomic>
#include <ctime>
#include <map>
#include <memory>
#include <random>
#include <string>
#include <vector>
#include "paddle/fluid/framework/program_desc.h"
#include "paddle/fluid/framework/scope.h"
#include "paddle/fluid/framework/variable_helper.h"
#ifdef PADDLE_WITH_CUDA
#include "paddle/fluid/platform/dynload/nccl.h"
#endif
#include "paddle/fluid/platform/macros.h" // for DISABLE_COPY_AND_ASSIGN
namespace
paddle
{
namespace
framework
{
class
NCCLInfo
{
public:
NCCLInfo
()
{}
virtual
~
NCCLInfo
()
{}
public:
int
local_rank_
;
int
global_ranks_
;
int
my_global_rank_
;
#ifdef PADDLE_WITH_CUDA
ncclUniqueId
nccl_id_
;
ncclComm_t
comm_
;
cudaStream_t
stream_
;
#endif
};
class
NCCLWrapper
{
public:
virtual
~
NCCLWrapper
()
{}
NCCLWrapper
()
{}
void
InitNCCL
();
void
SetNCCLId
(
const
NCCLInfo
&
nccl_info
);
NCCLInfo
GetNCCLId
();
void
SetRankInfo
(
const
int
local_rank
,
const
int
global_rank
,
const
int
ranks
);
void
SyncVar
(
const
int
root_rank
,
const
Scope
&
scope
,
const
std
::
vector
<
std
::
string
>&
var_names
);
static
std
::
shared_ptr
<
NCCLWrapper
>
GetInstance
()
{
if
(
NULL
==
s_instance_
)
{
s_instance_
.
reset
(
new
paddle
::
framework
::
NCCLWrapper
());
}
return
s_instance_
;
}
public:
NCCLInfo
nccl_info_
;
private:
static
std
::
shared_ptr
<
NCCLWrapper
>
s_instance_
;
protected:
static
bool
is_initialized_
;
DISABLE_COPY_AND_ASSIGN
(
NCCLWrapper
);
};
}
// end namespace framework
}
// end namespace paddle
paddle/fluid/pybind/CMakeLists.txt
浏览文件 @
bbc6c571
set
(
PYBIND_DEPS pybind python proto_desc memory executor async_executor fleet_wrapper prune
set
(
PYBIND_DEPS pybind python proto_desc memory executor async_executor fleet_wrapper
nccl_wrapper
prune
feed_fetch_method pass_builder parallel_executor profiler layer scope_pool
tracer analysis_predictor imperative_profiler nccl_context
)
if
(
WITH_PYTHON
)
list
(
APPEND PYBIND_DEPS py_func_op
)
endif
()
set
(
PYBIND_SRCS pybind.cc exception.cc protobuf.cc const_value.cc recordio.cc reader_py.cc async_executor_py.cc fleet_wrapper_py.cc data_set_py.cc imperative.cc ir.cc inference_api.cc
)
set
(
PYBIND_SRCS pybind.cc exception.cc protobuf.cc const_value.cc recordio.cc reader_py.cc async_executor_py.cc fleet_wrapper_py.cc
nccl_wrapper_py.cc
data_set_py.cc imperative.cc ir.cc inference_api.cc
)
if
(
WITH_PYTHON
)
if
(
WITH_AMD_GPU
)
...
...
paddle/fluid/pybind/fleet_wrapper_py.cc
浏览文件 @
bbc6c571
...
...
@@ -36,7 +36,6 @@ limitations under the License. */
#include "paddle/fluid/pybind/fleet_wrapper_py.h"
namespace
py
=
pybind11
;
namespace
pd
=
paddle
::
framework
;
namespace
paddle
{
namespace
pybind
{
...
...
paddle/fluid/pybind/nccl_wrapper_py.cc
0 → 100644
浏览文件 @
bbc6c571
/* Copyright (c) 2016 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 <fcntl.h>
#ifdef _POSIX_C_SOURCE
#undef _POSIX_C_SOURCE
#endif
#ifdef _XOPEN_SOURCE
#undef _XOPEN_SOURCE
#endif
#include <string>
#include <vector>
#include "google/protobuf/io/zero_copy_stream_impl.h"
#include "google/protobuf/text_format.h"
#include "paddle/fluid/framework/async_executor.h"
#include "paddle/fluid/framework/data_feed.h"
#include "paddle/fluid/framework/data_feed.pb.h"
#include "paddle/fluid/framework/fleet/nccl_wrapper.h"
#include "paddle/fluid/framework/scope.h"
#include "paddle/fluid/inference/io.h"
#include "paddle/fluid/platform/place.h"
#include "paddle/fluid/platform/variant.h"
#include "paddle/fluid/pybind/nccl_wrapper_py.h"
namespace
py
=
pybind11
;
namespace
pd
=
paddle
::
framework
;
namespace
paddle
{
namespace
pybind
{
void
BindNCCLWrapper
(
py
::
module
*
m
)
{
py
::
class_
<
framework
::
NCCLWrapper
>
(
*
m
,
"Nccl"
)
.
def
(
py
::
init
())
.
def
(
"init_nccl"
,
&
framework
::
NCCLWrapper
::
InitNCCL
)
.
def
(
"set_nccl_id"
,
&
framework
::
NCCLWrapper
::
SetNCCLId
)
.
def
(
"set_rank_info"
,
&
framework
::
NCCLWrapper
::
SetRankInfo
)
.
def
(
"sync_var"
,
&
framework
::
NCCLWrapper
::
SyncVar
);
}
// end NCCLWrapper
}
// end namespace pybind
}
// end namespace paddle
paddle/fluid/pybind/nccl_wrapper_py.h
0 → 100644
浏览文件 @
bbc6c571
// 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 "pybind11/pybind11.h"
#include "pybind11/stl.h"
namespace
py
=
pybind11
;
namespace
paddle
{
namespace
pybind
{
void
BindNCCLWrapper
(
py
::
module
*
m
);
}
// namespace pybind
}
// namespace paddle
paddle/fluid/pybind/pybind.cc
浏览文件 @
bbc6c571
...
...
@@ -58,6 +58,7 @@ limitations under the License. */
#include "paddle/fluid/pybind/imperative.h"
#include "paddle/fluid/pybind/inference_api.h"
#include "paddle/fluid/pybind/ir.h"
#include "paddle/fluid/pybind/nccl_wrapper_py.h"
#include "paddle/fluid/pybind/protobuf.h"
#include "paddle/fluid/pybind/pybind.h" // NOLINT
#include "paddle/fluid/pybind/reader_py.h"
...
...
@@ -1405,6 +1406,7 @@ All parameter, weight, gradient are variables in Paddle.
BindRecordIOWriter
(
&
m
);
BindAsyncExecutor
(
&
m
);
BindFleetWrapper
(
&
m
);
BindNCCLWrapper
(
&
m
);
BindGraph
(
&
m
);
BindNode
(
&
m
);
BindInferenceApi
(
&
m
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录