Move cpp install into cmake file

Author: mreso

cpp/CMakeLists.txt

@@ -71,3 +71,5 @@ add_subdirectory(src/examples)
 add_subdirectory(test)
 
 FILE(COPY src/resources/logging.yaml DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
+
+install(SCRIPT "install.cmake")

cpp/build.sh

@@ -95,18 +95,6 @@ function build() {
   fi
 }
 
-function install_torchserve_cpp() {
-  TARGET_DIR=`python -c "import ts; from pathlib import Path; print(Path(ts.__file__).parent / 'cpp')"`
-
-  if [ -d $TARGET_DIR ]; then
-    rm -rf $TARGET_DIR
-  fi
-  mkdir $TARGET_DIR
-  cp -rp $BASE_DIR/_build/bin $TARGET_DIR/bin
-  cp -rp $BASE_DIR/_build/libs $TARGET_DIR/lib
-  cp -rp $BASE_DIR/_build/resources $TARGET_DIR/resources
-}
-
 # Parse args
 JOBS=8
 WITH_QUIC=false
@@ -168,4 +156,3 @@ cd $BASE_DIR
 git submodule update --init --recursive
 
 build
-install_torchserve_cpp

cpp/install.cmake

@@ -0,0 +1,14 @@
+execute_process(COMMAND python -c "import ts; from pathlib import Path; print(Path(ts.__file__).parent / 'cpp')"
+                OUTPUT_VARIABLE TARGET_DIR
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+message("Installing cpp backend into ${TARGET_DIR}")
+
+if(EXISTS ${TARGET_DIR})
+    execute_process(COMMAND rm -rf ${TARGET_DIR})
+endif()
+
+execute_process(COMMAND mkdir ${TARGET_DIR})
+execute_process(COMMAND cp -rp ${CMAKE_BINARY_DIR}/bin ${TARGET_DIR}/bin)
+execute_process(COMMAND cp -rp ${CMAKE_BINARY_DIR}/libs ${TARGET_DIR}/lib)
+execute_process(COMMAND cp -rp ${CMAKE_BINARY_DIR}/resources ${TARGET_DIR}/resources)

examples/cpp/babyllama/CMakeLists.txt

@@ -16,7 +16,7 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(tokenizer_bin stories15M_bin)
 
-add_library(llama2_c STATIC ../../../cpp/third-party/llama2.c/run.c)
+add_library(llama2_c STATIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../cpp/third-party/llama2.c/run.c)
 target_compile_options(llama2_c PRIVATE -Wall -Wextra -Ofast -fPIC)
 
 add_library(babyllama_handler SHARED src/baby_llama_handler.cc)