diff --git a/paddle/cinn/poly/CMakeLists.txt b/paddle/cinn/poly/CMakeLists.txt index 45d0c5475d611..97f0267f36eed 100644 --- a/paddle/cinn/poly/CMakeLists.txt +++ b/paddle/cinn/poly/CMakeLists.txt @@ -15,6 +15,3 @@ gather_srcs( ast_gen.cc graph.cc compute_at_transform.cc) - -cinn_cc_test(test_compute_at_transform SRCS compute_at_transform_test.cc DEPS - cinncore) diff --git a/paddle/cinn/runtime/CMakeLists.txt b/paddle/cinn/runtime/CMakeLists.txt index 737487243aff0..ccdfb9fc19a11 100644 --- a/paddle/cinn/runtime/CMakeLists.txt +++ b/paddle/cinn/runtime/CMakeLists.txt @@ -13,8 +13,6 @@ cinn_cc_library( cinn_runtime SRCS cinn_runtime.cc buffer.cc #cinn_x86_device_impl.cc ) -cinn_cc_test(test_cinn_runtime SRCS cinn_runtime_test.cc DEPS cinn_runtime) - if(WITH_OPENMP) cinn_cc_library(tiny_runtime STATIC SRCS tiny_runtime.cc) endif() diff --git a/paddle/cinn/runtime/cuda/CMakeLists.txt b/paddle/cinn/runtime/cuda/CMakeLists.txt index aaf942e1d742f..c462cb560a8dc 100755 --- a/paddle/cinn/runtime/cuda/CMakeLists.txt +++ b/paddle/cinn/runtime/cuda/CMakeLists.txt @@ -14,5 +14,4 @@ gather_srcs( cuda_intrinsics_float16.cc cuda_intrinsics_bfloat16.cc) -cinn_nv_test(test_cuda_module SRCS cuda_module_test.cc DEPS cinncore) cinn_nv_library(cuda_runtime SRCS cinn_cuda_runtime_source.cuh) diff --git a/paddle/cinn/utils/CMakeLists.txt b/paddle/cinn/utils/CMakeLists.txt index e7181a4b99059..785d6ee8c7f6e 100755 --- a/paddle/cinn/utils/CMakeLists.txt +++ b/paddle/cinn/utils/CMakeLists.txt @@ -16,8 +16,6 @@ gather_srcs( random_engine.cc external_func_names.cc) -cinn_cc_test(test_sized_multi_set SRCS sized_multi_set_test.cc DEPS cinncore) -cinn_cc_test(test_multi_threading SRCS multi_threading_test.cc DEPS cinncore) cinn_cc_test( test_functional SRCS diff --git a/test/cpp/cinn/CMakeLists.txt b/test/cpp/cinn/CMakeLists.txt index b4ab8d4793701..215d9ad5c2442 100644 --- a/test/cpp/cinn/CMakeLists.txt +++ b/test/cpp/cinn/CMakeLists.txt @@ -5,6 +5,6 @@ add_subdirectory(ast_gen_ius) # add_subdirectory(ir) # add_subdirectory(lang) # add_subdirectory(optim) -# add_subdirectory(poly) -# add_subdirectory(runtime) -# add_subdirectory(utils) +add_subdirectory(poly) +add_subdirectory(runtime) +add_subdirectory(utils) diff --git a/test/cpp/cinn/poly/CMakeLists.txt b/test/cpp/cinn/poly/CMakeLists.txt new file mode 100644 index 0000000000000..702e3deb9546b --- /dev/null +++ b/test/cpp/cinn/poly/CMakeLists.txt @@ -0,0 +1,2 @@ +cinn_cc_test(test_compute_at_transform SRCS compute_at_transform_test.cc DEPS + cinncore) diff --git a/paddle/cinn/poly/compute_at_transform_test.cc b/test/cpp/cinn/poly/compute_at_transform_test.cc similarity index 100% rename from paddle/cinn/poly/compute_at_transform_test.cc rename to test/cpp/cinn/poly/compute_at_transform_test.cc diff --git a/test/cpp/cinn/runtime/CMakeLists.txt b/test/cpp/cinn/runtime/CMakeLists.txt new file mode 100644 index 0000000000000..b95ff3d9ae760 --- /dev/null +++ b/test/cpp/cinn/runtime/CMakeLists.txt @@ -0,0 +1,2 @@ +cinn_cc_test(test_cinn_runtime SRCS cinn_runtime_test.cc DEPS cinn_runtime) +add_subdirectory(cuda) diff --git a/paddle/cinn/runtime/cinn_runtime_test.cc b/test/cpp/cinn/runtime/cinn_runtime_test.cc similarity index 100% rename from paddle/cinn/runtime/cinn_runtime_test.cc rename to test/cpp/cinn/runtime/cinn_runtime_test.cc diff --git a/test/cpp/cinn/runtime/cuda/CMakeLists.txt b/test/cpp/cinn/runtime/cuda/CMakeLists.txt new file mode 100644 index 0000000000000..14c3be79b42b2 --- /dev/null +++ b/test/cpp/cinn/runtime/cuda/CMakeLists.txt @@ -0,0 +1,5 @@ +if(NOT WITH_CUDA) + return() +endif() + +cinn_nv_test(test_cuda_module SRCS cuda_module_test.cc DEPS cinncore) diff --git a/paddle/cinn/runtime/cuda/cuda_module_test.cc b/test/cpp/cinn/runtime/cuda/cuda_module_test.cc similarity index 100% rename from paddle/cinn/runtime/cuda/cuda_module_test.cc rename to test/cpp/cinn/runtime/cuda/cuda_module_test.cc diff --git a/test/cpp/cinn/utils/CMakeLists.txt b/test/cpp/cinn/utils/CMakeLists.txt new file mode 100644 index 0000000000000..fc601f1024340 --- /dev/null +++ b/test/cpp/cinn/utils/CMakeLists.txt @@ -0,0 +1,2 @@ +cinn_cc_test(test_sized_multi_set SRCS sized_multi_set_test.cc DEPS cinncore) +cinn_cc_test(test_multi_threading SRCS multi_threading_test.cc DEPS cinncore) diff --git a/paddle/cinn/utils/multi_threading_test.cc b/test/cpp/cinn/utils/multi_threading_test.cc similarity index 100% rename from paddle/cinn/utils/multi_threading_test.cc rename to test/cpp/cinn/utils/multi_threading_test.cc diff --git a/paddle/cinn/utils/sized_multi_set_test.cc b/test/cpp/cinn/utils/sized_multi_set_test.cc similarity index 100% rename from paddle/cinn/utils/sized_multi_set_test.cc rename to test/cpp/cinn/utils/sized_multi_set_test.cc