@FIR-1035: Bring llama.cpp to latest and add dependencies for curl and openssl.

This change brings in latest llama.cpp and adds
1. Open SSL
2. Lib CURL dependencies

The arm tool chain also has been updated with following libraries in /proj/rel/sw area

[atrivedi@ws01 workspace]$ ls /proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/lib -lt
total 41840
-rw-r--r-- 1 atrivedi tsiusers  730992 Oct 29 06:38 libzstd.so.1.4.8
-rw-r--r-- 1 atrivedi tsiusers  730992 Oct 29 06:38 libzstd.so.1
-rwxr-xr-x 1 atrivedi tsiusers   96248 Oct 29 06:38 libz.so.1.3.1
-rwxr-xr-x 1 atrivedi tsiusers   96248 Oct 29 06:38 libz.so.1
-rwxr-xr-x 1 atrivedi tsiusers   96248 Oct 29 06:38 libz.so
-rw-r--r-- 1 atrivedi tsiusers  128580 Oct 29 06:38 libz.a
-rwxr-xr-x 1 atrivedi tsiusers 2033616 Oct 29 06:38 libunistring.so.5.2.0
-rwxr-xr-x 1 atrivedi tsiusers 2033616 Oct 29 06:38 libunistring.so.5
-rwxr-xr-x 1 atrivedi tsiusers 2033616 Oct 29 06:38 libunistring.so
-rwxr-xr-x 1 atrivedi tsiusers 1196040 Oct 29 06:38 libssl.so.3
-rw-r--r-- 1 atrivedi tsiusers  132968 Oct 29 06:38 libidn2.so.0.4.0
-rw-r--r-- 1 atrivedi tsiusers  132968 Oct 29 06:38 libidn2.so.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.7.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.6.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.5.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.4.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.3.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.2.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.1.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.4.0.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl.so.3
-rwxr-xr-x 1 atrivedi tsiusers  666912 Oct 29 06:38 libcurl.so
-rw-r--r-- 1 atrivedi tsiusers    1066 Oct 29 06:38 libcurl.la
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.8.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.7.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.6.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.5.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.4.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.3.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.2.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.1.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.4.0.0
-rwxr-xr-x 1 atrivedi tsiusers 1195448 Oct 29 06:38 libcurl-compat.so.3
-rw-r--r-- 1 atrivedi tsiusers  776948 Oct 29 06:38 libcurl.a
-rwxr-xr-x 1 atrivedi tsiusers 6302760 Oct 29 06:38 libcrypto.so.3
-rw-r--r-- 1 atrivedi tsiusers 2612824 Oct 29 06:38 libcrypto.so.1.1

Author: atrivedi-tsavoritesi

CMakeLists.txt

@@ -49,6 +49,7 @@ if (GGML_TSAVORITE)
     set(GGML_TSAVORITE_TARGET "${GGML_TSAVORITE_TARGET}" CACHE STRING "Target for tsavorite")
     set (TSAVORITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/ggml/src/ggml-tsavorite/include)
 
+    include_directories($ENV{TSAVORITE_SYSROOT_INCLUDE_DIR})
     include_directories(${TSAVORITE_INCLUDE_DIR})
     include_directories(${MLIR_COMPILER_DIR}/include/runtime/shim)
     include_directories(${RUNTIME_DIR}/include)

common/CMakeLists.txt

@@ -176,6 +176,9 @@ target_compile_features   (${TARGET} PUBLIC cxx_std_17)
 if (GGML_TSAVORITE)
     if (${GGML_TSAVORITE_TARGET} STREQUAL fpga)
         target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} ${TLIBS} PUBLIC llama Threads::Threads)
+	set(SYSROOT_PATH_FOR_LIBRARIES $ENV{CMAKE_FIND_ROOT_PATH}/lib)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${SYSROOT_PATH_FOR_LIBRARIES} -Wl,-rpath-link,${SYSROOT_PATH_FOR_LIBRARIES}")
+	target_link_directories(${TARGET} PRIVATE ${SYSROOT_PATH_FOR_LIBRARIES})
     else()
         target_link_libraries     (${TARGET} PRIVATE ${LLAMA_COMMON_EXTRA_LIBS} PUBLIC llama Threads::Threads)
     endif()

examples/CMakeLists.txt

@@ -12,8 +12,10 @@ llama_add_compile_flags()
 
 # examples
 
+#if (NOT DEFINED GGML_TSAVORITE)
 if (EMSCRIPTEN)
 else()
+    if (NOT DEFINED GGML_TSAVORITE) 
     add_subdirectory(batched)
     add_subdirectory(embedding)
     add_subdirectory(eval-callback)
@@ -26,7 +28,9 @@ else()
     add_subdirectory(passkey)
     add_subdirectory(retrieval)
     add_subdirectory(save-load-state)
+    endif()
     add_subdirectory(simple)
+    if (NOT DEFINED GGML_TSAVORITE)
     add_subdirectory(simple-chat)
     add_subdirectory(speculative)
     add_subdirectory(speculative-simple)
@@ -41,4 +45,6 @@ else()
             add_subdirectory(sycl)
         endif()
     endif()
