From 1fdad1a60a064bf3c5f2412a1f5f6cdd2fcd14b4 Mon Sep 17 00:00:00 2001
From: wanghaoshuang <wanghaoshuang@baidu.com>
Date: Wed, 20 Sep 2017 14:11:35 +0800
Subject: [PATCH] Update transform invocation

---
 paddle/operators/clip_op.cc |  6 ++++--
 paddle/operators/clip_op.cu |  6 ++++--
 paddle/operators/clip_op.h  | 14 ++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/paddle/operators/clip_op.cc b/paddle/operators/clip_op.cc
index fde05759a90..86d79866a8e 100644
--- a/paddle/operators/clip_op.cc
+++ b/paddle/operators/clip_op.cc
@@ -80,5 +80,7 @@ class ClipOpGrad : public framework::OperatorWithKernel {
 namespace ops = paddle::operators;
 REGISTER_OP(clip, ops::ClipOp, ops::ClipOpMaker<float>, clip_grad,
             ops::ClipOpGrad);
-REGISTER_OP_CPU_KERNEL(clip, ops::ClipKernel<float>);
-REGISTER_OP_CPU_KERNEL(clip_grad, ops::ClipGradKernel<float>);
+REGISTER_OP_CPU_KERNEL(clip,
+                       ops::ClipKernel<paddle::platform::CPUPlace, float>);
+REGISTER_OP_CPU_KERNEL(clip_grad,
+                       ops::ClipGradKernel<paddle::platform::CPUPlace, float>);
diff --git a/paddle/operators/clip_op.cu b/paddle/operators/clip_op.cu
index 3a61841a56b..ca9701298fd 100644
--- a/paddle/operators/clip_op.cu
+++ b/paddle/operators/clip_op.cu
@@ -15,5 +15,7 @@
 #include "paddle/operators/clip_op.h"
 
 namespace ops = paddle::operators;
-REGISTER_OP_GPU_KERNEL(clip, ops::ClipKernel<float>);
-REGISTER_OP_GPU_KERNEL(clip_grad, ops::ClipGradKernel<float>);
+REGISTER_OP_GPU_KERNEL(clip,
+                       ops::ClipKernel<paddle::platform::GPUPlace, float>);
+REGISTER_OP_GPU_KERNEL(clip_grad,
+                       ops::ClipGradKernel<paddle::platform::GPUPlace, float>);
diff --git a/paddle/operators/clip_op.h b/paddle/operators/clip_op.h
index 5d05959129e..5ca32da41ad 100644
--- a/paddle/operators/clip_op.h
+++ b/paddle/operators/clip_op.h
@@ -58,7 +58,7 @@ class ClipGradFunctor {
   T max_;
 };
 
-template <typename T>
+template <typename Place, typename T>
 class ClipKernel : public framework::OpKernel {
  public:
   void Compute(const framework::ExecutionContext& context) const override {
@@ -69,12 +69,13 @@ class ClipKernel : public framework::OpKernel {
     T* out_data = out->mutable_data<T>(context.GetPlace());
     const T* x_data = x->data<T>();
     int numel = x->numel();
-    Transform(context.device_context(), x_data, x_data + numel, out_data,
-              ClipFunctor<T>(min, max));
+    Transform<Place> trans;
+    trans(context.device_context(), x_data, x_data + numel, out_data,
+          ClipFunctor<T>(min, max));
   }
 };
 
-template <typename T>
+template <typename Place, typename T>
 class ClipGradKernel : public framework::OpKernel {
  public:
   void Compute(const framework::ExecutionContext& context) const override {
@@ -88,8 +89,9 @@ class ClipGradKernel : public framework::OpKernel {
       auto d_x_data = d_x->mutable_data<T>(context.GetPlace());
       const T* d_out_data = d_out->data<T>();
       const T* x_data = x->data<T>();
-      Transform(context.device_context(), d_out_data, d_out_data + numel,
-                x_data, d_x_data, ClipGradFunctor<T>(min, max));
+      Transform<Place> trans;
+      trans(context.device_context(), d_out_data, d_out_data + numel, x_data,
+            d_x_data, ClipGradFunctor<T>(min, max));
     }
   }
 };
-- 
GitLab