From 8695baebc01f5cc49fdf99865414c791ed541be7 Mon Sep 17 00:00:00 2001
From: ochafik <ochafik@google.com>
Date: Fri, 7 Jun 2024 00:21:01 +0100
Subject: [PATCH] update more names

---
 .devops/llama-cpp-clblast.srpm.spec | 4 ++--
 .devops/llama-cpp-cuda.srpm.spec    | 4 ++--
 .devops/llama-cpp.srpm.spec         | 4 ++--
 .devops/main-cuda.Dockerfile        | 2 +-
 .devops/main-intel.Dockerfile       | 2 +-
 .devops/main-rocm.Dockerfile        | 2 +-
 .devops/main-vulkan.Dockerfile      | 2 +-
 .devops/main.Dockerfile             | 2 +-
 README-sycl.md                      | 2 +-
 examples/main/CMakeLists.txt        | 3 ++-
 10 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.devops/llama-cpp-clblast.srpm.spec b/.devops/llama-cpp-clblast.srpm.spec
index 774f63ddd..dcf803cb4 100644
--- a/.devops/llama-cpp-clblast.srpm.spec
+++ b/.devops/llama-cpp-clblast.srpm.spec
@@ -36,8 +36,8 @@ make -j LLAMA_CLBLAST=1
 
 %install
 mkdir -p %{buildroot}%{_bindir}/
-cp -p main %{buildroot}%{_bindir}/llamaclblast
-cp -p server %{buildroot}%{_bindir}/llamaclblastserver
+cp -p llama %{buildroot}%{_bindir}/llamaclblast
+cp -p llama-server %{buildroot}%{_bindir}/llamaclblastserver
 cp -p simple %{buildroot}%{_bindir}/llamaclblastsimple
 
 mkdir -p %{buildroot}/usr/lib/systemd/system
diff --git a/.devops/llama-cpp-cuda.srpm.spec b/.devops/llama-cpp-cuda.srpm.spec
index ba9cb7cbb..cec6052fa 100644
--- a/.devops/llama-cpp-cuda.srpm.spec
+++ b/.devops/llama-cpp-cuda.srpm.spec
@@ -36,8 +36,8 @@ make -j LLAMA_CUDA=1
 
 %install
 mkdir -p %{buildroot}%{_bindir}/
-cp -p main %{buildroot}%{_bindir}/llamacppcuda
-cp -p server %{buildroot}%{_bindir}/llamacppcudaserver
+cp -p llama %{buildroot}%{_bindir}/llamacppcuda
+cp -p llama-server %{buildroot}%{_bindir}/llamacppcudaserver
 cp -p simple %{buildroot}%{_bindir}/llamacppcudasimple
 
 mkdir -p %{buildroot}/usr/lib/systemd/system
diff --git a/.devops/llama-cpp.srpm.spec b/.devops/llama-cpp.srpm.spec
index 1d9e4f425..6d9de60ad 100644
--- a/.devops/llama-cpp.srpm.spec
+++ b/.devops/llama-cpp.srpm.spec
@@ -38,8 +38,8 @@ make -j
 
 %install
 mkdir -p %{buildroot}%{_bindir}/
-cp -p main %{buildroot}%{_bindir}/llama
-cp -p server %{buildroot}%{_bindir}/llamaserver
+cp -p llama %{buildroot}%{_bindir}/llama
+cp -p llama-server %{buildroot}%{_bindir}/llamaserver
 cp -p simple %{buildroot}%{_bindir}/llamasimple
 
 mkdir -p %{buildroot}/usr/lib/systemd/system
diff --git a/.devops/main-cuda.Dockerfile b/.devops/main-cuda.Dockerfile
index d46d50e87..5ec554aea 100644
--- a/.devops/main-cuda.Dockerfile
+++ b/.devops/main-cuda.Dockerfile
@@ -23,7 +23,7 @@ ENV CUDA_DOCKER_ARCH=${CUDA_DOCKER_ARCH}
 # Enable CUDA
 ENV LLAMA_CUDA=1
 
-RUN make -j$(nproc) main
+RUN make -j$(nproc) llama
 
 FROM ${BASE_CUDA_RUN_CONTAINER} as runtime
 
diff --git a/.devops/main-intel.Dockerfile b/.devops/main-intel.Dockerfile
index c272b5b95..10283654a 100644
--- a/.devops/main-intel.Dockerfile
+++ b/.devops/main-intel.Dockerfile
@@ -23,7 +23,7 @@ RUN if [ "${LLAMA_SYCL_F16}" = "ON" ]; then \
         export OPT_SYCL_F16="-DLLAMA_SYCL_F16=ON"; \
     fi && \
     cmake -B build -DLLAMA_SYCL=ON -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx ${OPT_SYCL_F16} && \
-    cmake --build build --config Release --target llama
+    cmake --build build --config Release --target llama-bin
 
 FROM intel/oneapi-basekit:$ONEAPI_VERSION as runtime
 
diff --git a/.devops/main-rocm.Dockerfile b/.devops/main-rocm.Dockerfile
index dcaeb3e72..009ac826c 100644
--- a/.devops/main-rocm.Dockerfile
+++ b/.devops/main-rocm.Dockerfile
@@ -40,6 +40,6 @@ ENV LLAMA_HIPBLAS=1
 ENV CC=/opt/rocm/llvm/bin/clang
 ENV CXX=/opt/rocm/llvm/bin/clang++
 
-RUN make -j$(nproc) main
+RUN make -j$(nproc) llama
 
 ENTRYPOINT [ "/app/main" ]
diff --git a/.devops/main-vulkan.Dockerfile b/.devops/main-vulkan.Dockerfile
index b1446b034..6dc46bc62 100644
--- a/.devops/main-vulkan.Dockerfile
+++ b/.devops/main-vulkan.Dockerfile
@@ -15,7 +15,7 @@ RUN wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | apt-key
 WORKDIR /app
 COPY . .
 RUN cmake -B build -DLLAMA_VULKAN=1 && \
-    cmake --build build --config Release --target llama
+    cmake --build build --config Release --target llama-bin
 
 # Clean up
 WORKDIR /
diff --git a/.devops/main.Dockerfile b/.devops/main.Dockerfile
index 0f3b8b6a5..c5479800e 100644
--- a/.devops/main.Dockerfile
+++ b/.devops/main.Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /app
 
 COPY . .
 
-RUN make -j$(nproc) main
+RUN make -j$(nproc) llama
 
 FROM ubuntu:$UBUNTU_VERSION as runtime
 
diff --git a/README-sycl.md b/README-sycl.md
index 136a02c52..3dbe060e1 100644
--- a/README-sycl.md
+++ b/README-sycl.md
@@ -427,7 +427,7 @@ Otherwise, run the `win-build-sycl.bat` wrapper which encapsulates the former in
 
 *Notes:*
 
-- By default, calling `make` will build all target binary files. In case of a minimal experimental setup, the user can build the inference executable only through `make main`.
+- By default, calling `make` will build all target binary files. In case of a minimal experimental setup, the user can build the inference executable only through `make llama`.
 
 ### III. Run the inference
 
diff --git a/examples/main/CMakeLists.txt b/examples/main/CMakeLists.txt
index 852677321..5cdd90443 100644
--- a/examples/main/CMakeLists.txt
+++ b/examples/main/CMakeLists.txt
@@ -1,5 +1,6 @@
-set(TARGET llama)
+set(TARGET llama-bin)
 add_executable(${TARGET} main.cpp)
+set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME llama)
 install(TARGETS ${TARGET} RUNTIME)
 target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
 target_compile_features(${TARGET} PRIVATE cxx_std_11)