diff --git a/paddle/fluid/eager/CMakeLists.txt b/paddle/fluid/eager/CMakeLists.txt index 46d1ff43e0dfedd83927f41e98a48a2fd49e68eb..a0ff3300ffa29b44dca090245ffff5b218f23091 100755 --- a/paddle/fluid/eager/CMakeLists.txt +++ b/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 diff --git a/paddle/fluid/eager/tests/CMakeLists.txt b/paddle/fluid/eager/tests/CMakeLists.txt deleted file mode 100644 index 6bcd34262c8ab1af2d97de2afde23049214f2a42..0000000000000000000000000000000000000000 --- a/paddle/fluid/eager/tests/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(data_structure_tests) -add_subdirectory(task_tests) -add_subdirectory(performance_tests) diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt index 603b7eb78ae7e921d0698f83167b8990384b3c18..2f395cb62ed65037887d320fa4877ef5e485139d 100644 --- a/test/cpp/CMakeLists.txt +++ b/test/cpp/CMakeLists.txt @@ -5,3 +5,4 @@ add_subdirectory(prim) add_subdirectory(imperative) add_subdirectory(ir) add_subdirectory(inference) +add_subdirectory(eager) diff --git a/test/cpp/eager/CMakeLists.txt b/test/cpp/eager/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..d8d3a6304cffc75f2956a933dac7480ff774bd25 --- /dev/null +++ b/test/cpp/eager/CMakeLists.txt @@ -0,0 +1,35 @@ +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) diff --git a/paddle/fluid/eager/tests/data_structure_tests/CMakeLists.txt b/test/cpp/eager/data_structure_tests/CMakeLists.txt similarity index 100% rename from paddle/fluid/eager/tests/data_structure_tests/CMakeLists.txt rename to test/cpp/eager/data_structure_tests/CMakeLists.txt diff --git a/paddle/fluid/eager/tests/data_structure_tests/accumulation_node_test.cc b/test/cpp/eager/data_structure_tests/accumulation_node_test.cc similarity index 100% rename from paddle/fluid/eager/tests/data_structure_tests/accumulation_node_test.cc rename to test/cpp/eager/data_structure_tests/accumulation_node_test.cc diff --git a/paddle/fluid/eager/tests/data_structure_tests/autograd_meta_test.cc b/test/cpp/eager/data_structure_tests/autograd_meta_test.cc similarity index 97% rename from paddle/fluid/eager/tests/data_structure_tests/autograd_meta_test.cc rename to test/cpp/eager/data_structure_tests/autograd_meta_test.cc index f588f8c8c759aeed5aa1d1e89eb188fea9fe64e7..651e3b63f07ac664e6f2bc9a611c03655f9780a3 100644 --- a/paddle/fluid/eager/tests/data_structure_tests/autograd_meta_test.cc +++ b/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; diff --git a/paddle/fluid/eager/tests/data_structure_tests/eager_tensor_test.cc b/test/cpp/eager/data_structure_tests/eager_tensor_test.cc similarity index 100% rename from paddle/fluid/eager/tests/data_structure_tests/eager_tensor_test.cc rename to test/cpp/eager/data_structure_tests/eager_tensor_test.cc diff --git a/paddle/fluid/eager/tests/data_structure_tests/grad_node_info_test.cc b/test/cpp/eager/data_structure_tests/grad_node_info_test.cc similarity index 98% rename from paddle/fluid/eager/tests/data_structure_tests/grad_node_info_test.cc rename to test/cpp/eager/data_structure_tests/grad_node_info_test.cc index c56db9e611713a6473f4940ba10507e52c405a09..0948e6f72aa0b053e6766326053229582a2316b4 100644 --- a/paddle/fluid/eager/tests/data_structure_tests/grad_node_info_test.cc +++ b/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(); diff --git a/paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h b/test/cpp/eager/data_structure_tests/grad_node_test.h similarity index 100% rename from paddle/fluid/eager/tests/data_structure_tests/grad_node_test.h rename to test/cpp/eager/data_structure_tests/grad_node_test.h diff --git a/paddle/fluid/eager/tests/data_structure_tests/grad_tensor_holder_test.cc b/test/cpp/eager/data_structure_tests/grad_tensor_holder_test.cc similarity index 100% rename from paddle/fluid/eager/tests/data_structure_tests/grad_tensor_holder_test.cc rename to test/cpp/eager/data_structure_tests/grad_tensor_holder_test.cc diff --git a/paddle/fluid/eager/tests/data_structure_tests/tensor_wrapper_test.cc b/test/cpp/eager/data_structure_tests/tensor_wrapper_test.cc similarity index 97% rename from paddle/fluid/eager/tests/data_structure_tests/tensor_wrapper_test.cc rename to test/cpp/eager/data_structure_tests/tensor_wrapper_test.cc index 86973debfe32376198ecdcc7dea4ba930c49903d..a3a82b0c3b2018a144ae065507739f61126dfa14 100644 --- a/paddle/fluid/eager/tests/data_structure_tests/tensor_wrapper_test.cc +++ b/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"; diff --git a/paddle/fluid/eager/tests/performance_tests/CMakeLists.txt b/test/cpp/eager/performance_tests/CMakeLists.txt similarity index 100% rename from paddle/fluid/eager/tests/performance_tests/CMakeLists.txt rename to test/cpp/eager/performance_tests/CMakeLists.txt diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc b/test/cpp/eager/performance_tests/benchmark_eager_cpu.cc similarity index 98% rename from paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc rename to test/cpp/eager/performance_tests/benchmark_eager_cpu.cc index 54deba9d51652c97ab03dd2d7d9d9eabf2e47db8..c3c7d847f97945207cb8faf36ce9970a2f266c97 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cpu.cc +++ b/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" diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc b/test/cpp/eager/performance_tests/benchmark_eager_cuda.cc similarity index 98% rename from paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc rename to test/cpp/eager/performance_tests/benchmark_eager_cuda.cc index d7beb958df852d8d13f7bcf8528e07fd61f2751e..48c2054e7076e56751cd72d5b30cc543caeaa7a4 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_eager_cuda.cc +++ b/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" diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc b/test/cpp/eager/performance_tests/benchmark_fluid_cpu.cc similarity index 98% rename from paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc rename to test/cpp/eager/performance_tests/benchmark_fluid_cpu.cc index 2289a9e8680b4373581fbbe28578fd66eb19743b..18bdb8d2241cf8d771d8ad6c60166478addd8bfa 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cpu.cc +++ b/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" diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc b/test/cpp/eager/performance_tests/benchmark_fluid_cuda.cc similarity index 98% rename from paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc rename to test/cpp/eager/performance_tests/benchmark_fluid_cuda.cc index c0f2250fbae18920a18bde454a0fc17f118dd865..d24c79f390c91b93090454b6e36263b615403ddb 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_fluid_cuda.cc +++ b/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" diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_utils.cc b/test/cpp/eager/performance_tests/benchmark_utils.cc similarity index 99% rename from paddle/fluid/eager/tests/performance_tests/benchmark_utils.cc rename to test/cpp/eager/performance_tests/benchmark_utils.cc index c84dd7661b6698ac77da2b1fab3a3932b1a6d202..83d14a6b45b89739bb4c6af5e6450451f9fe615e 100644 --- a/paddle/fluid/eager/tests/performance_tests/benchmark_utils.cc +++ b/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 #include @@ -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" diff --git a/paddle/fluid/eager/tests/performance_tests/benchmark_utils.h b/test/cpp/eager/performance_tests/benchmark_utils.h similarity index 100% rename from paddle/fluid/eager/tests/performance_tests/benchmark_utils.h rename to test/cpp/eager/performance_tests/benchmark_utils.h diff --git a/paddle/fluid/eager/tests/task_tests/CMakeLists.txt b/test/cpp/eager/task_tests/CMakeLists.txt similarity index 100% rename from paddle/fluid/eager/tests/task_tests/CMakeLists.txt rename to test/cpp/eager/task_tests/CMakeLists.txt diff --git a/paddle/fluid/eager/tests/task_tests/backward_test.cc b/test/cpp/eager/task_tests/backward_test.cc similarity index 99% rename from paddle/fluid/eager/tests/task_tests/backward_test.cc rename to test/cpp/eager/task_tests/backward_test.cc index 43a994068ca82d940f0f69de2624a2e2a46d18ef..b26945d00ae14e94485dd2386df15b5fa9c8f34d 100644 --- a/paddle/fluid/eager/tests/task_tests/backward_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/cross_batch_accumulation_test.cc b/test/cpp/eager/task_tests/cross_batch_accumulation_test.cc similarity index 98% rename from paddle/fluid/eager/tests/task_tests/cross_batch_accumulation_test.cc rename to test/cpp/eager/task_tests/cross_batch_accumulation_test.cc index 28cc3b2b30b3448abbb7628d8411f5bcedf73487..6d48970f2e95ff15f941e7c5e993b03a62aad88d 100644 --- a/paddle/fluid/eager/tests/task_tests/cross_batch_accumulation_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/eager_utils_test.cc b/test/cpp/eager/task_tests/eager_utils_test.cc similarity index 98% rename from paddle/fluid/eager/tests/task_tests/eager_utils_test.cc rename to test/cpp/eager/task_tests/eager_utils_test.cc index d9d277ad59b190da529ab254a9c6496a7e047d56..77902fa5eed506913bbaeb5122eaaeba599ad8a1 100644 --- a/paddle/fluid/eager/tests/task_tests/eager_utils_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/forward_autograd_test.cc b/test/cpp/eager/task_tests/forward_autograd_test.cc similarity index 99% rename from paddle/fluid/eager/tests/task_tests/forward_autograd_test.cc rename to test/cpp/eager/task_tests/forward_autograd_test.cc index b25b40571fb71fd433deeed487383c816bd9d3c9..41ca170998203c7c3f2d62ee5522c578dc06c46d 100644 --- a/paddle/fluid/eager/tests/task_tests/forward_autograd_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/fwd_bwd_joint_test.cc b/test/cpp/eager/task_tests/fwd_bwd_joint_test.cc similarity index 99% rename from paddle/fluid/eager/tests/task_tests/fwd_bwd_joint_test.cc rename to test/cpp/eager/task_tests/fwd_bwd_joint_test.cc index 5098be17bca477d0844e54bcc42877e88de186dc..4e9dffa28e41511cc58704b24db0e58af3723078 100644 --- a/paddle/fluid/eager/tests/task_tests/fwd_bwd_joint_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/generated_test.cc b/test/cpp/eager/task_tests/generated_test.cc similarity index 99% rename from paddle/fluid/eager/tests/task_tests/generated_test.cc rename to test/cpp/eager/task_tests/generated_test.cc index 7b7c47ecb71f7a8567d358d5f78b30a25815390f..dcb04ba66ca66e4a2ebae6d34ad141b6b3db8e9d 100644 --- a/paddle/fluid/eager/tests/task_tests/generated_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/grad_test.cc b/test/cpp/eager/task_tests/grad_test.cc similarity index 99% rename from paddle/fluid/eager/tests/task_tests/grad_test.cc rename to test/cpp/eager/task_tests/grad_test.cc index 8f76b6d05ee875495d6fb597338276e68c10474e..a1e2dece37595447f27d00f18660626acbbe17ed 100644 --- a/paddle/fluid/eager/tests/task_tests/grad_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/hook_test.cc b/test/cpp/eager/task_tests/hook_test.cc similarity index 99% rename from paddle/fluid/eager/tests/task_tests/hook_test.cc rename to test/cpp/eager/task_tests/hook_test.cc index 2c67427c55bbee19d818c0df9250501de6d1deed..0105d52846ed096992cb51130588f939ae4bc1f4 100644 --- a/paddle/fluid/eager/tests/task_tests/hook_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/hook_test_intermidiate.cc b/test/cpp/eager/task_tests/hook_test_intermidiate.cc similarity index 99% rename from paddle/fluid/eager/tests/task_tests/hook_test_intermidiate.cc rename to test/cpp/eager/task_tests/hook_test_intermidiate.cc index fe63ff7da48d1fea4aa576337724be41ae11a8c1..5c91b1be253a9dbdc7fa63b6e0a56a1e37d5d85c 100644 --- a/paddle/fluid/eager/tests/task_tests/hook_test_intermidiate.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/task_tests/nan_inf_utils_test.cc b/test/cpp/eager/task_tests/nan_inf_utils_test.cc similarity index 100% rename from paddle/fluid/eager/tests/task_tests/nan_inf_utils_test.cc rename to test/cpp/eager/task_tests/nan_inf_utils_test.cc diff --git a/paddle/fluid/eager/tests/task_tests/tensor_utils_test.cc b/test/cpp/eager/task_tests/tensor_utils_test.cc similarity index 97% rename from paddle/fluid/eager/tests/task_tests/tensor_utils_test.cc rename to test/cpp/eager/task_tests/tensor_utils_test.cc index f055839e516ad9b12ca32496f31defc2059830d7..21e6304fe03aaec598299bb6d82dd7f84250c4b1 100644 --- a/paddle/fluid/eager/tests/task_tests/tensor_utils_test.cc +++ b/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); diff --git a/paddle/fluid/eager/tests/test_utils.h b/test/cpp/eager/test_utils.h similarity index 100% rename from paddle/fluid/eager/tests/test_utils.h rename to test/cpp/eager/test_utils.h diff --git a/test/cpp/prim/test_eager_prim.cc b/test/cpp/prim/test_eager_prim.cc index 5055e439c40fdcb840a865db3c81cdda9b5d6939..d2cdeb80495c1a4ea1b9d8034ebcac8dd1d2c87c 100644 --- a/test/cpp/prim/test_eager_prim.cc +++ b/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);