linux build

locaal-ai · Oct 23, 2023 · c1d9497 · c1d9497
1 parent 0392ea8
commit c1d9497
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 30 deletions.
diff --git a/cmake/BuildCTranslate2.cmake b/cmake/BuildCTranslate2.cmake
@@ -1,13 +1,13 @@
 # build the CTranslate2 library from source https://github.com/OpenNMT/CTranslate2.git
 
 include(ExternalProject)
-include(FetchContent)
 
 set(CT2_VERSION "3.20.0")
 set(CT2_URL "https://github.com/OpenNMT/CTranslate2.git")
 
 if(WIN32)
   # Build with OpenBLAS
+  include(FetchContent)
   set(OpenBLAS_URL "https://github.com/xianyi/OpenBLAS/releases/download/v0.3.24/OpenBLAS-0.3.24-x64.zip")
   set(OpenBLAS_SHA256 "6335128ee7117ea2dd2f5f96f76dafc17256c85992637189a2d5f6da0c608163")
   FetchContent_Declare(
@@ -22,31 +22,34 @@ if(WIN32)
   set_target_properties(openblas PROPERTIES IMPORTED_LOCATION ${OpenBLAS_DIR}/lib/libopenblas.dll.a)
   install(FILES ${OpenBLAS_DIR}/bin/libopenblas.dll DESTINATION "obs-plugins/64bit")
 
-  set(EXTRA_CT2_CMAKE_ARGS
-      -DOPENBLAS_INCLUDE_DIR=${OPENBLAS_INCLUDE_DIR} -DOPENBLAS_LIBRARY=${OpenBLAS_DIR}/lib/libopenblas.dll.a
-      -DWITH_OPENBLAS=ON -DOPENMP_RUNTIME=COMP)
-
-  set(CT2_LIB_INSTALL_LOCATION bin/${CMAKE_SHARED_LIBRARY_PREFIX}ctranslate2${CMAKE_SHARED_LIBRARY_SUFFIX})
+  set(CT2_OPENBLAS_CMAKE_ARGS -DOPENBLAS_INCLUDE_DIR=${OPENBLAS_INCLUDE_DIR}
+                              -DOPENBLAS_LIBRARY=${OpenBLAS_DIR}/lib/libopenblas.dll.a -DWITH_OPENBLAS=ON)
 else()
-  set(EXTRA_CT2_CMAKE_ARGS -DWITH_OPENBLAS=OFF -DOPENMP_RUNTIME=NONE)
-  set(CT2_LIB_INSTALL_LOCATION lib/${CMAKE_SHARED_LIBRARY_PREFIX}ctranslate2${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(CT2_OPENBLAS_CMAKE_ARGS -DWITH_OPENBLAS=OFF)
 endif()
 
-if(APPLE)
-  set(CT2_CMAKE_PLATFORM_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_SHARED_LIBS=OFF -DWITH_ACCELERATE=ON)
+if(UNIX)
+  if(APPLE)
+    set(CT2_CMAKE_PLATFORM_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_SHARED_LIBS=OFF -DWITH_ACCELERATE=ON
+                                   -DOPENMP_RUNTIME=NONE)
+  else()
+    set(CT2_CMAKE_PLATFORM_OPTIONS -DBUILD_SHARED_LIBS=OFF -DOPENMP_RUNTIME=NONE -DCMAKE_POSITION_INDEPENDENT_CODE=ON)
+  endif()
+  set(CT2_LIB_INSTALL_LOCATION lib/${CMAKE_SHARED_LIBRARY_PREFIX}ctranslate2${CMAKE_STATIC_LIBRARY_SUFFIX})
 else()
-  set(CT2_CMAKE_PLATFORM_OPTIONS -DBUILD_SHARED_LIBS=ON)
+  set(CT2_CMAKE_PLATFORM_OPTIONS -DBUILD_SHARED_LIBS=ON -DOPENMP_RUNTIME=COMP)
+  set(CT2_LIB_INSTALL_LOCATION bin/${CMAKE_SHARED_LIBRARY_PREFIX}ctranslate2${CMAKE_SHARED_LIBRARY_SUFFIX})
 endif()
 
 ExternalProject_Add(
   ct2_build
-  DOWNLOAD_EXTRACT_TIMESTAMP true
   GIT_REPOSITORY ${CT2_URL}
   GIT_TAG v${CT2_VERSION}
   GIT_PROGRESS 1
   BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
   CMAKE_GENERATOR ${CMAKE_GENERATOR}
   INSTALL_COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
+  BUILD_BYPRODUCTS <INSTALL_DIR>/${CT2_LIB_INSTALL_LOCATION}
   CMAKE_ARGS -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
              -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
              -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
@@ -61,16 +64,18 @@ ExternalProject_Add(
              -DWITH_COVERAGE=OFF
              -DWITH_PROFILING=OFF
              -DBUILD_CLI=OFF
-             ${EXTRA_CT2_CMAKE_ARGS}
+             ${CT2_OPENBLAS_CMAKE_ARGS}
              ${CT2_CMAKE_PLATFORM_OPTIONS})
 ExternalProject_Get_Property(ct2_build INSTALL_DIR)
-ExternalProject_Get_Property(ct2_build BINARY_DIR)
 
-if(APPLE)
-  add_library(ct2::cpu_features STATIC IMPORTED GLOBAL)
-  set_target_properties(
-    ct2::cpu_features PROPERTIES IMPORTED_LOCATION
-                                 ${BINARY_DIR}/third_party/cpu_features/RelWithDebInfo/libcpu_features.a)
+if(UNIX)
+  if(APPLE)
+    ExternalProject_Get_Property(ct2_build BINARY_DIR)
+    add_library(ct2::cpu_features STATIC IMPORTED GLOBAL)
+    set_target_properties(
+      ct2::cpu_features PROPERTIES IMPORTED_LOCATION
+                                   ${BINARY_DIR}/third_party/cpu_features/RelWithDebInfo/libcpu_features.a)
+  endif()
 
   add_library(ct2::ct2 STATIC IMPORTED GLOBAL)
 else()
@@ -80,10 +85,10 @@ else()
                         ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}ctranslate2${CMAKE_STATIC_LIBRARY_SUFFIX})
   install(FILES ${INSTALL_DIR}/${CT2_LIB_INSTALL_LOCATION} DESTINATION "obs-plugins/64bit")
 endif()
+add_dependencies(ct2::ct2 ct2_build)
 set_target_properties(ct2::ct2 PROPERTIES IMPORTED_LOCATION ${INSTALL_DIR}/${CT2_LIB_INSTALL_LOCATION})
 
 add_library(ct2 INTERFACE)
-add_dependencies(ct2 ct2_build)
 target_link_libraries(ct2 INTERFACE ct2::ct2)
 if(APPLE)
   target_link_libraries(ct2 INTERFACE ct2::cpu_features "-framework Accelerate")

diff --git a/cmake/BuildSentencepiece.cmake b/cmake/BuildSentencepiece.cmake
@@ -12,26 +12,24 @@ else()
   set(SP_CMAKE_PLATFORM_OPTIONS "")
 endif()
 
+if(WIN32)
+  set(SENTENCEPIECE_INSTALL_LIB_LOCATION bin/${CMAKE_SHARED_LIBRARY_PREFIX}sentencepiece${CMAKE_SHARED_LIBRARY_SUFFIX})
+else()
+  set(SENTENCEPIECE_INSTALL_LIB_LOCATION lib/${CMAKE_STATIC_LIBRARY_PREFIX}sentencepiece${CMAKE_STATIC_LIBRARY_SUFFIX})
+endif()
+
 ExternalProject_Add(
   sentencepiece_build
-  DOWNLOAD_EXTRACT_TIMESTAMP true
   GIT_REPOSITORY ${SP_URL}
   GIT_TAG v0.1.99
   BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
   CMAKE_GENERATOR ${CMAKE_GENERATOR}
   INSTALL_COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR> --config ${CMAKE_BUILD_TYPE}
+  BUILD_BYPRODUCTS <INSTALL_DIR>/${SENTENCEPIECE_INSTALL_LIB_LOCATION}
   CMAKE_ARGS -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
              -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${SP_CMAKE_PLATFORM_OPTIONS})
 ExternalProject_Get_Property(sentencepiece_build INSTALL_DIR)
 
-if(WIN32)
-  set(SENTENCEPIECE_INSTALL_LIB_LOCATION
-      ${INSTALL_DIR}/bin/${CMAKE_SHARED_LIBRARY_PREFIX}sentencepiece${CMAKE_SHARED_LIBRARY_SUFFIX})
-else()
-  set(SENTENCEPIECE_INSTALL_LIB_LOCATION
-      ${INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}sentencepiece${CMAKE_STATIC_LIBRARY_SUFFIX})
-endif()
-
 if(APPLE)
   add_library(libsentencepiece STATIC IMPORTED GLOBAL)
 else()
@@ -41,7 +39,8 @@ else()
     PROPERTIES IMPORTED_IMPLIB
                ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sentencepiece${CMAKE_STATIC_LIBRARY_SUFFIX})
 endif()
-set_target_properties(libsentencepiece PROPERTIES IMPORTED_LOCATION ${SENTENCEPIECE_INSTALL_LIB_LOCATION})
+set_target_properties(libsentencepiece PROPERTIES IMPORTED_LOCATION
+                                                  ${INSTALL_DIR}/${SENTENCEPIECE_INSTALL_LIB_LOCATION})
 
 add_library(sentencepiece INTERFACE)
 add_dependencies(sentencepiece sentencepiece_build)