saymrwulf/pytorch
1
0
Fork 0
mirror of https://github.com/saymrwulf/pytorch.git synced 2026-05-14 20:57:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix building with Werror (#83275)

Browse source 
PR #82146 made `Block` non-copyable by adding a `unique_ptr` member,
and used this hacky work-around to copy it anyway. However, it
fails under -Werror with this message:
```
../c10/cuda/CUDACachingAllocator.cpp:1411:51: error: ‘void* memcpy(void*, const void*, size_t)’ writing to an object of type ‘struct c10::cuda::CUDACachingAllocator::{anonymous}::Block’ with no trivial copy-assignment [-Werror=class-memaccess]
 1411 |     std::memcpy(&key, &p.search_key, sizeof(Block));
 ```

Instead, this constructs a new `Block` with all the relevant
properties copied.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/83275
Approved by: https://github.com/malfet
This commit is contained in:
Peter Bell 2022-08-11 19:17:32 +01:00 committed by PyTorch MergeBot
parent ccb7d56a18
commit d8d9ecbfd0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
c10/cuda/CUDACachingAllocator.cpp
View file

@ -1407,9 +1407,12 @@ class DeviceCachingAllocator {
BlockPool& pool = *p.pool;
// because of std::unique_ptr, block cannot be trivially copied
Block key(0, 0, 0);
std::memcpy(&key, &p.search_key, sizeof(Block));
key.history.release();
Block key(
p.search_key.device,
p.search_key.stream,
p.search_key.size,
p.search_key.pool,
p.search_key.ptr);
key.size = (key.size < CachingAllocatorConfig::max_split_size())
? CachingAllocatorConfig::max_split_size()
: key.size;