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

Use FAISS with RMM #363

Merged
merged 14 commits into from
Jan 19, 2022
Merged

Use FAISS with RMM #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9e18070
RMM for FAISS
viclafargue Oct 20, 2021
6444a31
Merge branch-21.12
viclafargue Oct 25, 2021
2a7517d
Move faiss_mr.hpp and add tests
viclafargue Oct 25, 2021
fbe0142
Updating namespace
viclafargue Oct 25, 2021
8016385
temp commit
viclafargue Oct 26, 2021
d6e961d
Revert commit + add comment
viclafargue Nov 22, 2021
f670939
Merge branch 'branch-22.02' into rmm-usage-for-faiss
cjnolet Nov 23, 2021
475ad6f
Merge branch 'branch-22.02' into rmm-usage-for-faiss
cjnolet Nov 23, 2021
ed45978
Merge branch-22.02
viclafargue Nov 25, 2021
fe83a1c
Merge branch 'branch-22.02' into HEAD
cjnolet Dec 6, 2021
a9afd72
Merge branch 'branch-22.02' into HEAD
cjnolet Dec 6, 2021
b9e16b3
Updating style
cjnolet Dec 6, 2021
face25b
Fixing rogue curly brace
cjnolet Dec 6, 2021
0e13601
Merge branch-22.02
viclafargue Jan 10, 2022
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
2 changes: 1 addition & 1 deletion cpp/include/raft/spatial/knn/ann.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "detail/ann_quantized_faiss.cuh"

#include <faiss/gpu/GpuIndex.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <raft/spatial/knn/faiss_mr.hpp>

#include <raft/mr/device/buffer.hpp>

Expand Down
4 changes: 2 additions & 2 deletions cpp/include/raft/spatial/knn/ann_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <raft/linalg/distance_type.h>

#include <faiss/gpu/GpuIndex.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <raft/spatial/knn/faiss_mr.hpp>

namespace raft {
namespace spatial {
Expand All @@ -30,7 +30,7 @@ struct knnIndex {
raft::distance::DistanceType metric;
float metricArg;

faiss::gpu::StandardGpuResources* gpu_res;
raft::spatial::knn::RmmGpuResources* gpu_res;
int device;
~knnIndex()
{
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/raft/spatial/knn/detail/ann_quantized_faiss.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@

#include <label/classlabels.cuh>
#include <raft/distance/distance.hpp>
#include <raft/spatial/knn/faiss_mr.hpp>

#include <faiss/gpu/GpuDistance.h>
#include <faiss/gpu/GpuIndexFlat.h>
#include <faiss/gpu/GpuIndexIVFFlat.h>
#include <faiss/gpu/GpuIndexIVFPQ.h>
#include <faiss/gpu/GpuIndexIVFScalarQuantizer.h>
#include <faiss/gpu/GpuResources.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <faiss/gpu/utils/Limits.cuh>
#include <faiss/gpu/utils/Select.cuh>
#include <faiss/gpu/utils/Tensor.cuh>
Expand Down Expand Up @@ -126,7 +126,7 @@ void approx_knn_build_index(raft::handle_t& handle,
int device;
RAFT_CUDA_TRY(cudaGetDevice(&device));

faiss::gpu::StandardGpuResources* gpu_res = new faiss::gpu::StandardGpuResources();
raft::spatial::knn::RmmGpuResources* gpu_res = new raft::spatial::knn::RmmGpuResources();
gpu_res->noTempMemory();
gpu_res->setDefaultStream(device, handle.get_stream());
index->gpu_res = gpu_res;
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/spatial/knn/detail/haversine_distance.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

#include <faiss/gpu/GpuDistance.h>
#include <faiss/gpu/GpuResources.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <faiss/gpu/utils/Limits.cuh>
#include <faiss/gpu/utils/Select.cuh>
#include <faiss/utils/Heap.h>

#include <raft/handle.hpp>
#include <raft/linalg/distance_type.h>
#include <raft/spatial/knn/faiss_mr.hpp>

namespace raft {
namespace spatial {
Expand Down
4 changes: 2 additions & 2 deletions cpp/include/raft/spatial/knn/detail/knn_brute_force_faiss.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

#include <faiss/gpu/GpuDistance.h>
#include <faiss/gpu/GpuResources.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <faiss/gpu/utils/Limits.cuh>
#include <faiss/gpu/utils/Select.cuh>
#include <faiss/utils/Heap.h>
Expand All @@ -33,6 +32,7 @@
#include <iostream>
#include <raft/handle.hpp>
#include <raft/linalg/distance_type.h>
#include <raft/spatial/knn/faiss_mr.hpp>
#include <set>
#include <thrust/iterator/transform_iterator.h>

Expand Down Expand Up @@ -324,7 +324,7 @@ void brute_force_knn_impl(
default:
faiss::MetricType m = build_faiss_metric(metric);

faiss::gpu::StandardGpuResources gpu_res;
raft::spatial::knn::RmmGpuResources gpu_res;

gpu_res.noTempMemory();
gpu_res.setDefaultStream(device, stream);
Expand Down
2 changes: 1 addition & 1 deletion cpp/include/raft/spatial/knn/detail/selection_faiss.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
#pragma once

#include <raft/cudart_utils.h>
#include <raft/spatial/knn/faiss_mr.hpp>

#include <faiss/gpu/GpuDistance.h>
#include <faiss/gpu/GpuIndexFlat.h>
#include <faiss/gpu/GpuResources.h>
#include <faiss/gpu/StandardGpuResources.h>
#include <faiss/gpu/utils/Limits.cuh>
#include <faiss/gpu/utils/Select.cuh>
#include <faiss/utils/Heap.h>
Expand Down
Loading