Skip to content

Use much smaller scratch space for non filter case #639

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

Merged
ltan1ms merged 2 commits into from
Mar 28, 2025
Merged

Use much smaller scratch space for non filter case #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8f3dd1
Use much smaller scratch space for non filter case
ltan1ms Mar 24, 2025
02f51df
fix build error
ltan1ms Mar 28, 2025
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
6 changes: 6 additions & 0 deletions include/pq_flash_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ template <typename T, typename LabelT = uint32_t> class PQFlashIndex
DISKANN_DLLEXPORT int load(uint32_t num_threads, const char *index_prefix);
#endif

#ifdef EXEC_ENV_OLS
DISKANN_DLLEXPORT bool use_filter_support(MemoryMappedFiles &files);
#else
DISKANN_DLLEXPORT bool use_filter_support();
#endif

#ifdef EXEC_ENV_OLS
DISKANN_DLLEXPORT void load_labels(MemoryMappedFiles &files, const std::string &disk_index_file);
#else
Expand Down
29 changes: 27 additions & 2 deletions src/pq_flash_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,23 @@ void PQFlashIndex<T, LabelT>::load_dummy_map(const std::string &dummy_map_filepa
throw FileException (dummy_map_filepath, e, __FUNCSIG__, __FILE__, __LINE__);
}
}


template <typename T, typename LabelT>
#ifdef EXEC_ENV_OLS
bool PQFlashIndex<T, LabelT>::use_filter_support(MemoryMappedFiles &files)
#else
bool PQFlashIndex<T, LabelT>::use_filter_support()
#endif
{
std::string labels_file = _disk_index_file + "_labels.txt";
#ifdef EXEC_ENV_OLS
return files.fileExists(labels_file);
#else
return file_exists(labels_file);
#endif
}

#ifdef EXEC_ENV_OLS
template <typename T, typename LabelT>
void PQFlashIndex<T, LabelT>::load_labels(MemoryMappedFiles &files, const std::string &disk_index_file)
Expand Down Expand Up @@ -1090,7 +1107,11 @@ int PQFlashIndex<T, LabelT>::load_from_separate_paths(uint32_t num_threads, cons
// bytes are needed to store the header and read in that many using our
// 'standard' aligned file reader approach.
reader->open(_disk_index_file);
this->setup_thread_data(num_threads);
this->setup_thread_data(
num_threads,
defaults::VISITED_RESERVE,
defaults::MAX_GRAPH_DEGREE,
(use_filter_support(files)? defaults::MAX_FILTERS_PER_QUERY : 0));
this->_max_nthreads = num_threads;

char *bytes = getHeaderBytes();
Expand Down Expand Up @@ -1180,7 +1201,11 @@ int PQFlashIndex<T, LabelT>::load_from_separate_paths(uint32_t num_threads, cons
// open AlignedFileReader handle to index_file
std::string index_fname(_disk_index_file);
reader->open(index_fname);
this->setup_thread_data(num_threads);
this->setup_thread_data(
num_threads,
defaults::VISITED_RESERVE,
defaults::MAX_GRAPH_DEGREE,
(use_filter_support()? defaults::MAX_FILTERS_PER_QUERY : 0));
this->_max_nthreads = num_threads;

#endif
Expand Down
Loading