+    endif()
 endif()
+#endif()

pocs/CMakeLists.txt

@@ -6,9 +6,11 @@ find_package(Threads REQUIRED)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
+if (NOT DEFINED GGML_TSAVORITE)
 if (EMSCRIPTEN)
 else()
     if (NOT GGML_BACKEND_DL)
         add_subdirectory(vdot)
     endif()
 endif()
+endif()

tests/CMakeLists.txt

@@ -108,6 +108,8 @@ function(llama_build_and_test source)
     set_property(TEST ${TEST_TARGET} PROPERTY LABELS ${LLAMA_TEST_LABEL})
 endfunction()
 
+if (NOT DEFINED GGML_TSAVORITE)
+
 # build test-tokenizer-0 target once and add many tests
 llama_build(test-tokenizer-0.cpp)
 
@@ -125,6 +127,8 @@ llama_test(test-tokenizer-0 NAME test-tokenizer-0-qwen2             ARGS ${PROJE
 llama_test(test-tokenizer-0 NAME test-tokenizer-0-refact            ARGS ${PROJECT_SOURCE_DIR}/models/ggml-vocab-refact.gguf)
 llama_test(test-tokenizer-0 NAME test-tokenizer-0-starcoder         ARGS ${PROJECT_SOURCE_DIR}/models/ggml-vocab-starcoder.gguf)
 
+endif()
+
 if (NOT WIN32)
     llama_test_cmd(
         ${CMAKE_CURRENT_SOURCE_DIR}/test-tokenizers-repo.sh
@@ -138,6 +142,7 @@ if (LLAMA_LLGUIDANCE)
     llama_build_and_test(test-grammar-llguidance.cpp ARGS ${PROJECT_SOURCE_DIR}/models/ggml-vocab-llama-bpe.gguf)
 endif ()
 
+if (NOT DEFINED GGML_TSAVORITE)
 if (NOT WIN32 OR NOT BUILD_SHARED_LIBS)
     # these tests are disabled on Windows because they use internal functions not exported with LLAMA_API (when building with shared libraries)
     llama_build_and_test(test-sampling.cpp)
@@ -213,7 +218,6 @@ if (NOT GGML_BACKEND_DL)
     llama_build_and_test(test-quantize-perf.cpp)
     llama_build_and_test(test-rope.cpp)
 endif()
-
 # libmtmd
 set(LLAMA_TEST_NAME test-mtmd-c-api)
 llama_build_and_test(test-mtmd-c-api.c)
@@ -225,3 +229,4 @@ add_executable(${TEST_TARGET} test-c.c)
 target_link_libraries(${TEST_TARGET} PRIVATE ${TLIBS} llama stdc++)
 llama_build_and_test(test-alloc.cpp)
 target_include_directories(test-alloc PRIVATE ${PROJECT_SOURCE_DIR}/ggml/src)
+endif()

tools/CMakeLists.txt

@@ -14,11 +14,14 @@ llama_add_compile_flags()
 
 if (EMSCRIPTEN)
 else()
+if (NOT DEFINED GGML_TSAVORITE)
     add_subdirectory(batched-bench)
     add_subdirectory(gguf-split)
     add_subdirectory(imatrix)
     add_subdirectory(llama-bench)
+endif()
     add_subdirectory(main)
+if (NOT DEFINED GGML_TSAVORITE)
     add_subdirectory(perplexity)
     add_subdirectory(quantize)
     if (LLAMA_BUILD_SERVER)
@@ -35,5 +38,6 @@ else()
         # these examples use the backends directly and cannot be built with dynamic loading
         add_subdirectory(cvector-generator)
         add_subdirectory(export-lora)
+	endif()
     endif()
 endif()

tools/main/CMakeLists.txt

@@ -1,6 +1,13 @@
 set(TARGET llama-cli)
 add_executable(${TARGET} main.cpp)
 target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT})
+if (GGML_TSAVORITE)
+if (${GGML_TSAVORITE_TARGET} STREQUAL fpga)
+	set(SYSROOT_PATH_FOR_LIBRARIES $ENV{CMAKE_FIND_ROOT_PATH}/lib)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${SYSROOT_PATH_FOR_LIBRARIES} -Wl,-rpath-link,${SYSROOT_PATH_FOR_LIBRARIES}")
+	target_link_directories(${TARGET} PRIVATE ${SYSROOT_PATH_FOR_LIBRARIES})
+endif()
+endif()
 target_compile_features(${TARGET} PRIVATE cxx_std_17)
 
 if(LLAMA_TOOLS_INSTALL)

tsi-pkg-build.sh

@@ -1,11 +1,19 @@
 
+
+# Steps to merge the branch to latest
+#git clone [email protected]:tsisw/llama.cpp.git
+#git remote add upstream https://github.com/ggml-org/llama.cpp.git
+#git fetch upstream
+#git checkout master
+#git merge upstream/master
+
 set -e
 
 #Ensure prerequisites are met as follows
 echo 'updating submodule'
 git submodule update --recursive --init
 cd ggml-tsi-kernel/
-module load tsi4 gcc/13.3.0
+module load gcc/13.3.0
 export MLIR_SDK_VERSION=/proj/rel/sw/sdk-r.0.2.0
 echo 'creating python virtual env'
 /proj/local/Python-3.10.12/bin/python3 -m venv blob-creation
@@ -38,11 +46,11 @@ cd ../../
 echo 'building llama.cp, ggml for tsavorite  and other binary for posix'
 if [ "$(echo "$1" | tr '[:upper:]' '[:lower:]')" = "release" ];
 then
-  cmake -B build-posix -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=posix -DCMAKE_C_FLAGS="-DGGML_PERF_RELEASE -DGGML_TARGET_POSIX -DGGML_TSAVORITE"   -DCMAKE_CXX_FLAGS="-DGGML_PERF_RELEASE -DGGML_TARGET_POSIX -DGGML_TSAVORITE"
+  cmake -B build-posix -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=posix -DCMAKE_C_FLAGS="-DGGML_PERF_RELEASE -DGGML_TARGET_POSIX -DGGML_TSAVORITE" -DCMAKE_CXX_FLAGS="-DGGML_PERF_RELEASE -DGGML_TARGET_POSIX -DGGML_TSAVORITE"
 elif [ "$(echo "$1" | tr '[:upper:]' '[:lower:]')" = "debug" ]; then
-  cmake -B build-posix -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=posix -DCMAKE_C_FLAGS="-DGGML_PERF_DETAIL -DGGML_TARGET_POSIX -DGGML_TSAVORITE"   -DCMAKE_CXX_FLAGS="-DGGML_PERF_DETAIL -DGGML_TARGET_POSIX -DGGML_TSAVORITE"
+  cmake -B build-posix -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=posix -DCMAKE_C_FLAGS="-DGGML_PERF_DETAIL -DGGML_TARGET_POSIX -DGGML_TSAVORITE" -DCMAKE_CXX_FLAGS="-DGGML_PERF_DETAIL -DGGML_TARGET_POSIX -DGGML_TSAVORITE"
 else
-  cmake -B build-posix -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=posix -DCMAKE_C_FLAGS="-DGGML_PERF -DGGML_TARGET_POSIX -DGGML_TSAVORITE"   -DCMAKE_CXX_FLAGS="-DGGML_PERF -DGGML_TARGET_POSIX -DGGML_TSAVORITE"
+  cmake -B build-posix -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=posix -DCMAKE_C_FLAGS="-DGGML_PERF -DGGML_TARGET_POSIX -DGGML_TSAVORITE" -DCMAKE_CXX_FLAGS="-DGGML_PERF -DGGML_TARGET_POSIX -DGGML_TSAVORITE"
 fi
 
 cmake --build build-posix --config Release
@@ -73,14 +81,15 @@ chmod +x build-posix/bin/llama-cli
 echo 'building llama.cp, ggml for tsavorite  and other binary for fpga'
 export CC="/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-gcc"
 export CXX="/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-g++"
-
+export CMAKE_FIND_ROOT_PATH=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/
+export TSAVORITE_SYSROOT_INCLUDE_DIR=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/include/
 if [ "$(echo "$1" | tr '[:upper:]' '[:lower:]')" = "release" ];
 then
-  cmake -B build-fpga -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=fpga -DCMAKE_C_FLAGS="-DGGML_PERF_RELEASE"   -DCMAKE_CXX_FLAGS="-DGGML_PERF_RELEASE"
+  cmake -B build-fpga -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=fpga -DCMAKE_C_FLAGS="-DGGML_PERF_RELEASE"   -DCMAKE_CXX_FLAGS="-DGGML_PERF_RELEASE" -DCURL_INCLUDE_DIR=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/include  -DCURL_LIBRARY=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/lib/libcurl.so
 elif [ "$(echo "$1" | tr '[:upper:]' '[:lower:]')" = "debug" ]; then
-  cmake -B build-fpga -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=fpga -DCMAKE_C_FLAGS="-DGGML_PERF_DETAIL"   -DCMAKE_CXX_FLAGS="-DGGML_PERF_DETAIL"
+  cmake -B build-fpga -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=fpga -DCMAKE_C_FLAGS="-DGGML_PERF_DETAIL"   -DCMAKE_CXX_FLAGS="-DGGML_PERF_DETAIL" -DCURL_INCLUDE_DIR=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/include  -DCURL_LIBRARY=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/lib/libcurl.so
 else
-  cmake -B build-fpga -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=fpga -DCMAKE_C_FLAGS="-DGGML_PERF"   -DCMAKE_CXX_FLAGS="-DGGML_PERF"
+  cmake -B build-fpga -DGGML_TSAVORITE=ON -DGGML_TSAVORITE_TARGET=fpga -DCMAKE_C_FLAGS="-DGGML_PERF"   -DCMAKE_CXX_FLAGS="-DGGML_PERF" -DCURL_INCLUDE_DIR=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/include  -DCURL_LIBRARY=/proj/rel/sw/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-linux-gnu/lib/libcurl.so
 fi
 
 cmake --build build-fpga --config Release