Replace main-cmake-pkg with simple-cmake-pkg

Author: bandoti

examples/main-cmake-pkg/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.12)
+project(llama-simple-cmake-pkg)
+
+set(TARGET llama-simple-cmake-pkg)
+
+find_package(Llama REQUIRED)
+
+add_executable(${TARGET} ${CMAKE_CURRENT_LIST_DIR}/../simple/simple.cpp)
+install(TARGETS ${TARGET} RUNTIME)
+target_link_libraries(${TARGET} PRIVATE llama ggml::all ${CMAKE_THREAD_LIBS_INIT})
+target_compile_features(${TARGET} PRIVATE cxx_std_17)

examples/main-cmake-pkg/README.md

@@ -0,0 +1,38 @@
+# llama.cpp/example/simple-cmake-pkg
+
+This program builds [simple](../simple) using a relocatable CMake package. It serves as an example of using the `find_package()` CMake command to conveniently include [llama.cpp](https://github.com/ggerganov/llama.cpp) in projects which live outside of the source tree.
+
+## Building
+
+Because this example is "outside of the source tree", it is important to first build/install llama.cpp using CMake. An example is provided here, but please see the [llama.cpp build instructions](../..) for more detailed build instructions.
+
+### Considerations
+
+When hardware acceleration libraries are used (e.g. CUDA, Metal, Vulkan, etc.), the appropriate dependencies will be searched for automatically. So, for example, when finding a package
+
+### Build llama.cpp and install to llama.cpp/inst
+
+```sh
+git clone https://github.com/ggerganov/llama.cpp
+cd llama.cpp
+mkdir build
+mkdir inst
+cmake -S . -B build
+cmake --build build
+cmake --install build --prefix inst
+```
+
+### Build simple-cmake-pkg
+
+```sh
+cd examples\simple-cmake-pkg
+mkdir build
+cmake -S . -B build -DCMAKE_PREFIX_PATH=../../inst/lib/cmake
+cmake --build build
+```
+
+### Run simple-cmake-pkg
+
+```sh
+./build/llama-simple-cmake-pkg -m ./models/llama-7b-v2/ggml-model-f16.gguf "Hello my name is"
+```

examples/main-cmake-pkg/.gitignore renamed to examples/simple-cmake-pkg/.gitignore

@@ -269,7 +269,7 @@ endif()
 # Create CMake package
 #
 
-# * Generate version info based on git commit.
+# Generate version info based on git commit.
 
 find_program(GIT_EXE NAMES git git.exe REQUIRED NO_CMAKE_FIND_ROOT_PATH)
 execute_process(COMMAND ${GIT_EXE} rev-list --count HEAD
@@ -288,7 +288,7 @@ execute_process(COMMAND ${GIT_EXE} rev-parse --short HEAD
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-# * Capture variables prefixed with GGML_.
+# Capture variables prefixed with GGML_.
 
 set(variable_set_statements
 "
@@ -297,6 +297,8 @@ set(variable_set_statements
 
 ")
 
+set(GGML_SHARED_LIB ${BUILD_SHARED_LIBS})
+
 get_cmake_property(all_variables VARIABLES)
 foreach(variable_name IN LISTS all_variables)
     if(variable_name MATCHES "^GGML_")
@@ -310,7 +312,7 @@ endforeach()
 
 set(GGML_VARIABLES_EXPANDED ${variable_set_statements})
 
-# * Create the CMake package and set install location.
+# Create the CMake package and set install location.
 
 set(GGML_INSTALL_VERSION 0.0.${GGML_BUILD_NUMBER})
 set(GGML_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header  files")

examples/simple-cmake-pkg/CMakeLists.txt

@@ -17,7 +17,7 @@ find_library(GGML_LIBRARY ggml
 add_library(ggml::ggml UNKNOWN IMPORTED)
 set_target_properties(ggml::ggml
     PROPERTIES
-        INTERFACE_LINK_LIBRARIES "${GGML_LIBRARY}")
+        IMPORTED_LOCATION "${GGML_LIBRARY}")
 
 find_library(GGML_BASE_LIBRARY ggml-base
     REQUIRED
@@ -27,7 +27,7 @@ find_library(GGML_BASE_LIBRARY ggml-base
 add_library(ggml::ggml-base UNKNOWN IMPORTED)
 set_target_properties(ggml::ggml-base
     PROPERTIES
-        INTERFACE_LINK_LIBRARIES "${GGML_BASE_LIBRARY}")
+        IMPORTED_LOCATION "${GGML_BASE_LIBRARY}")
 
 if (NOT GGML_SHARED_LIB)
     if (APPLE AND GGML_ACCELERATE)
@@ -91,7 +91,8 @@ endif()
 
 set(_ggml_all_targets "")
 foreach(_ggml_backend ${GGML_AVAILABLE_BACKENDS})
-    string(replace "-" "_" _ggml_backend_pfx "${_ggml_backend}")
+    string(REPLACE "-" "_" _ggml_backend_pfx "${_ggml_backend}")
+    string(TOUPPER "${_ggml_backend_pfx}" _ggml_backend_pfx)
 
     find_library(${_ggml_backend_pfx}_LIBRARY ${_ggml_backend}
         REQUIRED
@@ -105,7 +106,7 @@ foreach(_ggml_backend ${GGML_AVAILABLE_BACKENDS})
         PROPERTIES
             INTERFACE_INCLUDE_DIRECTORIES "${GGML_INCLUDE_DIR}"
             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-            IMPORTED_LOCATION "${_ggml_backend_pfx}_LIBRARY"
+            IMPORTED_LOCATION "${${_ggml_backend_pfx}_LIBRARY}"
             INTERFACE_COMPILE_FEATURES cxx_std_17
             POSITION_INDEPENDENT_CODE ON)