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
Next Next commit
Removing code that explicitly compares equality of rmm memory resources
  • Loading branch information
@cjnolet
cjnolet committed Dec 7, 2023
commit dd32d8515361525c292c90fbb08567eaffa9ffd8
58 changes: 0 additions & 58 deletions cpp/include/raft/core/resource/detail/device_memory_resource.hpp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion 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 @@ -48,7 +48,6 @@ void build_knn_graph(raft::resources const& res,
std::optional<ivf_pq::index_params> build_params = std::nullopt,
std::optional<ivf_pq::search_params> search_params = std::nullopt)
{
resource::detail::warn_non_pool_workspace(res, "raft::neighbors::cagra::build");
RAFT_EXPECTS(!build_params || build_params->metric == distance::DistanceType::L2Expanded,
"Currently only L2Expanded metric is supported");

Expand Down
2 changes: 0 additions & 2 deletions cpp/include/raft/neighbors/detail/cagra/cagra_search.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <raft/core/device_mdspan.hpp>
#include <raft/core/host_mdspan.hpp>
#include <raft/core/nvtx.hpp>
#include <raft/core/resource/detail/device_memory_resource.hpp>
#include <raft/core/resources.hpp>
#include <raft/neighbors/cagra_types.hpp>
#include <rmm/cuda_stream_view.hpp>
Expand Down Expand Up @@ -110,7 +109,6 @@ void search_main(raft::resources const& res,
raft::device_matrix_view<DistanceT, int64_t, row_major> distances,
CagraSampleFilterT sample_filter = CagraSampleFilterT())
{
resource::detail::warn_non_pool_workspace(res, "raft::neighbors::cagra::search");
RAFT_LOG_DEBUG("# dataset size = %lu, dim = %lu\n",
static_cast<size_t>(index.dataset().extent(0)),
static_cast<size_t>(index.dataset().extent(1)));
Expand Down
3 changes: 0 additions & 3 deletions cpp/include/raft/neighbors/detail/ivf_pq_build.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#pragma once

#include <raft/core/resource/cuda_stream.hpp>
#include <raft/core/resource/device_memory_resource.hpp>
#include <raft/spatial/knn/detail/ann_utils.cuh>

#include <raft/neighbors/detail/ivf_pq_codepacking.cuh>
Expand Down Expand Up @@ -1559,7 +1558,6 @@ void extend(raft::resources const& handle,
common::nvtx::range<common::nvtx::domain::raft> fun_scope(
"ivf_pq::extend(%zu, %u)", size_t(n_rows), index->dim());

resource::detail::warn_non_pool_workspace(handle, "raft::ivf_pq::extend");
auto stream = resource::get_cuda_stream(handle);
const auto n_clusters = index->n_lists();

Expand Down Expand Up @@ -1758,7 +1756,6 @@ auto build(raft::resources const& handle,
{
common::nvtx::range<common::nvtx::domain::raft> fun_scope(
"ivf_pq::build(%zu, %u)", size_t(n_rows), dim);
resource::detail::warn_non_pool_workspace(handle, "raft::ivf_pq::build");
static_assert(std::is_same_v<T, float> || std::is_same_v<T, uint8_t> || std::is_same_v<T, int8_t>,
"Unsupported data type");

Expand Down
2 changes: 0 additions & 2 deletions cpp/include/raft/neighbors/detail/ivf_pq_search.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include <raft/core/logger.hpp>
#include <raft/core/nvtx.hpp>
#include <raft/core/operators.hpp>
#include <raft/core/resource/detail/device_memory_resource.hpp>
#include <raft/core/resource/device_memory_resource.hpp>
#include <raft/core/resources.hpp>
#include <raft/distance/distance_types.hpp>
Expand Down Expand Up @@ -747,7 +746,6 @@ inline void search(raft::resources const& handle,
params.n_probes,
k,
index.dim());
resource::detail::warn_non_pool_workspace(handle, "raft::ivf_pq::search");

RAFT_EXPECTS(
params.internal_distance_dtype == CUDA_R_16F || params.internal_distance_dtype == CUDA_R_32F,
Expand Down
Loading