Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
PaddleDetection
提交
a77fcef3
P
PaddleDetection
项目概览
s920243400
/
PaddleDetection
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleDetection
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
a77fcef3
编写于
7月 03, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix cuda compile error
上级
a30754b0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
43 addition
and
30 deletion
+43
-30
paddle/platform/cublas.h
paddle/platform/cublas.h
+0
-3
paddle/platform/cuda.h
paddle/platform/cuda.h
+9
-0
paddle/platform/curand.h
paddle/platform/curand.h
+4
-1
paddle/platform/device_context.h
paddle/platform/device_context.h
+28
-24
paddle/platform/dynamic_loader.cc
paddle/platform/dynamic_loader.cc
+2
-2
未找到文件。
paddle/platform/cublas.h
浏览文件 @
a77fcef3
...
...
@@ -3,7 +3,6 @@
namespace
paddle
{
namespace
dyload
{
namespace
dynload
{
std
::
once_flag
cublas_dso_flag
;
void
*
cublas_dso_handle
=
nullptr
;
...
...
@@ -67,8 +66,6 @@ CUBLAS_BLAS_ROUTINE_EACH(DYNAMIC_LOAD_CUBLAS_V2_WRAP)
#undef DYNAMIC_LOAD_CUBLAS_V2_WRAP
#undef CUBLAS_BLAS_ROUTINE_EACH
}
/* namespace dynload */
// clang-format on
#ifndef PADDLE_TYPE_DOUBLE
#define CUBLAS_GEAM dynload::cublasSgeam
...
...
paddle/platform/cuda.h
浏览文件 @
a77fcef3
...
...
@@ -33,6 +33,15 @@ int GetDeviceCount(void) {
throw_on_error
(
cudaGetDeviceCount
(
&
count
),
"cudaGetDeviceCount failed"
);
return
count
;
}
int
GetCurrentDeviceId
(
void
)
{
int
device_id
;
throw_on_error
(
cudaGetDevice
(
&
device_id
),
"cudaGetDevice failed"
);
return
device_id
;
}
void
SetDeviceId
(
int
device_id
)
{
throw_on_error
(
cudaSetDevice
(
device_id
),
"cudaSetDevice failed"
);
}
}
// namespace platform
}
// namespace paddle
...
...
paddle/platform/curand.h
浏览文件 @
a77fcef3
...
...
@@ -3,6 +3,8 @@
namespace
paddle
{
namespace
dyload
{
std
::
once_flag
curand_dso_flag
;
void
*
curand_dso_handle
=
nullptr
;
#ifdef PADDLE_USE_DSO
#define DYNAMIC_LOAD_CURAND_WRAP(__name) \
struct DynLoad__##__name { \
...
...
@@ -31,7 +33,8 @@ namespace dyload {
__macro(curandSetStream) \
__macro(curandSetPseudoRandomGeneratorSeed)\
__macro(curandGenerateUniform) \
__macro(curandGenerateUniformDouble)
__macro(curandGenerateUniformDouble) \
__macro(curandDestroyGenerator)
// clang-format on
CURAND_RAND_ROUTINE_EACH
(
DYNAMIC_LOAD_CURAND_WRAP
)
...
...
paddle/platform/device_context.h
浏览文件 @
a77fcef3
...
...
@@ -83,11 +83,12 @@ class CudaDeviceContext : public DeviceContext {
cublasHandle_t
cublas_handle
()
{
if
(
!
blas_handle_
)
{
DeviceGuard
guard
(
gpu_place_
);
PADDLE_ENFORCE
(
cublasCreate
(
&
blas_handle_
)
==
CUBLAS_STATUS_SUCCESS
,
"cublasCreate failed"
);
PADDLE_ENFORCE
(
cublasSetStream
(
blas_handle_
,
stream_
)
==
CUBLAS_STATUS_SUCCESS
,
"cublasSetStream failed"
);
paddle
::
dyload
::
cublasCreate
(
&
blas_handle_
)
==
CUBLAS_STATUS_SUCCESS
,
"cublasCreate failed"
);
PADDLE_ENFORCE
(
paddle
::
dyload
::
cublasSetStream
(
blas_handle_
,
stream_
)
==
CUBLAS_STATUS_SUCCESS
,
"cublasSetStream failed"
);
}
return
blas_handle_
;
}
...
...
@@ -95,11 +96,12 @@ class CudaDeviceContext : public DeviceContext {
cudnnHandle_t
cudnn_handle
()
{
if
(
!
dnn_handle_
)
{
DeviceGuard
guard
(
gpu_place_
);
PADDLE_ENFORCE
(
cudnnCreate
(
&
dnn_handle_
)
==
CUDNN_STATUS_SUCCESS
,
"cudnnCreate failed"
);
PADDLE_ENFORCE
(
cudnnSetStream
(
dnn_handle_
,
stream_
)
==
CUDNN_STATUS_SUCCESS
,
"cudnnSetStream failed"
);
paddle
::
dyload
::
cudnnCreate
(
&
dnn_handle_
)
==
CUDNN_STATUS_SUCCESS
,
"cudnnCreate failed"
);
PADDLE_ENFORCE
(
paddle
::
dyload
::
cudnnSetStream
(
dnn_handle_
,
stream_
)
==
CUDNN_STATUS_SUCCESS
,
"cudnnSetStream failed"
);
}
return
dnn_handle_
;
}
...
...
@@ -107,17 +109,17 @@ class CudaDeviceContext : public DeviceContext {
curandGenerator_t
curand_generator
()
{
if
(
!
rand_generator_
)
{
DeviceGuard
guard
(
gpu_place_
);
PADDLE_ENFORCE
(
paddle
::
dyload
::
curandCreateGenerator
(
&
rand_generator_
,
CURAND_RNG_PSEUDO_DEFAULT
)
==
CURAND_STATUS_SUCCESS
,
"curandCreateGenerator failed"
);
PADDLE_ENFORCE
(
curandCreateGenerator
(
&
rand_generator_
,
CURAND_RNG_PSEUDO_DEFAULT
)
==
CURAND_STATUS_SUCCESS
,
"curandCreateGenerator failed"
);
PADDLE_ENFORCE
(
curandSetPseudoRandomGeneratorSeed
(
rand_generator_
,
random_seed_
)
==
CURAND_STATUS_SUCCESS
,
paddle
::
dyload
::
curandSetPseudoRandomGeneratorSeed
(
rand_generator_
,
random_seed_
)
==
CURAND_STATUS_SUCCESS
,
"curandSetPseudoRandomGeneratorSeed failed"
);
PADDLE_ENFORCE
(
curandSetStream
(
rand_generator_
,
stream_
)
==
CURAND_STATUS_SUCCESS
,
"curandSetStream failed"
);
PADDLE_ENFORCE
(
paddle
::
dyload
::
curandSetStream
(
rand_generator_
,
stream_
)
==
CURAND_STATUS_SUCCESS
,
"curandSetStream failed"
);
}
return
rand_generator_
;
}
...
...
@@ -125,19 +127,21 @@ class CudaDeviceContext : public DeviceContext {
~
CudaDeviceContext
()
{
Wait
();
if
(
blas_handle_
)
{
PADDLE_ENFORCE
(
cublasDestroy
(
blas_handle_
)
==
CUBLAS_STATUS_SUCCESS
,
"cublasDestroy failed"
);
PADDLE_ENFORCE
(
paddle
::
dyload
::
cublasDestroy
(
blas_handle_
)
==
CUBLAS_STATUS_SUCCESS
,
"cublasDestroy failed"
);
}
if
(
dnn_handle_
)
{
PADDLE_ENFORCE
(
cudnnDestroy
(
dnn_handle_
)
==
CUDNN_STATUS_SUCCESS
,
"cudnnDestroy failed"
);
PADDLE_ENFORCE
(
paddle
::
dyload
::
cudnnDestroy
(
dnn_handle_
)
==
CUDNN_STATUS_SUCCESS
,
"cudnnDestroy failed"
);
}
if
(
rand_generator_
)
{
PADDLE_ENFORCE
(
curandDestroyGenerator
(
rand_generator_
)
==
CURAND_STATUS_SUCCESS
,
"curandDestroyGenerator failed"
);
PADDLE_ENFORCE
(
paddle
::
dyload
::
curandDestroyGenerator
(
rand_generator_
)
==
CURAND_STATUS_SUCCESS
,
"curandDestroyGenerator failed"
);
}
delete
eigen_stream_
;
...
...
paddle/platform/dynamic_loader.cc
浏览文件 @
a77fcef3
...
...
@@ -12,9 +12,9 @@ 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 "dynamic_loader.h"
#include <gflags/gflags.h>
#include "DynamicLoader.h"
#include "Logging.h"
#include <glog/logging.h>
DEFINE_string
(
cudnn_dir
,
""
,
"Specify path for loading libcudnn.so. For instance, "
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录