Skip to content

fix OLS build #428

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
harsha-simhadri merged 2 commits into from
Aug 17, 2023
Merged

fix OLS build #428

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
f8828b0
fix OLS build
PhilipBAdams Aug 17, 2023
bf64d77
Add a build to CI with feature flags enabled
PhilipBAdams Aug 17, 2023
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
13 changes: 12 additions & 1 deletion .github/actions/build/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,15 @@ runs:
mkdir dist
mklink /j .\dist\bin .\x64\Release\
shell: cmd
# ------------ End Windows Build ---------------
# ------------ End Windows Build ---------------
# ------------ Windows Build With EXEC_ENV_OLS and USE_BING_INFRA ---------------
- name: Add VisualStudio command line tools into path
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1
- name: Run configure and build for Windows with Bing feature flags
if: runner.os == 'Windows'
run: |
mkdir build_bing && cd build_bing && cmake .. -DEXEC_ENV_OLS=1 -DUSE_BING_INFRA=1 -DUNIT_TEST=True && msbuild diskann.sln /m /nologo /t:Build /p:Configuration="Release" /property:Platform="x64" -consoleloggerparameters:"ErrorsOnly;Summary"
cd ..
shell: cmd
# ------------ End Windows Build ---------------
2 changes: 1 addition & 1 deletion include/pq_flash_index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ template <typename T, typename LabelT = uint32_t> class PQFlashIndex
// Set to a larger value than the actual header to accommodate
// any additions we make to the header. This is an outer limit
// on how big the header can be.
static const int HEADER_SIZE = SECTOR_LEN;
static const int HEADER_SIZE = defaults::SECTOR_LEN;
char *getHeaderBytes();
#endif
};
Expand Down
8 changes: 4 additions & 4 deletions src/pq_flash_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ template <typename T, typename LabelT> int PQFlashIndex<T, LabelT>::load(uint32_
std::string pq_compressed_vectors = std::string(index_prefix) + "_pq_compressed.bin";
std::string _disk_index_file = std::string(index_prefix) + "_disk.index";
#ifdef EXEC_ENV_OLS
return load_from_separate_paths(files, num_threads, disk_index_file.c_str(), pq_table_bin.c_str(),
return load_from_separate_paths(files, num_threads, _disk_index_file.c_str(), pq_table_bin.c_str(),
pq_compressed_vectors.c_str());
#else
return load_from_separate_paths(num_threads, _disk_index_file.c_str(), pq_table_bin.c_str(),
Expand Down Expand Up @@ -919,7 +919,7 @@ int PQFlashIndex<T, LabelT>::load_from_separate_paths(uint32_t num_threads, cons
#ifdef EXEC_ENV_OLS
// giving 0 chunks to make the _pq_table infer from the
// chunk_offsets file the correct value
disk_pq_table.load_pq_centroid_bin(files, disk_pq_pivots_path.c_str(), 0);
_disk_pq_table.load_pq_centroid_bin(files, disk_pq_pivots_path.c_str(), 0);
#else
// giving 0 chunks to make the _pq_table infer from the
// chunk_offsets file the correct value
Expand All @@ -939,7 +939,7 @@ int PQFlashIndex<T, LabelT>::load_from_separate_paths(uint32_t num_threads, cons
// DiskPriorityIO class. So, we need to estimate how many
// bytes are needed to store the header and read in that many using our
// 'standard' aligned file reader approach.
reader->open(disk_index_file);
reader->open(_disk_index_file);
this->setup_thread_data(num_threads);
this->_max_nthreads = num_threads;

Expand Down Expand Up @@ -1033,7 +1033,7 @@ int PQFlashIndex<T, LabelT>::load_from_separate_paths(uint32_t num_threads, cons
if (files.fileExists(medoids_file))
{
size_t tmp_dim;
diskann::load_bin<uint32_t>(files, medoids_file, medoids, _num_medoids, tmp_dim);
diskann::load_bin<uint32_t>(files, medoids_file, _medoids, _num_medoids, tmp_dim);
#else
if (file_exists(medoids_file))
{
Expand Down