Mv eager ut (#53167)

* Mv eager tests

* fix

* fix build error

* fix build error

* fix codestyle

paddle/fluid/eager/CMakeLists.txt

@@ -39,7 +39,6 @@ add_subdirectory(api)
 add_subdirectory(custom_operator)
 if(NOT ((NOT WITH_PYTHON) AND ON_INFER))
   add_subdirectory(accumulation)
-  add_subdirectory(tests)
   add_subdirectory(pylayer)
   cc_library(
     grad_tensor_holder

paddle/fluid/eager/tests/CMakeLists.txt

-add_subdirectory(data_structure_tests)
-add_subdirectory(task_tests)
-add_subdirectory(performance_tests)

test/cpp/CMakeLists.txt

@@ -5,3 +5,4 @@ add_subdirectory(prim)
 add_subdirectory(imperative)
 add_subdirectory(ir)
 add_subdirectory(inference)
+add_subdirectory(eager)

test/cpp/eager/CMakeLists.txt

+set(eager_deps
+    phi_api
+    phi_dygraph_api
+    hook_utils
+    tensor_utils
+    utils
+    global_utils
+    backward
+    phi_tensor
+    tracer
+    layer
+    autograd_meta
+    eager_nan_inf_utils
+    grad_node_info
+    grad_tensor_holder
+    custom_operator_node)
+
+if(NOT (NOT WITH_PYTHON AND ON_INFER))
+  set(eager_deps ${eager_deps} accumulation_node prim_utils)
+endif()
+
+set(fluid_deps
+    tracer
+    layer
+    proto_desc
+    operator
+    op_registry
+    variable_helper
+    memcpy)
+set(generated_deps final_dygraph_function final_dygraph_node dygraph_function
+                   dygraph_node)
+
+add_subdirectory(data_structure_tests)
+add_subdirectory(task_tests)
+add_subdirectory(performance_tests)

paddle/fluid/eager/tests/data_structure_tests/autograd_meta_test.cc → test/cpp/eager/data_structure_tests/autograd_meta_test.cc

@@ -18,8 +18,8 @@
 #include "gtest/gtest.h"
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/eager/grad_node_info.h"
-#include "paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
+#include "test/cpp/eager/data_structure_tests/grad_node_test.h"
 
 TEST(AutogradMeta, Constructor) {
   paddle::Tensor et1;

paddle/fluid/eager/tests/data_structure_tests/grad_node_info_test.cc → test/cpp/eager/data_structure_tests/grad_node_info_test.cc

@@ -19,8 +19,8 @@
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/eager/hooks.h"
-#include "paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
+#include "test/cpp/eager/data_structure_tests/grad_node_test.h"
 
 TEST(GradNodeInfo, GradSlotMeta) {
   auto grad_slot = egr::GradSlotMeta();

paddle/fluid/eager/tests/data_structure_tests/tensor_wrapper_test.cc → test/cpp/eager/data_structure_tests/tensor_wrapper_test.cc

@@ -16,8 +16,8 @@
 
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h"
 #include "paddle/fluid/eager/utils.h"
+#include "test/cpp/eager/data_structure_tests/grad_node_test.h"
 
 TEST(TensorWrapper, Basic) {
   VLOG(6) << "Test Full reserved";

paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc → test/cpp/eager/performance_tests/benchmark_eager_cpu.cc

@@ -22,10 +22,10 @@
 #include "paddle/fluid/eager/api/all.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/backward.h"
-#include "paddle/fluid/eager/tests/performance_tests/benchmark_utils.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/imperative/tracer.h"
 #include "paddle/phi/core/flags.h"
+#include "test/cpp/eager/performance_tests/benchmark_utils.h"
+#include "test/cpp/eager/test_utils.h"
 
 #ifdef WITH_GPERFTOOLS
 #include "gperftools/profiler.h"

paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc → test/cpp/eager/performance_tests/benchmark_eager_cuda.cc

@@ -21,10 +21,10 @@
 #include "paddle/fluid/eager/api/all.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/backward.h"
-#include "paddle/fluid/eager/tests/performance_tests/benchmark_utils.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/imperative/tracer.h"
 #include "paddle/phi/core/flags.h"
+#include "test/cpp/eager/performance_tests/benchmark_utils.h"
+#include "test/cpp/eager/test_utils.h"
 
 #ifdef WITH_GPERFTOOLS
 #include "gperftools/profiler.h"

paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc → test/cpp/eager/performance_tests/benchmark_fluid_cpu.cc

@@ -23,11 +23,11 @@
 
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "paddle/fluid/eager/tests/performance_tests/benchmark_utils.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/imperative/basic_engine.h"
 #include "paddle/fluid/imperative/tracer.h"
 #include "paddle/fluid/memory/memcpy.h"
+#include "test/cpp/eager/performance_tests/benchmark_utils.h"
+#include "test/cpp/eager/test_utils.h"
 
 #ifdef WITH_GPERFTOOLS
 #include "gperftools/profiler.h"

paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc → test/cpp/eager/performance_tests/benchmark_fluid_cuda.cc

@@ -23,11 +23,11 @@
 
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "paddle/fluid/eager/tests/performance_tests/benchmark_utils.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/imperative/basic_engine.h"
 #include "paddle/fluid/imperative/tracer.h"
 #include "paddle/fluid/memory/memcpy.h"
+#include "test/cpp/eager/performance_tests/benchmark_utils.h"
+#include "test/cpp/eager/test_utils.h"
 
 #ifdef WITH_GPERFTOOLS
 #include "gperftools/profiler.h"

paddle/fluid/eager/tests/performance_tests/benchmark_utils.cc → test/cpp/eager/performance_tests/benchmark_utils.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/fluid/eager/tests/performance_tests/benchmark_utils.h"
+#include "test/cpp/eager/performance_tests/benchmark_utils.h"
 
 #include <iostream>
 #include <memory>
@@ -24,8 +24,8 @@
 #include "paddle/fluid/eager/api/all.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/backward.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/eager/utils.h"
+#include "test/cpp/eager/test_utils.h"
 
 // Eager Generated
 #include "paddle/fluid/eager/api/generated/eager_generated/forwards/dygraph_functions.h"

paddle/fluid/eager/tests/task_tests/backward_test.cc → test/cpp/eager/task_tests/backward_test.cc

@@ -24,10 +24,10 @@
 #include "paddle/fluid/eager/api/utils/tensor_utils.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/grad_node_info.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(add, CPU, ALL_LAYOUT);

paddle/fluid/eager/tests/task_tests/cross_batch_accumulation_test.cc → test/cpp/eager/task_tests/cross_batch_accumulation_test.cc

@@ -23,10 +23,10 @@
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/backward.h"
 #include "paddle/fluid/eager/grad_node_info.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 

paddle/fluid/eager/tests/task_tests/eager_utils_test.cc → test/cpp/eager/task_tests/eager_utils_test.cc

@@ -18,11 +18,11 @@
 #include "paddle/fluid/eager/accumulation/accumulation_node.h"
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/eager/grad_node_info.h"
-#include "paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/eager/utils.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "test/cpp/eager/data_structure_tests/grad_node_test.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 

paddle/fluid/eager/tests/task_tests/forward_autograd_test.cc → test/cpp/eager/task_tests/forward_autograd_test.cc

@@ -21,10 +21,10 @@
 #include "paddle/fluid/eager/api/utils/tensor_utils.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/grad_node_info.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 

paddle/fluid/eager/tests/task_tests/fwd_bwd_joint_test.cc → test/cpp/eager/task_tests/fwd_bwd_joint_test.cc

@@ -23,10 +23,10 @@
 #include "paddle/fluid/eager/backward.h"
 #include "paddle/fluid/eager/grad_node_info.h"
 #include "paddle/fluid/eager/hooks.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(add, CPU, ALL_LAYOUT);

paddle/fluid/eager/tests/task_tests/generated_test.cc → test/cpp/eager/task_tests/generated_test.cc

@@ -22,10 +22,10 @@
 #include "paddle/fluid/eager/api/utils/tensor_utils.h"
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/backward.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/eager/utils.h"
 #include "paddle/fluid/imperative/tracer.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(matmul, CPU, ALL_LAYOUT);

paddle/fluid/eager/tests/task_tests/grad_test.cc → test/cpp/eager/task_tests/grad_test.cc

@@ -23,10 +23,10 @@
 #include "paddle/fluid/eager/autograd_meta.h"
 #include "paddle/fluid/eager/backward.h"
 #include "paddle/fluid/eager/grad_node_info.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(add, CPU, ALL_LAYOUT);

paddle/fluid/eager/tests/task_tests/hook_test.cc → test/cpp/eager/task_tests/hook_test.cc

@@ -23,10 +23,10 @@
 #include "paddle/fluid/eager/backward.h"
 #include "paddle/fluid/eager/grad_node_info.h"
 #include "paddle/fluid/eager/hooks.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 

paddle/fluid/eager/tests/task_tests/hook_test_intermidiate.cc → test/cpp/eager/task_tests/hook_test_intermidiate.cc

@@ -20,10 +20,10 @@
 #include "paddle/fluid/eager/backward.h"
 #include "paddle/fluid/eager/grad_node_info.h"
 #include "paddle/fluid/eager/hooks.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/imperative/tracer.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 PD_DECLARE_KERNEL(matmul, CPU, ALL_LAYOUT);

paddle/fluid/eager/tests/task_tests/tensor_utils_test.cc → test/cpp/eager/task_tests/tensor_utils_test.cc

@@ -20,9 +20,9 @@
 #include "paddle/fluid/eager/eager_tensor.h"
 #include "paddle/fluid/eager/grad_node_info.h"
 #include "paddle/fluid/eager/grad_tensor_holder.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/phi/api/lib/utils/allocator.h"
 #include "paddle/phi/core/kernel_registry.h"
+#include "test/cpp/eager/test_utils.h"
 
 PD_DECLARE_KERNEL(full, CPU, ALL_LAYOUT);
 

test/cpp/prim/test_eager_prim.cc

@@ -20,11 +20,11 @@
 #include "paddle/fluid/eager/api/generated/eager_generated/forwards/dygraph_functions.h"
 #include "paddle/fluid/eager/api/utils/hook_utils.h"
 #include "paddle/fluid/eager/backward.h"
-#include "paddle/fluid/eager/tests/test_utils.h"
 #include "paddle/fluid/prim/utils/utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 #include "paddle/phi/core/kernel_registry.h"
 #include "paddle/phi/core/tensor_meta.h"
+#include "test/cpp/eager/test_utils.h"
 #include "test/cpp/prim/init_env_utils.h"
 
 DECLARE_string(tensor_operants_mode);