Commit e1ae8e9f authored by groot's avatar groot
Browse files

Merge remote-tracking branch 'source/0.6.0' into 0.6.0

parents 05655580 7e394a26

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#433 - C++ SDK query result is not easy to use

- \#449 - Add ShowPartitions example for C++ SDK

- \#470 - Small raw files should not be build index

- \#584 - Intergrate internal FAISS



## Task

core/CMakeLists.txt

+9 −8
Original line number Diff line number Diff line
@@ -141,6 +141,11 @@ if (MILVUS_USE_CCACHE) 
    endif (CCACHE_FOUND)

endif ()



if (CUSTOMIZATION)

    set(MILVUS_GPU_VERSION ON)

    add_compile_definitions(CUSTOMIZATION)

endif ()



set(MILVUS_CPU_VERSION false)

if (MILVUS_GPU_VERSION)

    message(STATUS "Building Milvus GPU version")
@@ -170,10 +175,6 @@ else () 
    endif ()

endif ()



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



config_summary()

add_subdirectory(src)

core/cmake/DefineOptions.cmake

+3 −1
Original line number Diff line number Diff line
@@ -41,10 +41,12 @@ macro(define_option_string name description default) 
endmacro()



#----------------------------------------------------------------------

set_option_category("GPU version")

set_option_category("Milvus Build Option")



define_option(MILVUS_GPU_VERSION "Build GPU version" OFF)



define_option(CUSTOMIZATION "Build with customized FAISS library" OFF)



#----------------------------------------------------------------------

set_option_category("Thirdparty")

core/src/index/CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ include(ExternalProject) 
include(DefineOptionsCore)

include(BuildUtilsCore)



if (CUSTOMIZATION)

    set(MILVUS_GPU_VERSION ON)

    add_compile_definitions(CUSTOMIZATION)

endif ()



set(KNOWHERE_CPU_VERSION false)

if (MILVUS_GPU_VERSION OR KNOWHERE_GPU_VERSION)

    message(STATUS "Building Knowhere GPU version")

core/src/index/cmake/DefineOptionsCore.cmake

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ else () 
    define_option(KNOWHERE_GPU_VERSION "Build GPU version" OFF)

endif ()



define_option(CUSTOMIZATION "Build with customized FAISS library" OFF)



#----------------------------------------------------------------------

set_option_category("Thirdparty")