Test: Modify FindMKL.cmake (DO NOT CLOSE OR MERGE)

.github/workflows/build_test_cmake.yml

@@ -1,7 +1,7 @@
 name: Build Test
 on:
   push:
-  pull_request:
+  # pull_request:
 
 jobs:
   test:

.github/workflows/build_test_makefile.yml

@@ -1,7 +1,7 @@
 name: Build Test
 on:
   push:
-  pull_request:
+  # pull_request:
 
 jobs:
   test:

.github/workflows/coverage.yml

@@ -1,6 +1,9 @@
 name: Coverage Analysis
 
 on:
+  pull_request:
+    branches:
+      - develop
   workflow_dispatch:
   push:
     tags:
@@ -13,24 +16,97 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
-      - name: Install Requirements for Coverage Testing
+        with:
+          submodules: recursive
+
+      - name: Install Perl Dependencies and Coverage Tools
         run: |
-          apt update && apt install -y lcov gpg curl jq ca-certificates
-      - name: Building
+          apt update && apt install -y curl jq ca-certificates python3-pip
+          # 首先安装系统版本的 lcov 和 Perl 依赖
+          apt install -y lcov perl-modules
+          # 安装必要的 Perl 模块
+          apt install -y libcapture-tiny-perl libdatetime-perl libjson-perl libperlio-gzip-perl
+          # 验证系统 lcov 是否工作
+          lcov --version
+          # 同时安装 gcovr 作为备用方案
+          pip3 install gcovr
+
+      - name: Building with Coverage
         run: |
-          cmake -B build -DENABLE_COVERAGE=ON -DBUILD_TESTING=ON -DENABLE_MLALGO=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_GOOGLEBENCH=ON -DENABLE_RAPIDJSON=ON
-          cmake --build build -j`nproc`
-          cmake --install build
+          rm -rf build/
+          rm -f CMakeCache.txt
+          # 确保构建目录权限
+          mkdir -p build
+          chmod -R 755 build/
+          # 使用明确的覆盖率标志
+          cmake -B build \
+            -DENABLE_COVERAGE=ON \
+            -DBUILD_TESTING=ON \
+            -DENABLE_MLALGO=ON \
+            -DENABLE_LIBXC=ON \
+            -DENABLE_LIBRI=ON \
+            -DENABLE_GOOGLEBENCH=ON \
+            -DENABLE_RAPIDJSON=ON \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DCMAKE_CXX_FLAGS="--coverage -fprofile-arcs -ftest-coverage" \
+            -DCMAKE_EXE_LINKER_FLAGS="--coverage"
+          cmake --build build -j`nproc` || echo "Some tests failed but continuing for coverage"
+          cmake --install build || echo "Some tests failed but continuing for coverage"
+
       - name: Testing
         env:
           OMP_NUM_THREADS: 1
         run: |
-          cmake --build build --target test ARGS="-V --timeout 21600" || exit 0
+          # 运行测试前确保权限
+          chmod -R 755 build/
+          cmake --build build --target test ARGS="-V --timeout 21600" || echo "Some tests failed but continuing for coverage"
+
+      - name: Generate Coverage Data
+        run: |
+          cd build
+          # 检查 .gcno 和 .gcda 文件是否存在
+          echo "Checking for coverage files:"
+          find . -name "*.gcno" | head -10
+          find . -name "*.gcda" | head -10
+
+          # 方法1: 使用更新后的 lcov
+          echo "Generating coverage with lcov..."
+          lcov --directory . --capture --output-file coverage.info || echo "lcov failed, will try gcovr"
+
+          # 过滤覆盖率数据
+          lcov --remove coverage.info '/usr/*' '*/test/*' '*/external/*' '*/build/*' --output-file coverage.filtered.info || echo "lcov filtering failed"
+
+          # 生成HTML报告用于检查
+          genhtml coverage.filtered.info --output-directory coverage-report || echo "genhtml failed"
+
+          # # 方法2: 使用 gcovr 作为备用
+          # echo "Generating coverage with gcovr..."
+          # gcovr -r .. --html --html-details -o coverage-gcovr.html --print-summary || echo "gcovr failed"
+
+          # # 同时生成 gcovr 的 XML 格式，Codecov 更喜欢这种格式
+          # gcovr -r .. --xml -o coverage.xml || echo "gcovr xml failed"
+
+          cd ..
+
       - name: Upload Coverage to Codecov
         uses: codecov/codecov-action@v5
         if: ${{ ! cancelled() }}
         with:
-          fail_ci_if_error: true
+          fail_ci_if_error: false  # 设置为 false 避免因覆盖率收集失败而整个 CI 失败
           token: ${{ secrets.CODECOV_TOKEN }}
-          skip_validation: true
+          files: ./build/coverage.xml,./build/coverage.info  # 提供多个文件选项
+          directory: ./build/
+          flags: unittests
+          name: codecov-umbrella
           verbose: true
