未验证 提交 01345a51 编写于 作者: L Leo Chen 提交者: GitHub

add host memory stats (#54036)

* add host memory stats

* add ut
上级 3dc99088
......@@ -59,6 +59,8 @@ BuddyAllocator::BuddyAllocator(
#endif
}
#endif
VLOG(1) << "min_chunk_size_: " << min_chunk_size_
<< ", max_chunk_size_:" << max_chunk_size_;
}
BuddyAllocator::~BuddyAllocator() {
......@@ -228,7 +230,7 @@ void* BuddyAllocator::SystemAlloc(size_t size) {
size_t index = 0;
void* p = system_allocator_->Alloc(&index, size);
VLOG(10) << "Allocated " << p << " from system allocator.";
VLOG(8) << "Allocated " << p << " size " << size << " from system allocator.";
if (p == nullptr) return nullptr;
......@@ -258,8 +260,8 @@ BuddyAllocator::PoolSet::iterator BuddyAllocator::RefillPool(
if (p == nullptr) return pool_.end();
VLOG(10) << "Creating and inserting new block " << p
<< " from system allocator";
VLOG(8) << "Creating and inserting new block " << p << " size "
<< allocate_bytes << " from system allocator";
static_cast<MemoryBlock*>(p)->Init(&cache_,
MemoryBlock::FREE_CHUNK,
......
......@@ -16,6 +16,7 @@
#include <stdlib.h>
#include "paddle/fluid/memory/stats.h"
#include "paddle/fluid/platform/enforce.h"
namespace paddle {
......@@ -25,12 +26,14 @@ namespace allocation {
bool CPUAllocator::IsAllocThreadSafe() const { return true; }
void CPUAllocator::FreeImpl(phi::Allocation *allocation) {
auto size = allocation->size();
void *p = allocation->ptr();
#ifdef _WIN32
_aligned_free(p);
#else
free(p);
#endif
HOST_MEMORY_STAT_UPDATE(Reserved, 0, -size);
delete allocation;
}
......@@ -46,6 +49,7 @@ phi::Allocation *CPUAllocator::AllocateImpl(size_t size) {
platform::errors::ResourceExhausted(
"Fail to alloc memory of %ld size, error code is %d.", size, error));
#endif
HOST_MEMORY_STAT_UPDATE(Reserved, 0, size);
return new Allocation(p, size, platform::CPUPlace());
}
} // namespace allocation
......
......@@ -379,6 +379,7 @@ template <>
void *Alloc<platform::CUDAPinnedPlace>(const platform::CUDAPinnedPlace &place,
size_t size) {
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
VLOG(10) << "Allocate " << size << " bytes on " << platform::Place(place);
auto *buddy_allocator = GetCUDAPinnedBuddyAllocator();
void *ptr = buddy_allocator->Alloc(size);
......@@ -401,6 +402,7 @@ void Free<platform::CUDAPinnedPlace>(const platform::CUDAPinnedPlace &place,
void *p,
size_t size) {
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
VLOG(10) << "Free " << size << " bytes on " << platform::Place(place);
GetCUDAPinnedBuddyAllocator()->Free(p);
#else
PADDLE_THROW(platform::errors::PermissionDenied(
......@@ -412,6 +414,7 @@ template <>
uint64_t Release<platform::CUDAPinnedPlace>(
const platform::CUDAPinnedPlace &place) {
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
VLOG(10) << "Release on " << platform::Place(place);
return GetCUDAPinnedBuddyAllocator()->Release();
#else
PADDLE_THROW(platform::errors::PermissionDenied(
......
......@@ -1946,6 +1946,8 @@ All parameter, weight, gradient are variables in Paddle.
m.def("device_memory_stat_current_value",
memory::DeviceMemoryStatCurrentValue);
m.def("device_memory_stat_peak_value", memory::DeviceMemoryStatPeakValue);
m.def("host_memory_stat_current_value", memory::HostMemoryStatCurrentValue);
m.def("host_memory_stat_peak_value", memory::HostMemoryStatPeakValue);
m.def(
"run_cmd",
[](const std::string &cmd,
......
# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import unittest
import paddle
from paddle.fluid import core
paddle.set_device('cpu')
class TestHostMemoryStats(unittest.TestCase):
def test_memory_allocated_with_pinned(self, device=None):
if core.is_compiled_with_cuda():
tensor = paddle.zeros(shape=[256])
tensor_pinned = tensor.pin_memory()
alloc_size = 4 * 256 # 256 float32 data, with 4 bytes for each one
memory_allocated_size = core.host_memory_stat_current_value(
"Allocated", 0
)
self.assertEqual(memory_allocated_size, alloc_size * 2)
def foo():
tensor = paddle.zeros(shape=[256])
tensor_pinned = tensor.pin_memory()
memory_allocated_size = core.host_memory_stat_current_value(
"Allocated", 0
)
self.assertEqual(memory_allocated_size, alloc_size * 4)
max_allocated_size = core.host_memory_stat_peak_value(
"Allocated", 0
)
self.assertEqual(memory_allocated_size, alloc_size * 4)
foo()
memory_allocated_size = core.host_memory_stat_current_value(
"Allocated", 0
)
self.assertEqual(memory_allocated_size, alloc_size * 2)
max_allocated_size = core.host_memory_stat_peak_value(
"Allocated", 0
)
self.assertEqual(max_allocated_size, alloc_size * 4)
if __name__ == "__main__":
unittest.main()
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册