Merge pull request #33 from Wovchena/fix-compilation-for-ubuntu20

Fix compilation for Ubuntu 20

Author: ilya-lavrenov

text_generation/causal_lm/cpp/continuous_batching/apps/CMakeLists.txt

@@ -17,13 +17,16 @@ FetchContent_MakeAvailable(cxxopts)
 FetchContent_MakeAvailable(nlohmann_json)
 
 find_package(OpenVINO REQUIRED COMPONENTS Runtime)
+find_package(Threads REQUIRED)
 
 # end of dependencies
 
 set(TARGET_NAME accuracy_sample)
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
 target_link_libraries(${TARGET_NAME} PRIVATE openvino::continuous_batching cxxopts::cxxopts)
+target_compile_features(${TARGET_NAME} PRIVATE cxx_std_20)
 
 set(TARGET_NAME throughput_benchmark)
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} PRIVATE openvino::continuous_batching nlohmann_json::nlohmann_json cxxopts::cxxopts)
+target_link_libraries(${TARGET_NAME} PRIVATE openvino::continuous_batching nlohmann_json::nlohmann_json cxxopts::cxxopts Threads::Threads)
+target_compile_features(${TARGET_NAME} PRIVATE cxx_std_20)

text_generation/causal_lm/cpp/continuous_batching/apps/throughput_benchmark.cpp

@@ -501,7 +501,7 @@ int main(int argc, char* argv[]) try {
 
     GenerationInfoCollector generation_info_collector;
 
-    std::atomic<bool> finishGenerationThread = false;
+    std::atomic<bool> finishGenerationThread{false};
     if (request_rate == "inf") {
         std::thread trafficSimulatorThread(trafficSimulator, &pipe, &dataset, request_rate, &generation_info_collector);
         trafficSimulatorThread.join();

text_generation/causal_lm/cpp/continuous_batching/library/CMakeLists.txt

@@ -38,7 +38,12 @@ add_library(openvino::continuous_batching ALIAS openvino_continuous_batching)
 
 target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src"
                                           PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_compile_definitions(${TARGET_NAME} PRIVATE OPENVINO_TOKENIZERS_PATH="libopenvino_tokenizers.so")
+if(TARGET openvino_tokenizers)
+    set(OPENVINO_TOKENIZERS_PATH $<TARGET_FILE:openvino_tokenizers>)
+else()
+    message(FATAL_ERROR "${TEST_TARGET_NAME} must be compiled as part of OpenVIINOGenAI to have the path to openvino_tokenizers hardcoded.")
+endif()
+target_compile_definitions(${TARGET_NAME} PRIVATE OPENVINO_TOKENIZERS_PATH="${OPENVINO_TOKENIZERS_PATH}")
 set_target_properties(${TARGET_NAME} PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
 
 target_link_libraries(${TARGET_NAME} PUBLIC openvino::runtime PRIVATE nlohmann_json::nlohmann_json)
@@ -73,3 +78,4 @@ add_executable(${TEST_TARGET_NAME} "src/tests/scheduler.cpp" "src/tests/block_ma
 target_link_libraries(${TEST_TARGET_NAME} PUBLIC ${TARGET_NAME} openvino::runtime gtest_main)
 target_include_directories(${TEST_TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/"
                                           PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+target_compile_features(${TEST_TARGET_NAME} PRIVATE cxx_std_20)