diff options
| author | Patrick Mours <pmours@nvidia.com> | 2021-03-03 16:35:50 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2021-03-11 16:12:35 +0300 |
| commit | f4f8b6dde32b0438e0b97a6d8ebeb89802987127 (patch) | |
| tree | 9cab5fe3998b72e481238289c5298b8a16dc7445 /intern/cycles/device/cuda/device_cuda_impl.cpp | |
| parent | ba996ddb3a3a49065d26ff1010790b17bc8709ec (diff) | |
Cycles: Change device-only memory to actually only allocate on the device
This patch changes the `MEM_DEVICE_ONLY` type to only allocate on the device and fail if
that is not possible anymore because out-of-memory (since OptiX acceleration structures may
not be allocated in host memory). It also fixes high peak memory usage during OptiX
acceleration structure building.
Reviewed By: brecht
Maniphest Tasks: T85985
Differential Revision: https://developer.blender.org/D10535
Diffstat (limited to 'intern/cycles/device/cuda/device_cuda_impl.cpp')
| -rw-r--r-- | intern/cycles/device/cuda/device_cuda_impl.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/intern/cycles/device/cuda/device_cuda_impl.cpp b/intern/cycles/device/cuda/device_cuda_impl.cpp index 44a51835f4c..5b62292ca55 100644 --- a/intern/cycles/device/cuda/device_cuda_impl.cpp +++ b/intern/cycles/device/cuda/device_cuda_impl.cpp @@ -854,7 +854,7 @@ CUDADevice::CUDAMem *CUDADevice::generic_alloc(device_memory &mem, size_t pitch_ void *shared_pointer = 0; - if (mem_alloc_result != CUDA_SUCCESS && can_map_host) { + if (mem_alloc_result != CUDA_SUCCESS && can_map_host && mem.type != MEM_DEVICE_ONLY) { if (mem.shared_pointer) { /* Another device already allocated host memory. */ mem_alloc_result = CUDA_SUCCESS; @@ -877,8 +877,14 @@ CUDADevice::CUDAMem *CUDADevice::generic_alloc(device_memory &mem, size_t pitch_ } if (mem_alloc_result != CUDA_SUCCESS) { - status = " failed, out of device and host memory"; - set_error("System is out of GPU and shared host memory"); + if (mem.type == MEM_DEVICE_ONLY) { + status = " failed, out of device memory"; + set_error("System is out of GPU memory"); + } + else { + status = " failed, out of device and host memory"; + set_error("System is out of GPU and shared host memory"); + } } if (mem.name) { |