From adb42b7ad543171b5385919ecd46cf31b2ec3c6c Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Mon, 7 Aug 2023 18:22:29 -0400 Subject: [PATCH] Reenable benchmarks Skip benchmarks that depend on Google Benchmark --- .github/workflows/windows.yml | 2 +- benchmarks/CMakeLists.txt | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f6094ca509..c2d0fa7828 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -39,7 +39,7 @@ jobs: run: | mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="/EHsc /bigobj" -DKokkos_ROOT="C:\kokkos-install" ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -DARBORX_ENABLE_MPI=OFF -DARBORX_ENABLE_TESTS=ON -DARBORX_ENABLE_EXAMPLES=ON -DARBORX_ENABLE_BENCHMARKS=OFF .. + cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="/EHsc /bigobj" -DKokkos_ROOT="C:\kokkos-install" ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -DARBORX_ENABLE_MPI=OFF -DARBORX_ENABLE_TESTS=ON -DARBORX_ENABLE_EXAMPLES=ON -DARBORX_ENABLE_BENCHMARKS=ON .. - name: Build ArborX shell: bash run: | diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index 0dfe84d14a..df56e7cc96 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -4,11 +4,15 @@ find_package(benchmark 1.5.4 REQUIRED) message(STATUS "Found benchmark: ${benchmark_DIR} (version \"${benchmark_VERSION}\")") add_subdirectory(brute_force_vs_bvh) -add_subdirectory(bvh_driver) add_subdirectory(dbscan) -add_subdirectory(develop) add_subdirectory(execution_space_instances) add_subdirectory(union_find) +if(NOT WIN32) + # FIXME: for now, skip benchmarks using Google benchmark + # when building for Windows + add_subdirectory(bvh_driver) + add_subdirectory(develop) +endif() if (ARBORX_ENABLE_MPI) add_subdirectory(distributed_tree_driver)