libfairseq2_cpp.so

ggml/Makefile

@@ -1,18 +1,10 @@
-build: build/src/libggml.so build/bin/unity
+build: build/src/libggml.so
 
 build/src/libggml.so: examples/unity/*.h examples/unity/*.cpp
 	mkdir -p build
 	cd build; cmake -DBUILD_SHARED_LIBS=On -DCMAKE_BUILD_TYPE=Debug ..
-	cd build; make -j4 ggml
+	cd build; make -j4 fairseq2_cpp
 	find build/ -iname '*.so'
 
-build/bin/unity: examples/unity/*.h examples/unity/*.cpp src/*
-	mkdir -p build
-	cd build; cmake ..
-	cd build; make -j4 unity
-
-run: build/bin/unity
-	$< --model examples/unity/models/unity-large/ggml-model.bin
-
 tests: build/src/libggml.so
 	pytest ./*.py -s

ggml/examples/unity/CMakeLists.txt

@@ -1,9 +1,9 @@
-# unity
+# fairseq2_cpp
 
-add_executable(unity unity.cpp)
-target_include_directories(unity PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-target_link_libraries(unity PRIVATE ggml common common-ggml kaldi-native-fbank)
-target_sources(unity
+add_library(fairseq2_cpp)
+target_include_directories(fairseq2_cpp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+target_link_libraries(fairseq2_cpp PRIVATE ggml kaldi-native-fbank)
+target_sources(fairseq2_cpp
     PRIVATE
         fairseq2.cpp
         model_loader.cpp

ggml/src/CMakeLists.txt

@@ -249,11 +249,6 @@ endif()
 add_library(${TARGET}
     ggml.c
     ggml-alloc.c
-    ../examples/unity/fairseq2.cpp
-    ../examples/unity/model_loader.cpp
-    ../examples/unity/unity.cpp
-    ../examples/common.cpp
-    ../examples/common-ggml.cpp
     ../include/ggml/ggml.h
     ../include/ggml/ggml-alloc.h
     ${GGML_CUDA_SOURCES}

ggml/third_party_ggml.py

@@ -102,8 +102,8 @@ def load_shared_library(base_path: Path, lib_base_name: str):
     )
 
 
-base_path = Path(__file__).parent.resolve() / "build/src"
-lib_base_name = "ggml"
+base_path = Path(__file__).parent.resolve() / "build/examples/unity"
+lib_base_name = "fairseq2_cpp"
 lib = load_shared_library(base_path, lib_base_name)
 
 #####################################################