【paddle_test No.19】replace cc_test with paddle_test (#61238)

ccsuzzh · Galaxy1458 · web-flow · commit 08573602d75c · 2024-03-18T16:15:40.000+08:00
* replace cc_test with paddle_test

* fix codestyle

* fix bug

* fix unresolved external symbol

* fix bug

* fix bug

* fix bug

* fix bug

* fix bug

* return ci

* fix bug

* Update device_context.h

* Update device_context.h

* fix bug

* Update device_context.cc

* Update device_context.cc

* Update cudnn_bn_add_relu_test.cc

* Update CMakeLists.txt

* Update cudnn_bn_add_relu_test.cc

* fix codestyle

---------

Co-authored-by: Galaxy1458 &lt;55453380+Galaxy1458@users.noreply.github.com&gt;
diff --git a/paddle/phi/backends/dynload/cudnn.h b/paddle/phi/backends/dynload/cudnn.h
@@ -24,11 +24,11 @@ limitations under the License. */
 namespace phi {
 namespace dynload {
 
-extern std::once_flag cudnn_dso_flag;
-extern void* cudnn_dso_handle;
+TEST_API extern std::once_flag cudnn_dso_flag;
+TEST_API extern void* cudnn_dso_handle;
 extern bool HasCUDNN();
 
-extern void EnforceCUDNNLoaded(const char* fn_name);
+TEST_API extern void EnforceCUDNNLoaded(const char* fn_name);
 #define DECLARE_DYNAMIC_LOAD_CUDNN_WRAP(__name)                      \
   struct DynLoad__##__name {                                         \
     template <typename... Args>                                      \
diff --git a/paddle/phi/backends/dynload/dynamic_loader.h b/paddle/phi/backends/dynload/dynamic_loader.h
@@ -14,7 +14,7 @@ limitations under the License. */
 
 #pragma once
 #include <string>
-
+#include "paddle/utils/test_macros.h"
 namespace phi {
 namespace dynload {
 
@@ -26,7 +26,7 @@ namespace dynload {
 
 void* GetCublasDsoHandle();
 void* GetCublasLtDsoHandle();
-void* GetCUDNNDsoHandle();
+TEST_API void* GetCUDNNDsoHandle();
 void* GetCUPTIDsoHandle();
 void* GetCurandDsoHandle();
 void* GetNvjpegDsoHandle();
diff --git a/paddle/phi/backends/dynload/port.h b/paddle/phi/backends/dynload/port.h
@@ -15,6 +15,7 @@
 #pragma once
 
 #include <string>
+#include "paddle/utils/test_macros.h"
 
 #define GLOG_NO_ABBREVIATED_SEVERITIES  // msvc conflict logging with windows.h
 
@@ -38,7 +39,7 @@
 #define S_ISDIR(mode) (((mode)&S_IFMT) == S_IFDIR)
 #endif  // S_ISDIR
 
-void *dlsym(void *handle, const char *symbol_name);
+TEST_API void *dlsym(void *handle, const char *symbol_name);
 
 void *dlopen(const char *filename, int flag);
 
diff --git a/paddle/phi/backends/gpu/gpu_context.h b/paddle/phi/backends/gpu/gpu_context.h
@@ -69,7 +69,7 @@ class DnnWorkspaceHandle {
 
   void ResetWorkspace();
 
-  void ReallocWorkspace(size_t required_workspace_bytes);
+  TEST_API void ReallocWorkspace(size_t required_workspace_bytes);
 
   DnnWorkspaceHandle(DnnWorkspaceHandle&&) = default;
   DnnWorkspaceHandle& operator=(DnnWorkspaceHandle&&) = delete;
diff --git a/paddle/phi/core/device_context.cc b/paddle/phi/core/device_context.cc
@@ -415,7 +415,7 @@ T* DeviceContext::HostAlloc(TensorBase* tensor, size_t requested_size) const {
 }
 
 #define DEVICE_CONTEXT_MEMBER_FUNC_INSTANTIATION(dtype)              \
-  template dtype* DeviceContext::Alloc(                              \
+  template TEST_API dtype* DeviceContext::Alloc(                     \
       TensorBase* tensor, size_t requested_size, bool pinned) const; \
   template dtype* DeviceContext::HostAlloc(TensorBase* tensor,       \
                                            size_t requested_size) const;
diff --git a/paddle/phi/core/device_context.h b/paddle/phi/core/device_context.h
@@ -152,9 +152,9 @@ class PADDLE_API DeviceContext {
                       bool fake_alloc = false) const;
 
   template <typename T>
-  T* Alloc(TensorBase* tensor,
-           size_t requested_size = 0,
-           bool pinned = false) const;
+  TEST_API T* Alloc(TensorBase* tensor,
+                    size_t requested_size = 0,
+                    bool pinned = false) const;
 
   /**
    * @brief Allocate host memory for tensor.
diff --git a/paddle/phi/core/enforce.h b/paddle/phi/core/enforce.h
@@ -316,7 +316,7 @@ DEFINE_EXTERNAL_API_TYPE(ncclResult_t, ncclSuccess);
 }  // namespace details
 
 template <typename T>
-std::string GetExternalErrorMsg(T status);
+TEST_API std::string GetExternalErrorMsg(T status);
 
 /*************** CUDA ERROR ***************/
 inline bool is_error(cudaError_t e) { return e != cudaSuccess; }
diff --git a/test/cpp/fluid/fused/CMakeLists.txt b/test/cpp/fluid/fused/CMakeLists.txt
@@ -1,10 +1,7 @@
 if(WITH_GPU OR WITH_ROCM)
   # fusion_group
   if(NOT APPLE AND NOT WIN32)
-    cc_test(
-      test_fusion_group_op
-      SRCS fusion_group_op_test.cc
-      DEPS fusion_group_op)
+    paddle_test(test_fusion_group_op SRCS fusion_group_op_test.cc)
   endif()
   if(NOT WITH_ROCM)
     nv_test(
@@ -42,7 +39,7 @@ if(WITH_GPU OR WITH_ROCM)
   endif()
   # resnet_unit needs cudnn 8.0 above
   if((NOT WITH_ROCM) AND (NOT ${CUDNN_VERSION} VERSION_LESS 8000))
-    cc_test(
+    nv_test(
       test_cudnn_norm_conv
       SRCS cudnn_norm_conv_test.cc
       DEPS generated_op
@@ -52,15 +49,6 @@ if(WITH_GPU OR WITH_ROCM)
            device_context
            phi
            common)
-    cc_test(
-      test_cudnn_bn_add_relu
-      SRCS cudnn_bn_add_relu_test.cc
-      DEPS batch_norm_op
-           fused_bn_add_activation_op
-           tensor
-           op_registry
-           device_context
-           phi
-           common)
+    paddle_test(test_cudnn_bn_add_relu SRCS cudnn_bn_add_relu_test.cc)
   endif()
 endif()
diff --git a/test/cpp/fluid/fused/cudnn_bn_add_relu_test.cc b/test/cpp/fluid/fused/cudnn_bn_add_relu_test.cc
@@ -33,13 +33,6 @@ namespace framework = paddle::framework;
 namespace platform = paddle::platform;
 namespace op = paddle::operators;
 
-USE_OP_ITSELF(batch_norm);
-USE_OP_ITSELF(fused_bn_add_activation);
-USE_OP_ITSELF(fused_bn_add_activation_grad);
-PD_DECLARE_KERNEL(batch_norm, GPU, ALL_LAYOUT);
-PD_DECLARE_KERNEL(fused_bn_add_activation, GPU, ALL_LAYOUT);
-PD_DECLARE_KERNEL(fused_bn_add_activation_grad, GPU, ALL_LAYOUT);
-
 template <typename T>
 void InitRandomTensor(const std::vector<int64_t> &dims,
                       phi::DenseTensor *cpu_out) {

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ T* DeviceContext::HostAlloc(TensorBase* tensor, size_t requested_size) const {`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`#define DEVICE_CONTEXT_MEMBER_FUNC_INSTANTIATION(dtype) \`
`418`		`- template dtype* DeviceContext::Alloc( \`
	`418`	`+ template TEST_API dtype* DeviceContext::Alloc( \`
`419`	`419`	`TensorBase* tensor, size_t requested_size, bool pinned) const; \`
`420`	`420`	`template dtype* DeviceContext::HostAlloc(TensorBase* tensor, \`
`421`	`421`	`size_t requested_size) const;`