From 41271f03cb609a9a772c3ff720a011ff3b1a1b93 Mon Sep 17 00:00:00 2001
From: qijun <qijun1994@hotmail.com>
Date: Thu, 14 Sep 2017 19:36:52 +0800
Subject: [PATCH] fix gpu build error

---
 paddle/operators/activation_op.cu             | 56 ++++++-------------
 .../paddle/trainer_config_helpers/networks.py |  4 +-
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/paddle/operators/activation_op.cu b/paddle/operators/activation_op.cu
index 112b33d2253..feed1302b29 100644
--- a/paddle/operators/activation_op.cu
+++ b/paddle/operators/activation_op.cu
@@ -19,10 +19,10 @@ namespace ops = paddle::operators;
 
 REGISTER_OP_GPU_KERNEL(sigmoid,
                        ops::ActivationKernel<paddle::platform::GPUPlace, float,
-                                             ops::SigmoidFunctor>);
+                                             ops::SigmoidFunctor<float>>);
 REGISTER_OP_GPU_KERNEL(
     sigmoid_grad, ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
-                                            ops::SigmoidGradFunctor>);
+                                            ops::SigmoidGradFunctor<float>>);
 
 REGISTER_OP_GPU_KERNEL(
     exp,
@@ -37,35 +37,27 @@ REGISTER_OP_GPU_KERNEL(
     relu_grad, ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
                                          ops::ReluGradFunctor<float>>);
 
-REGISTER_OP(tanh, ops::ActivationOp, ops::TanhOpMaker, tanh_grad,
-            ops::ActivationOpGrad);
-REGISTER_OP_GPU_KERNEL(tanh,
-                       ops::ActivationKernel<paddle::platform::GPUPlace, float,
-                                             ops::TanhFunctor<float>>);
+REGISTER_OP_GPU_KERNEL(
+    tanh,
+    ops::ActivationKernel<paddle::platform::GPUPlace, float, ops::TanhFunctor>);
 REGISTER_OP_GPU_KERNEL(
     tanh_grad, ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
                                          ops::TanhGradFunctor<float>>);
 
-REGISTER_OP(sqrt, ops::ActivationOp, ops::SqrtOpMaker, sqrt_grad,
-            ops::ActivationOpGrad);
-REGISTER_OP_GPU_KERNEL(sqrt,
-                       ops::ActivationKernel<paddle::platform::GPUPlace, float,
-                                             ops::SqrtFunctor<float>>);
+REGISTER_OP_GPU_KERNEL(
+    sqrt,
+    ops::ActivationKernel<paddle::platform::GPUPlace, float, ops::SqrtFunctor>);
 REGISTER_OP_GPU_KERNEL(
     sqrt_grad, ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
                                          ops::SqrtGradFunctor<float>>);
 
-REGISTER_OP(abs, ops::ActivationOp, ops::AbsOpMaker, abs_grad,
-            ops::ActivationOpGrad);
-REGISTER_OP_GPU_KERNEL(abs,
-                       ops::ActivationKernel<paddle::platform::GPUPlace, float,
-                                             ops::AbsFunctor<float>>);
 REGISTER_OP_GPU_KERNEL(
-    abs_grad, ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
-                                        ops::AbsGradFunctor<float>>);
+    abs,
+    ops::ActivationKernel<paddle::platform::GPUPlace, float, ops::AbsFunctor>);
+REGISTER_OP_GPU_KERNEL(abs_grad,
+                       ops::ActivationGradKernel<paddle::platform::GPUPlace,
+                                                 float, ops::AbsGradFunctor>);
 
-REGISTER_OP(reciprocal, ops::ActivationOp, ops::ReciprocalOpMaker,
-            reciprocal_grad, ops::ActivationOpGrad);
 REGISTER_OP_GPU_KERNEL(reciprocal,
                        ops::ActivationKernel<paddle::platform::GPUPlace, float,
                                              ops::ReciprocalFunctor<float>>);
@@ -74,47 +66,35 @@ REGISTER_OP_GPU_KERNEL(
     ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
                               ops::ReciprocalGradFunctor<float>>);
 
