fix enum operator override error

PaddlePaddle · Oct 22, 2021 · 7b7e988 · 7b7e988 · paddle-bot-old · Oct 22, 2021
1 parent 1685b67
commit 7b7e988
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/paddle/pten/common/data_type.h b/paddle/pten/common/data_type.h
@@ -169,12 +169,6 @@ inline std::ostream& operator<<(std::ostream& os, DataType dtype) {
   return os;
 }
 
-inline DataType& operator++(DataType& dtype, int) {
-  dtype =
-      DataType(static_cast<std::underlying_type<DataType>::type>(dtype) + 1);
-  return dtype;
-}
-
 }  // namespace experimental
 }  // namespace paddle
 

diff --git a/paddle/pten/common/layout.h b/paddle/pten/common/layout.h
@@ -52,12 +52,6 @@ inline std::ostream& operator<<(std::ostream& os, DataLayout layout) {
   return os;
 }
 
-inline DataLayout& operator++(DataLayout& layout, int) {
-  layout = DataLayout(
-      static_cast<std::underlying_type<DataLayout>::type>(layout) + 1);
-  return layout;
-}
-
 }  // namespace experimental
 }  // namespace paddle
 

diff --git a/paddle/pten/core/kernel_registry.h b/paddle/pten/core/kernel_registry.h
@@ -107,22 +107,24 @@ struct KernelRegistrar {
                   KernelArgsDefFn args_def_fn,
                   KernelFn kernel_fn) {
     if (layout == DataLayout::ANY) {
-      for (DataLayout layout_iter = DataLayout::NHWC;
-           layout_iter != DataLayout::NUM_DATA_LAYOUTS;
+      for (size_t layout_iter = static_cast<size_t>(DataLayout::NHWC);
+           layout_iter != static_cast<size_t>(DataLayout::NUM_DATA_LAYOUTS);
            layout_iter++) {
-        for (DataType dtype = DataType::BOOL; dtype != DataType::NUM_DATA_TYPES;
+        for (size_t dtype = static_cast<size_t>(DataType::BOOL);
+             dtype != static_cast<size_t>(DataType::NUM_DATA_TYPES);
              dtype++) {
           ConstructKernel(kernel_name_cstr,
                           backend,
-                          layout_iter,
-                          dtype,
+                          static_cast<DataLayout>(layout_iter),
+                          static_cast<DataType>(dtype),
                           args_parse_fn,
                           args_def_fn,
                           kernel_fn);
         }
       }
     } else {
-      for (DataType dtype = DataType::BOOL; dtype != DataType::NUM_DATA_TYPES;
+      for (size_t dtype = static_cast<size_t>(DataType::BOOL);
+           dtype != static_cast<size_t>(DataType::NUM_DATA_TYPES);
            dtype++) {
         ConstructKernel(kernel_name_cstr,
                         backend,

diff --git a/paddle/pten/hapi/include/linalg.h b/paddle/pten/hapi/include/linalg.h
@@ -21,10 +21,5 @@ namespace experimental {
 
 Tensor dot(const Tensor& x, const Tensor& y);
 
-Tensor matmul(const Tensor& x,
-              const Tensor& y,
-              bool transpose_x,
-              bool transpose_y);
-
 }  // namespace experimental
 }  // namespace paddle