Fix mac build error (#98)

Co-authored-by: CaiYudong <[email protected]>
milvus-io · Mar 18, 2022 · 51207f2 · 51207f2
1 parent 7e2d03f
commit 51207f2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/ut.yaml b/.github/workflows/ut.yaml
@@ -41,4 +41,8 @@ jobs:
           ./scripts/install_deps.sh
       - name: Run Unittest
         run: |
-          ./build.sh -t Release -u && output/unittest/faiss_test && output/unittest/test_knowhere
+          ./build.sh -t Release -u
+          if [[ -f "output/unittest/faiss_test" ]]; then
+            ./output/unittest/faiss_test
+          fi
+          ./output/unittest/test_knowhere
diff --git a/knowhere/CMakeLists.txt b/knowhere/CMakeLists.txt
@@ -214,7 +214,7 @@ if (MACOS)
         )
     endif ()
 
-    target_link_libraries(knowhere pthread)
+    target_link_libraries(knowhere pthread knowhere_utils)
     set(KNOWHERE_INCLUDE_DIRS ${KNOWHERE_SOURCE_DIR})
 endif()
 

diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
@@ -128,7 +128,6 @@ set( ALL_INDEXING_SRCS
         ${UTIL_SRCS}
         test_bruteforce.cpp
         test_common.cpp
-        test_customized_index.cpp
         test_structured_index_sort.cpp
         test_structured_index_flat.cpp
         )
@@ -139,6 +138,7 @@ if ( LINUX )
             test_annoy.cpp
             test_binaryidmap.cpp
             test_binaryivf.cpp
+            test_customized_index.cpp
             test_hnsw.cpp
             test_idmap.cpp
             test_instructionset.cpp

diff --git a/unittest/utils.h b/unittest/utils.h
@@ -19,13 +19,17 @@
 
 #include "knowhere/common/Dataset.h"
 #include "knowhere/common/Log.h"
+#ifdef __linux__
 #include "faiss/FaissHook.h"
+#endif
 
 class DataGen {
  public:
     DataGen() {
         std::string cpu_flag;
+#ifdef __linux__
         faiss::hook_init(cpu_flag);
+#endif
     }
 
  protected: