remove op.py in fluid

python/paddle/fluid/tests/unittests/benchmark.py

@@ -16,8 +16,7 @@
 
 import numpy as np
 from eager_op_test import OpTest
-
-from paddle.fluid.op import Operator
+from op import Operator
 
 
 class BenchmarkSuite(OpTest):

python/paddle/fluid/tests/unittests/collective/fleet/test_dgc_momentum_op.py

@@ -18,7 +18,7 @@
 
 from paddle import fluid
 from paddle.fluid import core
-from paddle.fluid.op import Operator
+from paddle.fluid.tests.unittests.op import Operator
 
 
 class TestDGCMomentumOp1(unittest.TestCase):

python/paddle/fluid/tests/unittests/collective/fleet/test_dgc_op.py

@@ -18,7 +18,7 @@
 
 from paddle import fluid
 from paddle.fluid import core
-from paddle.fluid.op import Operator
+from paddle.fluid.tests.unittests.op import Operator
 
 g_array_size = 102400
 

python/paddle/fluid/tests/unittests/collective/fleet/test_recv_save_op.py

@@ -25,7 +25,7 @@
 from paddle import fluid
 from paddle.fluid import core
 from paddle.fluid.framework import Program, program_guard
-from paddle.fluid.op import Operator
+from paddle.fluid.tests.unittests.op import Operator
 from paddle.incubate.distributed.fleet.parameter_server.mode import (
     DistributedMode,
 )

python/paddle/fluid/tests/unittests/eager_op_test.py

@@ -23,6 +23,7 @@
 from copy import copy
 
 import numpy as np
+from op import Operator
 
 import paddle
 from paddle import fluid
@@ -35,7 +36,6 @@
     _current_expected_place,
     canonicalize_attrs,
 )
-from paddle.fluid.op import Operator
 
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 from prim_op_test import OpTestUtils, PrimForwardChecker, PrimGradChecker

python/paddle/fluid/op.py → python/paddle/fluid/tests/unittests/op.py

@@ -14,8 +14,9 @@
 
 import numpy as np
 
-import paddle.fluid.core as core
-import paddle.fluid.proto.framework_pb2 as framework_pb2
+from paddle.fluid import core
+from paddle.fluid.proto import framework_pb2
+
 
 # NOTE: this is added to support creating a Scalar message
 # from a python number
@@ -256,13 +257,13 @@ def __impl__(*args, **kwargs):
         inputs=[(var.name, var.duplicable) for var in op_proto.inputs],
         outputs=[(var.name, var.duplicable) for var in op_proto.outputs],
         attrs=[attr.name for attr in op_proto.attrs],
-        extra_attrs=[item for item in extra_attrs_map.keys()],
+        extra_attrs=list(extra_attrs_map.keys()),
     )
 
 
 class OperatorFactory:
     def __init__(self):
-        self.op_methods = dict()
+        self.op_methods = {}
 
         for op_proto in get_all_op_protos():
             method = create_op_creation_method(op_proto)
@@ -313,70 +314,4 @@ def get_op_extra_attr_names(self, type):
         return self.get_op_info(type).extra_attrs
 
 
