From 2363830868a7496b35b7750b408c06b982bcb17b Mon Sep 17 00:00:00 2001 From: chenruibiao Date: Sat, 26 Mar 2022 10:16:42 +0800 Subject: [PATCH] Fix CI errors --- paddle/fluid/memory/CMakeLists.txt | 3 +-- paddle/fluid/memory/stats.h | 2 +- paddle/fluid/memory/stats_test.cc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/paddle/fluid/memory/CMakeLists.txt b/paddle/fluid/memory/CMakeLists.txt index cd436376022f0..76bb8993cbefa 100644 --- a/paddle/fluid/memory/CMakeLists.txt +++ b/paddle/fluid/memory/CMakeLists.txt @@ -10,8 +10,7 @@ endif() cc_library(malloc SRCS malloc.cc DEPS place enforce allocator_facade profiler ${MKLDNN_CTX_DEPS}) cc_library(memcpy SRCS memcpy.cc DEPS place device_context) -cc_library(stats SRCS stats.cc) - +cc_library(stats SRCS stats.cc DEPS enforce) cc_library(memory DEPS malloc memcpy stats) cc_test(stats_test SRCS stats_test.cc DEPS stats) diff --git a/paddle/fluid/memory/stats.h b/paddle/fluid/memory/stats.h index 5094d1c4eb1df..f644d2f5875da 100644 --- a/paddle/fluid/memory/stats.h +++ b/paddle/fluid/memory/stats.h @@ -72,7 +72,7 @@ class Stat : public StatBase { ThreadLocalStatType* thread_local_stat = thread_data_registry.GetMutableCurrentThreadData(); thread_local_stat->current += increment; - VLOG(1) << "+" << increment << " sum: " << thread_local_stat->current; + if (thread_local_stat->current > thread_local_stat->peak) { thread_local_stat->peak = thread_local_stat->current; int64_t current_value = GetCurrentValue(); diff --git a/paddle/fluid/memory/stats_test.cc b/paddle/fluid/memory/stats_test.cc index 097c90fb9bbbe..436c737916d9f 100644 --- a/paddle/fluid/memory/stats_test.cc +++ b/paddle/fluid/memory/stats_test.cc @@ -50,7 +50,7 @@ TEST(stats_test, MultiThreadReadWriteTest) { std::this_thread::sleep_for(std::chrono::seconds(1)); }); } - VLOG(1) << "lunch!"; + std::unique_lock unique_lock(mutex); cv.wait(unique_lock, [&ready_thread_num, thread_num]() { return ready_thread_num == thread_num;