Convert llama2.c submodule into fetch_content

Author: mreso

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "third_party/google/rpc"]
 	path = third_party/google/rpc
 	url = https://github.com/googleapis/googleapis.git
-[submodule "cpp/third-party/llama2.c"]
-	path = cpp/third-party/llama2.c
-	url = https://github.com/karpathy/llama2.c

cpp/third-party/llama2.c

@@ -14,8 +14,6 @@ add_custom_command(
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/aot_compile_export.py
 )
 
-# set(TOKENZIER_CPP_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../cpp/third-party/tokenizers-cpp)
-# add_subdirectory(${TOKENZIER_CPP_PATH} tokenizers EXCLUDE_FROM_ALL)
 add_library(bert_handler SHARED src/bert_handler.cc bert-seq.so)
 target_include_directories(bert_handler PRIVATE)
 target_link_libraries(bert_handler PRIVATE ts_backends_core ts_utils ${TORCH_LIBRARIES} tokenizers_cpp)

examples/cpp/aot_inductor/bert/CMakeLists.txt

@@ -22,7 +22,7 @@ FetchContent_MakeAvailable(stories15M_pt)
 
 add_custom_command(
     OUTPUT stories15M.so
-    COMMAND PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/../../../../cpp/third-party/llama2.so/ python ${CMAKE_CURRENT_SOURCE_DIR}/compile.py --checkpoint ${CMAKE_CURRENT_BINARY_DIR}/\'stories15M.pt?download=true\' ${CMAKE_CURRENT_BINARY_DIR}/stories15M.so
+    COMMAND PYTHONPATH=${llama2_so_SOURCE_DIR} python ${CMAKE_CURRENT_SOURCE_DIR}/compile.py --checkpoint ${CMAKE_CURRENT_BINARY_DIR}/\'stories15M.pt?download=true\' ${CMAKE_CURRENT_BINARY_DIR}/stories15M.so
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/compile.py
 )
 

examples/cpp/aot_inductor/llama2/CMakeLists.txt

@@ -1,4 +1,9 @@
-include(FetchContent)
+
+FetchContent_Declare(
+  llama2_c
+  GIT_REPOSITORY https://github.com/karpathy/llama2.c
+  GIT_TAG d986206
+)
 
 FetchContent_Declare(
     stories15M_bin
@@ -14,9 +19,9 @@ FetchContent_Declare(
   DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/
 )
 
-FetchContent_MakeAvailable(tokenizer_bin stories15M_bin)
+FetchContent_MakeAvailable(tokenizer_bin stories15M_bin llama2_c)
 
-add_library(llama2_c STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../cpp/third-party/llama2.c/run.c)
+add_library(llama2_c STATIC ${llama2_c_SOURCE_DIR}/run.c)
 target_compile_options(llama2_c PRIVATE -Wall -Wextra -Ofast -fPIC)
 
 add_library(babyllama_handler SHARED src/baby_llama_handler.cc)