-REGISTER_OP(log, ops::ActivationOp, ops::LogOpMaker, log_grad,
-            ops::ActivationOpGrad);
-REGISTER_OP_GPU_KERNEL(log,
-                       ops::ActivationKernel<paddle::platform::GPUPlace, float,
-                                             ops::LogFunctor<float>>);
+REGISTER_OP_GPU_KERNEL(
+    log,
+    ops::ActivationKernel<paddle::platform::GPUPlace, float, ops::LogFunctor>);
 REGISTER_OP_GPU_KERNEL(
     log_grad, ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
                                         ops::LogGradFunctor<float>>);
 
-REGISTER_OP(square, ops::ActivationOp, ops::SquareOpMaker, square_grad,
-            ops::ActivationOpGrad);
 REGISTER_OP_GPU_KERNEL(square,
                        ops::ActivationKernel<paddle::platform::GPUPlace, float,
-                                             ops::squareFunctor<float>>);
+                                             ops::SquareFunctor>);
 REGISTER_OP_GPU_KERNEL(
     square_grad, ops::ActivationGradKernel<paddle::platform::GPUPlace, float,
                                            ops::SquareGradFunctor<float>>);
 
-REGISTER_OP(brelu, ops::ActivationOp, ops::BReluOpMaker<float>, brelu_grad,
-            ops::ActivationOpGrad);
 REGISTER_OP_GPU_KERNEL(brelu,
                        ops::BReluKernel<paddle::platform::GPUPlace, float>);
 REGISTER_OP_GPU_KERNEL(brelu_grad,
                        ops::BReluGradKernel<paddle::platform::GPUPlace, float>);
 
-REGISTER_OP(soft_relu, ops::ActivationOp, ops::SoftReluOpMaker<float>,
-            soft_relu_grad, ops::ActivationOpGrad);
 REGISTER_OP_GPU_KERNEL(soft_relu,
                        ops::SoftReluKernel<paddle::platform::GPUPlace, float>);
 REGISTER_OP_GPU_KERNEL(
     soft_relu_grad, ops::SoftReluGradKernel<paddle::platform::GPUPlace, float>);
 
-REGISTER_OP(pow, ops::ActivationOp, ops::PowOpMaker<float>, pow_grad,
-            ops::ActivationOpGrad);
 REGISTER_OP_GPU_KERNEL(pow, ops::PowKernel<paddle::platform::GPUPlace, float>);
 REGISTER_OP_GPU_KERNEL(pow_grad,
                        ops::PowGradKernel<paddle::platform::GPUPlace, float>);
 
-REGISTER_OP(stanh, ops::ActivationOp, ops::STanhOpMaker<float>, stanh_grad,
-            ops::ActivationOpGrad);
 REGISTER_OP_GPU_KERNEL(stanh,
                        ops::STanhKernel<paddle::platform::GPUPlace, float>);
 REGISTER_OP_GPU_KERNEL(stanh_grad,
-                       ops::STanhGradKernel<paddle::platform::GPUPlace, float>);
\ No newline at end of file
+                       ops::STanhGradKernel<paddle::platform::GPUPlace, float>);
diff --git a/python/paddle/trainer_config_helpers/networks.py b/python/paddle/trainer_config_helpers/networks.py
index 34be203ee25..28a71cf788f 100644
--- a/python/paddle/trainer_config_helpers/networks.py
+++ b/python/paddle/trainer_config_helpers/networks.py
@@ -1406,7 +1406,7 @@ def inputs(layers, *args):
     if len(args) != 0:
         layers.extend(args)
 
-    Inputs(*[l.name for l in layers])
+    Inputs(* [l.name for l in layers])
 
 
 def outputs(layers, *args):
@@ -1456,7 +1456,7 @@ def outputs(layers, *args):
     assert len(layers) > 0
 
     if HasInputsSet():  # input already set
-        Outputs(*[l.name for l in layers])
+        Outputs(* [l.name for l in layers])
         return  # just return outputs.
 
     if len(layers) != 1:
-- 
GitLab