milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cmake' into 'branch-0.4.0' 

MS-495: cmake: integrated knowhere

See merge request megasearch/milvus!499

Former-commit-id: dc00213133c082dcc021575083255d3fdda21750
pull/191/head
jinhai 2019-09-06 18:16:31 +08:00
parent d6c7909b24 89b220ad1f
commit eaff4e5f0b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpp/build.sh
View File

@ -83,10 +83,6 @@ if [[ ! -d cmake_build ]]; then
MAKE_CLEAN="ON"
fi
#pushd `pwd`/src/core
#./build.sh ${KNOWHERE_OPTIONS}
#popd
cd cmake_build
CUDA_COMPILER=/usr/local/cuda/bin/nvcc

4
cpp/unittest/CMakeLists.txt
View File

@ -46,5 +46,5 @@ add_subdirectory(server)
add_subdirectory(db)
add_subdirectory(knowhere)
add_subdirectory(metrics)
add_subdirectory(scheduler)
add_subdirectory(storage)
#add_subdirectory(scheduler)
#add_subdirectory(storage)