app : move licences to llama-app (#23824)

Signed-off-by: Adrien Gallouët <redacted>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index edd0ea1ded0018541a4c30c357195365fe03d026..9e7b1253c7264c63cf52a1ca3e58df81fc7f15a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,19 +222,6 @@ if (LLAMA_BUILD_APP)
     add_subdirectory(app)
 endif()
 
-# Automatically add all files from the 'licenses' directory
-file(GLOB EXTRA_LICENSES "${CMAKE_SOURCE_DIR}/licenses/LICENSE-*")
-
-foreach(FILE_PATH ${EXTRA_LICENSES})
-    get_filename_component(FILE_NAME "${FILE_PATH}" NAME)
-    string(REGEX REPLACE "^LICENSE-" "" NAME "${FILE_NAME}")
-    license_add_file("${NAME}" "${FILE_PATH}")
-endforeach()
-
-if (LLAMA_BUILD_COMMON)
-    license_generate(llama-common)
-endif()
-
 #
 # install
 #

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 6c53ce0e4e21004486fc5d25f42b634767503b47..3ce503955b369ea2ca0a47b4f78e218b6ee553f7 100644 (file)
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -15,6 +15,17 @@ target_link_libraries(${TARGET} PRIVATE
 )
 target_compile_features(${TARGET} PRIVATE cxx_std_17)
 
+# Automatically add all files from the 'licenses' directory
+file(GLOB EXTRA_LICENSES "${CMAKE_SOURCE_DIR}/licenses/LICENSE-*")
+
+foreach(FILE_PATH ${EXTRA_LICENSES})
+    get_filename_component(FILE_NAME "${FILE_PATH}" NAME)
+    string(REGEX REPLACE "^LICENSE-" "" NAME "${FILE_NAME}")
+    license_add_file("${NAME}" "${FILE_PATH}")
+endforeach()
+
+license_generate(${TARGET})
+
 if(LLAMA_TOOLS_INSTALL)
     install(TARGETS ${TARGET} RUNTIME)
 endif()

diff --git a/app/llama.cpp b/app/llama.cpp
index 0e932c3553796516e3c2516924cddd5c3032e2c5..d898bfdfb24dc91cc440da21d8d4881852e8cf5d 100644 (file)
--- a/app/llama.cpp
+++ b/app/llama.cpp
@@ -5,6 +5,9 @@
 #include <string>
 #include <vector>
 
+// embedded data generated by cmake
+extern const char * LICENSES[];
+
 // visible
 int llama_server(int argc, char ** argv);
 int llama_cli(int argc, char ** argv);
@@ -21,6 +24,7 @@ static const char * progname;
 
 static int help(int argc, char ** argv);
 static int version(int argc, char ** argv);
+static int licenses(int argc, char ** argv);
 
 struct command {
     const char * name;
@@ -40,6 +44,7 @@ static const command cmds[] = {
     {"quantize",      "Quantize a model",                                   {},           true,  llama_quantize     },
     {"perplexity",    "Compute model perplexity and KL divergence",         {},           true,  llama_perplexity   },
     {"version",       "Show version",                                       {},           false, version            },
+    {"licenses",      "Show third-party licenses",                          {"credits"},  false, licenses           },
     {"help",          "Show available commands",                            {},           false, help               },
 };
 
@@ -48,6 +53,13 @@ static int version(int argc, char ** argv) {
     return 0;
 }
 
+static int licenses(int argc, char ** argv) {
+    for (int i = 0; LICENSES[i]; ++i) {
+        printf("%s\n", LICENSES[i]);
+    }
+    return 0;
+}
+
 static int help(int argc, char ** argv) {
     const bool show_all = argc >= 2 && std::string(argv[1]) == "all";
 

diff --git a/common/arg.cpp b/common/arg.cpp
index f6fdd4fa63f7aad9addc6be0c3a301bc9b8e9ea0..51631765fa3a4b0a06639d78219ecde4caa6c00a 100644 (file)
--- a/common/arg.cpp
+++ b/common/arg.cpp
@@ -50,8 +50,6 @@
 
 #define LLAMA_MAX_URL_LENGTH 2084 // Maximum URL Length in Chrome: 2083
 
-extern const char * LICENSES[];
-
 using json = nlohmann::ordered_json;
 using namespace common_arg_utils;
 
@@ -1091,16 +1089,6 @@ common_params_context common_params_parser_init(common_params & params, llama_ex
             exit(0);
         }
     ));
-    add_opt(common_arg(
-        {"--license"},
-        "show source code license and dependencies",
-        [](common_params &) {
-            for (int i = 0; LICENSES[i]; ++i) {
-                printf("%s\n", LICENSES[i]);
-            }
-            exit(0);
-        }
-    ));
     add_opt(common_arg(
         {"-cl", "--cache-list"},
         "show list of models in cache",

diff --git a/tools/cli/README.md b/tools/cli/README.md
index 04aef018870625404eaa2512bf8538e487a86054..f34417a835d88e4619295bf6f36783628644686e 100644 (file)
--- a/tools/cli/README.md
+++ b/tools/cli/README.md
@@ -12,7 +12,6 @@
 | -------- | ----------- |
 | `-h, --help, --usage` | print usage and exit |
 | `--version` | show version and build info |
-| `--license` | show source code license and dependencies |
 | `-cl, --cache-list` | show list of models in cache |
 | `--completion-bash` | print source-able bash completion script for llama.cpp |
 | `-t, --threads N` | number of CPU threads to use during generation (default: -1)<br/>(env: LLAMA_ARG_THREADS) |

diff --git a/tools/completion/README.md b/tools/completion/README.md
index e8a1287f3a1e2a039eb11b06fd37e17afb1e8b34..bcaae18f376746ab5f6fe4af9719e975a3d7dd54 100644 (file)
--- a/tools/completion/README.md
+++ b/tools/completion/README.md
@@ -95,7 +95,6 @@ llama-completion.exe -m models\gemma-1.1-7b-it.Q4_K_M.gguf --ignore-eos -n -1
 | -------- | ----------- |
 | `-h, --help, --usage` | print usage and exit |
 | `--version` | show version and build info |
-| `--license` | show source code license and dependencies |
 | `-cl, --cache-list` | show list of models in cache |
 | `--completion-bash` | print source-able bash completion script for llama.cpp |
 | `-t, --threads N` | number of CPU threads to use during generation (default: -1)<br/>(env: LLAMA_ARG_THREADS) |

diff --git a/tools/server/README.md b/tools/server/README.md
index b975088e4ae9e93ee7eae051d2685785c1571600..7870e3091ea553902312234e6bae6a33b8bbbba3 100644 (file)
--- a/tools/server/README.md
+++ b/tools/server/README.md
@@ -33,7 +33,6 @@ For the full list of features, please refer to [server's changelog](https://gith
 | -------- | ----------- |
 | `-h, --help, --usage` | print usage and exit |
 | `--version` | show version and build info |
-| `--license` | show source code license and dependencies |
 | `-cl, --cache-list` | show list of models in cache |
 | `--completion-bash` | print source-able bash completion script for llama.cpp |
 | `-t, --threads N` | number of CPU threads to use during generation (default: -1)<br/>(env: LLAMA_ARG_THREADS) |