From 7d782dbb9f826492680ee917199f109b5d6bc84a Mon Sep 17 00:00:00 2001 From: "xj.lin" Date: Tue, 30 Jul 2019 15:12:45 +0800 Subject: [PATCH 1/3] remove personal project knowhere Former-commit-id: 9d030089606c110f0a42159fb5200ae2fbbefcc5 --- cpp/thirdparty/knowhere | 1 - 1 file changed, 1 deletion(-) delete mode 160000 cpp/thirdparty/knowhere diff --git a/cpp/thirdparty/knowhere b/cpp/thirdparty/knowhere deleted file mode 160000 index 02550a43b5..0000000000 --- a/cpp/thirdparty/knowhere +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 02550a43b5146bd7976b8b2b3fc37ca885d1e880 From 9232625a93f63692afdf868eb7fee875d381047a Mon Sep 17 00:00:00 2001 From: "xj.lin" Date: Tue, 30 Jul 2019 15:18:26 +0800 Subject: [PATCH 2/3] replace knowhere with megasearch/knowhere Former-commit-id: ebc5f2dedbdc9fc7efdeecd8f2457f40829bbb31 --- .gitmodules | 4 ++-- cpp/thirdparty/knowhere | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 160000 cpp/thirdparty/knowhere diff --git a/.gitmodules b/.gitmodules index 297cf0e592..9a0f065809 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/cpp/thirdparty/knowhere b/cpp/thirdparty/knowhere new file mode 160000 index 0000000000..02550a43b5 --- /dev/null +++ b/cpp/thirdparty/knowhere @@ -0,0 +1 @@ +Subproject commit 02550a43b5146bd7976b8b2b3fc37ca885d1e880 From 08e0aa836c1b8af7f83bbfc0e62d96744ebcd85f Mon Sep 17 00:00:00 2001 From: "xj.lin" Date: Tue, 30 Jul 2019 15:34:44 +0800 Subject: [PATCH 3/3] remove faiss build useless gpu-arch Former-commit-id: 4c79e50367d25a5336138fe90815d6488ff5244e --- cpp/cmake/ThirdPartyPackages.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 046273a0b8..2804d98d98 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -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)