faiss 0.1.7 → 0.2.3

data/vendor/faiss/faiss/gpu/GpuAutoTune.cpp

@@ -8,19 +8,19 @@
 #include <faiss/gpu/GpuAutoTune.h>
 #include <typeinfo>
 
-#include <faiss/gpu/GpuIndex.h>
+#include <faiss/IndexPreTransform.h>
 #include <faiss/IndexReplicas.h>
 #include <faiss/IndexShards.h>
-#include <faiss/IndexPreTransform.h>
+#include <faiss/gpu/GpuIndex.h>
 #include <faiss/gpu/GpuIndexFlat.h>
 #include <faiss/gpu/GpuIndexIVFFlat.h>
 #include <faiss/gpu/GpuIndexIVFPQ.h>
 #include <faiss/gpu/GpuIndexIVFScalarQuantizer.h>
-#include <faiss/impl/FaissAssert.h>
 #include <faiss/gpu/utils/DeviceUtils.h>
+#include <faiss/impl/FaissAssert.h>
 
-namespace faiss { namespace gpu {
-
+namespace faiss {
+namespace gpu {
 
 using namespace ::faiss;
 
@@ -28,68 +28,63 @@ using namespace ::faiss;
  * Parameters to auto-tune on GpuIndex'es
  **********************************************************/
 
-#define DC(classname) auto ix = dynamic_cast<const classname *>(index)
+#define DC(classname) auto ix = dynamic_cast<const classname*>(index)
 
-
-void GpuParameterSpace::initialize (const Index * index)
-{
-    if (DC (IndexPreTransform)) {
+void GpuParameterSpace::initialize(const Index* index) {
+    if (DC(IndexPreTransform)) {
         index = ix->index;
     }
-    if (DC (IndexReplicas)) {
-        if (ix->count() == 0) return;
+    if (DC(IndexReplicas)) {
+        if (ix->count() == 0)
+            return;
         index = ix->at(0);
     }
-    if (DC (IndexShards)) {
-        if (ix->count() == 0) return;
+    if (DC(IndexShards)) {
+        if (ix->count() == 0)
+            return;
         index = ix->at(0);
     }
-    if (DC (GpuIndexIVF)) {
-        ParameterRange & pr = add_range("nprobe");
+    if (DC(GpuIndexIVF)) {
+        ParameterRange& pr = add_range("nprobe");
         for (int i = 0; i < 12; i++) {
             size_t nprobe = 1 << i;
-            if (nprobe >= ix->getNumLists() ||
-                nprobe > getMaxKSelection()) break;
-            pr.values.push_back (nprobe);
+            if (nprobe >= ix->getNumLists() || nprobe > getMaxKSelection())
+                break;
+            pr.values.push_back(nprobe);
         }
     }
     // not sure we should call the parent initializer
 }
 
-
-
 #undef DC
 // non-const version
-#define DC(classname) auto *ix = dynamic_cast<classname *>(index)
-
+#define DC(classname) auto* ix = dynamic_cast<classname*>(index)
 
-
-void GpuParameterSpace::set_index_parameter (
-        Index * index, const std::string & name, double val) const
-{
-    if (DC (IndexReplicas)) {
+void GpuParameterSpace::set_index_parameter(
+        Index* index,
+        const std::string& name,
+        double val) const {
+    if (DC(IndexReplicas)) {
         for (int i = 0; i < ix->count(); i++)
-            set_index_parameter (ix->at(i), name, val);
+            set_index_parameter(ix->at(i), name, val);
         return;
     }
     if (name == "nprobe") {
-        if (DC (GpuIndexIVF)) {
-            ix->setNumProbes (int (val));
+        if (DC(GpuIndexIVF)) {
+            ix->setNumProbes(int(val));
             return;
         }
     }
     if (name == "use_precomputed_table") {
-        if (DC (GpuIndexIVFPQ)) {
-            ix->setPrecomputedCodes(bool (val));
+        if (DC(GpuIndexIVFPQ)) {
+            ix->setPrecomputedCodes(bool(val));
             return;
         }
     }
 
     // maybe normal index parameters apply?
-    ParameterSpace::set_index_parameter (index, name, val);
+    ParameterSpace::set_index_parameter(index, name, val);
 }
 
-
-
-
-} } // namespace
+} // namespace gpu
+} // namespace faiss

data/vendor/faiss/faiss/gpu/GpuAutoTune.h

@@ -7,21 +7,23 @@
 
 #pragma once
 
-#include <faiss/Index.h>
 #include <faiss/AutoTune.h>
+#include <faiss/Index.h>
 
-namespace faiss { namespace gpu {
-
+namespace faiss {
+namespace gpu {
 
 /// parameter space and setters for GPU indexes
-struct GpuParameterSpace: faiss::ParameterSpace {
+struct GpuParameterSpace : faiss::ParameterSpace {
     /// initialize with reasonable parameters for the index
-    void initialize (const faiss::Index * index) override;
+    void initialize(const faiss::Index* index) override;
 
     /// set a combination of parameters on an index
-    void set_index_parameter (
-          faiss::Index * index, const std::string & name,
-          double val) const override;
+    void set_index_parameter(
+            faiss::Index* index,
+            const std::string& name,
+            double val) const override;
 };
 
-} } // namespace
+} // namespace gpu
+} // namespace faiss