faiss 0.3.1 → 0.3.3

data/vendor/faiss/faiss/gpu/test/TestGpuIndexIVFPQ.cpp

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -35,7 +35,7 @@ void pickEncoding(int& codes, int& dim) {
     }
 }
 
-void pickRaftEncoding(int& codes, int& dim, int bitsPerCode) {
+void pickCuvsEncoding(int& codes, int& dim, int bitsPerCode) {
     // Above 32 doesn't work with no precomputed codes
     std::vector<int> dimSizes{4, 8, 10, 12, 16, 20, 24, 28, 32};
 
@@ -85,7 +85,7 @@ struct Options {
         device = faiss::gpu::randVal(0, faiss::gpu::getNumDevices() - 1);
 
         interleavedLayout = false;
-        useRaft = false;
+        useCuvs = false;
     }
 
     std::string toString() const {
@@ -126,7 +126,7 @@ struct Options {
     bool useFloat16;
     int device;
     bool interleavedLayout;
-    bool useRaft;
+    bool useCuvs;
 };
 
 void queryTest(Options opt, faiss::MetricType metricType) {
@@ -156,7 +156,7 @@ void queryTest(Options opt, faiss::MetricType metricType) {
     config.indicesOptions = opt.indicesOpt;
     config.useFloat16LookupTables = opt.useFloat16;
     config.interleavedLayout = opt.interleavedLayout;
-    config.use_raft = opt.useRaft;
+    config.use_cuvs = opt.useCuvs;
 
     faiss::gpu::GpuIndexIVFPQ gpuIndex(&res, &cpuIndex, config);
     gpuIndex.nprobe = opt.nprobe;
@@ -235,7 +235,7 @@ void testMMCodeDistance(faiss::MetricType mt) {
         config.usePrecomputedTables = false;
         config.useMMCodeDistance = true;
         config.indicesOptions = opt.indicesOpt;
-        config.use_raft = false;
+        config.use_cuvs = false;
 
         // Make sure that the float16 version works as well
         config.useFloat16LookupTables = (tries % 2 == 0);
@@ -286,7 +286,7 @@ void testMMCodeDistance(faiss::MetricType mt) {
         config.device = opt.device;
         config.usePrecomputedTables = false;
         config.indicesOptions = opt.indicesOpt;
-        config.use_raft = false;
+        config.use_cuvs = false;
 
         // Make sure that the float16 version works as well
         config.useFloat16LookupTables = (dimPerSubQ == 7);
@@ -340,7 +340,7 @@ TEST(TestGpuIndexIVFPQ, Float16Coarse) {
     config.usePrecomputedTables = opt.usePrecomputed;
     config.indicesOptions = opt.indicesOpt;
     config.useFloat16LookupTables = opt.useFloat16;
-    config.use_raft = false;
+    config.use_cuvs = false;
 
     faiss::gpu::GpuIndexIVFPQ gpuIndex(&res, &cpuIndex, config);
     gpuIndex.nprobe = opt.nprobe;
@@ -386,7 +386,7 @@ void addTest(Options opt, faiss::MetricType metricType) {
     config.indicesOptions = opt.indicesOpt;
     config.useFloat16LookupTables = opt.useFloat16;
     config.interleavedLayout = opt.interleavedLayout;
-    config.use_raft = opt.useRaft;
+    config.use_cuvs = opt.useCuvs;
 
     faiss::gpu::GpuIndexIVFPQ gpuIndex(&res, &cpuIndex, config);
     gpuIndex.nprobe = opt.nprobe;
@@ -436,7 +436,7 @@ void copyToTest(Options opt) {
         config.indicesOptions = opt.indicesOpt;
         config.useFloat16LookupTables = opt.useFloat16;
         config.interleavedLayout = opt.interleavedLayout;
-        config.use_raft = opt.useRaft;
+        config.use_cuvs = opt.useCuvs;
 
         faiss::gpu::GpuIndexIVFPQ gpuIndex(
                 &res,
@@ -513,7 +513,7 @@ void copyFromTest(Options opt) {
     config.indicesOptions = opt.indicesOpt;
     config.useFloat16LookupTables = opt.useFloat16;
     config.interleavedLayout = opt.interleavedLayout;
-    config.use_raft = opt.useRaft;
+    config.use_cuvs = opt.useCuvs;
 
     // Use garbage values to see if we overwrite them
     faiss::gpu::GpuIndexIVFPQ gpuIndex(
@@ -567,8 +567,8 @@ void queryNaNTest(Options opt) {
     config.usePrecomputedTables = opt.usePrecomputed;
     config.indicesOptions = opt.indicesOpt;
     config.useFloat16LookupTables = opt.useFloat16;
-    config.use_raft = opt.useRaft;
-    config.interleavedLayout = opt.useRaft ? true : opt.interleavedLayout;
+    config.use_cuvs = opt.useCuvs;
+    config.interleavedLayout = opt.useCuvs ? true : opt.interleavedLayout;
 
     faiss::gpu::GpuIndexIVFPQ gpuIndex(
             &res,
@@ -606,7 +606,7 @@ void queryNaNTest(Options opt) {
 
 TEST(TestGpuIndexIVFPQ, QueryNaN) {
     Options opt;
-    opt.useRaft = false;
+    opt.useCuvs = false;
     queryNaNTest(opt);
 }
 
@@ -620,7 +620,7 @@ void addNaNTest(Options opt) {
     config.indicesOptions = opt.indicesOpt;
     config.useFloat16LookupTables = opt.useFloat16;
     config.interleavedLayout = opt.interleavedLayout;
-    config.use_raft = opt.useRaft;
+    config.use_cuvs = opt.useCuvs;
 
     faiss::gpu::GpuIndexIVFPQ gpuIndex(
             &res,
@@ -664,46 +664,46 @@ void addNaNTest(Options opt) {
 
 TEST(TestGpuIndexIVFPQ, AddNaN) {
     Options opt;
-    opt.useRaft = false;
+    opt.useCuvs = false;
     addNaNTest(opt);
 }
 
-#if defined USE_NVIDIA_RAFT
-TEST(TestGpuIndexIVFPQ, Query_L2_Raft) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestGpuIndexIVFPQ, Query_L2_Cuvs) {
     for (int tries = 0; tries < 2; ++tries) {
         Options opt;
         opt.bitsPerCode = faiss::gpu::randVal(4, 8);
-        opt.useRaft = true;
+        opt.useCuvs = true;
         opt.interleavedLayout = true;
         opt.usePrecomputed = false;
         opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-        pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+        pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
         queryTest(opt, faiss::MetricType::METRIC_L2);
     }
 }
 
-TEST(TestGpuIndexIVFPQ, Query_IP_Raft) {
+TEST(TestGpuIndexIVFPQ, Query_IP_Cuvs) {
     for (int tries = 0; tries < 2; ++tries) {
         Options opt;
         opt.bitsPerCode = faiss::gpu::randVal(4, 8);
-        opt.useRaft = true;
+        opt.useCuvs = true;
         opt.interleavedLayout = true;
         opt.usePrecomputed = false;
         opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-        pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+        pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
         queryTest(opt, faiss::MetricType::METRIC_INNER_PRODUCT);
     }
 }
 
 // Large batch sizes (>= 65536) should also work
-TEST(TestGpuIndexIVFPQ, LargeBatch_Raft) {
+TEST(TestGpuIndexIVFPQ, LargeBatch_Cuvs) {
     Options opt;
 
     // override for large sizes
     opt.dim = 4;
     opt.numQuery = 100000;
     opt.codes = 2;
-    opt.useRaft = true;
+    opt.useCuvs = true;
     opt.interleavedLayout = true;
     opt.usePrecomputed = false;
     opt.useFloat16 = false;
@@ -713,73 +713,73 @@ TEST(TestGpuIndexIVFPQ, LargeBatch_Raft) {
     queryTest(opt, faiss::MetricType::METRIC_L2);
 }
 
-TEST(TestGpuIndexIVFPQ, CopyFrom_Raft) {
+TEST(TestGpuIndexIVFPQ, CopyFrom_Cuvs) {
     Options opt;
-    opt.useRaft = true;
+    opt.useCuvs = true;
     opt.interleavedLayout = true;
     opt.bitsPerCode = faiss::gpu::randVal(4, 8);
     opt.usePrecomputed = false;
     opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-    pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+    pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
     copyFromTest(opt);
 }
 
-TEST(TestGpuIndexIVFPQ, Add_L2_Raft) {
+TEST(TestGpuIndexIVFPQ, Add_L2_Cuvs) {
     for (int tries = 0; tries < 2; ++tries) {
         Options opt;
-        opt.useRaft = true;
+        opt.useCuvs = true;
         opt.interleavedLayout = true;
         opt.bitsPerCode = faiss::gpu::randVal(4, 8);
         opt.usePrecomputed = false;
         opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-        pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+        pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
         addTest(opt, faiss::METRIC_L2);
     }
 }
 
-TEST(TestGpuIndexIVFPQ, Add_IP_Raft) {
+TEST(TestGpuIndexIVFPQ, Add_IP_Cuvs) {
     for (int tries = 0; tries < 2; ++tries) {
         Options opt;
-        opt.useRaft = true;
+        opt.useCuvs = true;
         opt.interleavedLayout = true;
         opt.bitsPerCode = faiss::gpu::randVal(4, 8);
         opt.usePrecomputed = false;
         opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-        pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+        pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
         addTest(opt, faiss::METRIC_INNER_PRODUCT);
     }
 }
 
-TEST(TestGpuIndexIVFPQ, QueryNaN_Raft) {
+TEST(TestGpuIndexIVFPQ, QueryNaN_Cuvs) {
     Options opt;
-    opt.useRaft = true;
+    opt.useCuvs = true;
     opt.interleavedLayout = true;
     opt.bitsPerCode = faiss::gpu::randVal(4, 8);
     opt.usePrecomputed = false;
     opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-    pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+    pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
     queryNaNTest(opt);
 }
 
-TEST(TestGpuIndexIVFPQ, AddNaN_Raft) {
+TEST(TestGpuIndexIVFPQ, AddNaN_Cuvs) {
     Options opt;
-    opt.useRaft = true;
+    opt.useCuvs = true;
     opt.interleavedLayout = true;
     opt.bitsPerCode = faiss::gpu::randVal(4, 8);
     opt.usePrecomputed = false;
     opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-    pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+    pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
     addNaNTest(opt);
 }
 
-TEST(TestGpuIndexIVFPQ, CopyTo_Raft) {
+TEST(TestGpuIndexIVFPQ, CopyTo_Cuvs) {
     Options opt;
-    opt.useRaft = true;
+    opt.useCuvs = true;
     opt.interleavedLayout = true;
     opt.bitsPerCode = faiss::gpu::randVal(4, 8);
     opt.usePrecomputed = false;
     opt.indicesOpt = faiss::gpu::INDICES_64_BIT;
-    pickRaftEncoding(opt.codes, opt.dim, opt.bitsPerCode);
+    pickCuvsEncoding(opt.codes, opt.dim, opt.bitsPerCode);
     copyToTest(opt);
 }
 #endif
@@ -824,7 +824,7 @@ TEST(TestGpuIndexIVFPQ, UnifiedMemory) {
     faiss::gpu::GpuIndexIVFPQConfig config;
     config.device = device;
     config.memorySpace = faiss::gpu::MemorySpace::Unified;
-    config.use_raft = false;
+    config.use_cuvs = false;
 
     faiss::gpu::GpuIndexIVFPQ gpuIndex(
             &res,
@@ -848,12 +848,12 @@ TEST(TestGpuIndexIVFPQ, UnifiedMemory) {
             0.1f,
             0.015f);
 
-#if defined USE_NVIDIA_RAFT
+#if defined USE_NVIDIA_CUVS
     config.interleavedLayout = true;
-    config.use_raft = true;
+    config.use_cuvs = true;
     config.indicesOptions = faiss::gpu::INDICES_64_BIT;
 
-    faiss::gpu::GpuIndexIVFPQ raftGpuIndex(
+    faiss::gpu::GpuIndexIVFPQ cuvsGpuIndex(
             &res,
             dim,
             numCentroids,
@@ -861,12 +861,12 @@ TEST(TestGpuIndexIVFPQ, UnifiedMemory) {
             bitsPerCode,
             faiss::METRIC_L2,
             config);
-    raftGpuIndex.copyFrom(&cpuIndex);
-    raftGpuIndex.nprobe = nprobe;
+    cuvsGpuIndex.copyFrom(&cpuIndex);
+    cuvsGpuIndex.nprobe = nprobe;
 
     faiss::gpu::compareIndices(
             cpuIndex,
-            raftGpuIndex,
+            cuvsGpuIndex,
             numQuery,
             dim,
             k,

data/vendor/faiss/faiss/gpu/test/TestGpuIndexIVFScalarQuantizer.cpp

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

data/vendor/faiss/faiss/gpu/test/TestGpuMemoryException.cpp

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -31,7 +31,7 @@ TEST(TestGpuMemoryException, AddException) {
 
     faiss::gpu::GpuIndexFlatConfig config;
     config.device = faiss::gpu::randVal(0, faiss::gpu::getNumDevices() - 1);
-    config.use_raft = false;
+    config.use_cuvs = false;
 
     faiss::gpu::GpuIndexFlatL2 gpuIndexL2Broken(
             &res, (int)brokenAddDims, config);

data/vendor/faiss/faiss/gpu/test/TestGpuResidualQuantizer.cpp

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <faiss/IndexFlat.h>
+#include <faiss/gpu/GpuCloner.h>
+#include <faiss/gpu/GpuIndexFlat.h>
+#include <faiss/gpu/StandardGpuResources.h>
+#include <faiss/gpu/test/TestUtils.h>
+#include <faiss/impl/ResidualQuantizer.h>
+#include <gtest/gtest.h>
+
+using namespace ::testing;
+
+float eval_codec(faiss::ResidualQuantizer* q, int nb, float* xb) {
+    // Compute codes
+    uint8_t* codes = new uint8_t[q->code_size * nb];
+    std::cout << "code size: " << q->code_size << std::endl;
+    q->compute_codes(xb, codes, nb);
+    // Decode codes
+    float* decoded = new float[nb * q->d];
+    q->decode(codes, decoded, nb);
+    // Compute reconstruction error
+    float err = 0.0f;
+    for (int i = 0; i < nb; i++) {
+        for (int j = 0; j < q->d; j++) {
+            float diff = xb[i * q->d + j] - decoded[i * q->d + j];
+            err = err + (diff * diff);
+        }
+    }
+    delete[] codes;
+    delete[] decoded;
+    return err;
+}
+
+TEST(TestGpuResidualQuantizer, TestNcall) {
+    int d = 32;
+    int nt = 3000;
+    int nb = 1000;
+    // Assuming get_dataset_2 is a function that returns xt and xb
+    std::vector<float> xt = faiss::gpu::randVecs(nt, d);
+    std::vector<float> xb = faiss::gpu::randVecs(nb, d);
+    faiss::ResidualQuantizer rq0(d, 4, 6);
+    rq0.train(nt, xt.data());
+    float err_rq0 = eval_codec(&rq0, nb, xb.data());
+    faiss::ResidualQuantizer rq1(d, 4, 6);
+    faiss::gpu::GpuProgressiveDimIndexFactory fac(1);
+    rq1.assign_index_factory = &fac;
+    rq1.train(nt, xt.data());
+    ASSERT_GT(fac.ncall, 0);
+    int ncall_train = fac.ncall;
+    float err_rq1 = eval_codec(&rq1, nb, xb.data());
+    ASSERT_GT(fac.ncall, ncall_train);
+    std::cout << "Error RQ0: " << err_rq0 << ", Error RQ1: " << err_rq1
+              << std::endl;
+    ASSERT_TRUE(0.9 * err_rq0 < err_rq1);
+    ASSERT_TRUE(err_rq1 < 1.1 * err_rq0);
+}
+
+int main(int argc, char** argv) {
+    testing::InitGoogleTest(&argc, argv);
+
+    // just run with a fixed test seed
+    faiss::gpu::setTestSeed(100);
+
+    return RUN_ALL_TESTS();
+}

data/vendor/faiss/faiss/gpu/test/TestUtils.cpp

@@ -1,11 +1,10 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <cuda_fp16.h>
 #include <faiss/gpu/test/TestUtils.h>
 #include <faiss/utils/random.h>
 #include <gtest/gtest.h>
@@ -18,6 +17,77 @@
 namespace faiss {
 namespace gpu {
 
+inline float half2float(const unsigned short h) {
+    unsigned int sign = ((static_cast<unsigned int>(h) >> 15U) & 1U);
+    unsigned int exponent = ((static_cast<unsigned int>(h) >> 10U) & 0x1fU);
+    unsigned int mantissa = ((static_cast<unsigned int>(h) & 0x3ffU) << 13U);
+    float f;
+    if (exponent == 0x1fU) { /* NaN or Inf */
+        /* discard sign of a NaN */
+        sign = ((mantissa != 0U) ? (sign >> 1U) : sign);
+        mantissa = ((mantissa != 0U) ? 0x7fffffU : 0U);
+        exponent = 0xffU;
+    } else if (exponent == 0U) { /* Denorm or Zero */
+        if (mantissa != 0U) {
+            unsigned int msb;
+            exponent = 0x71U;
+            do {
+                msb = (mantissa & 0x400000U);
+                mantissa <<= 1U; /* normalize */
+                --exponent;
+            } while (msb == 0U);
+            mantissa &= 0x7fffffU; /* 1.mantissa is implicit */
+        }
+    } else {
+        exponent += 0x70U;
+    }
+    const unsigned int u = ((sign << 31U) | (exponent << 23U) | mantissa);
+    std::memcpy(&f, &u, sizeof(u));
+    return f;
+}
+
+unsigned short float2half(const float f) {
+    unsigned int sign;
+    unsigned int remainder;
+    unsigned int x;
+    unsigned int u;
+    unsigned int result;
+    (void)std::memcpy(&x, &f, sizeof(f));
+
+    u = (x & 0x7fffffffU);
+    sign = ((x >> 16U) & 0x8000U);
+    // NaN/+Inf/-Inf
+    if (u >= 0x7f800000U) {
+        remainder = 0U;
+        result = ((u == 0x7f800000U) ? (sign | 0x7c00U) : 0x7fffU);
+    } else if (u > 0x477fefffU) { // Overflows
+        remainder = 0x80000000U;
+        result = (sign | 0x7bffU);
+    } else if (u >= 0x38800000U) { // Normal numbers
+        remainder = u << 19U;
+        u -= 0x38000000U;
+        result = (sign | (u >> 13U));
+    } else if (u < 0x33000001U) { // +0/-0
+        remainder = u;
+        result = sign;
+    } else { // Denormal numbers
+        const unsigned int exponent = u >> 23U;
+        const unsigned int shift = 0x7eU - exponent;
+        unsigned int mantissa = (u & 0x7fffffU);
+        mantissa |= 0x800000U;
+        remainder = mantissa << (32U - shift);
+        result = (sign | (mantissa >> shift));
+        result &= 0x0000FFFFU;
+    }
+
+    if ((remainder > 0x80000000U) ||
+        ((remainder == 0x80000000U) && ((result & 0x1U) != 0U))) {
+        return static_cast<unsigned short>(result) + 1;
+    } else {
+        return static_cast<unsigned short>(result);
+    }
+}
+
 inline float relativeError(float a, float b) {
     return std::abs(a - b) / (0.5f * (std::abs(a) + std::abs(b)));
 }
@@ -78,7 +148,7 @@ std::vector<unsigned char> randBinaryVecs(size_t num, size_t dim) {
 std::vector<float> roundToHalf(const std::vector<float>& v) {
     auto out = std::vector<float>(v.size());
     for (int i = 0; i < v.size(); ++i) {
-        out[i] = __half2float(__float2half(v[i]));
+        out[i] = half2float(float2half(v[i]));
     }
 
     return out;

data/vendor/faiss/faiss/gpu/test/TestUtils.h

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

data/vendor/faiss/faiss/gpu/test/demo_ivfpq_indexing_gpu.cpp

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -20,7 +20,7 @@
 
 double elapsed() {
     struct timeval tv;
-    gettimeofday(&tv, NULL);
+    gettimeofday(&tv, nullptr);
     return tv.tv_sec + tv.tv_usec * 1e-6;
 }
 

data/vendor/faiss/faiss/gpu/utils/{RaftUtils.h → CuvsUtils.h}

@@ -1,3 +1,4 @@
+// @lint-ignore-every LICENSELINT
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -5,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 /*
- * Copyright (c) 2023, NVIDIA CORPORATION.
+ * Copyright (c) 2024, NVIDIA CORPORATION.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,32 +27,32 @@
 #include <faiss/gpu/GpuResources.h>
 #include <faiss/gpu/utils/Tensor.cuh>
 
-#include <raft/distance/distance_types.hpp>
+#include <cuvs/distance/distance.h>
 
 #pragma GCC visibility push(default)
 namespace faiss {
 namespace gpu {
 
-inline raft::distance::DistanceType metricFaissToRaft(
+inline cuvsDistanceType metricFaissToCuvs(
         MetricType metric,
         bool exactDistance) {
     switch (metric) {
         case MetricType::METRIC_INNER_PRODUCT:
-            return raft::distance::DistanceType::InnerProduct;
+            return cuvsDistanceType::InnerProduct;
         case MetricType::METRIC_L2:
-            return raft::distance::DistanceType::L2Expanded;
+            return cuvsDistanceType::L2Expanded;
         case MetricType::METRIC_L1:
-            return raft::distance::DistanceType::L1;
+            return cuvsDistanceType::L1;
         case MetricType::METRIC_Linf:
-            return raft::distance::DistanceType::Linf;
+            return cuvsDistanceType::Linf;
         case MetricType::METRIC_Lp:
-            return raft::distance::DistanceType::LpUnexpanded;
+            return cuvsDistanceType::LpUnexpanded;
         case MetricType::METRIC_Canberra:
-            return raft::distance::DistanceType::Canberra;
+            return cuvsDistanceType::Canberra;
         case MetricType::METRIC_BrayCurtis:
-            return raft::distance::DistanceType::BrayCurtis;
+            return cuvsDistanceType::BrayCurtis;
         case MetricType::METRIC_JensenShannon:
-            return raft::distance::DistanceType::JensenShannon;
+            return cuvsDistanceType::JensenShannon;
         default:
             RAFT_FAIL("Distance type not supported");
     }

data/vendor/faiss/faiss/gpu/utils/DeviceUtils.h

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -76,6 +76,12 @@ bool getTensorCoreSupport(int device);
 /// Equivalent to getTensorCoreSupport(getCurrentDevice())
 bool getTensorCoreSupportCurrentDevice();
 
+/// Returns the warp size of the given GPU device
+int getWarpSize(int device);
+
+/// Equivalent to getWarpSize(getCurrentDevice())
+int getWarpSizeCurrentDevice();
+
 /// Returns the amount of currently available memory on the given device
 size_t getFreeMemory(int device);
 

data/vendor/faiss/faiss/gpu/utils/StackDeviceMemory.cpp

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

data/vendor/faiss/faiss/gpu/utils/StackDeviceMemory.h

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

data/vendor/faiss/faiss/gpu/utils/StaticUtils.h

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

data/vendor/faiss/faiss/gpu/utils/Timer.cpp

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -14,7 +14,10 @@ namespace faiss {
 namespace gpu {
 
 KernelTimer::KernelTimer(cudaStream_t stream)
-        : startEvent_(0), stopEvent_(0), stream_(stream), valid_(true) {
+        : startEvent_(nullptr),
+          stopEvent_(nullptr),
+          stream_(stream),
+          valid_(true) {
     CUDA_VERIFY(cudaEventCreate(&startEvent_));
     CUDA_VERIFY(cudaEventCreate(&stopEvent_));
 

data/vendor/faiss/faiss/gpu/utils/Timer.h

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -18,7 +18,7 @@ class KernelTimer {
    public:
     /// Constructor starts the timer and adds an event into the current
     /// device stream
-    KernelTimer(cudaStream_t stream = 0);
+    KernelTimer(cudaStream_t stream = nullptr);
 
     /// Destructor releases event resources
     ~KernelTimer();