Skip to content

Fix cloning and reverse index factory for NSG indices #4151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ddrcoder wants to merge 1 commit into from
Closed

Fix cloning and reverse index factory for NSG indices #4151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions faiss/clone_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,10 @@ Index* Cloner::clone_Index(const Index* index) {
IndexNSG* res = clone_IndexNSG(insg);

// copy the dynamic allocated graph
auto& new_graph = res->nsg.final_graph;
auto& old_graph = insg->nsg.final_graph;
new_graph = std::make_shared<nsg::Graph<int>>(*old_graph);
if (auto& old_graph = insg->nsg.final_graph) {
auto& new_graph = res->nsg.final_graph;
new_graph = std::make_shared<nsg::Graph<int>>(*old_graph);
}

res->own_fields = true;
res->storage = clone_Index(insg->storage);
Expand Down
19 changes: 19 additions & 0 deletions faiss/cppcontrib/factory_tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,22 @@
// -*- c++ -*-

#include <faiss/cppcontrib/factory_tools.h>

#include <map>

#include <faiss/IndexBinaryFlat.h>
#include <faiss/IndexBinaryHNSW.h>
#include <faiss/IndexBinaryIVF.h>
#include <faiss/IndexHNSW.h>
#include <faiss/IndexIDMap.h>
#include <faiss/IndexIVFFlat.h>
#include <faiss/IndexIVFPQFastScan.h>
#include <faiss/IndexLSH.h>
#include <faiss/IndexNSG.h>
#include <faiss/IndexPQFastScan.h>
#include <faiss/IndexPreTransform.h>
#include <faiss/IndexRefine.h>

namespace faiss {

namespace {
Expand Down Expand Up @@ -122,6 +136,11 @@ std::string reverse_index_factory(const faiss::Index* index) {
const faiss::IndexHNSW* hnsw_index =
dynamic_cast<const faiss::IndexHNSW*>(index)) {
return "HNSW" + std::to_string(get_hnsw_M(hnsw_index));
} else if (
const faiss::IndexNSG* nsg_index =
dynamic_cast<const faiss::IndexNSG*>(index)) {
return "NSG" + std::to_string(nsg_index->nsg.R) + "," +
reverse_index_factory(nsg_index->storage);
} else if (
const faiss::IndexRefine* refine_index =
dynamic_cast<const faiss::IndexRefine*>(index)) {
Expand Down
15 changes: 4 additions & 11 deletions faiss/cppcontrib/factory_tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,13 @@

#pragma once

#include <faiss/IndexBinaryFlat.h>
#include <faiss/IndexBinaryHNSW.h>
#include <faiss/IndexBinaryIVF.h>
#include <faiss/IndexHNSW.h>
#include <faiss/IndexIDMap.h>
#include <faiss/IndexIVFFlat.h>
#include <faiss/IndexIVFPQFastScan.h>
#include <faiss/IndexLSH.h>
#include <faiss/IndexPQFastScan.h>
#include <faiss/IndexPreTransform.h>
#include <faiss/IndexRefine.h>
#include <string>

namespace faiss {

struct Index;
struct IndexBinary;

std::string reverse_index_factory(const faiss::Index* index);
std::string reverse_index_factory(const faiss::IndexBinary* index);

Expand Down
4 changes: 4 additions & 0 deletions tests/test_factory_tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ TEST(TestFactoryTools, TestReverseIndexFactory) {
"HNSW32",
"SQ8",
"SQfp16",
"NSG24,Flat",
"NSG16,SQ8",
}) {
std::unique_ptr<Index> index{index_factory(64, factory)};
ASSERT_TRUE(index);
Expand All @@ -32,6 +34,8 @@ TEST(TestFactoryTools, TestReverseIndexFactory) {
using Case = std::pair<const char*, const char*>;
for (auto [src, dst] : {
Case{"SQ8,RFlat", "SQ8,Refine(Flat)"},
Case{"NSG", "NSG32,Flat"},
Case{"NSG,PQ8", "NSG32,PQ8x8"},
}) {
std::unique_ptr<Index> index{index_factory(64, src)};
ASSERT_TRUE(index);
Expand Down
Loading