From 462eca7024e146021f9993a7fce914e4ec93a34b Mon Sep 17 00:00:00 2001 From: Jerry Gao Date: Tue, 23 May 2023 14:10:37 +0800 Subject: [PATCH 1/6] Add WIN macro for non-win funtion --- include/filter_utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/filter_utils.h b/include/filter_utils.h index b7114d264..580f5a4cd 100644 --- a/include/filter_utils.h +++ b/include/filter_utils.h @@ -74,6 +74,7 @@ DISKANN_DLLEXPORT tsl::robin_map> generate_la * Each data file is saved under the following format: * input_data_path + "_" + label */ +#ifndef _WINDOWS template inline tsl::robin_map> generate_label_specific_vector_files( path input_data_path, tsl::robin_map labels_to_number_of_points, @@ -179,6 +180,7 @@ inline tsl::robin_map> generate_label_specifi return label_id_to_orig_id; } +#endif inline std::vector loadTags(const std::string &tags_file, const std::string &base_file) { From a2c6b380d20aca475daab1bb33510ec12974cec8 Mon Sep 17 00:00:00 2001 From: Jerry Gao Date: Tue, 23 May 2023 16:19:07 +0800 Subject: [PATCH 2/6] fix vc16 compile issue --- src/windows_aligned_file_reader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows_aligned_file_reader.cpp b/src/windows_aligned_file_reader.cpp index 9b1a024bd..7bcf4585b 100644 --- a/src/windows_aligned_file_reader.cpp +++ b/src/windows_aligned_file_reader.cpp @@ -44,7 +44,7 @@ void WindowsAlignedFileReader::register_thread() if (ctx.fhandle == INVALID_HANDLE_VALUE) { std::stringstream ss; - ss << m_filename.c_str(); + ss << std::string(m_filename.begin(), m_filename.end()); diskann::cout << "Error opening " << ss.str() << " -- error=" << GetLastError() << std::endl; } From b06b20b1dbda639a0b1e0b89d66eba00ae36b2e3 Mon Sep 17 00:00:00 2001 From: Jerry Gao Date: Tue, 30 May 2023 15:15:18 +0800 Subject: [PATCH 3/6] fix compile issue --- src/windows_aligned_file_reader.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/windows_aligned_file_reader.cpp b/src/windows_aligned_file_reader.cpp index 7bcf4585b..73d487e95 100644 --- a/src/windows_aligned_file_reader.cpp +++ b/src/windows_aligned_file_reader.cpp @@ -6,6 +6,8 @@ #include "windows_aligned_file_reader.h" #include #include "utils.h" +#include +#include #define SECTOR_LEN 4096 @@ -43,9 +45,8 @@ void WindowsAlignedFileReader::register_thread() FILE_ATTRIBUTE_READONLY | FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED | FILE_FLAG_RANDOM_ACCESS, NULL); if (ctx.fhandle == INVALID_HANDLE_VALUE) { - std::stringstream ss; - ss << std::string(m_filename.begin(), m_filename.end()); - diskann::cout << "Error opening " << ss.str() << " -- error=" << GetLastError() << std::endl; + auto filename = std::wstring_convert, wchar_t>().to_bytes(m_filename); + diskann::cout << "Error opening " << filename << " -- error=" << GetLastError() << std::endl; } // create IOCompletionPort From b61be09a65d34aef04b61b8eeb0ded69c09ffc97 Mon Sep 17 00:00:00 2001 From: Jerry Gao Date: Tue, 30 May 2023 21:40:21 +0800 Subject: [PATCH 4/6] fix compile issue --- src/windows_aligned_file_reader.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/windows_aligned_file_reader.cpp b/src/windows_aligned_file_reader.cpp index 73d487e95..6a69f24a6 100644 --- a/src/windows_aligned_file_reader.cpp +++ b/src/windows_aligned_file_reader.cpp @@ -7,7 +7,7 @@ #include #include "utils.h" #include -#include +#include #define SECTOR_LEN 4096 @@ -45,8 +45,17 @@ void WindowsAlignedFileReader::register_thread() FILE_ATTRIBUTE_READONLY | FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED | FILE_FLAG_RANDOM_ACCESS, NULL); if (ctx.fhandle == INVALID_HANDLE_VALUE) { - auto filename = std::wstring_convert, wchar_t>().to_bytes(m_filename); - diskann::cout << "Error opening " << filename << " -- error=" << GetLastError() << std::endl; + const size_t c_max_filepath_len = 256; + size_t actual_len = 0; + char filePath[c_max_filepath_len]; + if (wcstombs_s(&actual_len, filePath, c_max_filepath_len, m_filename.c_str(), m_filename.length()) == 0) + { + diskann::cout << "Error opening " << filePath << " -- error=" << GetLastError() << std::endl; + } + else + { + diskann::cout << "Error converting wchar to char" << " -- error=" << GetLastError() << std::endl; + } } // create IOCompletionPort From 0a240907913210ec6d933d7821d801f55783ffcc Mon Sep 17 00:00:00 2001 From: Jerry Gao Date: Wed, 31 May 2023 11:15:07 +0800 Subject: [PATCH 5/6] fix compile issue --- src/windows_aligned_file_reader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows_aligned_file_reader.cpp b/src/windows_aligned_file_reader.cpp index 6a69f24a6..ca7160891 100644 --- a/src/windows_aligned_file_reader.cpp +++ b/src/windows_aligned_file_reader.cpp @@ -54,7 +54,7 @@ void WindowsAlignedFileReader::register_thread() } else { - diskann::cout << "Error converting wchar to char" << " -- error=" << GetLastError() << std::endl; + diskann::cout << "Error converting wchar to char -- error=" << GetLastError() << std::endl; } } From fefaf59a8d992a0a328a61ffcfefe75884336da4 Mon Sep 17 00:00:00 2001 From: Jerry Gao Date: Thu, 1 Jun 2023 11:45:40 +0800 Subject: [PATCH 6/6] clean up code --- src/windows_aligned_file_reader.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/windows_aligned_file_reader.cpp b/src/windows_aligned_file_reader.cpp index ca7160891..3650b928a 100644 --- a/src/windows_aligned_file_reader.cpp +++ b/src/windows_aligned_file_reader.cpp @@ -6,7 +6,6 @@ #include "windows_aligned_file_reader.h" #include #include "utils.h" -#include #include #define SECTOR_LEN 4096