-class __RecurrentOp__:
-    __proto__ = None
-    type = "recurrent"
-
-    def __init__(self):
-        # cache recurrent_op's proto
-        if self.__proto__ is None:
-            for op_proto in get_all_op_protos():
-                if op_proto.type == self.type:
-                    self.__proto__ = op_proto
-
-    def __call__(self, *args, **kwargs):
-        if self.type not in args and "type" not in kwargs:
-            kwargs["type"] = self.type
-        # create proto
-        create_method = OpDescCreationMethod(self.__proto__)
-        proto = create_method(*args, **kwargs)
-        # create rnnop
-        return core.RecurrentOp.create(proto.SerializeToString())
-
-
-class __DynamicRecurrentOp__:
-    __proto__ = None
-    type = "dynamic_recurrent"
-
-    def __init__(self):
-        # cache recurrent_op's proto
-        if self.__proto__ is None:
-            for op_proto in get_all_op_protos():
-                if op_proto.type == self.type:
-                    self.__proto__ = op_proto
-
-    def __call__(self, *args, **kwargs):
-        if self.type not in args and "type" not in kwargs:
-            kwargs["type"] = self.type
-        # create proto
-        create_method = OpDescCreationMethod(self.__proto__)
-        proto = create_method(*args, **kwargs)
-        # create rnnop
-        return core.DynamicRecurrentOp.create(proto.SerializeToString())
-
-
-class __CondOp__:
-    __proto__ = None
-    type = "cond"
-
-    def __init__(self):
-        # cache recurrent_op's proto
-        if self.__proto__ is None:
-            for op_proto in get_all_op_protos():
-                if op_proto.type == self.type:
-                    self.__proto__ = op_proto
-
-    def __call__(self, *args, **kwargs):
-        if self.type not in args and "type" not in kwargs:
-            kwargs["type"] = self.type
-        # create proto
-        create_method = OpDescCreationMethod(self.__proto__)
-        proto = create_method(*args, **kwargs)
-        # create condop
-        return core.CondOp.create(proto.SerializeToString())
-
-
 Operator = OperatorFactory()  # The default global factory
-RecurrentOp = __RecurrentOp__()
-DynamicRecurrentOp = __DynamicRecurrentOp__()
-CondOp = __CondOp__()

python/paddle/fluid/tests/unittests/test_activation_sparse_op.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op import Operator
 
 import paddle
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 class TestSparseSquareOp(unittest.TestCase):

python/paddle/fluid/tests/unittests/test_adagrad_op.py

@@ -17,10 +17,10 @@
 
 import numpy as np
 from eager_op_test import OpTest
