Skip to content
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

Declare saveIndex/loadIndex as templates to use custom streams #556

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Declare saveIndex/loadIndex as templates to use custom streams #556

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
Declare saveIndex/loadIndex as templates to use custom streams
  • Loading branch information
@drons
drons committed Apr 13, 2024
commit 497f926aab11b146fd006d95941a6377e6d0dbf6
23 changes: 20 additions & 3 deletions hnswlib/hnswalg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
loadIndex(location, s, max_elements);
}

template<class stream_t>
HierarchicalNSW(
stream_t &stream,
SpaceInterface<dist_t> *s,
bool nmslib = false,
size_t max_elements = 0,
bool allow_replace_deleted = false)
: allow_replace_deleted_(allow_replace_deleted) {
loadIndexFromStream(stream, s, max_elements);
}

HierarchicalNSW(
SpaceInterface<dist_t> *s,
Expand Down Expand Up @@ -684,7 +694,11 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {

void saveIndex(const std::string &location) {
std::ofstream output(location, std::ios::binary);

saveIndexToStream(output);
}

template<typename stream_t>
void saveIndexToStream(stream_t &output) {
writeBinaryPOD(output, offsetLevel0_);
writeBinaryPOD(output, max_elements_);
writeBinaryPOD(output, cur_element_count);
Expand All @@ -711,17 +725,20 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
output.close();
}


void loadIndex(const std::string &location, SpaceInterface<dist_t> *s, size_t max_elements_i = 0) {
std::ifstream input(location, std::ios::binary);

if (!input.is_open())
throw std::runtime_error("Cannot open file");
loadIndexFromStream(input, s, max_elements_i);
}

template<typename stream_t>
void loadIndexFromStream(stream_t &input, SpaceInterface<dist_t> *s, size_t max_elements_i = 0) {
clear();
// get file size:
input.seekg(0, input.end);
std::streampos total_filesize = input.tellg();
auto total_filesize = input.tellg();
input.seekg(0, input.beg);

readBinaryPOD(input, offsetLevel0_);
Expand Down
8 changes: 4 additions & 4 deletions hnswlib/hnswlib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,13 @@ class pairGreater {
}
};

template<typename T>
static void writeBinaryPOD(std::ostream &out, const T &podRef) {
template<typename stream_t, typename T>
static void writeBinaryPOD(stream_t &out, const T &podRef) {
out.write((char *) &podRef, sizeof(T));
}

template<typename T>
static void readBinaryPOD(std::istream &in, T &podRef) {
template<typename stream_t, typename T>
static void readBinaryPOD(stream_t &in, T &podRef) {
in.read((char *) &podRef, sizeof(T));
}

Expand Down
Loading