Skip to content

Commit

Permalink
Fixed OpenMP builds, remove Mac builds from the actions.
Browse files Browse the repository at this point in the history
Not sure how to get HDF5 without pulling down homebrew.
  • Loading branch information
LTLA committed May 19, 2023
1 parent be9f496 commit 03d987f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,22 @@ jobs:
os: ubuntu-latest,
cov: true
}
- {
name: "macOS Latest Clang",
os: macos-latest
}

steps:
- uses: actions/checkout@v1

- name: Get latest CMake
uses: lukka/get-cmake@latest

- name: Configure the build for Mac
if: ${{ matrix.config.os == 'macos-latest' }}
run: cmake -S . -B build

- name: Install HDF5
if: ${{ matrix.config.os == 'ubuntu-latest' }}
run: sudo apt-get install libhdf5-dev

- name: Configure the build with coverage
if: ${{ matrix.config.os == 'ubuntu-latest' && matrix.config.cov }}
if: ${{ matrix.config.cov }}
run: cmake -S . -B build -DCODE_COVERAGE=ON

- name: Configure the build with OpenMP
if: ${{ matrix.config.os == 'ubuntu-latest' && matrix.config.omp }}
if: ${{ matrix.config.omp }}
run: cmake -S . -B build -DUSE_OPENMP=ON

- name: Run the build
Expand Down
5 changes: 4 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ if (NOT HAVE_CXX_FS)
target_link_libraries(cusparh5test stdc++fs)
endif()

# Checking whether to add OpenMP support. This is turned off
# by default to make it easier to debug test failures.
set(USE_OPENMP OFF CACHE BOOL "Compile with OpenMP support")
if (USE_OPENMP)
# Assume that the package has already been found.
find_package(OpenMP REQUIRED)
target_link_libraries(h5test OpenMP::OpenMP_CXX)
endif()

Expand Down

0 comments on commit 03d987f

Please sign in to comment.