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

Removing code that explicitly compares equality of rmm memory resources #2047

Merged
merged 14 commits into from
Dec 9, 2023
Merged

Removing code that explicitly compares equality of rmm memory resources #2047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dd32d85
Removing code that explicitly compares equality of rmm memory resources
cjnolet Dec 7, 2023
29b828f
Removing anothe rinclude
cjnolet Dec 7, 2023
e0e4a30
Removing internal managed memory and pool memory resources- we should…
cjnolet Dec 7, 2023
d241411
Removing more pools
cjnolet Dec 7, 2023
9a446a6
More fixes
cjnolet Dec 7, 2023
e0d9f69
More fixes
cjnolet Dec 7, 2023
d1aa62f
Removing last remnant of detail/device_memory_resource.hpp
cjnolet Dec 7, 2023
6b58324
Even more fixes...
cjnolet Dec 7, 2023
7dd51c7
Not sure why this is still failing
cjnolet Dec 8, 2023
e9b5e00
Another fix
cjnolet Dec 8, 2023
1075df5
Another one
cjnolet Dec 8, 2023
8bdfe33
More fixes
cjnolet Dec 8, 2023
b55765f
Fixing ivf flat
cjnolet Dec 9, 2023
36f42b8
CLeaning up more issues from pool guard
cjnolet Dec 9, 2023
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
Prev Previous commit
Next Next commit
Removing more pools
  • Loading branch information
@cjnolet
cjnolet committed Dec 7, 2023
commit d24141116706803f64ed6ebdb607eb21a7b9d155
10 changes: 0 additions & 10 deletions cpp/include/raft/matrix/detail/select_radix.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,12 +847,6 @@ void radix_topk(const T* in,
size_t req_buf = max_chunk_size * buf_len * 2 * (sizeof(T) + sizeof(IdxT));
size_t mem_req = req_aux + req_buf + 256 * 6; // might need extra memory for alignment

auto pool_guard = raft::get_pool_memory_resource(mr, mem_req);
if (pool_guard) {
RAFT_LOG_DEBUG("radix::select_k: using pool memory resource with initial size %zu bytes",
mem_req);
}

rmm::device_uvector<Counter<T, IdxT>> counters(max_chunk_size, stream, mr);
rmm::device_uvector<IdxT> histograms(max_chunk_size * num_buckets, stream, mr);
rmm::device_uvector<T> buf1(max_chunk_size * buf_len, stream, mr);
Expand Down Expand Up @@ -1120,10 +1114,6 @@ void radix_topk_one_block(const T* in,
const size_t max_chunk_size =
calc_chunk_size<T, IdxT, BlockSize>(batch_size, len, sm_cnt, kernel, true);

auto pool_guard =
raft::get_pool_memory_resource(mr, max_chunk_size * buf_len * 2 * (sizeof(T) + sizeof(IdxT)));
if (pool_guard) { RAFT_LOG_DEBUG("radix::select_k: using pool memory resource"); }

rmm::device_uvector<char> bufs(
max_chunk_size * buf_len * 2 * (sizeof(T) + sizeof(IdxT)), stream, mr);

Expand Down
4 changes: 0 additions & 4 deletions cpp/include/raft/matrix/detail/select_warpsort.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,10 +988,6 @@ void select_k_(int num_of_block,
rmm::cuda_stream_view stream,
rmm::mr::device_memory_resource* mr = nullptr)
{
auto pool_guard = raft::get_pool_memory_resource(
mr, num_of_block * k * batch_size * 2 * std::max(sizeof(T), sizeof(IdxT)));
if (pool_guard) { RAFT_LOG_DEBUG("warpsort::select_k: using pool memory resource"); }

rmm::device_uvector<T> tmp_val(num_of_block * k * batch_size, stream, mr);
rmm::device_uvector<IdxT> tmp_idx(num_of_block * k * batch_size, stream, mr);

Expand Down
4 changes: 0 additions & 4 deletions cpp/include/raft/neighbors/detail/cagra/cagra_build.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ void build_knn_graph(raft::resources const& res,
bool first = true;
const auto start_clock = std::chrono::system_clock::now();

rmm::mr::device_memory_resource* device_memory = nullptr;
auto pool_guard = raft::get_pool_memory_resource(device_memory, 1024 * 1024);
if (pool_guard) { RAFT_LOG_DEBUG("ivf_pq using pool memory resource"); }

raft::spatial::knn::detail::utils::batch_load_iterator<DataT> vec_batches(
dataset.data_handle(),
dataset.extent(0),
Expand Down
6 changes: 0 additions & 6 deletions cpp/include/raft/neighbors/detail/ivf_flat_search-inl.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,6 @@ inline void search(raft::resources const& handle,
raft::div_rounding_up_safe<uint64_t>(
kExpectedWsSize, 16ull * uint64_t{n_probes} * k + 4ull * index.dim()));

auto pool_guard = raft::get_pool_memory_resource(mr, max_queries * n_probes * k * 16);
if (pool_guard) {
RAFT_LOG_DEBUG("ivf_flat::search: using pool memory resource with initial size %zu bytes",
n_queries * n_probes * k * 16ull);
}

for (uint32_t offset_q = 0; offset_q < n_queries; offset_q += max_queries) {
uint32_t queries_batch = min(max_queries, n_queries - offset_q);

Expand Down
Loading