From 8568ef8b915dd5a17520bd8ff84f5ca29292efb0 Mon Sep 17 00:00:00 2001
From: Alexandr Guzhva <aguzhva@meta.com>
Date: Thu, 4 May 2023 12:26:59 -0700
Subject: [PATCH] Fix PR problems (#2839)

Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/2839

Reviewed By: algoriddle

Differential Revision: D45054275

fbshipit-source-id: 7eca136a6baff97e244d570c3ba7ab3171ccca48
---
 faiss/gpu/GpuDistance.cu           |  2 --
 faiss/gpu/StandardGpuResources.cpp | 17 ++++++++---------
 faiss/gpu/impl/RaftFlatIndex.cu    |  1 -
 faiss/gpu/impl/RaftUtils.h         |  5 ++++-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/faiss/gpu/GpuDistance.cu b/faiss/gpu/GpuDistance.cu
index daf4710aec..130c2454ef 100644
--- a/faiss/gpu/GpuDistance.cu
+++ b/faiss/gpu/GpuDistance.cu
@@ -293,7 +293,6 @@ void bfKnn(GpuResourcesProvider* prov, const GpuDistanceParams& args) {
                         search.view(),
                         inds.view(),
                         dists.view(),
-                        k,
                         distance,
                         metric_arg);
             }
@@ -328,7 +327,6 @@ void bfKnn(GpuResourcesProvider* prov, const GpuDistanceParams& args) {
                     search.view(),
                     inds.view(),
                     dists.view(),
-                    k,
                     distance,
                     metric_arg);
         }
diff --git a/faiss/gpu/StandardGpuResources.cpp b/faiss/gpu/StandardGpuResources.cpp
index af0f24c51e..c1be2fbf37 100644
--- a/faiss/gpu/StandardGpuResources.cpp
+++ b/faiss/gpu/StandardGpuResources.cpp
@@ -89,7 +89,13 @@ std::string allocsToString(const std::unordered_map<void*, AllocRequest>& map) {
 //
 
 StandardGpuResourcesImpl::StandardGpuResourcesImpl()
-        : pinnedMemAlloc_(nullptr),
+        :
+#if defined USE_NVIDIA_RAFT
+          cmr(new rmm::mr::cuda_memory_resource),
+          mmr(new rmm::mr::managed_memory_resource),
+          pmr(new rmm::mr::pinned_memory_resource),
+#endif
+          pinnedMemAlloc_(nullptr),
           pinnedMemAllocSize_(0),
           // let the adjustment function determine the memory size for us by
           // passing in a huge value that will then be adjusted
@@ -97,14 +103,7 @@ StandardGpuResourcesImpl::StandardGpuResourcesImpl()
                   -1,
                   std::numeric_limits<size_t>::max())),
           pinnedMemSize_(kDefaultPinnedMemoryAllocation),
-          allocLogging_(false)
-#if defined USE_NVIDIA_RAFT
-          ,
-          cmr(new rmm::mr::cuda_memory_resource),
-          mmr(new rmm::mr::managed_memory_resource),
-          pmr(new rmm::mr::pinned_memory_resource)
-#endif
-{
+          allocLogging_(false) {
 }
 
 StandardGpuResourcesImpl::~StandardGpuResourcesImpl() {
diff --git a/faiss/gpu/impl/RaftFlatIndex.cu b/faiss/gpu/impl/RaftFlatIndex.cu
index d407c68680..fb0f815368 100644
--- a/faiss/gpu/impl/RaftFlatIndex.cu
+++ b/faiss/gpu/impl/RaftFlatIndex.cu
@@ -109,7 +109,6 @@ void RaftFlatIndex::query(
                     search,
                     inds,
                     dists,
-                    k,
                     distance,
                     metricArg);
         }
diff --git a/faiss/gpu/impl/RaftUtils.h b/faiss/gpu/impl/RaftUtils.h
index 77c47999a5..6c744051ae 100644
--- a/faiss/gpu/impl/RaftUtils.h
+++ b/faiss/gpu/impl/RaftUtils.h
@@ -20,13 +20,16 @@
  * limitations under the License.
  */
 
+#pragma once
+
 #include <faiss/MetricType.h>
+#include <raft/core/error.hpp>
 #include <raft/distance/distance_types.hpp>
 
 namespace faiss {
 namespace gpu {
 
-raft::distance::DistanceType faiss_to_raft(
+inline raft::distance::DistanceType faiss_to_raft(
         MetricType metric,
         bool exactDistance) {
     switch (metric) {