Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wk1234123
Paddle
提交
39505151
P
Paddle
项目概览
wk1234123
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
39505151
编写于
10月 03, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove device context manager
上级
6c4d1f55
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
7 addition
and
138 deletion
+7
-138
paddle/framework/CMakeLists.txt
paddle/framework/CMakeLists.txt
+1
-1
paddle/framework/executor.cc
paddle/framework/executor.cc
+5
-7
paddle/framework/executor.h
paddle/framework/executor.h
+1
-2
paddle/platform/CMakeLists.txt
paddle/platform/CMakeLists.txt
+0
-2
paddle/platform/device_context_manager.cc
paddle/platform/device_context_manager.cc
+0
-68
paddle/platform/device_context_manager.h
paddle/platform/device_context_manager.h
+0
-58
未找到文件。
paddle/framework/CMakeLists.txt
浏览文件 @
39505151
...
...
@@ -44,7 +44,7 @@ add_custom_command(TARGET framework_py_proto POST_BUILD
cc_library
(
backward SRCS backward.cc DEPS net_op
)
cc_test
(
backward_test SRCS backward_test.cc DEPS backward recurrent_op device_context
)
cc_library
(
executor SRCS executor.cc DEPS op_registry device_context
_manager
scope framework_proto
${
GLOB_OP_LIB
}
)
cc_library
(
executor SRCS executor.cc DEPS op_registry device_context scope framework_proto
${
GLOB_OP_LIB
}
)
if
(
WITH_GPU
)
nv_test
(
executor_test SRCS executor_test.cc DEPS executor
)
else
()
...
...
paddle/framework/executor.cc
浏览文件 @
39505151
...
...
@@ -25,14 +25,12 @@ Executor::Executor(const std::vector<platform::Place>& places) {
device_contexts_
.
resize
(
places
.
size
());
for
(
size_t
i
=
0
;
i
<
places
.
size
();
i
++
)
{
if
(
platform
::
is_cpu_place
(
places
[
i
]))
{
device_contexts_
[
i
]
=
platform
::
DeviceContextManager
::
Get
()
->
GetDeviceContext
<
platform
::
CPUPlace
>
(
boost
::
get
<
platform
::
CPUPlace
>
(
places
[
i
]));
device_contexts_
[
i
].
reset
(
new
platform
::
CPUDeviceContext
(
boost
::
get
<
platform
::
CPUPlace
>
(
places
[
i
])));
}
else
{
#ifndef PADDLE_ONLY_CPU
device_contexts_
[
i
]
=
platform
::
DeviceContextManager
::
Get
()
->
GetDeviceContext
<
platform
::
GPUPlace
>
(
boost
::
get
<
platform
::
GPUPlace
>
(
places
[
i
]));
device_contexts_
[
i
].
reset
(
new
platform
::
CUDADeviceContext
(
boost
::
get
<
platform
::
CPUPlace
>
(
places
[
i
])));
#else
PADDLE_THROW
(
"'GPUPlace' is not supported in CPU only device."
);
#endif
...
...
@@ -63,7 +61,7 @@ void Executor::Run(const ProgramDesc& pdesc, Scope* scope,
}
// TODO(tonyyang-svail): need to test gpu device
for
(
auto
device_context
:
device_contexts_
)
{
for
(
auto
&
device_context
:
device_contexts_
)
{
device_context
->
Wait
();
}
}
...
...
paddle/framework/executor.h
浏览文件 @
39505151
...
...
@@ -18,7 +18,6 @@ limitations under the License. */
#include "paddle/framework/op_info.h"
#include "paddle/framework/scope.h"
#include "paddle/framework/tensor.h"
#include "paddle/platform/device_context_manager.h"
namespace
paddle
{
namespace
framework
{
...
...
@@ -30,7 +29,7 @@ class Executor {
void
Run
(
const
ProgramDesc
&
,
Scope
*
,
std
::
vector
<
Tensor
>*
);
private:
std
::
vector
<
platform
::
DeviceContext
*
>
device_contexts_
;
std
::
vector
<
std
::
unique_ptr
<
platform
::
DeviceContext
>
>
device_contexts_
;
};
}
// namespace framework
...
...
paddle/platform/CMakeLists.txt
浏览文件 @
39505151
...
...
@@ -23,7 +23,5 @@ cc_library(device_context SRCS device_context.cc DEPS memory buddy_allocator
system_allocator memory_block meta_data meta_cache place eigen3
${
GPU_CTX_DEPS
}
)
nv_test
(
device_context_test SRCS device_context_test.cc DEPS device_context gpu_info
)
cc_library
(
device_context_manager SRCS device_context_manager.cc DEPS device_context
)
nv_test
(
cudnn_helper_test SRCS cudnn_helper_test.cc DEPS dynload_cuda
)
nv_test
(
transform_test SRCS transform_test.cu DEPS paddle_memory place device_context
)
paddle/platform/device_context_manager.cc
已删除
100644 → 0
浏览文件 @
6c4d1f55
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
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/platform/device_context_manager.h"
namespace
paddle
{
namespace
platform
{
DeviceContextManager
::
DeviceContextManager
()
{
#ifndef PADDLE_ONLY_CPU
device_count_
=
GetDeviceCount
();
cuda_contexts_
.
reserve
(
device_count_
);
for
(
int
i
=
0
;
i
<
device_count_
;
i
++
)
{
cuda_contexts_
[
i
]
=
nullptr
;
}
#endif
}
template
<
>
CPUDeviceContext
*
DeviceContextManager
::
GetDeviceContext
<
CPUPlace
,
CPUDeviceContext
>
(
const
CPUPlace
&
place
)
{
if
(
!
cpu_context_
)
{
cpu_context_
=
new
CPUDeviceContext
(
place
);
}
return
cpu_context_
;
}
#ifndef PADDLE_ONLY_CPU
template
<
>
CUDADeviceContext
*
DeviceContextManager
::
GetDeviceContext
<
GPUPlace
,
CUDADeviceContext
>
(
const
GPUPlace
&
place
)
{
int
gpu_id
=
place
.
device
;
PADDLE_ENFORCE
(
gpu_id
<
device_count_
,
"GPU device id must less than device count"
);
SetDeviceId
(
gpu_id
);
if
(
!
cuda_contexts_
[
gpu_id
])
{
cuda_contexts_
[
gpu_id
]
=
new
CUDADeviceContext
(
place
);
}
return
cuda_contexts_
[
gpu_id
];
}
#endif
DeviceContextManager
::~
DeviceContextManager
()
{
if
(
cpu_context_
)
{
delete
cpu_context_
;
}
#ifndef PADDLE_ONLY_CPU
for
(
int
i
=
0
;
i
<
device_count_
;
i
++
)
{
if
(
cuda_contexts_
[
i
])
{
delete
cuda_contexts_
[
i
];
}
}
#endif
}
}
// namespace platform
}
// namespace paddle
paddle/platform/device_context_manager.h
已删除
100644 → 0
浏览文件 @
6c4d1f55
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
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/platform/device_context.h"
namespace
paddle
{
namespace
platform
{
template
<
typename
T
>
struct
Converter
;
template
<
>
struct
Converter
<
CPUPlace
>
{
using
DeviceContextType
=
CPUDeviceContext
;
};
#ifndef PADDLE_ONLY_CPU
template
<
>
struct
Converter
<
GPUPlace
>
{
using
DeviceContextType
=
CUDADeviceContext
;
};
#endif
class
DeviceContextManager
{
public:
DeviceContextManager
();
~
DeviceContextManager
();
template
<
typename
PlaceType
,
typename
DeviceType
=
typename
Converter
<
PlaceType
>
::
DeviceContextType
>
DeviceType
*
GetDeviceContext
(
const
PlaceType
&
place
);
static
DeviceContextManager
*
Get
()
{
static
DeviceContextManager
inst
;
return
&
inst
;
}
private:
CPUDeviceContext
*
cpu_context_
;
#ifndef PADDLE_ONLY_CPU
int
device_count_
;
std
::
vector
<
CUDADeviceContext
*>
cuda_contexts_
;
#endif
};
}
// namespace platform
}
// namespace paddle
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录