From 1cf19b04480dbe8e933f2af3cda036cdb265cce6 Mon Sep 17 00:00:00 2001 From: Mikhail Katliar Date: Thu, 23 May 2024 15:10:55 +0200 Subject: [PATCH] - Make benchmarks compile again - Include benchmarks in GitHub build job - Remove unnecessary compiler options from build job --- .github/workflows/cmake.yml | 4 +--- CMakeLists.txt | 1 + bench/common/CMakeLists.txt | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 10341ba5..4c5b1370 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -48,9 +48,7 @@ jobs: cmake -B ${{github.workspace}}/build \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_CXX_FLAGS="-march=native -mfma -mavx -mavx2 -msse4 -fno-math-errno -ftemplate-backtrace-limit=0" \ - -DCMAKE_CXX_FLAGS_RELEASE="-O3 -g -DNDEBUG -ffast-math" \ - -DBLAST_WITH_BENCHMARK=OFF \ + -DBLAST_WITH_BENCHMARK=ON \ -DBLAST_WITH_TEST=ON - name: Build diff --git a/CMakeLists.txt b/CMakeLists.txt index e509f126..faffe2fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(CMakeToolsHelpers OPTIONAL) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_DEBUG_POSTFIX d) diff --git a/bench/common/CMakeLists.txt b/bench/common/CMakeLists.txt index fe48220e..fafeecdc 100644 --- a/bench/common/CMakeLists.txt +++ b/bench/common/CMakeLists.txt @@ -12,7 +12,6 @@ target_link_libraries(bench-blast-common PUBLIC benchmark::benchmark ) - target_compile_options(bench-blast-common PUBLIC "-mllvm" "-inline-threshold=1000" ) \ No newline at end of file