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

Use identical .. to find upstream folder in path reference #64

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

Use identical .. to find upstream folder in path reference #64

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
2 changes: 1 addition & 1 deletion AnnService/inc/Aggregator/AggregatorContext.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SPTAG_AGGREGATOR_AGGREGATORCONTEXT_H_
#define _SPTAG_AGGREGATOR_AGGREGATORCONTEXT_H_

#include "inc/Socket/Common.h"
#include "../Socket/Common.h"
#include "AggregatorSettings.h"

#include <memory>
Expand Down
4 changes: 2 additions & 2 deletions AnnService/inc/Aggregator/AggregatorExecutionContext.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#ifndef _SPTAG_AGGREGATOR_AGGREGATOREXECUTIONCONTEXT_H_
#define _SPTAG_AGGREGATOR_AGGREGATOREXECUTIONCONTEXT_H_

#include "inc/Socket/RemoteSearchQuery.h"
#include "inc/Socket/Packet.h"
#include "../Socket/RemoteSearchQuery.h"
#include "../Socket/Packet.h"

#include <memory>
#include <atomic>
Expand Down
6 changes: 3 additions & 3 deletions AnnService/inc/Aggregator/AggregatorService.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

#include "AggregatorContext.h"
#include "AggregatorExecutionContext.h"
#include "inc/Socket/Server.h"
#include "inc/Socket/Client.h"
#include "inc/Socket/ResourceManager.h"
#include "../Socket/Server.h"
#include "../Socket/Client.h"
#include "../Socket/ResourceManager.h"

#include <boost/asio.hpp>

Expand Down
Empty file modified AnnService/inc/Aggregator/AggregatorSettings.h
100644 → 100755
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions AnnService/inc/Client/ClientWrapper.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#ifndef _SPTAG_CLIENT_CLIENTWRAPPER_H_
#define _SPTAG_CLIENT_CLIENTWRAPPER_H_

#include "inc/Socket/Client.h"
#include "inc/Socket/RemoteSearchQuery.h"
#include "inc/Socket/ResourceManager.h"
#include "../Socket/Client.h"
#include "../Socket/RemoteSearchQuery.h"
#include "../Socket/ResourceManager.h"
#include "Options.h"

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion AnnService/inc/Client/Options.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SPTAG_CLIENT_OPTIONS_H_
#define _SPTAG_CLIENT_OPTIONS_H_

#include "inc/Helper/ArgumentsParser.h"
#include "../Helper/ArgumentsParser.h"

#include <string>
#include <vector>
Expand Down
6 changes: 3 additions & 3 deletions AnnService/inc/Core/BKT/Index.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include "../Common/WorkSpacePool.h"
#include "../Common/RelativeNeighborhoodGraph.h"
#include "../Common/BKTree.h"
#include "inc/Helper/SimpleIniReader.h"
#include "inc/Helper/StringConvert.h"
#include "../../Helper/SimpleIniReader.h"
#include "../../Helper/StringConvert.h"

#include <functional>
#include <mutex>
Expand Down Expand Up @@ -67,7 +67,7 @@ namespace SPTAG
#define DefineBKTParameter(VarName, VarType, DefaultValue, RepresentStr) \
VarName = DefaultValue; \

#include "inc/Core/BKT/ParameterDefinitionList.h"
#include "ParameterDefinitionList.h"
#undef DefineBKTParameter

m_fComputeDistance = COMMON::DistanceCalcSelector<T>(m_iDistCalcMethod);
Expand Down
Empty file modified AnnService/inc/Core/BKT/ParameterDefinitionList.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/BKTree.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/CommonUtils.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/DataUtils.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/Dataset.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/DistanceUtils.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/FineGrainedLock.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/Heap.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/KDTree.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/NeighborhoodGraph.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/QueryResultSet.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/RelativeNeighborhoodGraph.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/WorkSpace.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/Common/WorkSpacePool.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/CommonDataStructure.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/DefinitionList.h
100644 → 100755
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions AnnService/inc/Core/KDT/Index.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include "../Common/WorkSpacePool.h"
#include "../Common/RelativeNeighborhoodGraph.h"
#include "../Common/KDTree.h"
#include "inc/Helper/StringConvert.h"
#include "inc/Helper/SimpleIniReader.h"
#include "../../Helper/StringConvert.h"
#include "../../Helper/SimpleIniReader.h"

