Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
G-071 authored Jun 1, 2024
2 parents 2095803 + 22bccbe commit 3a0f2cf
Show file tree
Hide file tree
Showing 6 changed files with 1,454 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: ctest

on: [push]
on:
push:
pull_request: # build on PRs -- asks maintainers for approval before running on external PRs
branches:
- master
workflow_dispatch: # add manual trigger for the workflow

#env:
# BUILD_TYPE: Release
Expand Down
32 changes: 32 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,38 @@ install(
install(FILES cppuddle-config.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/CPPuddle/)
install(EXPORT CPPuddle NAMESPACE CPPuddle:: DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/CPPuddle/)

#Boost::boost Boost::program_options HPX::hpx Kokkos::kokkos HPXKokkos::hpx_kokkos buffer_manager stream_manager
if (CPPUDDLE_WITH_TESTS)
if (CPPUDDLE_WITH_CUDA)
add_hpx_executable(
recycling-with-hpx-cuda
DEPENDENCIES
Boost::boost Boost::program_options HPX::hpx buffer_manager stream_manager
COMPONENT_DEPENDENCIES iostreams
SOURCES
examples/recycling-with-hpx-cuda.cu
)

if (CPPUDDLE_WITH_KOKKOS)
add_hpx_executable(
recycling-with-hpx-kokkos
DEPENDENCIES
Boost::boost Boost::program_options Kokkos::kokkos HPXKokkos::hpx_kokkos HPX::hpx buffer_manager stream_manager
COMPONENT_DEPENDENCIES iostreams
SOURCES
examples/recycling-with-hpx-kokkos.cpp
)
add_hpx_executable(
kernel-aggregation-with-hpx-kokkos
DEPENDENCIES
Boost::boost Boost::program_options Kokkos::kokkos HPXKokkos::hpx_kokkos HPX::hpx buffer_manager stream_manager
COMPONENT_DEPENDENCIES iostreams
SOURCES
examples/kernel-aggregation-with-hpx-kokkos.cpp
)
endif()
endif()
endif()
#------------------------------------------------------------------------------------------------------------
# Define cmake targets for all tests/example executables

Expand Down
Loading

0 comments on commit 3a0f2cf

Please sign in to comment.