admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 03:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update_knowhere' into 'branch-0.4.0'

Browse Source 
MS-298 Update knowhere

See merge request megasearch/milvus!287

Former-commit-id: 24f713388b6037222566f328d035f15bf763a1c2
This commit is contained in:
peng.xu 2019-07-30 15:38:03 +08:00
commit 72dd8f7a92
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "cpp/thirdparty/knowhere"]
path = cpp/thirdparty/knowhere
url = git@192.168.1.105:xiaojun.lin/knowhere.git
branch = develop
url = git@192.168.1.105:megasearch/knowhere.git
branch = branch-0.4.0

2
cpp/cmake/ThirdPartyPackages.cmake
View File

@ -810,7 +810,7 @@ macro(build_faiss)
if(${MILVUS_WITH_FAISS_GPU_VERSION} STREQUAL "ON")
set(FAISS_CONFIGURE_ARGS ${FAISS_CONFIGURE_ARGS}
"--with-cuda=${CUDA_TOOLKIT_ROOT_DIR}"
"--with-cuda-arch=-gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_75,code=sm_75"
"--with-cuda-arch=-gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_75,code=sm_75"
)
else()
set(FAISS_CONFIGURE_ARGS ${FAISS_CONFIGURE_ARGS} --without-cuda)