#include <functional>
#include <mutex>
Expand Down Expand Up @@ -67,7 +67,7 @@ namespace SPTAG
#define DefineKDTParameter(VarName, VarType, DefaultValue, RepresentStr) \
VarName = DefaultValue; \

#include "inc/Core/KDT/ParameterDefinitionList.h"
#include "ParameterDefinitionList.h"
#undef DefineKDTParameter

m_fComputeDistance = COMMON::DistanceCalcSelector<T>(m_iDistCalcMethod);
Expand Down
Empty file modified AnnService/inc/Core/KDT/ParameterDefinitionList.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/MetadataSet.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Core/SearchQuery.h
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion AnnService/inc/Core/VectorIndex.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "SearchQuery.h"
#include "VectorSet.h"
#include "MetadataSet.h"
#include "inc/Helper/SimpleIniReader.h"
#include "../Helper/SimpleIniReader.h"

namespace SPTAG
{
Expand Down
Empty file modified AnnService/inc/Core/VectorSet.h
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion AnnService/inc/Helper/ArgumentsParser.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SPTAG_HELPER_ARGUMENTSPARSER_H_
#define _SPTAG_HELPER_ARGUMENTSPARSER_H_

#include "inc/Helper/StringConvert.h"
#include "StringConvert.h"

#include <cstdint>
#include <cstddef>
Expand Down
Empty file modified AnnService/inc/Helper/Base64Encode.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Helper/CommonHelper.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Helper/Concurrent.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Helper/SimpleIniReader.h
100644 → 100755
View file
Open in desktop
Empty file.
14 changes: 7 additions & 7 deletions AnnService/inc/Helper/StringConvert.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SPTAG_HELPER_STRINGCONVERTHELPER_H_
#define _SPTAG_HELPER_STRINGCONVERTHELPER_H_

#include "inc/Core/Common.h"
#include "../Core/Common.h"
#include "CommonHelper.h"

#include <string>
Expand Down Expand Up @@ -240,7 +240,7 @@ inline bool ConvertStringTo<IndexAlgoType>(const char* p_str, IndexAlgoType& p_v
return true; \
} \

#include "inc/Core/DefinitionList.h"
#include "../Core/DefinitionList.h"
#undef DefineIndexAlgo

return false;
Expand All @@ -262,7 +262,7 @@ inline bool ConvertStringTo<DistCalcMethod>(const char* p_str, DistCalcMethod& p
return true; \
} \

#include "inc/Core/DefinitionList.h"
#include "../Core/DefinitionList.h"
#undef DefineDistCalcMethod

return false;
Expand All @@ -284,7 +284,7 @@ inline bool ConvertStringTo<VectorValueType>(const char* p_str, VectorValueType&
return true; \
} \

#include "inc/Core/DefinitionList.h"
#include "../Core/DefinitionList.h"
#undef DefineVectorValueType

return false;
Expand Down Expand Up @@ -316,7 +316,7 @@ inline std::string ConvertToString<IndexAlgoType>(const IndexAlgoType& p_value)
case IndexAlgoType::Name: \
return #Name; \

#include "inc/Core/DefinitionList.h"
#include "../Core/DefinitionList.h"
#undef DefineIndexAlgo

default:
Expand All @@ -336,7 +336,7 @@ inline std::string ConvertToString<DistCalcMethod>(const DistCalcMethod& p_value
case DistCalcMethod::Name: \
return #Name; \

#include "inc/Core/DefinitionList.h"
#include "../Core/DefinitionList.h"
#undef DefineDistCalcMethod

default:
Expand All @@ -356,7 +356,7 @@ inline std::string ConvertToString<VectorValueType>(const VectorValueType& p_val
case VectorValueType::Name: \
return #Name; \

#include "inc/Core/DefinitionList.h"
#include "../Core/DefinitionList.h"
#undef DefineVectorValueType

default:
Expand Down
4 changes: 2 additions & 2 deletions AnnService/inc/IndexBuilder/Options.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#ifndef _SPTAG_INDEXBUILDER_OPTIONS_H_
#define _SPTAG_INDEXBUILDER_OPTIONS_H_

#include "inc/Core/Common.h"
#include "inc/Helper/ArgumentsParser.h"
#include "../Core/Common.h"
#include "../Helper/ArgumentsParser.h"

#include <string>
#include <vector>
Expand Down
Empty file modified AnnService/inc/IndexBuilder/ThreadPool.h
100644 → 100755
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions AnnService/inc/IndexBuilder/VectorSetReader.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#ifndef _SPTAG_INDEXBUILDER_VECTORSETREADER_H_
#define _SPTAG_INDEXBUILDER_VECTORSETREADER_H_

#include "inc/Core/Common.h"
#include "inc/Core/VectorSet.h"
#include "inc/Core/MetadataSet.h"
#include "../Core/Common.h"
#include "../Core/VectorSet.h"
#include "../Core/MetadataSet.h"
#include "Options.h"

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion AnnService/inc/IndexBuilder/VectorSetReaders/DefaultReader.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define _SPTAG_INDEXBUILDER_VECTORSETREADERS_DEFAULTREADER_H_

#include "../VectorSetReader.h"
#include "inc/Helper/Concurrent.h"
#include "../../Helper/Concurrent.h"

#include <atomic>
#include <condition_variable>
Expand Down
Empty file modified AnnService/inc/Server/QueryParser.h
100644 → 100755
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions AnnService/inc/Server/SearchExecutionContext.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#ifndef _SPTAG_SERVER_SEARCHEXECUTIONCONTEXT_H_
#define _SPTAG_SERVER_SEARCHEXECUTIONCONTEXT_H_

#include "inc/Core/VectorIndex.h"
#include "inc/Core/SearchQuery.h"
#include "inc/Socket/RemoteSearchQuery.h"
#include "../Core/VectorIndex.h"
#include "../Core/SearchQuery.h"
#include "../Socket/RemoteSearchQuery.h"
#include "ServiceSettings.h"
#include "QueryParser.h"

Expand Down
Empty file modified AnnService/inc/Server/SearchExecutor.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Server/SearchService.h
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion AnnService/inc/Server/ServiceContext.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SPTAG_SERVER_SERVICECONTEX_H_
#define _SPTAG_SERVER_SERVICECONTEX_H_

#include "inc/Core/VectorIndex.h"
#include "../Core/VectorIndex.h"
#include "ServiceSettings.h"

#include <memory>
Expand Down
Empty file modified AnnService/inc/Server/ServiceSettings.h
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion AnnService/inc/Socket/Client.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SPTAG_SOCKET_CLIENT_H_
#define _SPTAG_SOCKET_CLIENT_H_

#include "inc/Core/Common.h"
#include "../Core/Common.h"
#include "Connection.h"
#include "ConnectionManager.h"
#include "Packet.h"
Expand Down
Empty file modified AnnService/inc/Socket/Common.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Socket/Connection.h
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion AnnService/inc/Socket/ConnectionManager.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define _SPTAG_SOCKET_CONNECTIONMANAGER_H_

#include "Connection.h"
#include "inc/Helper/Concurrent.h"
#include "../Helper/Concurrent.h"

#include <cstdint>
#include <memory>
Expand Down
Empty file modified AnnService/inc/Socket/Packet.h
100644 → 100755
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions AnnService/inc/Socket/RemoteSearchQuery.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#ifndef _SPTAG_SOCKET_REMOTESEARCHQUERY_H_
#define _SPTAG_SOCKET_REMOTESEARCHQUERY_H_

#include "inc/Core/CommonDataStructure.h"
#include "inc/Core/SearchQuery.h"
#include "../Core/CommonDataStructure.h"
#include "../Core/SearchQuery.h"

#include <cstdint>
#include <memory>
Expand Down
Empty file modified AnnService/inc/Socket/ResourceManager.h
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AnnService/inc/Socket/Server.h
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion AnnService/inc/Socket/SimpleSerialization.h
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef _SPTAG_SOCKET_SIMPLESERIALIZATION_H_
#define _SPTAG_SOCKET_SIMPLESERIALIZATION_H_

#include "inc/Core/CommonDataStructure.h"
#include "../Core/CommonDataStructure.h"

#include <type_traits>
#include <cstdint>
Expand Down