add boost threads

This commit is contained in:
James Ravenscroft 2023-08-24 13:03:12 +01:00
parent 113544400a
commit cceee41f79
2 changed files with 7 additions and 5 deletions

View File

@ -92,7 +92,7 @@ jobs:
submodules: true
- name: Install Dependencies
run: sudo apt-get update && sudo apt-get install -yq libboost-dev libasio-dev
run: sudo apt-get update && sudo apt-get install -yq libboost-dev libasio-dev libboost-thread-dev
- name: Install OpenBlas
if: ${{ matrix.build == 'avx2-openblas' }}
@ -207,7 +207,7 @@ jobs:
$msvc = $(join-path $vcdir $('VC\Tools\MSVC\'+$(gc -raw $(join-path $vcdir 'VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt')).Trim()))
$lib = $(join-path $msvc 'bin\Hostx64\x64\lib.exe')
& $lib /machine:x64 "/def:${env:RUNNER_TEMP}/openblas/lib/libopenblas.def" "/out:${env:RUNNER_TEMP}/openblas/lib/openblas.lib" /name:openblas.dll
- name: Build
id: cmake_build
env:
@ -216,7 +216,7 @@ jobs:
mkdir build
cd build
cmake .. ${{ matrix.defines }} -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib
cmake --build . --config Release --target turbopilot -DBoost_LIBRARY_DIRS=${{steps.install-boost.outputs.BOOST_ROOT}}/lib
cmake --build . --config Release --target turbopilot
# - name: Add libopenblas.dll
# id: add_libopenblas_dll

View File

@ -1,6 +1,7 @@
set(TURBOPILOT_TARGET turbopilot)
find_package(Boost REQUIRED)
find_package(Boost COMPONENTS thread system REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
add_executable(${TURBOPILOT_TARGET}
@ -24,7 +25,8 @@ target_include_directories(${TURBOPILOT_TARGET} PRIVATE
)
target_link_libraries(${TURBOPILOT_TARGET} PRIVATE ggml argparse)
target_link_libraries(${TURBOPILOT_TARGET} PRIVATE ggml argparse Boost::thread)
#target_link_libraries(${TURBOPILOT_TARGET} PRIVATE spdlog::spdlog_header_only)