From 14625ffe9e1ca45a3d16b5427488225c6a2549c4 Mon Sep 17 00:00:00 2001
From: Kaipeng Deng <dengkaipeng@baidu.com>
Date: Tue, 24 Sep 2019 11:48:15 +0800
Subject: [PATCH] add elementwise mod support float/double. test=develop
 (#19570)

---
 .../elementwise/elementwise_mod_op.cc         |  4 ++-
 .../elementwise/elementwise_mod_op.cu         |  4 ++-
 .../elementwise/elementwise_mod_op.h          | 29 +++++++++++++++++++
 .../unittests/test_elementwise_mod_op.py      | 21 ++++++++++++--
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/paddle/fluid/operators/elementwise/elementwise_mod_op.cc b/paddle/fluid/operators/elementwise/elementwise_mod_op.cc
index fadebc00cf4..451c7816b9a 100644
--- a/paddle/fluid/operators/elementwise/elementwise_mod_op.cc
+++ b/paddle/fluid/operators/elementwise/elementwise_mod_op.cc
@@ -33,4 +33,6 @@ REGISTER_OP_WITHOUT_GRADIENT(elementwise_mod, ops::ElementwiseOp,
 REGISTER_OP_CPU_KERNEL(
     elementwise_mod,
     ops::ElementwiseModKernel<paddle::platform::CPUDeviceContext, int>,
-    ops::ElementwiseModKernel<paddle::platform::CPUDeviceContext, int64_t>);
+    ops::ElementwiseModKernel<paddle::platform::CPUDeviceContext, int64_t>,
+    ops::ElementwiseModFPKernel<paddle::platform::CPUDeviceContext, float>,
+    ops::ElementwiseModFPKernel<paddle::platform::CPUDeviceContext, double>);
diff --git a/paddle/fluid/operators/elementwise/elementwise_mod_op.cu b/paddle/fluid/operators/elementwise/elementwise_mod_op.cu
index da3304a8395..92991ab3a0a 100644
--- a/paddle/fluid/operators/elementwise/elementwise_mod_op.cu
+++ b/paddle/fluid/operators/elementwise/elementwise_mod_op.cu
@@ -19,4 +19,6 @@ namespace plat = paddle::platform;
 
 REGISTER_OP_CUDA_KERNEL(
     elementwise_mod, ops::ElementwiseModKernel<plat::CUDADeviceContext, int>,
-    ops::ElementwiseModKernel<plat::CUDADeviceContext, int64_t>);
+    ops::ElementwiseModKernel<plat::CUDADeviceContext, int64_t>,
+    ops::ElementwiseModFPKernel<plat::CUDADeviceContext, float>,
+    ops::ElementwiseModFPKernel<plat::CUDADeviceContext, double>);
diff --git a/paddle/fluid/operators/elementwise/elementwise_mod_op.h b/paddle/fluid/operators/elementwise/elementwise_mod_op.h
index 5b139fd4b33..e568a5dc72c 100644
--- a/paddle/fluid/operators/elementwise/elementwise_mod_op.h
+++ b/paddle/fluid/operators/elementwise/elementwise_mod_op.h
@@ -27,6 +27,11 @@ struct ModFunctor {
   inline HOSTDEVICE T operator()(T a, T b) const { return a % b; }
 };
 
+template <typename T>
+struct ModFunctorFP {
+  inline HOSTDEVICE T operator()(T a, T b) const { return std::fmod(a, b); }
+};
+
 template <typename DeviceContext, typename T>
 void elementwise_mod(const framework::ExecutionContext &ctx,
                      const framework::Tensor *x, const framework::Tensor *y,
@@ -36,6 +41,15 @@ void elementwise_mod(const framework::ExecutionContext &ctx,
                                                         ModFunctor<T>(), z);
 }
 
+template <typename DeviceContext, typename T>
+void elementwise_mod_fp(const framework::ExecutionContext &ctx,
+                        const framework::Tensor *x, const framework::Tensor *y,
+                        framework::Tensor *z) {
+  int axis = ctx.Attr<int>("axis");
+  ElementwiseComputeEx<ModFunctorFP<T>, DeviceContext, T>(ctx, x, y, axis,
+                                                          ModFunctorFP<T>(), z);
+}
+
 template <typename DeviceContext, typename T>
 class ElementwiseModKernel : public framework::OpKernel<T> {
  public:
@@ -51,5 +65,20 @@ class ElementwiseModKernel : public framework::OpKernel<T> {
   }
 };
 
+template <typename DeviceContext, typename T>
+class ElementwiseModFPKernel : public framework::OpKernel<T> {
+ public:
+  void Compute(const framework::ExecutionContext &ctx) const override {
+    auto *x = ctx.Input<framework::LoDTensor>("X");
+    auto *y = ctx.Input<framework::LoDTensor>("Y");
+    auto *z = ctx.Output<framework::LoDTensor>("Out");
+
+    z->mutable_data<T>(ctx.GetPlace());
+
+    // dtype of x and y is float or double
+    elementwise_mod_fp<DeviceContext, T>(ctx, x, y, z);
+  }
+};
+
 }  // namespace operators
 }  // namespace paddle
diff --git a/python/paddle/fluid/tests/unittests/test_elementwise_mod_op.py b/python/paddle/fluid/tests/unittests/test_elementwise_mod_op.py
index a354ba0177a..fcda179a093 100644
--- a/python/paddle/fluid/tests/unittests/test_elementwise_mod_op.py
+++ b/python/paddle/fluid/tests/unittests/test_elementwise_mod_op.py
@@ -27,7 +27,6 @@ class TestElementwiseModOp(OpTest):
 
     def setUp(self):
         self.op_type = "elementwise_mod"
-        self.dtype = np.int32
         self.axis = -1
         self.init_dtype()
         self.init_input_output()
@@ -50,7 +49,7 @@ class TestElementwiseModOp(OpTest):
         self.out = np.mod(self.x, self.y)
 
     def init_dtype(self):
-        pass
+        self.dtype = np.int32
 
     def init_axis(self):
         pass
@@ -65,5 +64,23 @@ class TestElementwiseModOp_scalar(TestElementwiseModOp):
         self.out = np.mod(self.x, self.y)
 
 
+class TestElementwiseModOpFloat(TestElementwiseModOp):
+    def init_dtype(self):
+        self.dtype = np.float32
+
+    def init_input_output(self):
+        self.x = np.random.uniform(-1000, 1000, [10, 10]).astype(self.dtype)
+        self.y = np.random.uniform(-100, 100, [10, 10]).astype(self.dtype)
+        self.out = np.fmod(self.x, self.y)
+
+    def test_check_output(self):
+        self.check_output(atol=2e-5)
+
+
+class TestElementwiseModOpDouble(TestElementwiseModOpFloat):
+    def init_dtype(self):
+        self.dtype = np.float64
+
+
 if __name__ == '__main__':
     unittest.main()
-- 
GitLab