fine on raspberry pi 4

milvus-io · Jan 7, 2020 · 651b122 · 651b122
1 parent 3ecfe1d
commit 651b122
Show file tree

Hide file tree

Showing 21 changed files with 8,669 additions and 71 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -115,6 +115,9 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
 elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc)")
     message(STATUS "Building milvus_engine on ppc architecture")
     set(MILVUS_BUILD_ARCH ppc64le)
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch)")
+    message(STATUS "Building milvus_engine on aarch architecture")
+    set(MILVUS_BUILD_ARCH arch64)
 else ()
     message(WARNING "Unknown processor type")
     message(WARNING "CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}")

diff --git a/core/build.sh b/core/build.sh
@@ -160,5 +160,5 @@ else
   fi
 
   # compile and build
-  make -j 8 install || exit 1
+  make -j 4 install || exit 1
 fi
diff --git a/core/cmake/ThirdPartyPackages.cmake b/core/cmake/ThirdPartyPackages.cmake
@@ -199,7 +199,7 @@ if ("${MAKE}" STREQUAL "")
 endif ()
 
 if (NOT DEFINED MAKE_BUILD_ARGS)
-    set(MAKE_BUILD_ARGS "-j8")
+    set(MAKE_BUILD_ARGS "-j4")
 endif ()
 message(STATUS "Third Party MAKE_BUILD_ARGS = ${MAKE_BUILD_ARGS}")
 

diff --git a/core/src/index/CMakeLists.txt b/core/src/index/CMakeLists.txt
@@ -51,6 +51,9 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
 elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc)")
     message(STATUS "building milvus_engine on ppc architecture")
     set(KNOWHERE_BUILD_ARCH ppc64le)
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "(aarch)")
+    message(STATUS "building milvus_engine on aarch architecture")
+    set(KNOWHERE_BUILD_ARCH aarch64)
 else ()
     message(WARNING "unknown processor type")
     message(WARNING "CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}")
@@ -92,12 +95,12 @@ endif ()
 include(ThirdPartyPackagesCore)
 
 if (CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fPIC -DELPP_THREAD_SAFE -fopenmp -mavx -mf16c -msse4 -mpopcnt")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -fPIC -DELPP_THREAD_SAFE -fopenmp")
     if (KNOWHERE_GPU_VERSION)
         set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -O3")
     endif ()
 else ()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -fPIC -DELPP_THREAD_SAFE -fopenmp -mavx -mf16c -msse4 -mpopcnt")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -fPIC -DELPP_THREAD_SAFE -fopenmp")
     if (KNOWHERE_GPU_VERSION)
         set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -O0 -g")
     endif ()

diff --git a/core/src/index/build.sh b/core/src/index/build.sh
@@ -78,6 +78,6 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then
     make clean
 fi
 
-make -j 8 || exit 1
+make -j 4 || exit 1
 
-make install || exit 1
+# # make install || exit 1
diff --git a/core/src/index/cmake/ThirdPartyPackagesCore.cmake b/core/src/index/cmake/ThirdPartyPackagesCore.cmake
@@ -170,7 +170,7 @@ if ("${MAKE}" STREQUAL "")
     endif ()
 endif ()
 
-set(MAKE_BUILD_ARGS "-j8")
+set(MAKE_BUILD_ARGS "-j4")
 
 
 # ----------------------------------------------------------------------
@@ -442,7 +442,7 @@ macro(build_faiss)
     set(FAISS_CONFIGURE_ARGS
             "--prefix=${FAISS_PREFIX}"
             "CFLAGS=${EP_C_FLAGS}"
-            "CXXFLAGS=${EP_CXX_FLAGS} -mavx2 -mf16c -O3"
+            "CXXFLAGS=${EP_CXX_FLAGS} -O3"
             --without-python)
 
     if (FAISS_WITH_MKL)

diff --git a/core/src/index/knowhere/CMakeLists.txt b/core/src/index/knowhere/CMakeLists.txt
@@ -1,35 +1,35 @@
 include_directories(${INDEX_SOURCE_DIR}/knowhere)
 include_directories(${INDEX_SOURCE_DIR}/thirdparty)
-include_directories(${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
+#include_directories(${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService)
 
-set(SPTAG_SOURCE_DIR ${INDEX_SOURCE_DIR}/thirdparty/SPTAG)
-file(GLOB HDR_FILES
-        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/*.h
-        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/Common/*.h
-        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/BKT/*.h
-        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/KDT/*.h
-        ${SPTAG_SOURCE_DIR}/AnnService/inc/Helper/*.h)
-file(GLOB SRC_FILES
-        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/*.cpp
-        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/Common/*.cpp
-        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/BKT/*.cpp
-        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/KDT/*.cpp
-        ${SPTAG_SOURCE_DIR}/AnnService/src/Helper/*.cpp)
+#set(SPTAG_SOURCE_DIR ${INDEX_SOURCE_DIR}/thirdparty/SPTAG)
+#file(GLOB HDR_FILES
+#        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/*.h
+#        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/Common/*.h
+#        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/BKT/*.h
+#        ${SPTAG_SOURCE_DIR}/AnnService/inc/Core/KDT/*.h
+#        ${SPTAG_SOURCE_DIR}/AnnService/inc/Helper/*.h)
+#file(GLOB SRC_FILES
+#        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/*.cpp
+#        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/Common/*.cpp
+#        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/BKT/*.cpp
+#        ${SPTAG_SOURCE_DIR}/AnnService/src/Core/KDT/*.cpp
+#        ${SPTAG_SOURCE_DIR}/AnnService/src/Helper/*.cpp)
 
-if (NOT TARGET SPTAGLibStatic)
-    add_library(SPTAGLibStatic STATIC ${SRC_FILES} ${HDR_FILES})
-endif ()
+#if (NOT TARGET SPTAGLibStatic)
+#    add_library(SPTAGLibStatic STATIC ${SRC_FILES} ${HDR_FILES})
+#endif ()
 
 set(external_srcs
-        knowhere/adapter/SptagAdapter.cpp
-        knowhere/adapter/VectorAdapter.cpp
+	#        knowhere/adapter/SptagAdapter.cpp
+	knowhere/adapter/VectorAdapter.cpp
         knowhere/common/Exception.cpp
         knowhere/common/Timer.cpp
         )
 
 set(index_srcs
         knowhere/index/preprocessor/Normalize.cpp
-        knowhere/index/vector_index/IndexSPTAG.cpp
+	#        knowhere/index/vector_index/IndexSPTAG.cpp
         knowhere/index/vector_index/IndexIDMAP.cpp
         knowhere/index/vector_index/IndexIVF.cpp
         knowhere/index/vector_index/helpers/SPTAGParameterMgr.cpp
@@ -46,7 +46,7 @@ set(index_srcs
         )
 
 set(depend_libs
-        SPTAGLibStatic
+	#        SPTAGLibStatic
         faiss
         gomp
         gfortran
@@ -106,11 +106,11 @@ target_link_libraries(
 set(INDEX_INCLUDE_DIRS
         ${INDEX_SOURCE_DIR}/knowhere
         ${INDEX_SOURCE_DIR}/thirdparty
-        ${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService
+	#        ${INDEX_SOURCE_DIR}/thirdparty/SPTAG/AnnService
         ${ARROW_INCLUDE_DIR}
         ${FAISS_INCLUDE_DIR}
         ${OPENBLAS_INCLUDE_DIR}
         ${LAPACK_INCLUDE_DIR}
         )
 
-set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)
+set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)