ggml : update cmake to build on macOS (facebookresearch#235)

* cmake : fix build on Mac OS * ggml : update readme
abizer · Dec 4, 2023 · 54dfed1 · 54dfed1
1 parent 82f9432
commit 54dfed1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/ggml/README.md b/ggml/README.md
@@ -11,14 +11,17 @@ To build the interactive console for S2TT & ASR,
 
 cd seamless_communication/ggml
 mkdir build; cd build
-cmake -DGGML_OPENBLAS=ON \
+cmake \
+    -DGGML_OPENBLAS=ON \
     -DBUILD_SHARED_LIBS=On \
 	  -DCMAKE_BUILD_TYPE=Release \
 	  -DCMAKE_CXX_FLAGS="-g2 -fno-omit-frame-pointer" \
     ..
 make -j4 unity # Interactive Console
 
 ```
+Note that `-DGGML_OPENBLAS=ON` is not necessary on macOS.
+
 For more build commands see [Makefile](Makefile). 
 
 ## CLI usage

diff --git a/ggml/examples/common.h b/ggml/examples/common.h
@@ -37,12 +37,8 @@ struct gpt_params {
     int32_t n_gpu_layers     = 0;
 };
 
-bool unity_params_parse(int argc, char ** argv, unity_params & params);
-
 bool gpt_params_parse(int argc, char ** argv, gpt_params & params);
 
-void unity_print_usage(int /*argc*/, char ** argv, const unity_params & params);
-
 void gpt_print_usage(int argc, char ** argv, const gpt_params & params);
 
 
@@ -179,4 +175,4 @@ struct sam_params {
 
 bool sam_params_parse(int argc, char ** argv, sam_params & params);
 
-void sam_print_usage(int argc, char ** argv, const sam_params & params);
+void sam_print_usage(int argc, char ** argv, const sam_params & params);
diff --git a/ggml/examples/unity/CMakeLists.txt b/ggml/examples/unity/CMakeLists.txt
@@ -9,9 +9,8 @@ target_sources(fairseq2_cpp
 )
 add_executable(unity unity.cpp)
 find_package(PkgConfig REQUIRED)
-pkg_check_modules(SNDFILE REQUIRED sndfile)
-target_include_directories(unity PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${SNDFILE_INCLUDE_DIRS})
-target_link_libraries(unity PRIVATE ggml ${SNDFILE_LIBRARIES})
+pkg_check_modules(SNDFILE REQUIRED IMPORTED_TARGET sndfile)
+target_link_libraries(unity PRIVATE ggml PkgConfig::SNDFILE)
 target_sources(unity
     PRIVATE
         fairseq2.cpp