From f9c2155158c4f71e9a30f65e43bbf513873b66af Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Fri, 20 Sep 2024 15:45:22 +0200
Subject: [PATCH] squash! baby-llama : rename llama_layer to baby_llama_layer

Use an unnamed namespace to make identifiers unique to the translation
unit.
---
 examples/baby-llama/baby-llama.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/examples/baby-llama/baby-llama.cpp b/examples/baby-llama/baby-llama.cpp
index 28a40dde1..ebce9a997 100644
--- a/examples/baby-llama/baby-llama.cpp
+++ b/examples/baby-llama/baby-llama.cpp
@@ -11,6 +11,8 @@
 #pragma warning(disable: 4244 4267) // possible loss of data
 #endif
 
+namespace {
+
 #ifdef LLAMA_DEFAULT_RMS_EPS
 constexpr float rms_norm_eps = LLAMA_DEFAULT_RMS_EPS;
 #else
@@ -105,7 +107,7 @@ struct llama_hparams_lora {
     }
 };
 
-struct gpt_layer {
+struct llama_layer {
     // normalization
     struct ggml_tensor * attention_norm;
 
@@ -169,7 +171,7 @@ struct llama_model {
     struct ggml_tensor * norm;
     struct ggml_tensor * output;
 
-    std::vector<gpt_layer> layers;
+    std::vector<llama_layer> layers;
 };
 
 struct llama_model_lora {
@@ -1432,7 +1434,7 @@ static struct ggml_tensor * cross_entropy_loss(
                                 ggml_new_f32(ctx, eps)))))));
 }
 
-int main(int argc, char ** argv) {
+int baby_llama_main(int argc, char ** argv) {
     if (argc < 1) {
         fprintf(stderr, "usage: %s\n", argv[0]);
 
@@ -1637,3 +1639,9 @@ int main(int argc, char ** argv) {
 
     return 0;
 }
+
+}
+
+int main(int argc, char ** argv) {
+    return baby_llama_main(argc, argv);
+}