未验证 提交 3047b69f 编写于 作者: H Huihuang Zheng 提交者: GitHub

Make Allocation Smaller on BuddyAllocatorTest to Decrease CI Failure (#24205)

test=develop
上级 663eca45
...@@ -52,11 +52,7 @@ int* TestBuddyAllocator(BuddyAllocator* allocator, size_t size_bytes, ...@@ -52,11 +52,7 @@ int* TestBuddyAllocator(BuddyAllocator* allocator, size_t size_bytes,
EXPECT_NE(p, nullptr); EXPECT_NE(p, nullptr);
#ifdef PADDLE_WITH_CUDA
if (size_bytes < allocator->GetMaxChunkSize()) {
#else
if (size_bytes < allocator->GetMaxChunkSize()) { if (size_bytes < allocator->GetMaxChunkSize()) {
#endif
// Not allocate from SystemAllocator // Not allocate from SystemAllocator
EXPECT_FALSE(use_system_allocator); EXPECT_FALSE(use_system_allocator);
EXPECT_GE(allocator->Used(), used_bytes + size_bytes); EXPECT_GE(allocator->Used(), used_bytes + size_bytes);
...@@ -100,9 +96,9 @@ TEST(BuddyAllocator, GpuFraction) { ...@@ -100,9 +96,9 @@ TEST(BuddyAllocator, GpuFraction) {
TestBuddyAllocator(&buddy_allocator, 10 << 20); TestBuddyAllocator(&buddy_allocator, 10 << 20);
// Greater than max chunk size // Greater than max chunk size
TestBuddyAllocator(&buddy_allocator, 499 << 20, TestBuddyAllocator(&buddy_allocator, 300 << 20,
/* use_system_allocator = */ true); /* use_system_allocator = */ true);
TestBuddyAllocator(&buddy_allocator, 2 * static_cast<size_t>(1 << 30), TestBuddyAllocator(&buddy_allocator, 1 * static_cast<size_t>(1 << 30),
/* use_system_allocator = */ true); /* use_system_allocator = */ true);
} }
...@@ -124,7 +120,7 @@ TEST(BuddyAllocator, InitRealloc) { ...@@ -124,7 +120,7 @@ TEST(BuddyAllocator, InitRealloc) {
// Greater than max chunk size // Greater than max chunk size
TestBuddyAllocator(&buddy_allocator, 101 << 20, TestBuddyAllocator(&buddy_allocator, 101 << 20,
/* use_system_allocator = */ true); /* use_system_allocator = */ true);
TestBuddyAllocator(&buddy_allocator, 2 * static_cast<size_t>(1 << 30), TestBuddyAllocator(&buddy_allocator, 1 * static_cast<size_t>(1 << 30),
/* use_system_allocator = */ true); /* use_system_allocator = */ true);
} }
...@@ -147,7 +143,7 @@ TEST(BuddyAllocator, ReallocSizeGreaterThanInit) { ...@@ -147,7 +143,7 @@ TEST(BuddyAllocator, ReallocSizeGreaterThanInit) {
// Greater than max trunk size // Greater than max trunk size
TestBuddyAllocator(&buddy_allocator, 11 << 20, TestBuddyAllocator(&buddy_allocator, 11 << 20,
/* use_system_allocator = */ true); /* use_system_allocator = */ true);
TestBuddyAllocator(&buddy_allocator, 2 * static_cast<size_t>(1 << 30), TestBuddyAllocator(&buddy_allocator, 1 * static_cast<size_t>(1 << 30),
/* use_system_allocator = */ true); /* use_system_allocator = */ true);
} }
...@@ -226,7 +222,7 @@ TEST(BuddyAllocator, AllocFromAvailableWhenFractionIsOne) { ...@@ -226,7 +222,7 @@ TEST(BuddyAllocator, AllocFromAvailableWhenFractionIsOne) {
FLAGS_reallocate_gpu_memory_in_mb = 0; FLAGS_reallocate_gpu_memory_in_mb = 0;
void* p = nullptr; void* p = nullptr;
EXPECT_TRUE(cudaMalloc(&p, static_cast<size_t>(3) << 30) == cudaSuccess); EXPECT_TRUE(cudaMalloc(&p, static_cast<size_t>(1) << 30) == cudaSuccess);
// BuddyAllocator should be able to alloc the remaining GPU // BuddyAllocator should be able to alloc the remaining GPU
BuddyAllocator buddy_allocator( BuddyAllocator buddy_allocator(
...@@ -234,7 +230,7 @@ TEST(BuddyAllocator, AllocFromAvailableWhenFractionIsOne) { ...@@ -234,7 +230,7 @@ TEST(BuddyAllocator, AllocFromAvailableWhenFractionIsOne) {
platform::GpuMinChunkSize(), platform::GpuMaxChunkSize()); platform::GpuMinChunkSize(), platform::GpuMaxChunkSize());
TestBuddyAllocator(&buddy_allocator, static_cast<size_t>(1) << 30); TestBuddyAllocator(&buddy_allocator, static_cast<size_t>(1) << 30);
TestBuddyAllocator(&buddy_allocator, static_cast<size_t>(2) << 30); TestBuddyAllocator(&buddy_allocator, static_cast<size_t>(1) << 30);
if (p) { if (p) {
EXPECT_TRUE(cudaFree(p) == cudaSuccess); EXPECT_TRUE(cudaFree(p) == cudaSuccess);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册