Revert "hacky - search binary without ids"

This reverts commit 73e9e4b.

Author: metonymic-smokey

index.go

@@ -81,9 +81,6 @@ type Index interface {
 	SearchBinaryWithIDs(x []uint8, k int64, params json.RawMessage) (distances []int32,
 		labels []int64, err error)
 
-	SearchBinaryWithoutIDs(x []uint8, k int64, exclude []int64,
-		params json.RawMessage) (distances []int32, labels []int64, err error)
-
 	SearchBinary(x []uint8, k int64) (distances []int32,
 		labels []int64, err error)
 
@@ -397,46 +394,11 @@ func (idx *faissIndex) SearchWithoutIDs(x []float32, k int64, exclude []int64, p
 	}
 	defer searchParams.Delete()
 
-	d, labels, err := idx.searchWithParams(x, k, searchParams.sp)
-	distances = d.([]float32)
+	distances, labels, err = idx.searchWithParams(x, k, searchParams.sp)
 
 	return
 }
 
-func (idx *faissIndex) SearchBinaryWithoutIDs(x []uint8, k int64, exclude []int64,
-	params json.RawMessage) (distances []int32, labels []int64, err error,
-) {
-	if params == nil && len(exclude) == 0 {
-		return idx.SearchBinary(x, k)
-	}
-
-	var selector *C.FaissIDSelector
-	if len(exclude) > 0 {
-		excludeSelector, err := NewIDSelectorNot(exclude)
-		if err != nil {
-			return nil, nil, err
-		}
-		selector = excludeSelector.Get()
-		defer excludeSelector.Delete()
-	}
-
-	searchParams, err := NewSearchParams(idx, params, selector, nil)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer searchParams.Delete()
-
-	nq := (len(x) * 8) / idx.D()
-
-	distances = make([]int32, int64(nq)*k)
-	labels = make([]int64, int64(nq)*k)
-
-	d, labels, err := idx.searchWithParams(x, k, searchParams.sp)
-	distances = d.([]int32)
-
-	return distances, labels, nil
-}
-
 func (idx *faissIndex) SearchBinaryWithIDs(x []uint8, k int64,
 	params json.RawMessage) (distances []int32, labels []int64, err error,
 ) {
@@ -497,8 +459,7 @@ func (idx *faissIndex) SearchWithIDs(x []float32, k int64, include []int64,
 	}
 	defer searchParams.Delete()
 
-	d, labels, err := idx.searchWithParams(x, k, searchParams.sp)
-	distances = d.([]float32)
+	distances, labels, err = idx.searchWithParams(x, k, searchParams.sp)
 	return
 }
 
@@ -594,49 +555,23 @@ func (idx *faissIndex) Close() {
 	C.faiss_IndexBinary_free(idx.idxBinary)
 }
 
-func (idx *faissIndex) searchWithParams(x interface{}, k int64, searchParams *C.FaissSearchParameters) (
-	distances interface{}, labels []int64, err error,
+func (idx *faissIndex) searchWithParams(x []float32, k int64, searchParams *C.FaissSearchParameters) (
+	distances []float32, labels []int64, err error,
 ) {
-	floatVec, ok := x.([]float32)
-	if ok {
-		n := len(floatVec) / idx.D()
-		distancesFloat := make([]float32, int64(n)*k)
-		labels = make([]int64, int64(n)*k)
-
-		if c := C.faiss_Index_search_with_params(
-			idx.idx,
-			C.idx_t(n),
-			(*C.float)(&floatVec[0]),
-			C.idx_t(k),
-			searchParams,
-			(*C.float)(&distancesFloat[0]),
-			(*C.idx_t)(&labels[0]),
-		); c != 0 {
-			err = getLastError()
-		}
-
-		distances = distancesFloat
-	} else {
-		c, ok := x.([]uint8)
-		if ok {
-			n := (len(c) * 8) / idx.D()
-			distancesBinary := make([]int32, int64(n)*k)
-			labels = make([]int64, int64(n)*k)
-
-			if c := C.faiss_IndexBinary_search_with_params(
-				idx.idxBinary,
-				C.idx_t(n),
-				(*C.uint8_t)(&c[0]),
-				C.idx_t(k),
-				searchParams,
-				(*C.int32_t)(&distancesBinary[0]),
-				(*C.idx_t)(&labels[0]),
-			); c != 0 {
-				err = getLastError()
-			}
+	n := len(x) / idx.D()
+	distances = make([]float32, int64(n)*k)
+	labels = make([]int64, int64(n)*k)
 
-			distances = distancesBinary
-		}
+	if c := C.faiss_Index_search_with_params(
+		idx.idx,
+		C.idx_t(n),
+		(*C.float)(&x[0]),
+		C.idx_t(k),
+		searchParams,
+		(*C.float)(&distances[0]),
+		(*C.idx_t)(&labels[0]),
+	); c != 0 {
+		err = getLastError()
 	}
 
 	return

search_params.go

@@ -2,7 +2,6 @@ package faiss
 
 /*
 #include <faiss/c_api/Index_c.h>
-#include <faiss/c_api/IndexBinary_c.h>
 #include <faiss/c_api/IndexIVF_c.h>
 #include <faiss/c_api/impl/AuxIndexStructures_c.h>
 */
@@ -79,11 +78,7 @@ func NewSearchParams(idx Index, params json.RawMessage, sel *C.FaissIDSelector,
 		nlist = int(C.faiss_IndexIVF_nlist(ivfIdx))
 		nprobe = int(C.faiss_IndexIVF_nprobe(ivfIdx))
 		nvecs = int(C.faiss_Index_ntotal(idx.cPtr()))
-	} else if bivfIdx := C.faiss_IndexBinaryIVF_cast(idx.cPtrBinary()); bivfIdx != nil {
-		nlist = int(C.faiss_IndexBinaryIVF_nlist(bivfIdx))
-		nprobe = int(C.faiss_IndexBinaryIVF_nprobe(bivfIdx))
-		nvecs = int(C.faiss_IndexBinary_ntotal(idx.cPtrBinary()))
-	}
+	} 
 
 	if defaultParams != nil {
 		if defaultParams.Nlist > 0 {
@@ -122,16 +117,6 @@ func NewSearchParams(idx Index, params json.RawMessage, sel *C.FaissIDSelector,
 			rv.Delete()
 			return nil, fmt.Errorf("failed to create faiss IVF search params")
 		}
-	} else if bivfIdx := C.faiss_IndexBinaryIVF_cast(idx.cPtrBinary()); bivfIdx != nil {
-		if c := C.faiss_SearchParametersIVF_new_with(
-			&rv.sp,
-			sel,
-			C.size_t(nprobe),
-			C.size_t(maxCodes),
-		); c != 0 {
-			rv.Delete()
-			return nil, fmt.Errorf("failed to create faiss BIVF search params")
-		}
 	}
 	return rv, nil
 }