Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multi-stream allocation for CUDA place #37290

Merged
merged 13 commits into from
Nov 25, 2021
Merged

Support multi-stream allocation for CUDA place #37290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
515be94
Support multi-stream allocation for CUDA place
From00 Nov 17, 2021
ee154ee
Do not notify the retrying from other streams when free CUDA allocation
From00 Nov 18, 2021
c9e5291
Fix compile error for CPU
From00 Nov 18, 2021
e1e8012
Fix compile error for HIP
From00 Nov 18, 2021
dc7a055
Release memory for StreamSafeCUDAAllocaRetry in malloc_test
From00 Nov 19, 2021
165d499
Add FLAGS_use_stream_safe_cuda_allocator
From00 Nov 20, 2021
dc50b28
Fix CI error for 'set_tests_properties'
From00 Nov 20, 2021
43353c3
Invalidate stream safe CUDA allocator for naive_best_fit and thread_l…
From00 Nov 20, 2021
dc1f33c
Performance improvement: insert allocation pair to outstanding_events…
From00 Nov 22, 2021
9b881d4
FLAGS priority changes: FLAGS_use_system_allocator > FLAGS_use_stream…
From00 Nov 22, 2021
b78b055
Performance improvement: directly delete allocation when the recorded…
From00 Nov 22, 2021
896a67a
Add UT for alloc interface
From00 Nov 23, 2021
5a300a3
Changes multi-stream interface; move retry code from AllocatorFacadeP…
From00 Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions paddle/fluid/memory/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ if (WITH_GPU)
nv_test(malloc_test
SRCS malloc_test.cu
DEPS device_context malloc)
nv_test(stream_safe_cuda_alloc_test
SRCS stream_safe_cuda_alloc_test.cu
DEPS malloc)

if(WITH_TESTING AND TEST stream_safe_cuda_alloc_test)
set_tests_properties(stream_safe_cuda_alloc_test PROPERTIES
ENVIRONMENT "FLAGS_use_system_allocator=false"
ENVIRONMENT "FLAGS_enable_stream_safe_cuda_allocator=true"
ENVIRONMENT "FLAGS_allocator_strategy=auto_growth")
endif()
endif()

if (WITH_ROCM)
Expand Down
10 changes: 7 additions & 3 deletions paddle/fluid/memory/allocation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ endif()

if (WITH_GPU)
nv_library(cuda_allocator SRCS cuda_allocator.cc DEPS allocator cuda_device_guard)
nv_library(thread_local_allocator SRCS thread_local_allocator.cc DEPS allocator)
nv_library(pinned_allocator SRCS pinned_allocator.cc DEPS allocator)
nv_library(stream_safe_cuda_allocator SRCS stream_safe_cuda_allocator.cc DEPS allocator)
nv_library(thread_local_allocator SRCS thread_local_allocator.cc DEPS allocator)

cc_test(thread_local_allocator_test SRCS thread_local_allocator_test.cc DEPS thread_local_allocator)
if(CUDA_VERSION GREATER_EQUAL 10.2)
nv_library(cuda_virtual_mem_allocator SRCS cuda_virtual_mem_allocator.cc DEPS dynload_cuda)
Expand All @@ -25,8 +27,10 @@ endif()

if (WITH_ROCM)
hip_library(cuda_allocator SRCS cuda_allocator.cc DEPS allocator cuda_device_guard)
hip_library(thread_local_allocator SRCS thread_local_allocator.cc DEPS allocator)
hip_library(pinned_allocator SRCS pinned_allocator.cc DEPS allocator)
hip_library(stream_safe_cuda_allocator SRCS stream_safe_cuda_allocator.cc DEPS allocator)
hip_library(thread_local_allocator SRCS thread_local_allocator.cc DEPS allocator)

cc_test(thread_local_allocator_test SRCS thread_local_allocator_test.cc DEPS thread_local_allocator)
endif()

Expand All @@ -38,7 +42,7 @@ endif()
cc_library(retry_allocator SRCS retry_allocator.cc DEPS allocator)

if (WITH_GPU OR WITH_ROCM)
set(AllocatorFacadeDeps gpu_info cuda_allocator pinned_allocator cuda_device_guard thread_local_allocator)
set(AllocatorFacadeDeps gpu_info cuda_allocator pinned_allocator cuda_device_guard thread_local_allocator stream_safe_cuda_allocator)
if(CUDA_VERSION GREATER_EQUAL 10.2)
list(APPEND AllocatorFacadeDeps cuda_virtual_mem_allocator)
endif()
Expand Down
Loading