Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wmsofts
Paddle
提交
0957fa7b
P
Paddle
项目概览
wmsofts
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
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,发现更多精彩内容 >>
提交
0957fa7b
编写于
9月 14, 2017
作者:
Q
qijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix relu functor and revert some codes
上级
c18ebc30
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
78 addition
and
260 deletion
+78
-260
paddle/framework/operator.cc
paddle/framework/operator.cc
+2
-2
paddle/framework/operator.h
paddle/framework/operator.h
+20
-5
paddle/operators/activation_op.cc
paddle/operators/activation_op.cc
+18
-61
paddle/operators/activation_op.cu
paddle/operators/activation_op.cu
+14
-8
paddle/operators/activation_op.h
paddle/operators/activation_op.h
+18
-64
paddle/operators/math/activation_functor.h
paddle/operators/math/activation_functor.h
+0
-96
paddle/platform/device_context.cc
paddle/platform/device_context.cc
+3
-4
paddle/platform/device_context.h
paddle/platform/device_context.h
+1
-18
paddle/platform/device_context_test.cc
paddle/platform/device_context_test.cc
+1
-1
paddle/pybind/pybind.cc
paddle/pybind/pybind.cc
+1
-1
未找到文件。
paddle/framework/operator.cc
浏览文件 @
0957fa7b
...
...
@@ -22,14 +22,14 @@ namespace framework {
template
<
>
Eigen
::
DefaultDevice
&
ExecutionContext
::
GetEigenDevice
<
platform
::
CPUPlace
,
Eigen
::
DefaultDevice
>
()
const
{
return
*
device_context_
->
get_eigen_device
<
platform
::
CPUPla
ce
>
();
return
*
device_context_
->
get_eigen_device
<
Eigen
::
DefaultDevi
ce
>
();
}
#ifndef PADDLE_ONLY_CPU
template
<
>
Eigen
::
GpuDevice
&
ExecutionContext
::
GetEigenDevice
<
platform
::
GPUPlace
,
Eigen
::
GpuDevice
>
()
const
{
return
*
device_context_
->
get_eigen_device
<
platform
::
GPUPla
ce
>
();
return
*
device_context_
->
get_eigen_device
<
Eigen
::
GpuDevi
ce
>
();
}
#endif
...
...
paddle/framework/operator.h
浏览文件 @
0957fa7b
...
...
@@ -139,9 +139,9 @@ class OperatorBase {
// Macro for define a clone method.
// If you are writing an kernel operator, `Clone` will be defined when you
// register it. i.e. `Clone` method is not needed to define by yourself.
#define DEFINE_OP_CLONE_METHOD(cls)
\
std::unique_ptr<
::paddle::framework::
OperatorBase> Clone() const final { \
return std::unique_ptr<
::paddle::framework::
OperatorBase>(new cls(*this)); \
#define DEFINE_OP_CLONE_METHOD(cls) \
std::unique_ptr<OperatorBase> Clone() const final { \
return std::unique_ptr<OperatorBase>(new cls(*this)); \
}
// Macro for define a default constructor for Operator.
...
...
@@ -331,6 +331,21 @@ class InferShapeContext {
const
Scope
&
scope_
;
};
template
<
typename
T
>
struct
EigenDeviceConverter
;
template
<>
struct
EigenDeviceConverter
<
platform
::
CPUPlace
>
{
using
EigenDeviceType
=
Eigen
::
DefaultDevice
;
};
#ifndef PADDLE_ONLY_CPU
template
<>
struct
EigenDeviceConverter
<
platform
::
GPUPlace
>
{
using
EigenDeviceType
=
Eigen
::
GpuDevice
;
};
#endif
class
ExecutionContext
:
public
InferShapeContext
{
public:
ExecutionContext
(
const
OperatorBase
&
op
,
const
Scope
&
scope
,
...
...
@@ -338,8 +353,8 @@ class ExecutionContext : public InferShapeContext {
:
InferShapeContext
(
op
,
scope
),
device_context_
(
device_context
)
{}
template
<
typename
PlaceType
,
typename
DeviceType
=
typename
platform
::
EigenDeviceConverter
<
PlaceType
>::
EigenDeviceType
>
typename
DeviceType
=
typename
EigenDeviceConverter
<
PlaceType
>::
EigenDeviceType
>
DeviceType
&
GetEigenDevice
()
const
;
platform
::
Place
GetPlace
()
const
{
return
device_context_
->
GetPlace
();
}
...
...
paddle/operators/activation_op.cc
浏览文件 @
0957fa7b
...
...
@@ -14,26 +14,6 @@
#include "paddle/operators/activation_op.h"
// #define FILL_ACTIVATION_OP \
// public: \
// using framework::OperatorWithKernel::OperatorWithKernel; \
// \
// protected: \
// void InferShape(const framework::InferShapeContext &ctx) const override { \
// ctx.Output<framework::Tensor>("Y")->Resize( \
// ctx.Input<framework::Tensor>("X")->dims()); \
// }
// #define FILL_ACTIVATION_GRAD_OP \
// public: \
// using framework::OperatorWithKernel::OperatorWithKernel; \
// \
// protected: \
// void InferShape(const framework::InferShapeContext &ctx) const override { \
// ctx.Output<framework::Tensor>(framework::GradVarName("X")) \
// ->Resize(ctx.Input<framework::Tensor>("Y")->dims()); \
// }
namespace
paddle
{
namespace
operators
{
...
...
@@ -59,10 +39,6 @@ class ActivationOpGrad : public framework::OperatorWithKernel {
}
};
// class SigmoidOp : public framework::OperatorWithKernel {
// FILL_ACTIVATION_OP
// };
class
SigmoidOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
SigmoidOpMaker
(
framework
::
OpProto
*
proto
,
...
...
@@ -74,14 +50,6 @@ class SigmoidOpMaker : public framework::OpProtoAndCheckerMaker {
}
};
// class SigmoidOpGrad : public framework::OperatorWithKernel {
// FILL_ACTIVATION_GRAD_OP
// };
// class ExpOp : public framework::OperatorWithKernel {
// FILL_ACTIVATION_OP
// };
class
ExpOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
ExpOpMaker
(
framework
::
OpProto
*
proto
,
framework
::
OpAttrChecker
*
op_checker
)
...
...
@@ -92,14 +60,6 @@ class ExpOpMaker : public framework::OpProtoAndCheckerMaker {
}
};
// class ExpOpGrad : public framework::OperatorWithKernel {
// FILL_ACTIVATION_GRAD_OP
// };
// class ReluOp : public framework::OperatorWithKernel {
// FILL_ACTIVATION_OP
// };
class
ReluOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
ReluOpMaker
(
framework
::
OpProto
*
proto
,
framework
::
OpAttrChecker
*
op_checker
)
...
...
@@ -110,36 +70,33 @@ class ReluOpMaker : public framework::OpProtoAndCheckerMaker {
}
};
// class ReluOpGrad : public framework::OperatorWithKernel {
// FILL_ACTIVATION_GRAD_OP
// };
}
// namespace operators
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
REGISTER_OP
(
sigmoid
,
ops
::
ActivationOp
,
ops
::
SigmoidOpMaker
,
sigmoid_grad
,
ops
::
ActivationOpGrad
);
REGISTER_OP_CPU_KERNEL
(
sigmoid
,
ops
::
ActivationKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
SigmoidFunctor
>
);
REGISTER_OP_CPU_KERNEL
(
sigmoid
,
ops
::
ActivationKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
Sigmoid
>
);
REGISTER_OP_CPU_KERNEL
(
sigmoid_grad
,
ops
::
ActivationGradKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
SigmoidGrad
>
);
sigmoid_grad
,
ops
::
ActivationGradKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
SigmoidGradFunctor
>
);
REGISTER_OP
(
exp
,
ops
::
ActivationOp
,
ops
::
ExpOpMaker
,
exp_grad
,
ops
::
ActivationOpGrad
);
REGISTER_OP_CPU_KERNEL
(
exp
,
ops
::
ActivationKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
Exp
>
);
exp
,
ops
::
ActivationKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
ExpFunctor
>
);
REGISTER_OP_CPU_KERNEL
(
exp_grad
,
ops
::
ActivationGradKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
ExpGradFunctor
>
);
REGISTER_OP
(
relu
,
ops
::
ActivationOp
,
ops
::
ReluOpMaker
,
relu_grad
,
ops
::
ActivationOpGrad
);
REGISTER_OP_CPU_KERNEL
(
relu
,
ops
::
ActivationKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
ReluFunctor
<
float
>>
);
REGISTER_OP_CPU_KERNEL
(
exp_grad
,
ops
::
ActivationGradKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
ExpGrad
>
);
// REGISTER_OP(relu, ops::ActivationOp, ops::ReluOpMaker, relu_grad,
// ops::ActivationOpGrad);
// REGISTER_OP_CPU_KERNEL(relu,
// ops::ReluKernel<paddle::platform::CPUPlace, float,
// ops::Relu>);
// REGISTER_OP_CPU_KERNEL(relu_grad,
// ops::ReluGradKernel<paddle::platform::CPUPlace, float,
// ops::ReluGrad>);
relu_grad
,
ops
::
ActivationGradKernel
<
paddle
::
platform
::
CPUPlace
,
float
,
ops
::
ReluGradFunctor
<
float
>>
);
paddle/operators/activation_op.cu
浏览文件 @
0957fa7b
...
...
@@ -18,15 +18,21 @@
namespace
ops
=
paddle
::
operators
;
REGISTER_OP_GPU_KERNEL
(
sigmoid
,
ops
::
SigmoidKernel
<
paddle
::
platform
::
GPUPlace
,
float
>
);
ops
::
ActivationKernel
<
paddle
::
platform
::
GPUPlace
,
float
,
ops
::
SigmoidFunctor
>
);
REGISTER_OP_GPU_KERNEL
(
sigmoid_grad
,
ops
::
SigmoidGradKernel
<
paddle
::
platform
::
GPUPlace
,
float
>
);
sigmoid_grad
,
ops
::
ActivationGradKernel
<
paddle
::
platform
::
GPUPlace
,
float
,
ops
::
SigmoidGradFunctor
>
);
REGISTER_OP_GPU_KERNEL
(
exp
,
ops
::
ExpKernel
<
paddle
::
platform
::
GPUPlace
,
float
>
);
REGISTER_OP_GPU_KERNEL
(
exp
,
ops
::
ActivationKernel
<
paddle
::
platform
::
GPUPlace
,
float
,
ops
::
ExpFunctor
>
);
REGISTER_OP_GPU_KERNEL
(
exp_grad
,
ops
::
ExpGradKernel
<
paddle
::
platform
::
GPUPlace
,
float
>
);
ops
::
ActivationGradKernel
<
paddle
::
platform
::
GPUPlace
,
float
,
ops
::
ExpGradFunctor
>
);
REGISTER_OP_GPU_KERNEL
(
relu
,
ops
::
ReluKernel
<
paddle
::
platform
::
GPUPlace
,
float
>
);
REGISTER_OP_GPU_KERNEL
(
relu_grad
,
ops
::
ReluGradKernel
<
paddle
::
platform
::
GPUPlace
,
float
>
);
ops
::
ActivationKernel
<
paddle
::
platform
::
GPUPlace
,
float
,
ops
::
ReluFunctor
<
float
>>
);
REGISTER_OP_GPU_KERNEL
(
relu_grad
,
ops
::
ActivationGradKernel
<
paddle
::
platform
::
GPUPlace
,
float
,
ops
::
ReluGradFunctor
<
float
>>
);
paddle/operators/activation_op.h
浏览文件 @
0957fa7b
...
...
@@ -15,42 +15,6 @@
#pragma once
#include "paddle/framework/eigen.h"
#include "paddle/framework/op_registry.h"
// #include "paddle/operators/math/activation_functor.h"
// #define ACTIVATION_KERNEL_NAME(ACTIVATION_NAME) ACTIVATION_NAME##Kernel
// #define DEFINE_ACTIVATION_KERNEL(ACTIVATION_NAME) \
// template <typename Place, typename T> \
// class ACTIVATION_KERNEL_NAME(ACTIVATION_NAME) : public framework::OpKernel { \
// public: \
// void Compute(const framework::ExecutionContext& context) const override { \
// auto* X = context.Input<framework::Tensor>("X"); \
// auto* Y = context.Output<framework::Tensor>("Y"); \
// Y->mutable_data<T>(context.GetPlace()); \
// math::ACTIVATION_NAME<Place, T> functor; \
// auto* device_context = context.device_context(); \
// functor(*device_context, *X, Y); \
// } \
// };
// #define DEFINE_ACTIVATION_GRAD_KERNEL(ACTIVATION_GRAD_NAME) \
// template <typename Place, typename T> \
// class ACTIVATION_KERNEL_NAME(ACTIVATION_GRAD_NAME) \
// : public framework::OpKernel { \
// public: \
// void Compute(const framework::ExecutionContext& context) const override { \
// auto* X = context.Input<framework::Tensor>("X"); \
// auto* Y = context.Input<framework::Tensor>("Y"); \
// auto* dY = \
// context.Input<framework::Tensor>(framework::GradVarName("Y")); \
// auto* dX = \
// context.Output<framework::Tensor>(framework::GradVarName("X")); \
// dX->mutable_data<T>(context.GetPlace()); \
// math::ACTIVATION_GRAD_NAME<Place, T> functor; \
// auto* device_context = context.device_context(); \
// functor(*device_context, *X, *Y, *dY, dX); \
// } \
// };
namespace
paddle
{
namespace
operators
{
...
...
@@ -91,59 +55,49 @@ class ActivationGradKernel : public framework::OpKernel {
}
};
struct
Sigmoid
{
struct
Sigmoid
Functor
{
template
<
typename
Device
,
typename
X
,
typename
Y
>
void
operator
()(
Device
d
,
X
x
,
Y
y
)
{
y
.
device
(
d
)
=
1.
/
(
1.
+
(
-
x
).
exp
());
}
};
struct
SigmoidGrad
{
struct
SigmoidGrad
Functor
{
template
<
typename
Device
,
typename
X
,
typename
Y
,
typename
dY
,
typename
dX
>
void
operator
()(
Device
d
,
X
x
,
Y
y
,
dY
dy
,
dX
dx
)
{
dx
.
device
(
d
)
=
dy
*
y
*
(
1.
-
y
);
}
};
struct
Exp
{
struct
Exp
Functor
{
template
<
typename
Device
,
typename
X
,
typename
Y
>
void
operator
()(
Device
d
,
X
x
,
Y
y
)
{
y
.
device
(
d
)
=
x
.
exp
();
}
};
struct
ExpGrad
{
struct
ExpGrad
Functor
{
template
<
typename
Device
,
typename
X
,
typename
Y
,
typename
dY
,
typename
dX
>
void
operator
()(
Device
d
,
X
x
,
Y
y
,
dY
dy
,
dX
dx
)
{
dx
.
device
(
d
)
=
y
;
}
};
// template <typename Device, typename X, typename Y>
// struct Relu {
// void operator()(Device d, X x, Y y) {
// y.device(d) = x.cwiseMax(static_cast<T>(0));
// }
// };
// template <typename Device, typename X, typename Y, typename dY, typename dX>
// struct ReluGrad {
// void operator()(Device d, X x, Y y, dY dy, dX dx) {
// dx.device(d) = dy * (x > static_cast<T>(0)).template cast<T>();
// }
// };
// DEFINE_ACTIVATION_KERNEL(Sigmoid);
// DEFINE_ACTIVATION_GRAD_KERNEL(SigmoidGrad);
// DEFINE_ACTIVATION_KERNEL(Exp);
// DEFINE_ACTIVATION_GRAD_KERNEL(ExpGrad);
// DEFINE_ACTIVATION_KERNEL(Relu);
template
<
typename
T
>
struct
ReluFunctor
{
template
<
typename
Device
,
typename
X
,
typename
Y
>
void
operator
()(
Device
d
,
X
x
,
Y
y
)
{
y
.
device
(
d
)
=
x
.
cwiseMax
(
static_cast
<
T
>
(
0
));
}
};
// DEFINE_ACTIVATION_GRAD_KERNEL(ReluGrad);
template
<
typename
T
>
struct
ReluGradFunctor
{
template
<
typename
Device
,
typename
X
,
typename
Y
,
typename
dY
,
typename
dX
>
void
operator
()(
Device
d
,
X
x
,
Y
y
,
dY
dy
,
dX
dx
)
{
dx
.
device
(
d
)
=
dy
*
(
x
>
static_cast
<
T
>
(
0
)).
template
cast
<
T
>();
}
};
}
// namespace operators
}
// namespace paddle
paddle/operators/math/activation_functor.h
已删除
100644 → 0
浏览文件 @
c18ebc30
/* 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/framework/eigen.h"
#include "paddle/framework/tensor.h"
namespace
paddle
{
namespace
operators
{
namespace
math
{
template
<
typename
Place
,
typename
T
>
struct
Sigmoid
{
void
operator
()(
const
platform
::
DeviceContext
&
device_context
,
const
framework
::
Tensor
&
X
,
framework
::
Tensor
*
Y
)
{
auto
x
=
framework
::
EigenVector
<
T
>::
Flatten
(
X
);
auto
y
=
framework
::
EigenVector
<
T
>::
Flatten
(
*
Y
);
auto
*
place
=
device_context
.
template
get_eigen_device
<
Place
>();
y
.
device
(
*
place
)
=
1.
/
(
1.
+
(
-
x
).
exp
());
}
};
template
<
typename
Place
,
typename
T
>
struct
SigmoidGrad
{
void
operator
()(
const
platform
::
DeviceContext
&
device_context
,
const
framework
::
Tensor
&
X
,
const
framework
::
Tensor
&
Y
,
const
framework
::
Tensor
&
dY
,
framework
::
Tensor
*
dX
)
{
auto
dx
=
framework
::
EigenVector
<
T
>::
Flatten
(
*
dX
);
auto
y
=
framework
::
EigenVector
<
T
>::
Flatten
(
Y
);
auto
dy
=
framework
::
EigenVector
<
T
>::
Flatten
(
dY
);
auto
*
place
=
device_context
.
template
get_eigen_device
<
Place
>();
dx
.
device
(
*
place
)
=
dy
*
y
*
(
1.
-
y
);
}
};
template
<
typename
Place
,
typename
T
>
struct
Exp
{
void
operator
()(
const
platform
::
DeviceContext
&
device_context
,
const
framework
::
Tensor
&
input
,
framework
::
Tensor
*
output
)
{
auto
x
=
framework
::
EigenVector
<
T
>::
Flatten
(
input
);
auto
y
=
framework
::
EigenVector
<
T
>::
Flatten
(
*
output
);
auto
*
place
=
device_context
.
template
get_eigen_device
<
Place
>();
y
.
device
(
*
place
)
=
x
.
exp
();
}
};
template
<
typename
Place
,
typename
T
>
struct
ExpGrad
{
void
operator
()(
const
platform
::
DeviceContext
&
device_context
,
const
framework
::
Tensor
&
X
,
const
framework
::
Tensor
&
Y
,
const
framework
::
Tensor
&
dY
,
framework
::
Tensor
*
dX
)
{
auto
dx
=
framework
::
EigenVector
<
T
>::
Flatten
(
*
dX
);
auto
y
=
framework
::
EigenVector
<
T
>::
Flatten
(
Y
);
auto
*
place
=
device_context
.
template
get_eigen_device
<
Place
>();
dx
.
device
(
*
place
)
=
y
;
}
};
template
<
typename
Place
,
typename
T
>
struct
Relu
{
void
operator
()(
const
platform
::
DeviceContext
&
device_context
,
const
framework
::
Tensor
&
input
,
framework
::
Tensor
*
output
)
{
auto
x
=
framework
::
EigenVector
<
T
>::
Flatten
(
input
);
auto
y
=
framework
::
EigenVector
<
T
>::
Flatten
(
*
output
);
auto
*
place
=
device_context
.
template
get_eigen_device
<
Place
>();
y
.
device
(
*
place
)
=
x
.
cwiseMax
(
static_cast
<
T
>
(
0
));
}
};
template
<
typename
Place
,
typename
T
>
struct
ReluGrad
{
void
operator
()(
const
platform
::
DeviceContext
&
device_context
,
const
framework
::
Tensor
&
X
,
const
framework
::
Tensor
&
Y
,
const
framework
::
Tensor
&
dY
,
framework
::
Tensor
*
dX
)
{
auto
dx
=
framework
::
EigenVector
<
T
>::
Flatten
(
*
dX
);
auto
dy
=
framework
::
EigenVector
<
T
>::
Flatten
(
dY
);
auto
x
=
framework
::
EigenVector
<
T
>::
Flatten
(
X
);
auto
*
place
=
device_context
.
template
get_eigen_device
<
Place
>();
dx
.
device
(
*
place
)
=
dy
*
(
x
>
static_cast
<
T
>
(
0
)).
template
cast
<
T
>();
}
};
}
// namespace math
}
// namespace operators
}
// namespace paddle
paddle/platform/device_context.cc
浏览文件 @
0957fa7b
...
...
@@ -16,8 +16,8 @@ namespace paddle {
namespace
platform
{
template
<
>
Eigen
::
DefaultDevice
*
DeviceContext
::
get_eigen_device
<
CPUPlace
,
Eigen
::
DefaultDevice
>
()
const
{
Eigen
::
DefaultDevice
*
DeviceContext
::
get_eigen_device
<
Eigen
::
DefaultDevice
>
()
const
{
return
reinterpret_cast
<
const
CPUDeviceContext
*>
(
this
)
->
eigen_device
();
}
...
...
@@ -91,8 +91,7 @@ class EigenCudaStreamDevice : public Eigen::StreamInterface {
};
template
<
>
Eigen
::
GpuDevice
*
DeviceContext
::
get_eigen_device
<
GPUPlace
,
Eigen
::
GpuDevice
>
()
const
{
Eigen
::
GpuDevice
*
DeviceContext
::
get_eigen_device
<
Eigen
::
GpuDevice
>
()
const
{
return
reinterpret_cast
<
const
CUDADeviceContext
*>
(
this
)
->
eigen_device
();
}
...
...
paddle/platform/device_context.h
浏览文件 @
0957fa7b
...
...
@@ -27,29 +27,12 @@ limitations under the License. */
namespace
paddle
{
namespace
platform
{
template
<
typename
T
>
struct
EigenDeviceConverter
;
template
<
>
struct
EigenDeviceConverter
<
platform
::
CPUPlace
>
{
using
EigenDeviceType
=
Eigen
::
DefaultDevice
;
};
#ifndef PADDLE_ONLY_CPU
template
<
>
struct
EigenDeviceConverter
<
platform
::
GPUPlace
>
{
using
EigenDeviceType
=
Eigen
::
GpuDevice
;
};
#endif
class
DeviceContext
{
public:
virtual
~
DeviceContext
()
{}
virtual
Place
GetPlace
()
const
=
0
;
template
<
typename
PlaceType
,
typename
DeviceType
=
typename
EigenDeviceConverter
<
PlaceType
>
::
EigenDeviceType
>
template
<
typename
DeviceType
>
DeviceType
*
get_eigen_device
()
const
;
};
...
...
paddle/platform/device_context_test.cc
浏览文件 @
0957fa7b
...
...
@@ -24,7 +24,7 @@ TEST(Device, Init) {
for
(
int
i
=
0
;
i
<
count
;
i
++
)
{
DeviceContext
*
device_context
=
new
CUDADeviceContext
(
GPUPlace
(
i
));
Eigen
::
GpuDevice
*
gpu_device
=
device_context
->
template
get_eigen_device
<
GPUPla
ce
>();
device_context
->
template
get_eigen_device
<
Eigen
::
GpuDevi
ce
>();
ASSERT_NE
(
nullptr
,
gpu_device
);
delete
device_context
;
}
...
...
paddle/pybind/pybind.cc
浏览文件 @
0957fa7b
...
...
@@ -56,7 +56,7 @@ USE_OP(sum);
USE_OP
(
reshape
);
USE_OP
(
sigmoid
);
USE_OP
(
exp
);
//
USE_OP(relu);
USE_OP
(
relu
);
namespace
paddle
{
namespace
framework
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录