From a829357e4d2e6f05060455625b4e7cfbb1bff8dd Mon Sep 17 00:00:00 2001
From: Zhong Hui <zhonghui.net@gmail.com>
Date: Fri, 13 Nov 2020 14:55:48 +0800
Subject: [PATCH] register the op version for some ops

register the op version for some ops
---
 paddle/fluid/operators/clip_op.cc             | 14 ++++++++
 .../fluid/operators/controlflow/compare_op.cc | 35 ++++++++++++-------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/paddle/fluid/operators/clip_op.cc b/paddle/fluid/operators/clip_op.cc
index f727f63eb61..ad61d61d4cc 100644
--- a/paddle/fluid/operators/clip_op.cc
+++ b/paddle/fluid/operators/clip_op.cc
@@ -14,6 +14,8 @@ limitations under the License. */
 
 #include "paddle/fluid/operators/clip_op.h"
 #include <memory>
+#include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/op_version_registry.h"
 
 namespace paddle {
 namespace operators {
@@ -122,3 +124,15 @@ REGISTER_OP_CPU_KERNEL(
 REGISTER_OP_CPU_KERNEL(
     clip_grad, ops::ClipGradKernel<paddle::platform::CPUDeviceContext, float>,
     ops::ClipGradKernel<paddle::platform::CPUDeviceContext, double>);
+
+REGISTER_OP_VERSION(clip)
+    .AddCheckpoint(
+        R"ROC(
+              Upgrade clip add a new input [Min])ROC",
+        paddle::framework::compatible::OpVersionDesc()
+            .NewInput("Min",
+                      "Pass the mix, min value as input, not attribute. Min is "
+                      "dispensable.")
+            .NewInput("Max",
+                      "Pass the mix, min value as input, not attribute. Max is "
+                      "dispensable."));
diff --git a/paddle/fluid/operators/controlflow/compare_op.cc b/paddle/fluid/operators/controlflow/compare_op.cc
index 4940649c2a3..21c28f9818b 100644
--- a/paddle/fluid/operators/controlflow/compare_op.cc
+++ b/paddle/fluid/operators/controlflow/compare_op.cc
@@ -17,6 +17,7 @@ limitations under the License. */
 #include <string>
 #include <vector>
 #include "paddle/fluid/framework/op_registry.h"
+#include "paddle/fluid/framework/op_version_registry.h"
 #include "paddle/fluid/operators/elementwise/elementwise_op_function.h"
 
 namespace paddle {
@@ -128,18 +129,28 @@ class CompareOp : public framework::OperatorWithKernel {
 }  // namespace operators
 }  // namespace paddle
 
-#define REGISTER_COMPARE_OP(op_type, _equation)                         \
-  struct _##op_type##Comment {                                          \
-    static char type[];                                                 \
-    static char equation[];                                             \
-  };                                                                    \
-  char _##op_type##Comment::type[]{#op_type};                           \
-  char _##op_type##Comment::equation[]{_equation};                      \
-  REGISTER_OPERATOR(                                                    \
-      op_type, ::paddle::operators::CompareOp<_##op_type##Comment>,     \
-      ::paddle::operators::CompareOpProtoMaker<_##op_type##Comment>,    \
-      ::paddle::framework::EmptyGradOpMaker<paddle::framework::OpDesc>, \
-      ::paddle::framework::EmptyGradOpMaker<paddle::imperative::OpBase>);
+#define REGISTER_COMPARE_OP_VERSION(op_type)                               \
+  REGISTER_OP_VERSION(op_type)                                             \
+      .AddCheckpoint(                                                      \
+          R"ROC(Upgrade compare ops, add a new attribute [force_cpu])ROC", \
+          paddle::framework::compatible::OpVersionDesc().NewAttr(          \
+              "force_cpu",                                                 \
+              "In order to force fill output variable to cpu memory.",     \
+              false));
+
+#define REGISTER_COMPARE_OP(op_type, _equation)                           \
+  struct _##op_type##Comment {                                            \
+    static char type[];                                                   \
+    static char equation[];                                               \
+  };                                                                      \
+  char _##op_type##Comment::type[]{#op_type};                             \
+  char _##op_type##Comment::equation[]{_equation};                        \
+  REGISTER_OPERATOR(                                                      \
+      op_type, ::paddle::operators::CompareOp<_##op_type##Comment>,       \
+      ::paddle::operators::CompareOpProtoMaker<_##op_type##Comment>,      \
+      ::paddle::framework::EmptyGradOpMaker<paddle::framework::OpDesc>,   \
+      ::paddle::framework::EmptyGradOpMaker<paddle::imperative::OpBase>); \
+  REGISTER_COMPARE_OP_VERSION(op_type);
 
 REGISTER_COMPARE_OP(less_than, "Out = X < Y");
 REGISTER_COMPARE_KERNEL(less_than, CPU, paddle::operators::LessThanFunctor);
-- 
GitLab