faiss 0.3.1 → 0.3.3

data/vendor/faiss/faiss/gpu/perf/PerfIVFPQAdd.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,6 @@
 #include <faiss/gpu/utils/DeviceUtils.h>
 #include <faiss/gpu/utils/Timer.h>
 #include <gflags/gflags.h>
-#include <map>
 #include <vector>
 
 DEFINE_int32(batches, 10, "number of batches of vectors to add");

data/vendor/faiss/faiss/gpu/perf/WriteIndex.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/TestCodePacking.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.
@@ -7,6 +7,7 @@
 
 #include <faiss/gpu/impl/InterleavedCodes.h>
 #include <faiss/gpu/test/TestUtils.h>
+#include <faiss/gpu/utils/DeviceUtils.h>
 #include <faiss/gpu/utils/StaticUtils.h>
 #include <gtest/gtest.h>
 #include <cmath>
@@ -119,8 +120,9 @@ TEST(TestCodePacking, InterleavedCodes_UnpackPack) {
                 std::cout << bitsPerCode << " " << dims << " " << numVecs
                           << "\n";
 
-                int blocks = utils::divUp(numVecs, 32);
-                int bytesPerDimBlock = 32 * bitsPerCode / 8;
+                int warpSize = getWarpSizeCurrentDevice();
+                int blocks = utils::divUp(numVecs, warpSize);
+                int bytesPerDimBlock = warpSize * bitsPerCode / 8;
                 int bytesPerBlock = bytesPerDimBlock * dims;
                 int size = blocks * bytesPerBlock;
 
@@ -132,9 +134,9 @@ TEST(TestCodePacking, InterleavedCodes_UnpackPack) {
 
                     for (int i = 0; i < blocks; ++i) {
                         for (int j = 0; j < dims; ++j) {
-                            for (int k = 0; k < 32; ++k) {
+                            for (int k = 0; k < warpSize; ++k) {
                                 for (int l = 0; l < bytesPerCode; ++l) {
-                                    int vec = i * 32 + k;
+                                    int vec = i * warpSize + k;
                                     if (vec < numVecs) {
                                         data[i * bytesPerBlock +
                                              j * bytesPerDimBlock +
@@ -148,7 +150,8 @@ TEST(TestCodePacking, InterleavedCodes_UnpackPack) {
                     for (int i = 0; i < blocks; ++i) {
                         for (int j = 0; j < dims; ++j) {
                             for (int k = 0; k < bytesPerDimBlock; ++k) {
-                                int loVec = i * 32 + (k * 8) / bitsPerCode;
+                                int loVec =
+                                        i * warpSize + (k * 8) / bitsPerCode;
                                 int hiVec = loVec + 1;
                                 int hiVec2 = hiVec + 1;
 

data/vendor/faiss/faiss/gpu/test/TestGpuIndexBinaryFlat.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/TestGpuIndexFlat.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.
@@ -29,7 +29,7 @@ struct TestFlatOptions {
               numQueriesOverride(-1),
               kOverride(-1),
               dimOverride(-1),
-              use_raft(false) {}
+              use_cuvs(false) {}
 
     faiss::MetricType metric;
     float metricArg;
@@ -39,7 +39,7 @@ struct TestFlatOptions {
     int numQueriesOverride;
     int kOverride;
     int dimOverride;
-    bool use_raft;
+    bool use_cuvs;
 };
 
 void testFlat(const TestFlatOptions& opt) {
@@ -75,7 +75,7 @@ void testFlat(const TestFlatOptions& opt) {
     faiss::gpu::GpuIndexFlatConfig config;
     config.device = device;
     config.useFloat16 = opt.useFloat16;
-    config.use_raft = opt.use_raft;
+    config.use_cuvs = opt.use_cuvs;
 
     faiss::gpu::GpuIndexFlat gpuIndex(&res, dim, opt.metric, config);
     gpuIndex.metric_arg = opt.metricArg;
@@ -114,8 +114,8 @@ TEST(TestGpuIndexFlat, IP_Float32) {
 
         testFlat(opt);
 
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -128,8 +128,8 @@ TEST(TestGpuIndexFlat, L1_Float32) {
 
     testFlat(opt);
 
-#if defined USE_NVIDIA_RAFT
-    opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+    opt.use_cuvs = true;
     testFlat(opt);
 #endif
 }
@@ -141,8 +141,8 @@ TEST(TestGpuIndexFlat, Lp_Float32) {
     opt.useFloat16 = false;
 
     testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-    opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+    opt.use_cuvs = true;
     testFlat(opt);
 #endif
 }
@@ -155,8 +155,8 @@ TEST(TestGpuIndexFlat, L2_Float32) {
         opt.useFloat16 = false;
 
         testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -173,8 +173,8 @@ TEST(TestGpuIndexFlat, L2_k_2048) {
         opt.numVecsOverride = 10000;
 
         testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -189,8 +189,8 @@ TEST(TestGpuIndexFlat, L2_Float32_K1) {
         opt.kOverride = 1;
 
         testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -203,8 +203,8 @@ TEST(TestGpuIndexFlat, IP_Float16) {
         opt.useFloat16 = true;
 
         testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -217,8 +217,8 @@ TEST(TestGpuIndexFlat, L2_Float16) {
         opt.useFloat16 = true;
 
         testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -233,8 +233,8 @@ TEST(TestGpuIndexFlat, L2_Float16_K1) {
         opt.kOverride = 1;
 
         testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -254,8 +254,8 @@ TEST(TestGpuIndexFlat, L2_Tiling) {
         opt.kOverride = 64;
 
         testFlat(opt);
-#if defined USE_NVIDIA_RAFT
-        opt.use_raft = true;
+#if defined USE_NVIDIA_CUVS
+        opt.use_cuvs = true;
         testFlat(opt);
 #endif
     }
@@ -268,7 +268,7 @@ TEST(TestGpuIndexFlat, QueryEmpty) {
     faiss::gpu::GpuIndexFlatConfig config;
     config.device = 0;
     config.useFloat16 = false;
-    config.use_raft = false;
+    config.use_cuvs = false;
     int dim = 128;
     faiss::gpu::GpuIndexFlatL2 gpuIndex(&res, dim, config);
 
@@ -292,7 +292,7 @@ TEST(TestGpuIndexFlat, QueryEmpty) {
     }
 }
 
-void testCopyFrom(bool use_raft) {
+void testCopyFrom(bool use_cuvs) {
     int numVecs = faiss::gpu::randVal(100, 200);
     int dim = faiss::gpu::randVal(1, 1000);
 
@@ -310,7 +310,7 @@ void testCopyFrom(bool use_raft) {
         faiss::gpu::GpuIndexFlatConfig config;
         config.device = device;
         config.useFloat16 = useFloat16;
-        config.use_raft = use_raft;
+        config.use_cuvs = use_cuvs;
 
         // Fill with garbage values
         faiss::gpu::GpuIndexFlatL2 gpuIndex(&res, 2000, config);
@@ -343,13 +343,13 @@ TEST(TestGpuIndexFlat, CopyFrom) {
     testCopyFrom(false);
 }
 
-#if defined USE_NVIDIA_RAFT
-TEST(TestRaftGpuIndexFlat, CopyFrom) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestCuvsGpuIndexFlat, CopyFrom) {
     testCopyFrom(true);
 }
 #endif
 
-void testCopyTo(bool use_raft) {
+void testCopyTo(bool use_cuvs) {
     faiss::gpu::StandardGpuResources res;
     res.noTempMemory();
 
@@ -363,7 +363,7 @@ void testCopyTo(bool use_raft) {
         faiss::gpu::GpuIndexFlatConfig config;
         config.device = device;
         config.useFloat16 = useFloat16;
-        config.use_raft = use_raft;
+        config.use_cuvs = use_cuvs;
 
         faiss::gpu::GpuIndexFlatL2 gpuIndex(&res, dim, config);
         gpuIndex.add(numVecs, vecs.data());
@@ -394,13 +394,13 @@ TEST(TestGpuIndexFlat, CopyTo) {
     testCopyTo(false);
 }
 
-#if defined USE_NVIDIA_RAFT
-TEST(TestRaftGpuIndexFlat, CopyTo) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestCuvsGpuIndexFlat, CopyTo) {
     testCopyTo(true);
 }
 #endif
 
-void testUnifiedMemory(bool use_raft) {
+void testUnifiedMemory(bool use_cuvs) {
     // Construct on a random device to test multi-device, if we have
     // multiple devices
     int device = faiss::gpu::randVal(0, faiss::gpu::getNumDevices() - 1);
@@ -426,7 +426,7 @@ void testUnifiedMemory(bool use_raft) {
     faiss::gpu::GpuIndexFlatConfig config;
     config.device = device;
     config.memorySpace = faiss::gpu::MemorySpace::Unified;
-    config.use_raft = use_raft;
+    config.use_cuvs = use_cuvs;
 
     faiss::gpu::GpuIndexFlatL2 gpuIndexL2(&res, dim, config);
 
@@ -452,13 +452,13 @@ TEST(TestGpuIndexFlat, UnifiedMemory) {
     testUnifiedMemory(false);
 }
 
-#if defined USE_NVIDIA_RAFT
-TEST(TestRaftGpuIndexFlat, UnifiedMemory) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestCuvsGpuIndexFlat, UnifiedMemory) {
     testUnifiedMemory(true);
 }
 #endif
 
-void testLargeIndex(bool use_raft) {
+void testLargeIndex(bool use_cuvs) {
     // Construct on a random device to test multi-device, if we have
     // multiple devices
     int device = faiss::gpu::randVal(0, faiss::gpu::getNumDevices() - 1);
@@ -489,7 +489,7 @@ void testLargeIndex(bool use_raft) {
 
     faiss::gpu::GpuIndexFlatConfig config;
     config.device = device;
-    config.use_raft = use_raft;
+    config.use_cuvs = use_cuvs;
     faiss::gpu::GpuIndexFlatL2 gpuIndexL2(&res, dim, config);
 
     cpuIndexL2.add(nb, xb.data());
@@ -513,13 +513,13 @@ TEST(TestGpuIndexFlat, LargeIndex) {
     testLargeIndex(false);
 }
 
-#if defined USE_NVIDIA_RAFT
-TEST(TestRaftGpuIndexFlat, LargeIndex) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestCuvsGpuIndexFlat, LargeIndex) {
     testLargeIndex(true);
 }
 #endif
 
-void testResidual(bool use_raft) {
+void testResidual(bool use_cuvs) {
     // Construct on a random device to test multi-device, if we have
     // multiple devices
     int device = faiss::gpu::randVal(0, faiss::gpu::getNumDevices() - 1);
@@ -529,7 +529,7 @@ void testResidual(bool use_raft) {
 
     faiss::gpu::GpuIndexFlatConfig config;
     config.device = device;
-    config.use_raft = use_raft;
+    config.use_cuvs = use_cuvs;
 
     int dim = 32;
     faiss::IndexFlat cpuIndex(dim, faiss::MetricType::METRIC_L2);
@@ -566,13 +566,13 @@ TEST(TestGpuIndexFlat, Residual) {
     testResidual(false);
 }
 
-#if defined USE_NVIDIA_RAFT
-TEST(TestRaftGpuIndexFlat, Residual) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestCuvsGpuIndexFlat, Residual) {
     testResidual(true);
 }
 #endif
 
-void testReconstruct(bool use_raft) {
+void testReconstruct(bool use_cuvs) {
     // Construct on a random device to test multi-device, if we have
     // multiple devices
     int device = faiss::gpu::randVal(0, faiss::gpu::getNumDevices() - 1);
@@ -589,7 +589,7 @@ void testReconstruct(bool use_raft) {
         faiss::gpu::GpuIndexFlatConfig config;
         config.device = device;
         config.useFloat16 = useFloat16;
-        config.use_raft = use_raft;
+        config.use_cuvs = use_cuvs;
 
         faiss::gpu::GpuIndexFlat gpuIndex(
                 &res, dim, faiss::MetricType::METRIC_L2, config);
@@ -657,13 +657,13 @@ void testReconstruct(bool use_raft) {
 TEST(TestGpuIndexFlat, Reconstruct) {
     testReconstruct(false);
 }
-#if defined USE_NVIDIA_RAFT
-TEST(TestRaftGpuIndexFlat, Reconstruct) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestCuvsGpuIndexFlat, Reconstruct) {
     testReconstruct(true);
 }
 #endif
 
-void testSearchAndReconstruct(bool use_raft) {
+void testSearchAndReconstruct(bool use_cuvs) {
     // Construct on a random device to test multi-device, if we have
     // multiple devices
     int device = faiss::gpu::randVal(0, faiss::gpu::getNumDevices() - 1);
@@ -683,7 +683,7 @@ void testSearchAndReconstruct(bool use_raft) {
 
     faiss::gpu::GpuIndexFlatConfig config;
     config.device = device;
-    config.use_raft = use_raft;
+    config.use_cuvs = use_cuvs;
     faiss::gpu::GpuIndexFlatL2 gpuIndex(&res, dim, config);
 
     cpuIndex.add(nb, xb.data());
@@ -754,8 +754,8 @@ TEST(TestGpuIndexFlat, SearchAndReconstruct) {
     testSearchAndReconstruct(false);
 }
 
-#if defined USE_NVIDIA_RAFT
-TEST(TestRaftGpuIndexFlat, SearchAndReconstruct) {
+#if defined USE_NVIDIA_CUVS
+TEST(TestCuvsGpuIndexFlat, SearchAndReconstruct) {
     testSearchAndReconstruct(true);
 }
 #endif