[Polish Namespace] Polish operants namespace (#50420)

* polish namespace

* change static_tensor_operants

* polish namespace

paddle/fluid/framework/custom_operator.cc

@@ -46,8 +46,8 @@ limitations under the License. */
 #endif
 
 #include "gflags/gflags.h"
+#include "paddle/phi/api/include/operants_manager.h"
 #include "paddle/phi/api/include/tensor_operants.h"
-#include "paddle/phi/core/operants_manager.h"
 
 DECLARE_string(tensor_operants_mode);
 
@@ -278,9 +278,8 @@ static void RunKernelFunc(const framework::ExecutionContext& ctx,
     VLOG(3) << "Custom Operator: Run ComputeFunc.";
 
     FLAGS_tensor_operants_mode = "phi";
-    if (paddle::operants::OperantsManager::Instance().phi_operants.get() ==
-        nullptr) {
-      paddle::operants::OperantsManager::Instance().phi_operants.reset(
+    if (paddle::OperantsManager::Instance().phi_operants.get() == nullptr) {
+      paddle::OperantsManager::Instance().phi_operants.reset(
           new paddle::operants::PhiTensorOperants());
       VLOG(4) << "Initialize phi tensor operants successfully";
     }

paddle/fluid/prim/tests/init_env_utils.cc

@@ -15,16 +15,16 @@
 #include "paddle/fluid/prim/tests/init_env_utils.h"
 #include "paddle/fluid/prim/utils/eager/eager_tensor_operants.h"
 #include "paddle/fluid/prim/utils/static/static_tensor_operants.h"
-#include "paddle/phi/core/operants_manager.h"
+#include "paddle/phi/api/include/operants_manager.h"
 
 namespace paddle {
 namespace prim {
 
 void InitTensorOperants() {
-  paddle::operants::OperantsManager::Instance().eager_operants.reset(
-      new paddle::operants::EagerTensorOperants());
-  paddle::operants::OperantsManager::Instance().static_operants.reset(
-      new paddle::operants::StaticTensorOperants());
+  paddle::OperantsManager::Instance().eager_operants.reset(
+      new paddle::prim::EagerTensorOperants());
+  paddle::OperantsManager::Instance().static_operants.reset(
+      new paddle::prim::StaticTensorOperants());
 }
 
 }  // namespace prim

paddle/fluid/prim/tests/test_static_prim.cc

@@ -23,9 +23,9 @@
 #include "paddle/fluid/prim/utils/static/desc_tensor.h"
 #include "paddle/fluid/prim/utils/static/static_tensor_operants.h"
 #include "paddle/fluid/prim/utils/utils.h"
+#include "paddle/phi/api/include/operants_manager.h"
 #include "paddle/phi/core/enforce.h"
 #include "paddle/phi/core/kernel_registry.h"
-#include "paddle/phi/core/operants_manager.h"
 
 DECLARE_bool(prim_enabled);
 DECLARE_string(tensor_operants_mode);
@@ -148,8 +148,8 @@ class TestCompositeGradMaker : public CompositeGradOpMakerBase {
 TEST(StaticPrim, TanhBackwardComposite) {
   // Initialized environment
   FLAGS_tensor_operants_mode = "static";
-  paddle::operants::OperantsManager::Instance().static_operants.reset(
-      new paddle::operants::StaticTensorOperants());
+  paddle::OperantsManager::Instance().static_operants.reset(
+      new paddle::prim::StaticTensorOperants());
 
   TestBaseProgram base_program = TestBaseProgram();
   auto* target_block = base_program.GetBlock(0);
@@ -234,8 +234,8 @@ TEST(StaticPrim, TanhBackwardComposite) {
 TEST(StaticCompositeGradMaker, TestMutiInputMethod) {
   // Initialized environment
   FLAGS_tensor_operants_mode = "static";
-  paddle::operants::OperantsManager::Instance().static_operants.reset(
-      new paddle::operants::StaticTensorOperants());
+  paddle::OperantsManager::Instance().static_operants.reset(
+      new paddle::prim::StaticTensorOperants());
 
   TestBaseProgram base_program = TestBaseProgram();
   auto* target_block = base_program.GetBlock(0);
@@ -301,8 +301,8 @@ TEST(StaticCompositeGradMaker, TestMutiInputMethod) {
 TEST(StaticCompositeGradMaker, TestMutiOutputMethod) {
   // Initialized environment
   FLAGS_tensor_operants_mode = "static";
-  paddle::operants::OperantsManager::Instance().static_operants.reset(
-      new paddle::operants::StaticTensorOperants());
+  paddle::OperantsManager::Instance().static_operants.reset(
+      new paddle::prim::StaticTensorOperants());
 
   TestBaseProgram base_program = TestBaseProgram();
   auto* target_block = base_program.GetBlock(0);

paddle/fluid/prim/utils/eager/eager_tensor_operants.cc

@@ -19,11 +19,11 @@
 
 namespace paddle {
 
-namespace operants {
+namespace prim {
 
 Tensor EagerTensorOperants::multiply(const Tensor& x, const Tensor& y) {
   return ::multiply_ad_func(x, y);
 }
 
-}  // namespace operants
+}  // namespace prim
 }  // namespace paddle

paddle/fluid/prim/utils/eager/eager_tensor_operants.h

@@ -14,13 +14,16 @@
 
 #pragma once
 
+#include "paddle/phi/api/include/operants_base.h"
 #include "paddle/phi/api/include/tensor.h"
 #include "paddle/phi/core/macros.h"
-#include "paddle/phi/core/operants_base.h"
 
 namespace paddle {
 
-namespace operants {
+namespace prim {
+
+using Tensor = paddle::experimental::Tensor;
+using TensorOperantsBase = paddle::operants::TensorOperantsBase;
 
 class EagerTensorOperants : public TensorOperantsBase {
  public:
@@ -32,5 +35,5 @@ class EagerTensorOperants : public TensorOperantsBase {
   DISABLE_COPY_AND_ASSIGN(EagerTensorOperants);
 };
 
-}  // namespace operants
+}  // namespace prim
 }  // namespace paddle

paddle/fluid/prim/utils/static/static_tensor_operants.cc

@@ -20,12 +20,12 @@
 
 namespace paddle {
 
-namespace operants {
+namespace prim {
 using DescTensor = paddle::prim::DescTensor;
 
 Tensor StaticTensorOperants::multiply(const Tensor& x, const Tensor& y) {
   return paddle::prim::multiply<DescTensor>(x, y);
 }
 
-}  // namespace operants
+}  // namespace prim
 }  // namespace paddle

paddle/fluid/prim/utils/static/static_tensor_operants.h

@@ -14,13 +14,16 @@
 
 #pragma once
 
+#include "paddle/phi/api/include/operants_base.h"
 #include "paddle/phi/api/include/tensor.h"
 #include "paddle/phi/core/macros.h"
-#include "paddle/phi/core/operants_base.h"
 
 namespace paddle {
 
-namespace operants {
+namespace prim {
+
+using Tensor = paddle::experimental::Tensor;
+using TensorOperantsBase = paddle::operants::TensorOperantsBase;
 
 class StaticTensorOperants : public TensorOperantsBase {
  public:
@@ -32,5 +35,5 @@ class StaticTensorOperants : public TensorOperantsBase {
   DISABLE_COPY_AND_ASSIGN(StaticTensorOperants);
 };
 
-}  // namespace operants
+}  // namespace prim
 }  // namespace paddle

paddle/fluid/pybind/eager_functions.cc

@@ -61,8 +61,8 @@ typedef SSIZE_T ssize_t;
 #endif
 
 #include "gflags/gflags.h"
+#include "paddle/phi/api/include/operants_manager.h"
 #include "paddle/phi/api/include/tensor_operants.h"
-#include "paddle/phi/core/operants_manager.h"
 
 DECLARE_string(tensor_operants_mode);
 
@@ -503,10 +503,10 @@ static PyObject* eager_api_init_eager_and_static_tensor_operants(
     PyObject* self, PyObject* args, PyObject* kwargs) {
   EAGER_TRY
 
-  paddle::operants::OperantsManager::Instance().eager_operants.reset(
-      new paddle::operants::EagerTensorOperants());
-  paddle::operants::OperantsManager::Instance().static_operants.reset(
-      new paddle::operants::StaticTensorOperants());
+  paddle::OperantsManager::Instance().eager_operants.reset(
+      new paddle::prim::EagerTensorOperants());
+  paddle::OperantsManager::Instance().static_operants.reset(
+      new paddle::prim::StaticTensorOperants());
   VLOG(4) << "Initialize eager and static tensor operants successfully";
 
   RETURN_PY_NONE
@@ -518,9 +518,8 @@ static PyObject* eager_api_run_custom_op(PyObject* self,
                                          PyObject* kwargs) {
   EAGER_TRY
   FLAGS_tensor_operants_mode = "phi";
-  if (paddle::operants::OperantsManager::Instance().phi_operants.get() ==
-      nullptr) {
-    paddle::operants::OperantsManager::Instance().phi_operants.reset(
+  if (paddle::OperantsManager::Instance().phi_operants.get() == nullptr) {
+    paddle::OperantsManager::Instance().phi_operants.reset(
         new paddle::operants::PhiTensorOperants());
     VLOG(4) << "Initialize phi tensor operants successfully";
   }

paddle/phi/core/operants_manager.h → paddle/phi/api/include/operants_manager.h

@@ -14,15 +14,14 @@
 
 #pragma once
 
+#include "paddle/phi/api/include/operants_base.h"
 #include "paddle/phi/api/include/tensor.h"
 #include "paddle/phi/core/macros.h"
-#include "paddle/phi/core/operants_base.h"
 
 namespace paddle {
 
-namespace operants {
-
 using Tensor = paddle::experimental::Tensor;
+using TensorOperantsBase = paddle::operants::TensorOperantsBase;
 
 /**
  * [ Why need OperantsManager? ]
@@ -73,5 +72,4 @@ class OperantsManager {
   DISABLE_COPY_AND_ASSIGN(OperantsManager);
 };
 
-}  // namespace operants
 }  // namespace paddle

paddle/phi/api/include/tensor_operants.h

@@ -14,9 +14,9 @@
 
 #pragma once
 
+#include "paddle/phi/api/include/operants_base.h"
 #include "paddle/phi/api/include/tensor.h"
 #include "paddle/phi/core/macros.h"
-#include "paddle/phi/core/operants_base.h"
 
 namespace paddle {
 

paddle/phi/api/lib/CMakeLists.txt

@@ -316,3 +316,7 @@ cc_library(
   phi_tensor_operants
   SRCS tensor_operants.cc
   DEPS phi_function_api)
+cc_library(
+  operants_manager
+  SRCS operants_manager.cc
+  DEPS flags)

paddle/phi/core/operants_manager.cc → paddle/phi/api/lib/operants_manager.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/phi/core/operants_manager.h"
+#include "paddle/phi/api/include/operants_manager.h"
 
 #include "gflags/gflags.h"
 #include "glog/logging.h"
@@ -23,8 +23,6 @@ DECLARE_string(tensor_operants_mode);
 
 namespace paddle {
 
-namespace operants {
-
 OperantsManager& OperantsManager::Instance() {
   static OperantsManager g_op_manager;
   return g_op_manager;
@@ -63,5 +61,4 @@ Tensor OperantsManager::multiply(const Tensor& x, const Tensor& y) {
   }
 }
 
-}  // namespace operants
 }  // namespace paddle

paddle/phi/api/lib/tensor.cc

@@ -21,13 +21,13 @@ limitations under the License. */
 #include "glog/logging.h"
 
 #include "paddle/phi/api/include/context_pool.h"
+#include "paddle/phi/api/include/operants_manager.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
 #include "paddle/phi/backends/gpu/gpu_context.h"
 #include "paddle/phi/backends/gpu/gpu_info.h"
 #include "paddle/phi/core/ddim.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/enforce.h"
-#include "paddle/phi/core/operants_manager.h"
 #include "paddle/phi/core/selected_rows.h"
 #include "paddle/phi/core/sparse_coo_tensor.h"
 #include "paddle/phi/core/sparse_csr_tensor.h"
@@ -435,7 +435,7 @@ void Tensor::reset_inplace_version(bool set_to_zero) {
 }
 
 PADDLE_API Tensor operator*(const Tensor &x, const Tensor &y) {
-  return paddle::operants::OperantsManager::Instance().multiply(x, y);
+  return paddle::OperantsManager::Instance().multiply(x, y);
 }
 
 }  // namespace experimental

paddle/phi/core/CMakeLists.txt

@@ -114,11 +114,6 @@ cc_library(
   SRCS custom_kernel.cc
   DEPS kernel_factory)
 
-cc_library(
-  operants_manager
-  SRCS operants_manager.cc
-  DEPS phi_enforce)
-
 cc_library(
   mixed_vector
   SRCS mixed_vector.cc