From 2996315fc94bbf564c0a1179e4f69b1c0071a937 Mon Sep 17 00:00:00 2001 From: Tao Luo Date: Mon, 22 Jun 2020 10:22:47 +0800 Subject: [PATCH] fix profiler_test on win32 (#25073) * remove disable profiler_test on win32 * add log * enlarge the elapsed time * Revert "add log" test=develop --- paddle/fluid/platform/CMakeLists.txt | 5 +---- paddle/fluid/platform/profiler_test.cc | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/paddle/fluid/platform/CMakeLists.txt b/paddle/fluid/platform/CMakeLists.txt index e9929dfe0bc..c49989db3d5 100644 --- a/paddle/fluid/platform/CMakeLists.txt +++ b/paddle/fluid/platform/CMakeLists.txt @@ -124,10 +124,7 @@ else() cc_library(device_memory_aligment SRCS device_memory_aligment.cc DEPS cpu_info place) endif() -# TODO: Fix this unittest failed on Windows -if(NOT WIN32) - cc_test(profiler_test SRCS profiler_test.cc DEPS profiler) -endif(NOT WIN32) +cc_test(profiler_test SRCS profiler_test.cc DEPS profiler) nv_test(float16_gpu_test SRCS float16_test.cu DEPS lod_tensor) cc_test(float16_test SRCS float16_test.cc DEPS lod_tensor) diff --git a/paddle/fluid/platform/profiler_test.cc b/paddle/fluid/platform/profiler_test.cc index d8bfa5445cc..4d340a06342 100644 --- a/paddle/fluid/platform/profiler_test.cc +++ b/paddle/fluid/platform/profiler_test.cc @@ -28,6 +28,9 @@ TEST(Event, CpuElapsedTime) { while (counter != 1000) { counter++; } +#ifdef _WIN32 + Sleep(1); +#endif Event stop_event(EventType::kPopRange, "test", 0); EXPECT_GT(start_event.CpuElapsedMs(stop_event), 0); } -- GitLab