From d3d174f78b9724cb9aaad9cd3f13dc400d7ae5f3 Mon Sep 17 00:00:00 2001
From: Qi Li <qili93@qq.com>
Date: Mon, 26 Jul 2021 17:08:49 +0800
Subject: [PATCH] [NPU] fix logcial op on NPU, test=develop (#34371)

---
 .../operators/controlflow/logical_op_npu.cc   | 26 +++----------------
 .../unittests/npu/test_logical_op_npu.py      |  4 +--
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/paddle/fluid/operators/controlflow/logical_op_npu.cc b/paddle/fluid/operators/controlflow/logical_op_npu.cc
index babdb2257ee..9094aed4492 100644
--- a/paddle/fluid/operators/controlflow/logical_op_npu.cc
+++ b/paddle/fluid/operators/controlflow/logical_op_npu.cc
@@ -79,29 +79,11 @@ class LogicalAndPUKernel : public framework::OpKernel<T> {
 namespace ops = paddle::operators;
 namespace plat = paddle::platform;
 
-REGISTER_OP_NPU_KERNEL(
-    logical_not, ops::LogicalNotNPUKernel<plat::NPUDeviceContext, bool>,
-    ops::LogicalNotNPUKernel<plat::NPUDeviceContext, int8_t>,
-    ops::LogicalNotNPUKernel<plat::NPUDeviceContext, int16_t>,
-    ops::LogicalNotNPUKernel<plat::NPUDeviceContext, int>,
-    ops::LogicalNotNPUKernel<plat::NPUDeviceContext, int64_t>,
-    ops::LogicalNotNPUKernel<plat::NPUDeviceContext, float>,
-    ops::LogicalNotNPUKernel<plat::NPUDeviceContext, double>);
+REGISTER_OP_NPU_KERNEL(logical_not,
+                       ops::LogicalNotNPUKernel<plat::NPUDeviceContext, bool>);
 
 REGISTER_OP_NPU_KERNEL(logical_or,
-                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, bool>,
-                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, int8_t>,
-                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, int16_t>,
-                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, int>,
-                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, int64_t>,
-                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, float>,
-                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, double>);
+                       ops::LogicalOrNPUKernel<plat::NPUDeviceContext, bool>);
 
 REGISTER_OP_NPU_KERNEL(logical_and,
-                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, bool>,
-                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, int8_t>,
-                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, int16_t>,
-                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, int>,
-                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, int64_t>,
-                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, float>,
-                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, double>);
+                       ops::LogicalAndPUKernel<plat::NPUDeviceContext, bool>);
diff --git a/python/paddle/fluid/tests/unittests/npu/test_logical_op_npu.py b/python/paddle/fluid/tests/unittests/npu/test_logical_op_npu.py
index f5f0a23d81a..a9f9d73a039 100644
--- a/python/paddle/fluid/tests/unittests/npu/test_logical_op_npu.py
+++ b/python/paddle/fluid/tests/unittests/npu/test_logical_op_npu.py
@@ -23,9 +23,7 @@ import paddle
 import paddle.fluid as fluid
 from paddle.static import Program, program_guard
 
-SUPPORTED_DTYPES = [
-    bool, np.int8, np.int16, np.int32, np.int64, np.float32, np.float64
-]
+SUPPORTED_DTYPES = [bool]
 
 TEST_META_OP_DATA = [{
     'op_str': 'logical_and',
-- 
GitLab