This commit changes the naming conventioins of the shared object file… (ggml-org#48)

* This commit changes the naming conventioins of the shared object files. This modificatioin will produce libfalcon.so instead of liblibfalcon.so which would create downstreem bugs.

* This commit renames the falcon.cpp and falcon.h files the libfalcon.cpp and libfalcon.h. It produces shared object files that maintain the standard file format of libfalcon.so

Author: sirajperson

CMakeLists.txt

@@ -491,7 +491,7 @@ target_link_libraries(llama PRIVATE
     )
 
 # falcon
-add_library(libfalcon
+add_library(falcon
     libfalcon.cpp
     libfalcon.h
     llama-util.h
@@ -500,9 +500,9 @@ add_library(cmpnct_unicode
     cmpnct_unicode.cpp
     cmpnct_unicode.h
     )
-target_include_directories(libfalcon PUBLIC .)
-target_compile_features(libfalcon PUBLIC cxx_std_11) # don't bump
-target_link_libraries(libfalcon PRIVATE
+target_include_directories(falcon PUBLIC .)
+target_compile_features(falcon PUBLIC cxx_std_11) # don't bump
+target_link_libraries(falcon PRIVATE
     cmpnct_unicode
     ggml
     ${LLAMA_EXTRA_LIBS}
@@ -517,10 +517,10 @@ if (BUILD_SHARED_LIBS)
     endif()
 
     # falcon
-    set_target_properties(libfalcon PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_compile_definitions(libfalcon PRIVATE LLAMA_SHARED LLAMA_BUILD)
+    set_target_properties(falcon PROPERTIES POSITION_INDEPENDENT_CODE ON)
+    target_compile_definitions(falcon PRIVATE LLAMA_SHARED LLAMA_BUILD)
     if (LLAMA_METAL)
-        set_target_properties(libfalcon PROPERTIES RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/ggml-metal.metal")
+        set_target_properties(falcon PROPERTIES RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/ggml-metal.metal")
     endif()
     #
 endif()
@@ -531,7 +531,7 @@ if (GGML_SOURCES_CUDA)
     set_property(TARGET ggml  PROPERTY CUDA_SELECT_NVCC_ARCH_FLAGS "Auto")
     set_property(TARGET llama PROPERTY CUDA_ARCHITECTURES OFF)
     # falcon
-    set_property(TARGET libfalcon  PROPERTY CUDA_ARCHITECTURES OFF)
+    set_property(TARGET falcon  PROPERTY CUDA_ARCHITECTURES OFF)
 
 endif()
 

Makefile

@@ -254,7 +254,7 @@ llama.o: llama.cpp ggml.h ggml-cuda.h llama.h llama-util.h
 cmpnct_unicode.o: cmpnct_unicode.cpp cmpnct_unicode.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-libfalcon.o: libfalcon.cpp ggml.h ggml-cuda.h libfalcon.h llama-util.h cmpnct_unicode.h
+falcon.o: falcon.cpp ggml.h ggml-cuda.h falcon.h llama-util.h cmpnct_unicode.h
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 common.o: examples/common.cpp examples/common.h
@@ -285,17 +285,17 @@ simple: examples/simple/simple.cpp                            build-info.h ggml.
 quantize: examples/quantize/quantize.cpp                      build-info.h ggml.o llama.o $(OBJS)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
 
-falcon_main: examples/falcon/falcon_main.cpp                                  build-info.h ggml.o libfalcon.o libfalcon.o cmpnct_unicode.o falcon_common.o $(OBJS)
+falcon_main: examples/falcon/falcon_main.cpp                                  build-info.h ggml.o falcon.o falcon.o cmpnct_unicode.o falcon_common.o $(OBJS)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
 	@echo
 	@echo '====  Run ./falcon_main -h for help.  ===='
 	@echo 'Read the readme file for important parameters and usage'
 	@echo
 
-falcon_quantize: examples/falcon_quantize/quantize.cpp                      build-info.h ggml.o libfalcon.o libfalcon.o cmpnct_unicode.o  $(OBJS)
+falcon_quantize: examples/falcon_quantize/quantize.cpp                      build-info.h ggml.o falcon.o falcon.o cmpnct_unicode.o  $(OBJS)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
 
-falcon_perplexity: examples/falcon_perplexity/falcon_perplexity.cpp                build-info.h ggml.o libfalcon.o libfalcon.o falcon_common.o cmpnct_unicode.o $(OBJS)
+falcon_perplexity: examples/falcon_perplexity/falcon_perplexity.cpp                build-info.h ggml.o falcon.o falcon.o falcon_common.o cmpnct_unicode.o $(OBJS)
 	$(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS)
 
 

examples/CMakeLists.txt

@@ -39,7 +39,7 @@ endif()
 
 target_include_directories(${FALCON_TARGET} PUBLIC .)
 target_compile_features(${FALCON_TARGET} PUBLIC cxx_std_11)
-target_link_libraries(${FALCON_TARGET} PRIVATE libfalcon)
+target_link_libraries(${FALCON_TARGET} PRIVATE falcon)
 
 # examples
 

examples/falcon/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET falcon_main)
 add_executable(${TARGET} falcon_main.cpp)
-target_link_libraries(${TARGET} PRIVATE falcon_common libfalcon ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET} PRIVATE falcon_common falcon ${CMAKE_THREAD_LIBS_INIT})
 target_compile_features(${TARGET} PRIVATE cxx_std_11)
 if(TARGET BUILD_INFO)
   add_dependencies(${TARGET} BUILD_INFO)

examples/falcon_common.h

@@ -145,4 +145,4 @@ void console_init(console_state & con_st);
 void console_cleanup(console_state & con_st);
 void console_set_color(console_state & con_st, console_color_t color);
 bool console_readline(console_state & con_st, std::string & line);
-#endif
+#endif

examples/falcon_perplexity/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET falcon_perplexity)
 add_executable(${TARGET} falcon_perplexity.cpp)
-target_link_libraries(${TARGET} PRIVATE falcon_common libfalcon ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET} PRIVATE falcon_common falcon ${CMAKE_THREAD_LIBS_INIT})
 target_compile_features(${TARGET} PRIVATE cxx_std_11)
 if(TARGET BUILD_INFO)
   add_dependencies(${TARGET} BUILD_INFO)

examples/falcon_quantize/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET falcon_quantize)
 add_executable(${TARGET} quantize.cpp)
-target_link_libraries(${TARGET} PRIVATE libfalcon ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(${TARGET} PRIVATE falcon ${CMAKE_THREAD_LIBS_INIT})
 target_compile_features(${TARGET} PRIVATE cxx_std_11)
 if(TARGET BUILD_INFO)
   add_dependencies(${TARGET} BUILD_INFO)