+from op import Operator
 
 import paddle
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 def adamgrad_wrapper(

python/paddle/fluid/tests/unittests/test_adam_op.py

@@ -16,11 +16,11 @@
 
 import numpy as np
 from eager_op_test import OpTest
+from op import Operator
 
 import paddle
 from paddle import fluid
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 def adam_wrapper(

python/paddle/fluid/tests/unittests/test_batch_norm_op.py

@@ -17,12 +17,12 @@
 
 import numpy as np
 from eager_op_test import OpTest, _set_use_system_allocator
+from op import Operator
 
 import paddle
 from paddle import fluid
 from paddle.fluid import Program, core, program_guard
 from paddle.fluid.framework import grad_var_name
-from paddle.fluid.op import Operator
 
 _set_use_system_allocator(True)
 

python/paddle/fluid/tests/unittests/test_beam_search_decode_op.py

@@ -15,9 +15,9 @@
 import unittest
 
 import numpy as np
+from op import Operator
 
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 class TestBeamSearchDecodeOp(unittest.TestCase):

python/paddle/fluid/tests/unittests/test_beam_search_op.py

@@ -15,9 +15,9 @@
 import unittest
 
 import numpy as np
+from op import Operator
 
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 def create_tensor(scope, name, np_data):

python/paddle/fluid/tests/unittests/test_clip_by_norm_op.py

@@ -16,9 +16,9 @@
 
 import numpy as np
 from eager_op_test import OpTest
+from op import Operator
 
 import paddle
-from paddle import fluid
 from paddle.fluid import core
 from paddle.nn import clip
 
@@ -119,7 +119,7 @@ def check_with_place(self, place):
         out_selected_rows = scope.var('Out').get_selected_rows()
 
         # run clip_by_norm_op
-        clip_by_norm_op = fluid.op.Operator(
+        clip_by_norm_op = Operator(
             "clip_by_norm", max_norm=self.max_norm, X='X', Out='Out'
         )
         clip_by_norm_op.run(scope, place)

python/paddle/fluid/tests/unittests/test_data_norm_op.py

@@ -17,11 +17,11 @@
 
 import numpy as np
 from eager_op_test import OpTest
+from op import Operator
 
 import paddle
 from paddle import fluid
 from paddle.fluid import Program, core, program_guard
-from paddle.fluid.op import Operator
 
 
 def _reference_testing(x, batch_size, batch_sum, batch_square_sum, slot_dim=-1):

python/paddle/fluid/tests/unittests/test_fake_init_op.py

@@ -14,8 +14,9 @@
 
 import unittest
 
+from op import Operator
+
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 class TestFakeInitOpSelectedRows(unittest.TestCase):

python/paddle/fluid/tests/unittests/test_fill_constant_op.py

@@ -16,11 +16,11 @@
 
 import numpy as np
 from eager_op_test import OpTest, convert_float_to_uint16
+from op import Operator
 
 import paddle
 from paddle import fluid
 from paddle.fluid import Program, core, program_guard
-from paddle.fluid.op import Operator
 
 
 def fill_wrapper(shape, value=0.0):

python/paddle/fluid/tests/unittests/test_fill_op.py

@@ -16,9 +16,9 @@
 
 import numpy as np
 from eager_op_test import OpTest, convert_float_to_uint16
+from op import Operator
 
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 class TestFillOp1(OpTest):

python/paddle/fluid/tests/unittests/test_ftrl_op.py

@@ -16,9 +16,9 @@
 
 import numpy as np
 from eager_op_test import OpTest
+from op import Operator
 
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 def ftrl_step(param, grad, rows, sq_accum, lin_accum, lr, l1, l2, lr_power):

python/paddle/fluid/tests/unittests/test_get_tensor_from_selected_rows_op.py

@@ -15,10 +15,10 @@
 import unittest
 
 import numpy as np
+from op import Operator
 
 import paddle
 from paddle.fluid import Program, core, program_guard
-from paddle.fluid.op import Operator
 from paddle.nn import clip
 
 

python/paddle/fluid/tests/unittests/test_lamb_op.py

@@ -16,10 +16,10 @@
 
 import numpy as np
 from eager_op_test import OpTest
+from op import Operator
 
 import paddle
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 paddle.enable_static()
 

python/paddle/fluid/tests/unittests/test_lookup_table_bf16_op.py

@@ -15,11 +15,11 @@
 import unittest
 
 import numpy as np
+from op import Operator
 
 import paddle
 from paddle import enable_static, fluid
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 from paddle.fluid.tests.unittests.eager_op_test import (
     OpTest,
     convert_float_to_uint16,

python/paddle/fluid/tests/unittests/test_lookup_table_op.py

@@ -21,12 +21,12 @@
     paddle_static_guard,
     skip_check_grad_ci,
 )
+from op import Operator
 
 import paddle
 import paddle.nn.functional as F
 from paddle import fluid
 from paddle.fluid import Program, core, program_guard
-from paddle.fluid.op import Operator
 
 
 class TestLookupTableOp(OpTest):

python/paddle/fluid/tests/unittests/test_lookup_table_v2_op.py

@@ -16,11 +16,11 @@
 
 import numpy as np
 from eager_op_test import OpTest, skip_check_grad_ci
+from op import Operator
 
 import paddle
 from paddle import fluid
 from paddle.fluid import Program, core, program_guard
-from paddle.fluid.op import Operator
 
 
 class TestStaticGraphSupportMultipleInt(unittest.TestCase):

python/paddle/fluid/tests/unittests/test_merge_selectedrows_op.py

@@ -15,9 +15,9 @@
 import unittest
 
 import numpy as np
+from op import Operator
 
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 class TestMergeSelectedRows(unittest.TestCase):

python/paddle/fluid/tests/unittests/test_momentum_op.py

@@ -17,11 +17,11 @@
 import numpy
 import numpy as np
 from eager_op_test import OpTest
+from op import Operator
 
 import paddle
 from paddle import fluid
 from paddle.fluid import core
-from paddle.fluid.op import Operator
 
 
 def calculate_momentum_by_numpy(