reset unexpected changes, test=develop

revert-15684-revert-15661-fix-cpu-broadcast
liuwei1031 6 years ago
parent b1f97a6fa9
commit 14fe9219dc

@ -117,11 +117,6 @@ void* GPUAllocator::Alloc(size_t* index, size_t size) {
if (result == cudaSuccess) {
*index = 0;
gpu_alloc_size_ += size;
if (gpu_alloc_size_ > s_memoryMap[gpu_id_]) {
s_memoryMap[gpu_id_] = gpu_alloc_size_;
VLOG(3) << "device: " << gpu_id_
<< " maximum memory size : " <<(gpu_alloc_size_ >> 20) << " MiB";
}
return p;
} else {
LOG(WARNING)

@ -15,7 +15,6 @@ limitations under the License. */
#pragma once
#include <stddef.h> // for size_t
#include <unordered_map>
namespace paddle {
namespace memory {
@ -45,8 +44,6 @@ class CPUAllocator : public SystemAllocator {
#ifdef PADDLE_WITH_CUDA
class GPUAllocator : public SystemAllocator {
public:
std::unordered_map<int, uint64_t> s_memoryMap;
explicit GPUAllocator(int gpu_id) : gpu_id_(gpu_id) {}
virtual void* Alloc(size_t* index, size_t size);

Loading…
Cancel
Save