diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml deleted file mode 100644 index 5e62086496..0000000000 --- a/.github/workflows/benchmark.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Unit Test and Benchmark Test - -on: - pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - test: - name: Test - runs-on: self-hosted - if: github.repository_owner == 'deepmodeling' - container: - image: ghcr.io/deepmodeling/abacus-gnu - volumes: - - /tmp/ccache:/github/home/.ccache - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Install Ccache - run: | - sudo apt-get update - sudo apt-get install -y ccache - - - name: Build - run: | - cmake -B build -DENABLE_GOOGLEBENCH=ON -DENABLE_DEEPKS=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_PAW=ON - cmake --build build -j8 - cmake --install build - - - name: Test - env: - GTEST_COLOR: 'yes' - OMP_NUM_THREADS: '2' - run: | - cmake --build build --target test ARGS="-V --timeout 1600" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 69d08d9b36..76f48347a8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: - name: Build run: | - cmake -B build -DBUILD_TESTING=ON -DENABLE_DEEPKS=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_PAW=ON + cmake -B build -DBUILD_TESTING=ON -DENABLE_DEEPKS=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_PAW=ON -DENABLE_GOOGLEBENCH=ON cmake --build build -j8 cmake --install build diff --git a/CMakeLists.txt b/CMakeLists.txt index d32f94e999..c474d23ae1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -600,6 +600,7 @@ IF (ENABLE_GOOGLEBENCH) set(BUILD_TESTING ON) find_package(benchmark HINTS ${BENCHMARK_DIR}) if(NOT ${benchmark_FOUND}) + set(BENCHMARK_USE_BUNDLED_GTEST OFF) include(FetchContent) FetchContent_Declare( benchmark @@ -608,11 +609,8 @@ IF (ENABLE_GOOGLEBENCH) GIT_SHALLOW TRUE GIT_PROGRESS TRUE ) + set(BENCHMARK_ENABLE_TESTING OFF) FetchContent_MakeAvailable(benchmark) - set(BENCHMARK_USE_BUNDLED_GTEST OFF CACHE INTERNAL "disable benchmark bundled gtest") - set(CMAKE_BUILD_TYPE "Release" CACHE INTERNAL "build benchmark in release mode") - set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "disable benchmark testing") - add_subdirectory(tests) endif() endif()