+
+      - name: Upload Coverage Report Artifact
+        uses: actions/upload-artifact@v4
+        if: always()  # 即使前面的步骤失败也上传，便于调试
+        with:
+          name: coverage-report
+          path: |
+            build/coverage-report/
+            build/coverage.info
+            build/coverage.xml
+          retention-days: 30

.github/workflows/cuda.yml

@@ -2,7 +2,7 @@ name: CUDA Test
 
 on:
   workflow_dispatch:
-  pull_request:
+  # pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/devcontainer.yml

@@ -1,6 +1,9 @@
 name: Container
 
 on:
+  #pull_request: # 当有 PR 指向 develop 分支时触发
+    #branches:
+    #  - develop
   push:
     branches:
       - develop
@@ -14,7 +17,8 @@ jobs:
     if: github.repository_owner == 'deepmodeling'
     strategy:
       matrix:
-        dockerfile: ["gnu","intel","cuda"]
+        dockerfile: ["intel"]
+        # dockerfile: ["gnu","intel","cuda"]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -41,10 +45,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to Aliyun Registry
+        # 只有在不是由 fork 的 PR 触发时才执行
+        if: github.event.pull_request.head.repo.full_name == github.repository
         uses: docker/login-action@v3
         with:
           registry: dp-harbor-registry.us-east-1.cr.aliyuncs.com
-            # AliCloud automatically mirrors to registry.dp.tech
           username: ${{ secrets.DP_HARBOR_USERNAME }}
           password: ${{ secrets.DP_HARBOR_PASSWORD }}
 
@@ -54,6 +59,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: Dockerfile.${{ matrix.dockerfile }}
-          push: true
+          # 只有在 develop 分支或打标签时才推送，PR时不推送
+          push: ${{ github.event_name != 'pull_request' }}
           cache-from: type=registry,ref=ghcr.io/deepmodeling/abacus-${{ matrix.dockerfile }}:latest
           cache-to: type=inline

.github/workflows/pytest.yml

@@ -1,7 +1,8 @@
 name: Pyabacus Build and Test
 
 on:
-  pull_request:
+  push:
+  # pull_request:
 
 jobs:
   test:

.github/workflows/test.yml

@@ -1,7 +1,8 @@
 name: Integration Test and Unit Test
 
 on:
-  pull_request:
+  push:
+  # pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

CMakeLists.txt

@@ -151,16 +151,24 @@ endif()
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 if(ENABLE_COVERAGE)
-  find_package(codecov)
+  find_package(codecov QUIET)
   if(NOT codecov_FOUND)
     include(FetchContent)
     FetchContent_Declare(
       cmakecodecov
-      URL https://github.com/baixiaokuang/CMake-codecov/archive/refs/heads/master.zip
+      GIT_REPOSITORY https://github.com/RWTH-HPC/CMake-codecov.git
+      GIT_TAG master
+      # URL https://github.com/baixiaokuang/CMake-codecov/archive/refs/heads/master.zip
+      # URL https://github.com/RWTH-HPC/CMake-codecov/archive/refs/heads/master.zip
+      # URL https://gitee.com/mirrors_rwth-elp/cmake-codecov/archive/refs/heads/master.zip
+      GIT_SHALLOW TRUE
+      GIT_PROGRESS TRUE
     )
     FetchContent_Populate(cmakecodecov)
     list(APPEND CMAKE_MODULE_PATH ${cmakecodecov_SOURCE_DIR}/cmake)
+    set(CMAKE_MODULE_PATH "${cmakecodecov_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
     find_package(codecov REQUIRED)
+  ##set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/CMake-codecov/cmake" ${CMAKE_MODULE_PATH})
   endif()
 endif()
 
@@ -806,5 +814,18 @@ install(PROGRAMS ${ABACUS_BIN_PATH}
 )
 
 if(ENABLE_COVERAGE)
-  coverage_evaluate()
+    ## coverage_evaluate()
+    add_custom_target(coverage
+        COMMAND ${CMAKE_COMMAND} -E echo "Capturing coverage data..."
+        COMMAND lcov --capture --directory ${CMAKE_BINARY_DIR} --output-file ${CMAKE_BINARY_DIR}/coverage.info
+        COMMAND ${CMAKE_COMMAND} -E echo "Filtering coverage data..."
+
+        COMMAND lcov --remove ${CMAKE_BINARY_DIR}/coverage.info '/usr/*' '*/test/*' '*/gtest/*' '*/gmock/*' --output-file ${CMAKE_BINARY_DIR}/coverage.info
+        COMMAND ${CMAKE_COMMAND} -E echo "Generating HTML report..."
+
+        COMMAND genhtml -o ${CMAKE_BINARY_DIR}/coverage_html ${CMAKE_BINARY_DIR}/coverage.info
+        COMMAND ${CMAKE_COMMAND} -E echo "Coverage report generated at: ${CMAKE_BINARY_DIR}/coverage_html/index.html"
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMENT "Generating code coverage report with lcov"
+    )
 endif()