move decision to constructors

Author: Tony Kuo

hnswlib/space_ip.h

@@ -251,40 +251,8 @@ namespace hnswlib {
 #endif
 
 #if defined(USE_SSE) || defined(USE_AVX) || defined(USE_AVX512)
-    static float
-    InnerProductSIMD4Ext(const void *pVect1v, const void *pVect2v, const void *qty_ptr) {
-        DISTFUNC<float> simdfunc_;
-    #if defined(USE_AVX)
-        if (AVXCapable())
-            simdfunc_ = InnerProductSIMD4ExtAVX;
-        else
-            simdfunc_ = InnerProductSIMD4ExtSSE;
-    #else
-        simdfunc_ = InnerProductSIMD4ExtSSE;
-    #endif
-        return simdfunc_(pVect1v, pVect2v, qty_ptr);
-    }
-
-    static float
-    InnerProductSIMD16Ext(const void *pVect1v, const void *pVect2v, const void *qty_ptr) {
-        DISTFUNC<float> simdfunc_;
-    #if defined(USE_AVX512)
-        if (AVX512Capable())
-            simdfunc_ = InnerProductSIMD16ExtAVX512;
-        else if (AVXCapable())
-            simdfunc_ = InnerProductSIMD16ExtAVX;
-        else
-            simdfunc_ = InnerProductSIMD16ExtSSE;
-    #elif defined(USE_AVX)
-        if (AVXCapable())
-            simdfunc_ = InnerProductSIMD16ExtAVX;
-        else
-            simdfunc_ = InnerProductSIMD16ExtSSE;
-    #else
-        simdfunc_ = InnerProductSIMD16ExtSSE;
-    #endif
-        return simdfunc_(pVect1v, pVect2v, qty_ptr);
-    }
+    DISTFUNC<float> InnerProductSIMD16Ext = InnerProductSIMD16ExtSSE;
+    DISTFUNC<float> InnerProductSIMD4Ext = InnerProductSIMD4ExtSSE;
 
     static float
     InnerProductSIMD16ExtResiduals(const void *pVect1v, const void *pVect2v, const void *qty_ptr) {
@@ -324,6 +292,19 @@ namespace hnswlib {
         InnerProductSpace(size_t dim) {
             fstdistfunc_ = InnerProduct;
     #if defined(USE_AVX) || defined(USE_SSE) || defined(USE_AVX512)
+        #if defined(USE_AVX512)
+            if (AVX512Capable())
+                InnerProductSIMD16Ext = InnerProductSIMD16ExtAVX512;
+            else if (AVXCapable())
+                InnerProductSIMD16Ext = InnerProductSIMD16ExtAVX;
+        #endif
+        #if defined(USE_AVX)
+            if (AVXCapable()) {
+                InnerProductSIMD16Ext = InnerProductSIMD16ExtAVX;
+                InnerProductSIMD4Ext = InnerProductSIMD4ExtAVX;
+            }
+        #endif
+
             if (dim % 16 == 0)
                 fstdistfunc_ = InnerProductSIMD16Ext;
             else if (dim % 4 == 0)

hnswlib/space_l2.h

@@ -144,26 +144,7 @@ namespace hnswlib {
 #endif
 
 #if defined(USE_SSE) || defined(USE_AVX) || defined(USE_AVX512)
-    static float
-    L2SqrSIMD16Ext(const void *pVect1v, const void *pVect2v, const void *qty_ptr) {
-        DISTFUNC<float> simdfunc_;
-    #if defined(USE_AVX512)
-        if (AVX512Capable())
-            simdfunc_ = L2SqrSIMD16ExtAVX512;
-        else if (AVXCapable())
-            simdfunc_ = L2SqrSIMD16ExtAVX;
-        else
-            simdfunc_ = L2SqrSIMD16ExtSSE;
-    #elif defined(USE_AVX)
-        if (AVXCapable())
-            simdfunc_ = L2SqrSIMD16ExtAVX;
-        else
-            simdfunc_ = L2SqrSIMD16ExtSSE;
-    #else
-        simdfunc_ = L2SqrSIMD16ExtSSE;
-    #endif
-        return simdfunc_(pVect1v, pVect2v, qty_ptr);
-    }
+    DISTFUNC<float> L2SqrSIMD16Ext = L2SqrSIMD16ExtSSE;
 
     static float
     L2SqrSIMD16ExtResiduals(const void *pVect1v, const void *pVect2v, const void *qty_ptr) {
@@ -232,7 +213,17 @@ namespace hnswlib {
     public:
         L2Space(size_t dim) {
             fstdistfunc_ = L2Sqr;
-        #if defined(USE_SSE) || defined(USE_AVX) || defined(USE_AVX512)
+    #if defined(USE_SSE) || defined(USE_AVX) || defined(USE_AVX512)
+        #if defined(USE_AVX512)
+            if (AVX512Capable())
+                L2SqrSIMD16Ext = L2SqrSIMD16ExtAVX512;
+            else if (AVXCapable())
+                L2SqrSIMD16Ext = L2SqrSIMD16ExtAVX;
+        #elif defined(USE_AVX)
+            if (AVXCapable())
+                L2SqrSIMD16Ext = L2SqrSIMD16ExtAVX;
+        #endif
+
             if (dim % 16 == 0)
                 fstdistfunc_ = L2SqrSIMD16Ext;
             else if (dim % 4 == 0)
@@ -241,7 +232,7 @@ namespace hnswlib {
                 fstdistfunc_ = L2SqrSIMD16ExtResiduals;
             else if (dim > 4)
                 fstdistfunc_ = L2SqrSIMD4ExtResiduals;
-        #endif
+    #endif
             dim_ = dim;
             data_size_ = dim * sizeof(float);
         }